syching with bb-cvs. rm .\#* on make dist-clean. nls updates.

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 1c543bbea69c155fd2de41a7630783f40a0e5554..266d0e7318a6b1ffa807a48699e4e7b899eada73 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -90,6 +90,8 @@ extern "C" {
 #endif // HAVE_LIBGEN_H
 }
 
+#include <assert.h>
+
 #include <algorithm>
 #include <string>
 using std::string;
@@ -653,7 +655,7 @@ void Blackbox::process_event(XEvent *e) {
 
   case ClientMessage: {
     if (e->xclient.format == 32) {
-      if (e->xclient.message_type == getWMChangeStateAtom()) {
+      if (e->xclient.message_type == xatom->getAtom(XAtom::wm_change_state)) {
         BlackboxWindow *win = searchWindow(e->xclient.window);
         if (! win || ! win->validateClient()) return;
 
@@ -894,6 +896,18 @@ 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
@@ -911,6 +925,8 @@ 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));
@@ -958,6 +974,14 @@ 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;
 }