X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=2e78cb7672ff439db78dce1eb6f0f3a219b332dd;hb=f8a47de5ec444c452093371e3db16857eb39a490;hp=7bf726456b2ec00c5f03ad8a667cc217e6616aa6;hpb=0c2f0e0b5e974bace6b7488541fac0fed23c5bc9;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index 7bf72645..2e78cb76 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -151,10 +151,15 @@ void Client::getDesktop()
 {
   // defaults to the current desktop
   _desktop = openbox->screen(_screen)->desktop();
+  unsigned int d;
 
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_desktop,
                          otk::Property::atoms.cardinal,
-                         (long unsigned*)&_desktop)) {
+                         (long unsigned*)&d)) {
+    if (d >= openbox->screen(_screen)->numDesktops() &&
+        d != 0xffffffff)
+      d = openbox->screen(_screen)->numDesktops() - 1;
+    _desktop = d;
 #ifdef DEBUG
 //    printf("Window requested desktop: %ld\n", _desktop);
 #endif
@@ -167,7 +172,7 @@ void Client::getType()
   _type = (WindowType) -1;
   
   unsigned long *val;
-  unsigned long num = (unsigned) -1;
+  unsigned long num;
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_window_type,
                          otk::Property::atoms.atom, &num, &val)) {
     // use the first value that we know about in the array
@@ -372,7 +377,7 @@ void Client::getState()
     _iconic = _skip_taskbar = _skip_pager = false;
   
   unsigned long *state;
-  unsigned long num = (unsigned) -1;
+  unsigned long num;
   
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_state,
                          otk::Property::atoms.atom, &num, &state)) {
@@ -576,6 +581,17 @@ void Client::updateWMHints(bool initstate)
     } else // no group!
       _group = None;
 
+    if (hints->flags & IconPixmapHint) {
+      updateKwmIcon(); // try get the kwm icon first, this is a fallback only
+      if (_pixmap_icon == None) {
+        _pixmap_icon = hints->icon_pixmap;
+        if (hints->flags & IconMaskHint)
+          _pixmap_icon_mask = hints->icon_mask;
+        else
+          _pixmap_icon_mask = None;
+      }
+    }
+
     XFree(hints);
   }
 
