>From 507d6fbced86ca48e4731af76c348ed3ee652b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Fri, 30 Mar 2012 16:39:45 +0200
Subject: [PATCH 3/3] WindowMaker: Removed wApplicationDeactivate function
The wApplicationDeactivate is a function created by the preprocessor.
This small function can be removed and replaced for their contents, because the
code included is small and the same preprocessor block is used before in other
parts of the code.
---
src/actions.c | 23 +++++++++++++++++++----
src/application.c | 7 ++++++-
src/application.h | 19 -------------------
src/window.c | 7 ++++++-
4 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index e0339c4..8781e28 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -135,7 +135,12 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (oapp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif
}
WMPostNotificationName(WMNChangedFocus, NULL, (void *)True);
@@ -198,7 +203,12 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (oapp && oapp != napp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif
}
}
@@ -212,8 +222,13 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (wwin->flags.mapped)
wAppMenuMap(napp->menu, wwin);
}
- if (napp)
- wApplicationActivate(napp);
+
+#ifdef NEWAPPICON
+ if (napp && napp->app_icon) {
+ wIconSetHighlited(napp->app_icon->icon, True);
+ wAppIconPaint(napp->app_icon);
+ }
+#endif
XFlush(dpy);
old_scr = scr;
diff --git a/src/application.c b/src/application.c
index a9a308b..94eec74 100644
--- a/src/application.c
+++ b/src/application.c
@@ -413,7 +413,12 @@ void wApplicationDestroy(WApplication * wapp)
XDeleteContext(dpy, wapp->main_window, wAppWinContext);
wAppMenuDestroy(wapp->menu);
- wApplicationDeactivate(wapp);
+#ifdef NEWAPPICON
+ if (wapp->app_icon) {
+ wIconSetHighlited(wapp->app_icon->icon, False);
+ wAppIconPaint(wapp->app_icon);
+ }
+#endif /* NEWAPPICON */
if (wapp->app_icon) {
if (wapp->app_icon->docked && !wapp->app_icon->attracted) {
diff --git a/src/application.h b/src/application.h
index f866fef..21c694c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -55,23 +55,4 @@ void wApplicationSaveIconPathFor(char *iconPath, char
*wm_instance,
void wAppBounce(WApplication *);
void wAppBounceWhileUrgent(WApplication *);
-
-#ifdef NEWAPPICON
-#define wApplicationActivate(wapp) do { \
- if (wapp->app_icon) { \
- wIconSetHighlited(wapp->app_icon->icon, True); \
- wAppIconPaint(wapp->app_icon);\
- } \
- } while (0)
-#define wApplicationDeactivate(wapp) do { \
- if (wapp->app_icon) { \
- wIconSetHighlited(wapp->app_icon->icon, False); \
- wAppIconPaint(wapp->app_icon);\
- } \
- } while (0)
-#else
-#define wApplicationActivate(wapp) do { } while (0)
-#define wApplicationDeactivate(wapp) do { } while (0)
-#endif /* NEWAPPICON */
-
#endif
diff --git a/src/window.c b/src/window.c
index d6a2a1b..7bc30be 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1626,7 +1626,12 @@ void wUnmanageWindow(WWindow *wwin, Bool restore, Bool
destroyed)
WApplication *napp = scr->focused_window ?
wApplicationOf(scr->focused_window->main_window) : NULL;
if (oapp && oapp != napp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif /* NEWAPPICON */
}
wWindowDestroy(wwin);
--
1.7.9.1
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 507d6fbced86ca48e4731af76c348ed3ee652b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Fri, 30 Mar 2012 16:39:45 +0200
Subject: [PATCH 3/3] WindowMaker: Removed wApplicationDeactivate function
The wApplicationDeactivate is a function created by the preprocessor.
This small function can be removed and replaced for their contents, because the code included is small and the same preprocessor block is used before in other parts of the code.
---
src/actions.c | 23 +++++++++++++++++++----
src/application.c | 7 ++++++-
src/application.h | 19 -------------------
src/window.c | 7 ++++++-
4 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/actions.c b/src/actions.c
index e0339c4..8781e28 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -135,7 +135,12 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (oapp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif
}
WMPostNotificationName(WMNChangedFocus, NULL, (void *)True);
@@ -198,7 +203,12 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (oapp && oapp != napp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif
}
}
@@ -212,8 +222,13 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
if (wwin->flags.mapped)
wAppMenuMap(napp->menu, wwin);
}
- if (napp)
- wApplicationActivate(napp);
+
+#ifdef NEWAPPICON
+ if (napp && napp->app_icon) {
+ wIconSetHighlited(napp->app_icon->icon, True);
+ wAppIconPaint(napp->app_icon);
+ }
+#endif
XFlush(dpy);
old_scr = scr;
diff --git a/src/application.c b/src/application.c
index a9a308b..94eec74 100644
--- a/src/application.c
+++ b/src/application.c
@@ -413,7 +413,12 @@ void wApplicationDestroy(WApplication * wapp)
XDeleteContext(dpy, wapp->main_window, wAppWinContext);
wAppMenuDestroy(wapp->menu);
- wApplicationDeactivate(wapp);
+#ifdef NEWAPPICON
+ if (wapp->app_icon) {
+ wIconSetHighlited(wapp->app_icon->icon, False);
+ wAppIconPaint(wapp->app_icon);
+ }
+#endif /* NEWAPPICON */
if (wapp->app_icon) {
if (wapp->app_icon->docked && !wapp->app_icon->attracted) {
diff --git a/src/application.h b/src/application.h
index f866fef..21c694c 100644
--- a/src/application.h
+++ b/src/application.h
@@ -55,23 +55,4 @@ void wApplicationSaveIconPathFor(char *iconPath, char *wm_instance,
void wAppBounce(WApplication *);
void wAppBounceWhileUrgent(WApplication *);
-
-#ifdef NEWAPPICON
-#define wApplicationActivate(wapp) do { \
- if (wapp->app_icon) { \
- wIconSetHighlited(wapp->app_icon->icon, True); \
- wAppIconPaint(wapp->app_icon);\
- } \
- } while (0)
-#define wApplicationDeactivate(wapp) do { \
- if (wapp->app_icon) { \
- wIconSetHighlited(wapp->app_icon->icon, False); \
- wAppIconPaint(wapp->app_icon);\
- } \
- } while (0)
-#else
-#define wApplicationActivate(wapp) do { } while (0)
-#define wApplicationDeactivate(wapp) do { } while (0)
-#endif /* NEWAPPICON */
-
#endif
diff --git a/src/window.c b/src/window.c
index d6a2a1b..7bc30be 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1626,7 +1626,12 @@ void wUnmanageWindow(WWindow *wwin, Bool restore, Bool destroyed)
WApplication *napp = scr->focused_window ? wApplicationOf(scr->focused_window->main_window) : NULL;
if (oapp && oapp != napp) {
wAppMenuUnmap(oapp->menu);
- wApplicationDeactivate(oapp);
+#ifdef NEWAPPICON
+ if (oapp->app_icon) {
+ wIconSetHighlited(oapp->app_icon->icon, False);
+ wAppIconPaint(oapp->app_icon);
+ }
+#endif /* NEWAPPICON */
}
wWindowDestroy(wwin);
--
1.7.9.1
