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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 01:20:18 +02:00
parent 4984b81282 f86ac3534e
commit 6e6eb407e0
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
i3-config-wizard/main.c
View File

@ -281,6 +281,29 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press
return 1; return 1;
} }
/*
* Handle button presses to make clicking on "<win>" and "<alt>" work
*
*/
static void handle_button_press(xcb_button_press_event_t* event) {
if (current_step != STEP_GENERATE)
return;
if (event->event_x >= 32 && event->event_x <= 68 &&
event->event_y >= 45 && event->event_y <= 54) {
modifier = MOD_SUPER;
handle_expose();
}
if (event->event_x >= 32 && event->event_x <= 68 &&
event->event_y >= 56 && event->event_y <= 70) {
modifier = MOD_ALT;
handle_expose();
}
return;
}
/* /*
* Creates the config file and tells i3 to reload. * Creates the config file and tells i3 to reload.
* *
@ -534,6 +557,10 @@ int main(int argc, char *argv[]) {
/* TODO: handle mappingnotify */ /* TODO: handle mappingnotify */
case XCB_BUTTON_PRESS:
handle_button_press((xcb_button_press_event_t*)event);
break;
case XCB_EXPOSE: case XCB_EXPOSE:
handle_expose(); handle_expose();
break; break;

3
i3-config-wizard/xcb.c
View File

@ -110,7 +110,8 @@ xcb_window_t open_input_window(xcb_connection_t *conn, uint32_t width, uint32_t
values[0] = 0; values[0] = 0;
mask |= XCB_CW_EVENT_MASK; mask |= XCB_CW_EVENT_MASK;
values[1] = XCB_EVENT_MASK_EXPOSURE; values[1] = XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_BUTTON_PRESS;
xcb_create_window(conn, xcb_create_window(conn,
XCB_COPY_FROM_PARENT, XCB_COPY_FROM_PARENT,