X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed39ff57b30a70a2395e07887a70bc01e7a3b7ec..865864592a01250b4ed807773890797fe481ae49:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 5c2371a2bb..87fcdb4ea1 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -32,16 +32,10 @@ #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_WX_RESOURCES - #include "wx/resource.h" -#endif - #include "wx/x11/private.h" #include @@ -55,10 +49,6 @@ extern wxList wxPendingDelete; 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; @@ -101,282 +91,129 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) 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(); - -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - - wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - return TRUE; -} - -void wxApp::CleanUp() -{ - delete wxWidgetHashTable; - wxWidgetHashTable = NULL; - delete wxClientWidgetHashTable; - wxClientWidgetHashTable = NULL; - - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - 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[] ) +bool wxApp::Initialize(int& argc, wxChar **argv) { -#ifdef __WXDEBUG__ -#if !wxUSE_NANOX +#if defined(__WXDEBUG__) && !wxUSE_NANOX // install the X error handler gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); -#endif #endif // __WXDEBUG__ char *displayName = NULL; 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)) { - i ++; + argv[i++] = NULL; + 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)) { - i ++; + argv[i++] = NULL; + 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::FromAscii(argv[i]).c_str() ); } 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; - continue; + + argv[i] = NULL; + argc--; } - else if (strcmp( argv[i], "-iconic") == 0) + else if (wxStrcmp( argv[i], _T("-iconic") ) == 0) { 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 - Display* xdisplay = XOpenDisplay( displayName ); + // X11 display stuff + Display *xdisplay = XOpenDisplay( displayName ); if (!xdisplay) { wxLogError( _("wxWindows could not open display. Exiting.") ); - return -1; + return false; } if (syncDisplay) XSynchronize(xdisplay, True); - wxApp::ms_display = (WXDisplay*) xdisplay; - + ms_display = (WXDisplay*) xdisplay; + 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; - } - - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - } + XCloseDisplay(xdisplay); - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; + return false; } - // Command line argument stuff - wxTheApp->argc = argc; #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 - 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() { @@ -392,19 +229,14 @@ wxApp::wxApp() m_initialSize = wxDefaultSize; #if !wxUSE_NANOX - m_visualColormap = NULL; - m_colorCube = NULL; + m_visualInfo = NULL; #endif } wxApp::~wxApp() { #if !wxUSE_NANOX - if (m_colorCube) - free( m_colorCube ); - - if (m_visualColormap) - delete [] (XColor*)m_visualColormap; + delete m_visualInfo; #endif } @@ -549,7 +381,9 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // Only erase background, paint in idle time. win->SendEraseEvents(); - // win->Update(); + + // EXPERIMENT + //win->Update(); } return TRUE; @@ -847,6 +681,8 @@ bool wxApp::ProcessIdle() event.SetEventObject(this); ProcessEvent(event); + wxUpdateUIEvent::ResetUpdateTime(); + return event.MoreRequested(); } @@ -904,9 +740,10 @@ void wxApp::OnIdle(wxIdleEvent& event) s_inOnIdle = FALSE; } -void wxWakeUpIdle() +void wxApp::WakeUpIdle() { - // **** please implement me! **** + // TODO: use wxMotif implementation? + // Wake up the idle handler processor, even if it is in another thread... } @@ -941,14 +778,14 @@ bool wxApp::SendIdleEvents(wxWindow* win) if (event.MoreRequested()) needMore = TRUE; - wxNode* node = win->GetChildren().First(); + wxWindowListNode* node = win->GetChildren().GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = (wxWindow*) node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } win->OnInternalIdle(); @@ -956,42 +793,6 @@ bool wxApp::SendIdleEvents(wxWindow* win) return needMore; } -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - 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.First(); - } -} - -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() { @@ -1008,99 +809,8 @@ bool wxApp::OnInitGui() 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; @@ -1117,9 +827,9 @@ PangoContext* wxApp::GetPangoContext() static PangoContext *ret = NULL; if (ret) return ret; - + Display *xdisplay = (Display*) wxApp::GetDisplay(); - + #if 1 int xscreen = DefaultScreen(xdisplay); static int use_xft = -1; @@ -1128,16 +838,16 @@ PangoContext* wxApp::GetPangoContext() wxString val = wxGetenv( L"GDK_USE_XFT" ); use_xft = (val == L"1"); } - + if (use_xft) ret = pango_xft_get_context( xdisplay, xscreen ); else #endif ret = pango_x_get_context( xdisplay ); - + if (!PANGO_IS_CONTEXT(ret)) wxLogError( wxT("No pango context.") ); - + return ret; } #endif @@ -1187,18 +897,11 @@ Window wxGetWindowParent(Window window) return (Window) 0; } -void wxExit() +void wxApp::Exit() { - int retValue = 0; - if (wxTheApp) - retValue = wxTheApp->OnExit(); - 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 @@ -1238,7 +941,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // Call dispatch at least once so that sockets // can be tested wxTheApp->Dispatch(); - + while (wxTheApp && wxTheApp->Pending()) wxTheApp->Dispatch();