From 91a4fea4672c54d84bd3e46422e32636351c8053 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 30 Apr 2012 19:37:54 +0000 Subject: Fix wonky modifiers on Windows. --- pugl/pugl_win.cpp | 10 +++++----- pugl/pugl_x11.c | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'pugl') diff --git a/pugl/pugl_win.cpp b/pugl/pugl_win.cpp index a6b604f..6c4b07f 100644 --- a/pugl/pugl_win.cpp +++ b/pugl/pugl_win.cpp @@ -200,11 +200,11 @@ static void setModifiers(PuglView* view) { view->mods = 0; - view->mods |= GetKeyState(VK_SHIFT) ? PUGL_MOD_SHIFT : 0; - view->mods |= GetKeyState(VK_CONTROL) ? PUGL_MOD_CTRL : 0; - view->mods |= GetKeyState(VK_MENU) ? PUGL_MOD_ALT : 0; - view->mods |= GetKeyState(VK_LWIN) ? PUGL_MOD_SUPER : 0; - view->mods |= GetKeyState(VK_RWIN) ? PUGL_MOD_SUPER : 0; + view->mods |= (GetKeyState(VK_SHIFT) < 0) ? PUGL_MOD_SHIFT : 0; + view->mods |= (GetKeyState(VK_CONTROL) < 0) ? PUGL_MOD_CTRL : 0; + view->mods |= (GetKeyState(VK_MENU) < 0) ? PUGL_MOD_ALT : 0; + view->mods |= (GetKeyState(VK_LWIN) < 0) ? PUGL_MOD_SUPER : 0; + view->mods |= (GetKeyState(VK_RWIN) < 0) ? PUGL_MOD_SUPER : 0; } PuglStatus diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c index c180a9a..08bfc40 100644 --- a/pugl/pugl_x11.c +++ b/pugl/pugl_x11.c @@ -75,8 +75,9 @@ puglCreate(PuglNativeWindow parent, PuglPlatformData* impl = view->impl; - view->width = width; - view->height = height; + view->width = width; + view->height = height; + impl->display = XOpenDisplay(0); impl->screen = DefaultScreen(impl->display); -- cgit v1.2.3