gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 05:48:01 +01:00
Code Issues Projects Releases Wiki Activity

fixed wmaker failing to compile with gnome support enabled after the xinerama add

Browse Source
This commit is contained in:
dan
2002-11-29 02:37:40 +00:00
parent a10214a502
commit 1fa3937001
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/screen.c
View File

@@ -879,46 +879,48 @@ wScreenUpdateUsableArea(WScreen *scr)
#endif #endif
#ifdef GNOME_STUFF #ifdef GNOME_STUFF
area = scr->reservedAreas; {
WReservedArea *area = scr->reservedAreas;
while (area) { while (area) {
int th, bh; int th, bh;
int lw, rw; int lw, rw;
int w, h; int w, h;
w = area->area.x2 - area->area.x1; w = area->area.x2 - area->area.x1;
h = area->area.y2 - area->area.y1; h = area->area.y2 - area->area.y1;
th = area->area.y1; th = area->area.y1;
bh = scr->scr_height - area->area.y2; bh = scr->scr_height - area->area.y2;
lw = area->area.x1; lw = area->area.x1;
rw = scr->scr_width - area->area.x2; rw = scr->scr_width - area->area.x2;
if (WMIN(th, bh) <= WMIN(lw, rw)) { if (WMIN(th, bh) <= WMIN(lw, rw)) {
/* horizontal */ /* horizontal */
if (th < bh) { if (th < bh) {
/* on top */ /* on top */
if (scr->totalUsableArea.y1 < area->area.y2) if (scr->totalUsableArea.y1 < area->area.y2)
scr->totalUsableArea.y1 = area->area.y2; scr->totalUsableArea.y1 = area->area.y2;
} else { } else {
/* on bottom */ /* on bottom */
if (scr->totalUsableArea.y2 > area->area.y1) if (scr->totalUsableArea.y2 > area->area.y1)
scr->totalUsableArea.y2 = area->area.y1; scr->totalUsableArea.y2 = area->area.y1;
} }
} else { } else {
/* vertical */ /* vertical */
if (lw < rw) { if (lw < rw) {
/* on left */ /* on left */
if (scr->totalUsableArea.x1 < area->area.x2) if (scr->totalUsableArea.x1 < area->area.x2)
scr->totalUsableArea.x1 = area->area.x2; scr->totalUsableArea.x1 = area->area.x2;
} else { } else {
/* on right */ /* on right */
if (scr->totalUsableArea.x2 > area->area.x1) if (scr->totalUsableArea.x2 > area->area.x1)
scr->totalUsableArea.x2 = area->area.x1; scr->totalUsableArea.x2 = area->area.x1;
} }
} }
area = area->next; area = area->next;
}
} }
#endif /* GNOME_STUFF */ #endif /* GNOME_STUFF */