Release 1.0.4

- Fix README release process
- Fix issue 2 as specified in Bugs.md

Bugs.md

@@ -26,3 +26,10 @@ Steps to reproduce:
   * enter text into the "Tags" field
   * if autocompletion of tags pops up, the keyboard will not enter further
     keystrokes into the text field
+
+### Issue 2
+
+  * Github issue number: N/A
+  * Fixed: 1.0.4
+
+This issue fixes wrong consumption of modifier key on some keyboards.

README.md

@@ -74,13 +74,19 @@ it is merged into `master`, creating a new release, which is tagged and signed.
 Merging into master is always done by
 
 ```
-git merge --no-ff development
-git tag -u keyid version
-git push origin master
+git checkout development
+git pull origin development
+git checkout master
+git merge --squash development
+git tag -u keyid version HEAD
+git tag -v version
+git push --tags origin master
 ```
 
 and a log message roughly describing the features is added in the commit.
 
+In the past, our git history did not always reflect this scheme.
+
 ### Releases
 
 Release checklist

meson.build

@@ -1,5 +1,5 @@
 project('cagebreak', 'c',
-  version: '1.0.3',
+  version: '1.0.4',
   license: 'MIT',
   default_options: [
     'c_std=c11',

seat.c

@@ -338,7 +338,7 @@ handle_key_event(struct cg_keyboard_group *group, struct cg_seat *seat,
 			xkb_mod_mask_t consumed_modifiers =
 			    xkb_state_key_get_consumed_mods2(device->keyboard->xkb_state,
 			                                     keycode,
-			                                     XKB_CONSUMED_MODE_XKB);
+			                                     XKB_CONSUMED_MODE_GTK);
 			if(handle_command_key_bindings(seat->server, syms[i],
 			                               modifiers & ~consumed_modifiers,
 			                               seat->mode, group)) {