compilation fix after last check in

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 743577430e7225c8a2c57cfc7e11f8252756b4e4..7602f5821f0a268f806d94fb6129dad0fdee3fcb 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 


@@ -32,8 +32,6 @@
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 

-#define ABS(a)    (((a) < 0) ? -(a) : (a))
-

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


@@ -51,10 +49,6 @@ extern wxList wxPendingDelete;
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 wxHashTable *wxClientWidgetHashTable = NULL;
 

-wxApp *wxTheApp = NULL;
-
-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp

 static bool g_showIconic = FALSE;
 static wxSize g_initialSize = wxDefaultSize;
 
 static bool g_showIconic = FALSE;
 static wxSize g_initialSize = wxDefaultSize;
 


@@ -94,277 +88,136 @@ WXDisplay *wxApp::ms_display = NULL;
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

-    EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxAppBase::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-bool wxApp::Initialize()
-{
-    wxClassInfo::InitializeClasses();
-
-#if wxUSE_INTL
-    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-
-    // GL: I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.
-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-
-    return TRUE;
-}
-
-void wxApp::CleanUp()
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-    delete wxClientWidgetHashTable;
-    wxClientWidgetHashTable = NULL;
-
-    wxModule::CleanUpModules();
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxDeleteStockObjects();
-
-    wxDeleteStockLists();
-
-    delete wxTheApp;
-    wxTheApp = NULL;
-
-    wxClassInfo::CleanUpClasses();
-
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug("There were memory leaks.");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif
-
-    // do it as the very last thing because everything else can log messages
-    wxLog::DontCreateOnDemand();
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
-}
-
-// NB: argc and argv may be changed here, pass by reference!
-int wxEntryStart( int& argc, char *argv[] )
-{
-#ifdef __WXDEBUG__
-#if !wxUSE_NANOX
+#if defined(__WXDEBUG__) && !wxUSE_NANOX

     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );

-#endif

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

-    char *displayName = NULL;
+    wxString displayName;

     bool syncDisplay = FALSE;
 
     bool syncDisplay = FALSE;
 

-    int i;
-    for (i = 0; i < argc; i++)
+    int argcOrig = argc;
+    for ( int i = 0; i < argcOrig; i++ )

     {
     {

-        if (strcmp( argv[i], "-display") == 0)
+        if (wxStrcmp( argv[i], _T("-display") ) == 0)

         {
             if (i < (argc - 1))
             {
         {
             if (i < (argc - 1))
             {

-                i ++;
+                argv[i++] = NULL;
+

                 displayName = argv[i];
                 displayName = argv[i];

-                continue;
+
+                argv[i] = NULL;
+                argc -= 2;

             }
         }
             }
         }

-        else if (strcmp( argv[i], "-geometry") == 0)
+        else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)

         {
             if (i < (argc - 1))
             {
         {
             if (i < (argc - 1))
             {

-                i ++;
+                argv[i++] = NULL;
+

                 int w, h;
                 int w, h;

-                if (sscanf(argv[i], "%dx%d", &w, &h) != 2)
+                if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)

                 {
                 {

-                    wxLogError( _("Invalid geometry specification '%s'"), wxString::FromAscii(argv[i]).c_str() );
+                    wxLogError( _("Invalid geometry specification '%s'"),
+                                wxString(argv[i]).c_str() );

                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }
                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }

-                continue;
+
+                argv[i] = NULL;
+                argc -= 2;

             }
         }
             }
         }

-        else if (strcmp( argv[i], "-sync") == 0)
+        else if (wxStrcmp( argv[i], _T("-sync") ) == 0)

         {
             syncDisplay = TRUE;
         {
             syncDisplay = TRUE;

-            continue;
+
+            argv[i] = NULL;
+            argc--;

         }
         }

-        else if (strcmp( argv[i], "-iconic") == 0)
+        else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)

         {
             g_showIconic = TRUE;
 
         {
             g_showIconic = TRUE;
 

-            continue;
+            argv[i] = NULL;
+            argc--;

         }
         }

+    }

 
 

+    if ( argc != argcOrig )
+    {
+        // remove the argumens we consumed
+        for ( int i = 0; i < argc; i++ )
+        {
+            while ( !argv[i] )
+            {
+                memmove(argv + i, argv + i + 1, argcOrig - i);
+            }
+        }

     }
 
     // X11 display stuff
     }
 
     // X11 display stuff

-    Display* xdisplay = XOpenDisplay( displayName );
+    Display *xdisplay;
+    if ( displayName.empty() )
+        xdisplay = XOpenDisplay( NULL );
+    else
+        xdisplay = XOpenDisplay( displayName.ToAscii() );

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

-        return -1;
+        return false;

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

