X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c31a82c10db89f76394d1e33ada49696980d8daf..17a6a662f7d7932983fc29892854fad56a82057b:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index c21c217a82..ff91c2fb6b 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -17,54 +17,51 @@ #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/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/timer.h" +#include "wx/filename.h" +#include "wx/hash.h" + +#include "wx/univ/theme.h" +#include "wx/univ/renderer.h" #if wxUSE_THREADS #include "wx/thread.h" #endif -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif - -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#include -#include -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif - #include "wx/x11/private.h" #include -extern char *wxBuffer; -extern wxList wxPendingDelete; +//------------------------------------------------------------------------ +// global data +//------------------------------------------------------------------------ -wxApp *wxTheApp = NULL; +extern wxList wxPendingDelete; wxHashTable *wxWidgetHashTable = NULL; +wxHashTable *wxClientWidgetHashTable = NULL; -IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) +static bool g_showIconic = FALSE; +static wxSize g_initialSize = wxDefaultSize; -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() +// 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; + +//------------------------------------------------------------------------ +// X11 error handling +//------------------------------------------------------------------------ #ifdef __WXDEBUG__ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); @@ -74,191 +71,173 @@ 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__ -long wxApp::sm_lastMessageTime = 0; - -bool wxApp::Initialize() -{ - wxBuffer = new char[BUFSIZ + 512]; - - wxClassInfo::InitializeClasses(); +//------------------------------------------------------------------------ +// wxApp +//------------------------------------------------------------------------ - // 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 - - wxBitmap::InitStandardHandlers(); - - wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); +long wxApp::sm_lastMessageTime = 0; +WXDisplay *wxApp::ms_display = NULL; - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; +IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) - return TRUE; -} +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() -void wxApp::CleanUp() +bool wxApp::Initialize(int& argc, wxChar **argv) { - delete wxWidgetHashTable; - wxWidgetHashTable = NULL; - - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif - - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. +#if defined(__WXDEBUG__) && !wxUSE_NANOX + // install the X error handler + gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); +#endif // __WXDEBUG__ - wxDeleteStockLists(); + char *displayName = NULL; + bool syncDisplay = FALSE; - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + int argcOrig = argc; + for ( int i = 0; i < argcOrig; i++ ) + { + if (wxStrcmp( argv[i], _T("-display") ) == 0) + { + if (i < (argc - 1)) + { + argv[i++] = NULL; - wxBitmap::CleanUpHandlers(); + displayName = argv[i]; - delete[] wxBuffer; - wxBuffer = NULL; + argv[i] = NULL; + argc -= 2; + } + } + else if (wxStrcmp( argv[i], _T("-geometry") ) == 0) + { + if (i < (argc - 1)) + { + argv[i++] = NULL; - wxClassInfo::CleanUpClasses(); + int w, h; + if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2) + { + wxLogError( _("Invalid geometry specification '%s'"), + wxString::FromAscii(argv[i]).c_str() ); + } + else + { + g_initialSize = wxSize(w, h); + } - delete wxTheApp; - wxTheApp = NULL; + argv[i] = NULL; + argc -= 2; + } + } + else if (wxStrcmp( argv[i], _T("-sync") ) == 0) + { + syncDisplay = TRUE; - // 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 - delete wxPendingEvents; - delete wxPendingEventsLocker; -#endif + argv[i] = NULL; + argc--; + } + else if (wxStrcmp( argv[i], _T("-iconic") ) == 0) + { + g_showIconic = TRUE; -#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.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + argv[i] = NULL; + argc--; + } } -#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); -} - -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 - if (!wxApp::Initialize()) - return FALSE; - - if (!wxTheApp) + if ( argc != argcOrig ) { - if (!wxApp::GetInitializerFunction()) + // remove the argumens we consumed + for ( int i = 0; i < argc; i++ ) { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; - - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - }; + while ( !argv[i] ) + { + memmove(argv + i, argv + i + 1, argcOrig - i); + } + } + } - if (!wxTheApp) + // X11 display stuff + Display *xdisplay = XOpenDisplay( displayName ); + if (!xdisplay) { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - }; + wxLogError( _("wxWindows could not open display. Exiting.") ); + return false; + } - wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); - wxTheApp->SetAppName(wxFileNameFromPath(argv[0])); + if (syncDisplay) + XSynchronize(xdisplay, True); - wxTheApp->argc = argc; - wxTheApp->argv = argv; + ms_display = (WXDisplay*) xdisplay; - // GUI-specific initialization, such as creating an app context. - wxTheApp->OnInitGui(); + XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). + // Misc. + wxSetDetectableAutoRepeat( TRUE ); - int retValue = 0; - if (wxTheApp->OnInit()) + if ( !wxAppBase::Initialize(argc, argv) ) { - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - } + XCloseDisplay(xdisplay); - // 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); + return false; } - wxTheApp->DeletePendingObjects(); +#if wxUSE_UNICODE + // Glib's type system required by Pango + g_type_init(); +#endif + +#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() { - 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_initialDisplay = (WXDisplay*) 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() @@ -271,7 +250,7 @@ bool wxApp::Initialized() int wxApp::MainLoop() { - int rt; + int rt; m_mainLoop = new wxEventLoop; rt = m_mainLoop->Run(); @@ -281,21 +260,56 @@ 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 - // 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, @@ -303,183 +317,359 @@ 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); - - // 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)); + +#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 ); - // We intercepted and processed the key down event - return; + 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 TRUE; + } + +#if !wxUSE_NANOX + case GraphicsExpose: + { + printf( "GraphicExpose event\n" ); + + 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) + { + // 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 && !win->IsEnabled()) - return; + if (!win->IsEnabled()) + return FALSE; - if (win) + wxKeyEvent keyEvent(wxEVT_KEY_UP); + wxTranslateKeyEvent(keyEvent, win, window, event); + + return win->GetEventHandler()->ProcessEvent( keyEvent ); + } + case ConfigureNotify: + { +#if wxUSE_NANOX + if (event->update.utype == GR_UPDATE_SIZE) +#endif { - wxKeyEvent keyEvent(wxEVT_KEY_UP); - wxTranslateKeyEvent(keyEvent, win, window, event); - - win->GetEventHandler()->ProcessEvent( keyEvent ); + 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; + return FALSE; + break; } +#if !wxUSE_NANOX case PropertyNotify: { - HandlePropertyChange(_event); - return; + //wxLogDebug("PropertyNotify: %s", windowClass.c_str()); + return HandlePropertyChange(_event); } case ClientMessage: - { - Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);; - Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);; + { + if (!win->IsEnabled()) + return FALSE; + + 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 ((Atom) (event->xclient.data.l[0]) == wm_delete_window) { - if (win) - { - win->Close(FALSE); - } + win->Close(FALSE); + return TRUE; } } - return; + return FALSE; } - case ConfigureNotify: +#if 0 + case DestroyNotify: { - if (win) - { - wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() ); - sizeEvent.SetEventObject( win ); - - win->GetEventHandler()->ProcessEvent( sizeEvent ); - } + 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: { - /* Terry Gitnick - 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. - */ - + 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)); - - // TODO: when implementing refresh optimization, we can use - // XtAddExposureToRegion to expand the window's paint region. - - 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 ); } - case Expose: +#endif +#endif +#if wxUSE_NANOX + case GR_EVENT_TYPE_CLOSE_REQ: { if (win) { - win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - if (event->xexpose.count == 0) - { - win->X11SendPaintEvents(); // TODO let an idle handler do that - } + win->Close(FALSE); + return TRUE; } - - return; + return FALSE; + break; } +#endif case EnterNotify: case LeaveNotify: case ButtonPress: case ButtonRelease: case MotionNotify: { - if (win && !win->IsEnabled()) - return; + if (!win->IsEnabled()) + 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()) + { + // 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(); + } + } - if (win) +#if !wxUSE_NANOX + if (event->type == LeaveNotify || event->type == EnterNotify) { - wxMouseEvent wxevent; - wxTranslateMouseEvent(wxevent, win, window, event); - win->GetEventHandler()->ProcessEvent( wxevent ); + // Throw out NotifyGrab and NotifyUngrab + if (event->xcrossing.mode != NotifyNormal) + return FALSE; } - return; +#endif + wxMouseEvent wxevent; + wxTranslateMouseEvent(wxevent, win, window, event); + return win->GetEventHandler()->ProcessEvent( wxevent ); } case FocusIn: { - if (win && event->xfocus.detail != NotifyPointer) +#if !wxUSE_NANOX + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) +#endif { - 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 (win && event->xfocus.detail != NotifyPointer) +#if !wxUSE_NANOX + if ((event->xfocus.detail != NotifyPointer) && + (event->xfocus.mode == NotifyNormal)) +#endif { + 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: { +#ifdef __WXDEBUG__ + //wxString eventName = wxGetXEventName(XEvent& event); + //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); +#endif + return FALSE; break; } } -} - -// 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(); + return FALSE; } void wxApp::ExitMainLoop() @@ -502,152 +692,106 @@ 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); /* let Motif do the work */ + // XtDispatchEvent((XEvent*) event); + return FALSE; } void wxApp::OnIdle(wxIdleEvent& event) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) + if (s_inOnIdle) return; - inOnIdle = TRUE; - - // If there are pending events, we must process them: pending events - // are either events to the threads other than main or events posted - // with wxPostEvent() functions - // GRG: I have moved this here so that all pending events are processed - // before starting to delete any objects. This behaves better (in - // particular, wrt wxPostEvent) and is coherent with wxGTK's current - // behaviour. Also removed the '#if wxUSE_THREADS' around it. - // Changed Mar/2000 before 2.1.14 + s_inOnIdle = TRUE; - // Flush pending events. + // Resend in the main thread events which have been prepared in other + // threads ProcessPendingEvents(); - // 'Garbage' collection of windows deleted with Close(). + // 'Garbage' collection of windows deleted with Close() DeletePendingObjects(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); - // Send OnIdle events to all windows bool needMore = SendIdleEvents(); if (needMore) event.RequestMore(TRUE); - inOnIdle = FALSE; + 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... } -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() +// Create display, and other initialization +bool wxApp::OnInitGui() { - bool needMore = FALSE; - - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); - } - - return needMore; -} + // Eventually this line will be removed, but for + // now we don't want to try popping up a dialog + // for error messages. + delete wxLog::SetActiveTarget(new wxLogStderr); -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) -{ - bool needMore = FALSE; + if (!wxAppBase::OnInitGui()) + return FALSE; - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + GetMainColormap( wxApp::GetDisplay() ); - if (event.MoreRequested()) - needMore = TRUE; + m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() ); - wxNode* node = win->GetChildren().First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; +#if !wxUSE_NANOX + m_visualInfo = new wxXVisualInfo; + wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() ); +#endif - node = node->Next(); - } - return needMore ; + return TRUE; } -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); +#if wxUSE_UNICODE - delete obj; +#include +#include +#include - if (wxPendingDelete.Member(obj)) - delete node; +PangoContext* wxApp::GetPangoContext() +{ + static PangoContext *ret = NULL; + if (ret) + return ret; - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); - } -} + Display *xdisplay = (Display*) wxApp::GetDisplay(); -// Create an application context -bool wxApp::OnInitGui() -{ - // Eventually this line will be removed, but for - // now we don't want to try popping up a dialog - // for error messages. - delete wxLog::SetActiveTarget(new wxLogStderr); - if (!wxAppBase::OnInitGui()) - return FALSE; - - // TODO: parse argv and get display to pass to XOpenDisplay - Display* dpy = XOpenDisplay(NULL); - m_initialDisplay = (WXDisplay*) dpy; - - if (!dpy) { - wxString className(wxTheApp->GetClassName()); - wxLogError(_("wxWindows could not open display for '%s': exiting."), - (const char*) className); - exit(-1); +#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"); } - XSelectInput((Display*) m_initialDisplay, - XDefaultRootWindow((Display*) m_initialDisplay), - PropertyChangeMask); -#ifdef __WXDEBUG__ - // install the X error handler - gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); -#endif // __WXDEBUG__ + if (use_xft) + ret = pango_xft_get_context( xdisplay, xscreen ); + else +#endif + ret = pango_x_get_context( xdisplay ); - GetMainColormap(dpy); - m_maxRequestSize = XMaxRequestSize((Display*) dpy); + if (!PANGO_IS_CONTEXT(ret)) + wxLogError( wxT("No pango context.") ); - return TRUE; + return ret; } +#endif WXColormap wxApp::GetMainColormap(WXDisplay* display) { @@ -667,11 +811,25 @@ 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) @@ -680,88 +838,85 @@ 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 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(); - return TRUE; -} +#if wxUSE_TIMER + wxTimer::NotifyTimers(); +#endif + ProcessIdle(); -// TODO use XmGetPixmap (?) to get the really standard icons! + if (newEventLoop) + { + wxEventLoop::SetActive(NULL); + delete newEventLoop; + } -// XPM hack: make the arrays const -#define static static const + s_inYield = FALSE; + } -#include "wx/generic/info.xpm" -#include "wx/generic/error.xpm" -#include "wx/generic/question.xpm" -#include "wx/generic/warning.xpm" + return TRUE; +} -#undef static +#ifdef __WXDEBUG__ -wxIcon -wxApp::GetStdIcon(int which) const +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - 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); - } + // While the GUI isn't working that well, just print out the + // message. +#if 1 + wxAppBase::OnAssert(file, line, cond, msg); +#else + wxString msg2; + msg2.Printf("At file %s:%d: %s", file, line, msg); + wxLogDebug(msg2); +#endif } -// ---------------------------------------------------------------------------- -// accessors for C modules -// ---------------------------------------------------------------------------- +#endif // __WXDEBUG__ -#if 0 -extern "C" XtAppContext wxGetAppContext() -{ - return (XtAppContext)wxTheApp->GetAppContext(); -} -#endif