X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b3d5e55661cd0c5e6a7d8948abca54cfac31806..88f23fdd8366d57d15cba42d152539ff9ccbdd39:/src/os2/app.cpp diff --git a/src/os2/app.cpp b/src/os2/app.cpp index 3e752ba5ff..d0c2b5d7ed 100644 --- a/src/os2/app.cpp +++ b/src/os2/app.cpp @@ -9,6 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ + #pragma implementation "app.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,8 +31,9 @@ #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" @@ -36,6 +41,30 @@ #include "wx/os2/private.h" +#ifdef __EMX__ + +#include +#include + +#else + +#include +#include +#include +#include + +#endif // + +#ifndef __EMX__ + +#define select(a,b,c,d,e) bsdselect(a,b,c,d,e) +extern "C" int _System bsdselect(int, + struct fd_set *, + struct fd_set *, + struct fd_set *, + struct timeval *); +#endif + #if wxUSE_THREADS #include "wx/thread.h" @@ -47,9 +76,9 @@ WX_DEFINE_OBJARRAY(wxMsgArray); #endif // wxUSE_THREADS -#if wxUSE_WX_RESOURCES - #include "wx/resource.h" -#endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS #include #include @@ -59,29 +88,13 @@ // --------------------------------------------------------------------------- extern wxChar* wxBuffer; -extern wxChar* wxOsVersion; extern wxList* wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; -extern void wxSetKeyboardHook(bool doIt); extern wxCursor* g_globalCursor; -HINSTANCE wxhInstance = 0; +HAB vHabmain = NULLHANDLE; QMSG svCurrentMsg; -wxApp* wxTheApp = NULL; -HAB vHabmain = NULL; - -// FIXME why not const? and not static? - -// NB: all "NoRedraw" classes must have the same names as the "normal" classes -// with NR suffix - wxWindow::OS2Create() supposes this -wxChar wxFrameClassName[] = wxT("wxFrameClass"); -wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR"); -wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass"); -wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR"); -wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass"); -wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR"); -wxChar wxPanelClassName[] = wxT("wxPanelClass"); -wxChar wxCanvasClassName[] = wxT("wxCanvasClass"); + HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -93,16 +106,111 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -MRESULT 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 // --------------------------------------------------------------------------- @@ -115,51 +223,57 @@ MRESULT wxWndProc( HWND EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -//// Initialize -bool wxApp::Initialize( - HAB vHab -) +// +// Initialize +// +bool wxApp::Initialize(int& argc, wxChar **argv) { - // Some people may wish to use this, but - // probably it shouldn't be here by default. -#ifdef __WXDEBUG__ - // wxRedirectIOToConsole(); + if ( !wxAppBase::Initialize(argc, argv) ) + return false; + +#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 - wxBuffer = new wxChar[1500]; // FIXME; why? - - wxClassInfo::InitializeClasses(); + // + // OS2 has to have an anchorblock + // + vHabmain = WinInitialize(0); -#if wxUSE_RESOURCES - wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); -#endif + if (!vHabmain) + { + // TODO: at least give some error message here... + wxAppBase::CleanUp(); - // 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. - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + return FALSE; + } - wxInitializeStockLists(); - wxInitializeStockObjects(); + wxBuffer = new wxChar[1500]; // FIXME; why? -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); + // Some people may wish to use this, but + // probably it shouldn't be here by default. +#ifdef __WXDEBUG__ + // wxRedirectIOToConsole(); #endif - wxBitmap::InitStandardHandlers(); - - g_globalCursor = new wxCursor; - -#if 0 - wxSTD_FRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_FRAME"), TRUE); - wxSTD_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDIPARENTFRAME"), TRUE); - wxSTD_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxSTD_MDICHILDFRAME"), TRUE); - - wxDEFAULT_FRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_FRAME"), TRUE); - wxDEFAULT_MDIPARENTFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDIPARENTFRAME"), TRUE); - wxDEFAULT_MDICHILDFRAME_ICON = ::WinLoadFileIcon(wxT("wxDEFAULT_MDICHILDFRAME"), TRUE); -#endif - RegisterWindowClasses(vHab); wxWinHandleList = new wxList(wxKEY_INTEGER); // This is to foil optimizations in Visual C++ that throw out dummy.obj. @@ -169,176 +283,156 @@ bool wxApp::Initialize( if (wxDummyChar) wxDummyChar++; #endif - wxSetKeyboardHook(TRUE); + // wxSetKeyboardHook(TRUE); + + RegisterWindowClasses(vHab); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) - return FALSE; return TRUE; -} +} // end of wxApp::Initialize +const char* CANTREGISTERCLASS = " Can't register Class "; // --------------------------------------------------------------------------- // RegisterWindowClasses // --------------------------------------------------------------------------- -// TODO we should only register classes really used by the app. For this it -// would be enough to just delay the class registration until an attempt -// to create a window of this class is made. bool wxApp::RegisterWindowClasses( HAB vHab ) { - APIRET rc; - - if ((rc = ::WinRegisterClass( vHab - ,wxFrameClassName - ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME - ,0 - )) != 0) - { - wxLogLastError("RegisterClass(frame)"); + ERRORID vError = 0L; + wxString sError; + if (!::WinRegisterClass( vHab + ,wxFrameClassName + ,wxFrameWndProc + ,CS_SIZEREDRAW | CS_SYNCPAINT + ,sizeof(ULONG) + )) + { + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME + ,wxWndProc ,0 + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw frame)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIFrameClassName - ,(PFNWP)wxWndProc - ,CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME - ,0 + ,wxWndProc + ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(MDI parent)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPCHILDREN | CS_FRAME + ,wxWndProc ,0 + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw MDI parent)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIChildFrameClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST | CS_CLIPSIBLINGS | CS_FRAME - ,0 + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxMDIChildFrameClassNameNoRedraw - ,(PFNWP)wxWndProc - ,CS_HITTEST | CS_CLIPSIBLINGS | CS_FRAME - ,0 + ,wxWndProc + ,CS_HITTEST + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(no redraw MDI child)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxPanelClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_CLIPSIBLINGS | CS_SAVEBITS | CS_SYNCPAINT - ,0 + ,wxWndProc + ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(Panel)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } if (!::WinRegisterClass( vHab ,wxCanvasClassName - ,(PFNWP)wxWndProc - ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_CLIPSIBLINGS | CS_SAVEBITS | CS_SYNCPAINT - ,0 + ,wxWndProc + ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT + ,sizeof(ULONG) )) { - wxLogLastError("RegisterClass(Canvas)"); - + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); + return FALSE; + } + if (!::WinRegisterClass( vHab + ,wxCanvasClassNameNR + ,wxWndProc + ,CS_HITTEST | CS_SYNCPAINT + ,sizeof(ULONG) + )) + { + vError = ::WinGetLastError(vHab); + sError = wxPMErrorToStr(vError); + wxLogLastError(sError); return FALSE; } return TRUE; -} - -//// Cleans up any wxWindows internal structures left lying around +} // end of wxApp::RegisterWindowClasses +// +// Cleans up any wxWindows internal structures left lying around +// void wxApp::CleanUp() { - //// COMMON CLEANUP - -#if wxUSE_LOG - // flush the logged messages if any and install a 'safer' log target: the - // default one (wxLogGui) can't be used after the resources are freed just - // below and the user suppliedo ne might be even more unsafe (using any - // wxWindows GUI function is unsafe starting from now) - wxLog::DontCreateOnDemand(); - - // this will flush the old messages if any - delete wxLog::SetActiveTarget(new wxLogStderr); -#endif // wxUSE_LOG - - // One last chance for pending objects to be cleaned up - wxTheApp->DeletePendingObjects(); - - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); - - // wxDefaultResourceTable->ClearTable(); -#endif - - // Indicate that the cursor can be freed, so that cursor won't be deleted - // by deleting the bitmap list before g_globalCursor goes out of scope - // (double deletion of the cursor). - wxSetCursor(wxNullCursor); - delete g_globalCursor; - g_globalCursor = NULL; - - wxDeleteStockObjects(); - - // Destroy all GDI lists, etc. - wxDeleteStockLists(); - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; - - wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; wxBuffer = NULL; - //// WINDOWS-SPECIFIC CLEANUP + // + // PM-SPECIFIC CLEANUP + // - wxSetKeyboardHook(FALSE); + // wxSetKeyboardHook(FALSE); if (wxSTD_FRAME_ICON) ::WinFreeFileIcon(wxSTD_FRAME_ICON); @@ -362,164 +456,69 @@ void wxApp::CleanUp() if (wxWinHandleList) delete wxWinHandleList; - // 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 delete wxPendingEvents; +#if wxUSE_THREADS delete wxPendingEventsLocker; // If we don't do the following, we get an apparent memory leak. ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); #endif - wxClassInfo::CleanUpClasses(); - - delete wxTheApp; - wxTheApp = NULL; - -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft(TRUE) > 0) - { - wxLogDebug(wxT("There were memory leaks.")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - // wxDebugContext::SetStream(NULL, NULL); -#endif + // Delete Message queue + if (wxTheApp->m_hMq) + ::WinDestroyMsgQueue(wxTheApp->m_hMq); -#if wxUSE_LOG - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -#endif // wxUSE_LOG -} + wxAppBase::CleanUp(); +} // end of wxApp::CleanUp -int wxEntry( - int argc -, char* argv[] -) +bool wxApp::OnInitGui() { - HAB vHab = 0; - - if (!wxApp::Initialize(vHab)) - return 0; - - // - // create the application object or ensure that one already exists - // - if (!wxTheApp) - { - wxCHECK_MSG( wxApp::GetInitializerFunction() - ,-1 - ,wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") - ); - - wxAppInitializerFunction fnAppIni = wxApp::GetInitializerFunction(); - wxObject* pTest_app = fnAppIni(); - - wxTheApp = (wxApp*)pTest_app; - } - wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") ); - wxTheApp->argc = argc; - -#if wxUSE_UNICODE - wxTheApp->argv = new wxChar*[argc+1]; - - int nArgc = 0; - - while (nArgc < argc) - { - wxTheApp->argv[nArgc] = wxStrdup(wxConvLibc.cMB2WX(argv[nArgc])); - nArgc++; - } - wxTheApp->argv[nArgc] = (wxChar *)NULL; -#else - wxTheApp->argv = argv; -#endif - - wxString sName(wxFileNameFromPath(argv[0])); - - wxStripExtension(sName); - wxTheApp->SetAppName(sName); - - int nRetValue = 0; + ERRORID vError; + wxString sError; - if (!wxTheApp->OnInitGui()) - nRetValue = -1; - - if (nRetValue == 0) - { - if (wxTheApp->OnInit()) - { - nRetValue = -1; - } - } + if (!wxAppBase::OnInitGui()) + return FALSE; - if (nRetValue == 0) + m_hMq = ::WinCreateMsgQueue(vHabmain, 0); + if (!m_hMq) { - 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 - { - delete pTopWindow; - wxTheApp->SetTopWindow(NULL); - } - } + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogDebug(sError); + return FALSE; } - wxTheApp->OnExit(); - wxApp::CleanUp(); - return(nRetValue); -} - -bool wxApp::OnInitGui() -{ - vHabmain = WinInitialize(0); - m_hMq = WinCreateMsgQueue(vHabmain, 0); return TRUE; -} - -// -// Static member initialization -// -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; +} // end of wxApp::OnInitGui wxApp::wxApp() { m_topWindow = NULL; wxTheApp = this; - m_wantDebugOutput = TRUE; argc = 0; argv = NULL; 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() { -#if wxUSE_UNICODE + // // Delete command-line args - int i; + // +#if wxUSE_UNICODE + int i; + for (i = 0; i < argc; i++) { delete[] argv[i]; } delete[] argv; #endif -} +} // end of wxApp::~wxApp bool wxApp::Initialized() { @@ -527,15 +526,16 @@ bool wxApp::Initialized() return TRUE; else return FALSE; -} +} // end of wxApp::Initialized // // 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) { @@ -559,7 +559,7 @@ bool wxApp::DoMessage() static wxMsgArray svSavedMessages; // - // if a secondary thread owns is doing GUI calls, save all messages for + // If a secondary thread owns is doing GUI calls, save all messages for // later processing - we can't process them right now because it will // lead to recursive library calls (and we're not reentrant) // @@ -567,8 +567,10 @@ bool wxApp::DoMessage() { sbHadGuiLock = FALSE; - // leave out WM_COMMAND messages: too dangerous, sometimes + // + // Leave out WM_COMMAND messages: too dangerous, sometimes // the message will be processed twice + // if ( !wxIsWaitingForThread() || svCurrentMsg.msg != WM_COMMAND ) { @@ -579,12 +581,9 @@ bool wxApp::DoMessage() else { // - // have we just regained the GUI lock? if so, post all of the saved + // Have we just regained the GUI lock? if so, post all of the saved // messages // - // FIXME of course, it's not _exactly_ the same as processing the - // messages normally - expect some things to break... - // if (!sbHadGuiLock ) { sbHadGuiLock = TRUE; @@ -595,24 +594,30 @@ bool wxApp::DoMessage() { QMSG vMsg = svSavedMessages[n]; - if ( !ProcessMessage((WXMSG *)&vMsg) ) - { - ::WinDispatchMsg(vHabmain, &vMsg); - } + DoMessage((WXMSG*)&vMsg); } svSavedMessages.Empty(); } } #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 ////////////////////////////////////////////////////////////////////////////// // @@ -638,53 +643,30 @@ int wxApp::MainLoop() #if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - while (!::WinPeekMsg(vHabmain, &svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) + while (!Pending() && ProcessIdle()) { + HandleSockets(); + wxUsleep(10000); } - DoMessage(); - } - return (int)svCurrentMsg.mp1; -} - -// -// Returns TRUE if more time is needed. -// -bool wxApp::ProcessIdle() -{ - wxIdleEvent vEvent; - - vEvent.SetEventObject(this); - ProcessEvent(vEvent); - return vEvent.MoreRequested(); -} - -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode* pNode = wxPendingEvents->First(); - wxCriticalSectionLocker vLocker(*wxPendingEventsLocker); - - while (pNode) - { - wxEvtHandler* pHandler = (wxEvtHandler *)pNode->Data(); - pHandler->ProcessPendingEvents(); + HandleSockets(); + if (Pending()) + DoMessage(); + else + wxUsleep(10000); - delete pNode; - pNode = wxPendingEvents->First(); } -} -#endif + return (int)svCurrentMsg.mp1; +} // end of wxApp::MainLoop void wxApp::ExitMainLoop() { - m_bKeepGoing = FALSE; -} + ::WinPostMsg(NULL, WM_QUIT, 0, 0); +} // end of wxApp::ExitMainLoop bool wxApp::Pending() { return (::WinPeekMsg(vHabmain, (PQMSG)&svCurrentMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) != 0); -} +} // end of wxApp::Pending void wxApp::Dispatch() { @@ -702,13 +684,34 @@ bool wxApp::ProcessMessage( 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; // - // for some composite controls (like a combobox), wndThis might be NULL + // Pass non-system timer messages to the wxTimerProc + // + if (pMsg->msg == WM_TIMER && + (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR && + SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW && + SHORT1FROMMP(pMsg->mp1) != TID_SCROLL && + SHORT1FROMMP(pMsg->mp1) != 0x0000 + )) + wxTimerProc(NULL, 0, (int)pMsg->mp1, 0); + + // + // Allow the window to prevent certain messages from being + // translated/processed (this is currently used by wxTextCtrl to always + // grab Ctrl-C/V/X, even if they are also accelerators in some parent) + // + if (pWndThis && !pWndThis->OS2ShouldPreProcessMessage(pWxmsg)) + { + return FALSE; + } + + // + // For some composite controls (like a combobox), wndThis might be NULL // because the subcontrol is not a wxWindow, but only the control itself // is - try to catch this case // @@ -718,140 +721,84 @@ bool wxApp::ProcessMessage( pWndThis = wxFindWinFromHandle((WXHWND)hWnd); } - // Anyone for a non-translation message? Try youngest descendants first. - for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent()) + // + // 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. + // + 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 + +bool gbInOnIdle = FALSE; void wxApp::OnIdle( wxIdleEvent& rEvent ) { - static bool sbInOnIdle = FALSE; // // Avoid recursion (via ProcessEvent default case) // - if (sbInOnIdle ) + if (gbInOnIdle) return; - sbInOnIdle = TRUE; - - // - // 'Garbage' collection of windows deleted with Close(). - // - DeletePendingObjects(); + gbInOnIdle = TRUE; + + wxAppBase::OnIdle(event); -#if wxUSE_LOG - // flush the logged messages if any - wxLog* pLog = wxLog::GetActiveTarget(); +#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(HWND_DESKTOP, VK_BUTTON1) && + !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) && + !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2)) + wxDC::ClearCache(); +#endif // wxUSE_DC_CACHEING - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); -#endif // wxUSE_LOG - - // Send OnIdle events to all windows - if (SendIdleEvents()) - { - // - // SendIdleEvents() returns TRUE if at least one window requested more - // idle events - // - rEvent.RequestMore(TRUE); - } - - // - // If they are pending events, we must process them. - // -#if wxUSE_THREADS - ProcessPendingEvents(); -#endif - sbInOnIdle = FALSE; -} - -void wxWakeUpIdle() -{ - // **** please implement me! **** - // Wake up the idle handler processor, even if it is in another thread... -} - -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() -{ - bool bNeedMore = FALSE; - wxWindowList::Node* pNode = wxTopLevelWindows.GetFirst(); - - while (pNode) - { - wxWindow* pWin = pNode->GetData(); - - if (SendIdleEvents(pWin)) - bNeedMore = TRUE; - pNode = pNode->GetNext(); - } - return bNeedMore; -} - -// -// Send idle event to window and all subwindows -// -bool wxApp::SendIdleEvents( - wxWindow* pWin -) -{ - bool bNeedMore = FALSE; - wxIdleEvent vEvent; - - vEvent.SetEventObject(pWin); - pWin->GetEventHandler()->ProcessEvent(vEvent); - - if (vEvent.MoreRequested()) - bNeedMore = TRUE; - - wxNode* pNode = pWin->GetChildren().First(); - - while (pNode) - { - wxWindow* pWin = (wxWindow*) pNode->Data(); - - if (SendIdleEvents(pWin)) - bNeedMore = TRUE; - pNode = pNode->Next(); - } - return bNeedMore; -} - -void wxApp::DeletePendingObjects() -{ - wxNode* pNode = wxPendingDelete.First(); - - while (pNode) - { - wxObject* pObj = (wxObject *)pNode->Data(); - - delete pObj; - - if (wxPendingDelete.Member(pObj)) - delete pNode; - - // - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - // - pNode = wxPendingDelete.First(); - } -} + gbInOnIdle = FALSE; +} // end of wxApp::OnIdle void wxApp::OnEndSession( wxCloseEvent& WXUNUSED(rEvent)) { if (GetTopWindow()) GetTopWindow()->Close(TRUE); -} +} // end of wxApp::OnEndSession // // Default behaviour: close the application with prompts. The @@ -866,66 +813,153 @@ void wxApp::OnQueryEndSession( if (!GetTopWindow()->Close(!rEvent.CanVeto())) rEvent.Veto(TRUE); } -} +} // end of wxApp::OnQueryEndSession -void wxExit() +void wxApp::Exit() { - wxLogError(_("Fatal error: exiting")); - wxApp::CleanUp(); -} + // VZ: must really exit somehow, insert appropriate OS/2 syscall (FIXME) + wxAppConsole::Exit(); +} // end of wxExit + +// // Yield to incoming messages -bool wxYield() +// +bool wxApp::Yield(bool onlyIfNeeded) { + static bool s_inYield = FALSE; + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( _T("wxYield() called recursively") ); + } + + return FALSE; + } + HAB vHab = 0; QMSG vMsg; + + // + // Disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + // + wxLog::Suspend(); + + s_inYield = TRUE; + + // // We want to go back to the main message loop // if we see a WM_QUIT. (?) + // while (::WinPeekMsg(vHab, &vMsg, (HWND)NULL, 0, 0, PM_NOREMOVE) && vMsg.msg != WM_QUIT) { +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS if (!wxTheApp->DoMessage()) break; } + // // If they are pending events, we must process them. -#if wxUSE_THREADS - wxTheApp->ProcessPendingEvents(); -#endif + // + if (wxTheApp) + wxTheApp->ProcessPendingEvents(); + + // + // Let the logs be flashed again + // + wxLog::Resume(); + s_inYield = FALSE; return TRUE; -} +} // end of wxYield -wxIcon wxApp::GetStdIcon( - int nWhich -) const +int wxApp::AddSocketHandler(int handle, int mask, + void (*callback)(void*), void * gsock) { - switch(nWhich) + 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) { - case wxICON_INFORMATION: - return wxIcon("wxICON_INFO"); + // 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; +} - case wxICON_QUESTION: - return wxIcon("wxICON_QUESTION"); +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; + } +} - case wxICON_EXCLAMATION: - return wxIcon("wxICON_WARNING"); +//----------------------------------------------------------------------------- +// wxWakeUpIdle +//----------------------------------------------------------------------------- - default: - wxFAIL_MSG(wxT("requested non existent standard icon")); - // still fall through +void wxApp::WakeUpIdle() +{ + // + // Send the top window a dummy message so idle handler processing will + // start up again. Doing it this way ensures that the idle handler + // wakes up in the right thread (see also wxWakeUpMainThread() which does + // the same for the main app thread only) + // + wxWindow* pTopWindow = wxTheApp->GetTopWindow(); - case wxICON_HAND: - return wxIcon("wxICON_ERROR"); + if (pTopWindow) + { + if ( !::WinPostMsg(GetHwndOf(pTopWindow), WM_NULL, (MPARAM)0, (MPARAM)0)) + { + // + // Should never happen + // + wxLogLastError("PostMessage(WM_NULL)"); + } } - return wxIcon("wxICON_ERROR"); -} +} // end of wxWakeUpIdle -HINSTANCE wxGetInstance() +HAB wxGetInstance() { - return wxhInstance; + return vHabmain; } -void wxSetInstance(HINSTANCE hInst) +void wxSetInstance( + HAB vHab +) { - wxhInstance = hInst; + vHabmain = vHab; }