From: "Rodolfo García Peñas (kix)" <[email protected]>
Because the wClipIconPaint() function is specific to paint the clip,
it knows where is the clip (wks_nfo.clip_icon), so the argument is not
needed.
---
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 adcc7b0..a0fae71 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -1231,7 +1231,7 @@ void wDefaultUpdateIcons(WScreen *scr)
}
if (!wPreferences.flags.noclip ||
wPreferences.flags.clip_merged_in_dock)
- wClipIconPaint(wks_nfo.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 5713d07..902ac2e 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1369,8 +1369,9 @@ void wDockDestroy(WDock *dock)
wfree(dock);
}
-void wClipIconPaint(WAppIcon *aicon)
+void wClipIconPaint(void)
{
+ WAppIcon *aicon = wks_nfo.clip_icon;
WScreen *scr = aicon->icon->core->screen_ptr;
WWorkspace *workspace = wks_nfo.workspaces[wks_nfo.current_workspace];
WMColor *color;
@@ -1414,13 +1415,13 @@ void wClipIconPaint(WAppIcon *aicon)
static void clipIconExpose(WObjDescriptor *desc, XEvent *event)
{
- wClipIconPaint(desc->parent);
+ wClipIconPaint();
}
static void dockIconPaint(WAppIcon *btn)
{
if (btn == wks_nfo.clip_icon) {
- wClipIconPaint(btn);
+ wClipIconPaint();
} else if (wIsADrawer(btn)) {
wDrawerIconPaint(btn);
} else {
@@ -3867,7 +3868,7 @@ static void handleClipChangeWorkspace(WScreen *scr,
XEvent *event)
clip->lclip_button_pushed = direction == CLIP_REWIND;
clip->rclip_button_pushed = direction == CLIP_FORWARD;
- wClipIconPaint(wks_nfo.clip_icon);
+ wClipIconPaint();
done = 0;
while (!done) {
WMMaskEvent(dpy, ExposureMask | ButtonMotionMask |
ButtonReleaseMask | ButtonPressMask, &ev);
@@ -3882,7 +3883,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_nfo.clip_icon);
+ wClipIconPaint();
}
break;
@@ -3914,7 +3915,7 @@ static void handleClipChangeWorkspace(WScreen *scr,
XEvent *event)
wWorkspaceChange(scr, wks_nfo.workspace_count - 1);
}
- wClipIconPaint(wks_nfo.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 ac99088..6aee864 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_nfo.clip_icon)
- wClipIconPaint(aicon);
+ wClipIconPaint();
else if (wIsADrawer(aicon))
wDrawerIconPaint(aicon);
else
diff --git a/src/workspace.c b/src/workspace.c
index 5f39dfe..c228dae 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -630,7 +630,7 @@ void wWorkspaceForceChange(WScreen * scr, int workspace)
XMapWindow(dpy, wks_nfo.clip_icon->icon->core->window);
}
else if (wks_nfo.clip_icon != NULL) {
- wClipIconPaint(wks_nfo.clip_icon);
+ wClipIconPaint();
}
wScreenUpdateUsableArea(scr);
wNETWMUpdateDesktop(scr);
@@ -706,7 +706,7 @@ void wWorkspaceRename(WScreen *scr, int workspace, const
char *name)
}
if (wks_nfo.clip_icon)
- wClipIconPaint(wks_nfo.clip_icon);
+ wClipIconPaint();
WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void
*)(uintptr_t) workspace);
}
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
