Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h Makefile.am menus.c screen.c settings.c
Log Message:
Cleanups, HAS_...->HAVE_...
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -3 -r1.571 -r1.572
--- E.h 27 Nov 2006 20:01:05 -0000 1.571
+++ E.h 27 Dec 2006 16:34:48 -0000 1.572
@@ -37,21 +37,21 @@
#include <X11/Xlib.h>
#include <X11/extensions/shape.h>
-#ifdef HAS_XSYNC
+#ifdef HAVE_XSYNC
#define USE_XSYNC 1 /* Experimental */
#endif
-#ifdef HAS_XSCREENSAVER
+#ifdef HAVE_XSCREENSAVER
#define USE_XSCREENSAVER 1 /* Experimental */
#endif
-#ifdef HAS_XRANDR
+#ifdef HAVE_XRANDR
#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
#define USE_XRANDR 1
#endif
#endif
-#ifdef HAS_COMPOSITE
+#ifdef HAVE_COMPOSITE
#define USE_COMPOSITE 1
#endif
@@ -343,7 +343,7 @@
int slidespeedcleanup;
char ignore_struts;
char raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
char extra_head; /* Not used */
#endif
} place;
@@ -438,7 +438,7 @@
{
char *name;
int screens;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
char xinerama_active;
#endif
#if USE_XSYNC
===================================================================
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- Makefile.am 19 Nov 2006 21:55:50 -0000 1.80
+++ Makefile.am 27 Dec 2006 16:34:48 -0000 1.81
@@ -7,12 +7,13 @@
if ENABLE_GNOME
SRCS_GNOME = gnome.c
endif
+if HAVE_COMPOSITE
+SRCS_ECOMPMGR = ecompmgr.c ecompmgr.h
+endif
if USE_ESNPRINTF
SRCS_SNPRINTF = snprintf.c
endif
-if HAS_COMPOSITE
-SRCS_ECOMPMGR = ecompmgr.c ecompmgr.h
-endif
+
e16_SOURCES = \
E.h \
about.c \
@@ -108,7 +109,7 @@
LDADD = \
$(LTLIBINTL) \
$(LTLIBICONV) \
- @ecore_libs@ \
+ $(ECORE_LIBS) \
$(ESD_LIBS) \
$(IMLIB2_LIBS) \
$(XFT_LIBS) \
@@ -119,7 +120,7 @@
$(E_X_LIBS) \
-lX11 -lm
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl
@ecore_cflags@ $(ESD_CFLAGS) $(IMLIB2_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/intl
$(ECORE_CFLAGS) $(ESD_CFLAGS) $(IMLIB2_CFLAGS) $(XFT_CFLAGS) $(X_CFLAGS)
install-data-local:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -3 -r1.265 -r1.266
--- menus.c 27 Dec 2006 16:17:27 -0000 1.265
+++ menus.c 27 Dec 2006 16:34:48 -0000 1.266
@@ -1380,7 +1380,7 @@
if (Mode_menus.current_depth)
{
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
ewin = Mode_menus.list[0]->ewin;
if (ewin->head == head_num)
{
@@ -1407,7 +1407,7 @@
if (((xdist != 0) || (ydist != 0))
&& (Conf.menus.warp))
EXWarpPointer(None, xdist, ydist);
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
}
#endif
}
===================================================================
RCS file: /cvs/e/e16/e/src/screen.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- screen.c 24 Aug 2006 21:52:28 -0000 1.21
+++ screen.c 27 Dec 2006 16:34:48 -0000 1.22
@@ -25,7 +25,7 @@
#include "ewins.h"
#include "screen.h"
#include "xwin.h"
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@@ -60,7 +60,7 @@
void
ScreenInit(void)
{
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
XineramaScreenInfo *screens = NULL;
int num_screens = 0;
int i;
@@ -83,7 +83,7 @@
{
int i;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
if (XineramaIsActive(disp))
{
XineramaScreenInfo *scrns;
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- settings.c 29 Oct 2006 15:21:15 -0000 1.161
+++ settings.c 27 Dec 2006 16:34:48 -0000 1.162
@@ -194,7 +194,7 @@
static char tmp_place_ignore_struts;
static char tmp_raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
static char tmp_extra_head;
#endif
@@ -220,7 +220,7 @@
Conf.place.ignore_struts = tmp_place_ignore_struts;
Conf.place.raise_fullscreen = tmp_raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
if (Mode.display.xinerama_active)
Conf.place.extra_head = tmp_extra_head;
#endif
@@ -251,7 +251,7 @@
tmp_place_ignore_struts = Conf.place.ignore_struts;
tmp_raise_fullscreen = Conf.place.raise_fullscreen;
-#ifdef HAS_XINERAMA
+#ifdef HAVE_XINERAMA
tmp_extra_head = Conf.place.extra_head;
#endif
@@ -376,7 +376,7 @@
DialogItemSetText(di, _("Raise fullscreen windows"));
DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
-#ifdef HAS_XINERAMA_no /* Not implemented */
+#ifdef HAVE_XINERAMA_no /* Not implemented */
if (Mode.display.xinerama_active)
{
di = DialogAddItem(table, DITEM_CHECKBUTTON);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
