Browse Source

Merge tag 'upstream/2.8.3'

Upstream version 2.8.3
jessie-backports
Fabio Fantoni 7 years ago
parent
commit
1e6e0dfd41
  1. 2
      configure.ac
  2. 2
      src/compositor/meta-window-actor.c
  3. 2
      src/core/display-private.h
  4. 4
      src/core/display.c
  5. 46
      src/core/keybindings.c
  6. 8
      src/core/window.c

2
configure.ac

@ -2,7 +2,7 @@ AC_PREREQ(2.50)
m4_define([muffin_major_version], [2])
m4_define([muffin_minor_version], [8])
m4_define([muffin_micro_version], [2])
m4_define([muffin_micro_version], [3])
m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])

2
src/compositor/meta-window-actor.c

@ -963,7 +963,7 @@ const char *meta_window_actor_get_description (MetaWindowActor *self)
* This function is deprecated and should not be used in newly written code;
* meta_window_get_workspace() instead.
*
* Return value: (transfer none): index of workspace on which this window is
* Return value: index of workspace on which this window is
* located.
*/
gint

2
src/core/display-private.h

@ -224,6 +224,8 @@ struct _MetaDisplay
unsigned int hyper_mask;
unsigned int super_mask;
unsigned int meta_mask;
guint rebuild_keybinding_idle_id;
/* Monitor cache */
unsigned int monitor_cache_invalidated : 1;

4
src/core/display.c

@ -507,6 +507,8 @@ meta_display_open (void)
the_display->allow_terminal_deactivation = TRUE; /* Only relevant for when a
terminal has the focus */
the_display->rebuild_keybinding_idle_id = 0;
/* FIXME copy the checks from GDK probably */
the_display->static_gravity_works = g_getenv ("MUFFIN_USE_STATIC_GRAVITY") != NULL;
@ -5595,7 +5597,7 @@ Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
* _NET_SUPPORTING_WM_CHECK mechanism of EWMH). For use by plugins that wish
* to attach additional custom properties to this window.
*
* Return value: (transfer none): xid of the leader window.
* Return value: xid of the leader window.
**/
Window
meta_display_get_leader_window (MetaDisplay *display)

46
src/core/keybindings.c

@ -843,6 +843,33 @@ meta_display_process_mapping_event (MetaDisplay *display,
}
}
static gboolean
rebuild_keybindings_at_idle (MetaDisplay *display)
{
display->rebuild_keybinding_idle_id = 0;
rebuild_key_binding_table (display);
reload_keycodes (display);
reload_modifiers (display);
regrab_key_bindings (display);
return FALSE;
}
static void
queue_rebuild_keybindings (MetaDisplay *display)
{
if (display->rebuild_keybinding_idle_id > 0)
{
g_source_remove (display->rebuild_keybinding_idle_id);
display->rebuild_keybinding_idle_id = 0;
}
display->rebuild_keybinding_idle_id = g_idle_add_full (G_PRIORITY_LOW,
(GSourceFunc) rebuild_keybindings_at_idle,
display, NULL);
}
static void
bindings_changed_callback (MetaPreference pref,
void *data)
@ -854,23 +881,26 @@ bindings_changed_callback (MetaPreference pref,
switch (pref)
{
case META_PREF_KEYBINDINGS:
rebuild_key_binding_table (display);
reload_keycodes (display);
reload_modifiers (display);
regrab_key_bindings (display);
queue_rebuild_keybindings (display);
break;
default:
break;
}
}
/**
* meta_display_rebuild_keybindings:
* @display: the #MetaDisplay
*
* Rebuild all keybindings (typically done after adding, removing, or changing
* one or more keybindings)
*
*/
void
meta_display_rebuild_keybindings (MetaDisplay *display)
{
rebuild_key_binding_table (display);
reload_keycodes (display);
reload_modifiers (display);
regrab_key_bindings (display);
queue_rebuild_keybindings (display);
}
LOCAL_SYMBOL void

8
src/core/window.c

@ -10709,7 +10709,7 @@ find_ancestor_func (MetaWindow *window,
* so by traversing the @transient's ancestors until it either locates @window
* or reaches an ancestor that is not transient.
*
* Return Value: (transfer none): %TRUE if window is an ancestor of transient.
* Return Value: %TRUE if window is an ancestor of transient.
*/
gboolean
meta_window_is_ancestor_of_transient (MetaWindow *window,
@ -11549,7 +11549,7 @@ meta_window_get_transient_for (MetaWindow *window)
* parents. A typical usage of this hint is for a dialog that wants to stay
* above its associated window.
*
* Return value: (transfer none): the window this window is transient for, or
* Return value: the window this window is transient for, or
* None if the WM_TRANSIENT_FOR hint is unset.
*/
Window
@ -11565,7 +11565,7 @@ meta_window_get_transient_for_as_xid (MetaWindow *window)
* Returns pid of the process that created this window, if known (obtained from
* the _NET_WM_PID property).
*
* Return value: (transfer none): the pid, or -1 if not known.
* Return value: the pid, or -1 if not known.
*/
int
meta_window_get_pid (MetaWindow *window)
@ -11618,7 +11618,7 @@ meta_window_is_remote (MetaWindow *window)
* Queries whether the window is in a modal state as described by the
* _NET_WM_STATE protocol.
*
* Return value: (transfer none): TRUE if the window is in modal state.
* Return value: TRUE if the window is in modal state.
*/
gboolean
meta_window_is_modal (MetaWindow *window)

Loading…
Cancel
Save