gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Code refactoring: replaced macro 'SHAPE' by 'USE_XSHAPE' for consistency

Browse Source 
The usual way to define a macro in is to name macro with 'USE_xxx' when
they are used to enable a feature 'xxx'

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-18 00:51:57 +01:00
committed by Carlos R. Mafra
parent 0d66173e1f
commit 6184c955e7
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/window.c
View File

@@ -23,7 +23,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef SHAPE
#ifdef USE_XSHAPE
#include <X11/extensions/shape.h>
#endif
#ifdef KEEP_XKB_LOCK_STATUS
@@ -614,7 +614,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
XSaveContext(dpy, window, w_global.context.client_win, (XPointer) & wwin->client_descriptor);
#ifdef SHAPE
#ifdef USE_XSHAPE
if (w_global.xext.shape.supported) {
int junk;
unsigned int ujunk;
@@ -2039,7 +2039,7 @@ void wWindowConfigure(WWindow *wwin, int req_x, int req_y, int req_width, int re
wwin->client.x += wwin->screen_ptr->frame_border_width;
wwin->client.y += wwin->screen_ptr->frame_border_width;
}
#ifdef SHAPE
#ifdef USE_XSHAPE
if (w_global.xext.shape.supported && wwin->flags.shaped && resize)
wWindowSetShape(wwin);
#endif
@@ -2263,7 +2263,7 @@ void wWindowConfigureBorders(WWindow *wwin)
if (flags != 0)
wFrameWindowHideButton(wwin->frame, flags);
#ifdef SHAPE
#ifdef USE_XSHAPE
if (w_global.xext.shape.supported && wwin->flags.shaped)
wWindowSetShape(wwin);
#endif
@@ -2338,7 +2338,7 @@ static int getSavedState(Window window, WSavedState ** state)
return 0;
}
#ifdef SHAPE
#ifdef USE_XSHAPE
void wWindowClearShape(WWindow * wwin)
{
XShapeCombineMask(dpy, wwin->frame->core->window, ShapeBounding,
@@ -2422,7 +2422,7 @@ void wWindowSetShape(WWindow * wwin)
ShapeBounding, (count > 0 ? ShapeUnion : ShapeSet));
XFlush(dpy);
}
#endif /* SHAPE */
#endif /* USE_XSHAPE */
/* ====================================================================== */