summaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc68
1 files changed, 3 insertions, 65 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index a5f9d9b..610ae13 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.149 2003/05/15 12:00:46 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.150 2003/05/15 23:30:03 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -838,7 +838,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
838 838
839 if ((e->xcrossing.window == e->xcrossing.root) && 839 if ((e->xcrossing.window == e->xcrossing.root) &&
840 (screen = searchScreen(e->xcrossing.window))) { 840 (screen = searchScreen(e->xcrossing.window))) {
841 screen->getImageControl()->installRootColormap(); 841 screen->imageControl().installRootColormap();
842 842
843 } 843 }
844 844
@@ -902,7 +902,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
902 902
903 if (be.button == 1) { 903 if (be.button == 1) {
904 if (! screen->isRootColormapInstalled()) 904 if (! screen->isRootColormapInstalled())
905 screen->getImageControl()->installRootColormap(); 905 screen->imageControl().installRootColormap();
906 906
907 if (screen->getWorkspacemenu()->isVisible()) 907 if (screen->getWorkspacemenu()->isVisible())
908 screen->getWorkspacemenu()->hide(); 908 screen->getWorkspacemenu()->hide();
@@ -2070,68 +2070,6 @@ void Fluxbox::load_rc(BScreen &screen) {
2070 } else 2070 } else
2071 screen.savePlacementPolicy(BScreen::ROWSMARTPLACEMENT); 2071 screen.savePlacementPolicy(BScreen::ROWSMARTPLACEMENT);
2072 2072
2073#ifdef SLIT
2074 sprintf(name_lookup, "session.screen%d.slit.placement", screen_number);
2075 sprintf(class_lookup, "Session.Screen%d.Slit.Placement", screen_number);
2076 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
2077 &value)) {
2078 if (! strncasecmp(value.addr, "TopLeft", value.size))
2079 screen.saveSlitPlacement(Slit::TOPLEFT);
2080 else if (! strncasecmp(value.addr, "CenterLeft", value.size))
2081 screen.saveSlitPlacement(Slit::CENTERLEFT);
2082 else if (! strncasecmp(value.addr, "BottomLeft", value.size))
2083 screen.saveSlitPlacement(Slit::BOTTOMLEFT);
2084 else if (! strncasecmp(value.addr, "TopCenter", value.size))
2085 screen.saveSlitPlacement(Slit::TOPCENTER);
2086 else if (! strncasecmp(value.addr, "BottomCenter", value.size))
2087 screen.saveSlitPlacement(Slit::BOTTOMCENTER);
2088 else if (! strncasecmp(value.addr, "TopRight", value.size))
2089 screen.saveSlitPlacement(Slit::TOPRIGHT);
2090 else if (! strncasecmp(value.addr, "BottomRight", value.size))
2091 screen.saveSlitPlacement(Slit::BOTTOMRIGHT);
2092 else
2093 screen.saveSlitPlacement(Slit::CENTERRIGHT);
2094 } else
2095 screen.saveSlitPlacement(Slit::CENTERRIGHT);
2096
2097 sprintf(name_lookup, "session.screen%d.slit.direction", screen_number);
2098 sprintf(class_lookup, "Session.Screen%d.Slit.Direction", screen_number);
2099 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
2100 &value)) {
2101 if (! strncasecmp(value.addr, "Horizontal", value.size))
2102 screen.saveSlitDirection(Slit::HORIZONTAL);
2103 else
2104 screen.saveSlitDirection(Slit::VERTICAL);
2105 } else
2106 screen.saveSlitDirection(Slit::VERTICAL);
2107
2108
2109 sprintf(name_lookup, "session.screen%d.slit.autoHide", screen_number);
2110 sprintf(class_lookup, "Session.Screen%d.Slit.AutoHide", screen_number);
2111 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
2112 &value)) {
2113 if (! strncasecmp(value.addr, "True", value.size))
2114 screen.saveSlitAutoHide(true);
2115 else
2116 screen.saveSlitAutoHide(false);
2117 } else
2118 screen.saveSlitAutoHide(false);
2119 /*
2120 #ifdef XINERAMA
2121 int tmp_head;
2122 sprintf(name_lookup, "session.screen%d.slit.onHead", screen_number);
2123 sprintf(class_lookup, "Session.Screen%d.Slit.OnHead", screen_number);
2124 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
2125 &value)) {
2126 if (sscanf(value.addr, "%d", &tmp_head) != 1)
2127 tmp_head = 0;
2128 } else
2129 tmp_head = 0;
2130 screen->saveSlitOnHead(tmp_head);
2131 #endif // XINERAMA
2132 */
2133#endif // SLIT
2134
2135#ifdef HAVE_STRFTIME 2073#ifdef HAVE_STRFTIME
2136 sprintf(name_lookup, "session.screen%d.strftimeFormat", screen_number); 2074 sprintf(name_lookup, "session.screen%d.strftimeFormat", screen_number);
2137 sprintf(class_lookup, "Session.Screen%d.StrftimeFormat", screen_number); 2075 sprintf(class_lookup, "Session.Screen%d.StrftimeFormat", screen_number);