#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/intl.h"
#include "wx/evtloop.h"
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"
+
#if wxUSE_THREADS
#include "wx/thread.h"
#endif
#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <X11/Xresource.h>
#include <X11/Xatom.h>
+
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include <string.h>
-extern char *wxBuffer;
extern wxList wxPendingDelete;
wxApp *wxTheApp = NULL;
#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
wxInitializeResourceSystem();
#endif
- wxBitmap::InitStandardHandlers();
-
wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
wxModule::RegisterModules();
void wxApp::CleanUp()
{
+ if (g_newArgv)
+ delete[] g_newArgv;
+ g_newArgv = NULL;
+
delete wxWidgetHashTable;
wxWidgetHashTable = NULL;
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;
// wxDebugContext, too.
if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
{
- wxLogDebug("There were memory leaks.\n");
+ wxLogDebug("There were memory leaks.");
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
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
// 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)
{
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();
}
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()
wxWindow* win = NULL;
Window window = event->xany.window;
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 = 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,
+ // 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:
{
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
}
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:
- {
- Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
- Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+ {
+ 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 (event->xclient.data.l[0] == wm_delete_window)
+ if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
{
if (win)
{
}
case ResizeRequest:
{
- /* Terry Gitnick <terryg@scientech.com> - 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.
*/
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();
return;
}
+#endif
+#if wxUSE_NANOX
+ case GR_EVENT_TYPE_CLOSE_REQ:
+ {
+ if (win)
+ {
+ win->Close(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->X11SendPaintEvents(); // TODO let an idle handler do that
+ // Only erase background, paint in idle time.
+ win->SendEraseEvents();
+ }
+ }
+
+ 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)
+ {
+ // Only erase background, paint in idle time.
+ win->SendEraseEvents();
}
}
case ButtonRelease:
case MotionNotify:
{
- if (win && !win->IsEnabled())
+ if (!win)
return;
-
- if (win)
+
+ if (!win->IsEnabled())
+ return;
+
+#if 1
+ if (event->type == ButtonPress)
{
- wxMouseEvent wxevent;
- wxTranslateMouseEvent(wxevent, win, window, event);
- win->GetEventHandler()->ProcessEvent( wxevent );
+ if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+ win->SetFocus();
}
+#endif
+
+ wxMouseEvent wxevent;
+ wxTranslateMouseEvent(wxevent, win, window, event);
+ 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->GetEventHandler()->ProcessEvent(focusEvent);
}
case FocusOut:
{
+#if !wxUSE_NANOX
if (win && event->xfocus.detail != NotifyPointer)
+#endif
{
+ wxLogDebug( "FocusOut from %s", win->GetName().c_str() );
+
wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
focusEvent.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(focusEvent);
}
default:
{
+#ifdef __WXDEBUG__
+ //wxString eventName = wxGetXEventName(XEvent& event);
+ //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+#endif
break;
}
}
{
// 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;
-
- // 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()
wxIdleEvent event;
event.SetEventObject(win);
- win->ProcessEvent(event);
+
+ win->GetEventHandler()->ProcessEvent(event);
+
+ win->OnInternalIdle();
if (event.MoreRequested())
needMore = TRUE;
node = node->Next();
}
- return needMore ;
+
+ return needMore;
}
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((Display*) m_initialDisplay,
- XDefaultRootWindow((Display*) 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;
}
Window wxGetWindowParent(Window window)
{
+ wxASSERT_MSG( window, "invalid window" );
+
+ return (Window) 0;
+
Window parent, root = 0;
unsigned int noChildren = 0;
- if (XQueryTree((Display*) 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;
return TRUE;
}
-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-#undef static
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+wxIcon wxApp::GetStdIcon(int which) const
{
- 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);
- }
+ return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
}
-// ----------------------------------------------------------------------------
-// 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
+}
+
projects / wxWidgets.git / blobdiff