Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h draw.c handlers.c hints.c ipc.c mwm.c screen.c sound.c x.c
Log Message:
Header file and other cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -3 -r1.536 -r1.537
--- E.h 27 Feb 2006 19:17:34 -0000 1.536
+++ E.h 19 Mar 2006 14:59:48 -0000 1.537
@@ -41,15 +41,7 @@
#define USE_LIBC_MALLOC 1 /* Use unwrapped libc malloc/realloc/free */
#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xproto.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
#include <X11/extensions/shape.h>
-#include <X11/extensions/XShm.h>
-#ifdef HAS_XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
#ifdef HAS_XRANDR
#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
@@ -886,6 +878,7 @@
/* screen.c */
void ScreenInit(void);
+void ScreenShowInfo(void);
int ScreenGetGeometry(int x, int y, int *px, int *py,
int *pw, int *ph);
int ScreenGetAvailableArea(int x, int y, int *px, int *py,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- draw.c 19 Feb 2006 22:23:50 -0000 1.90
+++ draw.c 19 Mar 2006 14:59:48 -0000 1.91
@@ -27,6 +27,7 @@
#include "xwin.h"
#include <sys/ipc.h>
#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
static void
EFillPixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/handlers.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- handlers.c 7 Jan 2006 07:20:58 -0000 1.51
+++ handlers.c 19 Mar 2006 14:59:48 -0000 1.52
@@ -25,6 +25,7 @@
#include "xwin.h"
#include <sys/wait.h>
#include <signal.h>
+#include <X11/Xproto.h>
static void
SignalHandler(int sig)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- hints.c 27 Feb 2006 19:14:25 -0000 1.62
+++ hints.c 19 Mar 2006 14:59:48 -0000 1.63
@@ -30,6 +30,7 @@
#include "ewins.h"
#include "hints.h"
#include "xwin.h"
+#include <X11/Xatom.h>
/* Misc atoms */
Atom E_XROOTPMAP_ID;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -3 -r1.256 -r1.257
--- ipc.c 19 Mar 2006 00:26:53 -0000 1.256
+++ ipc.c 19 Mar 2006 14:59:48 -0000 1.257
@@ -133,35 +133,7 @@
static void
IPC_Screen(const char *params __UNUSED__, Client * c __UNUSED__)
{
-#ifdef HAS_XINERAMA
- if (Mode.display.xinerama_active)
- {
- XineramaScreenInfo *screens;
- int num, i;
-
- screens = XineramaQueryScreens(disp, &num);
-
- IpcPrintf("Xinerama active:\n");
- IpcPrintf("Head Screen X-Origin Y-Origin Width Height\n");
- for (i = 0; i < num; i++)
- {
- IpcPrintf(" %2d %2d %5d %5d %5d %5d\n",
- i, screens[i].screen_number,
- screens[i].x_org, screens[i].y_org, screens[i].width,
- screens[i].height);
- }
- XFree(screens);
- return;
- }
- else
- {
- IpcPrintf("Xinerama is not active\n");
- }
-#endif
-
- IpcPrintf("Head Screen X-Origin Y-Origin Width Height\n");
- IpcPrintf(" %2d %2d %5d %5d %5d %5d\n",
- 0, VRoot.scr, 0, 0, VRoot.w, VRoot.h);
+ ScreenShowInfo();
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mwm.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- mwm.c 20 Jan 2006 22:04:49 -0000 1.31
+++ mwm.c 19 Mar 2006 14:59:48 -0000 1.32
@@ -23,10 +23,7 @@
#include "E.h"
#include "ewins.h"
#include "hints.h"
-
-/* workaround for 64bit architectures - xlib expects 32bit CARDINALS to be */
-/* long's on 64bit machines... thus well the CARD32's Im unsing shoudl be.. */
-#define CARD32 long
+#include <X11/Xatom.h>
/* Motif window hints */
#define MWM_HINTS_FUNCTIONS (1L << 0)
@@ -63,13 +60,13 @@
static Atom _MOTIF_WM_HINTS = 0;
/* Motif window hints */
-typedef struct _mwmhints
+typedef struct
{
- CARD32 flags;
- CARD32 functions;
- CARD32 decorations;
- INT32 inputMode;
- CARD32 status;
+ long flags;
+ long functions;
+ long decorations;
+ long inputMode;
+ long status;
}
MWMHints;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/screen.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- screen.c 7 Jan 2006 07:20:58 -0000 1.13
+++ screen.c 19 Mar 2006 14:59:48 -0000 1.14
@@ -24,6 +24,9 @@
#include "E.h"
#include "ewins.h"
#include "xwin.h"
+#ifdef HAS_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
#ifdef HAS_XINERAMA
static XineramaScreenInfo *screens = NULL;
@@ -43,6 +46,40 @@
#endif
}
+void
+ScreenShowInfo(void)
+{
+#ifdef HAS_XINERAMA
+ if (Mode.display.xinerama_active)
+ {
+ XineramaScreenInfo *scrns;
+ int num, i;
+
+ scrns = XineramaQueryScreens(disp, &num);
+
+ IpcPrintf("Xinerama active:\n");
+ IpcPrintf("Head Screen X-Origin Y-Origin Width Height\n");
+ for (i = 0; i < num; i++)
+ {
+ IpcPrintf(" %2d %2d %5d %5d %5d %5d\n",
+ i, scrns[i].screen_number,
+ scrns[i].x_org, scrns[i].y_org, scrns[i].width,
+ scrns[i].height);
+ }
+ XFree(screens);
+ return;
+ }
+ else
+ {
+ IpcPrintf("Xinerama is not active\n");
+ }
+#endif
+
+ IpcPrintf("Head Screen X-Origin Y-Origin Width Height\n");
+ IpcPrintf(" %2d %2d %5d %5d %5d %5d\n",
+ 0, VRoot.scr, 0, 0, VRoot.w, VRoot.h);
+}
+
int
ScreenGetGeometry(int xi, int yi, int *px, int *py, int *pw, int *ph)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- sound.c 18 Feb 2006 08:30:09 -0000 1.40
+++ sound.c 19 Mar 2006 14:59:48 -0000 1.41
@@ -305,7 +305,7 @@
sound_fd = fd;
else
{
- AlertX(_("Error initialising sound"), _("OK"), " ", " ",
+ AlertX(_("Error initialising sound"), _("OK"), NULL, NULL,
_("Audio was enabled for Enlightenment but there was an error\n"
"communicating with the audio server (Esound). Audio will\n"
"now be disabled.\n"));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- x.c 27 Feb 2006 19:14:25 -0000 1.119
+++ x.c 19 Mar 2006 14:59:48 -0000 1.120
@@ -26,6 +26,7 @@
#include <Ecore_X.h>
#endif
#include "xwin.h"
+#include <X11/Xatom.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
