← Back to branch summary

~ubuntu-branches/ubuntu/saucy/xkeyboard-config/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/114_shift_f10.patch

  • Committer: Package Import Robot
  • Author(s): Bryce Harrington
  • Date: 2012-09-24 15:19:25 UTC
  • Revision ID: package-import@ubuntu.com-20120924151925-yg6u61xz7snfh7aj
Tags: 2.5-1ubuntu7
https://launchpad.net/bugs/937822
Add patch 114_shift_f10.patch.  Don't let Ctrl+Alt consume Shift, else
it causes Shift-F10 to be treated as F10.  This can result in popup
menus opening when they shouldn't.
(LP: #937822)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/114_shift_f10.patch
 
1
commit a4f62448819764f6f27ebcb86115734d0d57ea8d
 
2
Author: Sergey V. Udaltsov <svu@gnome.org>
 
3
Date:   Sun Sep 2 08:57:52 2012 +0100
 
4
 
 
5
    Fixed Shift-F10 behaviour
 
6
    
 
7
    Preserving shift is essential for many applications
 
8
    https://bugs.freedesktop.org/show_bug.cgi?id=45008
 
9
 
 
10
diff --git a/types/pc b/types/pc
 
11
index 01a5634..daebe74 100644
 
12
--- a/types/pc
 
13
+++ b/types/pc
 
14
@@ -59,17 +59,19 @@ partial default xkb_types "default" {
 
15
     };
 
16
 
 
17
     type "CTRL+ALT" {
 
18
-       modifiers = Control+Alt+Shift+LevelThree;
 
19
+        modifiers = Control+Alt+Shift+LevelThree;
 
20
         map[None] = Level1;
 
21
         map[Shift] = Level2;
 
22
         map[LevelThree] = Level3;
 
23
         map[Shift+LevelThree] = Level4;
 
24
-       map[Control+Alt] = Level5;
 
25
+        map[Control+Alt] = Level5;
 
26
+        preserve[Shift] = Shift;
 
27
+        preserve[Shift+LevelThree] = Shift;
 
28
         level_name[Level1] = "Base";
 
29
         level_name[Level2] = "Shift";
 
30
         level_name[Level3] = "Alt Base";
 
31
         level_name[Level4] = "Shift Alt";
 
32
-       level_name[Level5] = "Ctrl+Alt";
 
33
+        level_name[Level5] = "Ctrl+Alt";
 
34
     };
 
35
 
 
36
    // Local eight level