github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-04-25 20:11:36 +00:00
Code Issues Projects Releases Wiki Activity

Clean up display related variable names differing only in case (#529)

Browse Source 
Unify the LispDisplayRequested... and lispDisplayRequested...
variables from the SDL and X11 display modules.

Move the storage definitions for LispDisplayRequested... to main.c
leaving external references in the modules that utilize them.
This commit is contained in:
Nick Briggs
2025-02-02 16:31:43 -08:00
committed by GitHub
parent 511a1b523e
commit c8dc63d418
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -327,10 +327,10 @@ extern char backgroundColorName[64];
#endif #endif
char windowTitle[255] = "Medley"; char windowTitle[255] = "Medley";
extern char windowTitle[255]; extern char windowTitle[255];
int lispDisplayRequestedWidth = 1024; unsigned LispDisplayRequestedWidth = 1024, LispDisplayRequestedHeight = 768;
extern int lispDisplayRequestedWidth; extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
int lispDisplayRequestedHeight = 768; int LispDisplayRequestedX = 0, LispDisplayRequestedY = 0;
extern int lispDisplayRequestedHeight; extern int LispDisplayRequestedX, LispDisplayRequestedY;
int pixelScale = 1; int pixelScale = 1;
extern int pixelScale; extern int pixelScale;
@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
#ifdef SDL #ifdef SDL
else if ((strcmp(argv[i], "-sc") == 0) || (strcmp(argv[i], "-SC") == 0)) { else if ((strcmp(argv[i], "-sc") == 0) || (strcmp(argv[i], "-SC") == 0)) {
if (argc > ++i) { if (argc > ++i) {
int read = sscanf(argv[i], "%dx%d", &lispDisplayRequestedWidth, &lispDisplayRequestedHeight); int read = sscanf(argv[i], "%dx%d", &LispDisplayRequestedWidth, &LispDisplayRequestedHeight);
if(read != 2) { if(read != 2) {
(void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]); (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
exit(1); exit(1);
@@ -717,7 +717,7 @@ int main(int argc, char *argv[])
make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */ make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
#endif /* DOS || XWINDOW */ #endif /* DOS || XWINDOW */
#if defined(SDL) #if defined(SDL)
init_SDL(windowTitle, lispDisplayRequestedWidth, lispDisplayRequestedHeight, pixelScale); init_SDL(windowTitle, LispDisplayRequestedWidth, LispDisplayRequestedHeight, pixelScale);
#endif /* SDL */ #endif /* SDL */
/* Load sysout to VM space and returns real sysout_size(not 0) */ /* Load sysout to VM space and returns real sysout_size(not 0) */
sysout_size = sysout_loader(sysout_name, sysout_size); sysout_size = sysout_loader(sysout_name, sysout_size);

2
src/xinit.c
View File

@@ -50,8 +50,6 @@ unsigned LispWindowRequestedHeight = DEF_WIN_HEIGHT;
extern int LispDisplayRequestedX, LispDisplayRequestedY; extern int LispDisplayRequestedX, LispDisplayRequestedY;
extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight; extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
int LispDisplayRequestedX, LispDisplayRequestedY;
unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
extern Colormap Colors; extern Colormap Colors;
Colormap Colors; Colormap Colors;