From: Ralf Jung <post@ralfj.de>
Date: Sat, 13 Jul 2013 11:03:06 +0000 (+0200)
Subject: grab all keyboard focuses on startup
X-Git-Url: https://git.ralfj.de/multypo.git/commitdiff_plain/b02f9fdbd25d756d6ca73156d0b21a703e17d1de?ds=sidebyside

grab all keyboard focuses on startup
---

diff --git a/qt/multypo.cpp b/qt/multypo.cpp
index a5d8137..638114c 100644
--- a/qt/multypo.cpp
+++ b/qt/multypo.cpp
@@ -26,40 +26,6 @@ MultypoWindow::~MultypoWindow()
 {
 }
 
-void MultypoWindow::showEvent ( QShowEvent * )
-{
-	if (xiInited) return;
-
-	Display *dpy = x11Info().display();
-
-	/* XInput Extension available? */
-	int eventID, errorID;
-	if (!XQueryExtension(dpy, "XInputExtension", &xiOpcode, &eventID, &errorID)) {
-	   qCritical() << "X Input extension not available";
-	}
-
-	/* Which version of XI2? We support 2.0 */
-	int major = 2, minor = 0;
-	if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
-		qCritical() << "XI2 not available. Server supports" << major << "." <<
-					minor;
-	}
-
-	qDebug() << "System is sane";
-
-
-	// Now let's listen to keypress events
-	XIEventMask eventmask;
-	unsigned char mask [1] = { 0 }; // will change
-	eventmask.deviceid = XIAllMasterDevices;
-	eventmask.mask_len = sizeof (mask); // in bytes, for whatever reason...
-	eventmask.mask = mask;
-	XISetMask(mask, XI_KeyPress);
-	XISelectEvents (dpy, winId(), &eventmask, 1);
-
-	xiInited = true;
-}
-
 void MultypoWindow::handleKeyPress(int device, QString string)
 {
 	qDebug() << "Device" << device << "String" << string;
@@ -68,12 +34,51 @@ void MultypoWindow::handleKeyPress(int device, QString string)
 
 bool MultypoWindow::handleX11Event(XEvent *event)
 {
-	if (!xiInited) return false;
 	Display *dpy = x11Info().display();
+	/* Handle the first map event: We are finally visible! */
+	if (!xiInited && event->type == MapNotify) {
+		/* XInput Extension available? */
+		int eventID, errorID;
+		if (!XQueryExtension(dpy, "XInputExtension", &xiOpcode, &eventID, &errorID)) {
+		   qCritical() << "X Input extension not available";
+		}
 
-	if (event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode
-		&& event->xcookie.evtype == XI_KeyPress && XGetEventData(dpy, &event->xcookie)) {
+		/* Which version of XI2? We support 2.0 */
+		int major = 2, minor = 0;
+		if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
+			qCritical() << "XI2 not available. Server supports" << major << "." <<
+						minor;
+		}
+
+		qDebug() << "System supports XI2";
+
+
+		// Now let's listen to keypress events
+		XIEventMask eventmask;
+		unsigned char mask [1] = { 0 }; // will change
+		eventmask.deviceid = XIAllMasterDevices;
+		eventmask.mask_len = sizeof (mask); // in bytes, for whatever reason...
+		eventmask.mask = mask;
+		XISetMask(mask, XI_KeyPress);
+		XISelectEvents (dpy, winId(), &eventmask, 1);
+
+		// finally, grab all focuses
+		int ndevices;
+		XIDeviceInfo* devices = XIQueryDevice(dpy, XIAllMasterDevices, &ndevices);
+		for (int i = 0; i < ndevices; ++i) {
+			if (devices[i].use != XIMasterKeyboard) continue;
+			qDebug() << "Found master keyboard with ID" << devices[i].deviceid;
+			XISetFocus(dpy, devices[i].deviceid, winId(), CurrentTime);
+		}
 
+		xiInited = true;
+
+		return false;
+	}
+	else if (xiInited && event->type == GenericEvent
+		&& event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode
+		&& event->xcookie.evtype == XI_KeyPress && XGetEventData(dpy, &event->xcookie)) {
+		/* Handle XI event */
 		XIDeviceEvent *d_ev = (XIDeviceEvent*) event->xcookie.data;
 	    KeyCode keycode = d_ev->detail;
 	    int kbdid = d_ev->deviceid;
@@ -88,6 +93,7 @@ bool MultypoWindow::handleX11Event(XEvent *event)
 
 		return true;
 	}
-
-	return false;
+	else {
+		return false;
+	}
 }
diff --git a/qt/multypo.h b/qt/multypo.h
index f10a5d4..b9dbf3f 100644
--- a/qt/multypo.h
+++ b/qt/multypo.h
@@ -15,9 +15,6 @@ public:
 
 	bool handleX11Event(XEvent *event);
 
-protected:
-	virtual void showEvent (QShowEvent *);
-
 private:
 	void handleKeyPress(int device, QString string);