Cleanup of basic XIM support.

Shortened and simplified the code.  Removed reporting of XIM sentinel
key press event.  Added credit.  Updated changelog.

Closes #151.
This commit is contained in:
Camilla Berglund
2014-09-21 02:13:41 +02:00
parent cec63f3cb5
commit c769061a8a
4 changed files with 89 additions and 116 deletions
+3 -5
View File
@@ -78,6 +78,7 @@ typedef struct _GLFWwindowX11
{
Colormap colormap;
Window handle;
XIC ic;
GLboolean overrideRedirect;
@@ -90,8 +91,6 @@ typedef struct _GLFWwindowX11
// The last position the cursor was warped to by GLFW
int warpPosX, warpPosY;
// The window's input context
XIC ic;
} _GLFWwindowX11;
@@ -107,6 +106,8 @@ typedef struct _GLFWlibraryX11
Cursor cursor;
// Context for mapping window XIDs to _GLFWwindow pointers
XContext context;
// XIM input method
XIM im;
// True if window manager supports EWMH
GLboolean hasEWMH;
// Most recent error code received by X error handler
@@ -204,9 +205,6 @@ typedef struct _GLFWlibraryX11
Window source;
} xdnd;
// Input method and context
XIM im;
} _GLFWlibraryX11;