X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgbase%2Fwindow.cpp;h=08cb74db081807edd765c6a0115a40684c913696;hb=a8e642edcf466cf92313cbf1f467a2d10de03fb4;hp=4a14441e9c3704507520135239ac63ae729ea14d;hpb=7a4a508629d370c4a79791c7e62fd6f59e8564e9;p=libs%2Fgui.git diff --git a/source/gbase/window.cpp b/source/gbase/window.cpp index 4a14441..08cb74d 100644 --- a/source/gbase/window.cpp +++ b/source/gbase/window.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of libmspgbase -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2008 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -16,9 +16,42 @@ Distributed under the LGPL #include #include "display.h" #include "window.h" +#include "display_priv.h" using namespace std; +namespace { + +#ifdef WIN32 +LRESULT CALLBACK wndproc_(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(msg==WM_CREATE) + { + CREATESTRUCT *cs=reinterpret_cast(lparam); + SetWindowLong(hwnd, 0, reinterpret_cast(cs->lpCreateParams)); + } + else + { + Msp::Graphics::Window *wnd=reinterpret_cast(GetWindowLong(hwnd, 0)); + Msp::Graphics::Window::Event ev; + ev.msg=msg; + ev.wparam=wparam; + ev.lparam=lparam; + if(wnd && wnd->event(ev)) + return 0; + } + + return DefWindowProc(hwnd, msg, wparam, lparam); +} +#else +Bool match_event_type(Display *, XEvent *event, XPointer arg) +{ + return event->type==reinterpret_cast(arg); +} +#endif + +} + namespace Msp { namespace Graphics { @@ -47,91 +80,12 @@ Window::Window(Display &dpy, const WindowOptions &opts): init(); } -Window::~Window() -{ - if(window) -#ifdef WIN32 - CloseWindow(window); -#else - XDestroyWindow(display.get_display(), window); -#endif - - display.remove_window(this); - - if(options.fullscreen) - display.restore_mode(); -} - -void Window::set_title(const string &title) -{ -#ifdef WIN32 - SetWindowText(window, title.c_str()); -#else - vector buf(title.begin(), title.end()); - XTextProperty prop; - prop.value=&buf[0]; - prop.encoding=XA_STRING; - prop.format=8; - prop.nitems=title.size(); - XSetWMName(display.get_display(), window, &prop); - display.check_error(); -#endif -} - -void Window::reconfigure(const WindowOptions &opts) -{ - bool fullscreen_changed=(opts.fullscreen!=options.fullscreen); - - options=opts; - -#ifdef WIN32 - // XXX Preserve position - MoveWindow(window, 0, 0, options.width, options.height, false); - - (void)fullscreen_changed; -#else - ::Display *dpy=display.get_display(); - - XMoveResizeWindow(dpy, window, 0, 0, options.width, options.height); - - if(fullscreen_changed) - { - hide(); - XSetWindowAttributes attr; - attr.override_redirect=options.fullscreen; - XChangeWindowAttributes(dpy, window, CWOverrideRedirect, &attr); - show(); - } - - if(options.fullscreen) - display.set_mode(VideoMode(options.width, options.height)); - else if(fullscreen_changed) - display.restore_mode(); -#endif -} - -void Window::show() -{ -#ifdef WIN32 - ShowWindow(window, SW_SHOWNORMAL); -#else - XMapRaised(display.get_display(), window); - display.check_error(); -#endif -} - -void Window::hide() -{ -#ifdef WIN32 - ShowWindow(window, SW_HIDE); -#else - XUnmapWindow(display.get_display(), window); - display.check_error(); -#endif -} - void Window::init() { + visible=false; + kbd_autorepeat=true; + priv=new Private; + #ifdef WIN32 static bool wndclass_created=false; @@ -159,35 +113,38 @@ void Window::init() } RECT rect; - rect.left=0; - rect.top=0; - rect.right=options.width; - rect.bottom=options.height; - AdjustWindowRectEx(&rect, WS_OVERLAPPEDWINDOW, false, WS_EX_OVERLAPPEDWINDOW); + SetRect(&rect, 0, 0, options.width, options.height); - window=CreateWindowEx(WS_EX_OVERLAPPEDWINDOW, + int style=(options.fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW); + if(!options.resizable) + style&=~WS_THICKFRAME; + int exstyle=(options.fullscreen ? WS_EX_APPWINDOW : WS_EX_OVERLAPPEDWINDOW); + AdjustWindowRectEx(&rect, style, false, exstyle); + + priv->window=CreateWindowEx(exstyle, "mspgbase", "Window", - WS_OVERLAPPEDWINDOW, + style, CW_USEDEFAULT, CW_USEDEFAULT, rect.right-rect.left, rect.bottom-rect.top, 0, 0, reinterpret_cast(Application::get_data()), this); - if(!window) + if(!priv->window) throw Exception("CreateWindowEx failed"); #else - ::Display *dpy=display.get_display(); + ::Display *dpy=display.get_private().display; - wm_delete_window=XInternAtom(dpy, "WM_DELETE_WINDOW", true); + priv->wm_delete_window=XInternAtom(dpy, "WM_DELETE_WINDOW", true); + priv->invisible_cursor=0; XSetWindowAttributes attr; attr.override_redirect=options.fullscreen; attr.event_mask=ButtonPressMask|ButtonReleaseMask|PointerMotionMask|KeyPressMask|KeyReleaseMask|StructureNotifyMask|EnterWindowMask; - window=XCreateWindow(dpy, + priv->window=XCreateWindow(dpy, DefaultRootWindow(dpy), 0, 0, options.width, options.height, @@ -197,69 +154,223 @@ void Window::init() CopyFromParent, CWOverrideRedirect|CWEventMask, &attr); - XSetWMProtocols(dpy, window, &wm_delete_window, 1); + XSetWMProtocols(dpy, priv->window, &priv->wm_delete_window, 1); - if(options.fullscreen) + if(!options.resizable) { - display.set_mode(VideoMode(options.width, options.height)); - XWarpPointer(dpy, None, window, 0, 0, 0, 0, options.width/2, options.height/2); + XSizeHints hints; + hints.flags=PMinSize|PMaxSize; + hints.min_width=hints.max_width=options.width; + hints.min_height=hints.max_height=options.height; + XSetWMNormalHints(dpy, priv->window, &hints); } + #endif - display.add_window(this); + display.add_window(*this); display.check_error(); } -#ifndef WIN32 -void Window::event(const XEvent &ev) +Window::~Window() { - switch(ev.type) + if(priv->window) +#ifdef WIN32 + CloseWindow(priv->window); +#else + XDestroyWindow(display.get_private().display, priv->window); + + if(priv->invisible_cursor) + XFreeCursor(display.get_private().display, priv->invisible_cursor); +#endif + + display.remove_window(*this); + + if(options.fullscreen) + display.restore_mode(); + + delete priv; +} + +void Window::set_title(const string &title) +{ +#ifdef WIN32 + SetWindowText(priv->window, title.c_str()); +#else + vector buf(title.begin(), title.end()); + XTextProperty prop; + prop.value=&buf[0]; + prop.encoding=XA_STRING; + prop.format=8; + prop.nitems=title.size(); + XSetWMName(display.get_private().display, priv->window, &prop); + display.check_error(); +#endif +} + +void Window::reconfigure(const WindowOptions &opts) +{ + bool fullscreen_changed=(opts.fullscreen!=options.fullscreen); + + options=opts; + +#ifdef WIN32 + RECT rect; + SetRect(&rect, 0, 0, options.width, options.height); + + int style=(options.fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW); + if(!options.resizable) + style&=~WS_THICKFRAME; + int exstyle=(options.fullscreen ? WS_EX_APPWINDOW : WS_EX_OVERLAPPEDWINDOW); + AdjustWindowRectEx(&rect, style, false, exstyle); + + if(fullscreen_changed) { - case ButtonPress: - signal_button_press.emit(ev.xbutton.x, ev.xbutton.y, ev.xbutton.button, ev.xbutton.state); - break; - case ButtonRelease: - signal_button_release.emit(ev.xbutton.x, ev.xbutton.y, ev.xbutton.button, ev.xbutton.state); - break; - case MotionNotify: - signal_pointer_motion.emit(ev.xmotion.x, ev.xmotion.y); - break; - case KeyPress: + hide(); + SetWindowLong(priv->window, GWL_EXSTYLE, exstyle); + SetWindowLong(priv->window, GWL_STYLE, style); + show(); + } + + if(options.fullscreen) + SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER); + else + SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER); +#else + ::Display *dpy=display.get_private().display; + + if(fullscreen_changed) + { + bool was_visible=visible; + + if(was_visible) { - char buf[16]; - XLookupString(const_cast(&ev.xkey), buf, sizeof(buf), 0, 0); - // XXX Handle the result according to locale - signal_key_press.emit(XKeycodeToKeysym(display.get_display(), ev.xkey.keycode, 0), ev.xkey.state, buf[0]); + hide(); + + // Wait for the window to be unmapped. This makes window managers happy. + XEvent ev; + XPeekIfEvent(dpy, &ev, match_event_type, reinterpret_cast(UnmapNotify)); } - break; - case KeyRelease: - signal_key_release.emit(XKeycodeToKeysym(display.get_display(), ev.xkey.keycode, 0), ev.xkey.state); - break; - case ConfigureNotify: - options.width=ev.xconfigure.width; - options.height=ev.xconfigure.height; - signal_resize.emit(options.width, options.height); - break; - case ClientMessage: - if(ev.xclient.data.l[0]==static_cast(wm_delete_window)) - signal_close.emit(); - break; - case EnterNotify: - XSetInputFocus(display.get_display(), window, RevertToParent, CurrentTime); - break; - case MapNotify: + + XSetWindowAttributes attr; + attr.override_redirect=options.fullscreen; + XChangeWindowAttributes(dpy, priv->window, CWOverrideRedirect, &attr); + + if(was_visible) + show(); + } + + XSizeHints hints; + if(options.resizable) + hints.flags=0; + else + { + hints.flags=PMinSize|PMaxSize; + hints.min_width=hints.max_width=options.width; + hints.min_height=hints.max_height=options.height; + } + XSetWMNormalHints(dpy, priv->window, &hints); + + if(options.fullscreen) + XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height); + else + XResizeWindow(dpy, priv->window, options.width, options.height); +#endif + + if(visible) + { if(options.fullscreen) - XGrabPointer(display.get_display(), window, true, None, GrabModeAsync, GrabModeAsync, window, None, CurrentTime); - break; - default:; + display.set_mode(VideoMode(options.width, options.height)); + else if(fullscreen_changed) + display.restore_mode(); + } +} + +void Window::set_keyboard_autorepeat(bool r) +{ + kbd_autorepeat=r; +} + +void Window::show_cursor(bool s) +{ +#ifdef WIN32 + ShowCursor(s); +#else + ::Display *dpy=display.get_private().display; + + if(s) + XUndefineCursor(dpy, priv->window); + else + { + if(!priv->invisible_cursor) + { + int screen=DefaultScreen(dpy); + + Pixmap pm=XCreatePixmap(dpy, priv->window, 1, 1, 1); + GC gc=XCreateGC(dpy, pm, 0, 0); + XSetFunction(dpy, gc, GXclear); + XDrawPoint(dpy, pm, gc, 0, 0); + XFreeGC(dpy, gc); + + XColor black; + black.pixel=BlackPixel(dpy, screen); + XQueryColor(dpy, DefaultColormap(dpy, screen), &black); + + priv->invisible_cursor=XCreatePixmapCursor(dpy, pm, pm, &black, &black, 0, 0); + + XFreePixmap(dpy, pm); + } + XDefineCursor(dpy, priv->window, priv->invisible_cursor); } +#endif } + +void Window::warp_pointer(int x, int y) +{ +#ifndef WIN32 + XWarpPointer(display.get_private().display, None, priv->window, 0, 0, 0, 0, x, y); +#else + (void)x; + (void)y; #endif +} +void Window::show() +{ #ifdef WIN32 -int Window::wndproc(UINT msg, WPARAM wp, LPARAM lp) + ShowWindow(priv->window, SW_SHOWNORMAL); +#else + XMapRaised(display.get_private().display, priv->window); +#endif + visible=true; + + if(options.fullscreen) + { + display.set_mode(VideoMode(options.width, options.height)); +#ifndef WIN32 + XWarpPointer(display.get_private().display, None, priv->window, 0, 0, 0, 0, options.width/2, options.height/2); +#endif + } +} + +void Window::hide() +{ +#ifdef WIN32 + ShowWindow(priv->window, SW_HIDE); +#else + XUnmapWindow(display.get_private().display, priv->window); +#endif + visible=false; + + if(options.fullscreen) + display.restore_mode(); +} + +bool Window::event(const Event &evnt) { - switch(msg) +#ifdef WIN32 + WPARAM wp=evnt.wparam; + LPARAM lp=evnt.lparam; + switch(evnt.msg) { case WM_KEYDOWN: signal_key_press.emit(wp, 0, wp); @@ -285,36 +396,74 @@ int Window::wndproc(UINT msg, WPARAM wp, LPARAM lp) case WM_RBUTTONUP: signal_button_release.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp), 3, 0); break; + case WM_MOUSEWHEEL: + { + unsigned btn = (HIWORD(wp)&0x8000) ? 5 : 4; + signal_button_press.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp), btn, 0); + signal_button_release.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp), btn, 0); + } + break; case WM_MOUSEMOVE: signal_pointer_motion.emit(GET_X_LPARAM(lp), GET_Y_LPARAM(lp)); break; + case WM_SIZE: + options.width=LOWORD(lp); + options.height=HIWORD(lp); + signal_resize.emit(options.width, options.height); + break; case WM_CLOSE: signal_close.emit(); break; default: - return 0; - } - - return 1; -} - -LRESULT CALLBACK Window::wndproc_(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - if(msg==WM_CREATE) - { - CREATESTRUCT *cs=reinterpret_cast(lparam); - SetWindowLong(hwnd, 0, reinterpret_cast(cs->lpCreateParams)); + return false; } - else +#else + const XEvent &ev=evnt.xevent; + switch(ev.type) { - Window *wnd=reinterpret_cast(GetWindowLong(hwnd, 0)); - if(wnd && wnd->wndproc(msg, wparam, lparam)) - return 0; + case ButtonPress: + signal_button_press.emit(ev.xbutton.x, ev.xbutton.y, ev.xbutton.button, ev.xbutton.state); + break; + case ButtonRelease: + signal_button_release.emit(ev.xbutton.x, ev.xbutton.y, ev.xbutton.button, ev.xbutton.state); + break; + case MotionNotify: + signal_pointer_motion.emit(ev.xmotion.x, ev.xmotion.y); + break; + case KeyPress: + { + char buf[16]; + XLookupString(const_cast(&ev.xkey), buf, sizeof(buf), 0, 0); + // XXX Handle the result according to locale + signal_key_press.emit(XKeycodeToKeysym(display.get_private().display, ev.xkey.keycode, 0), ev.xkey.state, buf[0]); + } + break; + case KeyRelease: + signal_key_release.emit(XKeycodeToKeysym(display.get_private().display, ev.xkey.keycode, 0), ev.xkey.state); + break; + case ConfigureNotify: + options.width=ev.xconfigure.width; + options.height=ev.xconfigure.height; + signal_resize.emit(options.width, options.height); + break; + case ClientMessage: + if(ev.xclient.data.l[0]==static_cast(priv->wm_delete_window)) + signal_close.emit(); + break; + case EnterNotify: + if(options.fullscreen) + XSetInputFocus(display.get_private().display, priv->window, RevertToParent, CurrentTime); + break; + case MapNotify: + if(options.fullscreen) + XGrabPointer(display.get_private().display, priv->window, true, None, GrabModeAsync, GrabModeAsync, priv->window, None, CurrentTime); + break; + default: + return false; } - - return DefWindowProc(hwnd, msg, wparam, lparam); -} #endif + return true; +} } // namespace Graphics } // namespace Msp