X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b260bc3e2f269de090eefdaefc1450207a7734e..952ae1e88b9092f493b4ea6911a2b60b378d422d:/src/mgl/window.cpp diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 7e63e26d4b..36e2e13443 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -64,9 +64,14 @@ winmng_t *g_winMng = NULL; MGLDevCtx *g_displayDC = NULL; // the window that has keyboard focus: -static wxWindowMGL *g_focusedWindow = NULL; +static wxWindowMGL *gs_focusedWindow = NULL; // the window that is currently under mouse cursor: -static wxWindowMGL *g_windowUnderMouse = NULL; +static wxWindowMGL *gs_windowUnderMouse = NULL; +// the window that has mouse capture +static wxWindowMGL *gs_mouseCapture = NULL; +// the frame that is currently active (i.e. its child has focus). It is +// used to generate wxActivateEvents +static wxWindowMGL *gs_activeFrame = NULL; // --------------------------------------------------------------------------- // constants @@ -85,107 +90,68 @@ enum // private functions // --------------------------------------------------------------------------- -// wxCreateMGL_WM creates MGL display DC and associates it with winmng_t -// structure. Dimensions and depth of the DC are fetched from wxSystemOptions -// object. -// This function is *not* called from wxApp's initialization but rather at -// the time when WM is needed, i.e. when first wxWindow is created. This -// has two important effects: -// a) it is possible to write windowless wxMGL apps -// b) the app has plenty of time in wxApp::OnInit to feed wxSystemOptions -// with desired settings - -// FIXME_MGL -- move to app.cpp?? -static void wxDesktopPainter(window_t *wnd, MGLDC *dc) +// Returns toplevel grandparent of given window: +static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win) { - // FIXME_MGL - for now... - MGL_setColorRGB(0x63, 0x63, 0x96); - MGL_fillRectCoord(0, 0, wnd->width, wnd->height); + wxWindowMGL *p = win; + while (p && !p->IsTopLevel()) + p = p->GetParent(); + return p; } - -bool wxCreateMGL_WM() +#ifdef __WXDEBUG__ +// Add an easy way to capture screenshots: +static void CaptureScreenshot() { - int mode; - int width = 640, height = 480, depth = 16; - int refresh = MGL_DEFAULT_REFRESH; - -#if wxUSE_SYSTEM_OPTIONS - // FIXME_MGL -- so what is The Proper Way? - if ( wxSystemOptions::HasOption(wxT("mgl.screen-width") ) - width = wxSystemOptions::GetOptionInt(wxT("mgl.screen-width")); - if ( wxSystemOptions::HasOption(wxT("mgl.screen-height") ) - height = wxSystemOptions::GetOptionInt(wxT("mgl.screen-height")); - if ( wxSystemOptions::HasOption(wxT("mgl.screen-depth") ) - depth = wxSystemOptions::GetOptionInt(wxT("mgl.screen-depth")); - if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh") ) - refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh")); -#endif - - mode = MGL_findMode(width, height, depth); - if ( mode == -1 ) - { - wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), width, height, depth); - mode = 0; // always available - } - g_displayDC = new MGLDisplayDC(mode, 1, refresh); - if ( !g_displayDC->isValid() ) - { - delete g_displayDC; - g_displayDC = NULL; - return FALSE; - } - - g_winMng = MGL_wmCreate(g_displayDC->getDC()); - if (!g_winMng) - return FALSE; - - MGL_wmSetWindowPainter(MGL_wmGetRootWindow(g_winMng), wxDesktopPainter); + wxBusyCursor bcur; - return TRUE; -} - -void wxDestroyMGL_WM() -{ - if ( g_winMng ) - { - MGL_wmDestroy(g_winMng); - g_winMng = NULL; - } - if ( g_displayDC ) - { - delete g_displayDC; - g_displayDC = NULL; - } + static int screenshot_num = 0; + char screenshot[128]; + sprintf(screenshot, "screenshot-%03i.png", screenshot_num++); + g_displayDC->savePNGFromDC(screenshot, 0, 0, + g_displayDC->sizex(), + g_displayDC->sizey()); } +#endif // --------------------------------------------------------------------------- // MGL_WM hooks: // --------------------------------------------------------------------------- -static void wxWindowPainter(window_t *wnd, MGLDC *dc) +static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc) { wxWindowMGL *w = (wxWindow*) wnd->userData; - if (w) + + if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) ) { MGLDevCtx ctx(dc); w->HandlePaint(&ctx); } - // FIXME_MGL -- root window should be a regular window so that - // enter/leave and activate/deactivate events work correctly } -static ibool wxWindowMouseHandler(window_t *wnd, event_t *e) +static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e) { wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd); - wxPoint where = win->ScreenToClient(wxPoint(e->where_x, e->where_y)); + wxPoint orig(win->GetClientAreaOrigin()); + wxPoint where; + + MGL_wmCoordGlobalToLocal(win->GetHandle(), + e->where_x, e->where_y, &where.x, &where.y); + + for (wxWindowMGL *w = win; w; w = w->GetParent()) + { + if ( !w->IsEnabled() ) + return FALSE; + if ( w->IsTopLevel() ) + break; + } wxEventType type = wxEVT_NULL; wxMouseEvent event; event.SetEventObject(win); event.SetTimestamp(e->when); - event.m_x = where.x; - event.m_y = where.y; + event.m_x = where.x - orig.x; + event.m_y = where.y - orig.y; event.m_shiftDown = e->modifiers & EVT_SHIFTKEY; event.m_controlDown = e->modifiers & EVT_CTRLSTATE; event.m_altDown = e->modifiers & EVT_LEFTALT; @@ -206,6 +172,10 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e) else if ( e->message & EVT_RIGHTBMASK ) type = (e->message & EVT_DBLCLICK) ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN; + + if ( win->AcceptsFocus() && wxWindow::FindFocus() != win ) + win->SetFocus(); + break; case EVT_MOUSEUP: @@ -218,25 +188,48 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e) break; case EVT_MOUSEMOVE: - if ( win != g_windowUnderMouse ) + if ( !gs_mouseCapture ) + { + if ( win != gs_windowUnderMouse ) + { + if ( gs_windowUnderMouse ) + { + wxMouseEvent event2(event); + MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(), + e->where_x, e->where_y, + &event2.m_x, &event2.m_y); + + wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin()); + event2.m_x -= orig.x; + event2.m_y -= orig.y; + + event2.SetEventObject(gs_windowUnderMouse); + event2.SetEventType(wxEVT_LEAVE_WINDOW); + gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2); + } + + wxMouseEvent event3(event); + event3.SetEventType(wxEVT_ENTER_WINDOW); + win->GetEventHandler()->ProcessEvent(event3); + + gs_windowUnderMouse = win; + } + } + else // gs_mouseCapture { - if ( g_windowUnderMouse ) + bool inside = (where.x >= 0 && + where.y >= 0 && + where.x < win->GetSize().x && + where.y < win->GetSize().y); + if ( (inside && gs_windowUnderMouse != win) || + (!inside && gs_windowUnderMouse == win) ) { - wxMouseEvent event2(event); - wxPoint where2 = g_windowUnderMouse->ScreenToClient( - wxPoint(e->where_x, e->where_y)); - event2.m_x = where2.x; - event2.m_y = where2.y; - event2.SetEventObject(g_windowUnderMouse); - event2.SetEventType(wxEVT_LEAVE_WINDOW); - g_windowUnderMouse->GetEventHandler()->ProcessEvent(event2); + wxMouseEvent evt(inside ? + wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW); + evt.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(evt); + gs_windowUnderMouse = inside ? win : NULL; } - - wxMouseEvent event3(event); - event3.SetEventType(wxEVT_ENTER_WINDOW); - win->GetEventHandler()->ProcessEvent(event3); - - g_windowUnderMouse = win; } type = wxEVT_MOTION; @@ -257,146 +250,172 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e) } } -static long wxScanToKeyCode(event_t *event) +static long wxScanToKeyCode(event_t *event, bool translate) { - #define KEY(mgl,wx) case mgl: key = wx; break; + // VS: make it __WXDEBUG__-only, since we have lots of wxLogTrace calls + // here and the arguments would be stored in non-debug executable even + // though wxLogTrace would be no-op... + #ifdef __WXDEBUG__ + #define KEY(mgl_key,wx_key) \ + case mgl_key: \ + wxLogTrace(_T("keyevents"), \ + _T("key " #mgl_key ", mapped to " #wx_key)); \ + key = wx_key; \ + break; + #else + #define KEY(mgl_key,wx_key) \ + case mgl_key: key = wx_key; break; + #endif long key = 0; - switch ( EVT_scanCode(event->message) ) + + if ( translate ) { - KEY (KB_padEnter, WXK_NUMPAD_ENTER) - KEY (KB_padMinus, WXK_NUMPAD_SUBTRACT) - KEY (KB_padPlus, WXK_NUMPAD_ADD) - KEY (KB_padTimes, WXK_NUMPAD_MULTIPLY) - KEY (KB_padDivide, WXK_NUMPAD_DIVIDE) - KEY (KB_padLeft, WXK_NUMPAD_LEFT) - KEY (KB_padRight, WXK_NUMPAD_RIGHT) - KEY (KB_padUp, WXK_NUMPAD_UP) - KEY (KB_padDown, WXK_NUMPAD_DOWN) - KEY (KB_padInsert, WXK_NUMPAD_INSERT) - KEY (KB_padDelete, WXK_NUMPAD_DELETE) - KEY (KB_padHome, WXK_NUMPAD_HOME) - KEY (KB_padEnd, WXK_NUMPAD_END) - KEY (KB_padPageUp, WXK_NUMPAD_PAGEUP) - //KEY (KB_padPageUp, WXK_NUMPAD_PRIOR) - KEY (KB_padPageDown, WXK_NUMPAD_PAGEDOWN) - //KEY (KB_padPageDown, WXK_NUMPAD_NEXT) - KEY (KB_padCenter, WXK_NUMPAD_SEPARATOR) // ? - KEY (KB_F1, WXK_F1) - KEY (KB_F2, WXK_F2) - KEY (KB_F3, WXK_F3) - KEY (KB_F4, WXK_F4) - KEY (KB_F5, WXK_F5) - KEY (KB_F6, WXK_F6) - KEY (KB_F7, WXK_F7) - KEY (KB_F8, WXK_F8) - KEY (KB_F9, WXK_F9) - KEY (KB_F10, WXK_F10) - KEY (KB_F11, WXK_F11) - KEY (KB_F12, WXK_F12) - KEY (KB_left, WXK_LEFT) - KEY (KB_right, WXK_RIGHT) - KEY (KB_up, WXK_UP) - KEY (KB_down, WXK_DOWN) - KEY (KB_insert, WXK_INSERT) - KEY (KB_delete, WXK_DELETE) - KEY (KB_home, WXK_HOME) - KEY (KB_end, WXK_END) - KEY (KB_pageUp, WXK_PAGEUP) - KEY (KB_pageDown, WXK_PAGEDOWN) - KEY (KB_capsLock, WXK_CAPITAL) - KEY (KB_numLock, WXK_NUMLOCK) - KEY (KB_scrollLock, WXK_SCROLL) - KEY (KB_leftShift, WXK_SHIFT) - KEY (KB_rightShift, WXK_SHIFT) - KEY (KB_leftCtrl, WXK_CONTROL) - KEY (KB_rightCtrl, WXK_CONTROL) - KEY (KB_leftAlt, WXK_ALT) - KEY (KB_rightAlt, WXK_ALT) - KEY (KB_leftWindows, WXK_START) - KEY (KB_rightWindows, WXK_START) - KEY (KB_menu, WXK_MENU) - KEY (KB_sysReq, WXK_SNAPSHOT) - KEY (KB_esc, WXK_ESCAPE) - KEY (KB_1, '1') - KEY (KB_2, '2') - KEY (KB_3, '3') - KEY (KB_4, '4') - KEY (KB_5, '5') - KEY (KB_6, '6') - KEY (KB_7, '7') - KEY (KB_8, '8') - KEY (KB_9, '9') - KEY (KB_0, '0') - KEY (KB_minus, WXK_SUBTRACT) - KEY (KB_equals, WXK_ADD) - KEY (KB_backSlash, '\\') - KEY (KB_backspace, WXK_BACK) - KEY (KB_tab, WXK_TAB) - KEY (KB_Q, 'Q') - KEY (KB_W, 'W') - KEY (KB_E, 'E') - KEY (KB_R, 'R') - KEY (KB_T, 'T') - KEY (KB_Y, 'Y') - KEY (KB_U, 'U') - KEY (KB_I, 'I') - KEY (KB_O, 'O') - KEY (KB_P, 'P') - KEY (KB_leftSquareBrace,'[') - KEY (KB_rightSquareBrace,']') - KEY (KB_enter, WXK_RETURN) - KEY (KB_A, 'A') - KEY (KB_S, 'S') - KEY (KB_D, 'D') - KEY (KB_F, 'F') - KEY (KB_G, 'G') - KEY (KB_H, 'H') - KEY (KB_J, 'J') - KEY (KB_K, 'K') - KEY (KB_L, 'L') - KEY (KB_semicolon, ';') - KEY (KB_apostrophe, '\'') - KEY (KB_Z, 'Z') - KEY (KB_X, 'X') - KEY (KB_C, 'C') - KEY (KB_V, 'V') - KEY (KB_B, 'B') - KEY (KB_N, 'N') - KEY (KB_M, 'M') - KEY (KB_comma, ',') - KEY (KB_period, '.') - KEY (KB_divide, WXK_DIVIDE) - KEY (KB_space, WXK_SPACE) - KEY (KB_tilde, '~') - - default: - key = EVT_asciiCode(event->message); - break; + switch ( EVT_scanCode(event->message) ) + { + KEY (KB_padMinus, WXK_NUMPAD_SUBTRACT) + KEY (KB_padPlus, WXK_NUMPAD_ADD) + KEY (KB_padTimes, WXK_NUMPAD_MULTIPLY) + KEY (KB_padDivide, WXK_NUMPAD_DIVIDE) + KEY (KB_padCenter, WXK_NUMPAD_SEPARATOR) // ? + KEY (KB_padLeft, WXK_NUMPAD_LEFT) + KEY (KB_padRight, WXK_NUMPAD_RIGHT) + KEY (KB_padUp, WXK_NUMPAD_UP) + KEY (KB_padDown, WXK_NUMPAD_DOWN) + KEY (KB_padInsert, WXK_NUMPAD_INSERT) + KEY (KB_padDelete, WXK_NUMPAD_DELETE) + KEY (KB_padHome, WXK_NUMPAD_HOME) + KEY (KB_padEnd, WXK_NUMPAD_END) + KEY (KB_padPageUp, WXK_NUMPAD_PAGEUP) + //KEY (KB_padPageUp, WXK_NUMPAD_PRIOR) + KEY (KB_padPageDown, WXK_NUMPAD_PAGEDOWN) + //KEY (KB_padPageDown, WXK_NUMPAD_NEXT) + KEY (KB_1, '1') + KEY (KB_2, '2') + KEY (KB_3, '3') + KEY (KB_4, '4') + KEY (KB_5, '5') + KEY (KB_6, '6') + KEY (KB_7, '7') + KEY (KB_8, '8') + KEY (KB_9, '9') + KEY (KB_0, '0') + KEY (KB_minus, WXK_SUBTRACT) + KEY (KB_equals, WXK_ADD) + KEY (KB_backSlash, '\\') + KEY (KB_Q, 'Q') + KEY (KB_W, 'W') + KEY (KB_E, 'E') + KEY (KB_R, 'R') + KEY (KB_T, 'T') + KEY (KB_Y, 'Y') + KEY (KB_U, 'U') + KEY (KB_I, 'I') + KEY (KB_O, 'O') + KEY (KB_P, 'P') + KEY (KB_leftSquareBrace,'[') + KEY (KB_rightSquareBrace,']') + KEY (KB_A, 'A') + KEY (KB_S, 'S') + KEY (KB_D, 'D') + KEY (KB_F, 'F') + KEY (KB_G, 'G') + KEY (KB_H, 'H') + KEY (KB_J, 'J') + KEY (KB_K, 'K') + KEY (KB_L, 'L') + KEY (KB_semicolon, ';') + KEY (KB_apostrophe, '\'') + KEY (KB_Z, 'Z') + KEY (KB_X, 'X') + KEY (KB_C, 'C') + KEY (KB_V, 'V') + KEY (KB_B, 'B') + KEY (KB_N, 'N') + KEY (KB_M, 'M') + KEY (KB_comma, ',') + KEY (KB_period, '.') + KEY (KB_divide, WXK_DIVIDE) + KEY (KB_space, WXK_SPACE) + KEY (KB_tilde, '~') + + default: break; + } + } + + if ( key == 0 ) + { + switch ( EVT_scanCode(event->message) ) + { + KEY (KB_padEnter, WXK_NUMPAD_ENTER) + KEY (KB_F1, WXK_F1) + KEY (KB_F2, WXK_F2) + KEY (KB_F3, WXK_F3) + KEY (KB_F4, WXK_F4) + KEY (KB_F5, WXK_F5) + KEY (KB_F6, WXK_F6) + KEY (KB_F7, WXK_F7) + KEY (KB_F8, WXK_F8) + KEY (KB_F9, WXK_F9) + KEY (KB_F10, WXK_F10) + KEY (KB_F11, WXK_F11) + KEY (KB_F12, WXK_F12) + KEY (KB_left, WXK_LEFT) + KEY (KB_right, WXK_RIGHT) + KEY (KB_up, WXK_UP) + KEY (KB_down, WXK_DOWN) + KEY (KB_insert, WXK_INSERT) + KEY (KB_delete, WXK_DELETE) + KEY (KB_home, WXK_HOME) + KEY (KB_end, WXK_END) + KEY (KB_pageUp, WXK_PAGEUP) + KEY (KB_pageDown, WXK_PAGEDOWN) + KEY (KB_capsLock, WXK_CAPITAL) + KEY (KB_numLock, WXK_NUMLOCK) + KEY (KB_scrollLock, WXK_SCROLL) + KEY (KB_leftShift, WXK_SHIFT) + KEY (KB_rightShift, WXK_SHIFT) + KEY (KB_leftCtrl, WXK_CONTROL) + KEY (KB_rightCtrl, WXK_CONTROL) + KEY (KB_leftAlt, WXK_ALT) + KEY (KB_rightAlt, WXK_ALT) + KEY (KB_leftWindows, WXK_START) + KEY (KB_rightWindows, WXK_START) + KEY (KB_menu, WXK_MENU) + KEY (KB_sysReq, WXK_SNAPSHOT) + KEY (KB_esc, WXK_ESCAPE) + KEY (KB_backspace, WXK_BACK) + KEY (KB_tab, WXK_TAB) + KEY (KB_enter, WXK_RETURN) + + default: + key = EVT_asciiCode(event->message); + break; + } } - return key; -} + #undef KEY -static long wxAsciiToKeyCode(event_t *event) -{ - return (long)EVT_asciiCode(event->message); + return key; } -static ibool wxWindowKeybHandler(window_t *wnd, event_t *e) +static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) { - wxEventType type = wxEVT_NULL; wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd); - wxPoint where = win->ScreenToClient(wxPoint(e->where_x, e->where_y)); + + if ( !win->IsEnabled() ) return FALSE; + + wxPoint where; + MGL_wmCoordGlobalToLocal(win->GetHandle(), + e->where_x, e->where_y, &where.x, &where.y); wxKeyEvent event; event.SetEventObject(win); event.SetTimestamp(e->when); - event.m_keyCode = wxScanToKeyCode(e); + event.m_keyCode = wxScanToKeyCode(e, TRUE); event.m_scanCode = 0; // not used by wx at all event.m_x = where.x; event.m_y = where.y; - wxLogDebug("key pressed, x=%i y=%i", event.m_x, event.m_y); // FIXME_MGL -remove event.m_shiftDown = e->modifiers & EVT_SHIFTKEY; event.m_controlDown = e->modifiers & EVT_CTRLSTATE; event.m_altDown = e->modifiers & EVT_LEFTALT; @@ -417,6 +436,14 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e) ret = win->GetEventHandler()->ProcessEvent(event); + +#ifdef __WXDEBUG__ + // Add an easy way to capture screenshots: + if ( event.m_keyCode == WXK_F1 && + event.m_shiftDown && event.m_controlDown ) + CaptureScreenshot(); +#endif + #if wxUSE_ACCEL if ( !ret ) { @@ -435,16 +462,31 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e) } #endif // wxUSE_ACCEL - /* wxMSW doesn't send char events with Alt pressed */ - /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x - will only be sent if it is not in an accelerator table. */ - event2.m_keyCode = wxAsciiToKeyCode(e); + // wxMSW doesn't send char events with Alt pressed + // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x + // will only be sent if it is not in an accelerator table. + event2.m_keyCode = wxScanToKeyCode(e, FALSE); if ( !ret && event2.m_keyCode != 0 ) { event2.SetEventType(wxEVT_CHAR); ret = win->GetEventHandler()->ProcessEvent(event2); } + // Synthetize navigation key event, but do it only if the TAB key + // wasn't handled yet. + if ( !ret && event.m_keyCode == WXK_TAB && + win->GetParent() && win->GetParent()->HasFlag(wxTAB_TRAVERSAL) ) + { + wxNavigationKeyEvent navEvent; + navEvent.SetEventObject(win->GetParent()); + // Shift-TAB goes in reverse direction: + navEvent.SetDirection(!event.m_shiftDown); + // Ctrl-TAB changes the (parent) window, i.e. switch notebook page: + navEvent.SetWindowChange(event.m_controlDown); + navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow)); + ret = win->GetParent()->GetEventHandler()->ProcessEvent(navEvent); + } + return ret; } } @@ -467,8 +509,18 @@ END_EVENT_TABLE() // constructors and such // ---------------------------------------------------------------------------- +extern wxDisplayModeInfo wxGetDefaultDisplayMode(); + void wxWindowMGL::Init() { + // First of all, make sure window manager is up and running. If it is + // not the case, initialize it in default display mode + if ( !g_winMng ) + { + if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) ) + wxFatalError(_("Cannot initialize display.")); + } + // generic: InitBase(); @@ -487,10 +539,25 @@ wxWindowMGL::~wxWindowMGL() { m_isBeingDeleted = TRUE; - if ( g_focusedWindow == this ) + if ( gs_mouseCapture == this ) + ReleaseMouse(); + + if (gs_activeFrame == this) + { + gs_activeFrame = NULL; + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + } + + if ( gs_focusedWindow == this ) KillFocus(); - if ( g_windowUnderMouse == this ) - g_windowUnderMouse = NULL; + + if ( gs_windowUnderMouse == this ) + gs_windowUnderMouse = NULL; // VS: destroy children first and _then_ detach *this from its parent. // If we'd do it the other way around, children wouldn't be able @@ -512,22 +579,11 @@ bool wxWindowMGL::Create(wxWindow *parent, long style, const wxString& name) { - // FIXME_MGL -- temporary! - //wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); - if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - if ( parent ) // FIXME_MGL temporary + if ( parent ) parent->AddChild(this); - else - m_isShown=FALSE;// FIXME_MGL -- temporary, simulates wxTLW/wxFrame - - if ( style & wxPOPUP_WINDOW ) - { - // it is created hidden as other top level windows - m_isShown = FALSE; - } int x, y, w, h; x = pos.x, y = pos.y; @@ -537,20 +593,55 @@ bool wxWindowMGL::Create(wxWindow *parent, y = 0; // FIXME_MGL, something better, see GTK+ w = WidthDefault(size.x); h = HeightDefault(size.y); + + long mgl_style = 0; + window_t *wnd_parent = parent ? parent->GetHandle() : NULL; - m_wnd = MGL_wmCreateWindow(g_winMng, - parent ? parent->GetHandle() : NULL, - x, y, w, h); + if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) ) + { + mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE; + } + if ( style & wxSTAY_ON_TOP ) + { + mgl_style |= MGL_WM_ALWAYS_ON_TOP; + } + if ( style & wxPOPUP_WINDOW ) + { + mgl_style |= MGL_WM_ALWAYS_ON_TOP; + // it is created hidden as other top level windows + m_isShown = FALSE; + wnd_parent = NULL; + } + + window_t *wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h); + + MGL_wmSetWindowFlags(wnd, mgl_style); + MGL_wmShowWindow(wnd, m_isShown); + + SetMGLwindow_t(wnd); + + return TRUE; +} + +void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd) +{ + if ( m_wnd ) + MGL_wmDestroyWindow(m_wnd); + + m_wnd = wnd; + if ( !m_wnd ) return; + + m_isShown = m_wnd->visible; MGL_wmSetWindowUserData(m_wnd, (void*) this); MGL_wmSetWindowPainter(m_wnd, wxWindowPainter); - MGL_wmShowWindow(m_wnd, m_isShown); - MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); - MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0); MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0); - return TRUE; + if ( m_cursor.Ok() ) + MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); + else + MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); } // --------------------------------------------------------------------------- @@ -559,36 +650,47 @@ bool wxWindowMGL::Create(wxWindow *parent, void wxWindowMGL::SetFocus() { - if (g_focusedWindow) - g_focusedWindow->KillFocus(); + if ( gs_focusedWindow == this ) return; + + if ( gs_focusedWindow ) + gs_focusedWindow->KillFocus(); - g_focusedWindow = this; + gs_focusedWindow = this; MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB); -#if wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = GetCaret(); - if (caret) - caret->OnSetFocus(); -#endif // wxUSE_CARET - - if ( IsTopLevel() ) + wxWindowMGL *active = wxGetTopLevelParent(this); + if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame ) { - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + if ( gs_activeFrame ) + { + wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId()); + event.SetEventObject(gs_activeFrame); + gs_activeFrame->GetEventHandler()->ProcessEvent(event); + } + + gs_activeFrame = active; + wxActivateEvent event(wxEVT_ACTIVATE, TRUE, gs_activeFrame->GetId()); + event.SetEventObject(gs_activeFrame); + gs_activeFrame->GetEventHandler()->ProcessEvent(event); } wxFocusEvent event(wxEVT_SET_FOCUS, GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); + +#if wxUSE_CARET + // caret needs to be informed about focus change + wxCaret *caret = GetCaret(); + if ( caret ) + caret->OnSetFocus(); +#endif // wxUSE_CARET } void wxWindowMGL::KillFocus() { - if ( g_focusedWindow != this ) return; - g_focusedWindow = NULL; + if ( gs_focusedWindow != this ) return; + gs_focusedWindow = NULL; if ( m_isBeingDeleted ) return; @@ -601,13 +703,6 @@ void wxWindowMGL::KillFocus() caret->OnKillFocus(); #endif // wxUSE_CARET - if ( IsTopLevel() ) - { - wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - wxFocusEvent event(wxEVT_KILL_FOCUS, GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); @@ -619,7 +714,7 @@ void wxWindowMGL::KillFocus() // ---------------------------------------------------------------------------- wxWindow *wxWindowBase::FindFocus() { - return (wxWindow*)g_focusedWindow; + return (wxWindow*)gs_focusedWindow; } bool wxWindowMGL::Show(bool show) @@ -628,6 +723,17 @@ bool wxWindowMGL::Show(bool show) return FALSE; MGL_wmShowWindow(m_wnd, show); + + if (!show && gs_activeFrame == this) + { + // activate next frame in Z-order: + if ( m_wnd->prev ) + { + wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData; + win->SetFocus(); + } + } + return TRUE; } @@ -643,24 +749,26 @@ void wxWindowMGL::Lower() MGL_wmLowerWindow(m_wnd); } -void wxWindowMGL::CaptureMouse() +void wxWindowMGL::DoCaptureMouse() { + if ( gs_mouseCapture ) + MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE); + + gs_mouseCapture = this; MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE); } -void wxWindowMGL::ReleaseMouse() +void wxWindowMGL::DoReleaseMouse() { + wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") ) + MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE); + gs_mouseCapture = NULL; } /* static */ wxWindow *wxWindowBase::GetCapture() { - for (captureentry_t *c = g_winMng->capturedEvents; c; c = c->next) - { - if ( c->id == wxMGL_CAPTURE_MOUSE ) - return (wxWindow*)c->wnd->userData; - } - return NULL; + return (wxWindow*)gs_mouseCapture; } bool wxWindowMGL::SetCursor(const wxCursor& cursor) @@ -675,8 +783,6 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor) MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor()); else MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor()); - - // FIXME_MGL -- should it set children's cursor or not?! return TRUE; } @@ -781,27 +887,21 @@ void wxWindowMGL::DoGetPosition(int *x, int *y) const void wxWindowMGL::DoScreenToClient(int *x, int *y) const { int ax, ay; - wxPoint co = GetClientAreaOrigin(); - - MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x, m_wnd->y, &ax, &ay); - ax -= co.x; - ay -= co.y; + MGL_wmCoordGlobalToLocal(m_wnd, 0, 0, &ax, &ay); if (x) - *x = ax; + (*x) += ax; if (y) - *y = ay; + (*y) += ay; } void wxWindowMGL::DoClientToScreen(int *x, int *y) const { int ax, ay; - wxPoint co = GetClientAreaOrigin(); - - MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x+co.x, m_wnd->y+co.y, &ax, &ay); + MGL_wmCoordLocalToGlobal(m_wnd, 0, 0, &ax, &ay); if (x) - *x = ax; + (*x) += ax; if (y) - *y = ay; + (*y) += ay; } // Get size *available for subwindows* i.e. excluding menu bar etc. @@ -843,9 +943,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) y = currentY; -#if 0 // FIXME_MGL -- what's this good for? AdjustForParentClientOrigin(x, y, sizeFlags); -#endif wxSize size(-1, -1); if ( width == -1 ) @@ -881,11 +979,15 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags) } } - DoMoveWindow(x, y, width, height); + if ( m_wnd->x != x || m_wnd->y != y || + (int)m_wnd->width != width || (int)m_wnd->height != height ) + { + DoMoveWindow(x, y, width, height); - wxSizeEvent event(wxSize(width, height), GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + wxSizeEvent event(wxSize(width, height), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } } void wxWindowMGL::DoSetClientSize(int width, int height) @@ -977,6 +1079,7 @@ void wxWindowMGL::Clear() dc.Clear(); } +#include "wx/menu.h" void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect) { if ( m_eraseBackground == -1 ) @@ -1023,11 +1126,24 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) return; } +#if 0 // FIXME_MGL -- debugging stuff! + dc->setColorRGB(255,0,255); + dc->fillRect(-1000,-1000,2000,2000); + wxUsleep(50); +#endif + MGLRegion clip; dc->getClipRegion(clip); m_updateRegion = wxRegion(clip); m_paintMGLDC = dc; +#if wxUSE_CARET + // must hide caret temporarily, otherwise we'd get rendering artifacts + wxCaret *caret = GetCaret(); + if ( caret ) + caret->Hide(); +#endif // wxUSE_CARET + if ( m_eraseBackground != 0 ) { wxWindowDC dc((wxWindow*)this); @@ -1045,6 +1161,11 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc) eventPt.SetEventObject(this); GetEventHandler()->ProcessEvent(eventPt); +#if wxUSE_CARET + if ( caret ) + caret->Show(); +#endif // wxUSE_CARET + m_paintMGLDC = NULL; m_updateRegion.Clear(); }