The application icon list is moved to w_global.
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]>
---
src/WindowMaker.h | 3 +++
src/actions.c | 3 +--
src/appicon.c | 13 ++++++-------
src/defaults.c | 3 +--
src/dock.c | 3 +--
src/main.c | 3 ---
6 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index a04f1fa..146d42d 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -535,6 +535,9 @@ extern struct wmaker_global_variables {
/* Keyboard and shortcuts */
WMArray *shortcutWindows[MAX_WINDOW_SHORTCUTS];
+ /* Application related */
+ struct WAppIcon *app_icon_list; /* list of all aplication icons */
+
} w_global;
extern unsigned int ValidModMask;
diff --git a/src/actions.c b/src/actions.c
index d7dc498..d2cc77a 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -54,7 +54,6 @@
int ignore_wks_change = 0;
extern WWorkspace_info wks_info;
-extern WAppIcon *app_icon_list;
static void find_Maximus_geometry(WWindow *wwin, WArea usableArea, int *new_x,
int *new_y,
unsigned int *new_width, unsigned int
*new_height);
@@ -1768,7 +1767,7 @@ void wArrangeIcons(WScreen *scr, Bool arrangeAll)
: vars[head].yo + vars[head].ys*(vars[head].si*isize))
/* arrange application icons */
- aicon = app_icon_list;
+ aicon = w_global.app_icon_list;
/* reverse them to avoid unnecessarily sliding of icons */
while (aicon && aicon->next)
aicon = aicon->next;
diff --git a/src/appicon.c b/src/appicon.c
index c197c6b..67083d9 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -63,7 +63,6 @@
/**** Global variables ****/
extern WDDomain *WDWindowAttributes;
extern WWorkspace_info wks_info;
-extern WAppIcon *app_icon_list;
#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
@@ -1193,20 +1192,20 @@ static void create_appicon_from_dock(WWindow *wwin,
WApplication *wapp, Window m
static void add_to_appicon_list(WAppIcon *appicon)
{
appicon->prev = NULL;
- appicon->next = app_icon_list;
- if (app_icon_list)
- app_icon_list->prev = appicon;
+ appicon->next = w_global.app_icon_list;
+ if (w_global.app_icon_list)
+ w_global.app_icon_list->prev = appicon;
- app_icon_list = appicon;
+ w_global.app_icon_list = appicon;
}
/* Remove the appicon from the appiconlist */
static void remove_from_appicon_list(WAppIcon *appicon)
{
- if (appicon == app_icon_list) {
+ if (appicon == w_global.app_icon_list) {
if (appicon->next)
appicon->next->prev = NULL;
- app_icon_list = appicon->next;
+ w_global.app_icon_list = appicon->next;
} else {
if (appicon->next)
appicon->next->prev = appicon->prev;
diff --git a/src/defaults.c b/src/defaults.c
index 9606f7f..cf86285 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -77,7 +77,6 @@ extern WDDomain *WDWindowAttributes;
extern WDDomain *WDRootMenu;
extern int wScreenCount;
extern WWorkspace_info wks_info;
-extern WAppIcon *app_icon_list;
extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct _WDefaultEntry WDefaultEntry;
@@ -1218,7 +1217,7 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
void wDefaultUpdateIcons(WScreen *scr)
{
- WAppIcon *aicon = app_icon_list;
+ WAppIcon *aicon = w_global.app_icon_list;
WDrawerChain *dc;
WWindow *wwin = scr->focused_window;
diff --git a/src/dock.c b/src/dock.c
index 634f7d9..64d4ee3 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -67,7 +67,6 @@
/**** Global variables ****/
extern WWorkspace_info wks_info;
-extern WAppIcon *app_icon_list;
#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
@@ -665,7 +664,7 @@ static void colectIconsCallback(WMenu *menu, WMenuEntry
*entry)
assert(entry->clientdata != NULL);
clip = clickedIcon->dock;
- aicon = app_icon_list;
+ aicon = w_global.app_icon_list;
while (aicon) {
if (!aicon->docked && wDockFindFreeSlot(clip, &x, &y)) {
diff --git a/src/main.c b/src/main.c
index b15d661..3c50e07 100644
--- a/src/main.c
+++ b/src/main.c
@@ -95,9 +95,6 @@ WDDomain *WDRootMenu = NULL;
/* Workspace information */
WWorkspace_info wks_info;
-/* Appicons information - App Icon List */
-struct WAppIcon *app_icon_list;
-
#ifdef SHAPE
Bool wShapeSupported;
int wShapeEventBase;
--
1.8.4.rc3
--
To unsubscribe, send mail to [email protected].
