Attachment #111038 for bug #217044

View | Details | Raw Unified | Return to bug 217044
Collapse All | Expand All

Lines 43-48 Link Here

(-)./src/keybindings.c (-10 / +76 lines)
43		43
44	static gboolean all_bindings_disabled = FALSE;	44	static gboolean all_bindings_disabled = FALSE;
45		45
		46	/* This keycode, if set, will activate the main menu when released */
		47	unsigned int main_menu_keycode = FALSE;
		48
46	typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,	49	typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
47	MetaScreen *screen,	50	MetaScreen *screen,
48	MetaWindow *window,	51	MetaWindow *window,
Lines 195-200 Link Here
195	XEvent *event,	198	XEvent *event,
196	MetaKeyBinding *binding);	199	MetaKeyBinding *binding);
197		200
		201	static void handle_panel_action (MetaDisplay *display,
		202	MetaScreen *screen,
		203	MetaWindow *window,
		204	XEvent *event,
		205	MetaKeyBindingAction action);
		206
198	/* debug */	207	/* debug */
199	static gboolean process_mouse_move_resize_grab (MetaDisplay *display,	208	static gboolean process_mouse_move_resize_grab (MetaDisplay *display,
200	MetaScreen *screen,	209	MetaScreen *screen,
Lines 881-886 Link Here
881	switch (pref)	890	switch (pref)
882	{	891	{
883	case META_PREF_SCREEN_KEYBINDINGS:	892	case META_PREF_SCREEN_KEYBINDINGS:
		893	case META_PREF_ENABLE_WINDOWS_KEYS:
884	rebuild_screen_binding_table (display);	894	rebuild_screen_binding_table (display);
885	reload_keycodes (display);	895	reload_keycodes (display);
886	reload_modifiers (display);	896	reload_modifiers (display);
Lines 1107-1112 Link Here
1107	meta_error_trap_pop (display, FALSE);	1117	meta_error_trap_pop (display, FALSE);
1108	}	1118	}
1109		1119
		1120	/* Hardcoded keycodes for the Windows flag keys */
		1121	#define WINDOWS_KEY_1_KEYCODE 115
		1122	#define WINDOWS_KEY_2_KEYCODE 116
		1123
		1124	static void
		1125	meta_screen_grab_ungrab_windows_keys (MetaScreen *screen)
		1126	{
		1127	gboolean grab = meta_prefs_get_enable_windows_keys ();
		1128
		1129	meta_error_trap_push (screen->display);
		1130
		1131	meta_change_keygrab (screen->display, screen->xroot, grab, 0, WINDOWS_KEY_1_KEYCODE, 0);
		1132	meta_change_keygrab (screen->display, screen->xroot, grab, 0, WINDOWS_KEY_2_KEYCODE, 0);
		1133
		1134	meta_error_trap_pop (screen->display, FALSE);
		1135	}
		1136
1110	void	1137	void
1111	meta_screen_grab_keys (MetaScreen *screen)	1138	meta_screen_grab_keys (MetaScreen *screen)
1112	{	1139	{
Lines 1116-1121 Link Here
1116	if (screen->keys_grabbed)	1143	if (screen->keys_grabbed)
1117	return;	1144	return;
1118		1145
		1146	meta_screen_grab_ungrab_windows_keys (screen);
		1147
1119	grab_keys (screen->display->screen_bindings,	1148	grab_keys (screen->display->screen_bindings,
1120	screen->display->n_screen_bindings,	1149	screen->display->n_screen_bindings,
1121	screen->display, screen->xroot);	1150	screen->display, screen->xroot);
Lines 1539-1545 Link Here
1539	/* we used to have release-based bindings but no longer. */	1568	/* we used to have release-based bindings but no longer. */
1540	if (event->type == KeyRelease)	1569	if (event->type == KeyRelease)
1541	return;	1570	return;
1542		1571
1543	i = 0;	1572	i = 0;
1544	while (i < n_bindings)	1573	while (i < n_bindings)
1545	{	1574	{
Lines 1636-1641 Link Here
1636	all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed;	1665	all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed;
1637	if (!all_keys_grabbed)	1666	if (!all_keys_grabbed)
1638	{	1667	{
		1668	/* Handle the special action for the main menu. This binding provides
		1669	for a one-touch main menu while also leaving the key available for
		1670	use as a modifier */
		1671	if (event->type == KeyPress
		1672	&& meta_prefs_get_enable_windows_keys ()
		1673	&& (event->xkey.state & ~display->ignored_modifier_mask) == 0
		1674	&& (event->xkey.keycode == WINDOWS_KEY_1_KEYCODE
		1675	\|\| event->xkey.keycode == WINDOWS_KEY_2_KEYCODE))
		1676
		1677	/* Record this key depressed in case main menu wanted */
		1678	main_menu_keycode = event->xkey.keycode;
		1679
		1680	else if (main_menu_keycode == FALSE)
		1681	/* No pending main menu event, just continue */;
		1682
		1683	else if (event->xkey.keycode != main_menu_keycode)
		1684	/* An event, other than main_menu_keycode release, took place,
		1685	so cancel the pending menu event */
		1686	main_menu_keycode = FALSE;
		1687
		1688	else if (event->xkey.keycode == main_menu_keycode)
		1689	{
		1690	main_menu_keycode = FALSE;
		1691	handle_panel_action (display,screen, NULL, event,
		1692	META_KEYBINDING_ACTION_PANEL_MAIN_MENU);
		1693	}
		1694
1639	/* Do the normal keybindings */	1695	/* Do the normal keybindings */
1640	process_event (display->screen_bindings,	1696	process_event (display->screen_bindings,
1641	display->n_screen_bindings,	1697	display->n_screen_bindings,
Lines 1649-1655 Link Here
1649	display, screen, window, event, keysym);	1705	display, screen, window, event, keysym);
1650		1706
1651	return;	1707	return;
1652	}	1708	}
1653		1709
1654	if (display->grab_op == META_GRAB_OP_NONE)	1710	if (display->grab_op == META_GRAB_OP_NONE)
1655	return;	1711	return;
Lines 2955-2972 Link Here
2955	}	3011	}
2956		3012
2957	static void	3013	static void
2958	handle_panel_keybinding (MetaDisplay *display,	3014	handle_panel_action (MetaDisplay *display,
2959	MetaScreen *screen,	3015	MetaScreen *screen,
2960	MetaWindow *window,	3016	MetaWindow *window,
2961	XEvent *event,	3017	XEvent *event,
2962	MetaKeyBinding *binding)	3018	MetaKeyBindingAction action)
2963	{	3019	{
2964	MetaKeyBindingAction action;
2965	Atom action_atom;	3020	Atom action_atom;
2966	XClientMessageEvent ev;	3021	XClientMessageEvent ev;
2967		3022
2968	action = GPOINTER_TO_INT (binding->handler->data);
2969
2970	action_atom = None;	3023	action_atom = None;
2971	switch (action)	3024	switch (action)
2972	{	3025	{
Lines 3005-3010 Link Here
3005	}	3058	}
3006		3059
3007	static void	3060	static void
		3061	handle_panel_keybinding (MetaDisplay *display,
		3062	MetaScreen *screen,
		3063	MetaWindow *window,
		3064	XEvent *event,
		3065	MetaKeyBinding *binding)
		3066	{
		3067	MetaKeyBindingAction action;
		3068
		3069	action = GPOINTER_TO_INT (binding->handler->data);
		3070	handle_panel_action (display, screen, window, event, action);
		3071	}
		3072
		3073	static void
3008	handle_activate_menu (MetaDisplay *display,	3074	handle_activate_menu (MetaDisplay *display,
3009	MetaScreen *screen,	3075	MetaScreen *screen,
3010	MetaWindow *event_window,	3076	MetaWindow *event_window,




      <applyto>/apps/metacity/general/audible_bell</applyto>      
      <owner>metacity</owner>
      <type>bool</type>
      <default>false</default>
      <locale name="C">
        <short>System Bell is Audible</short>
        <long>

      </locale>
    </schema>


    <schema>
      <key>/schemas/apps/metacity/general/enable_windows_keys</key>
      <applyto>/apps/metacity/general/enable_windows_keys</applyto>
      <owner>metacity</owner>
      <type>bool</type>
      <default>true</default>
      <locale name="C">
         <short>If true, enables the Windows flag keys to show the panel's main menu</short>
         <long>
	   If true, then pressing the Windows flag keys will cause the panel's main
	   menu to appear.
         </long>
      </locale>
    </schema>

    <!-- Window Keybindings -->

    <schema>




#define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout"
#define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources"
#define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility"
#define KEY_ENABLE_WINDOWS_KEYS "/apps/metacity/general/enable_windows_keys"

#define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_"


static gboolean bell_is_audible = TRUE;
static gboolean reduced_resources = FALSE;
static gboolean gnome_accessibility = FALSE;
static gboolean enable_windows_keys = TRUE;
static char *cursor_theme = NULL;
static int   cursor_size = 24;
static gboolean compositing_manager = FALSE;

                                           const char  *value);
static gboolean update_reduced_resources  (gboolean     value);
static gboolean update_gnome_accessibility  (gboolean     value);
static gboolean update_enable_windows_keys (gboolean    value);
static gboolean update_cursor_theme       (const char *value);
static gboolean update_cursor_size        (int size);
static gboolean update_compositing_manager (gboolean	value);

  if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val))
    update_gnome_accessibility (bool_val);

  bool_val = gconf_client_get_bool (default_client, KEY_ENABLE_WINDOWS_KEYS,
				    &err);
  cleanup_error (&err);
  update_enable_windows_keys (bool_val);

  str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME,
                                     &err);
  cleanup_error (&err);

      if (update_compositing_manager (b))
        queue_changed (META_PREF_COMPOSITING_MANAGER);
    }
  else if (strcmp (key, KEY_ENABLE_WINDOWS_KEYS) == 0)
    {
      gboolean b;

      if (value && value->type != GCONF_VALUE_BOOL)
	{
          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
                        KEY_ENABLE_WINDOWS_KEYS);
          goto out;
	}

      b = value ? gconf_value_get_bool (value) : enable_windows_keys;

      if (update_enable_windows_keys (b))
        queue_changed (META_PREF_ENABLE_WINDOWS_KEYS);
    }
  else
    {
      meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",

  
  return old != disable_workarounds;
}

static gboolean
update_enable_windows_keys (gboolean value)
{
  gboolean old = enable_windows_keys;

  enable_windows_keys = value;

  return old != enable_windows_keys;
}
#endif /* HAVE_GCONF */

gboolean

}

gboolean
meta_prefs_get_enable_windows_keys (void)
{
  return enable_windows_keys;
}

gboolean
meta_prefs_get_gnome_accessibility ()
{
  return gnome_accessibility;

Lines 52-57 Link Here

(-)./src/prefs.h (+2 lines)
52	META_PREF_VISUAL_BELL_TYPE,	52	META_PREF_VISUAL_BELL_TYPE,
53	META_PREF_REDUCED_RESOURCES,	53	META_PREF_REDUCED_RESOURCES,
54	META_PREF_GNOME_ACCESSIBILITY,	54	META_PREF_GNOME_ACCESSIBILITY,
		55	META_PREF_ENABLE_WINDOWS_KEYS,
55	META_PREF_CURSOR_THEME,	56	META_PREF_CURSOR_THEME,
56	META_PREF_CURSOR_SIZE,	57	META_PREF_CURSOR_SIZE,
57	META_PREF_COMPOSITING_MANAGER	58	META_PREF_COMPOSITING_MANAGER
Lines 82-87 Link Here
82	int meta_prefs_get_auto_raise_delay (void);	83	int meta_prefs_get_auto_raise_delay (void);
83	gboolean meta_prefs_get_reduced_resources (void);	84	gboolean meta_prefs_get_reduced_resources (void);
84	gboolean meta_prefs_get_gnome_accessibility (void);	85	gboolean meta_prefs_get_gnome_accessibility (void);
		86	gboolean meta_prefs_get_enable_windows_keys (void);
85		87
86	const char* meta_prefs_get_command (int i);	88	const char* meta_prefs_get_command (int i);
87		89

Return to bug 217044

Lines 241-247 Link Here

(-)./src/metacity.schemas.in (-1 / +17 lines)
241	<applyto>/apps/metacity/general/audible_bell</applyto>	241	<applyto>/apps/metacity/general/audible_bell</applyto>
242	<owner>metacity</owner>	242	<owner>metacity</owner>
243	<type>bool</type>	243	<type>bool</type>
244	<default>true</default>	244	<default>false</default>
245	<locale name="C">	245	<locale name="C">
246	<short>System Bell is Audible</short>	246	<short>System Bell is Audible</short>
247	<long>	247	<long>
Lines 335-340 Link Here
335	</locale>	335	</locale>
336	</schema>	336	</schema>
337		337
		338
		339	<schema>
		340	<key>/schemas/apps/metacity/general/enable_windows_keys</key>
		341	<applyto>/apps/metacity/general/enable_windows_keys</applyto>
		342	<owner>metacity</owner>
		343	<type>bool</type>
		344	<default>true</default>
		345	<locale name="C">
		346	<short>If true, enables the Windows flag keys to show the panel's main menu</short>
		347	<long>
		348	If true, then pressing the Windows flag keys will cause the panel's main
		349	menu to appear.
		350	</long>
		351	</locale>
		352	</schema>
		353
338	<!-- Window Keybindings -->	354	<!-- Window Keybindings -->
339		355
340	<schema>	356	<schema>

Lines 56-61 Link Here

(-)./src/prefs.c (+40 lines)
56	#define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout"	56	#define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout"
57	#define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources"	57	#define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources"
58	#define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility"	58	#define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility"
		59	#define KEY_ENABLE_WINDOWS_KEYS "/apps/metacity/general/enable_windows_keys"
59		60
60	#define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_"	61	#define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_"
61		62
Lines 99-104 Link Here
99	static gboolean bell_is_audible = TRUE;	100	static gboolean bell_is_audible = TRUE;
100	static gboolean reduced_resources = FALSE;	101	static gboolean reduced_resources = FALSE;
101	static gboolean gnome_accessibility = FALSE;	102	static gboolean gnome_accessibility = FALSE;
		103	static gboolean enable_windows_keys = TRUE;
102	static char *cursor_theme = NULL;	104	static char *cursor_theme = NULL;
103	static int cursor_size = 24;	105	static int cursor_size = 24;
104	static gboolean compositing_manager = FALSE;	106	static gboolean compositing_manager = FALSE;
Lines 161-166 Link Here
161	const char *value);	163	const char *value);
162	static gboolean update_reduced_resources (gboolean value);	164	static gboolean update_reduced_resources (gboolean value);
163	static gboolean update_gnome_accessibility (gboolean value);	165	static gboolean update_gnome_accessibility (gboolean value);
		166	static gboolean update_enable_windows_keys (gboolean value);
