summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-07-17 21:03:47 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2013-07-17 21:03:59 -0400
commit1c569c2d0e651215d2a468fd80a449588a4743ca (patch)
treec85716b8d65bd1a15dce2598b5e3fd0da24ee841 /src/core
parente3855c77afc7e84608749c0b81b5c56ca94329bf (diff)
downloadmutter-1c569c2d0e651215d2a468fd80a449588a4743ca.tar.gz
Remove application-based preference
It's hardcoded to FALSE.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/display.c19
-rw-r--r--src/core/prefs.c19
2 files changed, 1 insertions, 37 deletions
diff --git a/src/core/display.c b/src/core/display.c
index bdb74be74..e78085c14 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2494,30 +2494,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 = XIAsyncDevice; /* eat focus click */
- else
- mode = XIReplayDevice; /* give event back */
meta_verbose ("Allowing events mode %s time %u\n",
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
(unsigned int)device_event->time);
XIAllowEvents (display->xdisplay, device_event->deviceid,
- mode, device_event->time);
+ XIReplayDevice, device_event->time);
}
if (begin_move && window->has_move_func)
diff --git a/src/core/prefs.c b/src/core/prefs.c
index b096d4563..f2bc7f22d 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -89,7 +89,6 @@ static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_
static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
static gboolean dynamic_workspaces = FALSE;
-static gboolean application_based = FALSE;
static gboolean disable_workarounds = FALSE;
static gboolean auto_raise = FALSE;
static gboolean auto_raise_delay = 500;
@@ -299,13 +298,6 @@ static MetaBoolPreference preferences_bool[] =
&dynamic_workspaces,
},
{
- { "application-based",
- SCHEMA_GENERAL,
- META_PREF_APPLICATION_BASED,
- },
- NULL, /* feature is known but disabled */
- },
- {
{ "disable-workarounds",
SCHEMA_GENERAL,
META_PREF_DISABLE_WORKAROUNDS,
@@ -1724,14 +1716,6 @@ meta_prefs_get_dynamic_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;
@@ -1768,9 +1752,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";