brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global: Remove support for the NONREACTIVE input mode

Browse Source 
As it's unused, this is a quick cleanup before we can go onto
more important things.

https://bugzilla.gnome.org/show_bug.cgi?id=700735
This commit is contained in:
Jasper St. Pierre 2013-05-15 13:02:10 -04:00
parent e62d22a50e
commit 9a79c71e88
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ui/ctrlAltTab.js
View File

@ -61,8 +61,7 @@ const CtrlAltTabManager = new Lang.Class({
if (item.focusCallback) { if (item.focusCallback) {
item.focusCallback(timestamp); item.focusCallback(timestamp);
} else { } else {
if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE || if (global.stage_input_mode == Shell.StageInputMode.NORMAL)
global.stage_input_mode == Shell.StageInputMode.NORMAL)
global.set_stage_input_mode(Shell.StageInputMode.FOCUSED); global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);

4
js/ui/grabHelper.js
View File

@ -211,10 +211,8 @@ const GrabHelper = new Lang.Class({
this._grabbedFromKeynav = hadFocus; this._grabbedFromKeynav = hadFocus;
this._preGrabInputMode = global.stage_input_mode; this._preGrabInputMode = global.stage_input_mode;
if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE || if (this._preGrabInputMode == Shell.StageInputMode.NORMAL)
this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
global.set_stage_input_mode(Shell.StageInputMode.FOCUSED); global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
}
this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged)); this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged)); this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));

18
src/shell-global.c
View File

@ -546,13 +546,10 @@ shell_global_focus_stage (ShellGlobal *global)
* @mode: the stage input mode * @mode: the stage input mode
* *
* Sets the input mode of the stage; when @mode is * Sets the input mode of the stage; when @mode is
* %SHELL_STAGE_INPUT_MODE_NONREACTIVE, then the stage does not absorb * %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts clicks in
* any clicks, but just passes them through to underlying windows. * the region defined by shell_global_set_stage_input_region() but
* When it is %SHELL_STAGE_INPUT_MODE_NORMAL, then the stage accepts * passes through clicks outside that region. When it is
* clicks in the region defined by * %SHELL_STAGE_INPUT_MODE_FULLSCREEN, the stage absorbs all input.
* shell_global_set_stage_input_region() but passes through clicks
* outside that region. When it is %SHELL_STAGE_INPUT_MODE_FULLSCREEN,
* the stage absorbs all input.
* *
* When the input mode is %SHELL_STAGE_INPUT_MODE_FOCUSED, the pointer * When the input mode is %SHELL_STAGE_INPUT_MODE_FOCUSED, the pointer
* is handled as with %SHELL_STAGE_INPUT_MODE_NORMAL, but additionally * is handled as with %SHELL_STAGE_INPUT_MODE_NORMAL, but additionally
@ -561,9 +558,8 @@ shell_global_focus_stage (ShellGlobal *global)
* will revert to %SHELL_STAGE_INPUT_MODE_NORMAL. * will revert to %SHELL_STAGE_INPUT_MODE_NORMAL.
* *
* Note that whenever a mutter-internal Gtk widget has a pointer grab, * Note that whenever a mutter-internal Gtk widget has a pointer grab,
* the shell behaves as though it was in * the shell goes unresponsive and passes things to the underlying GTK+
* %SHELL_STAGE_INPUT_MODE_NONREACTIVE, to ensure that the widget gets * widget to ensure that the widget gets any clicks it is expecting.
* any clicks it is expecting.
*/ */
void void
shell_global_set_stage_input_mode (ShellGlobal *global, shell_global_set_stage_input_mode (ShellGlobal *global,
@ -575,7 +571,7 @@ shell_global_set_stage_input_mode (ShellGlobal *global,
screen = meta_plugin_get_screen (global->plugin); screen = meta_plugin_get_screen (global->plugin);
if (mode == SHELL_STAGE_INPUT_MODE_NONREACTIVE || global->gtk_grab_active) if (global->gtk_grab_active)
meta_empty_stage_input_region (screen); meta_empty_stage_input_region (screen);
else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region) else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region)
meta_set_stage_input_region (screen, None); meta_set_stage_input_region (screen, None);

1
src/shell-global.h
View File

@ -46,7 +46,6 @@ void shell_global_end_modal (ShellGlobal *global,
guint32 timestamp); guint32 timestamp);
typedef enum { typedef enum {
SHELL_STAGE_INPUT_MODE_NONREACTIVE,
SHELL_STAGE_INPUT_MODE_NORMAL, SHELL_STAGE_INPUT_MODE_NORMAL,
SHELL_STAGE_INPUT_MODE_FOCUSED, SHELL_STAGE_INPUT_MODE_FOCUSED,
SHELL_STAGE_INPUT_MODE_FULLSCREEN SHELL_STAGE_INPUT_MODE_FULLSCREEN