Converted to the new debug interface.

tools/make_X11wrappers

@@ -107,7 +107,7 @@ END
 
 $pre_file
 $x11_incl#include <X11/$extensions_dir$name.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -391,13 +391,13 @@ sub raw_output_fn {
 #    print OUTH "#define $fn_name TS$fn_name\n";
     print OUTC "{\n";
     print OUTC "  $resultdecl;\n" if $resultdecl;
-    print OUTC "  TRACE(x11, \"Call $fn_name\\n\");\n";
+    print OUTC "  TRACE(\"Call $fn_name\\n\");\n";
     print OUTC "  EnterCriticalSection( &X11DRV_CritSection );\n";
     print OUTC "  ";
     print OUTC "r = " if $resultdecl;
     print OUTC "$fn_name($actuals);\n";
     print OUTC "  LeaveCriticalSection( &X11DRV_CritSection );\n";
-    print OUTC "  TRACE(x11, \"Ret $fn_name\\n\");\n";
+    print OUTC "  TRACE(\"Ret $fn_name\\n\");\n";
     print OUTC "  return r;\n" if $resultdecl;
     print OUTC "}\n";
     $want{$fn_name} = 2;

tsx11/ts_xf86dga.c

@@ -12,7 +12,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86dga.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -20,99 +20,99 @@ DEFAULT_DEBUG_CHANNEL(x11)
 Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86DGAQueryVersion\n");
+  TRACE("Call XF86DGAQueryVersion\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAQueryVersion(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAQueryVersion\n");
+  TRACE("Ret XF86DGAQueryVersion\n");
   return r;
 }
 
 Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86DGAQueryExtension\n");
+  TRACE("Call XF86DGAQueryExtension\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAQueryExtension(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAQueryExtension\n");
+  TRACE("Ret XF86DGAQueryExtension\n");
   return r;
 }
 
 Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5)
 {
   Status r;
-  TRACE(x11, "Call XF86DGAGetVideo\n");
+  TRACE("Call XF86DGAGetVideo\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAGetVideo\n");
+  TRACE("Ret XF86DGAGetVideo\n");
   return r;
 }
 
 Status TSXF86DGADirectVideo(Display*a0,int a1,int a2)
 {
   Status r;
-  TRACE(x11, "Call XF86DGADirectVideo\n");
+  TRACE("Call XF86DGADirectVideo\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGADirectVideo(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGADirectVideo\n");
+  TRACE("Ret XF86DGADirectVideo\n");
   return r;
 }
 
 Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3)
 {
   Status r;
-  TRACE(x11, "Call XF86DGAGetViewPortSize\n");
+  TRACE("Call XF86DGAGetViewPortSize\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAGetViewPortSize(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAGetViewPortSize\n");
+  TRACE("Ret XF86DGAGetViewPortSize\n");
   return r;
 }
 
 Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3)
 {
   Status r;
-  TRACE(x11, "Call XF86DGASetViewPort\n");
+  TRACE("Call XF86DGASetViewPort\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGASetViewPort(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGASetViewPort\n");
+  TRACE("Ret XF86DGASetViewPort\n");
   return r;
 }
 
 Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2)
 {
   Status r;
-  TRACE(x11, "Call XF86DGAInstallColormap\n");
+  TRACE("Call XF86DGAInstallColormap\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAInstallColormap(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAInstallColormap\n");
+  TRACE("Ret XF86DGAInstallColormap\n");
   return r;
 }
 
 Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2)
 {
   Status r;
-  TRACE(x11, "Call XF86DGAQueryDirectVideo\n");
+  TRACE("Call XF86DGAQueryDirectVideo\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAQueryDirectVideo(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAQueryDirectVideo\n");
+  TRACE("Ret XF86DGAQueryDirectVideo\n");
   return r;
 }
 
 Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
 {
   Status r;
-  TRACE(x11, "Call XF86DGAViewPortChanged\n");
+  TRACE("Call XF86DGAViewPortChanged\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86DGAViewPortChanged(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86DGAViewPortChanged\n");
+  TRACE("Ret XF86DGAViewPortChanged\n");
   return r;
 }
 

tsx11/ts_xf86vmode.c

@@ -15,7 +15,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -23,154 +23,154 @@ DEFAULT_DEBUG_CHANNEL(x11)
 Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeQueryVersion\n");
+  TRACE("Call XF86VidModeQueryVersion\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeQueryVersion(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeQueryVersion\n");
+  TRACE("Ret XF86VidModeQueryVersion\n");
   return r;
 }
 
 Bool TSXF86VidModeQueryExtension(Display*a0,int*a1,int*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeQueryExtension\n");
+  TRACE("Call XF86VidModeQueryExtension\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeQueryExtension(a0,a2,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeQueryExtension\n");
+  TRACE("Ret XF86VidModeQueryExtension\n");
   return r;
 }
 
 Bool TSXF86VidModeGetModeLine(Display*a0,int a1,int*a2,XF86VidModeModeLine*a3)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeGetModeLine\n");
