← easystroke

Add option to start easystroke disabled

c1ba1a729f7b0ccbc83cd340d0efd96e59cc4004 · Thomas Jaeger · Aug 9, 2011 23:40

https://sourceforge.net/tracker/index.php?func=detail&aid=3042827&group_id=229797&atid=1078457

+7 −4 · 3 files changed

• grabber.cc +0 −1
• main.cc +6 −2
• win.cc +1 −1

diff --git a/grabber.cc b/grabber.cc
index 14f373c..9e29c32 100644
--- a/grabber.cc
+++ b/grabber.cc
@@ -226,7 +226,6 @@ Grabber::Grabber() : children(ROOT) {
 	current = BUTTON;
 	suspended = 0;
 	suspend();
-	disabled = false;
 	active = true;
 	grabbed = NONE;
 	xi_grabbed = false;
diff --git a/main.cc b/main.cc
index f03fc43..d071e95 100644
--- a/main.cc
+++ b/main.cc
@@ -1240,6 +1240,7 @@ void Main::usage(char *me, bool good) {
 	printf("  -D  --no-dbus          Don't try to register as a DBus service\n");
 	printf("  -e  --experimental     Start in experimental mode\n");
 	printf("  -g, --show-gui         Show the configuration dialog on startup\n");
+	printf("  -x  --disable          Start disabled\n");
 	printf("  -v, --verbose          Increase verbosity level\n");
 	printf("  -h, --help             Display this help and exit\n");
 	printf("      --version          Output version information and exit\n");
@@ -1260,7 +1261,6 @@ std::string Main::parse_args_and_init_gtk() {
 		{"help",0,0,'h'},
 		{"version",0,0,'V'},
 		{"show-gui",0,0,'g'},
-		{"no-dbus",0,0,'D'},
 		{0,0,0,0}
 	};
 	static struct option long_opts2[] = {
@@ -1270,6 +1270,7 @@ std::string Main::parse_args_and_init_gtk() {
 		{"show-gui",0,0,'g'},
 		{"verbose",0,0,'v'},
 		{"no-dbus",0,0,'D'},
+		{"disabled",0,0,'x'},
 		{0,0,0,0}
 	};
 	std::string display;
@@ -1297,7 +1298,7 @@ std::string Main::parse_args_and_init_gtk() {
 	oldHandler = XSetErrorHandler(xErrorHandler);
 	oldIOHandler = XSetIOErrorHandler(xIOErrorHandler);
 
-	while ((opt = getopt_long(argc, argv, "c:egvD", long_opts2, 0)) != -1) {
+	while ((opt = getopt_long(argc, argv, "c:egvDx", long_opts2, 0)) != -1) {
 		switch (opt) {
 			case 'c':
 				config_dir = optarg;
@@ -1311,6 +1312,9 @@ std::string Main::parse_args_and_init_gtk() {
 			case 'D':
 				no_dbus = true;
 				break;
+			case 'x':
+				disabled.set(true);
+				break;
 			case 'd':
 			case 'n':
 			case 'g':
diff --git a/win.cc b/win.cc
index 591f732..94397a7 100644
--- a/win.cc
+++ b/win.cc
@@ -132,7 +132,7 @@ Glib::RefPtr<Gdk::Pixbuf> Stroke::drawEmpty_(int size) {
 	return pb;
 }
 
-Source<bool> disabled;
+Source<bool> disabled(false);
 
 class MenuCheck : private Base {
 	IO<bool> &io;