[X2Go-Commits] [nx-libs] 214/219: Events.c: introduce separate debug level for autograb debugging only

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 6181aa9113cc1e852d405ef85c184e32e7fad6c4
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Aug 14 20:59:49 2019 +0200

    Events.c: introduce separate debug level for autograb debugging only
    
    We should do something similar for all subsystems over time...
---
 nx-X11/programs/Xserver/hw/nxagent/Events.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index f3e7880c8..4a6a05482 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -115,6 +115,15 @@
 #undef  TEST
 #undef  DEBUG
 
+/* debug individual subsystems */
+#undef DEBUG_AUTOGRAB
+
+/* aktivate subsystems if generic DEBUG is activated */
+#ifdef DEBUG
+#ifndef DEBUG_AUTOGRAB
+#define DEBUG_AUTOGRAB
+#endif
+#endif
 /*
  * Log begin and end of the important handlers.
  */
@@ -706,9 +715,9 @@ static void nxagentSwitchDeferMode(void)
 
 static void nxagentEnableAutoGrab(void)
 {
-#ifdef DEBUG
+  #ifdef DEBUG_AUTOGRAB
   fprintf(stderr, "enabling autograb\n");
-#endif
+  #endif
 
   nxagentGrabPointerAndKeyboard(NULL);
   nxagentChangeOption(AutoGrab, True);
@@ -717,9 +726,9 @@ static void nxagentEnableAutoGrab(void)
 
 static void nxagentDisableAutoGrab(void)
 {
-#ifdef DEBUG
+  #ifdef DEBUG_AUTOGRAB
   fprintf(stderr, "disabling autograb\n");
-#endif
+  #endif
 
   nxagentUngrabPointerAndKeyboard(NULL);
   nxagentChangeOption(AutoGrab, False);
@@ -1603,14 +1612,14 @@ FIXME: Don't enqueue the KeyRelease event if the key was
         {
           if (X.xfocus.window == nxagentDefaultWindows[0] && X.xfocus.mode == NotifyNormal)
           {
-            #ifdef DEBUG
+            #if defined(DEBUG) || defined(DEBUG_AUTOGRAB)
             fprintf(stderr, "%s: (FocusIn): grabbing\n", __func__);
 	    #endif
             nxagentGrabPointerAndKeyboard(NULL);
           }
 	  /*	  else
           {
-            #ifdef DEBUG
+            #if defined(DEBUG) || defined(DEBUG_AUTOGRAB)
             fprintf(stderr, "%s: (FocusIn): ungrabbing\n", __func__);
 	    #endif
             nxagentUngrabPointerAndKeyboard(NULL);
@@ -1706,7 +1715,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was
           XGetInputFocus(nxagentDisplay, &w, &revert_to);
           if (w != nxagentDefaultWindows[0] && X.xfocus.mode == NotifyWhileGrabbed)
           {
-            #ifdef DEBUG
+            #if defined(DEBUG) || defined(DEBUG_AUTOGRAB)
             fprintf(stderr, "%s: (FocusOut): ungrabbing\n", __func__);
             #endif
             nxagentUngrabPointerAndKeyboard(NULL);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git