gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

switchpanel: Add skip_switchpanel advanced option

Browse Source 
Some applications running in my machine are only background
windows, e.g.: screenlets showing CPU usage.

In current wmaker version all these applications pollute my
switchpanel, so I wrote this patch (thanks Carlos for the helping me).

It includes an additional advanced option for windows "Do not
include in switchpanel" which, if set, allows applications to
not appear in the switchpanel.

Signed-off-by: Haroldo Santos <haroldo.santos@gmail.com>
This commit is contained in:
Haroldo Santos
2011-02-17 14:56:36 -02:00
committed by Carlos R. Mafra
parent 077a2eaa71
commit c82138eab9
6 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/switchpanel.c
View File

@@ -392,6 +392,8 @@ static WMArray *makeWindowListArray(WWindow *curwin, int include_unmapped, Bool
if (strcmp(wwin->wm_class, curwin->wm_class)) if (strcmp(wwin->wm_class, curwin->wm_class))
continue; continue;
} }
if (!WFLAGP(wwin, skip_switchpanel))
WMAddToArray(windows, wwin); WMAddToArray(windows, wwin);
} }
} }
@@ -409,6 +411,8 @@ static WMArray *makeWindowListArray(WWindow *curwin, int include_unmapped, Bool
if (strcmp(wwin->wm_class, curwin->wm_class)) if (strcmp(wwin->wm_class, curwin->wm_class))
continue; continue;
} }
if (!WFLAGP(wwin, skip_switchpanel))
WMAddToArray(windows, wwin); WMAddToArray(windows, wwin);
} }
} }

5
src/wdefaults.c
View File

