mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-21 05:18:06 +01:00
Change to the linux kernel coding style
for arq in `git ls-files *.c`; do
echo $arq;
indent -linux -l115 $arq;
done
The different line break at 115 columns is because
I use a widescreen monitor :-)
This commit is contained in:
Carlos R. Mafra
741
src/stacking.c
741
src/stacking.c
@@ -37,22 +37,18 @@
|
||||
#include "stacking.h"
|
||||
#include "workspace.h"
|
||||
|
||||
|
||||
/*** Global Variables ***/
|
||||
extern XContext wStackContext;
|
||||
|
||||
extern WPreferences wPreferences;
|
||||
|
||||
|
||||
static void
|
||||
notifyStackChange(WCoreWindow *frame, char *detail)
|
||||
static void notifyStackChange(WCoreWindow * frame, char *detail)
|
||||
{
|
||||
WWindow *wwin = wWindowFor(frame->window);
|
||||
WWindow *wwin = wWindowFor(frame->window);
|
||||
|
||||
WMPostNotificationName(WMNChangedStacking, wwin, detail);
|
||||
WMPostNotificationName(WMNChangedStacking, wwin, detail);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* RemakeStackList--
|
||||
@@ -66,54 +62,52 @@ notifyStackChange(WCoreWindow *frame, char *detail)
|
||||
*
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
RemakeStackList(WScreen *scr)
|
||||
void RemakeStackList(WScreen * scr)
|
||||
{
|
||||
Window *windows;
|
||||
unsigned int nwindows;
|
||||
Window junkr, junkp;
|
||||
WCoreWindow *frame;
|
||||
WCoreWindow *tmp;
|
||||
int level;
|
||||
int i, c;
|
||||
Window *windows;
|
||||
unsigned int nwindows;
|
||||
Window junkr, junkp;
|
||||
WCoreWindow *frame;
|
||||
WCoreWindow *tmp;
|
||||
int level;
|
||||
int i, c;
|
||||
|
||||
if (!XQueryTree(dpy, scr->root_win, &junkr, &junkp, &windows, &nwindows)) {
|
||||
wwarning(_("could not get window list!!"));
|
||||
return;
|
||||
} else {
|
||||
WMEmptyBag(scr->stacking_list);
|
||||
if (!XQueryTree(dpy, scr->root_win, &junkr, &junkp, &windows, &nwindows)) {
|
||||
wwarning(_("could not get window list!!"));
|
||||
return;
|
||||
} else {
|
||||
WMEmptyBag(scr->stacking_list);
|
||||
|
||||
/* verify list integrity */
|
||||
c=0;
|
||||
for (i=0; i<nwindows; i++) {
|
||||
if (XFindContext(dpy, windows[i], wStackContext, (XPointer*)&frame)
|
||||
==XCNOENT) {
|
||||
continue;
|
||||
}
|
||||
if (!frame) continue;
|
||||
c++;
|
||||
level = frame->stacking->window_level;
|
||||
tmp = WMGetFromBag(scr->stacking_list, level);
|
||||
if (tmp)
|
||||
tmp->stacking->above = frame;
|
||||
frame->stacking->under = tmp;
|
||||
frame->stacking->above = NULL;
|
||||
WMSetInBag(scr->stacking_list, level, frame);
|
||||
}
|
||||
XFree(windows);
|
||||
/* verify list integrity */
|
||||
c = 0;
|
||||
for (i = 0; i < nwindows; i++) {
|
||||
if (XFindContext(dpy, windows[i], wStackContext, (XPointer *) & frame)
|
||||
== XCNOENT) {
|
||||
continue;
|
||||
}
|
||||
if (!frame)
|
||||
continue;
|
||||
c++;
|
||||
level = frame->stacking->window_level;
|
||||
tmp = WMGetFromBag(scr->stacking_list, level);
|
||||
if (tmp)
|
||||
tmp->stacking->above = frame;
|
||||
frame->stacking->under = tmp;
|
||||
frame->stacking->above = NULL;
|
||||
WMSetInBag(scr->stacking_list, level, frame);
|
||||
}
|
||||
XFree(windows);
|
||||
#ifdef DEBUG
|
||||
if (c!=scr->window_count) {
|
||||
puts("Found different number of windows than in window lists!!!");
|
||||
}
|
||||
if (c != scr->window_count) {
|
||||
puts("Found different number of windows than in window lists!!!");
|
||||
}
|
||||
#endif
|
||||
scr->window_count = c;
|
||||
}
|
||||
scr->window_count = c;
|
||||
}
|
||||
|
||||
CommitStacking(scr);
|
||||
CommitStacking(scr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* CommitStacking--
|
||||
@@ -125,40 +119,39 @@ RemakeStackList(WScreen *scr)
|
||||
* Windows may be restacked.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
CommitStacking(WScreen *scr)
|
||||
void CommitStacking(WScreen * scr)
|
||||
{
|
||||
WCoreWindow *tmp;
|
||||
int nwindows, i;
|
||||
Window *windows;
|
||||
WMBagIterator iter;
|
||||
WCoreWindow *tmp;
|
||||
int nwindows, i;
|
||||
Window *windows;
|
||||
WMBagIterator iter;
|
||||
|
||||
nwindows = scr->window_count;
|
||||
windows = wmalloc(sizeof(Window)*nwindows);
|
||||
nwindows = scr->window_count;
|
||||
windows = wmalloc(sizeof(Window) * nwindows);
|
||||
|
||||
i = 0;
|
||||
WM_ETARETI_BAG(scr->stacking_list, tmp, iter) {
|
||||
while (tmp) {
|
||||
i = 0;
|
||||
WM_ETARETI_BAG(scr->stacking_list, tmp, iter) {
|
||||
while (tmp) {
|
||||
#ifdef DEBUG
|
||||
if (i>=nwindows) {
|
||||
puts("Internal inconsistency! window_count is incorrect!!!");
|
||||
printf("window_count says %i windows\n", nwindows);
|
||||
wfree(windows);
|
||||
return;
|
||||
}
|
||||
if (i >= nwindows) {
|
||||
puts("Internal inconsistency! window_count is incorrect!!!");
|
||||
printf("window_count says %i windows\n", nwindows);
|
||||
wfree(windows);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
windows[i++] = tmp->window;
|
||||
tmp = tmp->stacking->under;
|
||||
}
|
||||
}
|
||||
XRestackWindows(dpy, windows, i);
|
||||
wfree(windows);
|
||||
windows[i++] = tmp->window;
|
||||
tmp = tmp->stacking->under;
|
||||
}
|
||||
}
|
||||
XRestackWindows(dpy, windows, i);
|
||||
wfree(windows);
|
||||
|
||||
#ifdef VIRTUAL_DESKTOP
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
#endif
|
||||
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -173,14 +166,13 @@ CommitStacking(WScreen *scr)
|
||||
* Changes the stacking order of frame.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
static void
|
||||
moveFrameToUnder(WCoreWindow *under, WCoreWindow *frame)
|
||||
static void moveFrameToUnder(WCoreWindow * under, WCoreWindow * frame)
|
||||
{
|
||||
Window wins[2];
|
||||
Window wins[2];
|
||||
|
||||
wins[0] = under->window;
|
||||
wins[1] = frame->window;
|
||||
XRestackWindows(dpy, wins, 2);
|
||||
wins[0] = under->window;
|
||||
wins[1] = frame->window;
|
||||
XRestackWindows(dpy, wins, 2);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -196,198 +188,191 @@ moveFrameToUnder(WCoreWindow *under, WCoreWindow *frame)
|
||||
*
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
wRaiseFrame(WCoreWindow *frame)
|
||||
void wRaiseFrame(WCoreWindow * frame)
|
||||
{
|
||||
WCoreWindow *wlist = frame;
|
||||
int level = frame->stacking->window_level;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *wlist = frame;
|
||||
int level = frame->stacking->window_level;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
|
||||
/* already on top */
|
||||
if (frame->stacking->above == NULL) {
|
||||
return;
|
||||
}
|
||||
/* already on top */
|
||||
if (frame->stacking->above == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* insert it on top of other windows on the same level */
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
/* insert it on top of other windows on the same level */
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
|
||||
frame->stacking->above = NULL;
|
||||
frame->stacking->under = WMGetFromBag(scr->stacking_list, level);
|
||||
if (frame->stacking->under) {
|
||||
frame->stacking->under->stacking->above = frame;
|
||||
}
|
||||
WMSetInBag(scr->stacking_list, level, frame);
|
||||
frame->stacking->above = NULL;
|
||||
frame->stacking->under = WMGetFromBag(scr->stacking_list, level);
|
||||
if (frame->stacking->under) {
|
||||
frame->stacking->under->stacking->above = frame;
|
||||
}
|
||||
WMSetInBag(scr->stacking_list, level, frame);
|
||||
|
||||
/* raise transients under us from bottom to top
|
||||
* so that the order is kept */
|
||||
again:
|
||||
wlist = frame->stacking->under;
|
||||
while (wlist && wlist->stacking->under)
|
||||
wlist = wlist->stacking->under;
|
||||
while (wlist && wlist!=frame) {
|
||||
if (wlist->stacking->child_of == frame) {
|
||||
wRaiseFrame(wlist);
|
||||
goto again;
|
||||
}
|
||||
wlist = wlist->stacking->above;
|
||||
}
|
||||
/* raise transients under us from bottom to top
|
||||
* so that the order is kept */
|
||||
again:
|
||||
wlist = frame->stacking->under;
|
||||
while (wlist && wlist->stacking->under)
|
||||
wlist = wlist->stacking->under;
|
||||
while (wlist && wlist != frame) {
|
||||
if (wlist->stacking->child_of == frame) {
|
||||
wRaiseFrame(wlist);
|
||||
goto again;
|
||||
}
|
||||
wlist = wlist->stacking->above;
|
||||
}
|
||||
|
||||
/* try to optimize things a little */
|
||||
if (frame->stacking->above == NULL) {
|
||||
WMBagIterator iter;
|
||||
WCoreWindow *above = WMBagLast(scr->stacking_list, &iter);
|
||||
int i, last = above->stacking->window_level;
|
||||
/* try to optimize things a little */
|
||||
if (frame->stacking->above == NULL) {
|
||||
WMBagIterator iter;
|
||||
WCoreWindow *above = WMBagLast(scr->stacking_list, &iter);
|
||||
int i, last = above->stacking->window_level;
|
||||
|
||||
/* find the 1st level above us which has windows in it */
|
||||
for (i = level+1, above = NULL; i <= last; i++) {
|
||||
above = WMGetFromBag(scr->stacking_list, i);
|
||||
if (above != NULL)
|
||||
break;
|
||||
}
|
||||
/* find the 1st level above us which has windows in it */
|
||||
for (i = level + 1, above = NULL; i <= last; i++) {
|
||||
above = WMGetFromBag(scr->stacking_list, i);
|
||||
if (above != NULL)
|
||||
break;
|
||||
}
|
||||
|
||||
if (above != frame && above != NULL) {
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
moveFrameToUnder(above, frame);
|
||||
} else {
|
||||
/* no window above us */
|
||||
above = NULL;
|
||||
XRaiseWindow(dpy, frame->window);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
if (above != frame && above != NULL) {
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
moveFrameToUnder(above, frame);
|
||||
} else {
|
||||
/* no window above us */
|
||||
above = NULL;
|
||||
XRaiseWindow(dpy, frame->window);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
|
||||
notifyStackChange(frame, "raise");
|
||||
notifyStackChange(frame, "raise");
|
||||
|
||||
#ifdef VIRTUAL_DESKTOP
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
wRaiseLowerFrame(WCoreWindow *frame)
|
||||
void wRaiseLowerFrame(WCoreWindow * frame)
|
||||
{
|
||||
if (!frame->stacking->above
|
||||
||(frame->stacking->window_level
|
||||
!=frame->stacking->above->stacking->window_level)) {
|
||||
if (!frame->stacking->above
|
||||
|| (frame->stacking->window_level != frame->stacking->above->stacking->window_level)) {
|
||||
|
||||
wLowerFrame(frame);
|
||||
} else {
|
||||
WCoreWindow *scan = frame->stacking->above;
|
||||
WWindow *frame_wwin = (WWindow*) frame->descriptor.parent;
|
||||
wLowerFrame(frame);
|
||||
} else {
|
||||
WCoreWindow *scan = frame->stacking->above;
|
||||
WWindow *frame_wwin = (WWindow *) frame->descriptor.parent;
|
||||
|
||||
while (scan) {
|
||||
while (scan) {
|
||||
|
||||
if (scan->descriptor.parent_type == WCLASS_WINDOW) {
|
||||
WWindow *scan_wwin = (WWindow*)scan->descriptor.parent;
|
||||
if (scan->descriptor.parent_type == WCLASS_WINDOW) {
|
||||
WWindow *scan_wwin = (WWindow *) scan->descriptor.parent;
|
||||
|
||||
if (wWindowObscuresWindow(scan_wwin, frame_wwin)
|
||||
&& scan_wwin->flags.mapped) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
scan = scan->stacking->above;
|
||||
}
|
||||
if (wWindowObscuresWindow(scan_wwin, frame_wwin)
|
||||
&& scan_wwin->flags.mapped) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
scan = scan->stacking->above;
|
||||
}
|
||||
|
||||
if (scan) {
|
||||
wRaiseFrame(frame);
|
||||
} else {
|
||||
wLowerFrame(frame);
|
||||
}
|
||||
}
|
||||
if (scan) {
|
||||
wRaiseFrame(frame);
|
||||
} else {
|
||||
wLowerFrame(frame);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
wLowerFrame(WCoreWindow *frame)
|
||||
void wLowerFrame(WCoreWindow * frame)
|
||||
{
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *wlist=frame;
|
||||
int level = frame->stacking->window_level;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *wlist = frame;
|
||||
int level = frame->stacking->window_level;
|
||||
|
||||
/* already in bottom */
|
||||
if (wlist->stacking->under == NULL) {
|
||||
return;
|
||||
}
|
||||
/* cant lower transient below below its owner */
|
||||
if (wlist->stacking->under == wlist->stacking->child_of) {
|
||||
return;
|
||||
}
|
||||
/* remove from the list */
|
||||
if (WMGetFromBag(scr->stacking_list, level) == frame) {
|
||||
/* it was the top window */
|
||||
WMSetInBag(scr->stacking_list, level, frame->stacking->under);
|
||||
frame->stacking->under->stacking->above = NULL;
|
||||
} else {
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
}
|
||||
wlist = WMGetFromBag(scr->stacking_list, level);
|
||||
/* already in bottom */
|
||||
if (wlist->stacking->under == NULL) {
|
||||
return;
|
||||
}
|
||||
/* cant lower transient below below its owner */
|
||||
if (wlist->stacking->under == wlist->stacking->child_of) {
|
||||
return;
|
||||
}
|
||||
/* remove from the list */
|
||||
if (WMGetFromBag(scr->stacking_list, level) == frame) {
|
||||
/* it was the top window */
|
||||
WMSetInBag(scr->stacking_list, level, frame->stacking->under);
|
||||
frame->stacking->under->stacking->above = NULL;
|
||||
} else {
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
}
|
||||
wlist = WMGetFromBag(scr->stacking_list, level);
|
||||
|
||||
/* look for place to put this window */
|
||||
if (wlist) {
|
||||
WCoreWindow *owner = frame->stacking->child_of;
|
||||
/* look for place to put this window */
|
||||
if (wlist) {
|
||||
WCoreWindow *owner = frame->stacking->child_of;
|
||||
|
||||
if (owner != wlist) {
|
||||
while (wlist->stacking->under) {
|
||||
/* if this is a transient, it should not be placed under
|
||||
* it's owner */
|
||||
if (owner == wlist->stacking->under)
|
||||
break;
|
||||
wlist = wlist->stacking->under;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* insert under the place found */
|
||||
frame->stacking->above = wlist;
|
||||
if (wlist) {
|
||||
frame->stacking->under = wlist->stacking->under;
|
||||
if (wlist->stacking->under)
|
||||
wlist->stacking->under->stacking->above = frame;
|
||||
wlist->stacking->under = frame;
|
||||
} else {
|
||||
frame->stacking->under = NULL;
|
||||
}
|
||||
if (owner != wlist) {
|
||||
while (wlist->stacking->under) {
|
||||
/* if this is a transient, it should not be placed under
|
||||
* it's owner */
|
||||
if (owner == wlist->stacking->under)
|
||||
break;
|
||||
wlist = wlist->stacking->under;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* insert under the place found */
|
||||
frame->stacking->above = wlist;
|
||||
if (wlist) {
|
||||
frame->stacking->under = wlist->stacking->under;
|
||||
if (wlist->stacking->under)
|
||||
wlist->stacking->under->stacking->above = frame;
|
||||
wlist->stacking->under = frame;
|
||||
} else {
|
||||
frame->stacking->under = NULL;
|
||||
}
|
||||
|
||||
if (frame->stacking->above == NULL) {
|
||||
WMBagIterator iter;
|
||||
WCoreWindow *above = WMBagLast(scr->stacking_list, &iter);
|
||||
int i, last = above->stacking->window_level;
|
||||
if (frame->stacking->above == NULL) {
|
||||
WMBagIterator iter;
|
||||
WCoreWindow *above = WMBagLast(scr->stacking_list, &iter);
|
||||
int i, last = above->stacking->window_level;
|
||||
|
||||
/* find the 1st level above us which has windows in it */
|
||||
for (i = level+1, above = NULL; i <= last; i++) {
|
||||
above = WMGetFromBag(scr->stacking_list, i);
|
||||
if (above != NULL)
|
||||
break;
|
||||
}
|
||||
/* find the 1st level above us which has windows in it */
|
||||
for (i = level + 1, above = NULL; i <= last; i++) {
|
||||
above = WMGetFromBag(scr->stacking_list, i);
|
||||
if (above != NULL)
|
||||
break;
|
||||
}
|
||||
|
||||
if (above != frame && above != NULL) {
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
moveFrameToUnder(above, frame);
|
||||
} else {
|
||||
/* no window below us */
|
||||
XLowerWindow(dpy, frame->window);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
if (above != frame && above != NULL) {
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
moveFrameToUnder(above, frame);
|
||||
} else {
|
||||
/* no window below us */
|
||||
XLowerWindow(dpy, frame->window);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
|
||||
notifyStackChange(frame, "lower");
|
||||
notifyStackChange(frame, "lower");
|
||||
|
||||
#ifdef VIRTUAL_DESKTOP
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* AddToStackList--
|
||||
@@ -401,57 +386,55 @@ wLowerFrame(WCoreWindow *frame)
|
||||
* The frame is added to it's screen's window list.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
AddToStackList(WCoreWindow *frame)
|
||||
void AddToStackList(WCoreWindow * frame)
|
||||
{
|
||||
WCoreWindow *curtop, *wlist;
|
||||
int index = frame->stacking->window_level;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *trans = NULL;
|
||||
WCoreWindow *curtop, *wlist;
|
||||
int index = frame->stacking->window_level;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *trans = NULL;
|
||||
|
||||
frame->screen_ptr->window_count++;
|
||||
XSaveContext(dpy, frame->window, wStackContext, (XPointer)frame);
|
||||
curtop = WMGetFromBag(scr->stacking_list, index);
|
||||
frame->screen_ptr->window_count++;
|
||||
XSaveContext(dpy, frame->window, wStackContext, (XPointer) frame);
|
||||
curtop = WMGetFromBag(scr->stacking_list, index);
|
||||
|
||||
/* first window in this level */
|
||||
if (curtop == NULL) {
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
frame->stacking->above = NULL;
|
||||
frame->stacking->under = NULL;
|
||||
CommitStacking(scr);
|
||||
return;
|
||||
}
|
||||
/* first window in this level */
|
||||
if (curtop == NULL) {
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
frame->stacking->above = NULL;
|
||||
frame->stacking->under = NULL;
|
||||
CommitStacking(scr);
|
||||
return;
|
||||
}
|
||||
|
||||
/* check if this is a transient owner */
|
||||
wlist = curtop;
|
||||
while (wlist) {
|
||||
if (wlist->stacking->child_of == frame)
|
||||
trans = wlist;
|
||||
wlist = wlist->stacking->under;
|
||||
}
|
||||
/* trans will hold the transient in the lowest position
|
||||
* in stacking list */
|
||||
/* check if this is a transient owner */
|
||||
wlist = curtop;
|
||||
while (wlist) {
|
||||
if (wlist->stacking->child_of == frame)
|
||||
trans = wlist;
|
||||
wlist = wlist->stacking->under;
|
||||
}
|
||||
/* trans will hold the transient in the lowest position
|
||||
* in stacking list */
|
||||
|
||||
frame->stacking->above = trans;
|
||||
if (trans != NULL) {
|
||||
/* window is owner of a transient.. put it below
|
||||
* the lowest transient */
|
||||
frame->stacking->under = trans->stacking->under;
|
||||
if (trans->stacking->under) {
|
||||
trans->stacking->under->stacking->above = frame;
|
||||
}
|
||||
trans->stacking->under = frame;
|
||||
} else {
|
||||
/* window is not owner of transients.. just put it in the
|
||||
* top of other windows */
|
||||
frame->stacking->under = curtop;
|
||||
curtop->stacking->above = frame;
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
}
|
||||
CommitStacking(scr);
|
||||
frame->stacking->above = trans;
|
||||
if (trans != NULL) {
|
||||
/* window is owner of a transient.. put it below
|
||||
* the lowest transient */
|
||||
frame->stacking->under = trans->stacking->under;
|
||||
if (trans->stacking->under) {
|
||||
trans->stacking->under->stacking->above = frame;
|
||||
}
|
||||
trans->stacking->under = frame;
|
||||
} else {
|
||||
/* window is not owner of transients.. just put it in the
|
||||
* top of other windows */
|
||||
frame->stacking->under = curtop;
|
||||
curtop->stacking->above = frame;
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
}
|
||||
CommitStacking(scr);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* MoveInStackListAbove--
|
||||
@@ -465,67 +448,64 @@ AddToStackList(WCoreWindow *frame)
|
||||
* Window level for frame may be changed.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame)
|
||||
void MoveInStackListAbove(WCoreWindow * next, WCoreWindow * frame)
|
||||
{
|
||||
WCoreWindow *tmpw;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
int index;
|
||||
WCoreWindow *tmpw;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
int index;
|
||||
|
||||
if (!next || frame->stacking->under == next)
|
||||
return;
|
||||
if (!next || frame->stacking->under == next)
|
||||
return;
|
||||
|
||||
if (frame->stacking->window_level != next->stacking->window_level)
|
||||
ChangeStackingLevel(frame, next->stacking->window_level);
|
||||
if (frame->stacking->window_level != next->stacking->window_level)
|
||||
ChangeStackingLevel(frame, next->stacking->window_level);
|
||||
|
||||
index = frame->stacking->window_level;
|
||||
index = frame->stacking->window_level;
|
||||
|
||||
tmpw = WMGetFromBag(scr->stacking_list, index);
|
||||
if (tmpw == frame)
|
||||
WMSetInBag(scr->stacking_list, index, frame->stacking->under);
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
if (next->stacking->above)
|
||||
next->stacking->above->stacking->under = frame;
|
||||
frame->stacking->under = next;
|
||||
frame->stacking->above = next->stacking->above;
|
||||
next->stacking->above = frame;
|
||||
if (tmpw == next)
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
tmpw = WMGetFromBag(scr->stacking_list, index);
|
||||
if (tmpw == frame)
|
||||
WMSetInBag(scr->stacking_list, index, frame->stacking->under);
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
if (next->stacking->above)
|
||||
next->stacking->above->stacking->under = frame;
|
||||
frame->stacking->under = next;
|
||||
frame->stacking->above = next->stacking->above;
|
||||
next->stacking->above = frame;
|
||||
if (tmpw == next)
|
||||
WMSetInBag(scr->stacking_list, index, frame);
|
||||
|
||||
/* try to optimize things a little */
|
||||
if (frame->stacking->above == NULL) {
|
||||
WCoreWindow *above = NULL;
|
||||
WMBagIterator iter;
|
||||
/* try to optimize things a little */
|
||||
if (frame->stacking->above == NULL) {
|
||||
WCoreWindow *above = NULL;
|
||||
WMBagIterator iter;
|
||||
|
||||
for (above = WMBagIteratorAtIndex(scr->stacking_list, index+1, &iter);
|
||||
above != NULL;
|
||||
above = WMBagNext(scr->stacking_list, &iter)) {
|
||||
for (above = WMBagIteratorAtIndex(scr->stacking_list, index + 1, &iter);
|
||||
above != NULL; above = WMBagNext(scr->stacking_list, &iter)) {
|
||||
|
||||
/* can't optimize */
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
break;
|
||||
}
|
||||
if (above == NULL) {
|
||||
XRaiseWindow(dpy, frame->window);
|
||||
} else {
|
||||
moveFrameToUnder(above, frame);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
/* can't optimize */
|
||||
while (above->stacking->under)
|
||||
above = above->stacking->under;
|
||||
break;
|
||||
}
|
||||
if (above == NULL) {
|
||||
XRaiseWindow(dpy, frame->window);
|
||||
} else {
|
||||
moveFrameToUnder(above, frame);
|
||||
}
|
||||
} else {
|
||||
moveFrameToUnder(frame->stacking->above, frame);
|
||||
}
|
||||
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
|
||||
#ifdef VIRTUAL_DESKTOP
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
wWorkspaceRaiseEdge(scr);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
* MoveInStackListUnder--
|
||||
@@ -539,79 +519,72 @@ MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame)
|
||||
* Window level for frame may be changed.
|
||||
*----------------------------------------------------------------------
|
||||
*/
|
||||
void
|
||||
MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame)
|
||||
void MoveInStackListUnder(WCoreWindow * prev, WCoreWindow * frame)
|
||||
{
|
||||
WCoreWindow *tmpw;
|
||||
int index;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
WCoreWindow *tmpw;
|
||||
int index;
|
||||
WScreen *scr = frame->screen_ptr;
|
||||
|
||||
if (!prev || frame->stacking->above == prev)
|
||||
return;
|
||||
if (!prev || frame->stacking->above == prev)
|
||||
return;
|
||||
|
||||
if (frame->stacking->window_level != prev->stacking->window_level)
|
||||
ChangeStackingLevel(frame, prev->stacking->window_level);
|
||||
if (frame->stacking->window_level != prev->stacking->window_level)
|
||||
ChangeStackingLevel(frame, prev->stacking->window_level);
|
||||
|
||||
index = frame->stacking->window_level;
|
||||
index = frame->stacking->window_level;
|
||||
|
||||
tmpw = WMGetFromBag(scr->stacking_list, index);
|
||||
if (tmpw == frame)
|
||||
WMSetInBag(scr->stacking_list, index, frame->stacking->under);
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
if (prev->stacking->under)
|
||||
prev->stacking->under->stacking->above = frame;
|
||||
frame->stacking->above = prev;
|
||||
frame->stacking->under = prev->stacking->under;
|
||||
prev->stacking->under = frame;
|
||||
moveFrameToUnder(prev, frame);
|
||||
tmpw = WMGetFromBag(scr->stacking_list, index);
|
||||
if (tmpw == frame)
|
||||
WMSetInBag(scr->stacking_list, index, frame->stacking->under);
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
if (prev->stacking->under)
|
||||
prev->stacking->under->stacking->above = frame;
|
||||
frame->stacking->above = prev;
|
||||
frame->stacking->under = prev->stacking->under;
|
||||
prev->stacking->under = frame;
|
||||
moveFrameToUnder(prev, frame);
|
||||
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
WMPostNotificationName(WMNResetStacking, scr, NULL);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
RemoveFromStackList(WCoreWindow *frame)
|
||||
void RemoveFromStackList(WCoreWindow * frame)
|
||||
{
|
||||
int index = frame->stacking->window_level;
|
||||
int index = frame->stacking->window_level;
|
||||
|
||||
if (XDeleteContext(dpy, frame->window, wStackContext)==XCNOENT) {
|
||||
wwarning("RemoveFromStackingList(): window not in list ");
|
||||
return;
|
||||
}
|
||||
/* remove from the window stack list */
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
else /* this was the first window on the list */
|
||||
WMSetInBag(frame->screen_ptr->stacking_list, index,
|
||||
frame->stacking->under);
|
||||
if (XDeleteContext(dpy, frame->window, wStackContext) == XCNOENT) {
|
||||
wwarning("RemoveFromStackingList(): window not in list ");
|
||||
return;
|
||||
}
|
||||
/* remove from the window stack list */
|
||||
if (frame->stacking->under)
|
||||
frame->stacking->under->stacking->above = frame->stacking->above;
|
||||
if (frame->stacking->above)
|
||||
frame->stacking->above->stacking->under = frame->stacking->under;
|
||||
else /* this was the first window on the list */
|
||||
WMSetInBag(frame->screen_ptr->stacking_list, index, frame->stacking->under);
|
||||
|
||||
frame->screen_ptr->window_count--;
|
||||
frame->screen_ptr->window_count--;
|
||||
|
||||
WMPostNotificationName(WMNResetStacking, frame->screen_ptr, NULL);
|
||||
WMPostNotificationName(WMNResetStacking, frame->screen_ptr, NULL);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ChangeStackingLevel(WCoreWindow *frame, int new_level)
|
||||
void ChangeStackingLevel(WCoreWindow * frame, int new_level)
|
||||
{
|
||||
int old_level;
|
||||
int old_level;
|
||||
|
||||
if (frame->stacking->window_level == new_level)
|
||||
return;
|
||||
old_level = frame->stacking->window_level;
|
||||
if (frame->stacking->window_level == new_level)
|
||||
return;
|
||||
old_level = frame->stacking->window_level;
|
||||
|
||||
RemoveFromStackList(frame);
|
||||
frame->stacking->window_level = new_level;
|
||||
AddToStackList(frame);
|
||||
if (old_level > new_level) {
|
||||
wRaiseFrame(frame);
|
||||
} else {
|
||||
wLowerFrame(frame);
|
||||
}
|
||||
RemoveFromStackList(frame);
|
||||
frame->stacking->window_level = new_level;
|
||||
AddToStackList(frame);
|
||||
if (old_level > new_level) {
|
||||
wRaiseFrame(frame);
|
||||
} else {
|
||||
wLowerFrame(frame);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user