-    wxApp::ms_display = (WXDisplay*) xdisplay;
+    ms_display = (WXDisplay*) xdisplay;

 
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
 
     // Misc.
     wxSetDetectableAutoRepeat( TRUE );
 
 
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
 
     // Misc.
     wxSetDetectableAutoRepeat( TRUE );
 

-#if wxUSE_UNICODE
-    // Glib's type system required by Pango
-    g_type_init();
-#endif
-
-    if (!wxApp::Initialize())
-        return -1;
-
-    return 0;
-}
-
-int wxEntryInitGui()
-{
-    int retValue = 0;
-
-    if ( !wxTheApp->OnInitGui() )
-        retValue = -1;
-
-    return retValue;
-}
-
-
-int wxEntry( int argc, char *argv[] )
-{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
-#endif
-    int err = wxEntryStart(argc, argv);
-    if (err)
-        return err;
-
-    if (!wxTheApp)
+    if ( !wxAppBase::Initialize(argc, argv) )

     {
     {

-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        }
+        XCloseDisplay(xdisplay);

 
 

-        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
+        return false;

     }
 
     }
 

-    if (!wxTheApp)
-    {
-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    }
-
-    // Command line argument stuff
-    wxTheApp->argc = argc;

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxTheApp->argv = new wxChar*[argc+1];
-    int mb_argc = 0;
-    while (mb_argc < argc)
-    {
-        wxString tmp = wxString::FromAscii( argv[mb_argc] );
-        wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() );
-        mb_argc++;
-    }
-    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
-    wxTheApp->argv = argv;
+    // Glib's type system required by Pango
+    g_type_init();

 #endif
 
 #endif
 

-    if (wxTheApp->argc > 0)
-    {
-        wxFileName fname( wxTheApp->argv[0] );
-        wxTheApp->SetAppName( fname.GetName() );
-    }
-
-    wxTheApp->m_showIconic = g_showIconic;
-    wxTheApp->m_initialSize = g_initialSize;
-
-    int retValue;
-    retValue = wxEntryInitGui();
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-    if ( retValue == 0 )
-    {
-        if ( !wxTheApp->OnInit() )
-            retValue = -1;
-    }
-
-    if ( retValue == 0 )
-    {
-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-    }
-
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-    // for further messages
-
-    if (wxTheApp->GetTopWindow())
-    {
-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
-    }
-
-    wxTheApp->DeletePendingObjects();
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-    wxTheApp->OnExit();
+    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);

 
 

-    wxApp::CleanUp();
+    return true;
+}

 
 

-    return retValue;
-};
+void wxApp::CleanUp()
+{
+    delete wxWidgetHashTable;
+    wxWidgetHashTable = NULL;
+    delete wxClientWidgetHashTable;
+    wxClientWidgetHashTable = NULL;

 
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+    wxAppBase::CleanUp();
+}

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {


@@ -380,19 +233,14 @@ wxApp::wxApp()
     m_initialSize = wxDefaultSize;
 
 #if !wxUSE_NANOX
     m_initialSize = wxDefaultSize;
 
 #if !wxUSE_NANOX

-    m_visualColormap = NULL;
-    m_colorCube = NULL;
+    m_visualInfo = NULL;

 #endif
 }
 
 wxApp::~wxApp()
 {
 #if !wxUSE_NANOX
 #endif
 }
 
 wxApp::~wxApp()
 {
 #if !wxUSE_NANOX

-    if (m_colorCube)
-        free( m_colorCube );
-
-    if (m_visualColormap)
-        delete [] (XColor*)m_visualColormap;
+    delete m_visualInfo;

 #endif
 }
 
 #endif
 }
 


@@ -828,18 +676,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
     return FALSE;
 }
 
     return FALSE;
 }
 

-// Returns TRUE if more time is needed.
-// Note that this duplicates wxEventLoopImpl::SendIdleEvent
-// but ProcessIdle may be needed by apps, so is kept.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-
-    return event.MoreRequested();
-}
-

 void wxApp::ExitMainLoop()
 {
     if (m_mainLoop)
 void wxApp::ExitMainLoop()
 {
     if (m_mainLoop)


@@ -868,120 +704,14 @@ bool wxApp::HandlePropertyChange(WXEvent *event)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::WakeUpIdle()

 {
 {

-    static bool s_inOnIdle = FALSE;
-
-    // Avoid recursion (via ProcessEvent default case)
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    // Resend in the main thread events which have been prepared in other
-    // threads
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close()
-    DeletePendingObjects();
-
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
-
-    if (needMore)
-        event.RequestMore(TRUE);
+    // TODO: use wxMotif implementation?

 
 

-    s_inOnIdle = FALSE;
-}
-
-void wxWakeUpIdle()
-{
-    // **** please implement me! ****

     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 
     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
-
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->GetEventHandler()->ProcessEvent(event);
-
-    if (event.MoreRequested())
-        needMore = TRUE;
-
-    wxWindowListNode* node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }
-
-    win->OnInternalIdle();
-
-    return needMore;
-}
-
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = (wxObject *)node->GetData();
-
-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
-            delete node;
-
-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.GetFirst();
-    }
-}
-
-static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec )
-{
-  *shift = 0;
-  *prec = 0;
-
-  while (!(mask & 0x1))
-    {
-      (*shift)++;
-      mask >>= 1;
-    }
-
-  while (mask & 0x1)
-    {
-      (*prec)++;
-      mask >>= 1;
-    }
-}
-

 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {
 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {


@@ -998,99 +728,8 @@ bool wxApp::OnInitGui()
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
 #if !wxUSE_NANOX
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
 #if !wxUSE_NANOX

-    // Get info about the current visual. It is enough
-    // to do this once here unless we support different
-    // visuals, displays and screens. Given that wxX11
-    // mostly for embedded things, that is no real
-    // limitation.
-    Display *xdisplay = (Display*) wxApp::GetDisplay();
-    int xscreen = DefaultScreen(xdisplay);
-    Visual* xvisual = DefaultVisual(xdisplay,xscreen);
-    int xdepth = DefaultDepth(xdisplay, xscreen);
-
-    XVisualInfo vinfo_template;
-    vinfo_template.visual = xvisual;
-    vinfo_template.visualid = XVisualIDFromVisual( xvisual );
-    vinfo_template.depth = xdepth;
-
-    int nitem = 0;
-    XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
-    wxASSERT_MSG( vi, wxT("No visual info") );
-
-    m_visualType = vi->visual->c_class;
-    m_visualScreen = vi->screen;
-
-    m_visualRedMask = vi->red_mask;
-    m_visualGreenMask = vi->green_mask;
-    m_visualBlueMask = vi->blue_mask;
-
-    if (m_visualType != GrayScale && m_visualType != PseudoColor)
-    {
-        wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
-        wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
-        wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
-    }
-
-    m_visualDepth = xdepth;
-    if (xdepth == 16)
-        xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;
-
-    m_visualColormapSize = vi->colormap_size;
-
-    XFree( vi );
-
-    if (m_visualDepth > 8)
-        return TRUE;
-
-    m_visualColormap = new XColor[m_visualColormapSize];
-    XColor* colors = (XColor*) m_visualColormap;
-
-    for (int i = 0; i < m_visualColormapSize; i++)
-           colors[i].pixel = i;
-
-    XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );
-
-    m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
-
-    for (int r = 0; r < 32; r++)
-    {
-        for (int g = 0; g < 32; g++)
-        {
-            for (int b = 0; b < 32; b++)
-            {
-                int rr = (r << 3) | (r >> 2);
-                int gg = (g << 3) | (g >> 2);
-                int bb = (b << 3) | (b >> 2);
-
-                int index = -1;
-
-                if (colors)
-                {
-                    int max = 3 * 65536;
-
-                    for (int i = 0; i < m_visualColormapSize; i++)
-                    {
-                        int rdiff = ((rr << 8) - colors[i].red);
-                        int gdiff = ((gg << 8) - colors[i].green);
-                        int bdiff = ((bb << 8) - colors[i].blue);
-                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                        if (sum < max)
-                        {
-                            index = i; max = sum;
-                        }
-                    }
-                }
-                else
-                {
-                    // assume 8-bit true or static colors. this really exists
-                    index = (r >> (5 - m_visualRedPrec)) << m_visualRedShift;
-                    index |= (g >> (5 - m_visualGreenPrec)) << m_visualGreenShift;
-                    index |= (b >> (5 - m_visualBluePrec)) << m_visualBlueShift;
-                }
-                m_colorCube[ (r*1024) + (g*32) + b ] = index;
-            }
-        }
-    }
+    m_visualInfo = new wxXVisualInfo;
+    wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() );

 #endif
 
     return TRUE;
 #endif
 
     return TRUE;


@@ -1150,7 +789,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

-    wxASSERT_MSG( window, "invalid window" );
+    wxASSERT_MSG( window, _T("invalid window") );

 
     return (Window) 0;
 
 
     return (Window) 0;
 


@@ -1177,18 +816,11 @@ Window wxGetWindowParent(Window window)
         return (Window) 0;
 }
 
         return (Window) 0;
 }
 

-void wxExit()
+void wxApp::Exit()

 {
 {

-    int retValue = 0;
-    if (wxTheApp)
-        retValue = wxTheApp->OnExit();
-

     wxApp::CleanUp();
     wxApp::CleanUp();

-    /*
-    * Exit in some platform-specific way. Not recommended that the app calls this:
-    * only for emergencies.
-    */
-    exit(retValue);
+
+    wxAppConsole::Exit();

 }
 
 // Yield to other processes
 }
 
 // Yield to other processes