applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow a window manager to inherit keybindings from another window manager

Browse source 
Mutter shares most (currently all) its keybindings with Metacity, and uses
the same /apps/metacity GConf keys. For 2.28, the schemas stay in Metacity;
the eventual plan is to have a gnome-wm-data package.

This patch allows a window manager to put a _GNOME_WM_KEYBINDINGS property
on its _NET_SUPPORTING_WM_CHECK window to provide a comma separated list of
window manager names to use for keybinding lookup instead of _NET_WM_NAME.

http://bugzilla.gnome.org/show_bug.cgi?id=594066
This commit is contained in:
Owen W. Taylor 2009-09-03 14:36:12 -04:00
parent 1fce26d7e2
commit a01e8daa6d
3 changed files with 79 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
capplets/common/wm-common.c
View file

@ -15,10 +15,10 @@ typedef struct _WMCallbackData
/* Our WM Window */
static Window wm_window = None;
char*
wm_common_get_current_window_manager (void)
static char *
wm_common_get_window_manager_property (Atom atom)
{
Atom utf8_string, atom, type;
Atom utf8_string, type;
int result;
char *retval;
int format;
@ -30,7 +30,6 @@ wm_common_get_current_window_manager (void)
return g_strdup (WM_COMMON_UNKNOWN);
utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
gdk_error_trap_push ();
@ -60,6 +59,49 @@ wm_common_get_current_window_manager (void)
return retval;
}
char*
wm_common_get_current_window_manager (void)
{
Atom atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
char *result;
result = wm_common_get_window_manager_property (atom);
if (result)
return result;
else
return g_strdup (WM_COMMON_UNKNOWN);
}
char**
wm_common_get_current_keybindings (void)
{
Atom keybindings_atom = XInternAtom (GDK_DISPLAY (), "_GNOME_WM_KEYBINDINGS", False);
char *keybindings = wm_common_get_window_manager_property (keybindings_atom);
char **results;
if (keybindings)
{
char **p;
results = g_strsplit(keybindings, ",", -1);
for (p = results; *p; p++)
g_strstrip (*p);
g_free (keybindings);
}
else
{
Atom wm_atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
char *wm_name = wm_common_get_window_manager_property (wm_atom);
char *to_copy[] = { NULL, NULL };
to_copy[0] = wm_name;
results = g_strdupv (to_copy);
g_free (wm_name);
}
return results;
}
static void
update_wm_window (void)
{