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

Remove unused argument from wDefaultFillAttributes()

Browse Source 
The function wDefaultFillAttributes() doesn't use the argument WScreen,
so it can be removed.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-07-03 11:47:15 +02:00
committed by Carlos R. Mafra
parent d6db53af0b
commit f5d845cfad
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/application.c
View File

@@ -59,8 +59,8 @@ static WWindow *makeMainWindow(WScreen * scr, Window window)
PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance); PropGetWMClass(window, &wwin->wm_class, &wwin->wm_instance);
wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class, wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->user_flags,
&wwin->user_flags, &wwin->defined_user_flags, True); &wwin->defined_user_flags, True);
XSelectInput(dpy, window, attr.your_event_mask | PropertyChangeMask | StructureNotifyMask); XSelectInput(dpy, window, attr.your_event_mask | PropertyChangeMask | StructureNotifyMask);
return wwin; return wwin;

2
src/defaults.h
View File

@@ -37,7 +37,7 @@ void wDefaultUpdateIcons(WScreen *scr);
void wReadStaticDefaults(WMPropList *dict); void wReadStaticDefaults(WMPropList *dict);
void wDefaultsCheckDomains(void *arg); void wDefaultsCheckDomains(void *arg);
void wSaveDefaults(WScreen *scr); void wSaveDefaults(WScreen *scr);
void wDefaultFillAttributes(WScreen *scr, char *instance, char *class, void wDefaultFillAttributes(char *instance, char *class,
WWindowAttributes *attr, WWindowAttributes *mask, WWindowAttributes *attr, WWindowAttributes *mask,
Bool useGlobalDefault); Bool useGlobalDefault);

5
src/dock.c
View File

@@ -804,7 +804,7 @@ static void launchDockedApplication(WAppIcon *btn, Bool withSelection)
if (btn->wm_instance || btn->wm_class) { if (btn->wm_instance || btn->wm_class) {
WWindowAttributes attr; WWindowAttributes attr;
memset(&attr, 0, sizeof(WWindowAttributes)); memset(&attr, 0, sizeof(WWindowAttributes));
wDefaultFillAttributes(scr, btn->wm_instance, btn->wm_class, &attr, NULL, True); wDefaultFillAttributes(btn->wm_instance, btn->wm_class, &attr, NULL, True);
if (!attr.no_appicon && !btn->buggy_app) if (!attr.no_appicon && !btn->buggy_app)
btn->launching = 1; btn->launching = 1;
@@ -1840,8 +1840,7 @@ int wDockReceiveDNDDrop(WScreen *scr, XEvent *event)
if (btn->wm_instance || btn->wm_class) { if (btn->wm_instance || btn->wm_class) {
WWindowAttributes attr; WWindowAttributes attr;
memset(&attr, 0, sizeof(WWindowAttributes)); memset(&attr, 0, sizeof(WWindowAttributes));
wDefaultFillAttributes(btn->icon->core->screen_ptr, wDefaultFillAttributes(btn->wm_instance, btn->wm_class, &attr, NULL, True);
btn->wm_instance, btn->wm_class, &attr, NULL, True);
if (!attr.no_appicon) if (!attr.no_appicon)
btn->launching = 1; btn->launching = 1;

6
src/wdefaults.c
View File

@@ -199,9 +199,9 @@ static WMPropList *get_value_from_instanceclass(char *value)
* *
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
void void wDefaultFillAttributes(char *instance, char *class,
wDefaultFillAttributes(WScreen * scr, char *instance, char *class, WWindowAttributes *attr, WWindowAttributes *mask,
WWindowAttributes * attr, WWindowAttributes * mask, Bool useGlobalDefault) Bool useGlobalDefault)
{ {
WMPropList *value, *dw, *dc, *dn, *da; WMPropList *value, *dw, *dc, *dn, *da;
char *buffer; char *buffer;

6
src/window.c
View File

@@ -302,7 +302,7 @@ void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
WScreen *scr = wwin->screen_ptr; WScreen *scr = wwin->screen_ptr;
/* sets global default stuff */ /* sets global default stuff */
wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class, &wwin->client_flags, NULL, True); wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->client_flags, NULL, True);
/* /*
* Decoration setting is done in this precedence (lower to higher) * Decoration setting is done in this precedence (lower to higher)
* - use global default in the resource database * - use global default in the resource database
@@ -393,8 +393,8 @@ void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
* Set attributes specified only for that window/class. * Set attributes specified only for that window/class.
* This might do duplicate work with the 1st wDefaultFillAttributes(). * This might do duplicate work with the 1st wDefaultFillAttributes().
*/ */
wDefaultFillAttributes(scr, wwin->wm_instance, wwin->wm_class, wDefaultFillAttributes(wwin->wm_instance, wwin->wm_class, &wwin->user_flags,
&wwin->user_flags, &wwin->defined_user_flags, False); &wwin->defined_user_flags, False);
/* /*
* Sanity checks for attributes that depend on other attributes * Sanity checks for attributes that depend on other attributes
*/ */