=== modified file 'plugins/unityshell/src/Launcher.cpp' --- plugins/unityshell/src/Launcher.cpp 2012-02-08 08:27:10 +0000 +++ plugins/unityshell/src/Launcher.cpp 2012-02-08 16:43:47 +0000 @@ -162,16 +162,6 @@ ql_manager.quicklist_closed.connect(sigc::mem_fun(this, &Launcher::RecvQuicklistClosed)); WindowManager& plugin_adapter = *(WindowManager::Default()); - plugin_adapter.window_maximized.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_restored.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_unminimized.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_mapped.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_unmapped.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_shown.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_hidden.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_resized.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_moved.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihide)); - plugin_adapter.window_focus_changed.connect(sigc::mem_fun(this, &Launcher::OnWindowMaybeIntellihideDelayed)); plugin_adapter.window_mapped.connect(sigc::mem_fun(this, &Launcher::OnWindowMapped)); plugin_adapter.window_unmapped.connect(sigc::mem_fun(this, &Launcher::OnWindowUnmapped)); @@ -179,8 +169,6 @@ plugin_adapter.initiate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged)); plugin_adapter.terminate_spread.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged)); plugin_adapter.terminate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged)); - plugin_adapter.compiz_screen_viewport_switch_started.connect(sigc::mem_fun(this, &Launcher::OnViewPortSwitchStarted)); - plugin_adapter.compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &Launcher::OnViewPortSwitchEnded)); GeisAdapter& adapter = *(GeisAdapter::Default()); adapter.drag_start.connect(sigc::mem_fun(this, &Launcher::OnDragStart)); @@ -231,7 +219,6 @@ // FIXME: remove _initial_drag_animation = false; - _check_window_over_launcher = true; _postreveal_mousemove_delta_x = 0; _postreveal_mousemove_delta_y = 0; @@ -1403,28 +1390,6 @@ return _mouse_position.y; } -void -Launcher::EnableCheckWindowOverLauncher(gboolean enabled) -{ - _check_window_over_launcher = enabled; -} - -void -Launcher::CheckWindowOverLauncher() -{ - bool any = false; - bool active = false; - - // state has no mean right now, the check will be done again later - if (!_check_window_over_launcher) - return; - - WindowManager::Default()->CheckWindowIntersections(GetAbsoluteGeometry(), active, any); - - _hide_machine->SetQuirk(LauncherHideMachine::ANY_WINDOW_UNDER, any); - _hide_machine->SetQuirk(LauncherHideMachine::ACTIVE_WINDOW_UNDER, active); -} - gboolean Launcher::OnUpdateDragManagerTimeout(gpointer data) { @@ -1492,62 +1457,11 @@ //} } -// FIXME: remove those 2 for Oneiric -void -Launcher::OnWindowMaybeIntellihide(guint32 xid) -{ - if (options()->hide_mode != LAUNCHER_HIDE_NEVER) - CheckWindowOverLauncher(); -} - -void -Launcher::OnWindowMaybeIntellihideDelayed(guint32 xid) -{ - /* - * Delay to let the other window taking the focus first (otherwise focuschanged - * is emmited with the root window focus - */ - if (options()->hide_mode != LAUNCHER_HIDE_NEVER) - g_idle_add((GSourceFunc)CheckWindowOverLauncherSync, this); -} - -gboolean -Launcher::CheckWindowOverLauncherSync(Launcher* self) -{ - self->CheckWindowOverLauncher(); - return FALSE; -} - void Launcher::OnPluginStateChanged() { _hide_machine->SetQuirk (LauncherHideMachine::EXPO_ACTIVE, WindowManager::Default ()->IsExpoActive ()); _hide_machine->SetQuirk (LauncherHideMachine::SCALE_ACTIVE, WindowManager::Default ()->IsScaleActive ()); - - if (options()->hide_mode == LAUNCHER_HIDE_NEVER) - return; -} - -void -Launcher::OnViewPortSwitchStarted() -{ - /* - * don't take into account window over launcher state during - * the viewport switch as we can get false positives - * (like switching to an empty viewport while grabbing a fullscreen window) - */ - _check_window_over_launcher = false; -} - -void -Launcher::OnViewPortSwitchEnded() -{ - /* - * compute again the list of all window on the new viewport - * to decide if we should or not hide the launcher - */ - _check_window_over_launcher = true; - CheckWindowOverLauncher(); } LauncherHideMode Launcher::GetHideMode() const === modified file 'plugins/unityshell/src/Launcher.h' --- plugins/unityshell/src/Launcher.h 2012-02-08 06:49:54 +0000 +++ plugins/unityshell/src/Launcher.h 2012-02-08 16:43:47 +0000 @@ -112,9 +112,6 @@ void Resize(); - void CheckWindowOverLauncher(); - void EnableCheckWindowOverLauncher(gboolean enabled); - sigc::signal launcher_addrequest; sigc::signal launcher_addrequest_special; sigc::signal launcher_removerequest; @@ -173,9 +170,6 @@ void OnOptionChanged(); void UpdateOptions(Options::Ptr options); - void OnWindowMaybeIntellihide(guint32 xid); - void OnWindowMaybeIntellihideDelayed(guint32 xid); - static gboolean CheckWindowOverLauncherSync(Launcher* self); void OnWindowMapped(guint32 xid); void OnWindowUnmapped(guint32 xid); @@ -189,9 +183,6 @@ void OnSelectionChanged(AbstractLauncherIcon* selection); - void OnViewPortSwitchStarted(); - void OnViewPortSwitchEnded(); - static gboolean AnimationTimeout(gpointer data); static gboolean StrutHack(gpointer data); static gboolean StartIconDragTimeout(gpointer data); @@ -325,7 +316,6 @@ bool _hovered; bool _hidden; bool _render_drag_window; - bool _check_window_over_launcher; bool _shortcuts_shown; === modified file 'plugins/unityshell/src/LauncherHideMachine.cpp' --- plugins/unityshell/src/LauncherHideMachine.cpp 2012-02-04 05:28:23 +0000 +++ plugins/unityshell/src/LauncherHideMachine.cpp 2012-02-08 16:43:47 +0000 @@ -111,8 +111,6 @@ EXTERNAL_DND_ACTIVE = 1 << 5, 32 #VISIBLE_REQUIRED INTERNAL_DND_ACTIVE = 1 << 6, 64 #VISIBLE_REQUIRED TRIGGER_BUTTON_SHOW = 1 << 7, 128 #VISIBLE_REQUIRED - ANY_WINDOW_UNDER = 1 << 8, 256 - ACTIVE_WINDOW_UNDER = 1 << 9, 512 DND_PUSHED_OFF = 1 << 10, 1024 MOUSE_MOVE_POST_REVEAL = 1 << 11, 2k VERTICAL_SLIDE_ACTIVE = 1 << 12, 4k #VISIBLE_REQUIRED @@ -162,10 +160,6 @@ bool hide_for_window = false; if (_mode == AUTOHIDE) hide_for_window = true; - else if (_mode == DODGE_WINDOWS) - hide_for_window = GetQuirk(ANY_WINDOW_UNDER); - else if (_mode == DODGE_ACTIVE_WINDOW) - hide_for_window = GetQuirk(ACTIVE_WINDOW_UNDER); // if we activated AND we would hide because of a window, go ahead and do it if (!_should_hide && GetQuirk(LAST_ACTION_ACTIVATE) && hide_for_window) @@ -219,8 +213,7 @@ return _mode; } -#define SKIP_DELAY_QUIRK (EXTERNAL_DND_ACTIVE | DND_PUSHED_OFF | ACTIVE_WINDOW_UNDER | \ -ANY_WINDOW_UNDER | EXPO_ACTIVE | SCALE_ACTIVE | MT_DRAG_OUT | TRIGGER_BUTTON_SHOW) +#define SKIP_DELAY_QUIRK (EXTERNAL_DND_ACTIVE | DND_PUSHED_OFF | EXPO_ACTIVE | SCALE_ACTIVE | MT_DRAG_OUT | TRIGGER_BUTTON_SHOW) void LauncherHideMachine::SetQuirk(LauncherHideMachine::HideQuirk quirk, bool active) === modified file 'plugins/unityshell/src/LauncherHideMachine.h' --- plugins/unityshell/src/LauncherHideMachine.h 2012-02-04 05:28:23 +0000 +++ plugins/unityshell/src/LauncherHideMachine.h 2012-02-08 16:43:47 +0000 @@ -46,8 +46,6 @@ EXTERNAL_DND_ACTIVE = 1 << 5, INTERNAL_DND_ACTIVE = 1 << 6, TRIGGER_BUTTON_SHOW = 1 << 7, - ANY_WINDOW_UNDER = 1 << 8, - ACTIVE_WINDOW_UNDER = 1 << 9, DND_PUSHED_OFF = 1 << 10, MOUSE_MOVE_POST_REVEAL = 1 << 11, VERTICAL_SLIDE_ACTIVE = 1 << 12, === modified file 'plugins/unityshell/src/LauncherOptions.h' --- plugins/unityshell/src/LauncherOptions.h 2012-02-08 00:49:09 +0000 +++ plugins/unityshell/src/LauncherOptions.h 2012-02-08 16:43:47 +0000 @@ -37,8 +37,6 @@ { LAUNCHER_HIDE_NEVER, LAUNCHER_HIDE_AUTOHIDE, - LAUNCHER_HIDE_DODGE_WINDOWS, - LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW, } LauncherHideMode; typedef enum === modified file 'plugins/unityshell/unityshell.xml.in' --- plugins/unityshell/unityshell.xml.in 2012-02-08 00:49:09 +0000 +++ plugins/unityshell/unityshell.xml.in 2012-02-08 16:43:47 +0000 @@ -51,7 +51,7 @@ <_short>Hide Launcher <_long>Make the launcher hide automatically after some time of inactivity: always or just when the focussed window is not over the launcher 0 - 3 + 1 0 0 @@ -61,14 +61,6 @@ 1 <_name>Autohide - - 2 - <_name>Dodge Windows - - - 3 - <_name>Dodge Active Window -