fixing osx_carbon

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

diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp
index bbeedaea5dbeb4fb68b4d0c36efacfe59d091c1f..ff976cd946f0d79abe936bf9854a6e9fec89e5a5 100644 (file)
--- a/src/x11/reparent.cpp
+++ b/src/x11/reparent.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        reparent.cpp
+// Name:        src/x11/reparent.cpp

 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:


@@ -9,6 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+#pragma hdrstop
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -17,72 +24,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "reparent.h"
-#endif
+#if !wxUSE_NANOX

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

-#if !wxUSE_NANOX
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/timer.h"
+#endif

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

-#include "wx/log.h"
-#include "wx/app.h"
-#include "wx/timer.h"

 
 #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.
-
-*/
+#include "wx/generic/private/timer.h"

 
 /*
  * wxAdoptedWindow
 
 /*
  * wxAdoptedWindow


@@ -100,23 +57,23 @@ wxAdoptedWindow::wxAdoptedWindow(WXWindow window)
 wxAdoptedWindow::~wxAdoptedWindow()
 {
 }
 wxAdoptedWindow::~wxAdoptedWindow()
 {
 }

+

 /*
  * wxReparenter
  */
 
 static bool Xerror;
 static Atom WM_STATE = 0;
 /*
  * wxReparenter
  */
 
 static bool Xerror;
 static Atom WM_STATE = 0;

-bool wxReparenter::sm_done = FALSE;
+bool wxReparenter::sm_done = false;

 wxAdoptedWindow* wxReparenter::sm_toReparent = NULL;
 wxWindow* wxReparenter::sm_newParent = NULL;
 wxString wxReparenter::sm_name;
 wxAdoptedWindow* wxReparenter::sm_toReparent = NULL;
 wxWindow* wxReparenter::sm_newParent = NULL;
 wxString wxReparenter::sm_name;

-bool wxReparenter::sm_exactMatch = FALSE;
+bool wxReparenter::sm_exactMatch = false;

 
 

-static int
-ErrorHandler(Display* dpy, XErrorEvent* event)
+static int ErrorHandler(Display* WXUNUSED(dpy), XErrorEvent* WXUNUSED(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


@@ -132,17 +89,17 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
 
     old = XSetErrorHandler(ErrorHandler);
     XReparentWindow( wxGlobalDisplay(),
 
     old = XSetErrorHandler(ErrorHandler);
     XReparentWindow( wxGlobalDisplay(),

-                     (Window) toReparent->GetMainWindow(),
-                     (Window) newParent->GetMainWindow(),
+                     (Window) toReparent->X11GetMainWindow(),
+                     (Window) newParent->X11GetMainWindow(),

                      0, 0);
 
     if (!XQueryTree( wxGlobalDisplay(),
                      0, 0);
 
     if (!XQueryTree( wxGlobalDisplay(),

-                     (Window) toReparent->GetMainWindow(),
+                     (Window) toReparent->X11GetMainWindow(),

                      &returnroot, &returnparent,
                      &children, &numchildren) || Xerror)
     {
         XSetErrorHandler(old);
                      &returnroot, &returnparent,
                      &children, &numchildren) || Xerror)
     {
         XSetErrorHandler(old);

-        return TRUE;
+        return true;

     }
 
     if (numchildren > 0)
     }
 
     if (numchildren > 0)


@@ -166,17 +123,17 @@ bool wxReparenter::Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent)
               "Reparenting child at offset %d and position %d, %d.\n",
                parentOffset, parentOffset+xwa.x, parentOffset+xwa.y);
             XReparentWindow( wxGlobalDisplay(),
               "Reparenting child at offset %d and position %d, %d.\n",
                parentOffset, parentOffset+xwa.x, parentOffset+xwa.y);
             XReparentWindow( wxGlobalDisplay(),

-                             children[each], (Window) newParent->GetMainWindow(),
+                             children[each], (Window) newParent->X11GetMainWindow(),

                              xwa.x, xwa.y);
         }
     }
 
     XSetErrorHandler(old);
                              xwa.x, xwa.y);
         }
     }
 
     XSetErrorHandler(old);

-    return TRUE;
+    return true;

 }
 
 // Wait for an appropriate window to be created.
 }
 
 // Wait for an appropriate window to be created.

-// If exactMatch is FALSE, a substring match is OK.
+// If exactMatch is false, a substring match is OK.

 // If windowName is empty, then wait for the next overrideRedirect window.
 bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent,
                                    const wxString& windowName,
 // If windowName is empty, then wait for the next overrideRedirect window.
 bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent,
                                    const wxString& windowName,


@@ -186,7 +143,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
     sm_toReparent = toReparent;
     sm_exactMatch = exactMatch;
     sm_name = windowName;
     sm_toReparent = toReparent;
     sm_exactMatch = exactMatch;
     sm_name = windowName;

-    
+

     Display* display = wxGlobalDisplay();
     XSelectInput(display,
         RootWindowOfScreen(DefaultScreenOfDisplay(display)),
     Display* display = wxGlobalDisplay();
     XSelectInput(display,
         RootWindowOfScreen(DefaultScreenOfDisplay(display)),


@@ -195,12 +152,7 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
     if (!WM_STATE)
         WM_STATE = XInternAtom(display, "WM_STATE", False);
 
     if (!WM_STATE)
         WM_STATE = XInternAtom(display, "WM_STATE", False);
 

-#ifdef __WXDEBUG__
-    if (!windowName.IsEmpty())
-        wxLogDebug(_T("Waiting for window %s"), windowName.c_str());
-#endif
-    
-    sm_done = FALSE;
+    sm_done = false;

 
     wxEventLoop eventLoop;
     while (!sm_done)
 
     wxEventLoop eventLoop;
     while (!sm_done)


@@ -218,12 +170,12 @@ bool wxReparenter::WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toRepar
         else
         {
 #if wxUSE_TIMER
         else
         {
 #if wxUSE_TIMER

-            wxTimer::NotifyTimers();
-            wxTheApp->SendIdleEvents();
+            wxGenericTimerImpl::NotifyTimers();
+            wxTheApp->ProcessIdle();

 #endif
         }
     }
 #endif
         }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxReparenter::ProcessXEvent(WXEvent* event)
 }
 
 bool wxReparenter::ProcessXEvent(WXEvent* event)


@@ -235,15 +187,15 @@ bool wxReparenter::ProcessXEvent(WXEvent* event)
     {
         if (xevent->type == MapNotify)
         {
     {
         if (xevent->type == MapNotify)
         {

-            wxLogDebug(_T("Window was mapped"));
+            wxLogDebug(wxT("Window was mapped"));

         }
         }

-        
+

         if (xevent->type == MapNotify && !xevent->xmap.override_redirect &&
             (client = (Window) FindAClientWindow((WXWindow) xevent->xmap.window, sm_name)))
         {
         if (xevent->type == MapNotify && !xevent->xmap.override_redirect &&
             (client = (Window) FindAClientWindow((WXWindow) xevent->xmap.window, sm_name)))
         {

-            wxLogDebug(_T("Found a client window, about to reparent"));
+            wxLogDebug(wxT("Found a client window, about to reparent"));

             wxASSERT(sm_toReparent->GetParent() == NULL);
             wxASSERT(sm_toReparent->GetParent() == NULL);

-            
+

             sm_toReparent->SetHandle((WXWindow) client);
             sm_newParent->AddChild(sm_toReparent);
             sm_done = Reparent(sm_newParent, sm_toReparent);
             sm_toReparent->SetHandle((WXWindow) client);
             sm_newParent->AddChild(sm_toReparent);
             sm_done = Reparent(sm_newParent, sm_toReparent);


@@ -252,82 +204,85 @@ bool wxReparenter::ProcessXEvent(WXEvent* event)
                    xevent->xmap.override_redirect &&
                    xevent->xmap.window)
         {
                    xevent->xmap.override_redirect &&
                    xevent->xmap.window)
         {

-            wxLogDebug(_T("Found an override redirect window, about to reparent"));
+            wxLogDebug(wxT("Found an override redirect window, about to reparent"));

             sm_toReparent->SetHandle((WXWindow) xevent->xmap.window);
             sm_newParent->AddChild(sm_toReparent);
             wxASSERT(sm_toReparent->GetParent() == NULL);
             sm_toReparent->SetHandle((WXWindow) xevent->xmap.window);
             sm_newParent->AddChild(sm_toReparent);
             wxASSERT(sm_toReparent->GetParent() == NULL);

-            
+

             sm_done = Reparent(sm_newParent, sm_toReparent);
             return sm_done;
         }
     }
             sm_done = Reparent(sm_newParent, sm_toReparent);
             return sm_done;
         }
     }

-    return FALSE;
+    return false;

 }
 
 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;
-  }
-
-  old = XSetErrorHandler(ErrorHandler);
-  if (!XQueryTree((Display*) wxGetDisplay(), (Window) window, &returnroot, &returnparent,
-    &children, &numchildren) || Xerror) {
+    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 = 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);
     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;
+
+    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 // !wxUSE_NANOX