+  TRACE("Call XF86VidModeGetModeLine\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeGetModeLine(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeGetModeLine\n");
+  TRACE("Ret XF86VidModeGetModeLine\n");
   return r;
 }
 
 Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeGetAllModeLines\n");
+  TRACE("Call XF86VidModeGetAllModeLines\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeGetAllModeLines(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeGetAllModeLines\n");
+  TRACE("Ret XF86VidModeGetAllModeLines\n");
   return r;
 }
 
 Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeAddModeLine\n");
+  TRACE("Call XF86VidModeAddModeLine\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeAddModeLine(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeAddModeLine\n");
+  TRACE("Ret XF86VidModeAddModeLine\n");
   return r;
 }
 
 Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeDeleteModeLine\n");
+  TRACE("Call XF86VidModeDeleteModeLine\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeDeleteModeLine(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeDeleteModeLine\n");
+  TRACE("Ret XF86VidModeDeleteModeLine\n");
   return r;
 }
 
 Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeModModeLine\n");
+  TRACE("Call XF86VidModeModModeLine\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeModModeLine(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeModModeLine\n");
+  TRACE("Ret XF86VidModeModModeLine\n");
   return r;
 }
 
 Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
 {
   Status r;
-  TRACE(x11, "Call XF86VidModeValidateModeLine\n");
+  TRACE("Call XF86VidModeValidateModeLine\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeValidateModeLine(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeValidateModeLine\n");
+  TRACE("Ret XF86VidModeValidateModeLine\n");
   return r;
 }
 
 Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeSwitchMode\n");
+  TRACE("Call XF86VidModeSwitchMode\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeSwitchMode(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeSwitchMode\n");
+  TRACE("Ret XF86VidModeSwitchMode\n");
   return r;
 }
 
 Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeSwitchToMode\n");
+  TRACE("Call XF86VidModeSwitchToMode\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeSwitchToMode(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeSwitchToMode\n");
+  TRACE("Ret XF86VidModeSwitchToMode\n");
   return r;
 }
 
 Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeLockModeSwitch\n");
+  TRACE("Call XF86VidModeLockModeSwitch\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeLockModeSwitch(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeLockModeSwitch\n");
+  TRACE("Ret XF86VidModeLockModeSwitch\n");
   return r;
 }
 
 Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeGetMonitor\n");
+  TRACE("Call XF86VidModeGetMonitor\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeGetMonitor(a0,a1,a2);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeGetMonitor\n");
+  TRACE("Ret XF86VidModeGetMonitor\n");
   return r;
 }
 
 Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeGetViewPort\n");
+  TRACE("Call XF86VidModeGetViewPort\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeGetViewPort(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeGetViewPort\n");
+  TRACE("Ret XF86VidModeGetViewPort\n");
   return r;
 }
 
 Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
 {
   Bool r;
-  TRACE(x11, "Call XF86VidModeSetViewPort\n");
+  TRACE("Call XF86VidModeSetViewPort\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XF86VidModeSetViewPort(a0,a1,a2,a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XF86VidModeSetViewPort\n");
+  TRACE("Ret XF86VidModeSetViewPort\n");
   return r;
 }
 

tsx11/ts_xpm.c

