Mercurial > sdl-ios-xcode

diff src/video/x11/SDL_x11video.c @ 2295:dbc6d1893869

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob.
author Bob Pendleton <bob@pendleton.com>
date Tue, 08 Jan 2008 00:10:46 +0000
parents 1d23870d8c49
children fbe8ff44c519
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.c	Thu Jan 03 06:07:30 2008 +0000
+++ b/src/video/x11/SDL_x11video.c	Tue Jan 08 00:10:46 2008 +0000
@@ -171,6 +171,7 @@
     device->SetDisplayGammaRamp = X11_SetDisplayGammaRamp;
     device->GetDisplayGammaRamp = X11_GetDisplayGammaRamp;
     device->PumpEvents = X11_PumpEvents;
+    device->GetLayoutKey = X11_GetLayoutKey;
 
     device->CreateWindow = X11_CreateWindow;
     device->CreateWindowFrom = X11_CreateWindowFrom;
@@ -235,14 +236,9 @@
 
     X11_InitModes(_this);
 
-//#if SDL_VIDEO_RENDER_D3D
-//    D3D_AddRenderDriver(_this);
-//#endif
-//#if SDL_VIDEO_RENDER_GDI
-//    GDI_AddRenderDriver(_this);
-//#endif
-
-    X11_InitKeyboard(_this);
+    if (X11_InitKeyboard(_this) != 0) {
+        return -1;
+    }
     X11_InitMouse(_this);
 
     return 0;