Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Main
Synchronet
Compare Revisions
270ca850024904c18a207fb19bce8f39c604555d...4a7d00c84b74d5a3e33604749d85c4b6fd43c93d
Commits (1)
Add "LCD 80x25" to make DigitalMan less angry
· 4a7d00c8
Deucе
authored
May 22, 2021
He's old, and should keep his blood pressure down. Do not walk on his lawn.
4a7d00c8
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
3 deletions
+13
-3
src/conio/ciolib.h
src/conio/ciolib.h
+3
-0
src/conio/vidmodes.c
src/conio/vidmodes.c
+2
-0
src/conio/vidmodes.h
src/conio/vidmodes.h
+1
-1
src/syncterm/bbslist.c
src/syncterm/bbslist.c
+2
-2
src/syncterm/bbslist.h
src/syncterm/bbslist.h
+1
-0
src/syncterm/syncterm.c
src/syncterm/syncterm.c
+4
-0
No files found.
src/conio/ciolib.h
View file @
4a7d00c8
...
@@ -187,6 +187,9 @@ enum text_modes
...
@@ -187,6 +187,9 @@ enum text_modes
/* New modes we've added 'cause they're stupid */
/* New modes we've added 'cause they're stupid */
VGA80X25
,
VGA80X25
,
/* New modes we've added because DigitalMan bitched for DAYS! */
LCD80X25
,
/* Cruft... */
/* Cruft... */
C4350
=
C80X50
,
/* this is actually "64" in the "real" conio */
C4350
=
C80X50
,
/* this is actually "64" in the "real" conio */
...
...
src/conio/vidmodes.c
View file @
4a7d00c8
...
@@ -121,6 +121,8 @@ struct video_params vparams[] = {
...
@@ -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
},
{
ST132X52_5_4
,
COLOUR_PALETTE
,
132
,
52
,
14
,
15
,
16
,
8
,
7
,
0
,
5
,
4
,
1056
,
823
},
/* Stupid modes */
/* Stupid modes */
{
VGA80X25
,
COLOUR_PALETTE
,
80
,
25
,
14
,
15
,
16
,
9
,
7
,
CIOLIB_VIDEO_EXPAND
|
CIOLIB_VIDEO_LINE_GRAPHICS_EXPAND
,
4
,
3
,
720
,
400
},
{
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 */
/* Custom mode */
{
CIOLIB_MODE_CUSTOM
,
COLOUR_PALETTE
,
80
,
25
,
14
,
15
,
16
,
8
,
7
,
0
,
0
,
0
,
-
1
,
-
1
},
{
CIOLIB_MODE_CUSTOM
,
COLOUR_PALETTE
,
80
,
25
,
14
,
15
,
16
,
8
,
7
,
0
,
0
,
0
,
-
1
,
-
1
},
};
};
...
...
src/conio/vidmodes.h
View file @
4a7d00c8
...
@@ -120,7 +120,7 @@ enum {
...
@@ -120,7 +120,7 @@ enum {
,
ATARI_PALETTE
,
ATARI_PALETTE
};
};
extern
struct
video_params
vparams
[
5
5
];
extern
struct
video_params
vparams
[
5
6
];
#define NUMMODES (sizeof(vparams) / sizeof(struct video_params))
#define NUMMODES (sizeof(vparams) / sizeof(struct video_params))
extern
uint32_t
palettes
[
5
][
16
];
extern
uint32_t
palettes
[
5
][
16
];
extern
struct
dac_colors
dac_default
[
TOTAL_DAC_SIZE
];
extern
struct
dac_colors
dac_default
[
TOTAL_DAC_SIZE
];
...
...
src/syncterm/bbslist.c
View file @
4a7d00c8
...
@@ -188,8 +188,8 @@ static struct sort_order_info sort_order[] = {
...
@@ -188,8 +188,8 @@ static struct sort_order_info sort_order[] = {
int
sortorder
[
sizeof
(
sort_order
)
/
sizeof
(
struct
sort_order_info
)];
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
};
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"
,
"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
};
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
};
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
};
static
char
*
log_level_desc
[]
=
{
"None"
,
"Alerts"
,
"Critical Errors"
,
"Errors"
,
"Warnings"
,
"Notices"
,
"Normal"
,
"All (Debug)"
,
NULL
};
...
...
src/syncterm/bbslist.h
View file @
4a7d00c8
...
@@ -36,6 +36,7 @@ enum {
...
@@ -36,6 +36,7 @@ enum {
enum
{
enum
{
SCREEN_MODE_CURRENT
SCREEN_MODE_CURRENT
,
SCREEN_MODE_80X25
,
SCREEN_MODE_80X25
,
SCREEN_MODE_LCD80X25
,
SCREEN_MODE_80X28
,
SCREEN_MODE_80X28
,
SCREEN_MODE_80X30
,
SCREEN_MODE_80X30
,
SCREEN_MODE_80X43
,
SCREEN_MODE_80X43
...
...
src/syncterm/syncterm.c
View file @
4a7d00c8
...
@@ -1926,6 +1926,8 @@ int screen_to_ciolib(int screen)
...
@@ -1926,6 +1926,8 @@ int screen_to_ciolib(int screen)
return
(
ti
.
currmode
);
return
(
ti
.
currmode
);
case
SCREEN_MODE_80X25
:
case
SCREEN_MODE_80X25
:
return
(
C80
);
return
(
C80
);
case
SCREEN_MODE_LCD80X25
:
return
(
LCD80X25
);
case
SCREEN_MODE_80X28
:
case
SCREEN_MODE_80X28
:
return
(
C80X28
);
return
(
C80X28
);
case
SCREEN_MODE_80X30
:
case
SCREEN_MODE_80X30
:
...
@@ -1980,6 +1982,8 @@ int ciolib_to_screen(int ciolib)
...
@@ -1980,6 +1982,8 @@ int ciolib_to_screen(int ciolib)
switch
(
ciolib
)
{
switch
(
ciolib
)
{
case
C80
:
case
C80
:
return
(
SCREEN_MODE_80X25
);
return
(
SCREEN_MODE_80X25
);
case
LCD80X25
:
return
(
SCREEN_MODE_LCD80X25
);
case
C80X28
:
case
C80X28
:
return
(
SCREEN_MODE_80X28
);
return
(
SCREEN_MODE_80X28
);
case
C80X30
:
case
C80X30
:
...
...