aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormathias <mathias>2005-07-20 18:29:01 (GMT)
committermathias <mathias>2005-07-20 18:29:01 (GMT)
commit460dffdcc1f2de5463225feedd7d02f6f27958c2 (patch)
tree2e76bc31a08544a423e018c94ac9b06f7965684e /src/Screen.cc
parent3e16ad8cf8be40a1868b6c133649d6549a755761 (diff)
downloadfluxbox-460dffdcc1f2de5463225feedd7d02f6f27958c2.zip
fluxbox-460dffdcc1f2de5463225feedd7d02f6f27958c2.tar.bz2
Changed some *Focus options, just to make some things a bit more clear.
the "Sloppy" was always a bit .. unprecise. removed SloppyFocus, SemiSloppyFocus and ClickToFocus options added MouseFocus, ClickFocus, MouseTabFocus, ClickTabFocus - MouseFocus - change the focus to the window under the mouse (almost similar to the 'old' SloppyFocus) - ClickFocus - change the focus to the window the user clicks - MouseTabFocus - change active tabclient to the one under the mouse in titlebar, does NOT change the focus - ClickTabFocus - change active tabclient when clicked onto a tabbutton to achieve former SemiSloppyFocus behavior one needs MouseFocus and ClickTabFocus
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 3df9266..6d30cef 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -176,7 +176,8 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
176 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 176 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
177 resize_model(rm, BOTTOMRESIZE, scrname+".resizeMode", altscrname+".ResizeMode"), 177 resize_model(rm, BOTTOMRESIZE, scrname+".resizeMode", altscrname+".ResizeMode"),
178 windowmenufile(rm, "", scrname+".windowMenu", altscrname+".WindowMenu"), 178 windowmenufile(rm, "", scrname+".windowMenu", altscrname+".WindowMenu"),
179 focus_model(rm, CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"), 179 focus_model(rm, CLICKFOCUS, scrname+".focusModel", altscrname+".FocusModel"),
180 tabfocus_model(rm, CLICKTABFOCUS, scrname+".tabFocusModel", altscrname+".TabFocusModel"),
180 follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"), 181 follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"),
181 workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"), 182 workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
182 edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"), 183 edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
@@ -1771,15 +1772,16 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1771 1772
1772#define _FOCUSITEM(a, b, c, d, e) focus_menu->insert(new FocusModelMenuItem(_FBTEXT(a, b, c, d), *this, e, save_and_reconfigure)) 1773#define _FOCUSITEM(a, b, c, d, e) focus_menu->insert(new FocusModelMenuItem(_FBTEXT(a, b, c, d), *this, e, save_and_reconfigure))
1773 1774
1774 _FOCUSITEM(Configmenu, ClickToFocus, 1775 _FOCUSITEM(Configmenu, ClickFocus,
1775 "Click To Focus", "Click to focus", 1776 "Click To Focus", "Click to focus",
1776 CLICKTOFOCUS); 1777 CLICKFOCUS);
1777 _FOCUSITEM(Configmenu, SloppyFocus, 1778 _FOCUSITEM(Configmenu, MouseFocus,
1778 "Sloppy Focus", "Sloppy Focus", 1779 "Mouse Focus", "Mouse Focus",
1779 SLOPPYFOCUS); 1780 MOUSEFOCUS);
1780 _FOCUSITEM(Configmenu, SemiSloppyFocus, 1781
1781 "Semi Sloppy Focus", "Semi Sloppy Focus", 1782 focus_menu->insert(new TabFocusModelMenuItem("ClickTabFocus", *this, CLICKTABFOCUS, save_and_reconfigure));
1782 SEMISLOPPYFOCUS); 1783 focus_menu->insert(new TabFocusModelMenuItem("MouseTabFocus", *this, MOUSETABFOCUS, save_and_reconfigure));
1784
1783#undef _FOCUSITEM 1785#undef _FOCUSITEM
1784 1786
1785 focus_menu->insert(new BoolMenuItem(_FBTEXT(Configmenu, 1787 focus_menu->insert(new BoolMenuItem(_FBTEXT(Configmenu,