fix for not changing clients' border widths on them
This commit is contained in:
parent
2e529e3ff3
commit
5883164b19
2 changed files with 129 additions and 7 deletions
|
@ -2819,9 +2819,16 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
|
||||||
|
|
||||||
/* if the client is enlarging, then resize the client before the frame */
|
/* if the client is enlarging, then resize the client before the frame */
|
||||||
if (send_resize_client && (w > oldw || h > oldh)) {
|
if (send_resize_client && (w > oldw || h > oldh)) {
|
||||||
XMoveResizeWindow(ob_display, self->window,
|
XWindowChanges changes;
|
||||||
-self->border_width, -self->border_width,
|
changes.x = -self->border_width;
|
||||||
MAX(w, oldw), MAX(h, oldh));
|
changes.y = -self->border_width;
|
||||||
|
changes.width = MAX(w, oldw);
|
||||||
|
changes.height = MAX(h, oldh);
|
||||||
|
changes.border_width = self->border_width;
|
||||||
|
XConfigureWindow(ob_display, self->window,
|
||||||
|
(moved ? CWX|CWY : 0) |
|
||||||
|
(resized ? CWWidth|CWHeight|CWBorderWidth : 0),
|
||||||
|
&changes);
|
||||||
/* resize the plate to show the client padding color underneath */
|
/* resize the plate to show the client padding color underneath */
|
||||||
frame_adjust_client_area(self->frame);
|
frame_adjust_client_area(self->frame);
|
||||||
}
|
}
|
||||||
|
@ -2878,10 +2885,18 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
|
||||||
/* resize the plate to show the client padding color underneath */
|
/* resize the plate to show the client padding color underneath */
|
||||||
frame_adjust_client_area(self->frame);
|
frame_adjust_client_area(self->frame);
|
||||||
|
|
||||||
if (send_resize_client)
|
if (send_resize_client) {
|
||||||
XMoveResizeWindow(ob_display, self->window,
|
XWindowChanges changes;
|
||||||
-self->border_width, -self->border_width,
|
changes.x = -self->border_width;
|
||||||
w, h);
|
changes.y = -self->border_width;
|
||||||
|
changes.width = w;
|
||||||
|
changes.height = h;
|
||||||
|
changes.border_width = self->border_width;
|
||||||
|
XConfigureWindow(ob_display, self->window,
|
||||||
|
(moved ? CWX|CWY : 0) |
|
||||||
|
(resized ? CWWidth|CWHeight|CWBorderWidth : 0),
|
||||||
|
&changes);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
XFlush(ob_display);
|
XFlush(ob_display);
|
||||||
|
|
107
tests/borderchange.c
Normal file
107
tests/borderchange.c
Normal file
|
@ -0,0 +1,107 @@
|
||||||
|
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
|
||||||
|
|
||||||
|
borderchange.c for the Openbox window manager
|
||||||
|
Copyright (c) 2003-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 <unistd.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
|
int main () {
|
||||||
|
Display *display;
|
||||||
|
Window win;
|
||||||
|
XEvent report;
|
||||||
|
XEvent msg;
|
||||||
|
int x=10,y=10,h=200,w=200;
|
||||||
|
|
||||||
|
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));
|
||||||
|
XSelectInput(display, win, ExposureMask | StructureNotifyMask);
|
||||||
|
|
||||||
|
XMapWindow(display, win);
|
||||||
|
XFlush(display);
|
||||||
|
|
||||||
|
while (XPending(display)) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sleep(2);
|
||||||
|
|
||||||
|
printf("setting border to 0\n");
|
||||||
|
XSetWindowBorderWidth(display, win, 0);
|
||||||
|
XFlush(display);
|
||||||
|
|
||||||
|
while (XPending(display)) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sleep(2);
|
||||||
|
|
||||||
|
printf("setting border to 50\n");
|
||||||
|
XSetWindowBorderWidth(display, win, 50);
|
||||||
|
XFlush(display);
|
||||||
|
|
||||||
|
while (XPending(display)) {
|
||||||
|
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 0;
|
||||||
|
}
|
Loading…
Reference in a new issue