X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgbase%2Fwindow.cpp;h=08cb74db081807edd765c6a0115a40684c913696;hb=a8e642edcf466cf92313cbf1f467a2d10de03fb4;hp=3ba8d767a90e9edf5b9392bd2ef5d3d5b4f62e2d;hpb=881ad898c45954f95972091554af25d775b8c2a8;p=libs%2Fgui.git diff --git a/source/gbase/window.cpp b/source/gbase/window.cpp index 3ba8d76..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,25 +80,121 @@ Window::Window(Display &dpy, const WindowOptions &opts): init(); } +void Window::init() +{ + visible=false; + kbd_autorepeat=true; + priv=new Private; + +#ifdef WIN32 + static bool wndclass_created=false; + + if(!wndclass_created) + { + WNDCLASSEX wndcl; + + wndcl.cbSize=sizeof(WNDCLASSEX); + wndcl.style=0; + wndcl.lpfnWndProc=&wndproc_; + wndcl.cbClsExtra=0; + wndcl.cbWndExtra=sizeof(Window *); + wndcl.hInstance=reinterpret_cast(Application::get_data()); + wndcl.hIcon=0; + wndcl.hCursor=LoadCursor(0, IDC_ARROW); + wndcl.hbrBackground=0; + wndcl.lpszMenuName=0; + wndcl.lpszClassName="mspgbase"; + wndcl.hIconSm=0; + + if(!RegisterClassEx(&wndcl)) + throw Exception("Couldn't register window class"); + + wndclass_created=true; + } + + 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); + + priv->window=CreateWindowEx(exstyle, + "mspgbase", + "Window", + style, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right-rect.left, rect.bottom-rect.top, + 0, + 0, + reinterpret_cast(Application::get_data()), + this); + if(!priv->window) + throw Exception("CreateWindowEx failed"); + +#else + ::Display *dpy=display.get_private().display; + + 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; + + priv->window=XCreateWindow(dpy, + DefaultRootWindow(dpy), + 0, 0, + options.width, options.height, + 0, + CopyFromParent, + InputOutput, + CopyFromParent, + CWOverrideRedirect|CWEventMask, &attr); + + XSetWMProtocols(dpy, priv->window, &priv->wm_delete_window, 1); + + if(!options.resizable) + { + 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.check_error(); +} + Window::~Window() { - if(window) + if(priv->window) #ifdef WIN32 - CloseWindow(window); + CloseWindow(priv->window); #else - XDestroyWindow(display.get_display(), window); + XDestroyWindow(display.get_private().display, priv->window); + + if(priv->invisible_cursor) + XFreeCursor(display.get_private().display, priv->invisible_cursor); #endif - display.remove_window(this); + display.remove_window(*this); if(options.fullscreen) display.restore_mode(); + + delete priv; } void Window::set_title(const string &title) { #ifdef WIN32 - SetWindowText(window, title.c_str()); + SetWindowText(priv->window, title.c_str()); #else vector buf(title.begin(), title.end()); XTextProperty prop; @@ -73,7 +202,7 @@ void Window::set_title(const string &title) prop.encoding=XA_STRING; prop.format=8; prop.nitems=title.size(); - XSetWMName(display.get_display(), window, &prop); + XSetWMName(display.get_private().display, priv->window, &prop); display.check_error(); #endif } @@ -97,27 +226,37 @@ void Window::reconfigure(const WindowOptions &opts) if(fullscreen_changed) { hide(); - SetWindowLong(window, GWL_EXSTYLE, exstyle); - SetWindowLong(window, GWL_STYLE, style); + SetWindowLong(priv->window, GWL_EXSTYLE, exstyle); + SetWindowLong(priv->window, GWL_STYLE, style); show(); } if(options.fullscreen) - SetWindowPos(window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER); + SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER); else - SetWindowPos(window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER); - - (void)fullscreen_changed; + SetWindowPos(priv->window, 0, 0, 0, rect.right-rect.left, rect.bottom-rect.top, SWP_NOMOVE|SWP_NOZORDER); #else - ::Display *dpy=display.get_display(); + ::Display *dpy=display.get_private().display; if(fullscreen_changed) { - hide(); + bool was_visible=visible; + + if(was_visible) + { + hide(); + + // Wait for the window to be unmapped. This makes window managers happy. + XEvent ev; + XPeekIfEvent(dpy, &ev, match_event_type, reinterpret_cast(UnmapNotify)); + } + XSetWindowAttributes attr; attr.override_redirect=options.fullscreen; - XChangeWindowAttributes(dpy, window, CWOverrideRedirect, &attr); - show(); + XChangeWindowAttributes(dpy, priv->window, CWOverrideRedirect, &attr); + + if(was_visible) + show(); } XSizeHints hints; @@ -129,184 +268,109 @@ void Window::reconfigure(const WindowOptions &opts) hints.min_width=hints.max_width=options.width; hints.min_height=hints.max_height=options.height; } - XSetWMNormalHints(dpy, window, &hints); + XSetWMNormalHints(dpy, priv->window, &hints); if(options.fullscreen) - XMoveResizeWindow(dpy, window, 0, 0, options.width, options.height); + XMoveResizeWindow(dpy, priv->window, 0, 0, options.width, options.height); else - XResizeWindow(dpy, window, options.width, options.height); + XResizeWindow(dpy, priv->window, options.width, options.height); #endif - if(options.fullscreen) - display.set_mode(VideoMode(options.width, options.height)); - else if(fullscreen_changed) - display.restore_mode(); + if(visible) + { + if(options.fullscreen) + display.set_mode(VideoMode(options.width, options.height)); + else if(fullscreen_changed) + display.restore_mode(); + } } -void Window::show() +void Window::set_keyboard_autorepeat(bool r) { -#ifdef WIN32 - ShowWindow(window, SW_SHOWNORMAL); -#else - XMapRaised(display.get_display(), window); - display.check_error(); -#endif + kbd_autorepeat=r; } -void Window::hide() +void Window::show_cursor(bool s) { #ifdef WIN32 - ShowWindow(window, SW_HIDE); + ShowCursor(s); #else - XUnmapWindow(display.get_display(), window); - display.check_error(); -#endif -} + ::Display *dpy=display.get_private().display; -void Window::init() -{ -#ifdef WIN32 - static bool wndclass_created=false; - - if(!wndclass_created) + if(s) + XUndefineCursor(dpy, priv->window); + else { - WNDCLASSEX wndcl; - - wndcl.cbSize=sizeof(WNDCLASSEX); - wndcl.style=0; - wndcl.lpfnWndProc=&wndproc_; - wndcl.cbClsExtra=0; - wndcl.cbWndExtra=sizeof(Window *); - wndcl.hInstance=reinterpret_cast(Application::get_data()); - wndcl.hIcon=0; - wndcl.hCursor=LoadCursor(0, IDC_ARROW); - wndcl.hbrBackground=0; - wndcl.lpszMenuName=0; - wndcl.lpszClassName="mspgbase"; - wndcl.hIconSm=0; - - if(!RegisterClassEx(&wndcl)) - throw Exception("Couldn't register window class"); - - wndclass_created=true; - } + if(!priv->invisible_cursor) + { + int screen=DefaultScreen(dpy); - RECT rect; - SetRect(&rect, 0, 0, options.width, options.height); + 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); - 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); + XColor black; + black.pixel=BlackPixel(dpy, screen); + XQueryColor(dpy, DefaultColormap(dpy, screen), &black); - window=CreateWindowEx(exstyle, - "mspgbase", - "Window", - style, - CW_USEDEFAULT, CW_USEDEFAULT, - rect.right-rect.left, rect.bottom-rect.top, - 0, - 0, - reinterpret_cast(Application::get_data()), - this); - if(!window) - throw Exception("CreateWindowEx failed"); + priv->invisible_cursor=XCreatePixmapCursor(dpy, pm, pm, &black, &black, 0, 0); - if(options.fullscreen) - display.set_mode(VideoMode(options.width, options.height)); + 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 - ::Display *dpy=display.get_display(); - - wm_delete_window=XInternAtom(dpy, "WM_DELETE_WINDOW", true); - - XSetWindowAttributes attr; - attr.override_redirect=options.fullscreen; - attr.event_mask=ButtonPressMask|ButtonReleaseMask|PointerMotionMask|KeyPressMask|KeyReleaseMask|StructureNotifyMask|EnterWindowMask; - - window=XCreateWindow(dpy, - DefaultRootWindow(dpy), - 0, 0, - options.width, options.height, - 0, - CopyFromParent, - InputOutput, - CopyFromParent, - CWOverrideRedirect|CWEventMask, &attr); - - XSetWMProtocols(dpy, window, &wm_delete_window, 1); + (void)x; + (void)y; +#endif +} - if(!options.resizable) - { - XSizeHints hints; - hints.flags=PMinSize|PMaxSize; - hints.min_width=hints.max_width=options.width; - hints.min_height=hints.max_height=options.height; - XSetWMNormalHints(dpy, window, &hints); - } +void Window::show() +{ +#ifdef WIN32 + 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)); - XWarpPointer(dpy, None, window, 0, 0, 0, 0, options.width/2, options.height/2); - } +#ifndef WIN32 + XWarpPointer(display.get_private().display, None, priv->window, 0, 0, 0, 0, options.width/2, options.height/2); #endif - - display.add_window(this); - display.check_error(); + } } -#ifndef WIN32 -void Window::event(const XEvent &ev) +void Window::hide() { - switch(ev.type) - { - 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_display(), ev.xkey.keycode, 0), ev.xkey.state, buf[0]); - } - 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: - if(options.fullscreen) - XGrabPointer(display.get_display(), window, true, None, GrabModeAsync, GrabModeAsync, window, None, CurrentTime); - break; - default:; - } -} +#ifdef WIN32 + ShowWindow(priv->window, SW_HIDE); +#else + XUnmapWindow(display.get_private().display, priv->window); #endif + visible=false; -#ifdef WIN32 -int Window::wndproc(UINT msg, WPARAM wp, LPARAM lp) + 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); @@ -332,6 +396,13 @@ 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; @@ -344,29 +415,55 @@ int Window::wndproc(UINT msg, WPARAM wp, LPARAM lp) signal_close.emit(); break; default: - return 0; + return false; } - - 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)); - } - 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