sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11modes.c @ 2825:620a91b6d263

Date: Tue, 02 Dec 2008 23:38:26 +0100 From: Couriersud Subject: Re: SDL: Keyboard layout unknown I have attached a diff which will add an additional keyboard layout to the x11 driver. The issue arose, when I moved to ubuntu intrepid. I was only able to map the keys available on my keyboard. The differences to the existing keyboard was the mapping of HOME,UP,DOWN and some other keys. Now only one issue remains. Dead keys (e.g. ^, ` ') on european keyboards do not generate a "scancode" event. Just a text event when the key is composed (e.g. ?? ?? ??).

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 03 Dec 2008 04:32:24 +0000
parents	7177581dc9fa
children	99210400e8b9

rev	line source
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 Copyright (C) 1997-2006 Sam Lantinga
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "SDL_x11video.h"
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 static int
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 const char *visual_id = SDL_getenv("SDL_VIDEO_X11_VISUALID");
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 int use_directcolor = 1;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 int depth;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 /* Look for an exact visual, if requested */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 if (visual_id) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 XVisualInfo *vi, template;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 int nvis;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 SDL_zero(template);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 template.visualid = SDL_strtol(visual_id, NULL, 0);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 vi = XGetVisualInfo(display, VisualIDMask, &template, &nvis);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 if (vi) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 vinfo = vi;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 XFree(vi);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 return 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 depth = DefaultDepth(display, screen);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 if ((use_directcolor &&
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 XMatchVisualInfo(display, screen, depth, TrueColor, vinfo) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 XMatchVisualInfo(display, screen, depth, PseudoColor, vinfo) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 XMatchVisualInfo(display, screen, depth, StaticColor, vinfo)) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 return 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 return -1;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 void
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 X11_InitModes(_THIS)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 int screen;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 int n;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 XPixmapFormatValues *p;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 p = XListPixmapFormats(data->display, &n);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 for (screen = 0; screen < ScreenCount(data->display); ++screen) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 XVisualInfo vinfo;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 int i, bpp;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 Uint32 Rmask, Gmask, Bmask, Amask;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 SDL_VideoDisplay display;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 SDL_DisplayData *displaydata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 SDL_DisplayMode mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 if (get_visualinfo(data->display, screen, &vinfo) < 0) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 continue;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 bpp = vinfo.depth;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 for (i = 0; i < n; ++i) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 if (p[i].depth == vinfo.depth) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 bpp = p[i].bits_per_pixel;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 break;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 Rmask = vinfo.visual->red_mask;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 Gmask = vinfo.visual->green_mask;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 Bmask = vinfo.visual->blue_mask;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 if (vinfo.depth == 32) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 Amask = (0xFFFFFFFF & ~(Rmask \| Gmask \| Bmask));
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93 } else {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 Amask = 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 mode.format =
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 mode.w = DisplayWidth(data->display, screen);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 mode.h = DisplayHeight(data->display, screen);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 mode.refresh_rate = 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 mode.driverdata = NULL;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 displaydata = (SDL_DisplayData ) SDL_malloc(sizeof(displaydata));
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 if (!displaydata) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 continue;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 displaydata->screen = screen;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 displaydata->visual = vinfo.visual;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1950 diff changeset	109 displaydata->depth = vinfo.depth;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 SDL_zero(display);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112 display.desktop_mode = mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 display.current_mode = mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 display.driverdata = displaydata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 SDL_AddVideoDisplay(&display);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 XFree(p);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 void
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 X11_GetDisplayModes(_THIS)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 SDL_DisplayData data = (SDL_DisplayData ) SDL_CurrentDisplay.driverdata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 SDL_DisplayMode mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 //SDL_AddDisplayMode(_this->current_display, &mode);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 int
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 X11_SetDisplayMode(_THIS, SDL_DisplayMode * mode)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 //SDL_DisplayModeData data = (SDL_DisplayModeData ) mode->driverdata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 return -1;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 void
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 X11_QuitModes(_THIS)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11modes.c @ 2825:620a91b6d263