[mutter] keybindings: Remove #if 0'd code
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] keybindings: Remove #if 0'd code
- Date: Wed, 23 Nov 2016 17:58:25 +0000 (UTC)
commit 024999337798f15861b6e485ba3c3ba93f078568
Author: Rui Matos <tiagomatos gmail com>
Date: Mon Nov 21 16:41:35 2016 +0100
keybindings: Remove #if 0'd code
There's no reason to keep this ~15 year old piece of code around as
well as the preference handling that would only make sense if this
hunk was actually enabled.
https://bugzilla.gnome.org/show_bug.cgi?id=746642
src/core/display.c | 17 +----------------
src/core/keybindings.c | 16 ----------------
2 files changed, 1 insertions(+), 32 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 7ae3a28..d8f95df 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2719,22 +2719,7 @@ prefs_changed_callback (MetaPreference pref,
{
MetaDisplay *display = data;
- if (pref == META_PREF_FOCUS_MODE)
- {
- GSList *windows, *l;
- windows = meta_display_list_windows (display, META_LIST_DEFAULT);
-
- for (l = windows; l; l = l->next)
- {
- MetaWindow *w = l->data;
- meta_display_ungrab_focus_window_button (display, w);
- if (w->type != META_WINDOW_DOCK)
- meta_display_grab_focus_window_button (display, w);
- }
-
- g_slist_free (windows);
- }
- else if (pref == META_PREF_AUDIBLE_BELL)
+ if (pref == META_PREF_AUDIBLE_BELL)
{
meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
}
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 8d36873..4821c09 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1041,7 +1041,6 @@ update_window_grab_modifiers (MetaKeyBindingManager *keys)
keys->window_grab_modifiers = mods;
}
-/* Grab buttons we only grab while unfocused in click-to-focus mode */
void
meta_display_grab_focus_window_button (MetaDisplay *display,
MetaWindow *window)
@@ -1051,21 +1050,6 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
/* Grab button 1 for activating unfocused windows */
meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc);
-#if 0
- /* FIXME:115072 */
- /* Don't grab at all unless in click to focus mode. In click to
- * focus, we may sometimes be clever about intercepting and eating
- * the focus click. But in mouse focus, we never do that since the
- * focus window may not be raised, and who wants to think about
- * mouse focus anyway.
- */
- if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK)
- {
- meta_verbose (" (well, not grabbing since not in click to focus mode)\n");
- return;
- }
-#endif
-
if (window->have_focus_click_grab)
{
meta_verbose (" (well, not grabbing since we already have the grab)\n");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]