@@ -11,7 +11,7 @@
 #ifdef HAVE_LIBXXPM
 
 #include <X11/xpm.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -19,22 +19,22 @@ DEFAULT_DEBUG_CHANNEL(x11)
 int TSXpmCreatePixmapFromData(Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5)
 {
   int r;
-  TRACE(x11, "Call XpmCreatePixmapFromData\n");
+  TRACE("Call XpmCreatePixmapFromData\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XpmCreatePixmapFromData(a0, a1, a2, a3, a4, a5);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XpmCreatePixmapFromData\n");
+  TRACE("Ret XpmCreatePixmapFromData\n");
   return r;
 }
 
 int TSXpmAttributesSize(void)
 {
   int r;
-  TRACE(x11, "Call XpmAttributesSize\n");
+  TRACE("Call XpmAttributesSize\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XpmAttributesSize();
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XpmAttributesSize\n");
+  TRACE("Ret XpmAttributesSize\n");
   return r;
 }
 

tsx11/ts_xresource.c

@@ -11,7 +11,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -19,63 +19,63 @@ DEFAULT_DEBUG_CHANNEL(x11)
 XrmQuark  TSXrmUniqueQuark(void)
 {
   XrmQuark  r;
-  TRACE(x11, "Call XrmUniqueQuark\n");
+  TRACE("Call XrmUniqueQuark\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XrmUniqueQuark();
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmUniqueQuark\n");
+  TRACE("Ret XrmUniqueQuark\n");
   return r;
 }
 
 int   TSXrmGetResource(XrmDatabase a0, const  char* a1, const  char* a2, char** a3, XrmValue* a4)
 {
   int   r;
-  TRACE(x11, "Call XrmGetResource\n");
+  TRACE("Call XrmGetResource\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XrmGetResource(a0, a1, a2, a3, a4);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmGetResource\n");
+  TRACE("Ret XrmGetResource\n");
   return r;
 }
 
 XrmDatabase  TSXrmGetFileDatabase(const  char* a0)
 {
   XrmDatabase  r;
-  TRACE(x11, "Call XrmGetFileDatabase\n");
+  TRACE("Call XrmGetFileDatabase\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XrmGetFileDatabase(a0);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmGetFileDatabase\n");
+  TRACE("Ret XrmGetFileDatabase\n");
   return r;
 }
 
 XrmDatabase  TSXrmGetStringDatabase(const  char* a0)
 {
   XrmDatabase  r;
-  TRACE(x11, "Call XrmGetStringDatabase\n");
+  TRACE("Call XrmGetStringDatabase\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XrmGetStringDatabase(a0);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmGetStringDatabase\n");
+  TRACE("Ret XrmGetStringDatabase\n");
   return r;
 }
 
 void  TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1)
 {
-  TRACE(x11, "Call XrmMergeDatabases\n");
+  TRACE("Call XrmMergeDatabases\n");
   EnterCriticalSection( &X11DRV_CritSection );
   XrmMergeDatabases(a0, a1);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmMergeDatabases\n");
+  TRACE("Ret XrmMergeDatabases\n");
 }
 
 void  TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const  char* a3, int* a4, char** a5)
 {
-  TRACE(x11, "Call XrmParseCommand\n");
+  TRACE("Call XrmParseCommand\n");
   EnterCriticalSection( &X11DRV_CritSection );
   XrmParseCommand(a0, a1, a2, a3, a4, a5);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XrmParseCommand\n");
+  TRACE("Ret XrmParseCommand\n");
 }
 
 

tsx11/ts_xshm.c

@@ -12,7 +12,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
-#include "debug.h"
+#include "debugtools.h"
 #include "x11drv.h"
 
 DEFAULT_DEBUG_CHANNEL(x11)
@@ -20,99 +20,99 @@ DEFAULT_DEBUG_CHANNEL(x11)
 Bool TSXShmQueryExtension(Display *a0)
 {
   Bool r;
-  TRACE(x11, "Call XShmQueryExtension\n");
+  TRACE("Call XShmQueryExtension\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmQueryExtension(a0);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmQueryExtension\n");
+  TRACE("Ret XShmQueryExtension\n");
   return r;
 }
 
 Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3)
 {
   Bool r;
-  TRACE(x11, "Call XShmQueryVersion\n");
+  TRACE("Call XShmQueryVersion\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmQueryVersion(a0, a1, a2, a3);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmQueryVersion\n");
+  TRACE("Ret XShmQueryVersion\n");
   return r;
 }
 
 int TSXShmPixmapFormat(Display *a0)
 {
   int r;
-  TRACE(x11, "Call XShmPixmapFormat\n");
+  TRACE("Call XShmPixmapFormat\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmPixmapFormat(a0);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmPixmapFormat\n");
+  TRACE("Ret XShmPixmapFormat\n");
   return r;
 }
 
 Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1)
 {
   Status r;
-  TRACE(x11, "Call XShmAttach\n");
+  TRACE("Call XShmAttach\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmAttach(a0, a1);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmAttach\n");
+  TRACE("Ret XShmAttach\n");
   return r;
 }
 
 Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1)
 {
   Status r;
-  TRACE(x11, "Call XShmDetach\n");
+  TRACE("Call XShmDetach\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmDetach(a0, a1);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmDetach\n");
+  TRACE("Ret XShmDetach\n");
   return r;
 }
 
 Status TSXShmPutImage(Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10)
 {
   Status r;
-  TRACE(x11, "Call XShmPutImage\n");
+  TRACE("Call XShmPutImage\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmPutImage\n");
+  TRACE("Ret XShmPutImage\n");
   return r;
 }
 
 Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5)
 {
   Status r;
-  TRACE(x11, "Call XShmGetImage\n");
+  TRACE("Call XShmGetImage\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmGetImage(a0, a1, a2, a3, a4, a5);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmGetImage\n");
+  TRACE("Ret XShmGetImage\n");
   return r;
 }
 
 XImage * TSXShmCreateImage(Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7)
 {
   XImage * r;
-  TRACE(x11, "Call XShmCreateImage\n");
+  TRACE("Call XShmCreateImage\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmCreateImage\n");
+  TRACE("Ret XShmCreateImage\n");
   return r;
 }
 
 Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6)
 {
   Pixmap r;
-  TRACE(x11, "Call XShmCreatePixmap\n");
+  TRACE("Call XShmCreatePixmap\n");
   EnterCriticalSection( &X11DRV_CritSection );
   r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6);
   LeaveCriticalSection( &X11DRV_CritSection );
-  TRACE(x11, "Ret XShmCreatePixmap\n");
+  TRACE("Ret XShmCreatePixmap\n");
   return r;
 }