change to match blackbox

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 266d0e7318a6b1ffa807a48699e4e7b899eada73..56782248dddd5b9a3ef6802df26ef17e8f20cd0c 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -666,10 +666,9 @@ void Blackbox::process_event(XEvent *e) {
       } else if(e->xclient.message_type == getBlackboxChangeWorkspaceAtom()) {
         BScreen *screen = searchScreen(e->xclient.window);
 
-        if (screen && e->xclient.data.l[0] >= 0 &&
-            e->xclient.data.l[0] <
-            static_cast<signed>(screen->getWorkspaceCount()))
-          screen->changeWorkspaceID(e->xclient.data.l[0]);
+        unsigned int workspace = e->xclient.data.l[0];
+        if (screen && workspace < screen->getWorkspaceCount())
+          screen->changeWorkspaceID(workspace);
       } else if (e->xclient.message_type == getBlackboxChangeWindowFocusAtom()) {
         BlackboxWindow *win = searchWindow(e->xclient.window);
 
@@ -896,18 +895,6 @@ void Blackbox::shutdown(void) {
 }
 
 
-void Blackbox::saveWindowToWindowSnap(bool s) {
-  resource.window_to_window_snap = s;
-  config.setValue("session.windowToWindowSnap", resource.window_to_window_snap);
-}
-
-
-void Blackbox::saveWindowCornerSnap(bool s) {
-  resource.window_corner_snap = s;
-  config.setValue("session.windowCornerSnap", resource.window_corner_snap);
-}
-
-
 /*
  * Save all values as they are so that the defaults will be written to the rc
  * file
@@ -925,8 +912,6 @@ void Blackbox::save_rc(void) {
   config.setValue("session.cacheMax", resource.cache_max);
   config.setValue("session.styleFile", resource.style_file);
   config.setValue("session.titlebarLayout", resource.titlebar_layout);
-  saveWindowToWindowSnap(resource.window_to_window_snap);
-  saveWindowCornerSnap(resource.window_corner_snap);
   
   std::for_each(screenList.begin(), screenList.end(),
                 std::mem_fun(&BScreen::save_rc));
@@ -974,14 +959,6 @@ void Blackbox::load_rc(void) {
   
   if (! config.getValue("session.titlebarLayout", resource.titlebar_layout))
     resource.titlebar_layout = "ILMC";
-
-  if (! config.getValue("session.windowToWindowSnap",
-                        resource.window_to_window_snap))
-    resource.window_to_window_snap = true;
-
-  if (! config.getValue("session.windowCornerSnap",
-                        resource.window_corner_snap))
-    resource.window_corner_snap = true;
 }