some old changes to grav.c test, it wasn't a valid test before.

when a window gets reconfigured, try keep it on the monitor if it was before.

diff --git a/openbox/client.c b/openbox/client.c
index 6b8635be8eaa9d69c40930f6dca485ce4cf18e01..4abff4c50984a5296b3ac540ba9e487d558e2304 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -754,8 +754,6 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
     Rect *a;
     gint ox = *x, oy = *y;
 
-    /* XXX figure out if it is on screen now, and be rude if it is */
-
     /* get where the frame would be */
     frame_client_gravity(self->frame, x, y, w, h);
 
@@ -781,6 +779,15 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
             *y = a->y - self->frame->area.width*9/10;
     }
 
+    /* If rudeness wasn't requested, then figure out of the client is currently
+       entirely on the screen. If it is, then be rude even though it wasn't
+       requested */
+    if (!rude) {
+        a = screen_area_monitor(self->desktop, client_monitor(self));
+        if (RECT_CONTAINS_RECT(*a, self->area))
+            rude = TRUE;
+    }
+
     /* This here doesn't let windows even a pixel outside the screen,
      * when called from client_manage, programs placing themselves are
      * forced completely onscreen, while things like

diff --git a/tests/grav.c b/tests/grav.c
index 0fe32d4983ad35cefe9e44f79c0e8b771f884038..5aeed8bc4c79722b2532aabc4f7bf692dcf17e6e 100644 (file)
--- a/tests/grav.c
+++ b/tests/grav.c
@@ -49,7 +49,8 @@ int main () {
   XMapWindow(display, win);
   XFlush(display);
 
-  XMoveWindow(display, win, 960-1, 600-1);
+  XMoveResizeWindow(display, win, 960-1, 600-1, 600, 150);
+  /*XResizeWindow(display, win, 600, 150);*/
 
   XSelectInput(display, win, ExposureMask | StructureNotifyMask);
 

diff --git a/tests/resize.c b/tests/resize.c
new file mode 100644 (file)
index 0000000..4eecca2
--- /dev/null
+++ b/tests/resize.c
@@ -0,0 +1,69 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   resize.c for the Openbox window manager
+   Copyright (c) 2007        Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include <stdio.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+int main () {
+  Display   *display;
+  Window     win;
+  XEvent     report;
+  int        x=10,y=10,h=100,w=400;
+
+  display = XOpenDisplay(NULL);
+
+  if (display == NULL) {
+    fprintf(stderr, "couldn't connect to X server :0\n");
+    return 0;
+  }
+
+  win = XCreateWindow(display, RootWindow(display, 0),
+                     x, y, w, h, 10, CopyFromParent, CopyFromParent,
+                     CopyFromParent, 0, NULL);
+
+  XSetWindowBackground(display,win,WhitePixel(display,0)); 
+
+  XMapWindow(display, win);
+  XFlush(display);
+
+  sleep(5);
+  XResizeWindow(display, win, 600, 150);
+
+  XSelectInput(display, win, ExposureMask | StructureNotifyMask);
+
+  while (1) {
+    XNextEvent(display, &report);
+
+    switch (report.type) {
+    case Expose:
+      printf("exposed\n");
+      break;
+    case ConfigureNotify:
+      x = report.xconfigure.x;
+      y = report.xconfigure.y;
+      w = report.xconfigure.width;
+      h = report.xconfigure.height;
+      printf("confignotify %i,%i-%ix%i\n",x,y,w,h);
+      break;
+    }
+
+  }
+
+  return 1;
+}