Genericize mentions of Xming

Xming -> X server in various comments and text strings
Use the correct X server name (either XWin or Xming) when starting it

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

2 files changed, 16 insertions, 15 deletions

diff --git a/main.cc b/main.cc
index eddf4ed..75253e9 100644
--- a/main.cc
+++ b/main.cc
@@ -489,7 +489,7 @@ class CMyWizard : public CWizard
             return NULL;
         }
 
-        /// @brief Do the actual start of Xming and clients
+        /// @brief Do the actual start of X server and clients
 	void StartUp()
 	{
 	    std::string buffer;
@@ -499,13 +499,14 @@ class CMyWizard : public CWizard
 	    std::string display_id = ":" + config.display;
 	    std::string display = "localhost" + display_id + ":0";
 
-#ifdef _DEBUG
-            // Debug only: Switch to Xming installation directory
-	    SetCurrentDirectory("C:\\Programme\\Xming");
-#endif
-
-            // Build Xming commandline
+            // Build X server commandline
+#if defined (__CYGWIN__)
+	    buffer = "XWin " + display_id + " ";
+#elif defined (__MINGW__)
 	    buffer = "Xming " + display_id + " ";
+#else
+#error "Don't know X server name"
+#endif
 	    switch (config.window)
 	    {
 		case CConfig::MultiWindow:
@@ -577,7 +578,7 @@ class CMyWizard : public CWizard
 	    sic.cb = sizeof(sic);
 	    ZeroMemory( &pic, sizeof(pic) );
 
-	    // Start Xming process.
+	    // Start X server process
 #ifdef _DEBUG
 	    printf("%s\n", buffer.c_str());
 #endif
@@ -627,7 +628,7 @@ class CMyWizard : public CWizard
 #ifdef _DEBUG
 	    printf("killing process!\n");
 #endif
-            // Check if Xming is still running
+            // Check if X server is still running
 	    DWORD exitcode;
 	    GetExitCodeProcess(pi.hProcess, &exitcode);
 	    unsigned counter = 0;
@@ -636,7 +637,7 @@ class CMyWizard : public CWizard
 		if (++counter > 10)
 		    TerminateProcess(pi.hProcess, (DWORD)-1);
 		else
-		    // Shutdown Xming (the soft way!)
+		    // Shutdown X server (the soft way!)
 		    EnumThreadWindows(pi.dwThreadId, KillWindowsProc, 0);
 		Sleep(500);
 		GetExitCodeProcess(pi.hProcess, &exitcode);
diff --git a/resources/strings.rc b/resources/strings.rc
index 17bcaa5..3ca0ecd 100644
--- a/resources/strings.rc
+++ b/resources/strings.rc
@@ -33,9 +33,9 @@
 
 #define STR_CAPTION_CLIENTS         "Client startup"
 #define STR_CLIENT_NONE             "Start no client"
-#define STR_CLIENT_NONE_DESC		"This will just start the xserver. You will be able to start local clients later."
+#define STR_CLIENT_NONE_DESC		"This will just start the X server. You will be able to start local clients later."
 #define STR_CLIENT					"Start a program"
-#define STR_CLIENT_DESC				"This will start a local or remote program which will connect to the xserver. You will be able to start local clients later too. Remote programs are started using SSH."
+#define STR_CLIENT_DESC				"This will start a local or remote program which will connect to the X server. You will be able to start local clients later too. Remote programs are started using SSH."
 #define STR_XDMCP					"Open session via XDMCP"
 #define STR_XDMCP_DESC				"This will start a remote XDMCP session. Starting local clients later is limited. This option is not available with the ""Multiple windows"" mode."
 
@@ -60,15 +60,15 @@
 #define STR_CAPTION_CLIPBOARD       "Clipboard settings"
 #define STR_CLIPBOARD               "Clipboard"
 #define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
-#define STR_EXTRA_PARAMS_DESC       "Additional parameters for Xming"
+#define STR_EXTRA_PARAMS_DESC       "Additional parameters for X server"
 
 #define STR_CAPTION_FINISH          "Finish configuration"
-#define STR_FINISH_DESC	            "Configuration is complete. Clish Finish to start Xming."
+#define STR_FINISH_DESC	            "Configuration is complete. Clish Finish to start the X server."
 #define STR_FINISH_SAVE_DESC        "You may also save the configuration for later use."
 #define STR_FINISH_SAVE	            "Save configuration"
 
 #define STR_DISPLAY_TITLE           "Select display settings"
-#define STR_DISPLAY_SUBTITLE        "Choose how Xming display programs"
+#define STR_DISPLAY_SUBTITLE        "Choose how the X server displays programs"
 #define STR_CLIENTS_TITLE           "Select how to start clients"
 #define STR_CLIENTS_SUBTITLE        ""
 #define STR_PROGRAM_TITLE           "Specify the program to start"