readd hack to kitten to load files from exe path, update vbmouse help message & nls files

1 files changed, 18 insertions, 10 deletions

diff --git a/mousmain.c b/mousmain.c
index 2b6a2ab..79abfae 100644
--- a/mousmain.c
+++ b/mousmain.c
@@ -658,17 +658,27 @@ static void print_help(void)
 	puts(_(0, 2,  "Supported actions and options:"));
 	puts(_(0, 3,  "  install                 Install the driver (default)."));
 	puts(_(0, 4,  "    low                     Install in conventional memory (otherwise UMB)."));
-	puts(_(0, 5,  "  uninstall               Uninstall the driver from memory."));
+#if USE_SERIAL
+	puts(_(0, 5,  "    ps2, com1, com2, ...    Specify on which ports to search a mouse."));
+#endif
+	puts(_(0, 6,  "  uninstall               Uninstall the driver from memory."));
+#if USE_SERIAL
+	puts(_(0, 7,  "  rescan <ps2|com1|..>    Re-scan for mouse in specified ports."));
+#endif
 #if USE_WHEEL
-	puts(_(0, 6,  "  wheel <ON|OFF>          Enable/disable wheel API support."));
-	puts(_(0, 7,  "  wheelkey <KEY|OFF>      Emulate a specific keystroke on wheel scroll."));
-	puts(_(0, 8,  "                            Supported keys: updn, pageupdn."));
+	puts(_(0, 8,  "  wheel <ON|OFF>          Enable/disable wheel API support."));
+	puts(_(0, 9,  "  wheelkey <KEY|OFF>      Emulate a specific keystroke on wheel scroll."));
+	puts(_(0, 10, "                            Supported keys: updn, pageupdn."));
+#if USE_IMEX
+	puts(_(0, 11,  "                            Supported keys: updn, pageupdn."));
+	puts(_(0, 12,  "                            Supported keys: updn, pageupdn."));
+#endif
 #endif
 #if USE_INTEGRATION
-	puts(_(0, 9,  "  integ <ON|OFF>          Enable/disable VirtualBox integration."));
-	puts(_(0, 10, "  hostcur <ON|OFF>        Enable/disable mouse cursor rendering in the host."));
+	puts(_(0, 13,  "  integ <ON|OFF>          Enable/disable VirtualBox integration."));
+	puts(_(0, 14, "  hostcur <ON|OFF>        Enable/disable mouse cursor rendering in the host."));
 #endif
-	puts(_(0, 11, "  reset                   Reset mouse driver."));
+	puts(_(0, 15, "  reset                   Reset mouse driver."));
 }
 
 static int invalid_arg(const char *s)
@@ -746,7 +756,6 @@ int main(int argc, const char *argv[])
 	if (argi >= argc || stricmp(argv[argi], "install") == 0) {
 		bool high = true;
 		int portidx = 0;
-		// Default search order (PS2, COM1, COM2, COM3...)
 		int ports[1+MAX_PORTS] = {-1};
 
 		argi++;
@@ -797,9 +806,8 @@ int main(int argc, const char *argv[])
 		unconfigure_driver(data);
 		uninstall_driver(data);
 		return EXIT_SUCCESS;
-	} else if (stricmp(argv[argi], "reconf") == 0) {
+	} else if (stricmp(argv[argi], "rescan") == 0) {
 		int portidx = 0, port;
-		// Default search order (PS2, COM1, COM2, COM3...)
 		int ports[1+MAX_PORTS] = {-1};
 
 		argi++;