patches/metacity-02-shortcut.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 16986 fe96184d74b9
child 21819 9cd5115a9e9a
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15708
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     1
diff -uprN metacity-2.26.0/src/core/schema-bindings.c metacity-2.26.0-new/src/core/schema-bindings.c
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     2
--- metacity-2.26.0/src/core/schema-bindings.c	2009-02-05 09:10:05.000000000 +0800
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     3
+++ metacity-2.26.0-new/src/core/schema-bindings.c	2009-05-04 13:49:09.440307433 +0800
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     4
@@ -87,6 +87,46 @@ single_stanza (gboolean is_window, const
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     5
     g_free (escaped_default_value);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     6
 }
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     7
 
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     8
+static void
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     9
+single_list_stanza (gboolean is_window, const char *name,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    10
+               const char *default_value,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    11
+               gboolean can_reverse,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    12
+               const char *description)
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    13
+{
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    14
+  char *keybinding_type = is_window? "window": "global";
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    15
+  char *escaped_default_value, *escaped_description;
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    16
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    17
+  if (description==NULL)
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    18
+    return; /* it must be undocumented, so it can't go in this table */
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    19
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    20
+  escaped_description = g_markup_escape_text (description, -1);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    21
+  escaped_default_value = default_value==NULL? "disabled":
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    22
+        g_markup_escape_text (default_value, -1);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    23
+  
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    24
+  fprintf (target_file, "    <schema>\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    25
+  fprintf (target_file, "      <key>/schemas/apps/metacity/%s_keybindings/%s_list</key>\n",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    26
+            keybinding_type, name);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    27
+  fprintf (target_file, "      <applyto>/apps/metacity/%s_keybindings/%s_list</applyto>\n",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    28
+            keybinding_type, name);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    29
+  fprintf (target_file, "      <owner>metacity</owner>\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    30
+  fprintf (target_file, "      <type>list</type>\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    31
+  fprintf (target_file, "      <list_type>string</list_type>\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    32
+  fprintf (target_file, "      <default>[%s]</default>\n", escaped_default_value);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    33
+  
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    34
+  fprintf (target_file, "      <locale name=\"C\">\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    35
+  fprintf (target_file, "        <short>%s</short>\n", description);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    36
+  fprintf (target_file, "        <long>%s</long>\n",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    37
+                   can_reverse? about_reversible_keybindings:
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    38
+                   about_keybindings);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    39
+  fprintf (target_file, "      </locale>\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    40
+  fprintf (target_file, "    </schema>\n\n");
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    41
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    42
+  g_free (escaped_description);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    43
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    44
+  if (default_value!=NULL)
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    45
+    g_free (escaped_default_value);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    46
+}
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    47
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    48
 static void produce_bindings ();
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    49
 
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    50
 static void
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    51
@@ -130,6 +170,13 @@ produce_bindings ()
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    52
                stroke, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    53
                flags & BINDING_REVERSES, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    54
                description);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    55
+#define list_keybind(name, handler, param, flags, stroke, description) \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    56
+  single_list_stanza ( \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    57
+               flags & BINDING_PER_WINDOW, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    58
+               #name, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    59
+               stroke, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    60
+               flags & BINDING_REVERSES, \
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    61
+               description);
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    62
 #include "all-keybindings.h"
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    63
 #undef keybind
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    64
     }
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    65
diff -uprN metacity-2.26.0/src/include/all-keybindings.h metacity-2.26.0-new/src/include/all-keybindings.h
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    66
--- metacity-2.26.0/src/include/all-keybindings.h	2009-02-05 09:10:04.000000000 +0800
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    67
+++ metacity-2.26.0-new/src/include/all-keybindings.h	2009-05-04 13:54:10.708519198 +0800
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    68
@@ -68,6 +68,10 @@
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    69
 #error "keybind () must be defined when you include screen-bindings.h"
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    70
 #endif
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    71
 
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    72
+#ifndef list_keybind
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    73
+#define list_keybind keybind
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    74
+#endif
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    75
+
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    76
 /***********************************/
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    77
 
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    78
 #ifndef _BINDINGS_DEFINED_CONSTANTS
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    79
@@ -189,12 +193,20 @@ keybind (cycle_panels_backward,    handl
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    80
      
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    81
 keybind (show_desktop, handle_show_desktop, 0, 0, "<Control><Alt>d",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    82
       _("Hide all normal windows and set focus to the desktop"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    83
+list_keybind (show_desktop, handle_show_desktop, 0, 0, "<Mod4>d",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    84
+      _("Hide all normal windows and set focus to the desktop"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    85
 keybind (panel_main_menu, handle_panel,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    86
        META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0, "<Alt>F1",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    87
       _("Show the panel's main menu"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    88
+list_keybind (panel_main_menu, handle_panel,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    89
+       META_KEYBINDING_ACTION_PANEL_MAIN_MENU, 0, "<Control>Escape",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    90
+      _("Show the panel's main menu"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    91
 keybind (panel_run_dialog, handle_panel,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    92
        META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0, "<Alt>F2",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    93
       _("Show the panel's \"Run Application\" dialog box"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    94
+list_keybind (panel_run_dialog, handle_panel,
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    95
+       META_KEYBINDING_ACTION_PANEL_RUN_DIALOG, 0, "<Mod4>r",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    96
+      _("Show the panel's \"Run Application\" dialog box"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    97
 
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    98
 /* Yes, the param is offset by one.  Historical reasons.  (Maybe worth fixing
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    99
  * at some point.)  The description is NULL here because the stanza is
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   100
@@ -270,6 +282,8 @@ keybind (toggle_shaded, handle_toggle_sh
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   101
         _("Toggle shaded state"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   102
 keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "<Alt>F9",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   103
         _("Minimize window"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   104
+list_keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "F17",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   105
+        _("Minimize window"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   106
 keybind (close, handle_close, 0, BINDING_PER_WINDOW, "<Alt>F4",
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   107
         _("Close window"))
b1bebd509db6 2009-05-04 Wang Xin <[email protected]>
jedy
parents:
diff changeset
   108
 keybind (begin_move, handle_begin_move, 0, BINDING_PER_WINDOW, "<Alt>F7",
15974
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   109
@@ -338,7 +338,7 @@
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   110
          META_MOTION_DOWN, BINDING_PER_WINDOW, "<Control><Shift><Alt>Down",
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   111
         _("Move window one workspace down"))
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   112
 
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   113
-keybind (raise_or_lower, handle_raise_or_lower, 0, BINDING_PER_WINDOW, NULL,
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   114
+keybind (raise_or_lower, handle_raise_or_lower, 0, BINDING_PER_WINDOW, "F15",
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   115
         _("Raise window if it's covered by another window, otherwise lower it"))
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   116
 keybind (raise, handle_raise, 0, BINDING_PER_WINDOW, NULL,
4c2d14b23268 2009-06-30 Wang Xin <[email protected]>
jedy
parents: 15708
diff changeset
   117
         _("Raise window above other windows"))
16986
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   118
@@ -346,7 +360,7 @@ keybind (lower, handle_lower, 0, BINDING
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   119
         _("Lower window below other windows"))
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   120
 
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   121
 keybind (maximize_vertically, handle_maximize_vertically, 0,
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   122
-        BINDING_PER_WINDOW, NULL,
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   123
+        BINDING_PER_WINDOW, "<Shift><Alt>F10",
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   124
         _("Maximize window vertically"))
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   125
 
fe96184d74b9 2009-11-19 Wang Xin <[email protected]>
jedy
parents: 15974
diff changeset
   126
 keybind (maximize_horizontally, handle_maximize_horizontally, 0,