X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b0fb34be895a9596131233edd1bf68b10c052b4..eb90fb3ee8cbfa859907e3561caa456924556acf:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index ef1b07b838..21eff48925 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -17,14 +17,8 @@ #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/palette.h" -#include "wx/dc.h" #include "wx/dialog.h" -#include "wx/msgdlg.h" #include "wx/log.h" #include "wx/module.h" #include "wx/memory.h" @@ -45,8 +39,8 @@ #endif #include #include -#include #include + #ifdef __VMS__ #pragma message enable nosimpint #endif @@ -55,7 +49,6 @@ #include -extern char *wxBuffer; extern wxList wxPendingDelete; wxApp *wxTheApp = NULL; @@ -81,11 +74,17 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) #endif // __WXDEBUG__ 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; bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); // GL: I'm annoyed ... I don't know where to put this and I don't want to @@ -104,8 +103,6 @@ bool wxApp::Initialize() wxInitializeResourceSystem(); #endif - wxBitmap::InitStandardHandlers(); - wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); wxModule::RegisterModules(); @@ -116,6 +113,10 @@ bool wxApp::Initialize() void wxApp::CleanUp() { + if (g_newArgv) + delete[] g_newArgv; + g_newArgv = NULL; + delete wxWidgetHashTable; wxWidgetHashTable = NULL; @@ -125,27 +126,18 @@ void wxApp::CleanUp() wxCleanUpResourceSystem(); #endif - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. - - wxDeleteStockLists(); - delete wxTheColourDatabase; wxTheColourDatabase = NULL; - wxBitmap::CleanUpHandlers(); - - delete[] wxBuffer; - wxBuffer = NULL; - - wxClassInfo::CleanUpClasses(); + wxDeleteStockObjects(); + + wxDeleteStockLists(); delete wxTheApp; wxTheApp = NULL; - // 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. + wxClassInfo::CleanUpClasses(); + #if wxUSE_THREADS delete wxPendingEvents; delete wxPendingEventsLocker; @@ -158,7 +150,7 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug("There were memory leaks.\n"); + wxLogDebug("There were memory leaks."); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -170,6 +162,111 @@ void wxApp::CleanUp() delete wxLog::SetActiveTarget(NULL); } +// NB: argc and argv may be changed here, pass by reference! +int wxEntryStart( int& argc, char *argv[] ) +{ +#ifdef __WXDEBUG__ + // install the X error handler + gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); +#endif // __WXDEBUG__ + + wxString displayName; + 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 (i < (argc - 1)) + { + i ++; + displayName = argv[i]; + continue; + } + } + else if (arg == wxT("-geometry")) + { + if (i < (argc - 1)) + { + i ++; + wxString windowGeometry = argv[i]; + int w, h; + if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2) + { + wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str()); + } + else + { + g_initialSize = wxSize(w, h); + } + continue; + } + } + else if (arg == wxT("-sync")) + { + syncDisplay = TRUE; + continue; + } + else if (arg == wxT("-iconic")) + { + 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); + + if (!xdisplay) + { + wxLogError( _("wxWindows could not open display. Exiting.") ); + return -1; + } + + if (syncDisplay) + { + XSynchronize(xdisplay, True); + } + + wxApp::ms_display = (WXDisplay*) xdisplay; + + XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask); + +// wxSetDetectableAutoRepeat( TRUE ); + + 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 @@ -181,9 +278,9 @@ int wxEntry( int argc, char *argv[] ) // checked, but this is a reasonable compromise. wxDebugContext::SetCheckpoint(); #endif - - if (!wxApp::Initialize()) - return FALSE; + int err = wxEntryStart(argc, argv); + if (err) + return err; if (!wxTheApp) { @@ -205,17 +302,33 @@ int wxEntry( int argc, char *argv[] ) wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); wxTheApp->SetAppName(wxFileNameFromPath(argv[0])); - wxTheApp->argc = argc; - wxTheApp->argv = argv; + // The command line may have been changed + // by stripping out -display etc. + if (g_newArgc > 0) + { + wxTheApp->argc = g_newArgc; + wxTheApp->argv = g_newArgv; + } + else + { + wxTheApp->argc = argc; + wxTheApp->argv = argv; + } + wxTheApp->m_showIconic = g_showIconic; + wxTheApp->m_initialSize = g_initialSize; - // GUI-specific initialization, such as creating an app context. - wxTheApp->OnInitGui(); + int retValue; + retValue = wxEntryInitGui(); // Here frames insert themselves automatically into wxTopLevelWindows by // getting created in OnInit(). + if ( retValue == 0 ) + { + if ( !wxTheApp->OnInit() ) + retValue = -1; + } - int retValue = 0; - if (wxTheApp->OnInit()) + if ( retValue == 0 ) { if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); } @@ -259,8 +372,9 @@ wxApp::wxApp() m_mainColormap = (WXColormap) NULL; m_topLevelWidget = (WXWindow) NULL; m_maxRequestSize = 0; - m_initialDisplay = (WXDisplay*) 0; m_mainLoop = NULL; + m_showIconic = FALSE; + m_initialSize = wxDefaultSize; } bool wxApp::Initialized() @@ -293,36 +407,36 @@ void wxApp::ProcessXEvent(WXEvent* _event) Window actualWindow = window; // 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 = XGetParent(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, + // it must have been destroyed. + + win = wxGetWindowFromTable(window); + if (!win) + return; - // TODO: shouldn't all the ProcessEvents below - // be win->GetEventHandler()->ProcessEvent? switch (event->type) { case KeyPress: { - if (CheckForAccelerator(_event)) - { - // Do nothing! We intercepted and processed the event as an - // accelerator. + if (win && !win->IsEnabled()) return; - } - else + { if (win) { wxKeyEvent keyEvent(wxEVT_KEY_DOWN); - wxTranslateKeyEvent(keyEvent, win, window, xEvent); + wxTranslateKeyEvent(keyEvent, win, window, event); + + wxLogDebug( "OnKey from %s", win->GetName().c_str() ); // We didn't process wxEVT_KEY_DOWN, so send - // wxEVT_KEY_CHAR - if (!win->ProcessEvent( keyEvent )) + // wxEVT_CHAR + if (!win->GetEventHandler()->ProcessEvent( keyEvent )) { - keyEvent.SetEventType(wxEVT_KEY_CHAR); - win->ProcessEvent( keyEvent ); + keyEvent.SetEventType(wxEVT_CHAR); + win->GetEventHandler()->ProcessEvent( keyEvent ); } // We intercepted and processed the key down event @@ -333,60 +447,103 @@ void wxApp::ProcessXEvent(WXEvent* _event) } case KeyRelease: { + if (win && !win->IsEnabled()) + return; + if (win) { wxKeyEvent keyEvent(wxEVT_KEY_UP); wxTranslateKeyEvent(keyEvent, win, window, event); - win->ProcessEvent( keyEvent ); + win->GetEventHandler()->ProcessEvent( keyEvent ); } return; } + case ConfigureNotify: + { + // Not clear if this is the same in NanoX + if (win) + { + wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() ); + sizeEvent.SetEventObject( win ); + + win->GetEventHandler()->ProcessEvent( sizeEvent ); + } + } +#if !wxUSE_NANOX case PropertyNotify: { HandlePropertyChange(_event); return; } + case ClientMessage: + { + if (win && !win->IsEnabled()) + return; + + 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); + } + } + } + return; + } 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. */ - Display *disp = wxGetDisplay(); + 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->ProcessEvent( wxevent ); + win->GetEventHandler()->ProcessEvent( sizeEvent ); } return; } +#endif +#if wxUSE_NANOX + case GR_EVENT_TYPE_CLOSE_REQ: + { + if (win) + { + win->Close(FALSE); + } + break; + } +#endif case Expose: { if (win) { - win->AddUpdateRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - - if (event -> xexpose.count == 0) - { - win->DoPaint(); - win->ClearUpdateRects(); - } + 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; @@ -397,36 +554,57 @@ void wxApp::ProcessXEvent(WXEvent* _event) case ButtonRelease: case MotionNotify: { + if (win && !win->IsEnabled()) + return; + if (win) { wxMouseEvent wxevent; wxTranslateMouseEvent(wxevent, win, window, event); - win->ProcessEvent( wxevent ); + win->GetEventHandler()->ProcessEvent( wxevent ); } return; } case FocusIn: { +#if !wxUSE_NANOX if (win && event->xfocus.detail != NotifyPointer) +#endif { + wxLogDebug( "FocusIn from %s", win->GetName().c_str() ); + wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId()); focusEvent.SetEventObject(win); - win->ProcessEvent(focusEvent); + win->GetEventHandler()->ProcessEvent(focusEvent); } break; } case FocusOut: { +#if !wxUSE_NANOX if (win && event->xfocus.detail != NotifyPointer) +#endif { + wxLogDebug( "FocusOut from %s\n", win->GetName().c_str() ); + wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId()); focusEvent.SetEventObject(win); - win->ProcessEvent(focusEvent); + 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 + break; + } default: { +#ifdef __WXDEBUG__ + //wxString eventName = wxGetXEventName(XEvent& event); + //wxLogDebug(wxT("Event %s not handled"), eventName.c_str()); +#endif break; } } @@ -468,46 +646,33 @@ void 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); } 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; + s_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 - - // 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() @@ -541,7 +706,10 @@ bool wxApp::SendIdleEvents(wxWindow* win) wxIdleEvent event; event.SetEventObject(win); - win->ProcessEvent(event); + + win->GetEventHandler()->ProcessEvent(event); + + win->OnInternalIdle(); if (event.MoreRequested()) needMore = TRUE; @@ -555,7 +723,8 @@ bool wxApp::SendIdleEvents(wxWindow* win) node = node->Next(); } - return needMore ; + + return needMore; } void wxApp::DeletePendingObjects() @@ -576,30 +745,20 @@ void wxApp::DeletePendingObjects() } } -// Create an application context +// Create display, and other initialization bool wxApp::OnInitGui() { - // 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); - } - XSelectInput(m_initialDisplay, - XDefaultRootWindow(m_initialDisplay), - PropertyChangeMask); - -#ifdef __WXDEBUG__ - // install the X error handler - gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); -#endif // __WXDEBUG__ - - GetMainColormap(dpy); - m_maxRequestSize = XMaxRequestSize((Display*) dpy); + // 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; + + GetMainColormap( wxApp::GetDisplay() ); + + m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() ); return TRUE; } @@ -620,52 +779,25 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display) return (WXColormap) c; } -static Window XGetParent(Window window) +Window wxGetWindowParent(Window window) { + wxASSERT_MSG( window, "invalid window" ); + + return (Window) 0; + Window parent, root = 0; unsigned int noChildren = 0; - if (XQueryTree(wxGetDisplay(), window, & root, & parent, - NULL, & noChildren)) + Window* children = NULL; + int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent, + & children, & noChildren); + if (children) + XFree(children); + if (res) return parent; else return (Window) 0; } -// Returns TRUE if an accelerator has been processed -bool wxApp::CheckForAccelerator(WXEvent* event) -{ - XEvent* xEvent = (XEvent*) event; - if (xEvent->xany.type == KeyPress) - { - // Find a wxWindow for this window - // TODO: should get display for the window, not the current display - Window window = xEvent->xany.window; - wxWindow* win = NULL; - - // Find the first wxWindow that corresponds to this event window - while (window && !(win = wxGetWindowFromTable(window))) - window = XGetParent(window); - - if (!window || !win) - return FALSE; - - wxKeyEvent keyEvent(wxEVT_CHAR); - wxTranslateKeyEvent(keyEvent, win, (Window) 0, xEvent); - - // Now we have a wxKeyEvent and we have a wxWindow. - // Go up the hierarchy until we find a matching accelerator, - // or we get to the top. - while (win) - { - if (win->ProcessAccelerator(keyEvent)) - return TRUE; - win = win->GetParent(); - } - return FALSE; - } - return FALSE; -} - void wxExit() { int retValue = 0; @@ -706,8 +838,6 @@ bool wxApp::Yield(bool onlyIfNeeded) return TRUE; } -// TODO use XmGetPixmap (?) to get the really standard icons! - // XPM hack: make the arrays const #define static static const @@ -741,13 +871,16 @@ wxApp::GetStdIcon(int which) const } } -// ---------------------------------------------------------------------------- -// accessors for C modules -// ---------------------------------------------------------------------------- - -#if 0 -extern "C" XtAppContext wxGetAppContext() +void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) { - return (XtAppContext)wxTheApp->GetAppContext(); + // While the GUI isn't working that well, just print out the + // message. +#if 0 + wxAppBase::OnAssert(file, line, msg); +#else + wxString msg2; + msg2.Printf("At file %s:%d: %s", file, line, msg); + wxLogDebug(msg2); +#endif } -#endif \ No newline at end of file +