Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GNOME
mutter
Commits
1c569c2d
Commit
1c569c2d
authored
Jul 17, 2013
by
Jasper St. Pierre
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove application-based preference
It's hardcoded to FALSE.
parent
e3855c77
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
41 deletions
+1
-41
doc/reference/meta-sections.txt
doc/reference/meta-sections.txt
+0
-1
src/core/display.c
src/core/display.c
+1
-18
src/core/prefs.c
src/core/prefs.c
+0
-19
src/meta/prefs.h
src/meta/prefs.h
+0
-3
No files found.
doc/reference/meta-sections.txt
View file @
1c569c2d
...
...
@@ -409,7 +409,6 @@ meta_prefs_get_theme
meta_prefs_get_titlebar_font
meta_prefs_get_num_workspaces
meta_prefs_get_dynamic_workspaces
meta_prefs_get_application_based
meta_prefs_get_disable_workarounds
meta_prefs_get_auto_raise
meta_prefs_get_auto_raise_delay
...
...
src/core/display.c
View file @
1c569c2d
...
...
@@ -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
,
mod
e
,
device_event
->
time
);
XIReplayDevic
e
,
device_event
->
time
);
}
if
(
begin_move
&&
window
->
has_move_func
)
...
...
src/core/prefs.c
View file @
1c569c2d
...
...
@@ -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
;
...
...
@@ -298,13 +297,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
,
...
...
@@ -1723,14 +1715,6 @@ meta_prefs_get_dynamic_workspaces (void)
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
meta_prefs_get_disable_workarounds
(
void
)
{
...
...
@@ -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"
;
...
...
src/meta/prefs.h
View file @
1c569c2d
...
...
@@ -49,7 +49,6 @@
* @META_PREF_TITLEBAR_FONT: title-bar font
* @META_PREF_NUM_WORKSPACES: number of workspaces
* @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
* @META_PREF_APPLICATION_BASED: application-based
* @META_PREF_KEYBINDINGS: keybindings
* @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
* @META_PREF_BUTTON_LAYOUT: button layout
...
...
@@ -88,7 +87,6 @@ typedef enum
META_PREF_TITLEBAR_FONT
,
META_PREF_NUM_WORKSPACES
,
META_PREF_DYNAMIC_WORKSPACES
,
META_PREF_APPLICATION_BASED
,
META_PREF_KEYBINDINGS
,
META_PREF_DISABLE_WORKAROUNDS
,
META_PREF_BUTTON_LAYOUT
,
...
...
@@ -136,7 +134,6 @@ const char* meta_prefs_get_theme (void);
const
PangoFontDescription
*
meta_prefs_get_titlebar_font
(
void
);
int
meta_prefs_get_num_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_auto_raise
(
void
);
int
meta_prefs_get_auto_raise_delay
(
void
);
...
...
Florian Müllner
@fmuellner
mentioned in issue
#1054
·
Feb 19, 2020
mentioned in issue
#1054
mentioned in issue #1054
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment