Sakura

Merge lp:~ikenfin/sakura/bug_1399487 into lp:~dabisu/sakura/sakura

  1. bug_1399487
  2. Merge into sakura
Proposed by Tominov Sergey
Status: Merged
Approved by: David Gómez
Approved revision: 538
Merge reported by: David Gómez
Merged at revision: not available
Proposed branch: lp:~ikenfin/sakura/bug_1399487
Merge into: lp:~dabisu/sakura/sakura
Diff against target: 25 lines (+6/-4)
1 file modified
src/sakura.c (+6/-4)
To merge this branch: bzr merge lp:~ikenfin/sakura/bug_1399487
Reviewer Review Type Date Requested Status
David Gómez Approve
Review via email: mp+279230@code.launchpad.net

Description of the change

Case insensitivity for keybindings
Fix for (https://bugs.launchpad.net/sakura/+bug/1399487), and, possibly for (https://bugs.launchpad.net/sakura/+bug/1521723)

To post a comment you must log in.
Revision history for this message
David Gómez (dabisu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sakura.c'
2--- src/sakura.c 2015-12-01 21:01:08 +0000
3+++ src/sakura.c 2015-12-02 07:12:44 +0000
4@@ -463,9 +463,10 @@
5
6 /* Check if Caps lock is enabled. If it is, change keyval to make keybindings work with
7 both lowercase and uppercase letters */
8- if (gdk_keymap_get_caps_lock_state(gdk_keymap_get_default())) {
9- keyval = gdk_keyval_to_upper(keyval);
10- }
11+ /*if (gdk_keymap_get_caps_lock_state(gdk_keymap_get_default())) {*/
12+ /* make pressed key uppercase by default */
13+ keyval = gdk_keyval_to_upper(keyval);
14+ /*}*/
15
16 /* add_tab_accelerator + T or del_tab_accelerator + W pressed */
17 if ( (event->state & sakura.add_tab_accelerator)==sakura.add_tab_accelerator &&
18@@ -2982,7 +2983,8 @@
19 retval=g_key_file_get_integer(sakura.cfg, cfg_group, key, NULL);
20 }
21
22- return retval;
23+ /* always use uppercase value as keyval. (https://bugs.launchpad.net/sakura/+bug/1399487), and possibly (https://bugs.launchpad.net/sakura/+bug/1521723)*/
24+ return gdk_keyval_to_upper(retval);
25 }
26
27

Subscribers

People subscribed via source and target branches