summaryrefslogtreecommitdiff
path: root/greeter/Login.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@herrb.eu>2016-09-04 19:58:59 +0100
committerMatthieu Herrb <matthieu@herrb.eu>2016-09-04 19:58:59 +0100
commit6e5b4f4930b51d15ffd62afc285c0f08900654ee (patch)
treea0068bad37b9f6bdf096b8916105c9ef07191a2c /greeter/Login.c
parentdf25a1c5a2f433198915a4350eb3223665d53b21 (diff)
Unifdef Xinerama support
Diffstat (limited to 'greeter/Login.c')
-rw-r--r--greeter/Login.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/greeter/Login.c b/greeter/Login.c
index 468c0e3..696a8f6 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -80,9 +80,7 @@ from The Open Group.
#include <X11/cursorfont.h>
-#ifdef USE_XINERAMA
-# include <X11/extensions/Xinerama.h>
-#endif
+#include <X11/extensions/Xinerama.h>
#include <X11/extensions/Xrender.h>
@@ -1597,10 +1595,8 @@ static void Initialize (
XGCValues myXGCV;
Arg position[2];
Position x, y;
-#ifdef USE_XINERAMA
XineramaScreenInfo *screens;
int s_num;
-#endif
int rv = 0;
myXGCV.foreground = w->login.hipixel;
@@ -1717,11 +1713,8 @@ SkipXpmLoad:
(w->login.logoHeight + (2*w->login.logoPadding)) + pady);
}
-#ifdef USE_XINERAMA
- if (
- XineramaIsActive(XtDisplay(w)) &&
- (screens = XineramaQueryScreens(XtDisplay(w), &s_num)) != NULL
- )
+ if (XineramaIsActive(XtDisplay(w)) &&
+ (screens = XineramaQueryScreens(XtDisplay(w), &s_num)) != NULL)
{
if ((x = w->core.x) == -1)
x = screens[0].x_org + (int)(screens[0].width - w->core.width) / 2;
@@ -1731,7 +1724,6 @@ SkipXpmLoad:
XFree(screens);
}
else
-#endif
{
if ((x = w->core.x) == -1)
x = (int)(XWidthOfScreen (XtScreen (w)) - w->core.width) / 2;