focusmenu = new Focusmenu(this);
placementmenu = new Placementmenu(this);
+#ifdef XINERAMA
+ xineramamenu = new Xineramamenu(this);
+#endif // XINERAMA
insert(i18n(ConfigmenuSet, ConfigmenuFocusModel,
"Focus Model"), focusmenu);
insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement,
"Window Placement"), placementmenu);
+#ifdef XINERAMA
+ insert(i18n(ConfigmenuSet, ConfigmenuXineramaSupport,
+ "XineramaSupport"), xineramamenu);
+#endif // XINERAMA
insert(i18n(ConfigmenuSet, ConfigmenuImageDithering,
"Image Dithering"), 1);
insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove,
"Window-To-Window Snapping"), 6);
insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap,
"Window Corner Snapping"), 7);
+ insert(i18n(ConfigmenuSet, ConfigmenuWorkspaceWarping,
+ "Workspace Warping"), 8);
+ insert(i18n(ConfigmenuSet, ConfigmenuDisableBindings,
+ "Disable Mouse with Scroll Lock"), 9);
insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar,
- "Hide Toolbar"), 8);
+ "Hide Toolbar"), 10);
update();
setValues();
}
void Configmenu::setValues(void) {
- setItemSelected(2, getScreen()->doImageDither());
- setItemSelected(3, getScreen()->doOpaqueMove());
- setItemSelected(4, getScreen()->doFullMax());
- setItemSelected(5, getScreen()->doFocusNew());
- setItemSelected(6, getScreen()->doFocusLast());
- setItemSelected(7, getScreen()->getBlackbox()->getWindowToWindowSnap());
-
- setItemSelected(8, getScreen()->getBlackbox()->getWindowCornerSnap());
- setItemEnabled(8, getScreen()->getBlackbox()->getWindowToWindowSnap());
+ int index = 2;
+#ifdef XINERAMA
+ ++index;
+#endif // XINERAMA
+ setItemSelected(index++, getScreen()->doImageDither());
+ setItemSelected(index++, getScreen()->doOpaqueMove());
+ setItemSelected(index++, getScreen()->doFullMax());
+ setItemSelected(index++, getScreen()->doFocusNew());
+ setItemSelected(index++, getScreen()->doFocusLast());
+ setItemSelected(index++, getScreen()->getWindowToWindowSnap());
+
+ setItemSelected(index, getScreen()->getWindowCornerSnap());
+ setItemEnabled(index++, getScreen()->getWindowToWindowSnap());
- setItemSelected(9, getScreen()->doHideToolbar());
+ setItemSelected(index++, getScreen()->doWorkspaceWarping());
+ setItemSelected(index++, getScreen()->allowScrollLock());
+ setItemSelected(index++, getScreen()->doHideToolbar());
}
Configmenu::~Configmenu(void) {
delete focusmenu;
delete placementmenu;
+#ifdef XINERAMA
+ delete xineramamenu;
+#endif // XINERAMA
}
+
void Configmenu::itemSelected(int button, unsigned int index) {
if (button != 1)
return;
return;
switch(item->function()) {
- case 1: { // dither
+ case 1: // dither
getScreen()->saveImageDither(! getScreen()->doImageDither());
setItemSelected(index, getScreen()->doImageDither());
break;
- }
- case 2: { // opaque move
+ case 2: // opaque move
getScreen()->saveOpaqueMove(! getScreen()->doOpaqueMove());
setItemSelected(index, getScreen()->doOpaqueMove());
break;
- }
- case 3: { // full maximization
+ case 3: // full maximization
getScreen()->saveFullMax(! getScreen()->doFullMax());
setItemSelected(index, getScreen()->doFullMax());
break;
- }
- case 4: { // focus new windows
+
+ case 4: // focus new windows
getScreen()->saveFocusNew(! getScreen()->doFocusNew());
setItemSelected(index, getScreen()->doFocusNew());
break;
- }
- case 5: { // focus last window on workspace
+ case 5: // focus last window on workspace
getScreen()->saveFocusLast(! getScreen()->doFocusLast());
setItemSelected(index, getScreen()->doFocusLast());
break;
- }
- case 6: { // window-to-window snapping
- getScreen()->getBlackbox()->
- saveWindowToWindowSnap(! getScreen()->getBlackbox()->
- getWindowToWindowSnap());
- setItemSelected(index, getScreen()->getBlackbox()->getWindowToWindowSnap());
- setItemEnabled(index + 1,
- getScreen()->getBlackbox()->getWindowToWindowSnap());
+ 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()->getBlackbox()->
- saveWindowCornerSnap(! getScreen()->getBlackbox()->getWindowCornerSnap());
- setItemSelected(index, getScreen()->getBlackbox()->getWindowCornerSnap());
+ case 7: // window corner snapping
+ getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap());
+ setItemSelected(index, getScreen()->getWindowCornerSnap());
break;
- }
- case 8: { // hide toolbar
+ case 8: // workspace wrapping
+ getScreen()->saveWorkspaceWarping(! getScreen()->doWorkspaceWarping());
+ setItemSelected(index, getScreen()->doWorkspaceWarping());
+ break;
+
+ case 9: // disable mouse bindings with Scroll Lock
+ getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock());
+ setItemSelected(index, getScreen()->allowScrollLock());
+ getScreen()->reconfigure();
+ break;
+
+ case 10: // hide toolbar
getScreen()->saveHideToolbar(! getScreen()->doHideToolbar());
setItemSelected(index, getScreen()->doHideToolbar());
break;
}
- } // switch
}
setValues();
focusmenu->reconfigure();
placementmenu->reconfigure();
+#ifdef XINERAMA
+ xineramamenu->reconfigure();
+#endif // XINERAMA
Basemenu::reconfigure();
}
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();
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"),
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();
}
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),
e = placement != BScreen::UnderMousePlacement;
- setItemSelected(4, rl);
- setItemSelected(5, ! rl);
- setItemEnabled(4, e);
+ setItemSelected(5, rl);
+ setItemSelected(6, ! rl);
setItemEnabled(5, e);
-
- setItemSelected(6, tb);
- setItemSelected(7, ! tb);
setItemEnabled(6, e);
+
+ setItemSelected(7, tb);
+ setItemSelected(8, ! tb);
setItemEnabled(7, e);
+ setItemEnabled(8, e);
+
+ setItemSelected(9, getScreen()->getPlaceIgnoreShaded());
+ setItemSelected(10, getScreen()->getPlaceIgnoreMaximized());
}
setItemSelected(1, false);
setItemSelected(2, false);
setItemSelected(3, false);
- setItemEnabled(4, true);
+ setItemSelected(4, false);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
+ setItemEnabled(8, true);
break;
setItemSelected(1, true);
setItemSelected(2, false);
setItemSelected(3, false);
- setItemEnabled(4, true);
+ setItemSelected(4, false);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
+ setItemEnabled(8, true);
break;
setItemSelected(1, false);
setItemSelected(2, true);
setItemSelected(3, false);
- setItemEnabled(4, true);
+ setItemSelected(4, false);
setItemEnabled(5, true);
setItemEnabled(6, true);
setItemEnabled(7, true);
+ setItemEnabled(8, true);
break;
setItemSelected(1, false);
setItemSelected(2, false);
setItemSelected(3, true);
- setItemEnabled(4, false);
+ 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(4, true);
- setItemSelected(5, false);
+ setItemSelected(5, true);
+ setItemSelected(6, false);
break;
case BScreen::RightLeft:
getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
- setItemSelected(4, false);
- setItemSelected(5, true);
+ setItemSelected(5, false);
+ setItemSelected(6, true);
break;
case BScreen::TopBottom:
getScreen()->saveColPlacementDirection(BScreen::TopBottom);
- setItemSelected(6, true);
- setItemSelected(7, false);
+ setItemSelected(7, true);
+ setItemSelected(8, false);
break;
case BScreen::BottomTop:
getScreen()->saveColPlacementDirection(BScreen::BottomTop);
- setItemSelected(6, false);
- setItemSelected(7, 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;
+ }
+}
+
+
+#ifdef XINERAMA
+Configmenu::Xineramamenu::Xineramamenu(Configmenu *cm):
+ Basemenu(cm->getScreen()) {
+ setLabel(i18n(ConfigmenuSet, ConfigmenuXineramaSupport, "Xinerama Support"));
+ setInternalMenu();
+
+ insert(i18n(ConfigmenuSet, ConfigmenuXineramaPlacement, "Window Placement"),
+ 1);
+ insert(i18n(ConfigmenuSet, ConfigmenuXineramaMaximizing, "Window Maximizing"),
+ 2);
+ insert(i18n(ConfigmenuSet, ConfigmenuXineramaSnapping, "Window Snapping"),
+ 3);
+
+ update();
+ setValues();
+}
+
+
+void Configmenu::Xineramamenu::setValues(void) {
+ setItemSelected(0, getScreen()->getBlackbox()->doXineramaPlacement());
+ setItemSelected(1, getScreen()->getBlackbox()->doXineramaMaximizing());
+ setItemSelected(2, getScreen()->getBlackbox()->doXineramaSnapping());
+}
+
+
+void Configmenu::Xineramamenu::reconfigure(void) {
+ setValues();
+ Basemenu::reconfigure();
+}
+
+
+void Configmenu::Xineramamenu::itemSelected(int button, unsigned int index) {
+ if (button != 1)
+ return;
+
+ BasemenuItem *item = find(index);
+
+ if (! item->function())
+ return;
+
+ Blackbox *bb = getScreen()->getBlackbox();
+
+ switch (item->function()) {
+ case 1: // window placement
+ bb->saveXineramaPlacement(! bb->doXineramaPlacement());
+ setItemSelected(0, bb->doXineramaPlacement());
+ break;
+
+ case 2: // window maximizing
+ bb->saveXineramaMaximizing(! bb->doXineramaMaximizing());
+ setItemSelected(1, bb->doXineramaMaximizing());
+ break;
+ case 3: // window snapping
+ bb->saveXineramaSnapping(! bb->doXineramaSnapping());
+ setItemSelected(2, bb->doXineramaSnapping());
break;
}
}
+#endif // XINERAMA
projects / chaz / openbox / blobdiff