>From 6fb0b09402ac9abdb4b4f13f5e93ba7aec0ab10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Tue, 3 Jul 2012 19:33:40 +0200
Subject: [PATCH 10/13] New WWindow argument added to wAppIconCreateForDock()
The argument WWindow *wwin is added to wAppIconCreateForDock().
This change is only a step to join the functions wAppIconCreate() and
wAppIconCreateForDock(), and wwin in not used yet.
---
src/appicon.c | 2 +-
src/appicon.h | 4 ++--
src/dock.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index 0f318ed..be21ae0 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -106,7 +106,7 @@ void wApplicationExtractDirPackIcon(WScreen * scr, char
*path, char *wm_instance
}
}
-WAppIcon *wAppIconCreateForDock(WScreen * scr, char *command, char
*wm_instance, char *wm_class, int tile)
+WAppIcon *wAppIconCreateForDock(WWindow *wwin, WScreen *scr, char *command,
char *wm_instance, char *wm_class, int tile)
{
WAppIcon *dicon;
diff --git a/src/appicon.h b/src/appicon.h
index 280843c..63dc798 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -69,8 +69,8 @@ typedef struct WAppIcon {
unsigned int lock:1; /* do not allow to be destroyed */
} WAppIcon;
-WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
- char *wm_class, int tile);
+WAppIcon *wAppIconCreateForDock(WWindow *wwin, WScreen *scr, char *command,
+ char *wm_instance, char *wm_class, int tile);
void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window
main_window);
void wAppIconDestroy(WAppIcon *aicon);
diff --git a/src/dock.c b/src/dock.c
index 0db0fe5..a641723 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -730,14 +730,14 @@ static WAppIcon *mainIconCreate(WScreen *scr, int type)
if (type == WM_CLIP) {
if (scr->clip_icon)
return scr->clip_icon;
- btn = wAppIconCreateForDock(scr, NULL, "Logo", "WMClip",
TILE_CLIP);
+ btn = wAppIconCreateForDock(NULL, scr, NULL, "Logo", "WMClip",
TILE_CLIP);
btn->icon->core->descriptor.handle_expose = clipIconExpose;
btn->icon->core->descriptor.handle_enternotify =
clipEnterNotify;
btn->icon->core->descriptor.handle_leavenotify =
clipLeaveNotify;
/*x_pos = scr->scr_width - ICON_SIZE*2 - DOCK_EXTRA_SPACE; */
x_pos = 0;
} else {
- btn = wAppIconCreateForDock(scr, NULL, "Logo", "WMDock",
TILE_NORMAL);
+ btn = wAppIconCreateForDock(NULL, scr, NULL, "Logo", "WMDock",
TILE_NORMAL);
x_pos = scr->scr_width - ICON_SIZE - DOCK_EXTRA_SPACE;
}
@@ -1391,7 +1391,7 @@ static WAppIcon *restore_icon_state(WScreen *scr,
WMPropList *info, int type, in
return NULL;
}
- aicon = wAppIconCreateForDock(scr, command, winstance, wclass,
TILE_NORMAL);
+ aicon = wAppIconCreateForDock(NULL, scr, command, winstance,
wclass, TILE_NORMAL);
if (wclass)
wfree(wclass);
if (winstance)
@@ -2903,7 +2903,7 @@ void wDockTrackWindowLaunch(WDock *dock, Window window)
icon->launching = 1;
dockIconPaint(icon);
- aicon = wAppIconCreateForDock(dock->screen_ptr,
NULL,
+ aicon = wAppIconCreateForDock(NULL,
dock->screen_ptr, NULL,
wm_instance,
wm_class, TILE_NORMAL);
/* XXX: can: aicon->icon == NULL ? */
PlaceIcon(dock->screen_ptr, &x0, &y0,
wGetHeadForWindow(aicon->icon->owner));
--
1.7.10
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 6fb0b09402ac9abdb4b4f13f5e93ba7aec0ab10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Tue, 3 Jul 2012 19:33:40 +0200
Subject: [PATCH 10/13] New WWindow argument added to wAppIconCreateForDock()
The argument WWindow *wwin is added to wAppIconCreateForDock().
This change is only a step to join the functions wAppIconCreate() and
wAppIconCreateForDock(), and wwin in not used yet.
---
src/appicon.c | 2 +-
src/appicon.h | 4 ++--
src/dock.c | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/appicon.c b/src/appicon.c
index 0f318ed..be21ae0 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -106,7 +106,7 @@ void wApplicationExtractDirPackIcon(WScreen * scr, char *path, char *wm_instance
}
}
-WAppIcon *wAppIconCreateForDock(WScreen * scr, char *command, char *wm_instance, char *wm_class, int tile)
+WAppIcon *wAppIconCreateForDock(WWindow *wwin, WScreen *scr, char *command, char *wm_instance, char *wm_class, int tile)
{
WAppIcon *dicon;
diff --git a/src/appicon.h b/src/appicon.h
index 280843c..63dc798 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -69,8 +69,8 @@ typedef struct WAppIcon {
unsigned int lock:1; /* do not allow to be destroyed */
} WAppIcon;
-WAppIcon *wAppIconCreateForDock(WScreen *scr, char *command, char *wm_instance,
- char *wm_class, int tile);
+WAppIcon *wAppIconCreateForDock(WWindow *wwin, WScreen *scr, char *command,
+ char *wm_instance, char *wm_class, int tile);
void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window main_window);
void wAppIconDestroy(WAppIcon *aicon);
diff --git a/src/dock.c b/src/dock.c
index 0db0fe5..a641723 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -730,14 +730,14 @@ static WAppIcon *mainIconCreate(WScreen *scr, int type)
if (type == WM_CLIP) {
if (scr->clip_icon)
return scr->clip_icon;
- btn = wAppIconCreateForDock(scr, NULL, "Logo", "WMClip", TILE_CLIP);
+ btn = wAppIconCreateForDock(NULL, scr, NULL, "Logo", "WMClip", TILE_CLIP);
btn->icon->core->descriptor.handle_expose = clipIconExpose;
btn->icon->core->descriptor.handle_enternotify = clipEnterNotify;
btn->icon->core->descriptor.handle_leavenotify = clipLeaveNotify;
/*x_pos = scr->scr_width - ICON_SIZE*2 - DOCK_EXTRA_SPACE; */
x_pos = 0;
} else {
- btn = wAppIconCreateForDock(scr, NULL, "Logo", "WMDock", TILE_NORMAL);
+ btn = wAppIconCreateForDock(NULL, scr, NULL, "Logo", "WMDock", TILE_NORMAL);
x_pos = scr->scr_width - ICON_SIZE - DOCK_EXTRA_SPACE;
}
@@ -1391,7 +1391,7 @@ static WAppIcon *restore_icon_state(WScreen *scr, WMPropList *info, int type, in
return NULL;
}
- aicon = wAppIconCreateForDock(scr, command, winstance, wclass, TILE_NORMAL);
+ aicon = wAppIconCreateForDock(NULL, scr, command, winstance, wclass, TILE_NORMAL);
if (wclass)
wfree(wclass);
if (winstance)
@@ -2903,7 +2903,7 @@ void wDockTrackWindowLaunch(WDock *dock, Window window)
icon->launching = 1;
dockIconPaint(icon);
- aicon = wAppIconCreateForDock(dock->screen_ptr, NULL,
+ aicon = wAppIconCreateForDock(NULL, dock->screen_ptr, NULL,
wm_instance, wm_class, TILE_NORMAL);
/* XXX: can: aicon->icon == NULL ? */
PlaceIcon(dock->screen_ptr, &x0, &y0, wGetHeadForWindow(aicon->icon->owner));
--
1.7.10