@@ -706,7 +722,7 @@ void Client::updateTransientFor()
 
 void Client::updateIcons()
 {
-  unsigned long num = (unsigned) -1;
+  unsigned long num;
   unsigned long *data;
   unsigned long w, h, i = 0;
 
@@ -758,15 +774,15 @@ void Client::updateIcons()
 
 void Client::updateKwmIcon()
 {
-  _kwm_icon = _kwm_icon_mask = None;
+  _pixmap_icon = _pixmap_icon_mask = None;
 
   unsigned long num = 2;
   Pixmap *data;
   if (otk::Property::get(_window, otk::Property::atoms.kwm_win_icon,
                          otk::Property::atoms.kwm_win_icon, &num, &data)) {
-    if (num >= 2) {
-      _kwm_icon = data[0];
-      _kwm_icon_mask = data[1];
+    if (num == 2) {
+      _pixmap_icon = data[0];
+      _pixmap_icon_mask = data[1];
     }
     delete [] data;
   }
@@ -870,15 +886,16 @@ void Client::showhide()
   else      frame->hide();
 }
 
-void Client::setState(StateAction action, long data1, long data2)
+void Client::setState(Atom action, long data1, long data2)
 {
   bool shadestate = _shaded;
   bool fsstate = _fullscreen;
   bool maxh = _max_horz;
   bool maxv = _max_vert;
 
-  if (!(action == State_Add || action == State_Remove ||
-        action == State_Toggle))
+  if (!(action == otk::Property::atoms.net_wm_state_add ||
+        action == otk::Property::atoms.net_wm_state_remove ||
+        action == otk::Property::atoms.net_wm_state_toggle))
     return; // an invalid action was passed to the client message, ignore it
 
   for (int i = 0; i < 2; ++i) {
@@ -887,28 +904,37 @@ void Client::setState(StateAction action, long data1, long data2)
     if (! state) continue;
 
     // if toggling, then pick whether we're adding or removing
-    if (action == State_Toggle) {
+    if (action == otk::Property::atoms.net_wm_state_toggle) {
       if (state == otk::Property::atoms.net_wm_state_modal)
-        action = _modal ? State_Remove : State_Add;
+        action = _modal ? otk::Property::atoms.net_wm_state_remove :
+                          otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_maximized_vert)
-        action = _max_vert ? State_Remove : State_Add;
+        action = _max_vert ? otk::Property::atoms.net_wm_state_remove :
+                             otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_maximized_horz)
-        action = _max_horz ? State_Remove : State_Add;
+        action = _max_horz ? otk::Property::atoms.net_wm_state_remove :
+                             otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_shaded)
-        action = _shaded ? State_Remove : State_Add;
+        action = _shaded ? otk::Property::atoms.net_wm_state_remove :
+                           otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_skip_taskbar)
-        action = _skip_taskbar ? State_Remove : State_Add;
+        action = _skip_taskbar ? otk::Property::atoms.net_wm_state_remove :
+                                 otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_skip_pager)
-        action = _skip_pager ? State_Remove : State_Add;
+        action = _skip_pager ? otk::Property::atoms.net_wm_state_remove :
+                               otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_fullscreen)
-        action = _fullscreen ? State_Remove : State_Add;
+        action = _fullscreen ? otk::Property::atoms.net_wm_state_remove :
+                               otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_above)
-        action = _above ? State_Remove : State_Add;
+        action = _above ? otk::Property::atoms.net_wm_state_remove :
+                          otk::Property::atoms.net_wm_state_add;
       else if (state == otk::Property::atoms.net_wm_state_below)
-        action = _below ? State_Remove : State_Add;
+        action = _below ? otk::Property::atoms.net_wm_state_remove :
+                          otk::Property::atoms.net_wm_state_add;
     }
     
-    if (action == State_Add) {
+    if (action == otk::Property::atoms.net_wm_state_add) {
       if (state == otk::Property::atoms.net_wm_state_modal) {
         if (_modal) continue;
         _modal = true;
@@ -933,7 +959,7 @@ void Client::setState(StateAction action, long data1, long data2)
         _below = true;
       }
 
-    } else { // action == State_Remove
+    } else { // action == otk::Property::atoms.net_wm_state_remove
       if (state == otk::Property::atoms.net_wm_state_modal) {
         if (!_modal) continue;
         _modal = false;
@@ -1097,7 +1123,7 @@ void Client::clientMessageHandler(const XClientMessageEvent &e)
             e.data.l[0] == 2 ? "Toggle" : "INVALID"),
            e.data.l[1], e.data.l[2], _window);
 #endif
-    setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]);
+    setState(e.data.l[0], e.data.l[1], e.data.l[2]);
   } else if (e.message_type == otk::Property::atoms.net_close_window) {
 #ifdef DEBUG
     printf("net_close_window for 0x%lx\n", _window);
@@ -1129,6 +1155,14 @@ void Client::clientMessageHandler(const XClientMessageEvent &e)
     focus();
     if (e.data.l[1])
       openbox->screen(_screen)->raiseWindow(this);
+  } else if (e.message_type == otk::Property::atoms.openbox_restack_window) {
+#ifdef DEBUG
+    printf("openbox_restack_window for 0x%lx\n", _window);
+#endif
+    if (e.data.l[0] == 0)
+      openbox->screen(_screen)->raiseWindow(this);
+    else if (e.data.l[0] == 1)
+      openbox->screen(_screen)->lowerWindow(this);
   }
 }
 
@@ -1254,15 +1288,15 @@ const Icon *Client::icon(const otk::Size &s) const
   return &_icons[li];
 }
 
