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

Merge branch 'big-endian' of https://github.com/stevenjm/i3 into stevenjm-big-endian

This commit is contained in:
Michael Stapelberg 2015-03-01 16:28:42 +01:00
parent fe482cf193 1ab76fb05a
commit 4bcb702360
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,8 +1,14 @@
i3-wm (4.8.1-1) unstable; urgency=medium i3-wm (4.9.1-1) experimental; urgency=medium
* NOT YET RELEASED * NOT YET RELEASED.
-- Michael Stapelberg <stapelberg@debian.org> Sun, 15 Jun 2014 19:37:32 +0200 -- Michael Stapelberg <stapelberg@debian.org> Sat, 28 Feb 2015 15:04:25 +0100
i3-wm (4.9-1) experimental; urgency=medium
* New upstream release.
-- Michael Stapelberg <stapelberg@debian.org> Sat, 28 Feb 2015 14:53:34 +0100
i3-wm (4.8-2) unstable; urgency=medium i3-wm (4.8-2) unstable; urgency=medium

3
src/bindings.c
View File

@ -159,9 +159,10 @@ static Binding *get_binding(uint16_t modifiers, bool is_release, uint16_t input_
* need to look in the array of translated keycodes for the event’s * need to look in the array of translated keycodes for the event’s
* keycode */ * keycode */
if (input_type == B_KEYBOARD && bind->symbol != NULL) { if (input_type == B_KEYBOARD && bind->symbol != NULL) {
xcb_keycode_t input_keycode = (xcb_keycode_t)input_code;
if (memmem(bind->translated_to, if (memmem(bind->translated_to,
bind->number_keycodes * sizeof(xcb_keycode_t), bind->number_keycodes * sizeof(xcb_keycode_t),
&input_code, sizeof(xcb_keycode_t)) == NULL) &input_keycode, sizeof(xcb_keycode_t)) == NULL)
continue; continue;
} else { } else {
/* This case is easier: The user specified a keycode */ /* This case is easier: The user specified a keycode */