From c3b7d1707dc9f386fb3de2e58f99a07ffbfac9d0 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Fri, 18 Oct 2024 16:21:58 -0700
Subject: [PATCH] Switch X11 options to use shared windowTitle and cleanup icon
 title variable name

---
 src/xlspwin.c |  8 ++++----
 src/xrdopt.c  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/xlspwin.c b/src/xlspwin.c
index 8ed8b49..4e97168 100644
--- a/src/xlspwin.c
+++ b/src/xlspwin.c
@@ -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;
diff --git a/src/xrdopt.c b/src/xrdopt.c
index 31c882a..48a0b79 100644
--- a/src/xrdopt.c
+++ b/src/xrdopt.c
@@ -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) {