e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

HAVE_XINERAMA->USE_XINERAMA as for the other extensions. 

SVN revision: 37554
This commit is contained in:
Kim Woelders 2008-11-08 17:00:09 +00:00
parent 0c0658fad7
commit 1676ba36e7
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -200,7 +200,7 @@ AC_ARG_ENABLE(xinerama,
enable_xinerama=yes)
if test "x$enable_xinerama" = "xyes"; then
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
AC_DEFINE(HAVE_XINERAMA, 1, [Xinerama support])
AC_DEFINE(USE_XINERAMA, 1, [Xinerama support])
XINERAMA_LIBS="-lXinerama",
enable_xinerama=no
AC_MSG_WARN([Xinerama support was requested but not found]),

4
dox/dox.c
View File

@ -30,7 +30,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@ -356,7 +356,7 @@ main(int argc, char **argv)
t = 16;
wx = (VRoot.w - w) / 2;
wy = (VRoot.h - (h + t)) / 2;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
if (VRoot.win == DefaultRootWindow(disp) && XineramaIsActive(disp))
{
Window rt, ch;

4
src/E.h
View File

@ -233,7 +233,7 @@ typedef struct {
int slidemode;
int slidespeedmap;
int slidespeedcleanup;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
char extra_head; /* Not used */
#endif
} place;
@ -321,7 +321,7 @@ typedef struct {
} conf;
struct {
char dummy; /* Prevent empty struct */
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
char xinerama_active;
#endif
#if USE_XSYNC

4
src/menus.c
View File

@ -1470,7 +1470,7 @@ MenusHandleMotion(void)
if (Mode_menus.current_depth)
{
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
ewin = Mode_menus.list[0]->ewin;
if (ewin->head == head_num)
{
@ -1497,7 +1497,7 @@ MenusHandleMotion(void)
if (((xdist != 0) || (ydist != 0))
&& (Conf.menus.warp))
EXWarpPointer(None, xdist, ydist);
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
}
#endif
}

8
src/screen.c
View File

@ -26,7 +26,7 @@
#include "ipc.h"
#include "screen.h"
#include "xwin.h"
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@ -60,14 +60,14 @@ ScreenAdd(int type, int head, int x, int y, unsigned int w, unsigned int h)
void
ScreenInit(void)
{
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
XineramaScreenInfo *screens;
int i, num_screens;
#endif
n_screens = 0; /* Causes reconfiguration */
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
if (Mode.wm.window)
return;
@ -109,7 +109,7 @@ ScreenShowInfo(const char *prm __UNUSED__)
{
int i;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
if (XineramaIsActive(disp))
{
XineramaScreenInfo *scrns;

8
src/settings.c
View File

@ -234,7 +234,7 @@ static int tmp_shade_speed;
static char tmp_place_ignore_struts;
static char tmp_raise_fullscreen;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
static char tmp_extra_head;
#endif
@ -261,7 +261,7 @@ CB_ConfigurePlacement(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
Conf.place.ignore_struts = tmp_place_ignore_struts;
Conf.place.raise_fullscreen = tmp_raise_fullscreen;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
if (Mode.display.xinerama_active)
Conf.place.extra_head = tmp_extra_head;
#endif
@ -293,7 +293,7 @@ _DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
tmp_place_ignore_struts = Conf.place.ignore_struts;
tmp_raise_fullscreen = Conf.place.raise_fullscreen;
#ifdef HAVE_XINERAMA
#ifdef USE_XINERAMA
tmp_extra_head = Conf.place.extra_head;
#endif
@ -423,7 +423,7 @@ _DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
DialogItemSetText(di, _("Raise fullscreen windows"));
DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
#ifdef HAVE_XINERAMA_no /* Not implemented */
#ifdef USE_XINERAMA_no /* Not implemented */
if (Mode.display.xinerama_active)
{
di = DialogAddItem(table, DITEM_CHECKBUTTON);