Because the wClipIconPaint() function is specific to paint the clip, it knows where is the clip (wks_info.clip_icon), so the argument is not needed.
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- src/defaults.c | 2 +- src/dock.c | 13 +++++++------ src/dock.h | 2 +- src/dockedapp.c | 2 +- src/workspace.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/defaults.c b/src/defaults.c index 87b4167..9606f7f 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -1230,7 +1230,7 @@ void wDefaultUpdateIcons(WScreen *scr) } if (!wPreferences.flags.noclip || wPreferences.flags.clip_merged_in_dock) - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); for (dc = scr->drawers; dc != NULL; dc = dc->next) wDrawerIconPaint(dc->adrawer->icon_array[0]); diff --git a/src/dock.c b/src/dock.c index e6384b9..f4a4bd3 100644 --- a/src/dock.c +++ b/src/dock.c @@ -1367,8 +1367,9 @@ void wDockDestroy(WDock *dock) wfree(dock); } -void wClipIconPaint(WAppIcon *aicon) +void wClipIconPaint(void) { + WAppIcon *aicon = wks_info.clip_icon; WScreen *scr = aicon->icon->core->screen_ptr; WWorkspace *workspace = wks_info.workspaces[wks_info.current_workspace]; WMColor *color; @@ -1412,13 +1413,13 @@ void wClipIconPaint(WAppIcon *aicon) static void clipIconExpose(WObjDescriptor *desc, XEvent *event) { - wClipIconPaint(desc->parent); + wClipIconPaint(); } static void dockIconPaint(WAppIcon *btn) { if (btn == wks_info.clip_icon) { - wClipIconPaint(btn); + wClipIconPaint(); } else if (wIsADrawer(btn)) { wDrawerIconPaint(btn); } else { @@ -3865,7 +3866,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event) clip->lclip_button_pushed = direction == CLIP_REWIND; clip->rclip_button_pushed = direction == CLIP_FORWARD; - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); done = 0; while (!done) { WMMaskEvent(dpy, ExposureMask | ButtonMotionMask | ButtonReleaseMask | ButtonPressMask, &ev); @@ -3880,7 +3881,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event) direction = new_dir; clip->lclip_button_pushed = direction == CLIP_REWIND; clip->rclip_button_pushed = direction == CLIP_FORWARD; - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); } break; @@ -3912,7 +3913,7 @@ static void handleClipChangeWorkspace(WScreen *scr, XEvent *event) wWorkspaceChange(scr, wks_info.workspace_count - 1); } - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); } static void iconMouseDown(WObjDescriptor *desc, XEvent *event) diff --git a/src/dock.h b/src/dock.h index 5fd4637..9ac4d20 100644 --- a/src/dock.h +++ b/src/dock.h @@ -96,7 +96,7 @@ void wDockLaunchWithState(WDock *dock, WAppIcon *btn, WSavedState *state); int wDockReceiveDNDDrop(WScreen *scr, XEvent *event); #endif -void wClipIconPaint(WAppIcon *aicon); +void wClipIconPaint(void); void wClipSaveState(WScreen *scr); WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace); WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state); diff --git a/src/dockedapp.c b/src/dockedapp.c index 283cdd9..5417245 100644 --- a/src/dockedapp.c +++ b/src/dockedapp.c @@ -180,7 +180,7 @@ static void panelBtnCallback(WMWidget * self, void *data) // Cf dock.c:dockIconPaint(WAppIcon *aicon)? if (aicon == wks_info.clip_icon) - wClipIconPaint(aicon); + wClipIconPaint(); else if (wIsADrawer(aicon)) wDrawerIconPaint(aicon); else diff --git a/src/workspace.c b/src/workspace.c index 33680d0..1ec9bad 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -625,7 +625,7 @@ void wWorkspaceForceChange(WScreen * scr, int workspace) XMapWindow(dpy, wks_info.clip_icon->icon->core->window); } else if (wks_info.clip_icon != NULL) { - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); } wScreenUpdateUsableArea(scr); wNETWMUpdateDesktop(scr); @@ -701,7 +701,7 @@ void wWorkspaceRename(WScreen *scr, int workspace, const char *name) } if (wks_info.clip_icon) - wClipIconPaint(wks_info.clip_icon); + wClipIconPaint(); WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void *)(uintptr_t) workspace); } -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