-void Client::move(int x, int y)
+void Client::move(int x, int y, bool final)
 {
   if (!(_functions & Func_Move)) return;
   frame->frameGravity(x, y); // get the client's position based on x,y for the
                              // frame
-  internal_move(x, y);
+  internal_move(x, y, final);
 }
 
-void Client::internal_move(int x, int y)
+void Client::internal_move(int x, int y, bool final)
 {
   _area = otk::Rect(otk::Point(x, y), _area.size());
 
@@ -1272,28 +1306,30 @@ void Client::internal_move(int x, int y)
 
     // send synthetic configure notify (we don't need to if we aren't mapped
     // yet)
-    XEvent event;
-    event.type = ConfigureNotify;
-    event.xconfigure.display = **otk::display;
-    event.xconfigure.event = _window;
-    event.xconfigure.window = _window;
+    if (final) {
+      XEvent event;
+      event.type = ConfigureNotify;
+      event.xconfigure.display = **otk::display;
+      event.xconfigure.event = _window;
+      event.xconfigure.window = _window;
     
-    // root window coords with border in mind
-    event.xconfigure.x = x - _border_width + frame->size().left;
-    event.xconfigure.y = y - _border_width + frame->size().top;
+      // root window coords with border in mind
+      event.xconfigure.x = x - _border_width + frame->size().left;
+      event.xconfigure.y = y - _border_width + frame->size().top;
     
-    event.xconfigure.width = _area.width();
-    event.xconfigure.height = _area.height();
-    event.xconfigure.border_width = _border_width;
-    event.xconfigure.above = frame->plate();
-    event.xconfigure.override_redirect = False;
-    XSendEvent(event.xconfigure.display, event.xconfigure.window, False,
-               StructureNotifyMask, &event);
+      event.xconfigure.width = _area.width();
+      event.xconfigure.height = _area.height();
+      event.xconfigure.border_width = _border_width;
+      event.xconfigure.above = frame->plate();
+      event.xconfigure.override_redirect = False;
+      XSendEvent(event.xconfigure.display, event.xconfigure.window, False,
+                 StructureNotifyMask, &event);
 #if 0//def DEBUG
-    printf("Sent synthetic ConfigureNotify %d,%d %d,%d to 0x%lx\n",
-           event.xconfigure.x, event.xconfigure.y, event.xconfigure.width,
-           event.xconfigure.height, event.xconfigure.window);
+      printf("Sent synthetic ConfigureNotify %d,%d %d,%d to 0x%lx\n",
+             event.xconfigure.x, event.xconfigure.y, event.xconfigure.width,
+             event.xconfigure.height, event.xconfigure.window);
 #endif
+    }
   }
 }
 
@@ -1512,7 +1548,7 @@ void Client::maximize(bool max, int dir, bool savearea)
       if (otk::Property::get(_window, otk::Property::atoms.openbox_premax,
                              otk::Property::atoms.cardinal, &n,
                              (long unsigned**) &readdim)) {
-        if (n >= 4) {
+        if (n == 4) {
           if (_max_horz) {
             dimensions[0] = readdim[0];
             dimensions[2] = readdim[2];
@@ -1544,7 +1580,7 @@ void Client::maximize(bool max, int dir, bool savearea)
     if (otk::Property::get(_window, otk::Property::atoms.openbox_premax,
                            otk::Property::atoms.cardinal, &n,
                            (long unsigned**) &dimensions)) {
-      if (n >= 4) {
+      if (n == 4) {
         if (dir == 0 || dir == 1) { // horz
           x = (signed int)dimensions[0];
           w = (signed int)dimensions[2];
@@ -1627,7 +1663,7 @@ void Client::fullscreen(bool fs, bool savearea)
     if (otk::Property::get(_window, otk::Property::atoms.openbox_premax,
                            otk::Property::atoms.cardinal, &n,
                            (long unsigned**) &dimensions)) {
-      if (n >= 4) {
+      if (n == 4) {
         x = dimensions[0];
         y = dimensions[1];
         w = dimensions[2];