This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d (commit)
discards d9b10080dbb2e4ca3466efb411080b7cb11e2224 (commit)
discards 025075d5f0366810e91676f4cc9195c3770f94f4 (commit)
discards 61118ffa40979a45e6c75056bc81d133ad8cfdd5 (commit)
discards db3a4dd40470f970ffd4d23f769715dbddc134c7 (commit)
via 51a54ba2e2b406e0f037b2559ec61ddd068fed52 (commit)
via 119507d54160d64a4feeadd741061e8127c5bab8 (commit)
via b08b18214743511f53241d4820b9d0370c49540c (commit)
via 6368bde7e5c0997958837851b97827430ae9ed4a (commit)
via 4954d4df23495255c5014d4f8bee349c479ccf1e (commit)
via 558fc5f0d355f757fcb3272ef350655b42da2ac2 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (cae3be1e9cf07d5321d0a2e98ea0fd3556e1454d)
N -- N -- N (51a54ba2e2b406e0f037b2559ec61ddd068fed52)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/51a54ba2e2b406e0f037b2559ec61ddd068fed52
commit 51a54ba2e2b406e0f037b2559ec61ddd068fed52
Author: Carlos R. Mafra <[email protected]>
Date: Sun Feb 12 21:35:09 2012 +0000
dock: Make some functions static
diff --git a/src/dock.c b/src/dock.c
index 9565956..8a1a21f 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -108,7 +108,7 @@ static void clipLeave(WDock *dock);
static void handleClipChangeWorkspace(WScreen *scr, XEvent *event);
-Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int
y);
+static Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int
x, int y);
static void clipEnterNotify(WObjDescriptor *desc, XEvent *event);
static void clipLeaveNotify(WObjDescriptor *desc, XEvent *event);
@@ -118,6 +118,8 @@ static void launchDockedApplication(WAppIcon *btn, Bool
withSelection);
static void clipAutoLower(void *cdata);
static void clipAutoRaise(void *cdata);
+static void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y);
+static WAppIcon *mainIconCreate(WScreen *scr, int type);
static void make_keys(void)
{
@@ -733,7 +735,7 @@ static void unhideHereCallback(WMenu *menu, WMenuEntry
*entry)
wUnhideApplication(wapp, False, True);
}
-WAppIcon *mainIconCreate(WScreen *scr, int type)
+static WAppIcon *mainIconCreate(WScreen *scr, int type)
{
WAppIcon *btn;
int x_pos;
@@ -1991,7 +1993,7 @@ Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x,
int y)
return True;
}
-void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y)
+static void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y)
{
int index;
@@ -2008,7 +2010,7 @@ void reattachIcon(WDock *dock, WAppIcon *icon, int x, int
y)
icon->y_pos = dock->y_pos + y * ICON_SIZE;
}
-Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int
y)
+static Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int
x, int y)
{
WWindow *wwin;
char *command;
http://repo.or.cz/w/wmaker-crm.git/commit/119507d54160d64a4feeadd741061e8127c5bab8
commit 119507d54160d64a4feeadd741061e8127c5bab8
Author: Carlos R. Mafra <[email protected]>
Date: Sun Feb 12 17:09:19 2012 +0000
wmgenmenu: Update mrxvt options
The old mrxvt I had in my previous distro is gone. The options
need to be updated.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/util/wmgenmenu.h b/util/wmgenmenu.h
index dddd433..ab2cd8a 100644
--- a/util/wmgenmenu.h
+++ b/util/wmgenmenu.h
@@ -7,7 +7,7 @@
char *Terminals[MAX_NR_APPS][2] = {
{ N_("xterm"), "xterm -bg black -fg white +sb +sm -fn 10x20 -sl 4000
-cr yellow" },
- { N_("mrxvt"), "mrxvt -rv -shade 00 -vb +sb +sm -tr -sl 2000 -trt
-itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
+ { N_("mrxvt"), "mrxvt +bt +bc -shade 00 -vb +sb +sm -tr -sl 2000 -trt
-itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
{ N_("Konsole"), "konsole" },
{ N_("Urxvt"), "urxvt" },
{ NULL, NULL }
http://repo.or.cz/w/wmaker-crm.git/commit/b08b18214743511f53241d4820b9d0370c49540c
commit b08b18214743511f53241d4820b9d0370c49540c
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Feb 12 20:04:50 2012 +0100
menu: remove OpenWorkspaceMenu()
The function OpenWorkspaceMenu() is not used, remove it.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/funcs.h b/src/funcs.h
index 5d813ea..6d2c552 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -61,8 +61,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int
keyboard);
void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
-void OpenWorkspaceMenu(WScreen *scr, int x, int y);
-
void CloseWindowMenu(WScreen *scr);
void DestroyWindowMenu(WScreen *scr);
diff --git a/src/menu.c b/src/menu.c
index 5286899..449904f 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2503,36 +2503,3 @@ void wMenuRestoreState(WScreen * scr)
}
restoreMenuRecurs(scr, menus, scr->root_menu, "");
}
-
-void OpenWorkspaceMenu(WScreen * scr, int x, int y)
-{
- WMenu *menu, *parent;
- WMenuEntry *entry;
-
- if (!scr->root_menu) {
- OpenRootMenu(scr, scr->scr_width * 2, 0, False);
- wMenuUnmap(scr->root_menu);
- }
-
- menu = scr->workspace_menu;
- if (menu) {
- if (menu->flags.mapped) {
- if (!menu->flags.buttoned) {
- wMenuUnmap(menu);
- parent = menu->parent;
- if (parent && parent->selected_entry >= 0) {
- entry =
parent->entries[parent->selected_entry];
- if (parent->cascades[entry->cascade] ==
menu) {
- selectEntry(parent, -1);
- wMenuMapAt(menu, x, y, False);
- }
- }
- } else {
- wRaiseFrame(menu->frame->core);
- wMenuMapCopyAt(menu, x, y);
- }
- } else {
- wMenuMapAt(menu, x, y, False);
- }
- }
-}
http://repo.or.cz/w/wmaker-crm.git/commit/6368bde7e5c0997958837851b97827430ae9ed4a
commit 6368bde7e5c0997958837851b97827430ae9ed4a
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Feb 12 16:08:51 2012 +0100
WindowMaker: Add Balloon to the clip
Display a standard Window Maker balloon with the workspace name when the
mouse enters the clip area.
This complements commit 4954d4df2349 ("clip: Do not display balloon with
workspace name") because now the balloon which appears on the clip is the
same as in other parts of wmaker.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/balloon.c b/src/balloon.c
index a4e8aaf..517dc92 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -439,7 +439,15 @@ static void appiconBalloon(WObjDescriptor * object)
WScreen *scr = aicon->icon->core->screen_ptr;
char *tmp;
- if (aicon->command && aicon->wm_class) {
+ /* Show balloon if it is the Clip and the workspace name is > 5 chars */
+ if (object->parent == scr->clip_icon) {
+ if (strlen(scr->workspaces[scr->current_workspace]->name) > 5) {
+ scr->balloon->text =
wstrdup(scr->workspaces[scr->current_workspace]->name);
+ } else {
+ wBalloonHide(scr);
+ return;
+ }
+ } else if (aicon->command && aicon->wm_class) {
int len = strlen(aicon->command) + strlen(aicon->wm_class) + 8;
tmp = wmalloc(len);
snprintf(tmp, len, "%sn(%s)", aicon->wm_class, aicon->command);
@@ -510,24 +518,19 @@ void wBalloonEnteredObject(WScreen * scr, WObjDescriptor
* object)
balloon->ignoreTimer = 0;
return;
}
+
switch (object->parent_type) {
case WCLASS_FRAME:
- if (wPreferences.window_balloon) {
+ if (wPreferences.window_balloon)
frameBalloon(object);
- }
break;
-
case WCLASS_DOCK_ICON:
- if (object->parent != scr->clip_icon &&
wPreferences.appicon_balloon)
+ if (wPreferences.appicon_balloon)
appiconBalloon(object);
- else
- wBalloonHide(scr);
break;
-
case WCLASS_MINIWINDOW:
- if (wPreferences.miniwin_balloon) {
+ if (wPreferences.miniwin_balloon)
miniwindowBalloon(object);
- }
break;
case WCLASS_APPICON:
if (wPreferences.appicon_balloon)
http://repo.or.cz/w/wmaker-crm.git/commit/4954d4df23495255c5014d4f8bee349c479ccf1e
commit 4954d4df23495255c5014d4f8bee349c479ccf1e
Author: Carlos R. Mafra <[email protected]>
Date: Sat Feb 11 20:44:28 2012 +0000
clip: Do not display balloon with workspace name
When the mouse passes over the clip, wmaker would display a "odd" balloon
text with the workspace name, but the balloon itself was covered by the
clip icon!
So if the workspace name was short enough ("Internet" is, by my testing
here)
the user wouldn't see anything, the balloon is completely under the clip
icon.
I found this issue because one of my workspaces is called "Beyonder" and I
noticed a small "r" under the clip one day.
Instead of trying to fix this, I just removed the whole thing about
displaying
the balloon because it is superfluous and I haven't seen any bug reports
about
this yet, so it probably means most people are not even aware of it.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/dock.c b/src/dock.c
index 0eb6779..9565956 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -119,8 +119,6 @@ static void launchDockedApplication(WAppIcon *btn, Bool
withSelection);
static void clipAutoLower(void *cdata);
static void clipAutoRaise(void *cdata);
-static void showClipBalloon(WDock * dock, int workspace);
-
static void make_keys(void)
{
if (dCommand != NULL)
@@ -3002,8 +3000,6 @@ void wClipUpdateForWorkspaceChange(WScreen *scr, int
workspace)
}
wDockShowIcons(scr->workspaces[workspace]->clip);
}
- if (scr->flags.clip_balloon_mapped)
- showClipBalloon(scr->clip_icon->dock, workspace);
}
}
@@ -3747,10 +3743,6 @@ static void iconMouseDown(WObjDescriptor *desc, XEvent
*event)
}
}
- if (dock->type == WM_CLIP && scr->flags.clip_balloon_mapped) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- }
if (event->xbutton.button == Button1) {
if (event->xbutton.state & MOD_MASK)
wDockLower(dock);
@@ -3817,45 +3809,6 @@ static void iconMouseDown(WObjDescriptor *desc, XEvent
*event)
}
}
-static void showClipBalloon(WDock * dock, int workspace)
-{
- int w, h;
- int x, y;
- WScreen *scr = dock->screen_ptr;
- char *text;
- Window stack[2];
-
- scr->flags.clip_balloon_mapped = 1;
- XMapWindow(dpy, scr->clip_balloon);
-
- text = scr->workspaces[workspace]->name;
-
- w = WMWidthOfString(scr->clip_title_font, text, strlen(text));
-
- h = WMFontHeight(scr->clip_title_font);
- XResizeWindow(dpy, scr->clip_balloon, w, h);
-
- x = dock->x_pos + CLIP_BUTTON_SIZE * ICON_SIZE / 64;
- y = dock->y_pos + ICON_SIZE - WMFontHeight(scr->clip_title_font) - 3;
-
- if (x + w > scr->scr_width) {
- x = scr->scr_width - w;
- if (dock->y_pos + ICON_SIZE + h > scr->scr_height)
- y = dock->y_pos - h - 1;
- else
- y = dock->y_pos + ICON_SIZE;
- XRaiseWindow(dpy, scr->clip_balloon);
- } else {
- stack[0] = scr->clip_icon->icon->core->window;
- stack[1] = scr->clip_balloon;
- XRestackWindows(dpy, stack, 2);
- }
- XMoveWindow(dpy, scr->clip_balloon, x, y);
- XClearWindow(dpy, scr->clip_balloon);
- WMDrawString(scr->wmscreen, scr->clip_balloon,
- scr->clip_title_color[CLIP_NORMAL], scr->clip_title_font,
0, 0, text, strlen(text));
-}
-
static void clipEnterNotify(WObjDescriptor *desc, XEvent *event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
@@ -3893,15 +3846,6 @@ static void clipEnterNotify(WObjDescriptor *desc, XEvent
*event)
if (dock->auto_collapse && !dock->auto_expand_magic) {
dock->auto_expand_magic = WMAddTimerHandler(AUTO_EXPAND_DELAY,
clipAutoExpand, (void *)dock);
}
-
- if (btn->xindex == 0 && btn->yindex == 0)
- showClipBalloon(dock, dock->screen_ptr->current_workspace);
- else {
- if (dock->screen_ptr->flags.clip_balloon_mapped) {
- XUnmapWindow(dpy, dock->screen_ptr->clip_balloon);
- dock->screen_ptr->flags.clip_balloon_mapped = 0;
- }
- }
}
static void clipLeave(WDock *dock)
@@ -4008,10 +3952,6 @@ static void clipAutoRaise(void *cdata)
if (dock->auto_raise_lower)
wDockRaise(dock);
- if (dock->screen_ptr->flags.clip_balloon_mapped) {
- showClipBalloon(dock, dock->screen_ptr->current_workspace);
- }
-
dock->auto_raise_magic = NULL;
}
diff --git a/src/event.c b/src/event.c
index 561b1f2..3bc3c40 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1155,19 +1155,6 @@ static void handleEnterNotify(XEvent * event)
}
}
- /* a little kluge to hide the clip balloon */
- if (!wPreferences.flags.noclip && scr->flags.clip_balloon_mapped) {
- if (!desc) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- } else {
- if (desc->parent_type != WCLASS_DOCK_ICON ||
scr->clip_icon != desc->parent) {
- XUnmapWindow(dpy, scr->clip_balloon);
- scr->flags.clip_balloon_mapped = 0;
- }
- }
- }
-
if (event->xcrossing.window == event->xcrossing.root
&& event->xcrossing.detail == NotifyNormal
&& event->xcrossing.detail != NotifyInferior &&
wPreferences.focus_mode != WKF_CLICK) {
diff --git a/src/screen.h b/src/screen.h
index 74dabae..af5a97b 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -283,7 +283,6 @@ typedef struct _WScreen {
unsigned int added_windows_menu:1;
unsigned int startup2:1; /* startup phase 2 */
unsigned int supports_tiff:1;
- unsigned int clip_balloon_mapped:1;
unsigned int next_click_is_not_double:1;
unsigned int backimage_helper_launched:1;
/* some client has issued a WM_COLORMAP_NOTIFY */
http://repo.or.cz/w/wmaker-crm.git/commit/558fc5f0d355f757fcb3272ef350655b42da2ac2
commit 558fc5f0d355f757fcb3272ef350655b42da2ac2
Author: Carlos R. Mafra <[email protected]>
Date: Sat Feb 11 20:01:24 2012 +0000
dock: Trivial code style cleanups
Just random things I noticed while reading the code...
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/src/dock.c b/src/dock.c
index bf3f078..0eb6779 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -88,33 +88,33 @@ static WMPropList *dPosition, *dApplications, *dLowered,
*dCollapsed;
static WMPropList *dAutoCollapse, *dAutoRaiseLower, *dOmnipresent;
-static void dockIconPaint(WAppIcon * btn);
+static void dockIconPaint(WAppIcon *btn);
-static void iconMouseDown(WObjDescriptor * desc, XEvent * event);
+static void iconMouseDown(WObjDescriptor *desc, XEvent *event);
-static pid_t execCommand(WAppIcon * btn, char *command, WSavedState * state);
+static pid_t execCommand(WAppIcon *btn, char *command, WSavedState *state);
-static void trackDeadProcess(pid_t pid, unsigned char status, WDock * dock);
+static void trackDeadProcess(pid_t pid, unsigned char status, WDock *dock);
static int getClipButton(int px, int py);
-static void toggleLowered(WDock * dock);
+static void toggleLowered(WDock *dock);
-static void toggleCollapsed(WDock * dock);
+static void toggleCollapsed(WDock *dock);
-static void clipIconExpose(WObjDescriptor * desc, XEvent * event);
+static void clipIconExpose(WObjDescriptor *desc, XEvent *event);
-static void clipLeave(WDock * dock);
+static void clipLeave(WDock *dock);
-static void handleClipChangeWorkspace(WScreen * scr, XEvent * event);
+static void handleClipChangeWorkspace(WScreen *scr, XEvent *event);
-Bool moveIconBetweenDocks(WDock * src, WDock * dest, WAppIcon * icon, int x,
int y);
+Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int
y);
-static void clipEnterNotify(WObjDescriptor * desc, XEvent * event);
-static void clipLeaveNotify(WObjDescriptor * desc, XEvent * event);
+static void clipEnterNotify(WObjDescriptor *desc, XEvent *event);
+static void clipLeaveNotify(WObjDescriptor *desc, XEvent *event);
static void clipAutoCollapse(void *cdata);
static void clipAutoExpand(void *cdata);
-static void launchDockedApplication(WAppIcon * btn, Bool withSelection);
+static void launchDockedApplication(WAppIcon *btn, Bool withSelection);
static void clipAutoLower(void *cdata);
static void clipAutoRaise(void *cdata);
@@ -154,7 +154,7 @@ static void make_keys(void)
dClip = WMCreatePLString("Clip");
}
-static void renameCallback(WMenu * menu, WMenuEntry * entry)
+static void renameCallback(WMenu *menu, WMenuEntry *entry)
{
WDock *dock = entry->clientdata;
char buffer[128];
@@ -176,7 +176,7 @@ static void renameCallback(WMenu * menu, WMenuEntry * entry)
}
}
-static void toggleLoweredCallback(WMenu * menu, WMenuEntry * entry)
+static void toggleLoweredCallback(WMenu *menu, WMenuEntry *entry)
{
assert(entry->clientdata != NULL);
@@ -192,7 +192,7 @@ static int matchWindow(const void *item, const void *cdata)
return (((WFakeGroupLeader *) item)->leader == (Window) cdata);
}
-static void killCallback(WMenu * menu, WMenuEntry * entry)
+static void killCallback(WMenu *menu, WMenuEntry *entry)
{
WScreen *scr = menu->menu->screen_ptr;
WAppIcon *icon;
@@ -263,7 +263,7 @@ static void killCallback(WMenu * menu, WMenuEntry * entry)
}
/* TODO: replace this function with a member of the dock struct */
-static int numberOfSelectedIcons(WDock * dock)
+static int numberOfSelectedIcons(WDock *dock)
{
WAppIcon *aicon;
int i, n;
@@ -279,7 +279,7 @@ static int numberOfSelectedIcons(WDock * dock)
return n;
}
-static WMArray *getSelected(WDock * dock)
+static WMArray *getSelected(WDock *dock)
{
WMArray *ret = WMCreateArray(8);
WAppIcon *btn;
@@ -295,7 +295,7 @@ static WMArray *getSelected(WDock * dock)
return ret;
}
-static void paintClipButtons(WAppIcon * clipIcon, Bool lpushed, Bool rpushed)
+static void paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
{
Window win = clipIcon->icon->core->window;
WScreen *scr = clipIcon->icon->core->screen_ptr;
@@ -362,7 +362,7 @@ static void paintClipButtons(WAppIcon * clipIcon, Bool
lpushed, Bool rpushed)
}
}
-RImage *wClipMakeTile(WScreen * scr, RImage * normalTile)
+RImage *wClipMakeTile(WScreen *scr, RImage *normalTile)
{
RImage *tile = RCloneImage(normalTile);
RColor black;
@@ -407,7 +407,7 @@ RImage *wClipMakeTile(WScreen * scr, RImage * normalTile)
return tile;
}
-static void omnipresentCallback(WMenu * menu, WMenuEntry * entry)
+static void omnipresentCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *clickedIcon = entry->clientdata;
WAppIcon *aicon;
@@ -451,7 +451,7 @@ static void omnipresentCallback(WMenu * menu, WMenuEntry *
entry)
}
}
-static void removeIconsCallback(WMenu * menu, WMenuEntry * entry)
+static void removeIconsCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata;
WDock *dock;
@@ -499,7 +499,7 @@ static void removeIconsCallback(WMenu * menu, WMenuEntry *
entry)
wArrangeIcons(dock->screen_ptr, True);
}
-static void keepIconsCallback(WMenu * menu, WMenuEntry * entry)
+static void keepIconsCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata;
WDock *dock;
@@ -554,7 +554,7 @@ static void keepIconsCallback(WMenu * menu, WMenuEntry *
entry)
WMFreeArray(selectedIcons);
}
-static void toggleAutoAttractCallback(WMenu * menu, WMenuEntry * entry)
+static void toggleAutoAttractCallback(WMenu *menu, WMenuEntry *entry)
{
WDock *dock = (WDock *) entry->clientdata;
@@ -569,7 +569,7 @@ static void toggleAutoAttractCallback(WMenu * menu,
WMenuEntry * entry)
wMenuPaint(menu);
}
-static void selectCallback(WMenu * menu, WMenuEntry * entry)
+static void selectCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *icon = (WAppIcon *) entry->clientdata;
@@ -580,7 +580,7 @@ static void selectCallback(WMenu * menu, WMenuEntry * entry)
wMenuPaint(menu);
}
-static void colectIconsCallback(WMenu * menu, WMenuEntry * entry)
+static void colectIconsCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata;
WDock *clip;
@@ -624,7 +624,7 @@ static void colectIconsCallback(WMenu * menu, WMenuEntry *
entry)
}
}
-static void selectIconsCallback(WMenu * menu, WMenuEntry * entry)
+static void selectIconsCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *clickedIcon = (WAppIcon *) entry->clientdata;
WDock *dock;
@@ -655,7 +655,7 @@ static void selectIconsCallback(WMenu * menu, WMenuEntry *
entry)
wMenuPaint(menu);
}
-static void toggleCollapsedCallback(WMenu * menu, WMenuEntry * entry)
+static void toggleCollapsedCallback(WMenu *menu, WMenuEntry *entry)
{
assert(entry->clientdata != NULL);
@@ -666,7 +666,7 @@ static void toggleCollapsedCallback(WMenu * menu,
WMenuEntry * entry)
wMenuPaint(menu);
}
-static void toggleAutoCollapseCallback(WMenu * menu, WMenuEntry * entry)
+static void toggleAutoCollapseCallback(WMenu *menu, WMenuEntry *entry)
{
WDock *dock;
assert(entry->clientdata != NULL);
@@ -680,7 +680,7 @@ static void toggleAutoCollapseCallback(WMenu * menu,
WMenuEntry * entry)
wMenuPaint(menu);
}
-static void toggleAutoRaiseLowerCallback(WMenu * menu, WMenuEntry * entry)
+static void toggleAutoRaiseLowerCallback(WMenu *menu, WMenuEntry *entry)
{
WDock *dock;
assert(entry->clientdata != NULL);
@@ -694,14 +694,14 @@ static void toggleAutoRaiseLowerCallback(WMenu * menu,
WMenuEntry * entry)
wMenuPaint(menu);
}
-static void launchCallback(WMenu * menu, WMenuEntry * entry)
+static void launchCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *btn = (WAppIcon *) entry->clientdata;
launchDockedApplication(btn, False);
}
-static void settingsCallback(WMenu * menu, WMenuEntry * entry)
+static void settingsCallback(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *btn = (WAppIcon *) entry->clientdata;
@@ -710,7 +710,7 @@ static void settingsCallback(WMenu * menu, WMenuEntry *
entry)
ShowDockAppSettingsPanel(btn);
}
-static void hideCallback(WMenu * menu, WMenuEntry * entry)
+static void hideCallback(WMenu *menu, WMenuEntry *entry)
{
WApplication *wapp;
WAppIcon *btn = (WAppIcon *) entry->clientdata;
@@ -725,7 +725,7 @@ static void hideCallback(WMenu * menu, WMenuEntry * entry)
}
}
-static void unhideHereCallback(WMenu * menu, WMenuEntry * entry)
+static void unhideHereCallback(WMenu *menu, WMenuEntry *entry)
{
WApplication *wapp;
WAppIcon *btn = (WAppIcon *) entry->clientdata;
@@ -735,7 +735,7 @@ static void unhideHereCallback(WMenu * menu, WMenuEntry *
entry)
wUnhideApplication(wapp, False, True);
}
-WAppIcon *mainIconCreate(WScreen * scr, int type)
+WAppIcon *mainIconCreate(WScreen *scr, int type)
{
WAppIcon *btn;
int x_pos;
@@ -771,7 +771,7 @@ WAppIcon *mainIconCreate(WScreen * scr, int type)
return btn;
}
-static void switchWSCommand(WMenu * menu, WMenuEntry * entry)
+static void switchWSCommand(WMenu *menu, WMenuEntry *entry)
{
WAppIcon *btn, *icon = (WAppIcon *) entry->clientdata;
WScreen *scr = icon->icon->core->screen_ptr;
@@ -804,7 +804,7 @@ static void switchWSCommand(WMenu * menu, WMenuEntry *
entry)
WMFreeArray(selectedIcons);
}
-static void launchDockedApplication(WAppIcon * btn, Bool withSelection)
+static void launchDockedApplication(WAppIcon *btn, Bool withSelection)
{
WScreen *scr = btn->icon->core->screen_ptr;
@@ -848,7 +848,7 @@ static void launchDockedApplication(WAppIcon * btn, Bool
withSelection)
}
}
-static void updateWorkspaceMenu(WMenu * menu, WAppIcon * icon)
+static void updateWorkspaceMenu(WMenu *menu, WAppIcon *icon)
{
WScreen *scr = menu->frame->screen_ptr;
char title[MAX_WORKSPACENAME_WIDTH + 1];
@@ -884,7 +884,7 @@ static void updateWorkspaceMenu(WMenu * menu, WAppIcon *
icon)
wMenuRealize(menu);
}
-static WMenu *makeWorkspaceMenu(WScreen * scr)
+static WMenu *makeWorkspaceMenu(WScreen *scr)
{
WMenu *menu;
@@ -900,7 +900,7 @@ static WMenu *makeWorkspaceMenu(WScreen * scr)
return menu;
}
-static void updateClipOptionsMenu(WMenu * menu, WDock * dock)
+static void updateClipOptionsMenu(WMenu *menu, WDock *dock)
{
WMenuEntry *entry;
int index = 0;
@@ -938,7 +938,7 @@ static void updateClipOptionsMenu(WMenu * menu, WDock *
dock)
wMenuRealize(menu);
}
-static WMenu *makeClipOptionsMenu(WScreen * scr)
+static WMenu *makeClipOptionsMenu(WScreen *scr)
{
WMenu *menu;
WMenuEntry *entry;
@@ -980,7 +980,7 @@ static WMenu *makeClipOptionsMenu(WScreen * scr)
return menu;
}
-static WMenu *dockMenuCreate(WScreen * scr, int type)
+static WMenu *dockMenuCreate(WScreen *scr, int type)
{
WMenu *menu;
WMenuEntry *entry;
@@ -1049,7 +1049,7 @@ static WMenu *dockMenuCreate(WScreen * scr, int type)
return menu;
}
-WDock *wDockCreate(WScreen * scr, int type)
+WDock *wDockCreate(WScreen *scr, int type)
{
WDock *dock;
WAppIcon *btn;
@@ -1092,7 +1092,7 @@ WDock *wDockCreate(WScreen * scr, int type)
return dock;
}
-void wDockDestroy(WDock * dock)
+void wDockDestroy(WDock *dock)
{
int i;
WAppIcon *aicon;
@@ -1122,7 +1122,7 @@ void wDockDestroy(WDock * dock)
wfree(dock);
}
-void wClipIconPaint(WAppIcon * aicon)
+void wClipIconPaint(WAppIcon *aicon)
{
WScreen *scr = aicon->icon->core->screen_ptr;
WWorkspace *workspace = scr->workspaces[scr->current_workspace];
@@ -1151,8 +1151,6 @@ void wClipIconPaint(WAppIcon * aicon)
if(wPreferences.show_clip_title)
WMDrawString(scr->wmscreen, win, color, scr->clip_title_font,
tx, ty, ws_name, length);
- /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4,
- 2, ws_name, length); */
tx = (ICON_SIZE / 2 - WMWidthOfString(scr->clip_title_font, ws_number,
nlength)) / 2;
@@ -1167,12 +1165,12 @@ void wClipIconPaint(WAppIcon * aicon)
paintClipButtons(aicon, aicon->dock->lclip_button_pushed,
aicon->dock->rclip_button_pushed);
}
-static void clipIconExpose(WObjDescriptor * desc, XEvent * event)
+static void clipIconExpose(WObjDescriptor *desc, XEvent *event)
{
wClipIconPaint(desc->parent);
}
-static void dockIconPaint(WAppIcon * btn)
+static void dockIconPaint(WAppIcon *btn)
{
if (btn == btn->icon->core->screen_ptr->clip_icon)
wClipIconPaint(btn);
@@ -1182,7 +1180,7 @@ static void dockIconPaint(WAppIcon * btn)
}
}
-static WMPropList *make_icon_state(WAppIcon * btn)
+static WMPropList *make_icon_state(WAppIcon *btn)
{
WMPropList *node = NULL;
WMPropList *command, *autolaunch, *lock, *name, *forced, *host;
@@ -1253,7 +1251,7 @@ static WMPropList *make_icon_state(WAppIcon * btn)
return node;
}
-static WMPropList *dockSaveState(WDock * dock)
+static WMPropList *dockSaveState(WDock *dock)
{
int i;
WMPropList *icon_info;
@@ -1310,7 +1308,7 @@ static WMPropList *dockSaveState(WDock * dock)
return dock_state;
}
-void wDockSaveState(WScreen * scr, WMPropList * old_state)
+void wDockSaveState(WScreen *scr, WMPropList *old_state)
{
WMPropList *dock_state;
WMPropList *keys;
@@ -1342,7 +1340,7 @@ void wDockSaveState(WScreen * scr, WMPropList * old_state)
WMReleasePropList(dock_state);
}
-void wClipSaveState(WScreen * scr)
+void wClipSaveState(WScreen *scr)
{
WMPropList *clip_state;
@@ -1353,12 +1351,12 @@ void wClipSaveState(WScreen * scr)
WMReleasePropList(clip_state);
}
-WMPropList *wClipSaveWorkspaceState(WScreen * scr, int workspace)
+WMPropList *wClipSaveWorkspaceState(WScreen *scr, int workspace)
{
return dockSaveState(scr->workspaces[workspace]->clip);
}
-static Bool getBooleanDockValue(WMPropList * value, WMPropList * key)
+static Bool getBooleanDockValue(WMPropList *value, WMPropList *key)
{
if (value) {
if (WMIsPLString(value)) {
@@ -1371,7 +1369,7 @@ static Bool getBooleanDockValue(WMPropList * value,
WMPropList * key)
return False;
}
-static WAppIcon *restore_icon_state(WScreen * scr, WMPropList * info, int
type, int index)
+static WAppIcon *restore_icon_state(WScreen *scr, WMPropList *info, int type,
int index)
{
WAppIcon *aicon;
WMPropList *cmd, *value;
@@ -1493,7 +1491,7 @@ static WAppIcon *restore_icon_state(WScreen * scr,
WMPropList * info, int type,
#define COMPLAIN(key) wwarning(_("bad value in dock state info:%s"), key)
-WAppIcon *wClipRestoreState(WScreen * scr, WMPropList * clip_state)
+WAppIcon *wClipRestoreState(WScreen *scr, WMPropList *clip_state)
{
WAppIcon *icon;
WMPropList *value;
@@ -1544,7 +1542,7 @@ WAppIcon *wClipRestoreState(WScreen * scr, WMPropList *
clip_state)
return icon;
}
-WDock *wDockRestoreState(WScreen * scr, WMPropList * dock_state, int type)
+WDock *wDockRestoreState(WScreen *scr, WMPropList *dock_state, int type)
{
WDock *dock;
WMPropList *apps;
@@ -1560,9 +1558,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
WMRetainPropList(dock_state);
/* restore position */
-
value = WMGetFromPLDictionary(dock_state, dPosition);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Position");
@@ -1604,11 +1600,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore lowered/raised state */
-
dock->lowered = 0;
value = WMGetFromPLDictionary(dock_state, dLowered);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Lowered");
@@ -1620,11 +1614,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore collapsed state */
-
dock->collapsed = 0;
value = WMGetFromPLDictionary(dock_state, dCollapsed);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Collapsed");
@@ -1636,9 +1628,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-collapsed state */
-
value = WMGetFromPLDictionary(dock_state, dAutoCollapse);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoCollapse");
@@ -1651,32 +1641,26 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-raise/lower state */
-
value = WMGetFromPLDictionary(dock_state, dAutoRaiseLower);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoRaiseLower");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->auto_raise_lower = 1;
- }
}
}
/* restore attract icons state */
-
dock->attract_icons = 0;
value = WMGetFromPLDictionary(dock_state, dAutoAttractIcons);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoAttractIcons");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->attract_icons = 1;
- }
}
}
@@ -1700,17 +1684,14 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
apps = WMGetFromPLDictionary(dock_state, tmp);
WMReleasePropList(tmp);
- if (!apps) {
+ if (!apps)
apps = WMGetFromPLDictionary(dock_state, dApplications);
- }
}
- if (!apps) {
+ if (!apps)
goto finish;
- }
count = WMGetPropListItemCount(apps);
-
if (count == 0)
goto finish;
@@ -1781,7 +1762,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
return dock;
}
-void wDockLaunchWithState(WDock * dock, WAppIcon * btn, WSavedState * state)
+void wDockLaunchWithState(WDock *dock, WAppIcon *btn, WSavedState *state)
{
if (btn && btn->command && !btn->running && !btn->launching) {
@@ -1801,7 +1782,7 @@ void wDockLaunchWithState(WDock * dock, WAppIcon * btn,
WSavedState * state)
}
}
-void wDockDoAutoLaunch(WDock * dock, int workspace)
+void wDockDoAutoLaunch(WDock *dock, int workspace)
{
WAppIcon *btn;
WSavedState *state;
@@ -1822,7 +1803,7 @@ void wDockDoAutoLaunch(WDock * dock, int workspace)
}
#ifdef XDND /* was OFFIX */
-static WDock *findDock(WScreen * scr, XEvent * event, int *icon_pos)
+static WDock *findDock(WScreen *scr, XEvent *event, int *icon_pos)
{
WDock *dock;
int i;
@@ -1851,7 +1832,7 @@ static WDock *findDock(WScreen * scr, XEvent * event, int
*icon_pos)
return NULL;
}
-int wDockReceiveDNDDrop(WScreen * scr, XEvent * event)
+int wDockReceiveDNDDrop(WScreen *scr, XEvent *event)
{
WDock *dock;
WAppIcon *btn;
@@ -1907,7 +1888,7 @@ int wDockReceiveDNDDrop(WScreen * scr, XEvent * event)
}
#endif /* XDND */
-Bool wDockAttachIcon(WDock * dock, WAppIcon * icon, int x, int y)
+Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y)
{
WWindow *wwin;
int index;
@@ -2012,7 +1993,7 @@ Bool wDockAttachIcon(WDock * dock, WAppIcon * icon, int
x, int y)
return True;
}
-void reattachIcon(WDock * dock, WAppIcon * icon, int x, int y)
+void reattachIcon(WDock *dock, WAppIcon *icon, int x, int y)
{
int index;
@@ -2029,7 +2010,7 @@ void reattachIcon(WDock * dock, WAppIcon * icon, int x,
int y)
icon->y_pos = dock->y_pos + y * ICON_SIZE;
}
-Bool moveIconBetweenDocks(WDock * src, WDock * dest, WAppIcon * icon, int x,
int y)
+Bool moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int
y)
{
WWindow *wwin;
char *command;
@@ -2138,7 +2119,7 @@ Bool moveIconBetweenDocks(WDock * src, WDock * dest,
WAppIcon * icon, int x, int
return True;
}
-void wDockDetach(WDock * dock, WAppIcon * icon)
+void wDockDetach(WDock *dock, WAppIcon *icon)
{
int index;
@@ -2222,7 +2203,7 @@ void wDockDetach(WDock * dock, WAppIcon * icon)
* Note: this function should NEVER alter ret_x or ret_y, unless it will
* return True. -Dan
*/
-Bool wDockSnapIcon(WDock * dock, WAppIcon * icon, int req_x, int req_y, int
*ret_x, int *ret_y, int redocking)
+Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, int
*ret_x, int *ret_y, int redocking)
{
WScreen *scr = dock->screen_ptr;
int dx, dy;
@@ -2395,7 +2376,7 @@ Bool wDockSnapIcon(WDock * dock, WAppIcon * icon, int
req_x, int req_y, int *ret
return False;
}
-static int onScreen(WScreen * scr, int x, int y, int sx, int ex, int sy, int
ey)
+static int onScreen(WScreen *scr, int x, int y, int sx, int ex, int sy, int ey)
{
WMRect rect = wmkrect(x, y, ICON_SIZE, ICON_SIZE);
int flags;
@@ -2410,7 +2391,7 @@ static int onScreen(WScreen * scr, int x, int y, int sx,
int ex, int sy, int ey)
* in which case it changes x_pos and y_pos accordingly.
* Else returns false.
*/
-Bool wDockFindFreeSlot(WDock * dock, int *x_pos, int *y_pos)
+Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos)
{
WScreen *scr = dock->screen_ptr;
WAppIcon *btn;
@@ -2676,7 +2657,7 @@ Bool wDockFindFreeSlot(WDock * dock, int *x_pos, int
*y_pos)
return done;
}
-static void moveDock(WDock * dock, int new_x, int new_y)
+static void moveDock(WDock *dock, int new_x, int new_y)
{
WAppIcon *btn;
int i;
@@ -2693,7 +2674,7 @@ static void moveDock(WDock * dock, int new_x, int new_y)
}
}
-static void swapDock(WDock * dock)
+static void swapDock(WDock *dock)
{
WScreen *scr = dock->screen_ptr;
WAppIcon *btn;
@@ -2716,7 +2697,7 @@ static void swapDock(WDock * dock)
wScreenUpdateUsableArea(scr);
}
-static pid_t execCommand(WAppIcon * btn, char *command, WSavedState * state)
+static pid_t execCommand(WAppIcon *btn, char *command, WSavedState *state)
{
WScreen *scr = btn->icon->core->screen_ptr;
pid_t pid;
@@ -2787,7 +2768,7 @@ static pid_t execCommand(WAppIcon * btn, char *command,
WSavedState * state)
return pid;
}
-void wDockHideIcons(WDock * dock)
+void wDockHideIcons(WDock *dock)
{
int i;
@@ -2803,7 +2784,7 @@ void wDockHideIcons(WDock * dock)
dockIconPaint(dock->icon_array[0]);
}
-void wDockShowIcons(WDock * dock)
+void wDockShowIcons(WDock *dock)
{
int i, newlevel;
WAppIcon *btn;
@@ -2836,7 +2817,7 @@ void wDockShowIcons(WDock * dock)
dockIconPaint(btn);
}
-void wDockLower(WDock * dock)
+void wDockLower(WDock *dock)
{
int i;
@@ -2846,7 +2827,7 @@ void wDockLower(WDock * dock)
}
}
-void wDockRaise(WDock * dock)
+void wDockRaise(WDock *dock)
{
int i;
@@ -2856,7 +2837,7 @@ void wDockRaise(WDock * dock)
}
}
-void wDockRaiseLower(WDock * dock)
+void wDockRaiseLower(WDock *dock)
{
if (!dock->icon_array[0]->icon->core->stacking->above
|| (dock->icon_array[0]->icon->core->stacking->window_level
@@ -2866,14 +2847,14 @@ void wDockRaiseLower(WDock * dock)
wDockRaise(dock);
}
-void wDockFinishLaunch(WDock * dock, WAppIcon * icon)
+void wDockFinishLaunch(WDock *dock, WAppIcon *icon)
{
icon->launching = 0;
icon->relaunching = 0;
dockIconPaint(icon);
}
-WAppIcon *wDockFindIconForWindow(WDock * dock, Window window)
+WAppIcon *wDockFindIconForWindow(WDock *dock, Window window)
{
WAppIcon *icon;
int i;
@@ -2886,7 +2867,7 @@ WAppIcon *wDockFindIconForWindow(WDock * dock, Window
window)
return NULL;
}
-void wDockTrackWindowLaunch(WDock * dock, Window window)
+void wDockTrackWindowLaunch(WDock *dock, Window window)
{
WAppIcon *icon;
char *wm_class, *wm_instance;
@@ -2987,7 +2968,7 @@ void wDockTrackWindowLaunch(WDock * dock, Window window)
free(wm_instance);
}
-void wClipUpdateForWorkspaceChange(WScreen * scr, int workspace)
+void wClipUpdateForWorkspaceChange(WScreen *scr, int workspace)
{
if (!wPreferences.flags.noclip) {
scr->clip_icon->dock = scr->workspaces[workspace]->clip;
@@ -3026,7 +3007,7 @@ void wClipUpdateForWorkspaceChange(WScreen * scr, int
workspace)
}
}
-static void trackDeadProcess(pid_t pid, unsigned char status, WDock * dock)
+static void trackDeadProcess(pid_t pid, unsigned char status, WDock *dock)
{
WAppIcon *icon;
int i;
@@ -3066,7 +3047,7 @@ static void trackDeadProcess(pid_t pid, unsigned char
status, WDock * dock)
}
}
-static void toggleLowered(WDock * dock)
+static void toggleLowered(WDock *dock)
{
WAppIcon *tmp;
int newlevel, i;
@@ -3094,7 +3075,7 @@ static void toggleLowered(WDock * dock)
wScreenUpdateUsableArea(dock->screen_ptr);
}
-static void toggleCollapsed(WDock * dock)
+static void toggleCollapsed(WDock *dock)
{
if (dock->collapsed) {
dock->collapsed = 0;
@@ -3105,7 +3086,7 @@ static void toggleCollapsed(WDock * dock)
}
}
-static void openDockMenu(WDock * dock, WAppIcon * aicon, XEvent * event)
+static void openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
{
WScreen *scr = dock->screen_ptr;
WObjDescriptor *desc;
@@ -3266,7 +3247,7 @@ static void openDockMenu(WDock * dock, WAppIcon * aicon,
XEvent * event)
}
/******************************************************************/
-static void iconDblClick(WObjDescriptor * desc, XEvent * event)
+static void iconDblClick(WObjDescriptor *desc, XEvent *event)
{
WAppIcon *btn = desc->parent;
WDock *dock = btn->dock;
@@ -3312,7 +3293,7 @@ static void iconDblClick(WObjDescriptor * desc, XEvent *
event)
}
}
-static void handleDockMove(WDock * dock, WAppIcon * aicon, XEvent * event)
+static void handleDockMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
WScreen *scr = dock->screen_ptr;
int ofs_x = event->xbutton.x, ofs_y = event->xbutton.y;
@@ -3681,7 +3662,7 @@ static int getClipButton(int px, int py)
return CLIP_IDLE;
}
-static void handleClipChangeWorkspace(WScreen * scr, XEvent * event)
+static void handleClipChangeWorkspace(WScreen *scr, XEvent *event)
{
XEvent ev;
int done, direction, new_ws;
@@ -3743,7 +3724,7 @@ static void handleClipChangeWorkspace(WScreen * scr,
XEvent * event)
wClipIconPaint(scr->clip_icon);
}
-static void iconMouseDown(WObjDescriptor * desc, XEvent * event)
+static void iconMouseDown(WObjDescriptor *desc, XEvent *event)
{
WAppIcon *aicon = desc->parent;
WDock *dock = aicon->dock;
@@ -3875,7 +3856,7 @@ static void showClipBalloon(WDock * dock, int workspace)
scr->clip_title_color[CLIP_NORMAL], scr->clip_title_font,
0, 0, text, strlen(text));
}
-static void clipEnterNotify(WObjDescriptor * desc, XEvent * event)
+static void clipEnterNotify(WObjDescriptor *desc, XEvent *event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
WDock *dock;
@@ -3923,7 +3904,7 @@ static void clipEnterNotify(WObjDescriptor * desc, XEvent
* event)
}
}
-static void clipLeave(WDock * dock)
+static void clipLeave(WDock *dock)
{
XEvent event;
WObjDescriptor *desc = NULL;
@@ -3964,7 +3945,7 @@ static void clipLeave(WDock * dock)
}
}
-static void clipLeaveNotify(WObjDescriptor * desc, XEvent * event)
+static void clipLeaveNotify(WObjDescriptor *desc, XEvent *event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
@@ -4034,7 +4015,7 @@ static void clipAutoRaise(void *cdata)
dock->auto_raise_magic = NULL;
}
-static Bool iconCanBeOmnipresent(WAppIcon * aicon)
+static Bool iconCanBeOmnipresent(WAppIcon *aicon)
{
WScreen *scr = aicon->icon->core->screen_ptr;
WDock *clip;
@@ -4060,7 +4041,7 @@ static Bool iconCanBeOmnipresent(WAppIcon * aicon)
return True;
}
-int wClipMakeIconOmnipresent(WAppIcon * aicon, int omnipresent)
+int wClipMakeIconOmnipresent(WAppIcon *aicon, int omnipresent)
{
WScreen *scr = aicon->icon->core->screen_ptr;
WAppIconChain *new_entry, *tmp, *tmp1;
-----------------------------------------------------------------------
Summary of changes:
src/dock.c | 187 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 94 insertions(+), 93 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
