github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-13 15:18:14 +00:00
Code Issues Projects Releases Wiki Activity

Switch X11 options to use shared windowTitle and cleanup icon title variable name

Browse Source
This commit is contained in:
Nick Briggs 2024-10-18 16:21:58 -07:00
parent 532731b716
commit c3b7d1707d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xlspwin.c
View File

@ -39,8 +39,8 @@ extern DLword *DisplayRegion68k;
extern int Current_Hot_X, Current_Hot_Y; /* X Cursor hotspots */
extern char Window_Title[255];
extern char Icon_Title[255];
extern char windowTitle[255];
extern char iconTitle[255];
extern int save_argc;
extern char **save_argv;
@ -91,8 +91,8 @@ void Create_LispWindow(DspInterface dsp)
unsigned int GravSize;
char *WT, *IT;
WT = Window_Title;
IT = Icon_Title;
WT = windowTitle;
IT = iconTitle;
GravSize = (dsp->ScrollBarWidth / 2) - dsp->InternalBorderWidth;
Col2 = dsp->Visible.width;

16
src/xrdopt.c
View File

@ -81,14 +81,14 @@ extern char Display_Name[128];
char Display_Name[128];
extern char iconpixmapfile[1024];
char iconpixmapfile[1024];
extern char Window_Title[255];
char Window_Title[255];
extern char Icon_Title[255];
char Icon_Title[255];
extern char iconTitle[255];
char iconTitle[255];
extern char cursorColor[255];
char cursorColor[255] = {0};
extern char foregroundColorName[64];
extern char backgroundColorName[64];
extern char windowTitle[255];
extern char sysout_name_cl[];
extern char sysout_name_xrm[];
@ -247,14 +247,14 @@ void read_Xoption(int *argc, char *argv[])
}
if (XrmGetResource(rDB, "ldex.title", "Ldex.Title", str_type, &value) == True) {
(void)strncpy(Window_Title, value.addr, value.size);
(void)strncpy(windowTitle, value.addr, sizeof(windowTitle) - 1);
} else {
(void)strcpy(Window_Title, WINDOW_NAME);
(void)strncpy(windowTitle, WINDOW_NAME, sizeof(windowTitle) - 1);
}
if (XrmGetResource(rDB, "ldex.icontitle", "Ldex.icontitle", str_type, &value) == True) {
(void)strncpy(Icon_Title, value.addr, value.size);
(void)strncpy(iconTitle, value.addr, value.size);
} else {
(void)strcpy(Icon_Title, "Medley");
(void)strcpy(iconTitle, "Medley");
}
if (XrmGetResource(rDB, "ldex.iconbitmap", "Ldex.Iconbitmap", str_type, &value) == True) {