X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=fbb2c66a67567bf4fb3a7b711e847dc8eca137aa;hb=72a2e98738d87b89620bafd15141690aa4be8fab;hp=7bd90ef24ceea68b9a238f416578c462a18ab5a0;hpb=a7db565c75f316fd04ccb04004b58f6378af63c9;p=chaz%2Fopenbox

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 7bd90ef2..fbb2c66a 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -33,30 +33,50 @@
 #include "Screen.hh"
 
 Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
-  setLabel(i18n(ConfigmenuSet, ConfigmenuConfigOptions, "Config options"));
+  setLabel(i18n(ConfigmenuSet, ConfigmenuConfigOptions, "Config Options"));
   setInternalMenu();
 
   focusmenu = new Focusmenu(this);
   placementmenu = new Placementmenu(this);
+  windowsnapmenu = new WindowToWindowSnapmenu(this);
+  edgesnapmenu = new WindowToEdgeSnapmenu(this);
+#ifdef    XINERAMA
+  xineramamenu = new Xineramamenu(this);
+#endif // XINERAMA
+#ifdef    XFT
+  xftmenu = new Xftmenu(this);
+#endif // XFT
 
   insert(i18n(ConfigmenuSet, ConfigmenuFocusModel,
               "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);
+#endif // XINERAMA
+#ifdef    XFT
+  insert(i18n(ConfigmenuSet, ConfigmenuXftOptions,
+              "Xft Font Options"), xftmenu);
+#endif // XINERAMA
   insert(i18n(ConfigmenuSet, ConfigmenuImageDithering,
               "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"), 7);
   insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar,
               "Hide Toolbar"), 8);
   update();
@@ -65,25 +85,38 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
 
 
 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());
-  
-  setItemSelected(9, getScreen()->doHideToolbar());
+  int index = 4;
+#ifdef    XINERAMA
+  ++index;
+#endif // XINERAMA
+#ifdef    XFT
+  ++index;
+#endif // XFT
+  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
+#ifdef    XFT
+  delete xftmenu;
+#endif // XFT
 }
 
+
 void Configmenu::itemSelected(int button, unsigned int index) {
   if (button != 1)
     return;
@@ -94,58 +127,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
+  case 2: // opaque move
     getScreen()->saveOpaqueMove(! getScreen()->doOpaqueMove());
     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()->getBlackbox()->
-      saveWindowToWindowSnap(! getScreen()->getBlackbox()->
-                             getWindowToWindowSnap());
-    setItemSelected(index, getScreen()->getBlackbox()->getWindowToWindowSnap());
-    setItemEnabled(index + 1,
-                   getScreen()->getBlackbox()->getWindowToWindowSnap());
-    break;
-  }
 
-  case 7: { // window corner snapping
-    getScreen()->getBlackbox()->
-      saveWindowCornerSnap(! getScreen()->getBlackbox()->getWindowCornerSnap());
-    setItemSelected(index, getScreen()->getBlackbox()->getWindowCornerSnap());
+  case 7: // disable mouse bindings with Scroll Lock
+    getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock());
+    setItemSelected(index, getScreen()->allowScrollLock());
+    getScreen()->reconfigure();
     break;
-  }
 
-  case 8: { // hide toolbar
+  case 8: // hide toolbar
     getScreen()->saveHideToolbar(! getScreen()->doHideToolbar());
     setItemSelected(index, getScreen()->doHideToolbar());
     break;
   }
-  } // switch
 }
 
 
@@ -153,6 +175,14 @@ void Configmenu::reconfigure(void) {
   setValues();
   focusmenu->reconfigure();
   placementmenu->reconfigure();
+  windowsnapmenu->reconfigure();
+  edgesnapmenu->reconfigure();
+#ifdef    XINERAMA
+  xineramamenu->reconfigure();
+#endif // XINERAMA
+#ifdef    XFT
+  xftmenu->reconfigure();
+#endif // XFT
 
   Basemenu::reconfigure();
 }
@@ -211,7 +241,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();
@@ -231,6 +262,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
          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"),
@@ -239,6 +272,11 @@ 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();
 }
