Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 4a7d00c8 authored by Deucе's avatar Deucе 👌🏾

Add "LCD 80x25" to make DigitalMan less angry

He's old, and should keep his blood pressure down.
Do not walk on his lawn.
parent 270ca850
Pipeline #2278 passed with stage
in 8 minutes and 48 seconds
......@@ -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 */
......
......@@ -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},
};
......
......@@ -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];
......
......@@ -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};
......
......@@ -36,6 +36,7 @@ enum {
enum {
SCREEN_MODE_CURRENT
,SCREEN_MODE_80X25
,SCREEN_MODE_LCD80X25
,SCREEN_MODE_80X28
,SCREEN_MODE_80X30
,SCREEN_MODE_80X43
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment