|
|
|
|
@ -43,21 +43,18 @@ |
|
|
|
|
#define Button6 6 |
|
|
|
|
#define Button7 7 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
|
|
|
// Translates an X Window key to internal coding
|
|
|
|
|
//========================================================================
|
|
|
|
|
|
|
|
|
|
static int translateKey(int keycode) |
|
|
|
|
{ |
|
|
|
|
// Use the pre-filled LUT (see updateKeyCodeLUT() ).
|
|
|
|
|
// Use the pre-filled LUT (see updateKeyCodeLUT() in x11_init.c)
|
|
|
|
|
if ((keycode >= 0) && (keycode < 256)) |
|
|
|
|
{ |
|
|
|
|
return _glfwLibrary.X11.keyCodeLUT[keycode]; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -90,6 +87,7 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
|
|
|
|
|
// Every window needs a colormap
|
|
|
|
|
// Create one based on the visual used by the current context
|
|
|
|
|
// TODO: Decouple this from context creation
|
|
|
|
|
|
|
|
|
|
window->X11.colormap = XCreateColormap(_glfwLibrary.X11.display, |
|
|
|
|
_glfwLibrary.X11.root, |
|
|
|
|
@ -109,30 +107,29 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
|
|
|
|
|
if (wndconfig->mode == GLFW_WINDOWED) |
|
|
|
|
{ |
|
|
|
|
// The /only/ reason we are setting the background pixel here is
|
|
|
|
|
// that otherwise our window wont get any decorations on systems
|
|
|
|
|
// using Compiz on Intel hardware
|
|
|
|
|
// The /only/ reason for setting the background pixel here is that
|
|
|
|
|
// otherwise our window won't get any decorations on systems using
|
|
|
|
|
// certain versions of Compiz on Intel hardware
|
|
|
|
|
wa.background_pixel = BlackPixel(_glfwLibrary.X11.display, |
|
|
|
|
_glfwLibrary.X11.screen); |
|
|
|
|
wamask |= CWBackPixel; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
window->X11.handle = XCreateWindow( |
|
|
|
|
_glfwLibrary.X11.display, |
|
|
|
|
_glfwLibrary.X11.root, |
|
|
|
|
0, 0, // Upper left corner of this window on root
|
|
|
|
|
window->width, window->height, |
|
|
|
|
0, // Border width
|
|
|
|
|
visual->depth, // Color depth
|
|
|
|
|
InputOutput, |
|
|
|
|
visual->visual, |
|
|
|
|
wamask, |
|
|
|
|
&wa |
|
|
|
|
); |
|
|
|
|
window->X11.handle = XCreateWindow(_glfwLibrary.X11.display, |
|
|
|
|
_glfwLibrary.X11.root, |
|
|
|
|
0, 0, // Position
|
|
|
|
|
window->width, window->height, |
|
|
|
|
0, // Border width
|
|
|
|
|
visual->depth, // Color depth
|
|
|
|
|
InputOutput, |
|
|
|
|
visual->visual, |
|
|
|
|
wamask, |
|
|
|
|
&wa); |
|
|
|
|
|
|
|
|
|
if (!window->X11.handle) |
|
|
|
|
{ |
|
|
|
|
// TODO: Handle all the various error codes here
|
|
|
|
|
// TODO: Handle all the various error codes here and translate them
|
|
|
|
|
// to GLFW errors
|
|
|
|
|
|
|
|
|
|
_glfwSetError(GLFW_PLATFORM_ERROR, |
|
|
|
|
"X11/GLX: Failed to create window"); |
|
|
|
|
@ -147,8 +144,8 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
// manager ignore the window completely (ICCCM, section 4)
|
|
|
|
|
// The good thing is that this makes undecorated fullscreen windows
|
|
|
|
|
// easy to do; the bad thing is that we have to do everything manually
|
|
|
|
|
// and some things (like iconify/restore) won't work at all, as they're
|
|
|
|
|
// usually performed by the window manager
|
|
|
|
|
// and some things (like iconify/restore) won't work at all, as those
|
|
|
|
|
// are tasks usually performed by the window manager
|
|
|
|
|
|
|
|
|
|
XSetWindowAttributes attributes; |
|
|
|
|
attributes.override_redirect = True; |
|
|
|
|
@ -165,7 +162,7 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
"WM_DELETE_WINDOW", |
|
|
|
|
False); |
|
|
|
|
|
|
|
|
|
// Declare the WM protocols we support
|
|
|
|
|
// Declare the WM protocols supported by GLFW
|
|
|
|
|
{ |
|
|
|
|
int count = 0; |
|
|
|
|
Atom protocols[2]; |
|
|
|
|
@ -176,8 +173,8 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
protocols[count++] = _glfwLibrary.X11.wmDeleteWindow; |
|
|
|
|
|
|
|
|
|
// The _NET_WM_PING EWMH protocol
|
|
|
|
|
// Tells the WM to ping our window and flag us as unresponsive if we
|
|
|
|
|
// don't reply within a few seconds
|
|
|
|
|
// Tells the WM to ping the GLFW window and flag the application as
|
|
|
|
|
// unresponsive if the WM doesn't get a reply within a few seconds
|
|
|
|
|
if (_glfwLibrary.X11.wmPing != None) |
|
|
|
|
protocols[count++] = _glfwLibrary.X11.wmPing; |
|
|
|
|
|
|
|
|
|
@ -283,7 +280,7 @@ static void captureCursor(_GLFWwindow* window) |
|
|
|
|
|
|
|
|
|
static void showCursor(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
// Un-grab cursor (only in windowed mode: in fullscreen mode we still
|
|
|
|
|
// Un-grab cursor (in windowed mode only; in fullscreen mode we still
|
|
|
|
|
// want the cursor grabbed in order to confine the cursor to the window
|
|
|
|
|
// area)
|
|
|
|
|
if (window->X11.cursorGrabbed) |
|
|
|
|
@ -377,7 +374,7 @@ static void enterFullscreenMode(_GLFWwindow* window) |
|
|
|
|
} |
|
|
|
|
else if (window->X11.overrideRedirect) |
|
|
|
|
{ |
|
|
|
|
// In override-redirect mode, we have divorced ourselves from the
|
|
|
|
|
// In override-redirect mode we have divorced ourselves from the
|
|
|
|
|
// window manager, so we need to do everything manually
|
|
|
|
|
|
|
|
|
|
XRaiseWindow(_glfwLibrary.X11.display, window->X11.handle); |
|
|
|
|
@ -405,7 +402,6 @@ static void leaveFullscreenMode(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
_glfwRestoreVideoMode(); |
|
|
|
|
|
|
|
|
|
// Did we change the screen saver setting?
|
|
|
|
|
if (_glfwLibrary.X11.saver.changed) |
|
|
|
|
{ |
|
|
|
|
// Restore old screen saver settings
|
|
|
|
|
@ -648,7 +644,8 @@ static void processSingleEvent(void) |
|
|
|
|
if (event.xmotion.x != window->X11.cursorPosX || |
|
|
|
|
event.xmotion.y != window->X11.cursorPosY) |
|
|
|
|
{ |
|
|
|
|
// The cursor was moved and we didn't do it
|
|
|
|
|
// The cursor was moved by something other than GLFW
|
|
|
|
|
|
|
|
|
|
int x, y; |
|
|
|
|
|
|
|
|
|
if (window->cursorMode == GLFW_CURSOR_CAPTURED) |
|
|
|
|
@ -716,8 +713,8 @@ static void processSingleEvent(void) |
|
|
|
|
else if (_glfwLibrary.X11.wmPing != None && |
|
|
|
|
(Atom) event.xclient.data.l[0] == _glfwLibrary.X11.wmPing) |
|
|
|
|
{ |
|
|
|
|
// The window manager is pinging us to make sure we are still
|
|
|
|
|
// responding to events
|
|
|
|
|
// The window manager is pinging the application to ensure it's
|
|
|
|
|
// still responding to events
|
|
|
|
|
|
|
|
|
|
event.xclient.window = _glfwLibrary.X11.root; |
|
|
|
|
XSendEvent(_glfwLibrary.X11.display, |
|
|
|
|
@ -864,7 +861,6 @@ static void processSingleEvent(void) |
|
|
|
|
{ |
|
|
|
|
case RRScreenChangeNotify: |
|
|
|
|
{ |
|
|
|
|
// Show XRandR that we really care
|
|
|
|
|
XRRUpdateConfiguration(&event); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
@ -1071,8 +1067,8 @@ void _glfwPlatformIconifyWindow(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
if (window->X11.overrideRedirect) |
|
|
|
|
{ |
|
|
|
|
// We can't iconify/restore override-redirect windows, as that's
|
|
|
|
|
// performed by the window manager
|
|
|
|
|
// Override-redirect windows cannot be iconified or restored, as those
|
|
|
|
|
// tasks are performed by the window manager
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -1090,8 +1086,8 @@ void _glfwPlatformRestoreWindow(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
if (window->X11.overrideRedirect) |
|
|
|
|
{ |
|
|
|
|
// We can't iconify/restore override-redirect windows, as that's
|
|
|
|
|
// performed by the window manager
|
|
|
|
|
// Override-redirect windows cannot be iconified or restored, as those
|
|
|
|
|
// tasks are performed by the window manager
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -1195,7 +1191,7 @@ void _glfwPlatformWaitEvents(void) |
|
|
|
|
|
|
|
|
|
void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y) |
|
|
|
|
{ |
|
|
|
|
// Store the new position so we can recognise it later
|
|
|
|
|
// Store the new position so it can be recognized later
|
|
|
|
|
window->X11.cursorPosX = x; |
|
|
|
|
window->X11.cursorPosY = y; |
|
|
|
|
|
|
|
|
|
|
Camilla Berglund
ago%!(EXTRA string=13 years)