Mercurial > sdl-ios-xcode

comparison 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
comparison
equal deleted inserted replaced
2294:386ebf50dd91 2295:dbc6d1893869
169 device->GetDisplayModes = X11_GetDisplayModes; 169 device->GetDisplayModes = X11_GetDisplayModes;
170 device->SetDisplayMode = X11_SetDisplayMode; 170 device->SetDisplayMode = X11_SetDisplayMode;
171 device->SetDisplayGammaRamp = X11_SetDisplayGammaRamp; 171 device->SetDisplayGammaRamp = X11_SetDisplayGammaRamp;
172 device->GetDisplayGammaRamp = X11_GetDisplayGammaRamp; 172 device->GetDisplayGammaRamp = X11_GetDisplayGammaRamp;
173 device->PumpEvents = X11_PumpEvents; 173 device->PumpEvents = X11_PumpEvents;
174 device->GetLayoutKey = X11_GetLayoutKey;
174 175
175 device->CreateWindow = X11_CreateWindow; 176 device->CreateWindow = X11_CreateWindow;
176 device->CreateWindowFrom = X11_CreateWindowFrom; 177 device->CreateWindowFrom = X11_CreateWindowFrom;
177 device->SetWindowTitle = X11_SetWindowTitle; 178 device->SetWindowTitle = X11_SetWindowTitle;
178 device->SetWindowPosition = X11_SetWindowPosition; 179 device->SetWindowPosition = X11_SetWindowPosition;
233 data->WM_DELETE_WINDOW = 234 data->WM_DELETE_WINDOW =
234 XInternAtom(data->display, "WM_DELETE_WINDOW", False); 235 XInternAtom(data->display, "WM_DELETE_WINDOW", False);
235 236
236 X11_InitModes(_this); 237 X11_InitModes(_this);
237 238
238 //#if SDL_VIDEO_RENDER_D3D 239 if (X11_InitKeyboard(_this) != 0) {
239 // D3D_AddRenderDriver(_this); 240 return -1;
240 //#endif 241 }
241 //#if SDL_VIDEO_RENDER_GDI
242 // GDI_AddRenderDriver(_this);
243 //#endif
244
245 X11_InitKeyboard(_this);
246 X11_InitMouse(_this); 242 X11_InitMouse(_this);
247 243
248 return 0; 244 return 0;
249 } 245 }
250 246