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 2015-03-07 14:52:39 +01:00
parent 61418f4dfb fa3396b6ea
commit a2a32ab1ee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings.c
View File

@ -211,7 +211,7 @@ Binding *get_binding_from_xcb_event(xcb_generic_event_t *event) {
state_filtered &= 0xFF; state_filtered &= 0xFF;
DLOG("(removed upper 8 bits, state = %d)\n", state_filtered); DLOG("(removed upper 8 bits, state = %d)\n", state_filtered);
if (xkb_current_group == XkbGroup2Index) if (xkb_current_group == XCB_XKB_GROUP_2)
state_filtered |= BIND_MODE_SWITCH; state_filtered |= BIND_MODE_SWITCH;
DLOG("(checked mode_switch, state %d)\n", state_filtered); DLOG("(checked mode_switch, state %d)\n", state_filtered);
@ -294,8 +294,8 @@ void translate_keysyms(void) {
bind->translated_to[bind->number_keycodes - 1] = i; bind->translated_to[bind->number_keycodes - 1] = i;
} }
DLOG("Translated symbol \"%s\" to %d keycode\n", bind->symbol, DLOG("Translated symbol \"%s\" to %d keycode (mods %d)\n", bind->symbol,
bind->number_keycodes); bind->number_keycodes, bind->mods);
} }
} }

4
src/handlers.c
View File

@ -1267,7 +1267,7 @@ void handle_event(int type, xcb_generic_event_t *event) {
/* See The XKB Extension: Library Specification, section 14.1 */ /* See The XKB Extension: Library Specification, section 14.1 */
/* We check if the current group (each group contains /* We check if the current group (each group contains
* two levels) has been changed. Mode_switch activates * two levels) has been changed. Mode_switch activates
* group XkbGroup2Index */ * group XCB_XKB_GROUP_2 */
if (xkb_current_group == state->group) if (xkb_current_group == state->group)
return; return;
xkb_current_group = state->group; xkb_current_group = state->group;
@ -1277,7 +1277,7 @@ void handle_event(int type, xcb_generic_event_t *event) {
grab_all_keys(conn, false); grab_all_keys(conn, false);
} else { } else {
DLOG("Mode_switch enabled\n"); DLOG("Mode_switch enabled\n");
grab_all_keys(conn, false); grab_all_keys(conn, true);
} }
} }