mirror of
https://github.com/brl/mutter.git
synced 2024-11-27 18:40:40 -05:00
Remove application-based preference
It's hardcoded to FALSE.
This commit is contained in:
parent
e3855c77af
commit
1c569c2d0e
@ -409,7 +409,6 @@ meta_prefs_get_theme
|
|||||||
meta_prefs_get_titlebar_font
|
meta_prefs_get_titlebar_font
|
||||||
meta_prefs_get_num_workspaces
|
meta_prefs_get_num_workspaces
|
||||||
meta_prefs_get_dynamic_workspaces
|
meta_prefs_get_dynamic_workspaces
|
||||||
meta_prefs_get_application_based
|
|
||||||
meta_prefs_get_disable_workarounds
|
meta_prefs_get_disable_workarounds
|
||||||
meta_prefs_get_auto_raise
|
meta_prefs_get_auto_raise
|
||||||
meta_prefs_get_auto_raise_delay
|
meta_prefs_get_auto_raise_delay
|
||||||
|
@ -2494,30 +2494,13 @@ event_callback (XEvent *event,
|
|||||||
/* This is from our synchronous grab since
|
/* This is from our synchronous grab since
|
||||||
* it has no modifiers and was on the client window
|
* 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",
|
meta_verbose ("Allowing events mode %s time %u\n",
|
||||||
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
|
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
|
||||||
(unsigned int)device_event->time);
|
(unsigned int)device_event->time);
|
||||||
|
|
||||||
XIAllowEvents (display->xdisplay, device_event->deviceid,
|
XIAllowEvents (display->xdisplay, device_event->deviceid,
|
||||||
mode, device_event->time);
|
XIReplayDevice, device_event->time);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (begin_move && window->has_move_func)
|
if (begin_move && window->has_move_func)
|
||||||
|
@ -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_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
|
||||||
static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
|
static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
|
||||||
static gboolean dynamic_workspaces = FALSE;
|
static gboolean dynamic_workspaces = FALSE;
|
||||||
static gboolean application_based = FALSE;
|
|
||||||
static gboolean disable_workarounds = FALSE;
|
static gboolean disable_workarounds = FALSE;
|
||||||
static gboolean auto_raise = FALSE;
|
static gboolean auto_raise = FALSE;
|
||||||
static gboolean auto_raise_delay = 500;
|
static gboolean auto_raise_delay = 500;
|
||||||
@ -298,13 +297,6 @@ static MetaBoolPreference preferences_bool[] =
|
|||||||
},
|
},
|
||||||
&dynamic_workspaces,
|
&dynamic_workspaces,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
{ "application-based",
|
|
||||||
SCHEMA_GENERAL,
|
|
||||||
META_PREF_APPLICATION_BASED,
|
|
||||||
},
|
|
||||||
NULL, /* feature is known but disabled */
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
{ "disable-workarounds",
|
{ "disable-workarounds",
|
||||||
SCHEMA_GENERAL,
|
SCHEMA_GENERAL,
|
||||||
@ -1723,14 +1715,6 @@ meta_prefs_get_dynamic_workspaces (void)
|
|||||||
return dynamic_workspaces;
|
return dynamic_workspaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
|
||||||
meta_prefs_get_application_based (void)
|
|
||||||
{
|
|
||||||
return FALSE; /* For now, we never want this to do anything */
|
|
||||||
|
|
||||||
return application_based;
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
meta_prefs_get_disable_workarounds (void)
|
meta_prefs_get_disable_workarounds (void)
|
||||||
{
|
{
|
||||||
@ -1768,9 +1752,6 @@ meta_preference_to_string (MetaPreference pref)
|
|||||||
case META_PREF_NUM_WORKSPACES:
|
case META_PREF_NUM_WORKSPACES:
|
||||||
return "NUM_WORKSPACES";
|
return "NUM_WORKSPACES";
|
||||||
|
|
||||||
case META_PREF_APPLICATION_BASED:
|
|
||||||
return "APPLICATION_BASED";
|
|
||||||
|
|
||||||
case META_PREF_KEYBINDINGS:
|
case META_PREF_KEYBINDINGS:
|
||||||
return "KEYBINDINGS";
|
return "KEYBINDINGS";
|
||||||
|
|
||||||
|
@ -49,7 +49,6 @@
|
|||||||
* @META_PREF_TITLEBAR_FONT: title-bar font
|
* @META_PREF_TITLEBAR_FONT: title-bar font
|
||||||
* @META_PREF_NUM_WORKSPACES: number of workspaces
|
* @META_PREF_NUM_WORKSPACES: number of workspaces
|
||||||
* @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
|
* @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
|
||||||
* @META_PREF_APPLICATION_BASED: application-based
|
|
||||||
* @META_PREF_KEYBINDINGS: keybindings
|
* @META_PREF_KEYBINDINGS: keybindings
|
||||||
* @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
|
* @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
|
||||||
* @META_PREF_BUTTON_LAYOUT: button layout
|
* @META_PREF_BUTTON_LAYOUT: button layout
|
||||||
@ -88,7 +87,6 @@ typedef enum
|
|||||||
META_PREF_TITLEBAR_FONT,
|
META_PREF_TITLEBAR_FONT,
|
||||||
META_PREF_NUM_WORKSPACES,
|
META_PREF_NUM_WORKSPACES,
|
||||||
META_PREF_DYNAMIC_WORKSPACES,
|
META_PREF_DYNAMIC_WORKSPACES,
|
||||||
META_PREF_APPLICATION_BASED,
|
|
||||||
META_PREF_KEYBINDINGS,
|
META_PREF_KEYBINDINGS,
|
||||||
META_PREF_DISABLE_WORKAROUNDS,
|
META_PREF_DISABLE_WORKAROUNDS,
|
||||||
META_PREF_BUTTON_LAYOUT,
|
META_PREF_BUTTON_LAYOUT,
|
||||||
@ -136,7 +134,6 @@ const char* meta_prefs_get_theme (void);
|
|||||||
const PangoFontDescription* meta_prefs_get_titlebar_font (void);
|
const PangoFontDescription* meta_prefs_get_titlebar_font (void);
|
||||||
int meta_prefs_get_num_workspaces (void);
|
int meta_prefs_get_num_workspaces (void);
|
||||||
gboolean meta_prefs_get_dynamic_workspaces (void);
|
gboolean meta_prefs_get_dynamic_workspaces (void);
|
||||||
gboolean meta_prefs_get_application_based (void);
|
|
||||||
gboolean meta_prefs_get_disable_workarounds (void);
|
gboolean meta_prefs_get_disable_workarounds (void);
|
||||||
gboolean meta_prefs_get_auto_raise (void);
|
gboolean meta_prefs_get_auto_raise (void);
|
||||||
int meta_prefs_get_auto_raise_delay (void);
|
int meta_prefs_get_auto_raise_delay (void);
|
||||||
|
Loading…
Reference in New Issue
Block a user