nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source
This commit is contained in:
Dana Jansens 2009-12-17 10:33:39 -05:00
commit 501943b53d
5 changed files with 80 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -73,6 +73,7 @@ tests/grouptran
tests/grouptran2
tests/grouptrancircular
tests/grouptrancircular2
tests/iconifydelay
tests/icons
tests/mapiconic
tests/modal

2
openbox/geom.h
View file

@ -160,6 +160,6 @@ typedef struct _StrutPartial {
(s1).bottom_end == (s2).bottom_end)
#define RANGES_INTERSECT(r1x, r1w, r2x, r2w) \
(r1x < r2x + r2w && r1x + r1w > r2x)
(r1w && r2w && r1x < r2x + r2w && r1x + r1w > r2x)
#endif

3
openbox/resist.c
View file

@ -161,7 +161,8 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
cr = RECT_RIGHT(c->frame->area);
cb = RECT_BOTTOM(c->frame->area);
RECT_SET(desired_area, *x, *y, c->area.width, c->area.height);
RECT_SET(desired_area, c->frame->area.x, c->frame->area.y,
c->frame->area.width, c->frame->area.height);
for (i = 0; i < screen_num_monitors; ++i) {
parea = screen_physical_area_monitor(i);

55
openbox/screen.c
View file

@ -1352,10 +1352,9 @@ static void get_xinerama_screens(Rect **xin_areas, guint *nxin)
void screen_update_areas(void)
{
guint j;
guint i;
gulong *dims;
GList *it;
GSList *sit;
g_free(monitor_area);
get_xinerama_screens(&monitor_area, &screen_num_monitors);
@ -1370,8 +1369,6 @@ void screen_update_areas(void)
config_margins.right_start = RECT_TOP(monitor_area[screen_num_monitors]);
config_margins.right_end = RECT_BOTTOM(monitor_area[screen_num_monitors]);
dims = g_new(gulong, 4 * screen_num_desktops);
RESET_STRUT_LIST(struts_left);
RESET_STRUT_LIST(struts_top);
RESET_STRUT_LIST(struts_right);
@ -1416,48 +1413,14 @@ void screen_update_areas(void)
VALIDATE_STRUTS(struts_bottom, bottom,
monitor_area[screen_num_monitors].height / 2);
/* set up the work area to be full screen across all monitors */
for (j = 0; j < screen_num_desktops; ++j) {
dims[j*4 + 0] =
monitor_area[screen_num_monitors].x;
dims[j*4 + 1] =
monitor_area[screen_num_monitors].y;
dims[j*4 + 2] =
monitor_area[screen_num_monitors].width;
dims[j*4 + 3] =
monitor_area[screen_num_monitors].height;
}
/* calculate the work area from the struts */
for (j = 0; j < screen_num_desktops; ++j) {
gint l = 0, r = 0, t = 0, b = 0;
for (sit = struts_left; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data;
if (s->desktop == j || s->desktop == DESKTOP_ALL)
l = MAX(l, s->strut->left);
}
for (sit = struts_top; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data;
if (s->desktop == j || s->desktop == DESKTOP_ALL)
t = MAX(t, s->strut->top);
}
for (sit = struts_right; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data;
if (s->desktop == j || s->desktop == DESKTOP_ALL)
r = MAX(r, s->strut->right);
}
for (sit = struts_bottom; sit; sit = g_slist_next(sit)) {
ObScreenStrut *s = sit->data;
if (s->desktop == j || s->desktop == DESKTOP_ALL)
b = MAX(b, s->strut->bottom);
}
/* based on these margins, set the work area for the desktop */
dims[j*4 + 0] += l;
dims[j*4 + 1] += t;
dims[j*4 + 2] -= l + r;
dims[j*4 + 3] -= t + b;
dims = g_new(gulong, 4 * screen_num_desktops);
for (i = 0; i < screen_num_desktops; ++i) {
Rect *area = screen_area(i, SCREEN_AREA_ALL_MONITORS, NULL);
dims[i*4+0] = area->x;
dims[i*4+1] = area->y;
dims[i*4+2] = area->width;
dims[i*4+3] = area->height;
g_free(area);
}
/* set the legacy workarea hint to the union of all the monitors */

67
tests/iconifydelay.c Normal file
View file

@ -0,0 +1,67 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
iconifydelay.c for the Openbox window manager
Copyright (c) 2009 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>
#include <X11/Xutil.h>
int main () {
Display *display;
Window win;
XEvent report;
XEvent msg;
int x=50,y=50,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, DefaultScreen(display)),
x, y, w, h, 10, CopyFromParent, CopyFromParent,
CopyFromParent, 0, NULL);
XSetWindowBackground(display, win,
WhitePixel(display, DefaultScreen(display)));
usleep(1000000);
XMapWindow(display, win);
XFlush(display);
usleep(1000000);
msg.xclient.type = ClientMessage;
msg.xclient.message_type = XInternAtom(display, "WM_CHANGE_STATE", False);
msg.xclient.display = display;
msg.xclient.window = win;
msg.xclient.format = 32;
msg.xclient.data.l[0] = IconicState;
msg.xclient.data.l[1] = 0;
msg.xclient.data.l[2] = 0;
msg.xclient.data.l[3] = 0;
msg.xclient.data.l[4] = 0;
XSendEvent(display, RootWindow(display, DefaultScreen(display)),
False, SubstructureNotifyMask|SubstructureRedirectMask, &msg);
while (1) {
XNextEvent(display, &report);
}
return 1;
}