gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Remove NEWAPPICON #ifdefs

Browse Source 
It wasn't defined anywhere and when I defined it, the compilation
did not finish:

appicon.c: In function drawCorner:
appicon.c:206: error: WScreen has no member named focused_texture
appicon.c:208: error: WScreen has no member named unfocused_texture
appicon.c: At top level:
appicon.c:214: error: conflicting types for drawCorner
appicon.c:193: note: previous definition of drawCorner was here
make[2]: *** [appicon.o] Fehler 1
make[1]: *** [all] Fehler 2
make: *** [all-recursive] Fehler 1

So let's simply remove those #ifdefs.
This commit is contained in:
Carlos R. Mafra
2010-03-15 17:50:17 +01:00
parent baac5ead1e
commit ee569220df
3 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/actions.c
View File

@@ -136,15 +136,10 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
if (wwin == NULL) { if (wwin == NULL) {
XSetInputFocus(dpy, scr->no_focus_win, RevertToParent, CurrentTime); XSetInputFocus(dpy, scr->no_focus_win, RevertToParent, CurrentTime);
if (old_focused) { if (old_focused)
wWindowUnfocus(old_focused); wWindowUnfocus(old_focused);
} if (oapp)
if (oapp) {
wAppMenuUnmap(oapp->menu); wAppMenuUnmap(oapp->menu);
#ifdef NEWAPPICON
wApplicationDeactivate(oapp);
#endif
}
WMPostNotificationName(WMNChangedFocus, NULL, (void *)True); WMPostNotificationName(WMNChangedFocus, NULL, (void *)True);
return; return;
@@ -205,12 +200,8 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
wwin->next = NULL; wwin->next = NULL;
scr->focused_window = wwin; scr->focused_window = wwin;
if (oapp && oapp != napp) { if (oapp && oapp != napp)
wAppMenuUnmap(oapp->menu); wAppMenuUnmap(oapp->menu);
#ifdef NEWAPPICON
wApplicationDeactivate(oapp);
#endif
}
} }
wWindowFocus(wwin, focused); wWindowFocus(wwin, focused);
@@ -222,9 +213,6 @@ void wSetFocusTo(WScreen * scr, WWindow * wwin)
if (wwin->flags.mapped) if (wwin->flags.mapped)
wAppMenuMap(napp->menu, wwin); wAppMenuMap(napp->menu, wwin);
#ifdef NEWAPPICON
wApplicationActivate(napp);
#endif
} }
XFlush(dpy); XFlush(dpy);

22
src/appicon.c
View File

@@ -189,28 +189,6 @@ void wAppIconDestroy(WAppIcon * aicon)
wrelease(aicon); wrelease(aicon);
} }
#ifdef NEWAPPICON
static void drawCorner(WIcon * icon, WWindow * wwin, int active)
{
WScreen *scr = wwin->screen_ptr;
XPoint points[3];
GC gc;
points[0].x = 2;
points[0].y = 2;
points[1].x = 12;
points[1].y = 2;
points[2].x = 2;
points[2].y = 12;
if (active) {
gc = scr->focused_texture->any.gc;
} else {
gc = scr->unfocused_texture->any.gc;
}
XFillPolygon(dpy, icon->core->window, gc, points, 3, Convex, CoordModeOrigin);
}
#endif /* NEWAPPICON */
static void drawCorner(WIcon * icon) static void drawCorner(WIcon * icon)
{ {
WScreen *scr = icon->core->screen_ptr; WScreen *scr = icon->core->screen_ptr;

13
src/application.h
View File

@@ -57,18 +57,5 @@ WApplication *wApplicationOf(Window window);
void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance, void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance,
char *wm_class); char *wm_class);
#ifdef NEWAPPICON
# define wApplicationActivate(wapp) {\
wapp->main_window_desc->flags.focused=1; \
wAppIconPaint(wapp->app_icon);\
}
#define wApplicationDeactivate(wapp) {\
wapp->main_window_desc->flags.focused=0;\
wAppIconPaint(wapp->app_icon);\
}
#endif
#endif #endif