Skip to content
Snippets Groups Projects
Commit 65698853 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

And run it again.

parent 4dd81bb1
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #3508 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
src/syncterm/ripper.c
+ 32
− 32
View file @ 65698853
...@@ -7349,9 +7349,9 @@ struct rip_mouse_event { ...@@ -7349,9 +7349,9 @@ struct rip_mouse_event {
static struct rip_mouse_event rip_mouse_event; static struct rip_mouse_event rip_mouse_event;
   
static const struct builtin_rip_variable builtins[] = { static const struct builtin_rip_variable builtins[] = {
{"ADOW", rv_date, NULL} // Abbreviated Day of Week {"ADOW", rv_date, NULL} // Abbreviated Day of Week
, {"ALARM", rv_sound, NULL} , {"ALARM", rv_sound, NULL}
, {"AMPM", rv_time, NULL} // Returns AM or PM depending on time , {"AMPM", rv_time, NULL} // Returns AM or PM depending on time
, {"APP0", rv_exploit, NULL} , {"APP0", rv_exploit, NULL}
, {"APP1", rv_exploit, NULL} , {"APP1", rv_exploit, NULL}
, {"APP2", rv_exploit, NULL} , {"APP2", rv_exploit, NULL}
...@@ -7362,7 +7362,7 @@ static const struct builtin_rip_variable builtins[] = { ...@@ -7362,7 +7362,7 @@ static const struct builtin_rip_variable builtins[] = {
, {"APP7", rv_exploit, NULL} , {"APP7", rv_exploit, NULL}
, {"APP8", rv_exploit, NULL} , {"APP8", rv_exploit, NULL}
, {"APP9", rv_exploit, NULL} , {"APP9", rv_exploit, NULL}
, {"BEEP", rv_sound, NULL} // Beep Sound (ala Ctrl-G) , {"BEEP", rv_sound, NULL} // Beep Sound (ala Ctrl-G)
, {"BLIP", rv_sound, NULL} , {"BLIP", rv_sound, NULL}
, {"COFF", rv_termset, NULL} , {"COFF", rv_termset, NULL}
, {"COMPAT", rv_termset, NULL} , {"COMPAT", rv_termset, NULL}
...@@ -7370,26 +7370,26 @@ static const struct builtin_rip_variable builtins[] = { ...@@ -7370,26 +7370,26 @@ static const struct builtin_rip_variable builtins[] = {
, {"CURSOR", rv_termstat, NULL} , {"CURSOR", rv_termstat, NULL}
, {"CURX", rv_termstat, NULL} , {"CURX", rv_termstat, NULL}
, {"CURY", rv_termstat, NULL} , {"CURY", rv_termstat, NULL}
, {"DATE", rv_date, NULL} // Date in short format MM/DD/YY , {"DATE", rv_date, NULL} // Date in short format MM/DD/YY
, {"DATETIME", rv_date, NULL} // Date and Time , {"DATETIME", rv_date, NULL} // Date and Time
, {"DAY", rv_date, NULL} // Day of Month Number , {"DAY", rv_date, NULL} // Day of Month Number
, {"DOW", rv_date, NULL} // Day of week fully spelled out , {"DOW", rv_date, NULL} // Day of week fully spelled out
, {"DOY", rv_date, NULL} // Day of year , {"DOY", rv_date, NULL} // Day of year
, {"DTW", rv_disable, NULL} , {"DTW", rv_disable, NULL}
, {"DWAYOFF", rv_termset, NULL} , {"DWAYOFF", rv_termset, NULL}
, {"DWAYON", rv_termset, NULL} , {"DWAYON", rv_termset, NULL}
, {"EGW", rv_erase, NULL} , {"EGW", rv_erase, NULL}
, {"ETW", rv_erase, NULL} , {"ETW", rv_erase, NULL}
, {"FYEAR", rv_date, NULL} // 4 digit year , {"FYEAR", rv_date, NULL} // 4 digit year
, {"HKEYOFF", rv_hotkey, NULL} , {"HKEYOFF", rv_hotkey, NULL}
, {"HKEYON", rv_hotkey, NULL} , {"HKEYON", rv_hotkey, NULL}
, {"HOUR", rv_time, NULL} // Hour (format HH) - normal style , {"HOUR", rv_time, NULL} // Hour (format HH) - normal style
, {"M", rv_mouse, NULL} , {"M", rv_mouse, NULL}
, {"MHOUR", rv_time, NULL} // Hour (format HH) - military style , {"MHOUR", rv_time, NULL} // Hour (format HH) - military style
, {"MIN", rv_time, NULL} // Minutes , {"MIN", rv_time, NULL} // Minutes
, {"MKILL", rv_mouse_kill, NULL} , {"MKILL", rv_mouse_kill, NULL}
, {"MONTH", rv_date, NULL} // Month Name , {"MONTH", rv_date, NULL} // Month Name
, {"MONTHNUM", rv_date, NULL} // Month Number (1..12) , {"MONTHNUM", rv_date, NULL} // Month Number (1..12)
, {"MSTAT", rv_mouse, NULL} , {"MSTAT", rv_mouse, NULL}
, {"MUSIC", rv_sound, NULL} , {"MUSIC", rv_sound, NULL}
, {"PCB", rv_paste, NULL} , {"PCB", rv_paste, NULL}
...@@ -7426,14 +7426,14 @@ static const struct builtin_rip_variable builtins[] = { ...@@ -7426,14 +7426,14 @@ static const struct builtin_rip_variable builtins[] = {
, {"SBAROFF", rv_termset, NULL} , {"SBAROFF", rv_termset, NULL}
, {"SBARON", rv_termset, NULL} , {"SBARON", rv_termset, NULL}
, {"SCB", rv_save, NULL} , {"SCB", rv_save, NULL}
, {"SEC", rv_time, NULL} // Seconds , {"SEC", rv_time, NULL} // Seconds
, {"SMF", rv_save, NULL} , {"SMF", rv_save, NULL}
, {"STATBAR", rv_termstat, NULL} , {"STATBAR", rv_termstat, NULL}
, {"STW", rv_save, NULL} , {"STW", rv_save, NULL}
, {"TABOFF", rv_hotkey, NULL} , {"TABOFF", rv_hotkey, NULL}
, {"TABON", rv_hotkey, NULL} , {"TABON", rv_hotkey, NULL}
, {"TIME", rv_time, NULL} // Time in standard format 18:09:33 , {"TIME", rv_time, NULL} // Time in standard format 18:09:33
, {"TIMEZONE", rv_time, NULL} // Time Zone or "NONE" if unknown , {"TIMEZONE", rv_time, NULL} // Time Zone or "NONE" if unknown
, {"TWFONT", rv_termstat, NULL} , {"TWFONT", rv_termstat, NULL}
, {"TWH", rv_termstat, NULL} , {"TWH", rv_termstat, NULL}
, {"TWIN", rv_termstat, NULL} , {"TWIN", rv_termstat, NULL}
...@@ -7444,14 +7444,14 @@ static const struct builtin_rip_variable builtins[] = { ...@@ -7444,14 +7444,14 @@ static const struct builtin_rip_variable builtins[] = {
, {"TWY1", rv_termstat, NULL} , {"TWY1", rv_termstat, NULL}
, {"VT102OFF", rv_termset, NULL} , {"VT102OFF", rv_termset, NULL}
, {"VT102ON", rv_termset, NULL} , {"VT102ON", rv_termset, NULL}
, {"WDAY", rv_date, NULL} // Day of Week (0..6) , {"WDAY", rv_date, NULL} // Day of Week (0..6)
, {"WOY", rv_date, NULL} // Week of current year 00-53; Sunday=1st Day of Week , {"WOY", rv_date, NULL} // Week of current year 00-53; Sunday=1st Day of Week
, {"WOYM", rv_date, NULL} // Week of current year 00-53; Monday=1st Day of Week , {"WOYM", rv_date, NULL} // Week of current year 00-53; Monday=1st Day of Week
, {"X", rv_mouse, NULL} , {"X", rv_mouse, NULL}
, {"XY", rv_mouse, NULL} , {"XY", rv_mouse, NULL}
, {"XYM", rv_mouse, NULL} , {"XYM", rv_mouse, NULL}
, {"Y", rv_mouse, NULL} , {"Y", rv_mouse, NULL}
, {"YEAR", rv_date, NULL} // 2 digit year , {"YEAR", rv_date, NULL} // 2 digit year
, ,
}; };
   
...@@ -8550,8 +8550,8 @@ write_char(char ch) ...@@ -8550,8 +8550,8 @@ write_char(char ch)
// draw_pixel(rip.x + (x * rip.font.size) + xs, rip.y + (y * // draw_pixel(rip.x + (x * rip.font.size) + xs, rip.y + (y *
// rip.font.size)+ ys); // rip.font.size)+ ys);
set_pixel(rip.x + (x * rip.font.size) + xs set_pixel(rip.x + (x * rip.font.size) + xs
, rip.y + (y * rip.font.size) + ys, , rip.y + (y * rip.font.size) + ys
map_rip_color(rip.color)); , map_rip_color(rip.color));
} }
} }
} }
...@@ -11287,7 +11287,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -11287,7 +11287,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* Command Description of Command * Command Description of Command
* *
* *
* *
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* RIP_FONT_STYLE font style (character set, direction, * RIP_FONT_STYLE font style (character set, direction,
* size) * size)
...@@ -13420,7 +13420,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -13420,7 +13420,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* follows: * follows:
* *
* *
* *
* variable-identifier[,field-width]:[?question-text?][default-value] * variable-identifier[,field-width]:[?question-text?][default-value]
* *
* There are several different segments in this parameter as you * There are several different segments in this parameter as you
...@@ -13694,7 +13694,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -13694,7 +13694,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* Mode Description * Mode Description
* Logical * Logical
* *
* *
* ------------------------------------------------------------------ * ------------------------------------------------------------------
* 00 Paste the image on-screen normally * 00 Paste the image on-screen normally
* (COPY) * (COPY)
...@@ -13977,7 +13977,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -13977,7 +13977,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* Mode Description * Mode Description
* Logical * Logical
* *
* *
* ------------------------------------------------------------------- * -------------------------------------------------------------------
* 00 Paste the image on-screen normally * 00 Paste the image on-screen normally
* (COPY) * (COPY)
...@@ -14226,7 +14226,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -14226,7 +14226,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* *
* Justify Description * Justify Description
* *
* *
* ------------------------------------------------------------------ * ------------------------------------------------------------------
* 0 Don't right/left justify. Left-justify only * 0 Don't right/left justify. Left-justify only
* 1 Perform right/left margin justification of this * 1 Perform right/left margin justification of this
...@@ -14332,7 +14332,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -14332,7 +14332,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* Effect Type X0 Modifier Y0 Modifier X1 Modifier Y1 * Effect Type X0 Modifier Y0 Modifier X1 Modifier Y1
* Modifier * Modifier
* *
* *
* ------------------------------------------------------------------- * -------------------------------------------------------------------
* Bevel -bevel size -bevel size +bevel size * Bevel -bevel size -bevel size +bevel size
* +bevel size * +bevel size
...@@ -14465,7 +14465,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs) ...@@ -14465,7 +14465,7 @@ do_rip_command(int level, int sublevel, int cmd, const char*rawargs)
* *
* Parameter Example Description of the Text Parameter * Parameter Example Description of the Text Parameter
* *
* *
* ------------------------------------------------------------------- * -------------------------------------------------------------------
* icon<>label<>host_cmd Specify all three blocks * icon<>label<>host_cmd Specify all three blocks
* <>label<>host_cmd 2 blocks specified; no icon * <>label<>host_cmd 2 blocks specified; no icon
...@@ -15030,8 +15030,8 @@ draw_glyph(uint8_t ch) ...@@ -15030,8 +15030,8 @@ draw_glyph(uint8_t ch)
   
if (pix) { if (pix) {
setpixels(0, 0, vparams[vmode].charwidth * vparams[vmode].cols - 1 setpixels(0, 0, vparams[vmode].charwidth * vparams[vmode].cols - 1
, (vparams[vmode].charheight - 1) * vparams[vmode].rows - 1, 0, 0, pix, , (vparams[vmode].charheight - 1) * vparams[vmode].rows - 1, 0, 0, pix
NULL); , NULL);
freepixels(pix); freepixels(pix);
amiga_y -= (amiga_font->height << doubled); amiga_y -= (amiga_font->height << doubled);
for (int ypos = (vparams[vmode].charheight - 1) * vparams[vmode].rows; for (int ypos = (vparams[vmode].charheight - 1) * vparams[vmode].rows;
src/syncterm/term.c
+ 9
− 2
View file @ 65698853
...@@ -903,6 +903,7 @@ erase_transfer_window(void) ...@@ -903,6 +903,7 @@ erase_transfer_window(void)
textattr(trans_ti.attribute); textattr(trans_ti.attribute);
_setcursortype(_NORMALCURSOR); _setcursortype(_NORMALCURSOR);
} }
void ascii_upload(FILE*fp); void ascii_upload(FILE*fp);
void raw_upload(FILE*fp); void raw_upload(FILE*fp);
...@@ -2701,20 +2702,26 @@ doterm(struct bbslist*bbs) ...@@ -2701,20 +2702,26 @@ doterm(struct bbslist*bbs)
BYTE ooii_buf[256]; BYTE ooii_buf[256];
BYTE ooii_init1[] = BYTE ooii_init1[] =
"\xdb\b \xdb\b \xdb\b[\xdb\b[\xdb\b \xdb\bM\xdb\ba\xdb\bi\xdb\bn\xdb\bt\xdb\be\xdb\bn\xdb\ba\xdb\bn\xdb\bc\xdb\be\xdb\b \xdb\bC\xdb\bo\xdb\bm\xdb\bp\xdb\bl\xdb\be\xdb\bt\xdb\be\xdb\b \xdb\b]\xdb\b]\xdb\b \b\r\n\r\n\r\n\x1b[0;0;36mDo you have the Overkill Ansiterm installed? (y/N) \xe9 "; /* "\xdb\b \xdb\b \xdb\b[\xdb\b[\xdb\b \xdb\bM\xdb\ba\xdb\bi\xdb\bn\xdb\bt\xdb\be\xdb\bn\xdb\ba\xdb\bn\xdb\bc\xdb\be\xdb\b \xdb\bC\xdb\bo\xdb\bm\xdb\bp\xdb\bl\xdb\be\xdb\bt\xdb\be\xdb\b \xdb\b]\xdb\b]\xdb\b \b\r\n\r\n\r\n\x1b[0;0;36mDo you have the Overkill Ansiterm installed? (y/N) \xe9 "; /*
*
* *
* for * for
* *
*
* OOII * OOII
* *
*
* auto-enable * auto-enable
*/ */
BYTE ooii_init2[] = BYTE ooii_init2[] =
"\xdb\b \xdb\b \xdb\b[\xdb\b[\xdb\b \xdb\bM\xdb\ba\xdb\bi\xdb\bn\xdb\bt\xdb\be\xdb\bn\xdb\ba\xdb\bn\xdb\bc\xdb\be\xdb\b \xdb\bC\xdb\bo\xdb\bm\xdb\bp\xdb\bl\xdb\be\xdb\bt\xdb\be\xdb\b \xdb\b]\xdb\b]\xdb\b \b\r\n\r\n\x1b[0m\x1b[2J\r\n\r\n\x1b[0;1;30mHX Force retinal scan in progress ... \x1b[0;0;30m"; /* "\xdb\b \xdb\b \xdb\b[\xdb\b[\xdb\b \xdb\bM\xdb\ba\xdb\bi\xdb\bn\xdb\bt\xdb\be\xdb\bn\xdb\ba\xdb\bn\xdb\bc\xdb\be\xdb\b \xdb\bC\xdb\bo\xdb\bm\xdb\bp\xdb\bl\xdb\be\xdb\bt\xdb\be\xdb\b \xdb\b]\xdb\b]\xdb\b \b\r\n\r\n\x1b[0m\x1b[2J\r\n\r\n\x1b[0;1;30mHX Force retinal scan in progress ... \x1b[0;0;30m"; /*
*
* *
* for * for
* *
*
* OOII * OOII
* *
*
* auto-enable * auto-enable
*/ */
#endif #endif
...@@ -2996,8 +3003,8 @@ doterm(struct bbslist*bbs) ...@@ -2996,8 +3003,8 @@ doterm(struct bbslist*bbs)
case CIOLIB_MOUSE_MOVE: case CIOLIB_MOUSE_MOVE:
case CIOLIB_BUTTON_1_CLICK: case CIOLIB_BUTTON_1_CLICK:
conn_send(mouse_buf conn_send(mouse_buf
, fill_mevent(mouse_buf, sizeof(mouse_buf), &mevent, &ms), , fill_mevent(mouse_buf, sizeof(mouse_buf), &mevent, &ms)
0); , 0);
break; break;
case CIOLIB_BUTTON_4_PRESS: case CIOLIB_BUTTON_4_PRESS:
case CIOLIB_BUTTON_5_PRESS: case CIOLIB_BUTTON_5_PRESS:
......
src/syncterm/uncrustify.cfg
+ 3
− 0
View file @ 65698853
...@@ -258,3 +258,6 @@ mod_enum_last_comma = remove ...@@ -258,3 +258,6 @@ mod_enum_last_comma = remove
pp_indent = force pp_indent = force
pp_space = remove pp_space = remove
pp_space_count = 1 pp_space_count = 1
#Use or Do not Use options
use_indent_continue_only_once = false # true/false
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment