don't expect errno to be set to EOVERFLOW if vsnprintf() fails

[wxWidgets.git] / src / x11 / reparent.cpp

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index 7a6482426582180d25f4232aeddb9478f490156e..7fab513311e2f6ffd2e36036ca3a9e622afc135c 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -17,14 +17,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "reparent.h"
-#endif
-
-#include "wx/x11/reparent.h"
+#include "wx/setup.h"

 
 #if !wxUSE_NANOX
 
 
 #if !wxUSE_NANOX
 

+#include "wx/x11/reparent.h"

 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/app.h"
 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/app.h"


@@ -33,57 +30,6 @@
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
 

-/*
-
-  Adapted from code by Mike Yang, as follows.
-
-From: Mike Yang (mikey@eukanuba.wpd.sgi.com)
-Subject: Re: Wrapping new widget around existing windows 
-Newsgroups: comp.windows.x
-View: Complete Thread (17 articles) | Original Format 
-Date: 1991-08-09 09:45:48 PST 
- 
-
-Enough people asked, so here's my test program which reparents another
-window.  It's a single file (reparent.c), and will work with Motif or
-Xaw.  Xaw users should comment out the "#define MOTIF" line.
-
-The reparent program first prompts for the application name of the
-client that it will reparent.  If you're going to start the
-application override_redirect (e.g. -xrm "*overrideRedirect: true"),
-then this name is ignored and the first override_redirect window is
-assumed to be the one.
-
-Input focus is supposed to be correctly handled, as is resizing with
-window manager hints.  If you have input focus problems, try launching
-your application override_redirect instead.  This method is preferred
-anyway, since you can map it off-screen and then avoid the "window
-flash" effect as the application's top-level window is reparented.
-
------------------------------------------------------------------------
-                 Mike Yang        Silicon Graphics, Inc.
-               mikey@sgi.com           415/335-1786
-
-
-------------------------------- cut here ------------------------------
-*/
-
-/*
-
-Copyright 1991 by Mike Yang, mikey@sgi.com, Silicon Graphics, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SGI not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SGI makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-*/
-

 /*
  * wxAdoptedWindow
  */
 /*
  * wxAdoptedWindow
  */


@@ -94,12 +40,13 @@ wxAdoptedWindow::wxAdoptedWindow()
 
 wxAdoptedWindow::wxAdoptedWindow(WXWindow window)
 {
 
 wxAdoptedWindow::wxAdoptedWindow(WXWindow window)
 {

-    m_mainWidget = window;
+    m_mainWindow = window;

 }
 
 wxAdoptedWindow::~wxAdoptedWindow()
 {
 }
 }
 
 wxAdoptedWindow::~wxAdoptedWindow()
 {
 }

+

 /*
  * wxReparenter
  */
 /*
  * wxReparenter
  */


@@ -112,11 +59,10 @@ wxWindow* wxReparenter::sm_newParent = NULL;
 wxString wxReparenter::sm_name;
 bool wxReparenter::sm_exactMatch = FALSE;
 
 wxString wxReparenter::sm_name;
 bool wxReparenter::sm_exactMatch = FALSE;
 

-static int
-ErrorHandler(Display* dpy, XErrorEvent* event)
+static int ErrorHandler(Display* dpy, XErrorEvent* event)

 {
 {

-  Xerror = True;
-  return False;
+    Xerror = True;
+    return False;

 }
 
 // We assume that toReparent has had its X window set
 }
 
 // We assume that toReparent has had its X window set


@@ -131,15 +77,15 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
     int parentOffset = 0;
 
     old = XSetErrorHandler(ErrorHandler);
     int parentOffset = 0;
 
     old = XSetErrorHandler(ErrorHandler);

-    XReparentWindow((Display*) newParent->GetXDisplay(),
-                    (Window) toReparent->GetXWindow(),
-                    (Window) newParent->GetXWindow(),
-                    0, 0);
-
-    if (!XQueryTree((Display*) newParent->GetXDisplay(),
-                    (Window) toReparent->GetXWindow(),
-                    &returnroot, &returnparent,
-                    &children, &numchildren) || Xerror)
+    XReparentWindow( wxGlobalDisplay(),
+                     (Window) toReparent->GetMainWindow(),
+                     (Window) newParent->GetMainWindow(),
+                     0, 0);
+
+    if (!XQueryTree( wxGlobalDisplay(),
+                     (Window) toReparent->GetMainWindow(),
+                     &returnroot, &returnparent,
+                     &children, &numchildren) || Xerror)

     {
         XSetErrorHandler(old);
         return TRUE;
     {
         XSetErrorHandler(old);
         return TRUE;


@@ -160,14 +106,14 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
          */
         for (each=0; each<numchildren; each++)
         {
          */
         for (each=0; each<numchildren; each++)
         {

-            XGetWindowAttributes((Display*) newParent->GetXDisplay(),
-                                 children[each], &xwa);
+            XGetWindowAttributes( wxGlobalDisplay(),
+                                  children[each], &xwa);

             fprintf(stderr,
               "Reparenting child at offset %d and position %d, %d.\n",
                parentOffset, parentOffset+xwa.x, parentOffset+xwa.y);
             fprintf(stderr,
               "Reparenting child at offset %d and position %d, %d.\n",
                parentOffset, parentOffset+xwa.x, parentOffset+xwa.y);

-            XReparentWindow((Display*) newParent->GetXDisplay(),
-                            children[each], (Window) newParent->GetXWindow(),
-              xwa.x, xwa.y);
+            XReparentWindow( wxGlobalDisplay(),
+                             children[each], (Window) newParent->GetMainWindow(),
+                             xwa.x, xwa.y);

         }
     }
 
         }
     }
 


