diff --git a/src/conio/ciolib.h b/src/conio/ciolib.h index c1fdcf631cf1d4aeacc6f2472006a23a86dd3c12..b13c2c95baf7d6132a4c5952d9f4aff2d01a6538 100644 --- a/src/conio/ciolib.h +++ b/src/conio/ciolib.h @@ -187,6 +187,9 @@ enum text_modes /* New modes we've added 'cause they're stupid */ VGA80X25, + /* New modes we've added because DigitalMan bitched for DAYS! */ + LCD80X25, + /* Cruft... */ C4350 = C80X50, /* this is actually "64" in the "real" conio */ diff --git a/src/conio/vidmodes.c b/src/conio/vidmodes.c index 2f9d05b0d1ca1aa02d0aa2cc07406a56464a7d2c..cd8bbb8969eeca4138a769f0fbdbcb28a08ebf83 100644 --- a/src/conio/vidmodes.c +++ b/src/conio/vidmodes.c @@ -121,6 +121,8 @@ struct video_params vparams[] = { {ST132X52_5_4, COLOUR_PALETTE, 132, 52, 14, 15, 16, 8, 7, 0, 5, 4, 1056, 823}, /* Stupid modes */ {VGA80X25, COLOUR_PALETTE, 80, 25, 14, 15, 16, 9, 7, CIOLIB_VIDEO_EXPAND | CIOLIB_VIDEO_LINE_GRAPHICS_EXPAND, 4, 3, 720, 400}, + /* DigitalMon */ + {LCD80X25, COLOUR_PALETTE, 80, 25, 14, 15, 16, 8, 7, 0, 8, 5, 640, 400}, /* Custom mode */ {CIOLIB_MODE_CUSTOM, COLOUR_PALETTE, 80, 25, 14, 15, 16, 8, 7, 0, 0, 0, -1, -1}, }; diff --git a/src/conio/vidmodes.h b/src/conio/vidmodes.h index 99e28200d1208e2f6ecda0272f7edfc4f5981ea8..ebdcf38e74e182ed632cb15cf37d246c082d05a3 100644 --- a/src/conio/vidmodes.h +++ b/src/conio/vidmodes.h @@ -120,7 +120,7 @@ enum { ,ATARI_PALETTE }; -extern struct video_params vparams[55]; +extern struct video_params vparams[56]; #define NUMMODES (sizeof(vparams) / sizeof(struct video_params)) extern uint32_t palettes[5][16]; extern struct dac_colors dac_default[TOTAL_DAC_SIZE]; diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c index 38b15a4eae26db9b5d3ff5f648bdf112c66614af..e2483de967976760bb312d26b4b9dd1478d3d8d5 100644 --- a/src/syncterm/bbslist.c +++ b/src/syncterm/bbslist.c @@ -188,8 +188,8 @@ static struct sort_order_info sort_order[] = { int sortorder[sizeof(sort_order)/sizeof(struct sort_order_info)]; -char *screen_modes[]={ "Current", "80x25", "80x28", "80x30", "80x43", "80x50", "80x60", "132x37 (16:9)", "132x52 (5:4)", "132x25", "132x28", "132x30", "132x34", "132x43", "132x50", "132x60", "C64", "C128 (40col)", "C128 (80col)", "Atari", "Atari XEP80", "Custom", "EGA 80x25", "VGA 80x25", NULL}; -static char *screen_modes_enum[]={"Current", "80x25", "80x28", "80x30", "80x43", "80x50", "80x60", "132x37", "132x52", "132x25", "132x28", "132x30", "132x34", "132x43", "132x50", "132x60", "C64", "C128-40col", "C128-80col", "Atari", "Atari-XEP80", "Custom", "EGA80x25", "VGA80x25", NULL}; +char *screen_modes[]={ "Current", "80x25", "LCD 80x25", "80x28", "80x30", "80x43", "80x50", "80x60", "132x37 (16:9)", "132x52 (5:4)", "132x25", "132x28", "132x30", "132x34", "132x43", "132x50", "132x60", "C64", "C128 (40col)", "C128 (80col)", "Atari", "Atari XEP80", "Custom", "EGA 80x25", "VGA 80x25", NULL}; +static char *screen_modes_enum[]={"Current", "80x25", "LCD80x25", "80x28", "80x30", "80x43", "80x50", "80x60", "132x37", "132x52", "132x25", "132x28", "132x30", "132x34", "132x43", "132x50", "132x60", "C64", "C128-40col", "C128-80col", "Atari", "Atari-XEP80", "Custom", "EGA80x25", "VGA80x25", NULL}; char *log_levels[]={"Emergency", "Alert", "Critical", "Error", "Warning", "Notice", "Info", "Debug", NULL}; static char *log_level_desc[]={"None", "Alerts", "Critical Errors", "Errors", "Warnings", "Notices", "Normal", "All (Debug)", NULL}; diff --git a/src/syncterm/bbslist.h b/src/syncterm/bbslist.h index 77b3ab310a3b82af24087fe5e38bb7de2b602993..4cb83a2dbcbaf580e67a49151bf95a1528d5788d 100644 --- a/src/syncterm/bbslist.h +++ b/src/syncterm/bbslist.h @@ -36,6 +36,7 @@ enum { enum { SCREEN_MODE_CURRENT ,SCREEN_MODE_80X25 + ,SCREEN_MODE_LCD80X25 ,SCREEN_MODE_80X28 ,SCREEN_MODE_80X30 ,SCREEN_MODE_80X43 diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c index 610556fc9655da71253b59d198dbfa324d9fed2a..92fc0eabb4a218c3936df52380de56204fe9864b 100644 --- a/src/syncterm/syncterm.c +++ b/src/syncterm/syncterm.c @@ -1926,6 +1926,8 @@ int screen_to_ciolib(int screen) return(ti.currmode); case SCREEN_MODE_80X25: return(C80); + case SCREEN_MODE_LCD80X25: + return(LCD80X25); case SCREEN_MODE_80X28: return(C80X28); case SCREEN_MODE_80X30: @@ -1980,6 +1982,8 @@ int ciolib_to_screen(int ciolib) switch(ciolib) { case C80 : return(SCREEN_MODE_80X25); + case LCD80X25: + return(SCREEN_MODE_LCD80X25); case C80X28 : return(SCREEN_MODE_80X28); case C80X30: