← easystroke

minor cleanup

d3c8ad8b8623e4409beb24412397944feb2e1d10 · Thomas Jaeger · Sep 23, 2012 02:46

+14 −14 · 5 files changed

• grabber.cc +9 −10
• grabber.h +1 −1
• gui.glade +1 −1
• main.cc +2 −1
• win.cc +1 −1

diff --git a/grabber.cc b/grabber.cc
index 90b4b86..4dcb4de 100644
--- a/grabber.cc
+++ b/grabber.cc
@@ -16,8 +16,7 @@
 #include "actiondb.h" // TODO
 #include "grabber.h"
 #include "main.h"
-#include "win.h" // TODO
-#include "prefs.h" // TODO
+#include "prefs.h"
 #include <X11/extensions/XTest.h>
 #include <xorg/xserver-properties.h>
 #include <X11/cursorfont.h>
@@ -28,7 +27,6 @@ extern Window get_window(Window w, Atom prop);
 extern Source<bool> disabled;
 extern Source<Window> current_app_window;
 extern Source<bool> recording;
-extern bool in_proximity;
 
 Grabber *grabber = 0;
 
@@ -308,32 +306,33 @@ bool Grabber::init_xi() {
 	return true;
 }
 
-void Grabber::hierarchy_changed(XIHierarchyEvent *event) {
+bool Grabber::hierarchy_changed(XIHierarchyEvent *event) {
+	bool changed = false;
 	for (int i = 0; i < event->num_info; i++) {
 		XIHierarchyInfo *info = event->info + i;
 		if (info->flags & XISlaveAdded) {
 			int n;
 			XIDeviceInfo *dev_info = XIQueryDevice(dpy, info->deviceid, &n);
 			if (!dev_info)
-				return;
+				continue;
 			new_device(dev_info);
 			XIFreeDeviceInfo(dev_info);
 			update_excluded();
-			win->prefs_tab->update_device_list();
+			changed = true;
 		} else if (info->flags & XISlaveRemoved) {
 			if (verbosity >= 1)
 				printf("Device %d removed.\n", info->deviceid);
 			xi_devs.erase(info->deviceid);
-			win->prefs_tab->update_device_list();
 			if (current_dev && current_dev->dev == info->deviceid)
 				current_dev = NULL;
+			changed = true;
 		} else if (info->flags & (XISlaveAttached | XISlaveDetached)) {
 			DeviceMap::iterator i = xi_devs.find(info->deviceid);
-			if (i == xi_devs.end())
-				return;
-			i->second->master = info->attachment;
+			if (i != xi_devs.end())
+				i->second->master = info->attachment;
 		}
 	}
+	return changed;
 }
 
 void Grabber::update_excluded() {
diff --git a/grabber.h b/grabber.h
index 6b33f70..76ad60b 100644
--- a/grabber.h
+++ b/grabber.h
@@ -117,7 +117,7 @@ public:
 	bool is_grabbed(guint b);
 	bool is_instant(guint b);
 	bool is_click_hold(guint b);
-	void hierarchy_changed(XIHierarchyEvent *);
+	bool hierarchy_changed(XIHierarchyEvent *);
 
 	int get_default_button() { return grabbed_button.button; }
 	guint get_default_mods(guint button);
diff --git a/gui.glade b/gui.glade
index 9529193..44652af 100644
--- a/gui.glade
+++ b/gui.glade
@@ -1248,7 +1248,7 @@ Van Diep Duong (Vietnamese)</property>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="check_left_handed">
-                                <property name="label" translatable="yes">optimize for left-handed operation )</property>
+                                <property name="label" translatable="yes">to the right of the cursor)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
diff --git a/main.cc b/main.cc
index 8b6c042..29cb256 100644
--- a/main.cc
+++ b/main.cc
@@ -1504,7 +1504,8 @@ void Main::handle_xi2_event(XIDeviceEvent *event) {
 			handle_raw_motion((XIRawEvent *)event);
 			break;
 		case XI_HierarchyChanged:
-			grabber->hierarchy_changed((XIHierarchyEvent *)event);
+			if (grabber->hierarchy_changed((XIHierarchyEvent *)event))
+				win->prefs_tab->update_device_list();
 	}
 }
 
diff --git a/win.cc b/win.cc
index d9ffd36..4190a40 100644
--- a/win.cc
+++ b/win.cc
@@ -286,5 +286,5 @@ void error_dialog(const Glib::ustring &text) {
 }
 
 Glib::ustring app_name_hr(Glib::ustring src) {
-	return src == "" ? _("(window manager frame)") : src;
+	return src == "" ? _("<unnamed>") : src;
 }