@@ -251,20 +289,27 @@ void Configmenu::Placementmenu::setValues(void) {
   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;
+       e = (placement == BScreen::RowSmartPlacement ||
+            placement == BScreen::ColSmartPlacement);
 
-  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());
+  setItemEnabled(9, e);
+  setItemEnabled(10, e);
 }
 
 
@@ -286,90 +331,285 @@ 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);
-    setItemEnabled(4, true);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-
     break;
 
   case BScreen::ColSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, true);
-    setItemSelected(2, false);
-    setItemSelected(3, false);
-    setItemEnabled(4, true);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-
     break;
 
   case BScreen::CascadePlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, false);
-    setItemSelected(2, true);
-    setItemSelected(3, false);
-    setItemEnabled(4, true);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-
     break;
 
   case BScreen::UnderMousePlacement:
     getScreen()->savePlacementPolicy(item->function());
+    break;
 
-    setItemSelected(0, false);
-    setItemSelected(1, false);
-    setItemSelected(2, false);
-    setItemSelected(3, true);
-    setItemEnabled(4, false);
-    setItemEnabled(5, false);
-    setItemEnabled(6, false);
-    setItemEnabled(7, false);
-
+  case BScreen::ClickMousePlacement:
+    getScreen()->savePlacementPolicy(item->function());
     break;
 
   case BScreen::LeftRight:
     getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
-
-    setItemSelected(4, true);
-    setItemSelected(5, false);
-
     break;
 
   case BScreen::RightLeft:
     getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
-
-    setItemSelected(4, false);
-    setItemSelected(5, true);
-
     break;
 
   case BScreen::TopBottom:
     getScreen()->saveColPlacementDirection(BScreen::TopBottom);
-
-    setItemSelected(6, true);
-    setItemSelected(7, false);
-
     break;
 
   case BScreen::BottomTop:
     getScreen()->saveColPlacementDirection(BScreen::BottomTop);
+    break;
+  
+  case BScreen::IgnoreShaded:
+    getScreen()->savePlaceIgnoreShaded(! 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();
+}
+
 
-    setItemSelected(6, false);
-    setItemSelected(7, true);
+void Configmenu::WindowToEdgeSnapmenu::setValues(void) {
+  setItemSelected(0, (getScreen()->getWindowToEdgeSnap() ==
+                      BScreen::WindowNoSnap));
+  setItemSelected(1, (getScreen()->getWindowToEdgeSnap() ==
+                      BScreen::WindowSnap));
+  setItemSelected(2, (getScreen()->getWindowToEdgeSnap() ==
+                      BScreen::WindowResistance));
+}
+
+
+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();
+}
+
+
+#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
+
+#ifdef    XFT
+Configmenu::Xftmenu::Xftmenu(Configmenu *cm):
+  Basemenu(cm->getScreen()) {
+  setLabel(i18n(ConfigmenuSet, ConfigmenuXftOptions, "Xft Font Options"));
+  setInternalMenu();
+
+  insert(i18n(ConfigmenuSet, ConfigmenuXftAA, "Anti-Alias Text"), 1);
+  insert(i18n(ConfigmenuSet, ConfigmenuXftShadow, "Drop Shadows Under Text"),
+         2);
+
+  update();
+  setValues();
+}
+
+
+void Configmenu::Xftmenu::setValues(void) {
+  setItemSelected(0, getScreen()->doAAFonts());
+  setItemEnabled(1, getScreen()->doAAFonts());
+  setItemSelected(1, getScreen()->doShadowFonts());
+}
+
+
+void Configmenu::Xftmenu::reconfigure(void) {
+  setValues();
+  Basemenu::reconfigure();
+}
+
+
+void Configmenu::Xftmenu::itemSelected(int button, unsigned int index) {
+  if (button != 1)
+    return;
+
+  BasemenuItem *item = find(index);
+
+  if (! item->function())
+    return;
+
+  switch (item->function()) {
+  case 1: // anti-alias text
+    getScreen()->saveAAFonts(! getScreen()->doAAFonts());
+    break;
+
+  case 2: // drop shadows
+    getScreen()->saveShadowFonts(! getScreen()->doShadowFonts());
+    break;
+  }
+
+  setValues();
 }
+#endif // XFT