Send last event timestamp with WM_TAKE_FOCUS msg

According to 4.1.7 of the iccm spec

http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.7

> Windows with the atom WM_TAKE_FOCUS in their WM_PROTOCOLS property may
> receive a ClientMessage event from the window manager (as described in
> section 4.2.8) with WM_TAKE_FOCUS in its data[0] field and a valid
> timestamp (i.e. not CurrentTime ) in its data[1] field.

Adds the timestamp parameter to send_take_focus to avoid the dangerous
use of a global variable.
This commit is contained in:
Tony Crisci
2014-03-29 00:25:52 -04:00
committed by Michael Stapelberg
parent 2ba0d1ea49
commit 4ded44d18a
3 changed files with 4 additions and 4 deletions

View File

@ -110,7 +110,7 @@ void fake_absolute_configure_notify(Con *con) {
* Sends the WM_TAKE_FOCUS ClientMessage to the given window
*
*/
void send_take_focus(xcb_window_t window) {
void send_take_focus(xcb_window_t window, xcb_timestamp_t timestamp) {
/* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes.
* In order to properly initialize these bytes, we allocate 32 bytes even
* though we only need less for an xcb_configure_notify_event_t */
@ -122,7 +122,7 @@ void send_take_focus(xcb_window_t window) {
ev->type = A_WM_PROTOCOLS;
ev->format = 32;
ev->data.data32[0] = A_WM_TAKE_FOCUS;
ev->data.data32[1] = XCB_CURRENT_TIME;
ev->data.data32[1] = timestamp;
DLOG("Sending WM_TAKE_FOCUS to the client\n");
xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);