X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89cd4125bdd6404ec7d8caf07ac364fabfd28d47..44d511ad4d37abcea6f6ba6d96f40120e310b579:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 90daa58df0..bd29c3eac5 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -26,20 +26,16 @@ #include "wx/intl.h" #include "wx/evtloop.h" #include "wx/timer.h" +#include "wx/filename.h" +#include "wx/hash.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_WX_RESOURCES - #include "wx/resource.h" -#endif - #include "wx/x11/private.h" #include @@ -57,8 +53,6 @@ wxApp *wxTheApp = 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; @@ -121,10 +115,6 @@ bool wxApp::Initialize() wxInitializeStockLists(); wxInitializeStockObjects(); -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER); @@ -136,10 +126,6 @@ bool wxApp::Initialize() void wxApp::CleanUp() { - if (g_newArgv) - delete[] g_newArgv; - g_newArgv = NULL; - delete wxWidgetHashTable; wxWidgetHashTable = NULL; delete wxClientWidgetHashTable; @@ -147,10 +133,6 @@ void wxApp::CleanUp() wxModule::CleanUpModules(); -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - delete wxTheColourDatabase; wxTheColourDatabase = NULL; @@ -197,20 +179,13 @@ int wxEntryStart( int& argc, char *argv[] ) #endif #endif // __WXDEBUG__ - wxString displayName; + char *displayName = NULL; 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 (strcmp( argv[i], "-display") == 0) { if (i < (argc - 1)) { @@ -219,16 +194,15 @@ int wxEntryStart( int& argc, char *argv[] ) continue; } } - else if (arg == wxT("-geometry")) + else if (strcmp( argv[i], "-geometry") == 0) { if (i < (argc - 1)) { i ++; - wxString windowGeometry = argv[i]; int w, h; - if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2) + if (sscanf(argv[i], "%dx%d", &w, &h) != 2) { - wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str()); + wxLogError( _("Invalid geometry specification '%s'"), wxString::FromAscii(argv[i]).c_str() ); } else { @@ -237,29 +211,22 @@ int wxEntryStart( int& argc, char *argv[] ) continue; } } - else if (arg == wxT("-sync")) + else if (strcmp( argv[i], "-sync") == 0) { syncDisplay = TRUE; continue; } - else if (arg == wxT("-iconic")) + else if (strcmp( argv[i], "-iconic") == 0) { g_showIconic = TRUE; continue; } - // Not eaten by wxWindows, so pass through - g_newArgv[g_newArgc] = argv[i]; - g_newArgc ++; } - Display* xdisplay = NULL; - if (displayName.IsEmpty()) - xdisplay = XOpenDisplay(NULL); - else - xdisplay = XOpenDisplay((char*) displayName.c_str()); - + // X11 display stuff + Display* xdisplay = XOpenDisplay( displayName ); if (!xdisplay) { wxLogError( _("wxWindows could not open display. Exiting.") ); @@ -267,16 +234,20 @@ int wxEntryStart( int& argc, char *argv[] ) } if (syncDisplay) - { XSynchronize(xdisplay, True); - } wxApp::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; @@ -315,32 +286,39 @@ int wxEntry( int argc, char *argv[] ) { printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); return 0; - }; + } wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - }; + } if (!wxTheApp) { printf( "wxWindows error: wxTheApp == NULL\n" ); return 0; - }; - - wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); - wxTheApp->SetAppName(wxFileNameFromPath(argv[0])); + } - // The command line may have been changed - // by stripping out -display etc. - if (g_newArgc > 0) + // Command line argument stuff + wxTheApp->argc = argc; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc = 0; + while (mb_argc < argc) { - wxTheApp->argc = g_newArgc; - wxTheApp->argv = g_newArgv; + wxString tmp = wxString::FromAscii( argv[mb_argc] ); + wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() ); + mb_argc++; } - else + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else + wxTheApp->argv = argv; +#endif + + if (wxTheApp->argc > 0) { - wxTheApp->argc = argc; - wxTheApp->argv = argv; + wxFileName fname( wxTheApp->argv[0] ); + wxTheApp->SetAppName( fname.GetName() ); } + wxTheApp->m_showIconic = g_showIconic; wxTheApp->m_initialSize = g_initialSize; @@ -400,19 +378,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 } @@ -557,7 +530,9 @@ bool wxApp::ProcessXEvent(WXEvent* _event) // Only erase background, paint in idle time. win->SendEraseEvents(); - // win->Update(); + + // EXPERIMENT + //win->Update(); } return TRUE; @@ -602,6 +577,9 @@ bool wxApp::ProcessXEvent(WXEvent* _event) return TRUE; keyEvent.SetEventType(wxEVT_CHAR); + // Do the translation again, retaining the ASCII + // code. + wxTranslateKeyEvent(keyEvent, win, window, event, TRUE); if (win->GetEventHandler()->ProcessEvent( keyEvent )) return TRUE; @@ -946,14 +924,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(); @@ -963,10 +941,10 @@ bool wxApp::SendIdleEvents(wxWindow* win) void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); + wxNode *node = wxPendingDelete.GetFirst(); while (node) { - wxObject *obj = (wxObject *)node->Data(); + wxObject *obj = (wxObject *)node->GetData(); delete obj; @@ -975,25 +953,7 @@ void wxApp::DeletePendingObjects() // 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; + node = wxPendingDelete.GetFirst(); } } @@ -1013,103 +973,48 @@ 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 ); + m_visualInfo = new wxXVisualInfo; + wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() ); +#endif - if (m_visualDepth > 8) - return TRUE; + return TRUE; +} - m_visualColormap = new XColor[m_visualColormapSize]; - XColor* colors = (XColor*) m_visualColormap; +#if wxUSE_UNICODE - for (int i = 0; i < m_visualColormapSize; i++) - colors[i].pixel = i; +#include +#include +#include - XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize ); +PangoContext* wxApp::GetPangoContext() +{ + static PangoContext *ret = NULL; + if (ret) + return ret; - m_colorCube = (unsigned char*)malloc(32 * 32 * 32); + Display *xdisplay = (Display*) wxApp::GetDisplay(); - for (int r = 0; r < 32; r++) +#if 1 + int xscreen = DefaultScreen(xdisplay); + static int use_xft = -1; + if (use_xft == -1) { - 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; - } - } + 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 ); - return TRUE; + if (!PANGO_IS_CONTEXT(ret)) + wxLogError( wxT("No pango context.") ); + + return ret; } +#endif WXColormap wxApp::GetMainColormap(WXDisplay* display) { @@ -1174,45 +1079,56 @@ void wxExit() bool wxApp::Yield(bool onlyIfNeeded) { - bool s_inYield = FALSE; - - if ( s_inYield ) + // Sometimes only 2 yields seem + // to do the trick, e.g. in the + // progress dialog + int i; + for (i = 0; i < 2; i++) { - if ( !onlyIfNeeded ) + bool s_inYield = FALSE; + + if ( s_inYield ) { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } - return FALSE; - } + return FALSE; + } - s_inYield = TRUE; + s_inYield = TRUE; - // Make sure we have an event loop object, - // or Pending/Dispatch will fail - wxEventLoop* eventLoop = wxEventLoop::GetActive(); - wxEventLoop* newEventLoop = NULL; - if (!eventLoop) - { - newEventLoop = new wxEventLoop; - wxEventLoop::SetActive(newEventLoop); - } + // Make sure we have an event loop object, + // or Pending/Dispatch will fail + wxEventLoop* eventLoop = wxEventLoop::GetActive(); + wxEventLoop* newEventLoop = NULL; + if (!eventLoop) + { + newEventLoop = new wxEventLoop; + wxEventLoop::SetActive(newEventLoop); + } - while (wxTheApp && wxTheApp->Pending()) + // Call dispatch at least once so that sockets + // can be tested wxTheApp->Dispatch(); + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); + #if wxUSE_TIMER - wxTimer::NotifyTimers(); + wxTimer::NotifyTimers(); #endif - ProcessIdle(); + ProcessIdle(); - if (newEventLoop) - { - wxEventLoop::SetActive(NULL); - delete newEventLoop; - } + if (newEventLoop) + { + wxEventLoop::SetActive(NULL); + delete newEventLoop; + } - s_inYield = FALSE; + s_inYield = FALSE; + } return TRUE; }