File 0001-libs-wine-winex11.drv-Toggle-debug-traces-... of Package wine-snapshot

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-libs-wine-winex11.drv-Toggle-debug-traces-with-the-k.patch of Package wine-snapshot (Revision bf6b44558416cee94776bd4ed6a33a33)

Currently displaying revision bf6b44558416cee94776bd4ed6a33a33 , Show latest

From 8554fac162c21d494edaf80f1aa4fa7eabcd1982 Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.wine@zerebecki.de>
Date: Sun, 18 Jul 2010 10:26:04 +0200
Subject: [PATCH] libs/wine winex11.drv: Toggle debug traces with the key F12.

libs/wine winex11.drv: Toggle debug traces with the key F12.

To disable debug traces on startup set the environment variable
WINEDELAY=enable , to only enable the hotkey (with traces enabled
on startup) set the variable to anything (e.g. empty).

If keypresses are not picked up you might need to set wine to
unmanaged or use the virtual desktop mode.

Based on a patch from
http://wiki.winehq.org/Debug_trace_toggle_key by Mike Hearn, with
additions from http://kegel.com/wine/debug-delay-3.patch by Dan
Kegel.
---
 dlls/winex11.drv/keyboard.c |    5 +++++
 include/wine/debug.h        |    1 +
 libs/wine/debug.c           |   13 +++++++++++++
 libs/wine/wine.def          |    1 +
 libs/wine/wine.map          |    1 +
 5 Dateien geändert, 21 Zeilen hinzugefügt(+)

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index ae7e72b..1d88bda 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1427,6 +1427,11 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev )
 
     update_lock_state( hwnd, vkey, event->state, event_time );
 
+    /* we get this event repeatedly if we hold down the key (keyboard repeat) */
+    if ((VK_F12 == vkey) && (event->type == KeyPress) && getenv("WINEDELAY")) {
+    __wine_dbg_toggle_block();
+    }
+
     X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time );
 }
 
diff --git a/include/wine/debug.h b/include/wine/debug.h
index ba6fabe..bae075a 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -152,6 +152,7 @@ struct __wine_debug_functions
                      const char *function, const char *format, va_list args );
 };
 
+extern void __wine_dbg_toggle_block(void);
 extern unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel );
 extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel,
                                          unsigned char set, unsigned char clear );
diff --git a/libs/wine/debug.c b/libs/wine/debug.c
index a38abf4..18679cb 100644
--- a/libs/wine/debug.c
+++ b/libs/wine/debug.c
@@ -52,6 +52,14 @@ static int cmp_name( const void *p1, const void *p2 )
     return strcmp( name, chan->name );
 }
 
+static int block_traces = 0;
+
+/* enable or disable printing of debug messages temporarily */
+void __wine_dbg_toggle_block() {
+    block_traces = !block_traces;
+    fprintf(stderr, "wine: tracing is now %s\n", block_traces ? "disabled" : "enabled");
+}
+
 /* get the flags to use for a given channel, possibly setting them too in case of lazy init */
 unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel )
 {
@@ -59,9 +67,11 @@ unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel
 
     if (nb_debug_options)
     {
+        if(!block_traces) {
         struct __wine_debug_channel *opt = bsearch( channel->name, debug_options, nb_debug_options,
                                                     sizeof(debug_options[0]), cmp_name );
         if (opt) return opt->flags;
+	} else return default_flags;
     }
     /* no option for this channel */
     if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags;
@@ -207,6 +217,9 @@ static void debug_init(void)
         if (!strcmp( wine_debug, "help" )) debug_usage();
         parse_options( wine_debug );
     }
+    if(!block_traces && getenv("WINEDELAY") && 0 == strncasecmp(getenv("WINEDELAY"), "enable", 6) ) {
+        __wine_dbg_toggle_block();
+    }
 }
 
 /* varargs wrapper for funcs.dbg_vprintf */
diff --git a/libs/wine/wine.def b/libs/wine/wine.def
index ed315bd..e1263e1 100644
--- a/libs/wine/wine.def
+++ b/libs/wine/wine.def
@@ -2,6 +2,7 @@ LIBRARY libwine.dll
 
 EXPORTS
     __wine_dbg_get_channel_flags
+    __wine_dbg_toggle_block
     __wine_dbg_set_channel_flags
     __wine_dbg_set_functions
     __wine_dll_register
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 2159fac..19d454e 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -2,6 +2,7 @@ WINE_1.0
 {
   global:
     __wine_dbg_get_channel_flags;
+    __wine_dbg_toggle_block;
     __wine_dbg_set_channel_flags;
     __wine_dbg_set_functions;
     __wine_dll_register;
-- 
1.7.10.4

Places

File 0001-libs-wine-winex11.drv-Toggle-debug-traces-with-the-k.patch of Package wine-snapshot (Revision bf6b44558416cee94776bd4ed6a33a33)

Places