X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=54c047edb1cc8ae2e45b743fcd2e73f15ae3264f;hb=db3e93a3c1a57d962741a572a0913ce2555d9dba;hp=1c18387c84fea0e950ac4ed40e380829d298a206;hpb=da67802bc8bd42741fae491bf932ff17ee16f0f7;p=chaz%2Fopenbox diff --git a/src/Configmenu.cc b/src/Configmenu.cc index 1c18387c..54c047ed 100644 --- a/src/Configmenu.cc +++ b/src/Configmenu.cc @@ -38,6 +38,8 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { focusmenu = new Focusmenu(this); placementmenu = new Placementmenu(this); + windowsnapmenu = new WindowToWindowSnapmenu(this); + edgesnapmenu = new WindowToEdgeSnapmenu(this); #ifdef XINERAMA xineramamenu = new Xineramamenu(this); #endif // XINERAMA @@ -46,6 +48,10 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { "Focus Model"), focusmenu); insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement, "Window Placement"), placementmenu); + insert(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap, + "Window-To-Window Snapping"), windowsnapmenu); + insert(i18n(ConfigmenuSet, ConfigmenuWindowToEdgeSnap, + "Window-To-Edge Snapping"), edgesnapmenu); #ifdef XINERAMA insert(i18n(ConfigmenuSet, ConfigmenuXineramaSupport, "XineramaSupport"), xineramamenu); @@ -54,44 +60,44 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { "Image Dithering"), 1); insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove, "Opaque Window Moving"), 2); + insert(i18n(ConfigmenuSet, ConfigmenuWorkspaceWarping, + "Workspace Warping"), 3); insert(i18n(ConfigmenuSet, ConfigmenuFullMax, - "Full Maximization"), 3); + "Full Maximization"), 4); insert(i18n(ConfigmenuSet, ConfigmenuFocusNew, - "Focus New Windows"), 4); + "Focus New Windows"), 5); insert(i18n(ConfigmenuSet, ConfigmenuFocusLast, - "Focus Last Window on Workspace"), 5); - insert(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap, - "Window-To-Window Snapping"), 6); - insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap, - "Window Corner Snapping"), 7); + "Focus Last Window on Workspace"), 6); insert(i18n(ConfigmenuSet, ConfigmenuDisableBindings, - "Disable Mouse with Scroll Lock"), 8); + "Disable Mouse with Scroll Lock"), 7); insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar, - "Hide Toolbar"), 9); + "Hide Toolbar"), 8); update(); setValues(); } void Configmenu::setValues(void) { - setItemSelected(3, getScreen()->doImageDither()); - setItemSelected(4, getScreen()->doOpaqueMove()); - setItemSelected(5, getScreen()->doFullMax()); - setItemSelected(6, getScreen()->doFocusNew()); - setItemSelected(7, getScreen()->doFocusLast()); - setItemSelected(8, getScreen()->getWindowToWindowSnap()); - - setItemSelected(9, getScreen()->getWindowCornerSnap()); - setItemEnabled(9, getScreen()->getWindowToWindowSnap()); - - setItemSelected(10, getScreen()->allowScrollLock()); - setItemSelected(11, getScreen()->doHideToolbar()); + int index = 4; +#ifdef XINERAMA + ++index; +#endif // XINERAMA + setItemSelected(index++, getScreen()->doImageDither()); + setItemSelected(index++, getScreen()->doOpaqueMove()); + setItemSelected(index++, getScreen()->doWorkspaceWarping()); + setItemSelected(index++, getScreen()->doFullMax()); + setItemSelected(index++, getScreen()->doFocusNew()); + setItemSelected(index++, getScreen()->doFocusLast()); + setItemSelected(index++, getScreen()->allowScrollLock()); + setItemSelected(index++, getScreen()->doHideToolbar()); } Configmenu::~Configmenu(void) { delete focusmenu; delete placementmenu; + delete windowsnapmenu; + delete edgesnapmenu; #ifdef XINERAMA delete xineramamenu; #endif // XINERAMA @@ -118,39 +124,33 @@ void Configmenu::itemSelected(int button, unsigned int index) { setItemSelected(index, getScreen()->doOpaqueMove()); break; - case 3: // full maximization + case 3: // workspace wrapping + getScreen()->saveWorkspaceWarping(! getScreen()->doWorkspaceWarping()); + setItemSelected(index, getScreen()->doWorkspaceWarping()); + break; + + case 4: // full maximization getScreen()->saveFullMax(! getScreen()->doFullMax()); setItemSelected(index, getScreen()->doFullMax()); break; - case 4: // focus new windows + case 5: // focus new windows getScreen()->saveFocusNew(! getScreen()->doFocusNew()); setItemSelected(index, getScreen()->doFocusNew()); break; - case 5: // focus last window on workspace + case 6: // focus last window on workspace getScreen()->saveFocusLast(! getScreen()->doFocusLast()); setItemSelected(index, getScreen()->doFocusLast()); break; - case 6: // window-to-window snapping - getScreen()->saveWindowToWindowSnap(! getScreen()->getWindowToWindowSnap()); - setItemSelected(index, getScreen()->getWindowToWindowSnap()); - setItemEnabled(index + 1, getScreen()->getWindowToWindowSnap()); - break; - - case 7: // window corner snapping - getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap()); - setItemSelected(index, getScreen()->getWindowCornerSnap()); - break; - - case 8: // disable mouse bindings with Scroll Lock + case 7: // disable mouse bindings with Scroll Lock getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock()); setItemSelected(index, getScreen()->allowScrollLock()); getScreen()->reconfigure(); break; - case 9: // hide toolbar + case 8: // hide toolbar getScreen()->saveHideToolbar(! getScreen()->doHideToolbar()); setItemSelected(index, getScreen()->doHideToolbar()); break; @@ -162,7 +162,11 @@ void Configmenu::reconfigure(void) { setValues(); focusmenu->reconfigure(); placementmenu->reconfigure(); + windowsnapmenu->reconfigure(); + edgesnapmenu->reconfigure(); +#ifdef XINERAMA xineramamenu->reconfigure(); +#endif // XINERAMA Basemenu::reconfigure(); } @@ -273,7 +277,8 @@ void Configmenu::Placementmenu::setValues(void) { bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight), tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom), - e = placement != BScreen::UnderMousePlacement; + e = (placement == BScreen::RowSmartPlacement || + placement == BScreen::ColSmartPlacement); setItemSelected(5, rl); setItemSelected(6, ! rl); @@ -287,6 +292,8 @@ void Configmenu::Placementmenu::setValues(void) { setItemSelected(9, getScreen()->getPlaceIgnoreShaded()); setItemSelected(10, getScreen()->getPlaceIgnoreMaximized()); + setItemEnabled(9, e); + setItemEnabled(10, e); } @@ -308,126 +315,174 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) { switch (item->function()) { case BScreen::RowSmartPlacement: getScreen()->savePlacementPolicy(item->function()); - - setItemSelected(0, true); - setItemSelected(1, false); - setItemSelected(2, false); - setItemSelected(3, false); - setItemSelected(4, false); - setItemEnabled(5, true); - setItemEnabled(6, true); - setItemEnabled(7, true); - setItemEnabled(8, true); - break; case BScreen::ColSmartPlacement: getScreen()->savePlacementPolicy(item->function()); - - setItemSelected(0, false); - setItemSelected(1, true); - setItemSelected(2, false); - setItemSelected(3, false); - setItemSelected(4, false); - setItemEnabled(5, true); - setItemEnabled(6, true); - setItemEnabled(7, true); - setItemEnabled(8, true); - break; case BScreen::CascadePlacement: getScreen()->savePlacementPolicy(item->function()); - - setItemSelected(0, false); - setItemSelected(1, false); - setItemSelected(2, true); - setItemSelected(3, false); - setItemSelected(4, false); - setItemEnabled(5, true); - setItemEnabled(6, true); - setItemEnabled(7, true); - setItemEnabled(8, true); - break; case BScreen::UnderMousePlacement: getScreen()->savePlacementPolicy(item->function()); - - setItemSelected(0, false); - setItemSelected(1, false); - setItemSelected(2, false); - setItemSelected(3, true); - setItemSelected(4, false); - setItemEnabled(5, false); - setItemEnabled(6, false); - setItemEnabled(7, false); - setItemEnabled(8, false); - break; case BScreen::ClickMousePlacement: getScreen()->savePlacementPolicy(item->function()); - - setItemSelected(0, false); - setItemSelected(1, false); - setItemSelected(2, false); - setItemSelected(3, false); - setItemSelected(4, true); - setItemEnabled(5, false); - setItemEnabled(6, false); - setItemEnabled(7, false); - setItemEnabled(8, false); - break; case BScreen::LeftRight: getScreen()->saveRowPlacementDirection(BScreen::LeftRight); - - setItemSelected(5, true); - setItemSelected(6, false); - break; case BScreen::RightLeft: getScreen()->saveRowPlacementDirection(BScreen::RightLeft); - - setItemSelected(5, false); - setItemSelected(6, true); - break; case BScreen::TopBottom: getScreen()->saveColPlacementDirection(BScreen::TopBottom); - - setItemSelected(7, true); - setItemSelected(8, false); - break; case BScreen::BottomTop: getScreen()->saveColPlacementDirection(BScreen::BottomTop); - - setItemSelected(7, false); - setItemSelected(8, true); - break; case BScreen::IgnoreShaded: getScreen()->savePlaceIgnoreShaded(! getScreen()->getPlaceIgnoreShaded()); - - setItemSelected(9, getScreen()->getPlaceIgnoreShaded()); - break; case BScreen::IgnoreMaximized: getScreen()-> savePlaceIgnoreMaximized(! getScreen()->getPlaceIgnoreMaximized()); + break; + } + setValues(); +} + + +Configmenu::WindowToWindowSnapmenu::WindowToWindowSnapmenu(Configmenu *cm) : + Basemenu(cm->getScreen()) { + setLabel(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap, + "Window-To-Window Snapping")); + setInternalMenu(); + + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoSnapNo, "No Snapping"), 1); + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoSnap, "Edge Snapping"), 2); + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoResistance, + "Edge Resistance"), 3); + insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap, + "Window Corner Snapping"), 4); + update(); + setValues(); +} + + +void Configmenu::WindowToWindowSnapmenu::setValues(void) { + setItemSelected(0, (getScreen()->getWindowToWindowSnap() == + BScreen::WindowNoSnap)); + setItemSelected(1, (getScreen()->getWindowToWindowSnap() == + BScreen::WindowSnap)); + setItemSelected(2, (getScreen()->getWindowToWindowSnap() == + BScreen::WindowResistance)); + + setItemEnabled(3, getScreen()->getWindowToWindowSnap()); + setItemSelected(3, getScreen()->getWindowCornerSnap()); +} + + +void Configmenu::WindowToWindowSnapmenu::reconfigure(void) { + setValues(); + Basemenu::reconfigure(); +} + + +void Configmenu::WindowToWindowSnapmenu::itemSelected(int button, unsigned int index) { + if (button != 1) + return; + + BasemenuItem *item = find(index); + + if (! item->function()) + return; + + switch (item->function()) { + case 1: // none + getScreen()->saveWindowToWindowSnap(BScreen::WindowNoSnap); + break; + + case 2: // edge snapping + getScreen()->saveWindowToWindowSnap(BScreen::WindowSnap); + break; + + case 3: // edge resistance + getScreen()->saveWindowToWindowSnap(BScreen::WindowResistance); + break; + + case 4: // window corner snapping + getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap()); + break; + + } + setValues(); +} + + +Configmenu::WindowToEdgeSnapmenu::WindowToEdgeSnapmenu(Configmenu *cm) : + Basemenu(cm->getScreen()) { + setLabel(i18n(ConfigmenuSet, ConfigmenuWindowToEdgeSnap, + "Window-To-Edge Snapping")); + setInternalMenu(); + + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoSnapNo, "No Snapping"), 1); + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoSnap, "Edge Snapping"), 2); + insert(i18n(ConfigmenuSet, ConfigmenuWindowDoResistance, + "Edge Resistance"), 3); + update(); + setValues(); +} + + +void Configmenu::WindowToEdgeSnapmenu::setValues(void) { + setItemSelected(0, (getScreen()->getWindowToEdgeSnap() == + BScreen::WindowNoSnap)); + setItemSelected(1, (getScreen()->getWindowToEdgeSnap() == + BScreen::WindowSnap)); + setItemSelected(2, (getScreen()->getWindowToEdgeSnap() == + BScreen::WindowResistance)); +} - setItemSelected(10, getScreen()->getPlaceIgnoreMaximized()); +void Configmenu::WindowToEdgeSnapmenu::reconfigure(void) { + setValues(); + Basemenu::reconfigure(); +} + + +void Configmenu::WindowToEdgeSnapmenu::itemSelected(int button, unsigned int index) { + if (button != 1) + return; + + BasemenuItem *item = find(index); + + if (! item->function()) + return; + + switch (item->function()) { + case 1: // none + getScreen()->saveWindowToEdgeSnap(BScreen::WindowNoSnap); + break; + + case 2: // edge snapping + getScreen()->saveWindowToEdgeSnap(BScreen::WindowSnap); + break; + + case 3: // edge resistance + getScreen()->saveWindowToEdgeSnap(BScreen::WindowResistance); break; } + setValues(); }