X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e4501ee3cc88ee8dd2b75e2964118e2897ec4a2..55e18dbe2faca047b2008734782d52a6eb140115:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 511b5fb034..bd29c3eac5 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -25,6 +25,9 @@ #include "wx/log.h" #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" @@ -33,36 +36,36 @@ #include "wx/thread.h" #endif -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#include -#include - -#ifdef __VMS__ -#pragma message enable nosimpint -#endif - #include "wx/x11/private.h" #include +//------------------------------------------------------------------------ +// global data +//------------------------------------------------------------------------ + extern wxList wxPendingDelete; +wxHashTable *wxWidgetHashTable = NULL; +wxHashTable *wxClientWidgetHashTable = NULL; + wxApp *wxTheApp = NULL; -wxHashTable *wxWidgetHashTable = NULL; +// This is set within wxEntryStart -- too early on +// to put these in wxTheApp +static bool g_showIconic = FALSE; +static wxSize g_initialSize = wxDefaultSize; -IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) +// This is required for wxFocusEvent::SetWindow(). It will only +// work for focus events which we provoke ourselves (by calling +// SetFocus()). It will not work for those events, which X11 +// generates itself. +static wxWindow *g_nextFocus = NULL; +static wxWindow *g_prevFocus = NULL; -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() +//------------------------------------------------------------------------ +// X11 error handling +//------------------------------------------------------------------------ #ifdef __WXDEBUG__ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); @@ -72,24 +75,34 @@ XErrorHandlerFunc gs_pfnXErrorHandler = 0; static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) { // just forward to the default handler for now - return gs_pfnXErrorHandler(dpy, xevent); + if (gs_pfnXErrorHandler) + return gs_pfnXErrorHandler(dpy, xevent); + else + return 0; } #endif // __WXDEBUG__ +//------------------------------------------------------------------------ +// wxApp +//------------------------------------------------------------------------ + 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; +IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) + +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 @@ -102,11 +115,8 @@ bool wxApp::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; @@ -116,24 +126,18 @@ bool wxApp::Initialize() void wxApp::CleanUp() { - if (g_newArgv) - delete[] g_newArgv; - g_newArgv = NULL; - delete wxWidgetHashTable; wxWidgetHashTable = NULL; + delete wxClientWidgetHashTable; + wxClientWidgetHashTable = NULL; wxModule::CleanUpModules(); -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - delete wxTheColourDatabase; wxTheColourDatabase = NULL; wxDeleteStockObjects(); - + wxDeleteStockLists(); delete wxTheApp; @@ -169,24 +173,19 @@ void wxApp::CleanUp() int wxEntryStart( int& argc, char *argv[] ) { #ifdef __WXDEBUG__ +#if !wxUSE_NANOX // install the X error handler gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); +#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)) { @@ -195,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 { @@ -213,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; - if (displayName.IsEmpty()) - xdisplay = XOpenDisplay(NULL); - else - xdisplay = XOpenDisplay(displayName); - + // X11 display stuff + Display* xdisplay = XOpenDisplay( displayName ); if (!xdisplay) { wxLogError( _("wxWindows could not open display. Exiting.") ); @@ -243,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; @@ -291,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; @@ -364,20 +366,27 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; + // TODO: parse the command line argc = 0; argv = NULL; - m_exitOnFrameDelete = TRUE; + m_mainColormap = (WXColormap) NULL; m_topLevelWidget = (WXWindow) NULL; m_maxRequestSize = 0; m_mainLoop = NULL; m_showIconic = FALSE; m_initialSize = wxDefaultSize; + +#if !wxUSE_NANOX + m_visualInfo = NULL; +#endif +} + +wxApp::~wxApp() +{ +#if !wxUSE_NANOX + delete m_visualInfo; +#endif } bool wxApp::Initialized() @@ -390,7 +399,7 @@ bool wxApp::Initialized() int wxApp::MainLoop() { - int rt; + int rt; m_mainLoop = new wxEventLoop; rt = m_mainLoop->Run(); @@ -400,15 +409,55 @@ int wxApp::MainLoop() return rt; } -// Processes an X event. -void wxApp::ProcessXEvent(WXEvent* _event) +#if !wxUSE_NANOX +//----------------------------------------------------------------------- +// X11 predicate function for exposure compression +//----------------------------------------------------------------------- + +struct wxExposeInfo +{ + Window window; + Bool found_non_matching; +}; + +static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) +{ + wxExposeInfo *info = (wxExposeInfo*) arg; + + if (info->found_non_matching) + return FALSE; + + if (xevent->xany.type != Expose) + { + info->found_non_matching = TRUE; + return FALSE; + } + + if (xevent->xexpose.window != info->window) + { + info->found_non_matching = TRUE; + return FALSE; + } + + return TRUE; +} +#endif + // wxUSE_NANOX + +//----------------------------------------------------------------------- +// Processes an X event, returning TRUE if the event was processed. +//----------------------------------------------------------------------- + +bool wxApp::ProcessXEvent(WXEvent* _event) { XEvent* event = (XEvent*) _event; wxWindow* win = NULL; - Window window = event->xany.window; + Window window = XEventGetWindow(event); +#if 0 Window actualWindow = window; - +#endif + // Find the first wxWindow that corresponds to this event window // Because we're receiving events after a window // has been destroyed, assume a 1:1 match between @@ -417,72 +466,187 @@ void wxApp::ProcessXEvent(WXEvent* _event) win = wxGetWindowFromTable(window); if (!win) - return; + { +#if wxUSE_TWO_WINDOWS + win = wxGetClientWindowFromTable(window); + if (!win) +#endif + return FALSE; + } + +#ifdef __WXDEBUG__ + wxString windowClass = win->GetClassInfo()->GetClassName(); +#endif switch (event->type) { - case KeyPress: + case Expose: { - if (win && !win->IsEnabled()) - return; - +#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX + if (event->xexpose.window != (Window)win->GetClientAreaWindow()) { - if (win) + XEvent tmp_event; + wxExposeInfo info; + info.window = event->xexpose.window; + info.found_non_matching = FALSE; + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) { - 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 - if (!win->GetEventHandler()->ProcessEvent( keyEvent )) - { - keyEvent.SetEventType(wxEVT_CHAR); - win->GetEventHandler()->ProcessEvent( keyEvent ); - } + // Don't worry about optimizing redrawing the border etc. + } + win->NeedUpdateNcAreaInIdle(); + } + else +#endif + { + win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event), + XExposeEventGetWidth(event), XExposeEventGetHeight(event)); + win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event), + XExposeEventGetWidth(event), XExposeEventGetHeight(event)); - // We intercepted and processed the key down event - return; +#if !wxUSE_NANOX + XEvent tmp_event; + wxExposeInfo info; + info.window = event->xexpose.window; + info.found_non_matching = FALSE; + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + { + win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y, + tmp_event.xexpose.width, tmp_event.xexpose.height ); + + win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y, + tmp_event.xexpose.width, tmp_event.xexpose.height ); } +#endif + + // This simplifies the expose and clear areas to simple + // rectangles. + win->GetUpdateRegion() = win->GetUpdateRegion().GetBox(); + win->GetClearRegion() = win->GetClearRegion().GetBox(); + + // If we only have one X11 window, always indicate + // that borders might have to be redrawn. + if (win->GetMainWindow() == win->GetClientAreaWindow()) + win->NeedUpdateNcAreaInIdle(); + + // Only erase background, paint in idle time. + win->SendEraseEvents(); + + // EXPERIMENT + //win->Update(); } - return; + + return TRUE; } - case KeyRelease: + +#if !wxUSE_NANOX + case GraphicsExpose: { - if (win && !win->IsEnabled()) - return; + printf( "GraphicExpose event\n" ); - if (win) + wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str()); + + 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) { - wxKeyEvent keyEvent(wxEVT_KEY_UP); - wxTranslateKeyEvent(keyEvent, win, window, event); - - win->GetEventHandler()->ProcessEvent( keyEvent ); + // Only erase background, paint in idle time. + win->SendEraseEvents(); + // win->Update(); } - return; + + return TRUE; + } +#endif + + case KeyPress: + { + if (!win->IsEnabled()) + return FALSE; + + 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 + if (win->GetEventHandler()->ProcessEvent( keyEvent )) + 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; + + if ( (keyEvent.m_keyCode == WXK_TAB) && + win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) + { + wxNavigationKeyEvent new_event; + new_event.SetEventObject( win->GetParent() ); + /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ + new_event.SetDirection( (keyEvent.m_keyCode == WXK_TAB) ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + new_event.SetWindowChange( keyEvent.ControlDown() ); + new_event.SetCurrentFocus( win ); + return win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); + } + + return FALSE; + } + case KeyRelease: + { + if (!win->IsEnabled()) + return FALSE; + + wxKeyEvent keyEvent(wxEVT_KEY_UP); + wxTranslateKeyEvent(keyEvent, win, window, event); + + return win->GetEventHandler()->ProcessEvent( keyEvent ); } case ConfigureNotify: { - // Not clear if this is the same in NanoX - if (win) +#if wxUSE_NANOX + if (event->update.utype == GR_UPDATE_SIZE) +#endif { - wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() ); - sizeEvent.SetEventObject( win ); - - win->GetEventHandler()->ProcessEvent( sizeEvent ); + if (win->IsTopLevel()) + { + wxTopLevelWindow *tlw = (wxTopLevelWindow*) win; + tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event), + XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) ); + } + + if (win->IsTopLevel() && win->IsShown()) + { + wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win; + tlw->SetNeedResizeInIdle(); + } + else + { + wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() ); + sizeEvent.SetEventObject( win ); + + return win->GetEventHandler()->ProcessEvent( sizeEvent ); + } } + return FALSE; + break; } #if !wxUSE_NANOX case PropertyNotify: { - HandlePropertyChange(_event); - return; + //wxLogDebug("PropertyNotify: %s", windowClass.c_str()); + return HandlePropertyChange(_event); } case ClientMessage: { - if (win && !win->IsEnabled()) - return; + if (!win->IsEnabled()) + return FALSE; Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True); Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True); @@ -491,143 +655,157 @@ void wxApp::ProcessXEvent(WXEvent* _event) { if ((Atom) (event->xclient.data.l[0]) == wm_delete_window) { - if (win) - { - win->Close(FALSE); - } + win->Close(FALSE); + return TRUE; } } - return; + return FALSE; + } +#if 0 + case DestroyNotify: + { + printf( "destroy from %s\n", win->GetName().c_str() ); + break; + } + case CreateNotify: + { + printf( "create from %s\n", win->GetName().c_str() ); + break; + } + case MapRequest: + { + printf( "map request from %s\n", win->GetName().c_str() ); + break; } case ResizeRequest: { - /* - * If resize event, don't resize until the last resize event for this - * window is recieved. Prevents flicker as windows are resized. - */ - + printf( "resize request from %s\n", win->GetName().c_str() ); + Display *disp = (Display*) wxGetDisplay(); XEvent report; - + // to avoid flicker report = * event; while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report)); - - if (win) - { - wxSize sz = win->GetSize(); - wxSizeEvent sizeEvent(sz, win->GetId()); - sizeEvent.SetEventObject(win); - win->GetEventHandler()->ProcessEvent( sizeEvent ); - } + wxSize sz = win->GetSize(); + wxSizeEvent sizeEvent(sz, win->GetId()); + sizeEvent.SetEventObject(win); - return; + return win->GetEventHandler()->ProcessEvent( sizeEvent ); } #endif +#endif #if wxUSE_NANOX case GR_EVENT_TYPE_CLOSE_REQ: { if (win) { win->Close(FALSE); + return TRUE; } + return FALSE; break; } #endif - case Expose: - { - if (win) - { - 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) - // win->Update(); - } - - 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) - // win->Update(); - } - - return; - } case EnterNotify: case LeaveNotify: case ButtonPress: case ButtonRelease: case MotionNotify: { - if (!win) - return; - if (!win->IsEnabled()) - return; - -#if 1 + return FALSE; + + // Here we check if the top level window is + // disabled, which is one aspect of modality. + wxWindow *tlw = win; + while (tlw && !tlw->IsTopLevel()) + tlw = tlw->GetParent(); + if (tlw && !tlw->IsEnabled()) + return FALSE; + if (event->type == ButtonPress) { if ((win != wxWindow::FindFocus()) && win->AcceptsFocus()) - win->SetFocus(); + { + // This might actually be done in wxWindow::SetFocus() + // and not here. TODO. + g_prevFocus = wxWindow::FindFocus(); + g_nextFocus = win; + + wxLogTrace( _T("focus"), _T("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + + // Record the fact that this window is + // getting the focus, because we'll need to + // check if its parent is getting a bogus + // focus and duly ignore it. + // TODO: may need to have this code in SetFocus, too. + extern wxWindow* g_GettingFocus; + g_GettingFocus = win; + win->SetFocus(); + } } -#endif +#if !wxUSE_NANOX + if (event->type == LeaveNotify || event->type == EnterNotify) + { + // Throw out NotifyGrab and NotifyUngrab + if (event->xcrossing.mode != NotifyNormal) + return FALSE; + } +#endif wxMouseEvent wxevent; wxTranslateMouseEvent(wxevent, win, window, event); - win->GetEventHandler()->ProcessEvent( wxevent ); - return; + return win->GetEventHandler()->ProcessEvent( wxevent ); } case FocusIn: { #if !wxUSE_NANOX - if (win && event->xfocus.detail != NotifyPointer) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #endif { - wxLogDebug( "FocusIn from %s", win->GetName().c_str() ); - - wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId()); - focusEvent.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(focusEvent); + wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + + extern wxWindow* g_GettingFocus; + if (g_GettingFocus && g_GettingFocus->GetParent() == win) + { + // Ignore this, this can be a spurious FocusIn + // caused by a child having its focus set. + g_GettingFocus = NULL; + wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + return TRUE; + } + else + { + wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId()); + focusEvent.SetEventObject(win); + focusEvent.SetWindow( g_prevFocus ); + g_prevFocus = NULL; + + return win->GetEventHandler()->ProcessEvent(focusEvent); + } } + return FALSE; break; } case FocusOut: { #if !wxUSE_NANOX - if (win && event->xfocus.detail != NotifyPointer) + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) #endif { - wxLogDebug( "FocusOut from %s", win->GetName().c_str() ); - + wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() ); + wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId()); focusEvent.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(focusEvent); + focusEvent.SetWindow( g_nextFocus ); + g_nextFocus = NULL; + return win->GetEventHandler()->ProcessEvent(focusEvent); } - break; - } - case DestroyNotify: - { - // Do we want to process this (for top-level windows)? - // But we want to be able to veto closes, anyway + return FALSE; break; } default: @@ -636,9 +814,11 @@ void wxApp::ProcessXEvent(WXEvent* _event) //wxString eventName = wxGetXEventName(XEvent& event); //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); #endif + return FALSE; break; } } + return FALSE; } // Returns TRUE if more time is needed. @@ -673,11 +853,12 @@ void wxApp::Dispatch() // This should be redefined in a derived class for // handling property change events for XAtom IPC. -void wxApp::HandlePropertyChange(WXEvent *event) +bool wxApp::HandlePropertyChange(WXEvent *event) { // by default do nothing special // TODO: what to do for X11 // XtDispatchEvent((XEvent*) event); + return FALSE; } void wxApp::OnIdle(wxIdleEvent& event) @@ -740,30 +921,30 @@ bool wxApp::SendIdleEvents(wxWindow* win) win->GetEventHandler()->ProcessEvent(event); - win->OnInternalIdle(); - 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(); + return needMore; } 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; @@ -772,7 +953,7 @@ void wxApp::DeletePendingObjects() // Deleting one object may have deleted other pending // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + node = wxPendingDelete.GetFirst(); } } @@ -783,17 +964,58 @@ bool wxApp::OnInitGui() // now we don't want to try popping up a dialog // for error messages. delete wxLog::SetActiveTarget(new wxLogStderr); - + if (!wxAppBase::OnInitGui()) - return FALSE; - + return FALSE; + GetMainColormap( wxApp::GetDisplay() ); m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() ); +#if !wxUSE_NANOX + m_visualInfo = new wxXVisualInfo; + wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() ); +#endif + return TRUE; } +#if wxUSE_UNICODE + +#include +#include +#include + +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; + if (use_xft == -1) + { + 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 + WXColormap wxApp::GetMainColormap(WXDisplay* display) { if (!display) /* Must be called first with non-NULL display */ @@ -813,14 +1035,24 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) Window wxGetWindowParent(Window window) { wxASSERT_MSG( window, "invalid window" ); - + return (Window) 0; Window parent, root = 0; +#if wxUSE_NANOX + int noChildren = 0; +#else unsigned int noChildren = 0; +#endif Window* children = NULL; - int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent, - & children, & noChildren); + + // #define XQueryTree(d,w,r,p,c,nc) GrQueryTree(w,p,c,nc) + int res = 1; +#if !wxUSE_NANOX + res = +#endif + XQueryTree((Display*) wxGetDisplay(), window, & root, & parent, + & children, & noChildren); if (children) XFree(children); if (res) @@ -847,39 +1079,68 @@ 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); + } - while (wxTheApp && wxTheApp->Pending()) + // Call dispatch at least once so that sockets + // can be tested wxTheApp->Dispatch(); - s_inYield = FALSE; + while (wxTheApp && wxTheApp->Pending()) + wxTheApp->Dispatch(); + +#if wxUSE_TIMER + wxTimer::NotifyTimers(); +#endif + ProcessIdle(); + + if (newEventLoop) + { + wxEventLoop::SetActive(NULL); + delete newEventLoop; + } + + s_inYield = FALSE; + } return TRUE; } -wxIcon wxApp::GetStdIcon(int which) const -{ - return wxTheme::Get()->GetRenderer()->GetStdIcon(which); -} +#ifdef __WXDEBUG__ -void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { // While the GUI isn't working that well, just print out the // message. -#if 0 - wxAppBase::OnAssert(file, line, msg); +#if 1 + wxAppBase::OnAssert(file, line, cond, msg); #else wxString msg2; msg2.Printf("At file %s:%d: %s", file, line, msg); @@ -887,3 +1148,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) #endif } +#endif // __WXDEBUG__ +