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

Dim switchpanel icons when same-class cycling.

Browse Source 
When cycling through windows in the switchpanel using the GroupNextKey
or GroupPrevKey shortcuts, dim the icons of windows which are of a
different WM_CLASS.
This commit is contained in:
Iain Patterson
2013-05-23 14:54:35 +01:00
committed by Carlos R. Mafra
parent bf9e025289
commit 89a6476a33
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/switchpanel.c
View File

@@ -105,7 +105,7 @@ static Bool sameWindowClass(WWindow *wwin, WWindow *curwin)
return True; return True;
} }
static void changeImage(WSwitchPanel *panel, int idecks, int selected) static void changeImage(WSwitchPanel *panel, int idecks, int selected, Bool dim)
{ {
WMFrame *icon = WMGetFromArray(panel->icons, idecks); WMFrame *icon = WMGetFromArray(panel->icons, idecks);
RImage *image = WMGetFromArray(panel->images, idecks); RImage *image = WMGetFromArray(panel->images, idecks);
@@ -115,7 +115,7 @@ static void changeImage(WSwitchPanel *panel, int idecks, int selected)
if (image && icon) { if (image && icon) {
RImage *back; RImage *back;
int opaq = 255; int opaq = (dim) ? 75 : 255;
RImage *tile; RImage *tile;
WMPoint pos; WMPoint pos;
Pixmap p; Pixmap p;
@@ -204,7 +204,7 @@ static void scrollIcons(WSwitchPanel *panel, int delta)
panel->firstVisible = nfirst; panel->firstVisible = nfirst;
for (i = panel->firstVisible; i < panel->firstVisible + panel->visibleCount; i++) for (i = panel->firstVisible; i < panel->firstVisible + panel->visibleCount; i++)
changeImage(panel, i, i == panel->current); changeImage(panel, i, i == panel->current, 0);
} }
/* /*
@@ -471,7 +471,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, Bool class_only)
WMRealizeWidget(panel->win); WMRealizeWidget(panel->win);
WM_ITERATE_ARRAY(panel->windows, wwin, i) { WM_ITERATE_ARRAY(panel->windows, wwin, i) {
changeImage(panel, i, 0); changeImage(panel, i, 0, False);
} }
if (panel->bg) { if (panel->bg) {
@@ -501,7 +501,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, Bool class_only)
panel->current = WMGetFirstInArray(panel->windows, curwin); panel->current = WMGetFirstInArray(panel->windows, curwin);
if (panel->current >= 0) if (panel->current >= 0)
changeImage(panel, panel->current, 1); changeImage(panel, panel->current, 1, False);
WMMapWidget(panel->win); WMMapWidget(panel->win);
@@ -564,15 +564,16 @@ void wSwitchPanelDestroy(WSwitchPanel *panel)
WWindow *wSwitchPanelSelectNext(WSwitchPanel *panel, int back, int ignore_minimized, Bool class_only) WWindow *wSwitchPanelSelectNext(WSwitchPanel *panel, int back, int ignore_minimized, Bool class_only)
{ {
WWindow *wwin, *curwin; WWindow *wwin, *curwin, *tmpwin;
int count = WMGetArrayItemCount(panel->windows); int count = WMGetArrayItemCount(panel->windows);
int orig = panel->current; int orig = panel->current;
int i;
if (count == 0) if (count == 0)
return NULL; return NULL;
if (panel->win) if (panel->win)
changeImage(panel, panel->current, 0); changeImage(panel, panel->current, 0, False);
if (!wPreferences.cycle_ignore_minimized) if (!wPreferences.cycle_ignore_minimized)
ignore_minimized = False; ignore_minimized = False;
@@ -598,6 +599,14 @@ WWindow *wSwitchPanelSelectNext(WSwitchPanel *panel, int back, int ignore_minimi
} while (!sameWindowClass(wwin, curwin)); } while (!sameWindowClass(wwin, curwin));
} while (ignore_minimized && panel->current != orig && canReceiveFocus(wwin) < 0); } while (ignore_minimized && panel->current != orig && canReceiveFocus(wwin) < 0);
WM_ITERATE_ARRAY(panel->windows, tmpwin, i) {
if (!class_only || sameWindowClass(tmpwin, curwin))
changeImage(panel, i, 0, False);
else
changeImage(panel, i, 0, True);
}
if (panel->current < panel->firstVisible) if (panel->current < panel->firstVisible)
scrollIcons(panel, panel->current - panel->firstVisible); scrollIcons(panel, panel->current - panel->firstVisible);
else if (panel->current - panel->firstVisible >= panel->visibleCount) else if (panel->current - panel->firstVisible >= panel->visibleCount)
@@ -606,7 +615,7 @@ WWindow *wSwitchPanelSelectNext(WSwitchPanel *panel, int back, int ignore_minimi
if (panel->win) { if (panel->win) {
drawTitle(panel, panel->current, wwin->frame->title); drawTitle(panel, panel->current, wwin->frame->title);
changeImage(panel, panel->current, 1); changeImage(panel, panel->current, 1, False);
} }
return wwin; return wwin;
@@ -621,7 +630,7 @@ WWindow *wSwitchPanelSelectFirst(WSwitchPanel *panel, int back)
return NULL; return NULL;
if (panel->win) if (panel->win)
changeImage(panel, panel->current, 0); changeImage(panel, panel->current, 0, False);
if (back) { if (back) {
panel->current = count - 1; panel->current = count - 1;
@@ -635,7 +644,7 @@ WWindow *wSwitchPanelSelectFirst(WSwitchPanel *panel, int back)
if (panel->win) { if (panel->win) {
drawTitle(panel, panel->current, wwin->frame->title); drawTitle(panel, panel->current, wwin->frame->title);
changeImage(panel, panel->current, 1); changeImage(panel, panel->current, 1, False);
} }
return wwin; return wwin;
@@ -662,8 +671,8 @@ WWindow *wSwitchPanelHandleEvent(WSwitchPanel *panel, XEvent *event)
if (focus >= 0 && panel->current != focus) { if (focus >= 0 && panel->current != focus) {
WWindow *wwin; WWindow *wwin;
changeImage(panel, panel->current, 0); changeImage(panel, panel->current, 0, False);
changeImage(panel, focus, 1); changeImage(panel, focus, 1, False);
panel->current = focus; panel->current = focus;
wwin = WMGetFromArray(panel->windows, focus); wwin = WMGetFromArray(panel->windows, focus);