Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h alert.c evhandlers.c globals.c main.c
Log Message:
Introduced debug_flags, minor cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- E.h 14 Jun 2003 12:03:09 -0000 1.119
+++ E.h 15 Jun 2003 15:27:04 -0000 1.120
@@ -3152,11 +3152,8 @@
#ifdef HAS_XINERAMA
extern char xinerama_active;
-
#endif
-/* This turns on E's internal stack tracking system for coarse debugging */
-/* and being able to trace E for profiling/optimisation purposes (which */
-/* believe it or not I'm actually doing) */
-
-/* #define DEBUG 1 */
+#define EDBUG_CLIENT_MESSAGES 0x00000001
+#define EDBUG_PROPERTY_CHANGE 0x00000002
+extern int debug_flags;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/alert.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- alert.c 22 May 2003 19:14:57 -0000 1.21
+++ alert.c 15 Jun 2003 15:27:04 -0000 1.22
@@ -38,10 +38,6 @@
static char *TitleText = NULL;
-int call_level;
-int debug_level;
-char *call_stack[1024];
-
void
Alert(char *fmt, ...)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- evhandlers.c 14 Jun 2003 12:03:09 -0000 1.106
+++ evhandlers.c 15 Jun 2003 15:27:04 -0000 1.107
@@ -99,18 +99,21 @@
void
HandleClientMessage(XEvent * ev)
{
-#if DEBUG_HINTS
- char *name = XGetAtomName(disp, ev->xclient.message_type);
-
- printf
- ("HandleClientMessage: ev_type=%s(%d) ev_win=%#x data[0-3]= %08lx %08lx %08lx
%08lx\n",
- name, (unsigned)ev->xclient.message_type, (unsigned)ev->xclient.window,
- ev->xclient.data.l[0], ev->xclient.data.l[1], ev->xclient.data.l[2],
- ev->xclient.data.l[3]);
- XFree(name);
-#endif
EDBUG(5, "HandleClientMessage");
+ if (debug_flags & EDBUG_CLIENT_MESSAGES)
+ {
+ char *name = XGetAtomName(disp, ev->xclient.message_type);
+
+ printf
+ ("HandleClientMessage: ev_type=%s(%d) ev_win=%#x data[0-3]= %08lx %08lx
%08lx %08lx\n",
+ name, (unsigned)ev->xclient.message_type,
+ (unsigned)ev->xclient.window, ev->xclient.data.l[0],
+ ev->xclient.data.l[1], ev->xclient.data.l[2],
+ ev->xclient.data.l[3]);
+ XFree(name);
+ }
+
if (!xa_ENL_MSG)
xa_ENL_MSG = XInternAtom(disp, "ENL_MSG", False);
if (ev->xclient.message_type == xa_ENL_MSG)
@@ -1120,13 +1123,15 @@
char title[10240];
int desktop;
-#if DEBUG_HINTS
- char *name = XGetAtomName(disp, ev->xproperty.atom);
+ if (debug_flags & EDBUG_PROPERTY_CHANGE)
+ {
+ char *name = XGetAtomName(disp, ev->xproperty.atom);
- printf("HandleProperty: Atom=%s(%d) id=%#x\n",
- name, (unsigned)ev->xproperty.atom, (unsigned)ev->xproperty.window);
- XFree(name);
-#endif
+ printf("HandleProperty: Atom=%s(%d) id=%#x\n",
+ name, (unsigned)ev->xproperty.atom,
+ (unsigned)ev->xproperty.window);
+ XFree(name);
+ }
EDBUG(5, "HandleProperty");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- globals.c 11 Jun 2003 19:44:58 -0000 1.11
+++ globals.c 15 Jun 2003 15:27:04 -0000 1.12
@@ -70,5 +70,10 @@
#ifdef HAS_XINERAMA
char xinerama_active;
-
#endif
+#ifdef DEBUG
+int call_level;
+int debug_level;
+char *call_stack[1024];
+#endif
+int debug_flags = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- main.c 31 May 2003 08:28:52 -0000 1.56
+++ main.c 15 Jun 2003 15:27:04 -0000 1.57
@@ -48,6 +48,7 @@
Background *bg;
ECursor *ec = NULL;
struct utsname ubuf;
+ char *str;
/* This function runs all the setup for startup, and then
* proceeds into the primary event loop at the end.
@@ -67,14 +68,13 @@
#ifdef DEBUG
call_level = 0;
debug_level = 0;
- {
- char *debug_str;
-
- debug_str = getenv("EDBUG");
- if (debug_str)
- debug_level = atoi(debug_str);
- }
+ str = getenv("EDBUG");
+ if (str)
+ debug_level = atoi(str);
#endif
+ str = getenv("EDBUG_FLAGS");
+ if (str)
+ debug_flags = strtoul(str, NULL, 0);
EDBUG(1, "main");
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
