#include "wx/msgdlg.h"
#include "wx/intl.h"
#include "wx/dynarray.h"
-# include "wx/wxchar.h"
-# include "wx/icon.h"
+ #include "wx/wxchar.h"
+ #include "wx/icon.h"
+ #include "wx/timer.h"
#endif
#include "wx/log.h"
#include "wx/os2/private.h"
+#ifdef __EMX__
+
+#include <sys\ioctl.h>
+#include <sys\select.h>
+
+#else
+
+#include <nerrno.h>
+#include <ioctl.h>
+#include <select.h>
+
+#endif // ndef for __EMX__
+
+#ifndef __EMX__
+
+#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
+int _System bsdselect(int,
+ struct fd_set *,
+ struct fd_set *,
+ struct fd_set *,
+ struct timeval *);
+
+#endif
+
#if wxUSE_THREADS
#include "wx/thread.h"
// ---------------------------------------------------------------------------
extern wxChar* wxBuffer;
-extern wxChar* wxOsVersion;
extern wxList* wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
extern wxCursor* g_globalCursor;
HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
-MRESULT EXPENTRY wxWndProc( HWND
- ,ULONG
- ,MPARAM
- ,MPARAM
- );
+MRESULT EXPENTRY wxWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
+MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
// ===========================================================================
// implementation
// ===========================================================================
+// ---------------------------------------------------------------------------
+// helper struct and functions for socket handling
+// ---------------------------------------------------------------------------
+
+struct GsocketCallbackInfo{
+ void (*proc)(void *);
+ int type;
+ int handle;
+ void* gsock;
+};
+
+// These defines and wrapper functions are used here and in gsockpm.c
+#define wxSockReadMask 0x01
+#define wxSockWriteMask 0x02
+
+#ifdef __EMX__
+extern "C"
+int wxAppAddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+extern "C"
+void wxAppRemoveSocketHandler(int handle)
+{
+ wxTheApp->RemoveSocketHandler(handle);
+}
+#else
+// Linkage mode problems using callbacks with extern C in a .cpp module
+int wxAppAddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+void wxAppRemoveSocketHandler(int handle)
+{
+ wxTheApp->RemoveSocketHandler(handle);
+}
+#endif
+
+void wxApp::HandleSockets()
+{
+ bool pendingEvent = FALSE;
+
+ // Check whether it's time for Gsocket operation
+ if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
+ {
+ fd_set readfds = m_readfds;
+ fd_set writefds = m_writefds;
+ struct timeval timeout;
+ int i;
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ int r = 0;
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 0;
+ if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0)
+ {
+ for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; i++)
+ {
+ if (i == m_maxSocketNr)
+ i = 0;
+ if (FD_ISSET(i, &readfds))
+ {
+ int r;
+ for (r = 0; r < m_maxSocketHandles; r++){
+ if(CallbackInfo[r].handle == i &&
+ CallbackInfo[r].type == wxSockReadMask)
+ break;
+ }
+ if (r < m_maxSocketHandles)
+ {
+ CallbackInfo[r].proc(CallbackInfo[r].gsock);
+ pendingEvent = TRUE;
+ wxYield();
+ }
+ }
+ if (FD_ISSET(i, &writefds))
+ {
+ int r;
+ for (r = 0; r < m_maxSocketHandles; r++)
+ if(CallbackInfo[r].handle == i &&
+ CallbackInfo[r].type == wxSockWriteMask)
+ break;
+ if (r < m_maxSocketHandles)
+ {
+ CallbackInfo[r].proc(CallbackInfo[r].gsock);
+ pendingEvent = TRUE;
+ wxYield();
+ }
+ }
+ }
+ m_lastUsedHandle = i;
+ }
+ if (pendingEvent)
+ wxYield();
+ }
+}
// ---------------------------------------------------------------------------
// wxApp
// ---------------------------------------------------------------------------
HAB vHab
)
{
+#if defined(wxUSE_CONSOLEDEBUG)
+ #if wxUSE_CONSOLEDEBUG
+/***********************************************/
+/* Code for using stdout debug */
+/* To use it you mast link app as "Window" - EK*/
+/***********************************************/
+ {
+ PPIB pib;
+ PTIB tib;
+
+ printf("In console\n");
+
+ DosGetInfoBlocks(&tib, &pib);
+/* Try morphing into a PM application. */
+// if(pib->pib_ultype == 2) /* VIO */
+ pib->pib_ultype = 3;
+ }
+/**********************************************/
+/**********************************************/
+ #endif //wxUSE_CONSOLEDEBUG
+#endif
+
//
// OS2 has to have an anchorblock
//
wxClassInfo::InitializeClasses();
-#if wxUSE_RESOURCES
- wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
-
#if wxUSE_THREADS
wxPendingEventsLocker = new wxCriticalSection;
#endif
return TRUE;
} // end of wxApp::Initialize
+const char* CANTREGISTERCLASS = " Can't register Class ";
// ---------------------------------------------------------------------------
// RegisterWindowClasses
// ---------------------------------------------------------------------------
if (!::WinRegisterClass( vHab
,wxFrameClassName
- ,(PFNWP)wxWndProc
- ,CS_SIZEREDRAW | CS_SYNCPAINT
+ ,wxFrameWndProc
+ ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_CLIPCHILDREN
,sizeof(ULONG)
))
{
if (!::WinRegisterClass( vHab
,wxFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
- ,0
+ ,wxWndProc
,0
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxMDIFrameClassName
- ,(PFNWP)wxWndProc
- ,CS_SIZEREDRAW | CS_SYNCPAINT
- ,0
+ ,wxWndProc
+ ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxMDIFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
- ,0
+ ,wxWndProc
,0
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxMDIChildFrameClassName
- ,(PFNWP)wxWndProc
+ ,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
- ,0
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxMDIChildFrameClassNameNoRedraw
- ,(PFNWP)wxWndProc
+ ,wxWndProc
,CS_HITTEST
- ,0
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxPanelClassName
- ,(PFNWP)wxWndProc
+ ,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
- ,0
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
if (!::WinRegisterClass( vHab
,wxCanvasClassName
- ,(PFNWP)wxWndProc
- ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
- ,0
+ ,wxWndProc
+ ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN
+ ,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
wxClassInfo::CleanUpClasses();
+ // Delete Message queue
+ if (wxTheApp->m_hMq)
+ ::WinDestroyMsgQueue(wxTheApp->m_hMq);
+
delete wxTheApp;
wxTheApp = NULL;
#endif // wxUSE_LOG
} // end of wxApp::CleanUp
+//----------------------------------------------------------------------
+// Main wxWindows entry point
+//----------------------------------------------------------------------
int wxEntry(
int argc
, char* argv[]
if (wxTheApp->OnInit())
{
nRetValue = wxTheApp->OnRun();
-// nRetValue = -1;
- }
- }
-
- wxWindow* pTopWindow = wxTheApp->GetTopWindow();
-
- if (pTopWindow)
- {
- // Forcibly delete the window.
- if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
- {
- pTopWindow->Close(TRUE);
- wxTheApp->DeletePendingObjects();
}
- else
+ // Normal exit
+ wxWindow* pTopWindow = wxTheApp->GetTopWindow();
+ if (pTopWindow)
{
- delete pTopWindow;
- wxTheApp->SetTopWindow(NULL);
+ // Forcibly delete the window.
+ if (pTopWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+ pTopWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ {
+ pTopWindow->Close(TRUE);
+ wxTheApp->DeletePendingObjects();
+ }
+ else
+ {
+ delete pTopWindow;
+ wxTheApp->SetTopWindow(NULL);
+ }
}
}
+ else // app initialization failed
+ {
+ wxLogLastError(" Gui initialization failed, exitting");
+ }
+#if wxUSE_CONSOLEDEBUG
+ printf("wxTheApp->OnExit ");
+ fflush(stdout);
+#endif
wxTheApp->OnExit();
+#if wxUSE_CONSOLEDEBUG
+ printf("wxApp::CleanUp ");
+ fflush(stdout);
+#endif
wxApp::CleanUp();
+#if wxUSE_CONSOLEDEBUG
+ printf("return %i ", nRetValue);
+ fflush(stdout);
+#endif
return(nRetValue);
} // end of wxEntry
m_nPrintMode = wxPRINT_WINDOWS;
m_exitOnFrameDelete = TRUE;
m_bAuto3D = TRUE;
+ m_hMq = 0;
+ m_maxSocketHandles = 0;
+ m_maxSocketNr = 0;
+ m_sockCallbackInfo = 0;
} // end of wxApp::wxApp
wxApp::~wxApp()
// Get and process a message, returning FALSE if WM_QUIT
// received (and also set the flag telling the app to exit the main loop)
//
+
bool wxApp::DoMessage()
{
- BOOL bRc = ::WinGetMsg(vHabmain, &m_vMsg, HWND(NULL), 0, 0);
+ BOOL bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);
if (bRc == 0)
{
}
#endif // wxUSE_THREADS
+ //
// Process the message
- if (!ProcessMessage((WXMSG *)&svCurrentMsg) )
- {
- ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
- }
+ //
+ DoMessage((WXMSG *)&svCurrentMsg);
}
return TRUE;
} // end of wxApp::DoMessage
+void wxApp::DoMessage(
+ WXMSG* pMsg
+)
+{
+ if (!ProcessMessage((WXMSG *)&svCurrentMsg))
+ {
+ ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
+ }
+} // end of wxApp::DoMessage
+
//////////////////////////////////////////////////////////////////////////////
//
// Keep trying to process messages until WM_QUIT
#endif // wxUSE_THREADS
while (!Pending() && ProcessIdle())
{
+ HandleSockets();
+ wxUsleep(10000);
}
- DoMessage();
+ HandleSockets();
+ if (Pending())
+ DoMessage();
+ else
+ wxUsleep(10000);
+
}
return (int)svCurrentMsg.mp1;
} // end of wxApp::MainLoop
WXMSG* pWxmsg
)
{
- QMSG* vMsg = (PQMSG)pWxmsg;
- HWND hWnd = vMsg->hwnd;
+ QMSG* pMsg = (PQMSG)pWxmsg;
+ HWND hWnd = pMsg->hwnd;
wxWindow* pWndThis = wxFindWinFromHandle((WXHWND)hWnd);
wxWindow* pWnd;
// We must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
// popup the tooltip bubbles
//
- if (pWndThis && (vMsg->msg == WM_MOUSEMOVE))
+ if (pWndThis && (pMsg->msg == WM_MOUSEMOVE))
{
wxToolTip* pToolTip = pWndThis->GetToolTip();
if (pToolTip)
}
#endif // wxUSE_TOOLTIPS
+ //
+ // We must relay Timer events to wxTimer's processing function
+ //
+ if (pMsg->msg == WM_TIMER)
+ wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
+
//
// For some composite controls (like a combobox), wndThis might be NULL
// because the subcontrol is not a wxWindow, but only the control itself
}
//
- // Anyone for a non-translation message? Try youngest descendants first.
+ // Try translations first; find the youngest window with
+ // a translation table. OS/2 has case sensative accels, so
+ // this block, coded by BK, removes that and helps make them
+ // case insensative.
//
- for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+ if(pMsg->msg == WM_CHAR)
{
- if (pWnd->OS2ProcessMessage(pWxmsg))
- return TRUE;
+ PBYTE pChmsg = (PBYTE)&(pMsg->msg);
+ USHORT uSch = CHARMSG(pChmsg)->chr;
+ bool bRc;
+
+ //
+ // Do not process keyup events
+ //
+ if(!(CHARMSG(pChmsg)->fs & KC_KEYUP))
+ {
+ if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)
+ CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch);
+
+
+ for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
+ {
+ if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE)
+ break;
+ }
+
+ if(!bRc) // untranslated, should restore original value
+ CHARMSG(pChmsg)->chr = uSch;
+ }
}
+ //
+ // Anyone for a non-translation message? Try youngest descendants first.
+ //
+// for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+// {
+// if (pWnd->OS2ProcessMessage(pWxmsg))
+// return TRUE;
+// }
return FALSE;
} // end of wxApp::ProcessMessage
//
// Avoid recursion (via ProcessEvent default case)
//
- if (sbInOnIdle )
+ if (sbInOnIdle)
return;
sbInOnIdle = TRUE;
wxLog::FlushActive();
#endif // wxUSE_LOG
+#if wxUSE_DC_CACHEING
+ // automated DC cache management: clear the cached DCs and bitmap
+ // if it's likely that the app has finished with them, that is, we
+ // get an idle event and we're not dragging anything.
+ if (!::WinGetKeyState(MK_LBUTTON) &&
+ !::WinGetKeyState(MK_MBUTTON) &&
+ !::WinGetKeyState(MK_RBUTTON))
+ wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+
//
// Send OnIdle events to all windows
//
wxApp::CleanUp();
} // end of wxExit
+static bool gs_inYield = FALSE;
+
//
// Yield to incoming messages
//
//
wxLog::Suspend();
+ gs_inYield = TRUE;
+
//
// We want to go back to the main message loop
// if we see a WM_QUIT. (?)
// Let the logs be flashed again
//
wxLog::Resume();
+ gs_inYield = FALSE;
return TRUE;
} // end of wxYield
+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
+{
+ if (gs_inYield)
+ return FALSE;
+
+ return wxYield();
+}
+
wxIcon wxApp::GetStdIcon(
int nWhich
) const
return wxIcon("wxICON_ERROR");
} // end of wxApp::GetStdIcon
+int wxApp::AddSocketHandler(int handle, int mask,
+ void (*callback)(void*), void * gsock)
+{
+ int find;
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+
+ for (find = 0; find < m_maxSocketHandles; find++)
+ if (CallbackInfo[find].handle == -1)
+ break;
+ if (find == m_maxSocketHandles)
+ {
+ // Allocate new memory
+ m_sockCallbackInfo = realloc(m_sockCallbackInfo,
+ (m_maxSocketHandles+=10)*
+ sizeof(struct GsocketCallbackInfo));
+ CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ for (find = m_maxSocketHandles - 10; find < m_maxSocketHandles; find++)
+ CallbackInfo[find].handle = -1;
+ find = m_maxSocketHandles - 10;
+ }
+ CallbackInfo[find].proc = callback;
+ CallbackInfo[find].type = mask;
+ CallbackInfo[find].handle = handle;
+ CallbackInfo[find].gsock = gsock;
+ if (mask & wxSockReadMask)
+ FD_SET(handle, &m_readfds);
+ if (mask & wxSockWriteMask)
+ FD_SET(handle, &m_writefds);
+ if (handle >= m_maxSocketNr)
+ m_maxSocketNr = handle + 1;
+ return find;
+}
+
+void wxApp::RemoveSocketHandler(int handle)
+{
+ struct GsocketCallbackInfo
+ *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+ if (handle < m_maxSocketHandles)
+ {
+ if (CallbackInfo[handle].type & wxSockReadMask)
+ FD_CLR(CallbackInfo[handle].handle, &m_readfds);
+ if (CallbackInfo[handle].type & wxSockWriteMask)
+ FD_CLR(CallbackInfo[handle].handle, &m_writefds);
+ CallbackInfo[handle].handle = -1;
+ }
+}
+
//-----------------------------------------------------------------------------
// wxWakeUpIdle
//-----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff