X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWindow.cc;h=32fe86c75c373205b0ea01d379cf1bc96749deb1;hb=5033ce0a24336668f4705a17063f27d842da461b;hp=058390632e16cd35bd2e51aa9c8ef30e0365fecd;hpb=3ad19e4a45ce75209e1fb7607f915244895a669a;p=chaz%2Fopenbox

diff --git a/src/Window.cc b/src/Window.cc
index 05839063..32fe86c7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -179,7 +179,7 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
 
   blackbox->saveWindowSearch(frame.window, this);
   
-  frame.plate = createChildWindow(frame.window);
+  frame.plate = createChildWindow(frame.window, ExposureMask);
   blackbox->saveWindowSearch(frame.plate, this);
 
   // determine if this is a transient window
@@ -474,9 +474,7 @@ Window BlackboxWindow::createToplevelWindow(void) {
   attrib_create.background_pixmap = None;
   attrib_create.colormap = screen->getColormap();
   attrib_create.override_redirect = True;
-  attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
-                             ButtonMotionMask |
-                             EnterWindowMask | LeaveWindowMask;
+  attrib_create.event_mask = EnterWindowMask | LeaveWindowMask;
 
   return XCreateWindow(blackbox->getXDisplay(), screen->getRootWindow(),
                        0, 0, 1, 1, frame.border_w, screen->getDepth(),
@@ -489,14 +487,15 @@ Window BlackboxWindow::createToplevelWindow(void) {
  * Creates a child window, and optionally associates a given cursor with
  * the new window.
  */
-Window BlackboxWindow::createChildWindow(Window parent, Cursor cursor) {
+Window BlackboxWindow::createChildWindow(Window parent,
+                                         unsigned long event_mask,
+                                         Cursor cursor) {
   XSetWindowAttributes attrib_create;
   unsigned long create_mask = CWBackPixmap | CWBorderPixel |
                               CWEventMask;
 
   attrib_create.background_pixmap = None;
-  attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
-                             ButtonMotionMask | ExposureMask;
+  attrib_create.event_mask = event_mask;
 
   if (cursor) {
     create_mask |= CWCursor;
@@ -647,15 +646,23 @@ void BlackboxWindow::decorateLabel(void) {
 
 
 void BlackboxWindow::createHandle(void) {
-  frame.handle = createChildWindow(frame.window);
+  frame.handle = createChildWindow(frame.window,
+                                   ButtonPressMask | ButtonReleaseMask |
+                                   ButtonMotionMask | ExposureMask);
   blackbox->saveWindowSearch(frame.handle, this);
 
   frame.left_grip =
-    createChildWindow(frame.handle, blackbox->getLowerLeftAngleCursor());
+    createChildWindow(frame.handle,
+                      ButtonPressMask | ButtonReleaseMask |
+                      ButtonMotionMask | ExposureMask,
+                      blackbox->getLowerLeftAngleCursor());
   blackbox->saveWindowSearch(frame.left_grip, this);
 
   frame.right_grip =
-    createChildWindow(frame.handle, blackbox->getLowerRightAngleCursor());
+    createChildWindow(frame.handle,
+                      ButtonPressMask | ButtonReleaseMask |
+                      ButtonMotionMask | ExposureMask,
+                      blackbox->getLowerRightAngleCursor());
   blackbox->saveWindowSearch(frame.right_grip, this);
 }
 
@@ -687,8 +694,12 @@ void BlackboxWindow::destroyHandle(void) {
 
 
 void BlackboxWindow::createTitlebar(void) {
-  frame.title = createChildWindow(frame.window);
-  frame.label = createChildWindow(frame.title);
+  frame.title = createChildWindow(frame.window,
+                                  ButtonPressMask | ButtonReleaseMask |
+                                  ButtonMotionMask | ExposureMask);
+  frame.label = createChildWindow(frame.title,
+                                  ButtonPressMask | ButtonReleaseMask |
+                                  ButtonMotionMask | ExposureMask);
   blackbox->saveWindowSearch(frame.title, this);
   blackbox->saveWindowSearch(frame.label, this);
 
@@ -740,7 +751,10 @@ void BlackboxWindow::destroyTitlebar(void) {
 
 void BlackboxWindow::createCloseButton(void) {
   if (frame.title != None) {
-    frame.close_button = createChildWindow(frame.title);
+    frame.close_button = createChildWindow(frame.title,
+                                           ButtonPressMask |
+                                           ButtonReleaseMask |
+                                           ButtonMotionMask | ExposureMask);
     blackbox->saveWindowSearch(frame.close_button, this);
   }
 }
@@ -755,7 +769,10 @@ void BlackboxWindow::destroyCloseButton(void) {
 
 void BlackboxWindow::createIconifyButton(void) {
   if (frame.title != None) {
-    frame.iconify_button = createChildWindow(frame.title);
+    frame.iconify_button = createChildWindow(frame.title,
+                                             ButtonPressMask |
+                                             ButtonReleaseMask |
+                                             ButtonMotionMask | ExposureMask);
     blackbox->saveWindowSearch(frame.iconify_button, this);
   }
 }
@@ -770,7 +787,10 @@ void BlackboxWindow::destroyIconifyButton(void) {
 
 void BlackboxWindow::createMaximizeButton(void) {
   if (frame.title != None) {
-    frame.maximize_button = createChildWindow(frame.title);
+    frame.maximize_button = createChildWindow(frame.title,
+                                              ButtonPressMask |
+                                              ButtonReleaseMask |
+                                              ButtonMotionMask | ExposureMask);
     blackbox->saveWindowSearch(frame.maximize_button, this);
   }
 }
@@ -909,8 +929,7 @@ void BlackboxWindow::grabButtons(void) {
   // alt+middle lowers the window
   blackbox->grabButton(Button2, mod_mask, frame.window, True,
                        ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
-                       frame.window, None,
-                       screen->allowScrollLock());
+                       frame.window, None, screen->allowScrollLock());
 }
 
 
@@ -1070,6 +1089,15 @@ void BlackboxWindow::getWMName(void) {
   client.title = i18n(WindowSet, WindowUnnamed, "Unnamed");
   xatom->setValue(client.window, XAtom::net_wm_visible_name, XAtom::utf8,
                   client.title);
+
+#define DEBUG_WITH_ID 1
+#ifdef DEBUG_WITH_ID
+  // the 16 is the 8 chars of the debug text plus the number
+  char *tmp = new char[client.title.length() + 16];
+  sprintf(tmp, "%s; id: 0x%lx", client.title.c_str(), client.window);
+  client.title = tmp;
+  delete tmp;
+#endif
 }
 
 
@@ -1190,14 +1218,11 @@ void BlackboxWindow::getWMNormalHints(void) {
     client.max_aspect_x = client.max_aspect_y = 1;
 #endif
 
-  /*
-    use the full screen, not the strut modified size. otherwise when the
-    availableArea changes max_width/height will be incorrect and lead to odd
-    rendering bugs.
-  */
-  const Rect& screen_area = screen->getRect();
-  client.max_width = screen_area.width();
-  client.max_height = screen_area.height();
+  // don't limit the size of a window, the default max width is the biggest
+  // possible
+  client.max_width = (unsigned) -1;
+  client.max_height = (unsigned) -1;
+
 
   if (! XGetWMNormalHints(blackbox->getXDisplay(), client.window,
                           &sizehint, &icccm_mask))
@@ -1606,6 +1631,14 @@ void BlackboxWindow::configureShape(void) {
                           ShapeBounding, 0, 0, xrect, num,
                           ShapeUnion, Unsorted);
 }
+
+
+void BlackboxWindow::clearShape(void) {
+  XShapeCombineMask(blackbox->getXDisplay(), frame.window, ShapeBounding,
+                    frame.margin.left - frame.border_w,
+                    frame.margin.top - frame.border_w,
+                    None, ShapeSet);
+}
 #endif // SHAPE
 
 
@@ -2610,7 +2643,7 @@ void BlackboxWindow::redrawCloseButton(bool pressed) const {
   XClearWindow(blackbox->getXDisplay(), frame.close_button);
 
   BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
-           screen->getWindowStyle()->b_pic_unfocus);
+           screen->getWindowStyle()->b_pic_unfocus, 0, 2);
   XDrawLine(blackbox->getXDisplay(), frame.close_button, pen.gc(),
             2, 2, (frame.button_w - 3), (frame.button_w - 3));
   XDrawLine(blackbox->getXDisplay(), frame.close_button, pen.gc(),
@@ -3596,34 +3629,42 @@ void BlackboxWindow::doResize(int x_root, int y_root) {
 
   unsigned int gw, gh;
   Corner anchor;
+  int dx, dy; // the amount of change in the size of the window
 
   switch (resize_dir) {
   case BottomLeft:
     anchor = TopRight;
-    frame.changing.setSize(frame.rect.width() - (x_root - frame.grab_x),
-                           frame.rect.height() + (y_root - frame.grab_y));
+    dx = - (x_root - frame.grab_x);
+    dy = + (y_root - frame.grab_y);
     break;
   case BottomRight:
     anchor = TopLeft;
-    frame.changing.setSize(frame.rect.width() + (x_root - frame.grab_x),
-                           frame.rect.height() + (y_root - frame.grab_y));
+    dx = + (x_root - frame.grab_x);
+    dy = + (y_root - frame.grab_y);
     break;
   case TopLeft:
     anchor = BottomRight;
-    frame.changing.setSize(frame.rect.width() - (x_root - frame.grab_x),
-                           frame.rect.height() - (y_root - frame.grab_y));
+    dx = - (x_root - frame.grab_x);
+    dy = - (y_root - frame.grab_y);
     break;
   case TopRight:
     anchor = BottomLeft;
-    frame.changing.setSize(frame.rect.width() + (x_root - frame.grab_x),
-                           frame.rect.height() - (y_root - frame.grab_y));
+    dx = + (x_root - frame.grab_x);
+    dy = - (y_root - frame.grab_y);
     break;
 
   default:
     assert(false); // unhandled Corner
     return;        // unreachable, for the compiler
   }
-  
+
+  // make sure the user cant resize the window smaller than 0, which makes it
+  // wrap around and become huge
+  if (dx < -(signed)client.rect.width()) dx = -(signed)client.rect.width();
+  if (dy < -(signed)client.rect.height()) dy = -(signed)client.rect.height();
+
+  frame.changing.setSize(frame.rect.width() + dx, frame.rect.height() + dy);
+
   constrain(anchor, &gw, &gh);
 
   XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
@@ -3752,9 +3793,15 @@ void BlackboxWindow::leaveNotifyEvent(const XCrossingEvent*) {
 
 
 #ifdef    SHAPE
-void BlackboxWindow::shapeEvent(XShapeEvent *) {
-  if (blackbox->hasShapeExtensions() && flags.shaped) {
-    configureShape();
+void BlackboxWindow::shapeEvent(XShapeEvent *e) {
+  if (blackbox->hasShapeExtensions()) {
+    if (! e->shaped && flags.shaped) {
+      clearShape();
+      flags.shaped = False;
+    } else if (e->shaped) {
+      configureShape();
+      flags.shaped = True;
+    }
   }
 }
 #endif // SHAPE