@@ -187,7 +133,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
     sm_exactMatch = exactMatch;
     sm_name = windowName;
     
     sm_exactMatch = exactMatch;
     sm_name = windowName;
     

-    Display* display = (Display*) newParent->GetXDisplay() ;
+    Display* display = wxGlobalDisplay();

     XSelectInput(display,
         RootWindowOfScreen(DefaultScreenOfDisplay(display)),
         SubstructureNotifyMask);
     XSelectInput(display,
         RootWindowOfScreen(DefaultScreenOfDisplay(display)),
         SubstructureNotifyMask);


@@ -219,7 +165,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
         {
 #if wxUSE_TIMER
             wxTimer::NotifyTimers();
         {
 #if wxUSE_TIMER
             wxTimer::NotifyTimers();

-            wxTheApp->SendIdleEvents();
+            wxTheApp->ProcessIdle();

 #endif
         }
     }
 #endif
         }
     }


@@ -266,68 +212,71 @@ bool wxReparenter::ProcessXEvent(WXEvent* event)
 
 WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
 {
 
 WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name)
 {

-  int rvalue, i;
-  Atom actualtype;
-  int actualformat;
-  unsigned long nitems, bytesafter;
-  unsigned char *propreturn;
-  Window *children;
-  unsigned int numchildren;
-  Window returnroot, returnparent;
-  Window result = 0;
-  XErrorHandler old;
-  char *clientName;
-
-  Xerror = False;
-  old = XSetErrorHandler(ErrorHandler);
-  rvalue = XGetWindowProperty((Display*) wxGetDisplay(),
-                              (Window) window, WM_STATE,
-                              0, 1, False,
-                              AnyPropertyType, &actualtype, &actualformat,
-                              &nitems, &bytesafter, &propreturn);
-  XSetErrorHandler(old);
-  if (!Xerror && rvalue == Success && actualtype != None)
-  {
-      if (rvalue == Success)
-      {
-          XFree((char *) propreturn);
-      }
-      XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName);
-
-      wxString str1(name);
-      wxString str2(clientName);
-      str1.Lower();
-      str2.Lower();
-
-      bool matches;
-      if (sm_exactMatch)
-          matches = (name == clientName);
-      else
-          matches = (str1.Contains(str2) || str2.Contains(str1));
-      
-      XFree(clientName);
-
-      if (matches)
-          return (WXWindow) window;
-      else
-          return NULL;
-  }
+    int rvalue, i;
+    Atom actualtype;
+    int actualformat;
+    unsigned long nitems, bytesafter;
+    unsigned char *propreturn;
+    Window *children;
+    unsigned int numchildren;
+    Window returnroot, returnparent;
+    Window result = 0;
+    XErrorHandler old;
+    char *clientName;
+    
+    Xerror = False;
+    old = XSetErrorHandler(ErrorHandler);
+    rvalue = XGetWindowProperty((Display*) wxGetDisplay(),
+        (Window) window, WM_STATE,
+        0, 1, False,
+        AnyPropertyType, &actualtype, &actualformat,
+        &nitems, &bytesafter, &propreturn);

 
 

-  old = XSetErrorHandler(ErrorHandler);
-  if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,
-    &children, &numchildren) || Xerror) {

     XSetErrorHandler(old);
     XSetErrorHandler(old);

-    return NULL;
-  }
-  XSetErrorHandler(old);

 
 

-  result = 0;
-  for (i=0; i<(int)numchildren && !result ;i++) {
-    result = (Window) FindAClientWindow((WXWindow) children[i], name);
-  }
-  if (numchildren) {
-    XFree((char *) children);
-  } return (WXWindow) result;
+    if (!Xerror && rvalue == Success && actualtype != None)
+    {
+        if (rvalue == Success)
+        {
+            XFree((char *) propreturn);
+        }
+        XFetchName((Display*) wxGetDisplay(), (Window) window, &clientName);
+        
+        wxString str1(name);
+        wxString str2 = wxString::FromAscii(clientName);
+        str1.Lower();
+        str2.Lower();
+        
+        bool matches;
+        if (sm_exactMatch)
+            matches = (name == wxString::FromAscii(clientName));
+        else
+            matches = (str1.Contains(str2) || str2.Contains(str1));
+        
+        XFree(clientName);
+        
+        if (matches)
+            return (WXWindow) window;
+        else
+            return NULL;
+    }
+    
+    old = XSetErrorHandler(ErrorHandler);
+    if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,
+        &children, &numchildren) || Xerror)
+    {
+        XSetErrorHandler(old);
+        return NULL;
+    }
+    XSetErrorHandler(old);
+    
+    result = 0;
+    for (i=0; i<(int)numchildren && !result ;i++) {
+        result = (Window) FindAClientWindow((WXWindow) children[i], name);
+    }
+    if (numchildren) {
+        XFree((char *) children);
+    } return (WXWindow) result;

 }
 
 #endif
 }
 
 #endif