@@ -64,6 +64,7 @@ static WMPropList *AKeepOnTop;
static WMPropList *AKeepOnBottom; static WMPropList *AKeepOnBottom;
static WMPropList *AOmnipresent; static WMPropList *AOmnipresent;
static WMPropList *ASkipWindowList; static WMPropList *ASkipWindowList;
static WMPropList *ASkipSwitchPanel;
static WMPropList *AKeepInsideScreen; static WMPropList *AKeepInsideScreen;
static WMPropList *AUnfocusable; static WMPropList *AUnfocusable;
static WMPropList *AAlwaysUserIcon; static WMPropList *AAlwaysUserIcon;
@@ -100,6 +101,7 @@ static void init_wdefaults(WScreen * scr)
AKeepOnBottom = WMCreatePLString("KeepOnBottom"); AKeepOnBottom = WMCreatePLString("KeepOnBottom");
AOmnipresent = WMCreatePLString("Omnipresent"); AOmnipresent = WMCreatePLString("Omnipresent");
ASkipWindowList = WMCreatePLString("SkipWindowList"); ASkipWindowList = WMCreatePLString("SkipWindowList");
ASkipSwitchPanel = WMCreatePLString("SkipSwitchPanel");
AKeepInsideScreen = WMCreatePLString("KeepInsideScreen"); AKeepInsideScreen = WMCreatePLString("KeepInsideScreen");
AUnfocusable = WMCreatePLString("Unfocusable"); AUnfocusable = WMCreatePLString("Unfocusable");
AAlwaysUserIcon = WMCreatePLString("AlwaysUserIcon"); AAlwaysUserIcon = WMCreatePLString("AlwaysUserIcon");
@@ -273,6 +275,9 @@ wDefaultFillAttributes(WScreen * scr, char *instance, char *class,
value = get_value(dw, dc, dn, da, ASkipWindowList, No, useGlobalDefault); value = get_value(dw, dc, dn, da, ASkipWindowList, No, useGlobalDefault);
APPLY_VAL(value, skip_window_list, ASkipWindowList); APPLY_VAL(value, skip_window_list, ASkipWindowList);
value = get_value(dw, dc, dn, da, ASkipSwitchPanel, No, useGlobalDefault);
APPLY_VAL(value, skip_switchpanel, ASkipSwitchPanel);
value = get_value(dw, dc, dn, da, AKeepInsideScreen, No, useGlobalDefault); value = get_value(dw, dc, dn, da, AKeepInsideScreen, No, useGlobalDefault);
APPLY_VAL(value, dont_move_off, AKeepInsideScreen); APPLY_VAL(value, dont_move_off, AKeepInsideScreen);

13
src/wdefaults.h
View File

@@ -32,11 +32,12 @@
#define WA_FOCUSABLE (1<<6) #define WA_FOCUSABLE (1<<6)
#define WA_OMNIPRESENT (1<<7) #define WA_OMNIPRESENT (1<<7)
#define WA_SKIP_WINDOW_LIST (1<<8) #define WA_SKIP_WINDOW_LIST (1<<8)
#define WA_FLOATING (1<<9) #define WA_SKIP_SWITCHPANEL (1<<9)
#define WA_IGNORE_KEYS (1<<10) #define WA_FLOATING (1<<10)
#define WA_IGNORE_MOUSE (1<<11) #define WA_IGNORE_KEYS (1<<11)
#define WA_IGNORE_HIDE_OTHERS (1<<12) #define WA_IGNORE_MOUSE (1<<12)
#define WA_NOT_APPLICATION (1<<13) #define WA_IGNORE_HIDE_OTHERS (1<<13)
#define WA_DONT_MOVE_OFF (1<<14) #define WA_NOT_APPLICATION (1<<14)
#define WA_DONT_MOVE_OFF (1<<15)
#endif #endif

1
src/window.h
View File

@@ -109,6 +109,7 @@ typedef struct {
unsigned int no_shadeable:1; unsigned int no_shadeable:1;
unsigned int omnipresent:1; unsigned int omnipresent:1;
unsigned int skip_window_list:1; unsigned int skip_window_list:1;
unsigned int skip_switchpanel:1;
unsigned int floating:1; /* put in WMFloatingLevel */ unsigned int floating:1; /* put in WMFloatingLevel */
unsigned int sunken:1; /* put in WMSunkenLevel */ unsigned int sunken:1; /* put in WMSunkenLevel */
unsigned int no_bind_keys:1; /* intercept wm kbd binds unsigned int no_bind_keys:1; /* intercept wm kbd binds

76
src/winspector.c
View File

@@ -88,9 +88,9 @@ typedef struct InspectorPanel {
/* 3rd page. more attributes */ /* 3rd page. more attributes */
WMFrame *moreFrm; WMFrame *moreFrm;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
WMButton *moreChk[10]; WMButton *moreChk[11];
#else #else
WMButton *moreChk[9]; WMButton *moreChk[10];
#endif #endif
/* 4th page. icon and workspace */ /* 4th page. icon and workspace */
@@ -134,6 +134,7 @@ static WMPropList *AKeepOnTop;
static WMPropList *AKeepOnBottom; static WMPropList *AKeepOnBottom;
static WMPropList *AOmnipresent; static WMPropList *AOmnipresent;
static WMPropList *ASkipWindowList; static WMPropList *ASkipWindowList;
static WMPropList *ASkipSwitchPanel;
static WMPropList *AKeepInsideScreen; static WMPropList *AKeepInsideScreen;
static WMPropList *AUnfocusable; static WMPropList *AUnfocusable;
static WMPropList *ADontFocusAcrossWorkspace; static WMPropList *ADontFocusAcrossWorkspace;
@@ -185,6 +186,7 @@ static void make_keys(void)
AKeepOnBottom = WMCreatePLString("KeepOnBottom"); AKeepOnBottom = WMCreatePLString("KeepOnBottom");
AOmnipresent = WMCreatePLString("Omnipresent"); AOmnipresent = WMCreatePLString("Omnipresent");
ASkipWindowList = WMCreatePLString("SkipWindowList"); ASkipWindowList = WMCreatePLString("SkipWindowList");
ASkipSwitchPanel = WMCreatePLString("SkipSwitchPanel");
AKeepInsideScreen = WMCreatePLString("KeepInsideScreen"); AKeepInsideScreen = WMCreatePLString("KeepInsideScreen");
AUnfocusable = WMCreatePLString("Unfocusable"); AUnfocusable = WMCreatePLString("Unfocusable");
ADontFocusAcrossWorkspace = WMCreatePLString("DontFocusAcrossWorkspace"); ADontFocusAcrossWorkspace = WMCreatePLString("DontFocusAcrossWorkspace");
@@ -574,25 +576,28 @@ static void saveSettings(WMButton * button, InspectorPanel * panel)
different |= insertAttribute(dict, winDic, ASkipWindowList, value, flags); different |= insertAttribute(dict, winDic, ASkipWindowList, value, flags);
value = (WMGetButtonSelected(panel->moreChk[3]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[3]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, AUnfocusable, value, flags); different |= insertAttribute(dict, winDic, ASkipSwitchPanel, value, flags);
value = (WMGetButtonSelected(panel->moreChk[4]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[4]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, AKeepInsideScreen, value, flags); different |= insertAttribute(dict, winDic, AUnfocusable, value, flags);
value = (WMGetButtonSelected(panel->moreChk[5]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[5]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoHideOthers, value, flags); different |= insertAttribute(dict, winDic, AKeepInsideScreen, value, flags);
value = (WMGetButtonSelected(panel->moreChk[6]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[6]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ADontSaveSession, value, flags); different |= insertAttribute(dict, winDic, ANoHideOthers, value, flags);
value = (WMGetButtonSelected(panel->moreChk[7]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[7]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, AEmulateAppIcon, value, flags); different |= insertAttribute(dict, winDic, ADontSaveSession, value, flags);
value = (WMGetButtonSelected(panel->moreChk[8]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[8]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, AEmulateAppIcon, value, flags);
value = (WMGetButtonSelected(panel->moreChk[9]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ADontFocusAcrossWorkspace, value, flags); different |= insertAttribute(dict, winDic, ADontFocusAcrossWorkspace, value, flags);
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
value = (WMGetButtonSelected(panel->moreChk[9]) != 0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[10]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoLanguageButton, value, flags); different |= insertAttribute(dict, winDic, ANoLanguageButton, value, flags);
#endif #endif
@@ -761,14 +766,15 @@ static void applySettings(WMButton * button, InspectorPanel * panel)
WSETUFLAG(wwin, no_bind_keys, WMGetButtonSelected(panel->moreChk[0])); WSETUFLAG(wwin, no_bind_keys, WMGetButtonSelected(panel->moreChk[0]));
WSETUFLAG(wwin, no_bind_mouse, WMGetButtonSelected(panel->moreChk[1])); WSETUFLAG(wwin, no_bind_mouse, WMGetButtonSelected(panel->moreChk[1]));
skip_window_list = WMGetButtonSelected(panel->moreChk[2]); skip_window_list = WMGetButtonSelected(panel->moreChk[2]);
WSETUFLAG(wwin, no_focusable, WMGetButtonSelected(panel->moreChk[3])); WSETUFLAG(wwin, skip_switchpanel, WMGetButtonSelected(panel->moreChk[3]));
WSETUFLAG(wwin, dont_move_off, WMGetButtonSelected(panel->moreChk[4])); WSETUFLAG(wwin, no_focusable, WMGetButtonSelected(panel->moreChk[4]));
WSETUFLAG(wwin, no_hide_others, WMGetButtonSelected(panel->moreChk[5])); WSETUFLAG(wwin, dont_move_off, WMGetButtonSelected(panel->moreChk[5]));
WSETUFLAG(wwin, dont_save_session, WMGetButtonSelected(panel->moreChk[6])); WSETUFLAG(wwin, no_hide_others, WMGetButtonSelected(panel->moreChk[6]));
WSETUFLAG(wwin, emulate_appicon, WMGetButtonSelected(panel->moreChk[7])); WSETUFLAG(wwin, dont_save_session, WMGetButtonSelected(panel->moreChk[7]));
WSETUFLAG(wwin, dont_focus_across_wksp, WMGetButtonSelected(panel->moreChk[8])); WSETUFLAG(wwin, emulate_appicon, WMGetButtonSelected(panel->moreChk[8]));
WSETUFLAG(wwin, dont_focus_across_wksp, WMGetButtonSelected(panel->moreChk[9]));
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
WSETUFLAG(wwin, no_language_button, WMGetButtonSelected(panel->moreChk[9])); WSETUFLAG(wwin, no_language_button, WMGetButtonSelected(panel->moreChk[10]));
#endif #endif
WSETUFLAG(wwin, always_user_icon, WMGetButtonSelected(panel->alwChk)); WSETUFLAG(wwin, always_user_icon, WMGetButtonSelected(panel->alwChk));
@@ -912,7 +918,7 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
} }
WMSetButtonSelected(panel->attrChk[i], flag); WMSetButtonSelected(panel->attrChk[i], flag);
} }
for (i = 0; i < 9; i++) { for (i = 0; i < 11; i++) {
int flag = 0; int flag = 0;
switch (i) { switch (i) {
@@ -926,25 +932,28 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
flag = WFLAGP(wwin, skip_window_list); flag = WFLAGP(wwin, skip_window_list);
break; break;
case 3: case 3:
flag = WFLAGP(wwin, no_focusable); flag = WFLAGP(wwin, skip_switchpanel);
break; break;
case 4: case 4:
flag = WFLAGP(wwin, dont_move_off); flag = WFLAGP(wwin, no_focusable);
break; break;
case 5: case 5:
flag = WFLAGP(wwin, no_hide_others); flag = WFLAGP(wwin, dont_move_off);
break; break;
case 6: case 6:
flag = WFLAGP(wwin, dont_save_session); flag = WFLAGP(wwin, no_hide_others);
break; break;
case 7: case 7:
flag = WFLAGP(wwin, emulate_appicon); flag = WFLAGP(wwin, dont_save_session);
break; break;
case 8: case 8:
flag = WFLAGP(wwin, emulate_appicon);
break;
case 9:
flag = WFLAGP(wwin, dont_focus_across_wksp); flag = WFLAGP(wwin, dont_focus_across_wksp);
break; break;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
case 9: case 10:
flag = WFLAGP(wwin, no_language_button); flag = WFLAGP(wwin, no_language_button);
break; break;
#endif #endif
@@ -952,7 +961,7 @@ static void revertSettings(WMButton * button, InspectorPanel * panel)
WMSetButtonSelected(panel->moreChk[i], flag); WMSetButtonSelected(panel->moreChk[i], flag);
} }
if (panel->appFrm && wapp) { if (panel->appFrm && wapp) {
for (i = 0; i < 2; i++) { for (i = 0; i < 3; i++) {
int flag = 0; int flag = 0;
switch (i) { switch (i) {
@@ -1319,9 +1328,9 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
for (i = 0; for (i = 0;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
i < 10; i < 11;
#else #else
i < 9; i < 10;
#endif #endif
i++) { i++) {
char *caption = NULL; char *caption = NULL;
@@ -1349,36 +1358,41 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
descr = _("Do not list the window in the window list menu."); descr = _("Do not list the window in the window list menu.");
break; break;
case 3: case 3:
caption = _("Do not show in the switch panel");
flag = WFLAGP(wwin, skip_switchpanel);
descr = _("Do not include in switchpanel while alternating windows.");
break;
case 4:
caption = _("Do not let it take focus"); caption = _("Do not let it take focus");
flag = WFLAGP(wwin, no_focusable); flag = WFLAGP(wwin, no_focusable);
descr = _("Do not let the window take keyboard focus when you\n" "click on it."); descr = _("Do not let the window take keyboard focus when you\n" "click on it.");
break; break;
case 4: case 5:
caption = _("Keep inside screen"); caption = _("Keep inside screen");
flag = WFLAGP(wwin, dont_move_off); flag = WFLAGP(wwin, dont_move_off);
descr = _("Do not allow the window to move itself completely\n" descr = _("Do not allow the window to move itself completely\n"
"outside the screen. For bug compatibility.\n"); "outside the screen. For bug compatibility.\n");
break; break;
case 5: case 6:
caption = _("Ignore 'Hide Others'"); caption = _("Ignore 'Hide Others'");
flag = WFLAGP(wwin, no_hide_others); flag = WFLAGP(wwin, no_hide_others);
descr = _("Do not hide the window when issuing the\n" "`HideOthers' command."); descr = _("Do not hide the window when issuing the\n" "`HideOthers' command.");
break; break;
case 6: case 7:
caption = _("Ignore 'Save Session'"); caption = _("Ignore 'Save Session'");
flag = WFLAGP(wwin, dont_save_session); flag = WFLAGP(wwin, dont_save_session);
descr = _("Do not save the associated application in the\n" descr = _("Do not save the associated application in the\n"
"session's state, so that it won't be restarted\n" "session's state, so that it won't be restarted\n"
"together with other applications when Window Maker\n" "starts."); "together with other applications when Window Maker\n" "starts.");
break; break;
case 7: case 8:
caption = _("Emulate application icon"); caption = _("Emulate application icon");
flag = WFLAGP(wwin, emulate_appicon); flag = WFLAGP(wwin, emulate_appicon);
descr = _("Make this window act as an application that provides\n" descr = _("Make this window act as an application that provides\n"
"enough information to Window Maker for a dockable\n" "enough information to Window Maker for a dockable\n"
"application icon to be created."); "application icon to be created.");
break; break;
case 8: case 9:
caption = _("Don't focus across workspaces"); caption = _("Don't focus across workspaces");
flag = WFLAGP(wwin, dont_focus_across_wksp); flag = WFLAGP(wwin, dont_focus_across_wksp);
descr = _("Do not allow Window Maker to switch workspace to satisfy\n" descr = _("Do not allow Window Maker to switch workspace to satisfy\n"
@@ -1386,7 +1400,7 @@ static InspectorPanel *createInspectorForWindow(WWindow * wwin, int xpos, int yp
"firefox opening in a different workspace)."); "firefox opening in a different workspace).");
break; break;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
case 9: case 10:
caption = _("Disable language button"); caption = _("Disable language button");
flag = WFLAGP(wwin, no_language_button); flag = WFLAGP(wwin, no_language_button);
descr = _("Remove the `toggle language' button of the window."); descr = _("Remove the `toggle language' button of the window.");

5
src/wmspec.c
View File

@@ -1101,6 +1101,7 @@ static Bool handleWindowType(WWindow * wwin, Atom type, int *layer)
wwin->client_flags.no_movable = 1; wwin->client_flags.no_movable = 1;
wwin->client_flags.omnipresent = 1; wwin->client_flags.omnipresent = 1;
wwin->client_flags.skip_window_list = 1; wwin->client_flags.skip_window_list = 1;
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1; wwin->client_flags.dont_move_off = 1;
wwin->client_flags.no_appicon = 1; wwin->client_flags.no_appicon = 1;
wwin->flags.net_skip_pager = 1; wwin->flags.net_skip_pager = 1;
@@ -1116,6 +1117,7 @@ static Bool handleWindowType(WWindow * wwin, Atom type, int *layer)
wwin->client_flags.no_movable = 1; wwin->client_flags.no_movable = 1;
wwin->client_flags.omnipresent = 1; wwin->client_flags.omnipresent = 1;
wwin->client_flags.skip_window_list = 1; wwin->client_flags.skip_window_list = 1;
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1; wwin->client_flags.dont_move_off = 1;
wwin->flags.net_skip_pager = 1; wwin->flags.net_skip_pager = 1;
} else if (type == net_wm_window_type_toolbar) { } else if (type == net_wm_window_type_toolbar) {
@@ -1125,6 +1127,7 @@ static Bool handleWindowType(WWindow * wwin, Atom type, int *layer)
wwin->client_flags.no_resizebar = 1; wwin->client_flags.no_resizebar = 1;
wwin->client_flags.no_shadeable = 1; wwin->client_flags.no_shadeable = 1;
wwin->client_flags.skip_window_list = 1; wwin->client_flags.skip_window_list = 1;
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1; wwin->client_flags.dont_move_off = 1;
wwin->client_flags.no_appicon = 1; wwin->client_flags.no_appicon = 1;
} else if (type == net_wm_window_type_menu) { } else if (type == net_wm_window_type_menu) {
@@ -1134,6 +1137,7 @@ static Bool handleWindowType(WWindow * wwin, Atom type, int *layer)
wwin->client_flags.no_resizebar = 1; wwin->client_flags.no_resizebar = 1;
wwin->client_flags.no_shadeable = 1; wwin->client_flags.no_shadeable = 1;
wwin->client_flags.skip_window_list = 1; wwin->client_flags.skip_window_list = 1;
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1; wwin->client_flags.dont_move_off = 1;
wwin->client_flags.no_appicon = 1; wwin->client_flags.no_appicon = 1;
} else if (type == net_wm_window_type_utility) { } else if (type == net_wm_window_type_utility) {
@@ -1146,6 +1150,7 @@ static Bool handleWindowType(WWindow * wwin, Atom type, int *layer)
wwin->client_flags.no_shadeable = 1; wwin->client_flags.no_shadeable = 1;
wwin->client_flags.no_movable = 1; wwin->client_flags.no_movable = 1;
wwin->client_flags.skip_window_list = 1; wwin->client_flags.skip_window_list = 1;
wwin->client_flags.skip_switchpanel = 1;
wwin->client_flags.dont_move_off = 1; wwin->client_flags.dont_move_off = 1;
wwin->client_flags.no_appicon = 1; wwin->client_flags.no_appicon = 1;
wwin->flags.net_skip_pager = 1; wwin->flags.net_skip_pager = 1;