respects wxFRAME_TOOL_WINDOW for floaters, too

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a4d0c28487fba6e50022aed63f258c5591a5b364..d45ff95d4a9230ba17bff32026c146f450699902 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -17,19 +17,17 @@
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"

 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"

-#include "wx/cmdline.h"
+
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"


@@ -44,8 +42,8 @@
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#include <X11/Xresource.h>

 #include <X11/Xatom.h>
 #include <X11/Xatom.h>

+

 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif


@@ -66,14 +64,6 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 

-static const wxCmdLineEntryDesc g_cmdLineDesc[] =
-{
-    { wxCMD_LINE_SWITCH, "sync", "sync", "synchronize the display" },
-    { wxCMD_LINE_OPTION, "display", "display",  "use the given display", wxCMD_LINE_VAL_STRING },
-
-    { wxCMD_LINE_NONE }
-};
-

 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 


@@ -89,6 +79,13 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 
 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 

+// This is set within wxEntryStart -- too early on
+// to put these in wxTheApp
+static int g_newArgc = 0;
+static wxChar** g_newArgv = NULL;
+static bool g_showIconic = FALSE;
+static wxSize g_initialSize = wxDefaultSize;
+

 bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();
 bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();


@@ -119,6 +116,10 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

+    if (g_newArgv)
+        delete[] g_newArgv;
+    g_newArgv = NULL;
+

     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 


@@ -152,7 +153,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug("There were memory leaks.");

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -164,11 +165,6 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
     delete wxLog::SetActiveTarget(NULL);
 }
 

-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp
-static int g_newArgc = 0;
-static wxChar** g_newArgv = NULL;
-

 // NB: argc and argv may be changed here, pass by reference!
 int wxEntryStart( int& argc, char *argv[] )
 {
 // NB: argc and argv may be changed here, pass by reference!
 int wxEntryStart( int& argc, char *argv[] )
 {


@@ -177,26 +173,85 @@ int wxEntryStart( int& argc, char *argv[] )
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif // __WXDEBUG__
 
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif // __WXDEBUG__
 

-    /// TODO
-#if 0
-    // Parse the arguments. Is it OK to use the command line
-    // parser before calling Initialize?
-    wxCmdLineParser cmdLine(argv, argv);
-#endif
+    wxString displayName;
+    bool syncDisplay = FALSE;
+
+    // Parse the arguments.
+    // We can't use wxCmdLineParser or OnInitCmdLine and friends because
+    // we have to create the Display earlier. If we can find a way to
+    // use the wxAppBase API then I'll be quite happy to change it.
+    g_newArgv = new wxChar*[argc];
+    g_newArgc = 0;
+    int i;
+    for (i = 0; i < argc; i++)
+    {
+        wxString arg(argv[i]);
+        if (arg == wxT("-display"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                displayName = argv[i];
+                continue;
+            }
+        }
+        else if (arg == wxT("-geometry"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                wxString windowGeometry = argv[i];
+                int w, h;
+                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                {
+                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                }
+                else
+                {
+                    g_initialSize = wxSize(w, h);
+                }
+                continue;
+            }
+        }
+        else if (arg == wxT("-sync"))
+        {
+            syncDisplay = TRUE;
+            continue;
+        }
+        else if (arg == wxT("-iconic"))
+        {
+            g_showIconic = TRUE;
+
+            continue;
+        }

 
 

-    Display* xdisplay = XOpenDisplay(NULL);
+        // Not eaten by wxWindows, so pass through
+        g_newArgv[g_newArgc] = argv[i];
+        g_newArgc ++;
+    }
+
+    Display* xdisplay;
+    if (displayName.IsEmpty())
+        xdisplay = XOpenDisplay(NULL);
+    else
+        xdisplay = XOpenDisplay(displayName);

 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }
 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }

+
+    if (syncDisplay)
+    {
+        XSynchronize(xdisplay, True);
+    }

     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         
     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         

-//    wxSetDetectableAutoRepeat( TRUE );
+    wxSetDetectableAutoRepeat( TRUE );

 
     if (!wxApp::Initialize())
         return -1;
 
     if (!wxApp::Initialize())
         return -1;


