Add version information in ydotoold

Author: ReimuNotMoe

CMakeLists.txt

@@ -17,6 +17,15 @@ else()
     set(SD_UNITDIR "lib/systemd/user")
 endif()
 
+execute_process(COMMAND git describe --tags --long --always RESULT_VARIABLE RC_GIT_VER OUTPUT_VARIABLE GIT_VERSION)
+
+if (${RC_GIT_VER} EQUAL 0)
+    string(STRIP ${GIT_VERSION} GIT_VERSION)
+    message("-- Version: " ${GIT_VERSION})
+    add_definitions(-DVERSION=\"${GIT_VERSION}\")
+endif()
+
+
 
 set(SOURCE_FILES_DAEMON Daemon/ydotoold.c)
 set(SOURCE_FILES_CLIENT Client/ydotool.c Client/tool_click.c Client/tool_mousemove.c Client/tool_type.c Client/tool_key.c)

Daemon/ydotoold.c

@@ -64,6 +64,10 @@
 
 #include <linux/uinput.h>
 
+#ifndef VERSION
+#define VERSION "unknown"
+#endif
+
 #define SOCKET_PATH_LEN		108
 
 static char opt_socket_path[SOCKET_PATH_LEN] = "/tmp/.ydotool_socket";
@@ -78,12 +82,17 @@ static void show_help() {
 		"  -p, --socket-path=PATH     Custom socket path\n"
 		"  -P, --socket-perm=PERM     Socket permission\n"
 		"  -m, --mouse-off            Disable mouse (EV_REL)\n"
-		"  -k, --keyboard-off         Disable mouse (EV_KEY)\n"
+		"  -k, --keyboard-off         Disable keyboard (EV_KEY)\n"
 		"  -T, --touch-on             Enable touchscreen (EV_ABS)\n"
 		"  -h, --help                 Display this help and exit\n"
+		"  -V, --version              Show version information\n"
 	);
 }
 
+static void show_version() {
+	puts(VERSION);
+}
+
 enum ydotool_uinput_setup_options {
 	ENABLE_KEY = (1 << 0),
 	ENABLE_REL = (1 << 1),
@@ -175,15 +184,18 @@ int main(int argc, char **argv) {
 
 		static struct option long_options[] = {
 			{"help", no_argument, 0, 'h'},
+			{"version", no_argument, 0, 'V'},
 			{"socket-perm", required_argument, 0, 'P'},
 			{"socket-path", required_argument, 0, 'p'},
 			{"mouse-off", no_argument, 0, 'm'},
+			{"keyboard-off", no_argument, 0, 'k'},
+			{"touch-on", no_argument, 0, 'T'},
 			{0, 0, 0, 0}
 		};
 		/* getopt_long stores the option index here. */
 		int option_index = 0;
 
-		c = getopt_long (argc, argv, "hp:P:m",
+		c = getopt_long (argc, argv, "hVp:P:mkT",
 				 long_options, &option_index);
 
 		/* Detect the end of the options. */
@@ -225,6 +237,11 @@ int main(int argc, char **argv) {
 				exit(0);
 				break;
 
+			case 'V':
+				show_version();
+				exit(0);
+				break;
+
 			case '?':
 				/* getopt_long already printed an error message. */
 				break;