diff options
| -rw-r--r-- | src/core/display.c | 21 | ||||
| -rw-r--r-- | src/core/prefs.c | 20 | ||||
| -rw-r--r-- | src/include/prefs.h | 2 |
3 files changed, 2 insertions, 41 deletions
diff --git a/src/core/display.c b/src/core/display.c index b8a68f99..368a1650 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -1703,30 +1703,13 @@ event_callback (XEvent *event, /* This is from our synchronous grab since * it has no modifiers and was on the client window */ - int mode; - - /* When clicking a different app in click-to-focus - * in application-based mode, and the different - * app is not a dock or desktop, eat the focus click. - */ - if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK && - meta_prefs_get_application_based () && - !window->has_focus && - window->type != META_WINDOW_DOCK && - window->type != META_WINDOW_DESKTOP && - (display->focus_window == NULL || - !meta_window_same_application (window, - display->focus_window))) - mode = AsyncPointer; /* eat focus click */ - else - mode = ReplayPointer; /* give event back */ meta_verbose ("Allowing events mode %s time %u\n", - mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer", + "ReplayPointer", (unsigned int)event->xbutton.time); XAllowEvents (display->xdisplay, - mode, event->xbutton.time); + ReplayPointer, event->xbutton.time); } if (begin_move && window->has_move_func) diff --git a/src/core/prefs.c b/src/core/prefs.c index 133f4243..1e197abe 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -76,7 +76,6 @@ static int num_workspaces = 4; static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE; static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER; static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU; -static gboolean application_based = FALSE; static gboolean disable_workarounds = FALSE; static gboolean auto_raise = FALSE; static gboolean auto_raise_delay = 500; @@ -276,14 +275,6 @@ static MetaBoolPreference preferences_bool[] = TRUE, }, { - { "application-based", - SCHEMA_GENERAL, - META_PREF_APPLICATION_BASED, - }, - NULL, /* feature is known but disabled */ - FALSE, - }, - { { "disable-workarounds", SCHEMA_GENERAL, META_PREF_DISABLE_WORKAROUNDS, @@ -1330,14 +1321,6 @@ meta_prefs_get_num_workspaces (void) } gboolean -meta_prefs_get_application_based (void) -{ - return FALSE; /* For now, we never want this to do anything */ - - return application_based; -} - -gboolean meta_prefs_get_disable_workarounds (void) { return disable_workarounds; @@ -1374,9 +1357,6 @@ meta_preference_to_string (MetaPreference pref) case META_PREF_NUM_WORKSPACES: return "NUM_WORKSPACES"; - case META_PREF_APPLICATION_BASED: - return "APPLICATION_BASED"; - case META_PREF_KEYBINDINGS: return "KEYBINDINGS"; diff --git a/src/include/prefs.h b/src/include/prefs.h index 621ad5b8..ba57be0a 100644 --- a/src/include/prefs.h +++ b/src/include/prefs.h @@ -44,7 +44,6 @@ typedef enum META_PREF_THEME, META_PREF_TITLEBAR_FONT, META_PREF_NUM_WORKSPACES, - META_PREF_APPLICATION_BASED, META_PREF_KEYBINDINGS, META_PREF_DISABLE_WORKAROUNDS, META_PREF_BUTTON_LAYOUT, @@ -95,7 +94,6 @@ const char* meta_prefs_get_theme (void); /* returns NULL if GTK default should be used */ const PangoFontDescription* meta_prefs_get_titlebar_font (void); int meta_prefs_get_num_workspaces (void); -gboolean meta_prefs_get_application_based (void); gboolean meta_prefs_get_disable_workarounds (void); gboolean meta_prefs_get_auto_raise (void); int meta_prefs_get_auto_raise_delay (void); |