X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=e73ae327ba5999123944646c919494f4b3f42f8b;hb=54c495c83cf5595db4c6a367386d3ef35bc94fca;hp=89f93f9b16cc3c4f1a54508aa55e469f583197d4;hpb=0305cbdc3ae8525c74b2bb9b23884035549e3407;p=chaz%2Fopenbox diff --git a/src/Configmenu.cc b/src/Configmenu.cc index 89f93f9b..e73ae327 100644 --- a/src/Configmenu.cc +++ b/src/Configmenu.cc @@ -53,6 +53,12 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { "Focus New Windows"), 4); 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); + insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar, + "Hide Toolbar"), 8); update(); setValues(); } @@ -64,6 +70,12 @@ void Configmenu::setValues(void) { setItemSelected(4, getScreen()->doFullMax()); setItemSelected(5, getScreen()->doFocusNew()); setItemSelected(6, getScreen()->doFocusLast()); + setItemSelected(7, getScreen()->getWindowToWindowSnap()); + + setItemSelected(8, getScreen()->getWindowCornerSnap()); + setItemEnabled(8, getScreen()->getWindowToWindowSnap()); + + setItemSelected(9, getScreen()->doHideToolbar()); } @@ -82,35 +94,47 @@ void Configmenu::itemSelected(int button, unsigned int index) { return; switch(item->function()) { - case 1: { // dither + case 1: // dither getScreen()->saveImageDither(! getScreen()->doImageDither()); setItemSelected(index, getScreen()->doImageDither()); break; - } - case 2: { // opaque move - getScreen()->saveOpaqueMove((! getScreen()->doOpaqueMove())); + case 2: // opaque move + getScreen()->saveOpaqueMove(! getScreen()->doOpaqueMove()); setItemSelected(index, getScreen()->doOpaqueMove()); break; - } - case 3: { // full maximization - getScreen()->saveFullMax((! getScreen()->doFullMax())); + case 3: // full maximization + getScreen()->saveFullMax(! getScreen()->doFullMax()); setItemSelected(index, getScreen()->doFullMax()); break; - } - case 4: { // focus new windows - getScreen()->saveFocusNew((! getScreen()->doFocusNew())); + + case 4: // focus new windows + getScreen()->saveFocusNew(! getScreen()->doFocusNew()); setItemSelected(index, getScreen()->doFocusNew()); break; - } - case 5: { // focus last window on workspace - getScreen()->saveFocusLast((! getScreen()->doFocusLast())); + case 5: // 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: // hide toolbar + getScreen()->saveHideToolbar(! getScreen()->doHideToolbar()); + setItemSelected(index, getScreen()->doHideToolbar()); + break; } - } // switch } @@ -176,7 +200,8 @@ void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) { case 4: // click raise with sloppy focus getScreen()->saveClickRaise(! getScreen()->doClickRaise()); - getScreen()->updateFocusModel(); + // make sure the appropriate mouse buttons are grabbed on the windows + getScreen()->toggleFocusModel(BScreen::SloppyFocus); break; } setValues(); @@ -194,6 +219,10 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm): BScreen::ColSmartPlacement); insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"), BScreen::CascadePlacement); + insert(i18n(ConfigmenuSet, ConfigmenuUnderMouse, "Under Mouse Placement"), + BScreen::UnderMousePlacement); + insert(i18n(ConfigmenuSet, ConfigmenuClickMouse, "Click Mouse Placement"), + BScreen::ClickMousePlacement); insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"), BScreen::LeftRight); insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"), @@ -202,34 +231,41 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm): BScreen::TopBottom); insert(i18n(ConfigmenuSet, ConfigmenuBottomTop, "Bottom to Top"), BScreen::BottomTop); + insert(i18n(ConfigmenuSet, ConfigmenuIgnoreShaded, "Ignore Shaded Windows"), + BScreen::IgnoreShaded); + insert(i18n(ConfigmenuSet, ConfigmenuIgnoreMax, + "Ignore Full-Maximized Windows"), + BScreen::IgnoreMaximized); update(); setValues(); } void Configmenu::Placementmenu::setValues(void) { - switch (getScreen()->getPlacementPolicy()) { - case BScreen::RowSmartPlacement: - setItemSelected(0, True); - break; - - case BScreen::ColSmartPlacement: - setItemSelected(1, True); - break; - - case BScreen::CascadePlacement: - setItemSelected(2, True); - break; - } + int placement = getScreen()->getPlacementPolicy(); + + setItemSelected(0, placement == BScreen::RowSmartPlacement); + setItemSelected(1, placement == BScreen::ColSmartPlacement); + setItemSelected(2, placement == BScreen::CascadePlacement); + setItemSelected(3, placement == BScreen::UnderMousePlacement); + setItemSelected(4, placement == BScreen::ClickMousePlacement); bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight), - tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom); - - setItemSelected(3, rl); - setItemSelected(4, ! rl); - - setItemSelected(5, tb); - setItemSelected(6, ! tb); + tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom), + e = placement != BScreen::UnderMousePlacement; + + setItemSelected(5, rl); + setItemSelected(6, ! rl); + setItemEnabled(5, e); + setItemEnabled(6, e); + + setItemSelected(7, tb); + setItemSelected(8, ! tb); + setItemEnabled(7, e); + setItemEnabled(8, e); + + setItemSelected(9, getScreen()->getPlaceIgnoreShaded()); + setItemSelected(10, getScreen()->getPlaceIgnoreMaximized()); } @@ -252,59 +288,122 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) { case BScreen::RowSmartPlacement: getScreen()->savePlacementPolicy(item->function()); - setItemSelected(0, True); - setItemSelected(1, False); - setItemSelected(2, False); + 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(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(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(3, True); - setItemSelected(4, False); + setItemSelected(5, true); + setItemSelected(6, false); break; case BScreen::RightLeft: getScreen()->saveRowPlacementDirection(BScreen::RightLeft); - setItemSelected(3, False); - setItemSelected(4, True); + setItemSelected(5, false); + setItemSelected(6, true); break; case BScreen::TopBottom: getScreen()->saveColPlacementDirection(BScreen::TopBottom); - setItemSelected(5, True); - setItemSelected(6, False); + setItemSelected(7, true); + setItemSelected(8, false); break; case BScreen::BottomTop: getScreen()->saveColPlacementDirection(BScreen::BottomTop); - setItemSelected(5, False); - setItemSelected(6, True); + 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()); + + setItemSelected(10, getScreen()->getPlaceIgnoreMaximized()); break; }