#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"
#include "wx/thread.h"
#endif
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
-#endif
-
#include "wx/x11/private.h"
#include <string.h>
extern wxList wxPendingDelete;
wxHashTable *wxWidgetHashTable = NULL;
+wxHashTable *wxClientWidgetHashTable = NULL;
wxApp *wxTheApp = NULL;
// This is set within wxEntryStart -- too early on
// to put these in wxTheApp
-static int g_newArgc = 0;
-static wxChar** g_newArgv = NULL;
static bool g_showIconic = FALSE;
static wxSize g_initialSize = wxDefaultSize;
{
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
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;
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;
#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))
{
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
{
continue;
}
}
- else if (arg == wxT("-sync"))
+ else if (strcmp( argv[i], "-sync") == 0)
{
syncDisplay = TRUE;
continue;
}
- else if (arg == wxT("-iconic"))
+ else if (strcmp( argv[i], "-iconic") == 0)
{
g_showIconic = TRUE;
continue;
}
- // Not eaten by wxWindows, so pass through
- g_newArgv[g_newArgc] = argv[i];
- g_newArgc ++;
}
- Display* xdisplay = NULL;
- if (displayName.IsEmpty())
- xdisplay = XOpenDisplay(NULL);
- else
- xdisplay = XOpenDisplay((char*) displayName.c_str());
-
+ // X11 display stuff
+ Display* xdisplay = XOpenDisplay( displayName );
if (!xdisplay)
{
wxLogError( _("wxWindows could not open display. Exiting.") );
}
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;
{
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;
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()
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
wxWindow* win = NULL;
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
win = wxGetWindowFromTable(window);
if (!win)
- return FALSE;
+ {
+#if wxUSE_TWO_WINDOWS
+ win = wxGetClientWindowFromTable(window);
+ if (!win)
+#endif
+ return FALSE;
+ }
#ifdef __WXDEBUG__
wxString windowClass = win->GetClassInfo()->GetClassName();
#endif
-
+
switch (event->type)
{
case Expose:
{
- //wxLogDebug("Expose: %s", windowClass.c_str());
- win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
- XExposeEventGetWidth(event), XExposeEventGetHeight(event));
-
- win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
+ if (event->xexpose.window != (Window)win->GetClientAreaWindow())
+ {
+ XEvent tmp_event;
+ wxExposeInfo info;
+ info.window = event->xexpose.window;
+ info.found_non_matching = FALSE;
+ while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+ {
+ // 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 );
-
- win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
- tmp_event.xexpose.width, tmp_event.xexpose.height );
- }
+ 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
- // Only erase background, paint in idle time.
- win->SendEraseEvents();
+ // 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:
{
- // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
- // event->xgraphicsexpose.x, event->xgraphicsexpose.y,
- // event->xgraphicsexpose.width, event->xgraphicsexpose.height);
-
+ 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();
+ // win->Update();
}
return TRUE;
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)) )
{
wxKeyEvent keyEvent(wxEVT_KEY_UP);
wxTranslateKeyEvent(keyEvent, win, window, event);
-
+
return win->GetEventHandler()->ProcessEvent( keyEvent );
}
case ConfigureNotify:
if (event->update.utype == GR_UPDATE_SIZE)
#endif
{
- //wxLogDebug("ConfigureNotify: %s", windowClass.c_str());
+ 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;
{
wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
sizeEvent.SetEventObject( win );
-
+
return win->GetEventHandler()->ProcessEvent( sizeEvent );
}
}
case ResizeRequest:
{
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));
-
+
wxSize sz = win->GetSize();
wxSizeEvent sizeEvent(sz, win->GetId());
sizeEvent.SetEventObject(win);
{
if (!win->IsEnabled())
return FALSE;
-
+
// Here we check if the top level window is
// disabled, which is one aspect of modality.
wxWindow *tlw = win;
tlw = tlw->GetParent();
if (tlw && !tlw->IsEnabled())
return FALSE;
-
+
if (event->type == ButtonPress)
{
if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
// 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 !wxUSE_NANOX
if (event->type == LeaveNotify || event->type == EnterNotify)
{
(event->xfocus.mode == NotifyNormal))
#endif
{
- // wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
-
- wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
- focusEvent.SetEventObject(win);
- focusEvent.SetWindow( g_prevFocus );
- g_prevFocus = NULL;
-
- return 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;
(event->xfocus.mode == NotifyNormal))
#endif
{
- // wxLogDebug( "FocusOut from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
-
+ 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);
focusEvent.SetWindow( g_nextFocus );
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;
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ node = wxPendingDelete.GetFirst();
}
}
// 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 <pango/pango.h>
+#include <pango/pangox.h>
+#include <pango/pangoxft.h>
+
+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 */
Window wxGetWindowParent(Window window)
{
wxASSERT_MSG( window, "invalid window" );
-
+
return (Window) 0;
Window parent, root = 0;
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);
#endif
}
+#endif // __WXDEBUG__
+
projects / wxWidgets.git / blobdiff