nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Same xcb_send_event fix as 1e0033bce4

This commit is contained in:
Michael Stapelberg 2011-07-31 19:33:56 +02:00
parent 5bfc89f733
commit fa1fe3cfed
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/x.c
View File

@ -215,20 +215,23 @@ void x_window_kill(xcb_window_t window, kill_window_t kill_window) {
return; return;
} }
xcb_client_message_event_t ev; /* 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 */
void *event = scalloc(32);
xcb_client_message_event_t *ev = event;
memset(&ev, 0, sizeof(xcb_client_message_event_t)); ev->response_type = XCB_CLIENT_MESSAGE;
ev->window = window;
ev.response_type = XCB_CLIENT_MESSAGE; ev->type = A_WM_PROTOCOLS;
ev.window = window; ev->format = 32;
ev.type = A_WM_PROTOCOLS; ev->data.data32[0] = A_WM_DELETE_WINDOW;
ev.format = 32; ev->data.data32[1] = XCB_CURRENT_TIME;
ev.data.data32[0] = A_WM_DELETE_WINDOW;
ev.data.data32[1] = XCB_CURRENT_TIME;
LOG("Sending WM_DELETE to the client\n"); LOG("Sending WM_DELETE to the client\n");
xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev); xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);
xcb_flush(conn); xcb_flush(conn);
free(event);
} }
/* /*

22
src/xcb.c
View File

@ -219,19 +219,21 @@ void fake_absolute_configure_notify(Con *con) {
* *
*/ */
void send_take_focus(xcb_window_t window) { void send_take_focus(xcb_window_t window) {
xcb_client_message_event_t ev; /* 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 */
void *event = scalloc(32);
xcb_client_message_event_t *ev = event;
memset(&ev, 0, sizeof(xcb_client_message_event_t)); ev->response_type = XCB_CLIENT_MESSAGE;
ev->window = window;
ev.response_type = XCB_CLIENT_MESSAGE; ev->type = A_WM_PROTOCOLS;
ev.window = window; ev->format = 32;
ev.type = A_WM_PROTOCOLS; ev->data.data32[0] = A_WM_TAKE_FOCUS;
ev.format = 32; ev->data.data32[1] = XCB_CURRENT_TIME;
ev.data.data32[0] = A_WM_TAKE_FOCUS;
ev.data.data32[1] = XCB_CURRENT_TIME;
DLOG("Sending WM_TAKE_FOCUS to the client\n"); DLOG("Sending WM_TAKE_FOCUS to the client\n");
xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev); xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);
} }
/* /*