@@ -204,7 +259,6 @@ int wxEntryStart( int& argc, char *argv[] )
     return 0;
 }
 
     return 0;
 }
 

-

 int wxEntryInitGui()
 {
     int retValue = 0;
 int wxEntryInitGui()
 {
     int retValue = 0;


@@ -263,6 +317,8 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp->argc = argc;
         wxTheApp->argv = argv;
     }
         wxTheApp->argc = argc;
         wxTheApp->argv = argv;
     }

+    wxTheApp->m_showIconic = g_showIconic;
+    wxTheApp->m_initialSize = g_initialSize;

 
     int retValue;
     retValue = wxEntryInitGui();
 
     int retValue;
     retValue = wxEntryInitGui();


@@ -320,6 +376,8 @@ wxApp::wxApp()
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;

+    m_showIconic = FALSE;
+    m_initialSize = wxDefaultSize;

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -350,13 +408,8 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     wxWindow* win = NULL;
     Window window = event->xany.window;
     Window actualWindow = window;
     wxWindow* win = NULL;
     Window window = event->xany.window;
     Window actualWindow = window;

-
+    

     // Find the first wxWindow that corresponds to this event window
     // Find the first wxWindow that corresponds to this event window

-    // TODO: may need to translate coordinates from actualWindow
-    // to window, if the receiving window != wxWindow window
-    //    while (window && !(win = wxGetWindowFromTable(window)))
-    //        window = wxGetWindowParent(window);
-

     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,


@@ -378,6 +431,8 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 {
                     wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
                     wxTranslateKeyEvent(keyEvent, win, window, event);
                 {
                     wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
                     wxTranslateKeyEvent(keyEvent, win, window, event);

+                    
+                    wxLogDebug( "OnKey from %s", win->GetName().c_str() );

         
                     // We didn't process wxEVT_KEY_DOWN, so send
                     // wxEVT_CHAR
         
                     // We didn't process wxEVT_KEY_DOWN, so send
                     // wxEVT_CHAR


@@ -407,15 +462,30 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
             return;
         }
             }
             return;
         }

+        case ConfigureNotify:
+        {
+            // Not clear if this is the same in NanoX
+            if (win)
+            {
+                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
+                sizeEvent.SetEventObject( win );
+                
+                win->GetEventHandler()->ProcessEvent( sizeEvent );
+            }
+        }
+#if !wxUSE_NANOX

         case PropertyNotify:
         {
             HandlePropertyChange(_event);
             return;
         }
         case ClientMessage:
         case PropertyNotify:
         {
             HandlePropertyChange(_event);
             return;
         }
         case ClientMessage:

-        {           
-            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
-            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+        {
+            if (win && !win->IsEnabled())
+                return;
+
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);

 
             if (event->xclient.message_type == wm_protocols)
             {
 
             if (event->xclient.message_type == wm_protocols)
             {


@@ -429,19 +499,9 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
             return;
         }
             }
             return;
         }

