← easystroke

Drop distinction b/w app_window and current_window

2bc6d3c4db15ba4f5c1331a688cdced1acf36329 · Thomas Jaeger · Aug 9, 2011 16:41

Fixes a bug where easystroke wouldn't recognize the current application if
the pointer was moved directly into the window (without going through the
frame window first).

+12 −13 · 2 files changed

• grabber.cc +2 −2
• main.cc +10 −11

diff --git a/grabber.cc b/grabber.cc
index 587e394..43b9842 100644
--- a/grabber.cc
+++ b/grabber.cc
@@ -26,7 +26,7 @@
 
 extern Window get_window(Window w, Atom prop);
 extern Source<bool> disabled;
-extern Source<Window> current_window;
+extern Source<Window> current_app_window;
 extern Source<ActionListDiff *> stroke_app;
 extern bool in_proximity;
 
@@ -237,7 +237,7 @@ Grabber::Grabber() : children(ROOT) {
 	init_xi();
 	prefs.excluded_devices.connect(new IdleNotifier(sigc::mem_fun(*this, &Grabber::update)));
 	prefs.button.connect(new IdleNotifier(sigc::mem_fun(*this, &Grabber::update)));
-	current_class = fun2(&get_wm_class, current_window, stroke_app);
+	current_class = fun2(&get_wm_class, current_app_window, stroke_app);
 	current_class->connect(new IdleNotifier(sigc::mem_fun(*this, &Grabber::update)));
 	disabled.connect(new IdleNotifier(sigc::mem_fun(*this, &Grabber::set)));
 	update();
diff --git a/main.cc b/main.cc
index 7cae601..3abe212 100644
--- a/main.cc
+++ b/main.cc
@@ -46,7 +46,7 @@ extern Source<bool> disabled;
 bool experimental = false;
 int verbosity = 0;
 const char *versions[] = { "-0.4.1", "-0.4.0", "", NULL };
-Source<Window> current_window(None);
+Source<Window> current_app_window(None);
 std::string config_dir;
 Win *win = NULL;
 Display *dpy;
@@ -62,7 +62,7 @@ static bool no_dbus = false;
 static int argc;
 static char **argv;
 
-static Window current_app = 0, ping_window = 0;
+static Window ping_window = 0;
 static boost::shared_ptr<Trace> trace;
 static std::map<guint, guint> core_inv_map;
 
@@ -936,8 +936,8 @@ protected:
 		update_core_mapping();
 	}
 	virtual void press(guint b, RTriple e) {
-		if (current_app)
-			activate_window(current_app, e->t);
+		if (current_app_window.get())
+			activate_window(current_app_window.get(), e->t);
 		replace_child(new StrokeHandler(b, e));
 	}
 public:
@@ -1284,16 +1284,15 @@ void Main::handle_enter_leave(XEvent &ev) {
 		return;
 	Window w = ev.xcrossing.window;
 	if (ev.type == EnterNotify) {
-		current_window.set(w);
-		current_app = get_app_window(w);
+		current_app_window.set(get_app_window(w));
 		if (verbosity >= 3)
-			printf("Entered window 0x%lx -> 0x%lx\n", w, current_app);
+			printf("Entered window 0x%lx -> 0x%lx\n", w, current_app_window.get());
 	} else if (ev.type == LeaveNotify) {
-		if (ev.xcrossing.window != current_window.get())
+		if (ev.xcrossing.window != current_app_window.get())
 			return;
 		if (verbosity >= 3)
 			printf("Left window 0x%lx\n", w);
-		current_window.set(None);
+		current_app_window.set(None);
 	} else printf("Error: Bogus Enter/Leave event\n");
 }
 
@@ -1307,8 +1306,8 @@ void Main::handle_event(XEvent &ev) {
 		return;
 
 	case PropertyNotify:
-		if (current_window.get() == ev.xproperty.window && ev.xproperty.atom == XA_WM_CLASS)
-			current_window.notify();
+		if (current_app_window.get() == ev.xproperty.window && ev.xproperty.atom == XA_WM_CLASS)
+			current_app_window.notify();
 		return;
 
 	case ButtonPress: