#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"
// 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;
void wxApp::CleanUp()
{
- if (g_newArgv)
- delete[] g_newArgv;
- g_newArgv = NULL;
-
delete wxWidgetHashTable;
wxWidgetHashTable = NULL;
delete wxClientWidgetHashTable;
#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_visualColormap = NULL;
m_colorCube = NULL;
#if !wxUSE_NANOX
if (m_colorCube)
free( m_colorCube );
-
+
if (m_visualColormap)
delete [] (XColor*)m_visualColormap;
#endif
{
printf( "GraphicExpose event\n" );
- wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str(),
- event->xgraphicsexpose.x, event->xgraphicsexpose.y,
- event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+ 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);
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 (!win->IsEnabled())
return FALSE;
-
+
// Here we check if the top level window is
// disabled, which is one aspect of modality.
wxWindow *tlw = win;
#endif
{
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)
{
vinfo_template.visual = xvisual;
vinfo_template.visualid = XVisualIDFromVisual( xvisual );
vinfo_template.depth = xdepth;
-
+
int nitem = 0;
XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
wxASSERT_MSG( vi, wxT("No visual info") );
-
+
m_visualType = vi->visual->c_class;
m_visualScreen = vi->screen;
-
+
m_visualRedMask = vi->red_mask;
m_visualGreenMask = vi->green_mask;
m_visualBlueMask = vi->blue_mask;
-
+
if (m_visualType != GrayScale && m_visualType != PseudoColor)
{
wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
}
-
+
m_visualDepth = xdepth;
if (xdepth == 16)
xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;
-
+
m_visualColormapSize = vi->colormap_size;
-
+
XFree( vi );
-
+
if (m_visualDepth > 8)
return TRUE;
-
+
m_visualColormap = new XColor[m_visualColormapSize];
XColor* colors = (XColor*) m_visualColormap;
-
+
for (int i = 0; i < m_visualColormapSize; i++)
colors[i].pixel = i;
XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );
-
+
m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
for (int r = 0; r < 32; r++)
}
}
#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 */
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);
- }
+ // 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();
+
+ while (wxTheApp && wxTheApp->Pending())
+ wxTheApp->Dispatch();
#if wxUSE_TIMER
- wxTimer::NotifyTimers();
+ wxTimer::NotifyTimers();
#endif
- ProcessIdle();
+ ProcessIdle();
- if (newEventLoop)
- {
- wxEventLoop::SetActive(NULL);
- delete newEventLoop;
- }
+ if (newEventLoop)
+ {
+ wxEventLoop::SetActive(NULL);
+ delete newEventLoop;
+ }
- s_inYield = FALSE;
+ s_inYield = FALSE;
+ }
return TRUE;
}
projects / wxWidgets.git / blobdiff