-        case ConfigureNotify:
-        {
-            if (win)
-            {
-                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
-                sizeEvent.SetEventObject( win );
-                
-                win->GetEventHandler()->ProcessEvent( sizeEvent );
-            }
-        }

         case ResizeRequest:
         {
         case ResizeRequest:
         {

-            /* Terry Gitnick <terryg@scientech.com> - 1/21/98
+            /*

             * If resize event, don't resize until the last resize event for this
             * window is recieved. Prevents flicker as windows are resized.
             */
             * If resize event, don't resize until the last resize event for this
             * window is recieved. Prevents flicker as windows are resized.
             */


@@ -453,9 +513,6 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             

-            // TODO: when implementing refresh optimization, we can use
-            // XtAddExposureToRegion to expand the window's paint region.
-

             if (win)
             {
                 wxSize sz = win->GetSize();
             if (win)
             {
                 wxSize sz = win->GetSize();


@@ -467,13 +524,55 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
             return;
         }
 
             return;
         }

+#endif
+#if wxUSE_NANOX
+        case GR_EVENT_TYPE_CLOSE_REQ:
+        {
+            if (win)
+            {
+                win->Close(FALSE);
+            }
+            break;
+        }
+#endif

         case Expose:
         {
             if (win)
             {
         case Expose:
         {
             if (win)
             {

-                // Schedule update for later

                 win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
                                               event->xexpose.width, event->xexpose.height);
                 win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
                                               event->xexpose.width, event->xexpose.height);

+                                              
+                win->GetClearRegion().Union( event->xexpose.x, event->xexpose.y,
+                                             event->xexpose.width, event->xexpose.height);
+                
+                if (event->xexpose.count == 0)
+                {
+                    // Only erase background, paint in idle time.
+                    win->SendEraseEvents();
+                }
+            }
+
+            return;
+        }
+        case GraphicsExpose:
+        {
+            if (win)
+            {
+                // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
+                //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                    
+                win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                              
+                win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                             event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                              
+                if (event->xgraphicsexpose.count == 0)
+                {
+                    // Only erase background, paint in idle time.
+                    win->SendEraseEvents();
+                }

             }
 
             return;
             }
 
             return;


@@ -484,21 +583,33 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         case ButtonRelease:
         case MotionNotify:
         {
         case ButtonRelease:
         case MotionNotify:
         {

-            if (win && !win->IsEnabled())
+            if (!win)

                 return;
                 return;

-
-            if (win)
+                
+            if (!win->IsEnabled())
+                return;
+            
+#if 1
+            if (event->type == ButtonPress)

             {
             {

-                wxMouseEvent wxevent;
-                wxTranslateMouseEvent(wxevent, win, window, event);
-                win->GetEventHandler()->ProcessEvent( wxevent );
+                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                   win->SetFocus();

             }
             }

+#endif
+
+            wxMouseEvent wxevent;
+            wxTranslateMouseEvent(wxevent, win, window, event);
+            win->GetEventHandler()->ProcessEvent( wxevent );

             return;
         }
         case FocusIn:
             {
             return;
         }
         case FocusIn:
             {

+#if !wxUSE_NANOX

                 if (win && event->xfocus.detail != NotifyPointer)
                 if (win && event->xfocus.detail != NotifyPointer)

+#endif

                 {
                 {

+                    wxLogDebug( "FocusIn from %s", win->GetName().c_str() );
+                    

                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);


@@ -507,8 +618,12 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
         case FocusOut:
             {
             }
         case FocusOut:
             {

+#if !wxUSE_NANOX

                 if (win && event->xfocus.detail != NotifyPointer)
                 if (win && event->xfocus.detail != NotifyPointer)

+#endif

                 {
                 {

+                    wxLogDebug( "FocusOut from %s", win->GetName().c_str() );
+                    

                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);
                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);


@@ -568,7 +683,7 @@ void wxApp::HandlePropertyChange(WXEvent *event)
 {
     // by default do nothing special
     // TODO: what to do for X11
 {
     // by default do nothing special
     // TODO: what to do for X11

-    // XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    // XtDispatchEvent((XEvent*) event);

 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)


@@ -667,7 +782,7 @@ void wxApp::DeletePendingObjects()
     }
 }
 
     }
 }
 

-// Create an application context
+// Create display, and other initialization

 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for
 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for


@@ -678,8 +793,8 @@ bool wxApp::OnInitGui()
     if (!wxAppBase::OnInitGui())
        return FALSE;
     
     if (!wxAppBase::OnInitGui())
        return FALSE;
     

-

     GetMainColormap( wxApp::GetDisplay() );
     GetMainColormap( wxApp::GetDisplay() );

+

     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;


@@ -703,6 +818,10 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

+    wxASSERT_MSG( window, "invalid window" );
+    
+    return (Window) 0;
+

     Window parent, root = 0;
     unsigned int noChildren = 0;
     Window* children = NULL;
     Window parent, root = 0;
     unsigned int noChildren = 0;
     Window* children = NULL;


@@ -756,39 +875,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-#undef static
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+wxIcon wxApp::GetStdIcon(int which) const

 {
 {

-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-
-        default:
-            wxFAIL_MSG("requested non existent standard icon");
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);

 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)