164	static gboolean update_cursor_theme (const char *value);	167	static gboolean update_cursor_theme (const char *value);
165	static gboolean update_cursor_size (int size);	168	static gboolean update_cursor_size (int size);
166	static gboolean update_compositing_manager (gboolean value);	169	static gboolean update_compositing_manager (gboolean value);
Lines 496-501 Link Here
496	if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val))	499	if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val))
497	update_gnome_accessibility (bool_val);	500	update_gnome_accessibility (bool_val);
498		501
		502	bool_val = gconf_client_get_bool (default_client, KEY_ENABLE_WINDOWS_KEYS,
		503	&err);
		504	cleanup_error (&err);
		505	update_enable_windows_keys (bool_val);
		506
499	str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME,	507	str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME,
500	&err);	508	&err);
501	cleanup_error (&err);	509	cleanup_error (&err);
Lines 1037-1042 Link Here
1037	if (update_compositing_manager (b))	1045	if (update_compositing_manager (b))
1038	queue_changed (META_PREF_COMPOSITING_MANAGER);	1046	queue_changed (META_PREF_COMPOSITING_MANAGER);
1039	}	1047	}
		1048	else if (strcmp (key, KEY_ENABLE_WINDOWS_KEYS) == 0)
		1049	{
		1050	gboolean b;
		1051
		1052	if (value && value->type != GCONF_VALUE_BOOL)
		1053	{
		1054	meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
		1055	KEY_ENABLE_WINDOWS_KEYS);
		1056	goto out;
		1057	}
		1058
		1059	b = value ? gconf_value_get_bool (value) : enable_windows_keys;
		1060
		1061	if (update_enable_windows_keys (b))
		1062	queue_changed (META_PREF_ENABLE_WINDOWS_KEYS);
		1063	}
1040	else	1064	else
1041	{	1065	{
1042	meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",	1066	meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
Lines 1577-1582 Link Here
1577		1601
1578	return old != disable_workarounds;	1602	return old != disable_workarounds;
1579	}	1603	}
		1604
		1605	static gboolean
		1606	update_enable_windows_keys (gboolean value)
		1607	{
		1608	gboolean old = enable_windows_keys;
		1609
		1610	enable_windows_keys = value;
		1611
		1612	return old != enable_windows_keys;
		1613	}
1580	#endif /* HAVE_GCONF */	1614	#endif /* HAVE_GCONF */
1581		1615
1582	gboolean	1616	gboolean
Lines 2846-2851 Link Here
2846	}	2880	}
2847		2881
2848	gboolean	2882	gboolean
		2883	meta_prefs_get_enable_windows_keys (void)
		2884	{
		2885	return enable_windows_keys;
		2886	}
		2887
		2888	gboolean
2849	meta_prefs_get_gnome_accessibility ()	2889	meta_prefs_get_gnome_accessibility ()
2850	{	2890	{
2851	return gnome_accessibility;	2891	return gnome_accessibility;