///////////////////////////////////////////////////////////////////////////////
-// Name: motif/evtloop.cpp
+// Name: src/motif/evtloop.cpp
// Purpose: implements wxEventLoop for Motif
// Author: Mattia Barbon
// Modified by:
// Created: 01.11.02
// RCS-ID: $Id$
// Copyright: (c) 2002 Mattia Barbon
-// License: wxWindows license
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "evtloop.h"
-#endif
-
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
+ #include "wx/event.h"
+ #include "wx/app.h"
+ #include "wx/window.h"
+ #include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/evtloop.h"
-#include "wx/event.h"
-#include "wx/app.h"
+#include "wx/thread.h"
#ifdef __VMS__
-#pragma message disable nosimpint
+ #pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
#ifdef __VMS__
-#pragma message enable nosimpint
+ #pragma message enable nosimpint
#endif
+#include "wx/unix/private.h"
#include "wx/motif/private.h"
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
static bool CheckForKeyUp(XEvent* event);
static bool CheckForKeyDown(XEvent* event);
static bool CheckForAccelerator(XEvent* event);
static bool SendIdleMessage()
{
- wxIdleEvent event;
-
- return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+ return wxTheApp->ProcessIdle();
}
bool wxEventLoopImpl::SendIdleMessage()
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-
-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()
{
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
}
-bool wxEventLoop::IsRunning() const
-{
- return m_impl != NULL;
-}
-
-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()
{
// event loops are not recursive, you need to create another loop!
wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
- wxEventLoop *oldLoop = ms_activeLoop;
- ms_activeLoop = this;
+ wxEventLoopActivator activate(this);
m_impl = new wxEventLoopImpl;
m_impl->SetKeepGoing( true );
break;
}
+ OnExit();
+
int exitcode = m_impl->GetExitCode();
delete m_impl;
m_impl = NULL;
- ms_activeLoop = oldLoop;
-
return exitcode;
}
-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)
{
wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
// wxEventLoop message processing dispatching
// ----------------------------------------------------------------------------
-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const
{
return XtAppPending( (XtAppContext)wxTheApp->GetAppContext() ) != 0;
}
-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()
{
XEvent event;
XtAppContext context = (XtAppContext)wxTheApp->GetAppContext();
ProcessXEvent( &event );
}
else
-#ifdef __VMS
- XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput );
-#else
- XtAppProcessEvent( context, XtIMTimer|XtIMAlternateInput|XtIMSignal );
+ {
+ XtAppProcessEvent( context, XtIMTimer | XtIMAlternateInput
+#ifdef XtIMSignal
+ | XtIMSignal
#endif
-
+ );
+ }
+
return m_impl ? m_impl->GetKeepGoing() : true;
}
* window is recieved. Prevents flicker as windows are resized.
*/
- Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
+ Display *disp = event->xany.display;
Window win = event->xany.window;
XEvent report;
{
// Find a wxWindow for this window
// TODO: should get display for the window, not the current display
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+ Widget widget = XtWindowToWidget(event->xany.display,
event->xany.window);
wxWindow* win = NULL;
// Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
+ while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))
widget = XtParent(widget);
if (!widget || !win)
{
if (event->xany.type == KeyPress)
{
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- event->xany.window);
+ Widget widget = XtWindowToWidget(event->xany.display,
+ event->xany.window);
wxWindow* win = NULL;
// Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
+ while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))
widget = XtParent(widget);
if (!widget || !win)
wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event);
- return win->ProcessEvent( keyEvent );
+ return win->HandleWindowEvent( keyEvent );
}
return false;
{
if (event->xany.type == KeyRelease)
{
- Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- event->xany.window);
+ Widget widget = XtWindowToWidget(event->xany.display,
+ event->xany.window);
wxWindow* win = NULL;
// Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
+ while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))
widget = XtParent(widget);
if (!widget || !win)
wxKeyEvent keyEvent(wxEVT_KEY_UP);
wxTranslateKeyEvent(keyEvent, win, (Widget) 0, event);
- return win->ProcessEvent( keyEvent );
+ return win->HandleWindowEvent( keyEvent );
}
return false;
// executes one main loop iteration (declared in include/wx/motif/private.h)
// ----------------------------------------------------------------------------
-bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
+bool wxDoEventLoopIteration( wxGUIEventLoop& evtLoop )
{
+ bool moreRequested, pendingEvents;
+
+ for(;;)
+ {
+ pendingEvents = evtLoop.Pending();
+ if( pendingEvents ) break;
+ moreRequested = ::SendIdleMessage();
+ if( !moreRequested ) break;
+ }
+
#if wxUSE_THREADS
- // leave the main loop to give other threads a chance to
- // perform their GUI work
- wxMutexGuiLeave();
- wxUsleep(20);
- wxMutexGuiEnter();
+ if( !pendingEvents && !moreRequested )
+ {
+ // leave the main loop to give other threads a chance to
+ // perform their GUI work
+ wxMutexGuiLeave();
+ wxMilliSleep(20);
+ wxMutexGuiEnter();
+ }
#endif
- while ( !evtLoop.Pending() && ::SendIdleMessage() )
- ;
-
if( !evtLoop.Dispatch() )
return false;
// also wxEventLoop::Exit is implemented that way, so that exiting an
// event loop won't require an event being in the queue
-#include "wx/module.h"
-
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
-static XtInputId inputId;
static int idleFds[2] = { -1, -1 };
class wxIdlePipeModule : public wxModule
virtual bool OnInit()
{
+ // Must be done before modules are initialized
+#if 0
if( pipe(idleFds) != 0 )
return false;
-
+#endif
return true;
}
close( idleFds[1] );
}
private:
- DECLARE_DYNAMIC_CLASS(wxIdlePipeModule);
+ DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
};
-IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
+IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)
static void wxInputCallback( XtPointer, int* fd, XtInputId* )
{
timeout.tv_sec = 0;
timeout.tv_usec = 0;
- FD_ZERO( &in );
- FD_SET( *fd, &in );
+ wxFD_ZERO( &in );
+ wxFD_SET( *fd, &in );
if( select( *fd + 1, &in, NULL, NULL, &timeout ) <= 0 )
break;
static void wxBreakDispatch()
{
- char dummy;
+ char dummy = 0; // for valgrind
// check if wxWakeUpIdle has already been called
fd_set in;
timeout.tv_sec = 0;
timeout.tv_usec = 0;
- FD_ZERO( &in );
- FD_SET( idleFds[0], &in );
+ wxFD_ZERO( &in );
+ wxFD_SET( idleFds[0], &in );
if( select( idleFds[0] + 1, &in, NULL, NULL, &timeout ) > 0 )
return;
write( idleFds[1], &dummy, 1 );
}
-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()
{
::wxBreakDispatch();
}
+bool wxInitIdleFds()
+{
+ if( pipe(idleFds) != 0 )
+ return false;
+ return true;
+}
+
bool wxAddIdleCallback()
{
+ if (!wxInitIdleFds())
+ return false;
+
// install input handler for wxWakeUpIdle
- inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
- idleFds[0],
- (XtPointer)XtInputReadMask,
- wxInputCallback,
- NULL );
+ XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
+ idleFds[0],
+ (XtPointer)XtInputReadMask,
+ wxInputCallback,
+ NULL);
return true;
}
-
projects / wxWidgets.git / blobdiff