Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h events.c globals.c setup.c
Log Message:
Move some event initialisation to events.c.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -3 -r1.201 -r1.202
--- E.h 8 Feb 2004 22:51:50 -0000 1.201
+++ E.h 10 Feb 2004 18:29:45 -0000 1.202
@@ -1683,6 +1683,7 @@
int wd, int ht);
/* events.c */
+void EventsInit(void);
void CheckEvent(void);
void WaitEvent(void);
void EventDebugInit(const char *s);
@@ -2715,7 +2716,6 @@
extern FnlibData *pFnlibData;
#endif
extern List *lists;
-extern int event_base_shape;
extern Root root;
extern EConf conf;
extern EMode mode;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- events.c 1 Feb 2004 11:28:05 -0000 1.49
+++ events.c 10 Feb 2004 18:29:46 -0000 1.50
@@ -33,6 +33,8 @@
static int EventDebug(unsigned int type);
#endif
+static int event_base_shape = 0;
+
char throw_move_events_away = 0;
static char diddeskaccount = 1;
@@ -51,6 +53,46 @@
EDBUG_RETURN_;
}
+void
+EventsInit(void)
+{
+ int shape_event_base, shape_error_base;
+
+ /* Check for the Shape Extension */
+ if (!XShapeQueryExtension(disp, &shape_event_base, &shape_error_base))
+ {
+ ASSIGN_ALERT(_("X server setup error"), "", "",
+ _("Quit Enlightenment"));
+ Alert(_
+ ("FATAL ERROR:\n" "\n"
+ "This Xserver does not support the Shape extension.\n"
+ "This is required for Enlightenment to run.\n" "\n"
+ "Your Xserver probably is too old or mis-configured.\n" "\n"
+ "Exiting.\n"));
+ RESET_ALERT;
+ EExit((void *)1);
+ }
+ event_base_shape = shape_event_base;
+
+ /* check for the XTEST extension */
+/*
+ * if (XTestQueryExtension(disp, &test_event_base, &test_error_base, &test_v1,
&test_v2))
+ * {
+ * XTestGrabControl(disp, True);
+ * }
+ * else
+ * Alert("WARNING:\n"
+ * "This Xserver does not support the XTest extension.\n"
+ * "This is required for Enlightenment to run properly.\n"
+ * "Enlightenment will continue to run, but parts may not.\n"
+ * "Work correctly.\n"
+ * "Please contact your system administrator, or see the manuals\n"
+ * "For your XServer to find out how to enable the XTest\n"
+ * "Extension\n");
+ */
+ /* record the event base for shape change events */
+}
+
char *
NukeBoringevents(XEvent * ev, int num)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- globals.c 19 Jan 2004 22:30:30 -0000 1.27
+++ globals.c 10 Feb 2004 18:29:46 -0000 1.28
@@ -47,7 +47,6 @@
#endif
List *lists;
Root root;
-int event_base_shape;
EConf conf;
EMode mode;
Desktops desks;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- setup.c 6 Feb 2004 19:56:26 -0000 1.108
+++ setup.c 10 Feb 2004 18:29:46 -0000 1.109
@@ -112,11 +112,8 @@
void
SetupX()
{
-
/* This function sets up all of our connections to X */
- int shape_event_base, shape_error_base;
-
EDBUG(6, "SetupX");
/* In case we are going to fork, set up the master pid */
@@ -195,42 +192,14 @@
}
}
}
+
/* set up an error handler for then E would normally have fatal X errors */
XSetErrorHandler((XErrorHandler) EHandleXError);
/* set up a handler for when the X Connection goes down */
XSetIOErrorHandler((XIOErrorHandler) HandleXIOError);
- /* Check for the Shape Extension */
- if (!XShapeQueryExtension(disp, &shape_event_base, &shape_error_base))
- {
- ASSIGN_ALERT(_("X server setup error"), "", "",
- _("Quit Enlightenment"));
- Alert(_
- ("FATAL ERROR:\n" "\n"
- "This Xserver does not support the Shape extension.\n"
- "This is required for Enlightenment to run.\n" "\n"
- "Your Xserver probably is too old or mis-configured.\n" "\n"
- "Exiting.\n"));
- RESET_ALERT;
- EExit((void *)1);
- }
- /* check for the XTEST extension */
-/*
- * if (XTestQueryExtension(disp, &test_event_base, &test_error_base, &test_v1,
&test_v2))
- * {
- * XTestGrabControl(disp, True);
- * }
- * else
- * Alert("WARNING:\n"
- * "This Xserver does not support the XTest extension.\n"
- * "This is required for Enlightenment to run properly.\n"
- * "Enlightenment will continue to run, but parts may not.\n"
- * "Work correctly.\n"
- * "Please contact your system administrator, or see the manuals\n"
- * "For your XServer to find out how to enable the XTest\n"
- * "Extension\n");
- */
- /* record the event base for shape change events */
- event_base_shape = shape_event_base;
+
+ /* initialise event handling */
+ EventsInit();
/* initialise imlib */
#if USE_IMLIB2
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
