Code refactoring: replaced macro 'XINERAMA' by 'USE_XINERAMA' for consistency
authorChristophe CURIS <christophe.curis@free.fr>
Sun, 17 Nov 2013 17:51:15 +0000 (17 18:51 +0100)
committerCarlos R. Mafra <crmafra@gmail.com>
Mon, 30 Dec 2013 18:11:06 +0000 (30 18:11 +0000)
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>
configure.ac
src/dialog.c
src/workspace.c
src/xinerama.c
util/wmsetbg.c

index efa0535..99df9c6 100644 (file)
@@ -611,7 +611,7 @@ if test "$xinerama" = yes; then
        fi
 
        if test "$xine" = 1; then
-           AC_DEFINE(XINERAMA, 1, 
+           AC_DEFINE(USE_XINERAMA, 1,
                [define if you want support for the XINERAMA extension (set by configure)])
        fi
 fi
index 3a019cf..63b8c50 100644 (file)
@@ -1304,7 +1304,7 @@ void wShowInfoPanel(WScreen *scr)
        strbuf = wstrappend(strbuf, ", MWM");
 #endif
 
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
        strbuf = wstrappend(strbuf, _("\n"));
 #ifdef SOLARIS_XINERAMA
        strbuf = wstrappend(strbuf, _("Solaris "));
index 81c6a01..b0c436d 100644 (file)
@@ -258,7 +258,7 @@ static void showWorkspaceName(WScreen * scr, int workspace)
        char *name = w_global.workspace.array[workspace]->name;
        int len = strlen(name);
        int x, y;
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
        int head;
        WMRect rect;
        int xx, yy;
@@ -286,7 +286,7 @@ static void showWorkspaceName(WScreen * scr, int workspace)
        w = WMWidthOfString(w_global.workspace.font_for_name, name, len);
        h = WMFontHeight(w_global.workspace.font_for_name);
 
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
        head = wGetHeadForPointerLocation(scr);
        rect = wGetRectForHead(scr, head);
        if (scr->xine_info.count) {
@@ -301,7 +301,7 @@ static void showWorkspaceName(WScreen * scr, int workspace)
 
        switch (wPreferences.workspace_name_display_position) {
        case WD_TOP:
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
                px = xx;
 #else
                px = (scr->scr_width - (w + 4)) / 2;
@@ -309,7 +309,7 @@ static void showWorkspaceName(WScreen * scr, int workspace)
                py = WORKSPACE_NAME_DISPLAY_PADDING;
                break;
        case WD_BOTTOM:
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
                px = xx;
 #else
                px = (scr->scr_width - (w + 4)) / 2;
@@ -334,7 +334,7 @@ static void showWorkspaceName(WScreen * scr, int workspace)
                break;
        case WD_CENTER:
        default:
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
                px = xx;
                py = yy;
 #else
index f9fe31e..92944b1 100644 (file)
@@ -27,7 +27,7 @@
 #include "framewin.h"
 #include "placement.h"
 
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
 # ifdef SOLARIS_XINERAMA       /* sucks */
 #  include <X11/extensions/xinerama.h>
 # else
@@ -40,7 +40,7 @@ void wInitXinerama(WScreen * scr)
        scr->xine_info.primary_head = 0;
        scr->xine_info.screens = NULL;
        scr->xine_info.count = 0;
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
 # ifdef SOLARIS_XINERAMA
        if (XineramaGetState(dpy, scr->screen)) {
                WXineramaInfo *info = &scr->xine_info;
@@ -79,7 +79,7 @@ void wInitXinerama(WScreen * scr)
                XFree(xine_screens);
        }
 # endif                                /* !SOLARIS_XINERAMA */
-#endif                         /* XINERAMA */
+#endif                         /* USE_XINERAMA */
 }
 
 int wGetRectPlacementInfo(WScreen * scr, WMRect rect, int *flags)
index 22653af..644c85d 100644 (file)
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #include <ctype.h>
 
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
 # ifdef SOLARIS_XINERAMA       /* sucks */
 #  include <X11/extensions/xinerama.h>
 # else
@@ -78,7 +78,7 @@ int scrX, scrY;
 WXineramaInfo xineInfo;
 
 Bool smooth = False;
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
 Bool xineStretch = False;
 #endif
 
@@ -104,7 +104,7 @@ static void initXinerama(void)
 {
        xineInfo.screens = NULL;
        xineInfo.count = 0;
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
 # ifdef SOLARIS_XINERAMA
        if (XineramaGetState(dpy, scr)) {
                XRectangle head[MAXFRAMEBUFFERS];
@@ -141,7 +141,7 @@ static void initXinerama(void)
                XFree(xine_screens);
        }
 # endif                                /* !SOLARIS_XINERAMA */
-#endif                         /* XINERAMA */
+#endif                         /* USE_XINERAMA */
 }
 
 static RImage *loadImage(RContext * rc, const char *file)
@@ -552,7 +552,7 @@ static BackgroundTexture *parseTexture(RContext * rc, char *text)
                                texture->width = scrWidth;
                                texture->height = scrHeight;
 
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
                                if (xineInfo.count && ! xineStretch) {
                                        int i;
                                        for (i = 0; i < xineInfo.count; ++i) {
@@ -564,9 +564,9 @@ static BackgroundTexture *parseTexture(RContext * rc, char *text)
                                } else {
                                        applyImage(rc, texture, image, type[0], 0, 0, scrWidth, scrHeight);
                                }
-#else                          /* !XINERAMA */
+#else                          /* !USE_XINERAMA */
                                applyImage(rc, texture, image, type[0], 0, 0, scrWidth, scrHeight);
-#endif                         /* !XINERAMA */
+#endif                         /* !USE_XINERAMA */
                                RReleaseImage(image);
                        }
                        break;
@@ -1139,7 +1139,7 @@ static void print_help(void)
        puts(" -d, --dither                     dither image");
        puts(" -m, --match                      match  colors");
        puts(" -S, --smooth                     smooth scaled image");
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
        puts(" -X, --xinerama                   stretch image across Xinerama heads");
 #endif
        puts(" -b, --back-color <color>         background color");
@@ -1249,7 +1249,7 @@ int main(int argc, char **argv)
                        obey_user++;
                } else if (strcmp(argv[i], "-S") == 0 || strcmp(argv[i], "--smooth") == 0) {
                        smooth = True;
-#ifdef XINERAMA
+#ifdef USE_XINERAMA
                } else if (strcmp(argv[i], "-X") == 0 || strcmp(argv[i], "--xinerama") == 0) {
                        xineStretch = True;
 #endif