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

include minimized windows in switch panel

Browse Source
This commit is contained in:
kojima
2004-10-19 01:29:34 +00:00
parent 9de3560d9f
commit f6fb9fbb3e
3 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
WindowMaker/Pixmaps/swtile.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 1.3 KiB

6
src/cycling.c
View File

@@ -349,7 +349,11 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
#endif #endif
XUngrabKeyboard(dpy, CurrentTime); XUngrabKeyboard(dpy, CurrentTime);
} }
wSetFocusTo(scr, newFocused);
if (newFocused) {
wSetFocusTo(scr, newFocused);
wMakeWindowVisible(newFocused);
}
#ifdef MOX_CYCLING #ifdef MOX_CYCLING
if (swpanel) if (swpanel)

73
src/switchpanel.c
View File

@@ -129,6 +129,25 @@ extern WPreferences wPreferences;
#define ICON_IDEAL_SIZE 48 #define ICON_IDEAL_SIZE 48
#define ICON_EXTRASPACE 16 #define ICON_EXTRASPACE 16
static int canReceiveFocus(WWindow *wwin)
{
if (!wwin->flags.mapped)
{
if (!wwin->flags.shaded && !wwin->flags.miniaturized && !wwin->flags.hidden)
return 0;
else
return -1;
}
if (WFLAGP(wwin, no_focusable))
return 0;
if (wwin->frame->workspace != wwin->screen_ptr->current_workspace)
return 0;
return 1;
}
static void changeImage(WSwitchPanel *panel, int index, int selected) static void changeImage(WSwitchPanel *panel, int index, int selected)
{ {
WMPixmap *pixmap= NULL; WMPixmap *pixmap= NULL;
@@ -138,26 +157,33 @@ static void changeImage(WSwitchPanel *panel, int index, int selected)
if (image && label) { if (image && label) {
RColor bgColor; RColor bgColor;
RImage *back; RImage *back;
WMScreen *wscr= WMWidgetScreen(label); WMScreen *wscr= WMWidgetScreen(label);
int opaq= 255;
if (canReceiveFocus(WMGetFromArray(panel->windows, index)) < 0)
opaq= 50;
if (selected) { if (selected) {
back= RCloneImage(panel->tile); back= RCloneImage(panel->tile);
RCombineArea(back, image, 0, 0, image->width, image->height, RCombineAreaWithOpaqueness(back, image, 0, 0, image->width, image->height,
(back->width - image->width)/2, (back->height - image->height)/2); (back->width - image->width)/2, (back->height - image->height)/2,
opaq);
pixmap= WMCreatePixmapFromRImage(wscr, back, -1); pixmap= WMCreatePixmapFromRImage(wscr, back, -1);
RReleaseImage(back); RReleaseImage(back);
} else { } else {
bgColor.alpha= 100; bgColor.alpha= opaq;
bgColor.red = WMRedComponentOfColor(WMGrayColor(wscr))>>8; bgColor.red = WMRedComponentOfColor(WMGrayColor(wscr))>>8;
bgColor.green = WMGreenComponentOfColor(WMGrayColor(wscr))>>8; bgColor.green = WMGreenComponentOfColor(WMGrayColor(wscr))>>8;
bgColor.blue = WMBlueComponentOfColor(WMGrayColor(wscr))>>8; bgColor.blue = WMBlueComponentOfColor(WMGrayColor(wscr))>>8;
image= RCloneImage(image); back= RCreateImage(image->width, image->height, 1);
RCombineImageWithColor(image, &bgColor); RFillImage(back, &bgColor);
pixmap= WMCreatePixmapFromRImage(wscr, image, -1); RCombineImagesWithOpaqueness(back, image, opaq);
RReleaseImage(image);
pixmap= WMCreatePixmapFromRImage(wscr, back, -1);
RReleaseImage(back);
} }
} }
@@ -215,27 +241,30 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
int height; int height;
int iconWidth = ICON_IDEAL_SIZE; int iconWidth = ICON_IDEAL_SIZE;
WMBox *vbox; WMBox *vbox;
int fl;
memset(panel, 0, sizeof(WSwitchPanel)); memset(panel, 0, sizeof(WSwitchPanel));
panel->scr= scr; panel->scr= scr;
panel->windows= WMCreateArray(10); panel->windows= WMCreateArray(10);
for (wwin= curwin; wwin; wwin= wwin->prev) { for (fl= 0; fl < 2; fl++) {
if (wwin->frame->workspace == workspace && wWindowCanReceiveFocus(wwin) && for (wwin= curwin; wwin; wwin= wwin->prev) {
(!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) &&
WMInsertInArray(panel->windows, 0, wwin); (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) {
WMInsertInArray(panel->windows, 0, wwin);
}
} }
} wwin = curwin;
wwin = curwin; /* start over from the beginning of the list */
/* start over from the beginning of the list */ while (wwin->next)
while (wwin->next) wwin = wwin->next;
wwin = wwin->next;
for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) {
if (wwin->frame->workspace == workspace && wWindowCanReceiveFocus(wwin) && if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) &&
(!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) {
WMInsertInArray(panel->windows, 0, wwin); WMInsertInArray(panel->windows, 0, wwin);
}
} }
} }
@@ -259,7 +288,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
return panel; return panel;
} }
height= iconWidth + 20 + 10 + ICON_EXTRASPACE; height= iconWidth + 20 + 10 + ICON_EXTRASPACE + 10;
panel->icons= WMCreateArray(WMGetArrayItemCount(panel->windows)); panel->icons= WMCreateArray(WMGetArrayItemCount(panel->windows));
panel->images= WMCreateArray(WMGetArrayItemCount(panel->windows)); panel->images= WMCreateArray(WMGetArrayItemCount(panel->windows));