Clipboard.c: Refactor nxagentCollectPropertyEvent

nx-X11/programs/Xserver/hw/nxagent/Clipboard.c

@@ -930,6 +930,13 @@ void nxagentTransferSelection(int resource)
   }
 }
 
+/*
+   Called from Events.c/nxagentHandlePropertyNotify
+
+   This event is generated after XChangeProperty(), XDeleteProperty() or
+   XGetWindowProperty(delete=True)
+*/
+
 void nxagentCollectPropertyEvent(int resource)
 {
   Atom                  atomReturnType;
@@ -940,9 +947,8 @@ void nxagentCollectPropertyEvent(int resource)
   int                   result;
 
   /*
-   * We have received the notification so
-   * we can safely retrieve data from the
-   * client structure.
+   * We have received the notification so we can safely retrieve data
+   * from the client structure.
    */
 
   result = NXGetCollectedProperty(nxagentDisplay,
@@ -958,28 +964,21 @@ void nxagentCollectPropertyEvent(int resource)
   if (result == 0)
   {
     #ifdef DEBUG
-    fprintf (stderr, "%s: Failed to get reply data for client [%d].\n", __func__,
-                 CLINDEX(lastClientClientPtr));
+    fprintf (stderr, "%s: Failed to get reply data.\n", __func__);
     #endif
 
     endTransfer(SELECTION_FAULT);
-
-    SAFE_XFree(pszReturnData);
-    return;
   }
-
-  if (resultFormat != 8 && resultFormat != 16 && resultFormat != 32)
+  else if (resultFormat != 8 && resultFormat != 16 && resultFormat != 32)
   {
     #ifdef DEBUG
-    fprintf (stderr, "%s: WARNING! Invalid property value.\n", __func__);
+    fprintf (stderr, "%s: WARNING! Invalid property format.\n", __func__);
     #endif
 
     endTransfer(SELECTION_FAULT);
-
-    SAFE_XFree(pszReturnData);
-    return;
   }
-
+  else
+  {
     switch (lastClientStage)
     {
       case SelectionStageWaitSize:
@@ -993,16 +992,13 @@ void nxagentCollectPropertyEvent(int resource)
         if (ulReturnBytesLeft == 0)
         {
           #ifdef DEBUG
-        fprintf (stderr, "%s: Aborting selection notify procedure for client [%d].\n", __func__,
-                     CLINDEX(lastClientClientPtr));
+          fprintf (stderr, "%s: Aborting selection notify procedure.\n", __func__);
           #endif
 
           endTransfer(SELECTION_FAULT);
-
-        SAFE_XFree(pszReturnData);
-        return;
         }
-
+        else
+        {
           #ifdef DEBUG
           fprintf(stderr, "%s: Got property size from remote server.\n", __func__);
           #endif
@@ -1010,12 +1006,11 @@ void nxagentCollectPropertyEvent(int resource)
           /*
            * Request the selection data now.
            */
-
           lastClientPropertySize = ulReturnBytesLeft;
           SetClientSelectionStage(QueryData);
 
           nxagentTransferSelection(resource);
-
+        }
         break;
       }
       case SelectionStageWaitData:
@@ -1029,16 +1024,13 @@ void nxagentCollectPropertyEvent(int resource)
         if (ulReturnBytesLeft != 0)
         {
           #ifdef DEBUG
-        fprintf (stderr, "%s: Aborting selection notify procedure for client [%d].\n", __func__,
-                     CLINDEX(lastClientClientPtr));
+          fprintf (stderr, "%s: Aborting selection notify procedure.\n", __func__);
           #endif
 
           endTransfer(SELECTION_FAULT);
-
-        SAFE_XFree(pszReturnData);
-        return;
         }
-
+        else
+        {
           #ifdef DEBUG
           fprintf(stderr, "%s: Got property content from remote server.\n", __func__);
           #endif
@@ -1050,12 +1042,15 @@ void nxagentCollectPropertyEvent(int resource)
                                ulReturnItems, pszReturnData, 1);
 
           #ifdef DEBUG
-      fprintf(stderr, "%s: Selection property [%s] changed to [%s]\n", __func__,
-                   validateString(NameForAtom(lastClientProperty)), pszReturnData);
+          fprintf(stderr, "%s: Selection property [%d][%s] changed to [\"%*.*s\"...]\n", __func__,
+                      lastClientProperty, validateString(NameForAtom(lastClientProperty)),
+                          (int)(min(20, ulReturnItems * resultFormat / 8)),
+                              (int)(min(20, ulReturnItems * resultFormat / 8)),
+                                 pszReturnData);
           #endif
 
           endTransfer(SELECTION_SUCCESS);
-
+        }
         break;
       }
       default:
@@ -1064,11 +1059,10 @@ void nxagentCollectPropertyEvent(int resource)
         fprintf (stderr, "%s: WARNING! Inconsistent state [%s] for client [%d].\n", __func__,
                      GetClientSelectionStageString(lastClientStage), CLINDEX(lastClientClientPtr));
         #endif
-
         break;
       }
     }
-
+  }
   SAFE_XFree(pszReturnData);
 }