Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11wm.c @ 246:7c09c9e3b0c7
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Subject: X11 icon byte order bug
This fixes a small byte order bug when running X on a remote host
with a >8bpp screen.
Cheers,
Mattias
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 27 Nov 2001 01:26:57 +0000 |
| parents | 3f09f52ac2cc |
| children | e8157fcb3114 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 3 Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga | |
| 4 | |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
| 20 slouken@devolution.com | |
| 21 */ | |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 #include <stdlib.h> | |
| 29 #include <string.h> | |
| 30 #include <X11/Xlib.h> | |
| 31 #include <X11/Xutil.h> | |
| 32 | |
| 33 #include "SDL_version.h" | |
| 34 #include "SDL_error.h" | |
| 35 #include "SDL_timer.h" | |
| 36 #include "SDL_video.h" | |
| 37 #include "SDL_syswm.h" | |
| 38 #include "SDL_events_c.h" | |
| 39 #include "SDL_pixels_c.h" | |
| 40 #include "SDL_x11modes_c.h" | |
| 41 #include "SDL_x11wm_c.h" | |
| 42 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
43 static Uint8 reverse_byte(Uint8 x) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
44 { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
45 x = (x & 0xaa) >> 1 | (x & 0x55) << 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
46 x = (x & 0xcc) >> 2 | (x & 0x33) << 2; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
47 x = (x & 0xf0) >> 4 | (x & 0x0f) << 4; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
48 return x; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
49 } |
| 0 | 50 |
| 51 void X11_SetIcon(_THIS, SDL_Surface *icon, Uint8 *mask) | |
| 52 { | |
| 53 SDL_Surface *sicon; | |
| 54 XWMHints *wmhints; | |
| 55 XImage *icon_image; | |
| 56 Pixmap icon_pixmap; | |
| 57 Pixmap mask_pixmap; | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
58 Window icon_window = None; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
59 GC gc; |
| 0 | 60 XGCValues GCvalues; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
61 int i, dbpp; |
| 0 | 62 SDL_Rect bounds; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
63 Uint8 *LSBmask; |
| 0 | 64 Visual *dvis; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
65 char *p; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
66 int masksize; |
| 0 | 67 |
| 68 SDL_Lock_EventThread(); | |
| 69 | |
| 70 /* The icon must use the default visual, depth and colormap of the | |
| 71 screen, so it might need a conversion */ | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
72 dvis = DefaultVisual(SDL_Display, SDL_Screen); |
| 0 | 73 dbpp = DefaultDepth(SDL_Display, SDL_Screen); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
74 for(i = 0; i < this->hidden->nvisuals; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
75 if(this->hidden->visuals[i].visual == dvis) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
76 dbpp = this->hidden->visuals[i].bpp; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
77 break; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
78 } |
| 0 | 79 } |
| 80 | |
| 81 /* The Visual struct is supposed to be opaque but we cheat a little */ | |
| 82 sicon = SDL_CreateRGBSurface(SDL_SWSURFACE, icon->w, icon->h, | |
| 83 dbpp, | |
| 84 dvis->red_mask, dvis->green_mask, | |
| 85 dvis->blue_mask, 0); | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
86 if ( sicon == NULL ) |
| 0 | 87 goto done; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
88 |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
89 if(dbpp == 8) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
90 /* Default visual is 8bit; we need to allocate colours from |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
91 the default colormap */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
92 SDL_Color want[256], got[256]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
93 int nwant; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
94 Colormap dcmap; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
95 int missing; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
96 dcmap = DefaultColormap(SDL_Display, SDL_Screen); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
97 if(icon->format->palette) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
98 /* The icon has a palette as well - we just have to |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
99 find those colours */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
100 nwant = icon->format->palette->ncolors; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
101 memcpy(want, icon->format->palette->colors, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
102 nwant * sizeof want[0]); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
103 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
104 /* try the standard 6x6x6 cube for lack of better |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
105 ideas */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
106 int r, g, b, i; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
107 for(r = i = 0; r < 256; r += 0x33) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
108 for(g = 0; g < 256; g += 0x33) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
109 for(b = 0; b < 256; b += 0x33, i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
110 want[i].r = r; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
111 want[i].g = g; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
112 want[i].b = b; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
113 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
114 nwant = 216; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
115 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
116 if(SDL_iconcolors) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
117 /* free already allocated colours first */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
118 unsigned long freelist[512]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
119 int nfree = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
120 for(i = 0; i < 256; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
121 while(SDL_iconcolors[i]) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
122 freelist[nfree++] = i; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
123 SDL_iconcolors[i]--; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
124 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
125 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
126 XFreeColors(GFX_Display, dcmap, freelist, nfree, 0); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
127 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
128 if(!SDL_iconcolors) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
129 SDL_iconcolors = malloc(256 * sizeof *SDL_iconcolors); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
130 memset(SDL_iconcolors, 0, 256 * sizeof *SDL_iconcolors); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
131 |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
132 /* try to allocate the colours */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
133 memset(got, 0, sizeof got); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
134 missing = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
135 for(i = 0; i < nwant; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
136 XColor c; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
137 c.red = want[i].r << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
138 c.green = want[i].g << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
139 c.blue = want[i].b << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
140 c.flags = DoRed | DoGreen | DoBlue; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
141 if(XAllocColor(GFX_Display, dcmap, &c)) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
142 /* got the colour */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
143 SDL_iconcolors[c.pixel]++; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
144 got[c.pixel] = want[i]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
145 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
146 missing = 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
147 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
148 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
149 if(missing) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
150 /* Some colours were apparently missing, so we just |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
151 allocate all the rest as well */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
152 XColor cols[256]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
153 for(i = 0; i < 256; i++) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
154 cols[i].pixel = i; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
155 XQueryColors(GFX_Display, dcmap, cols, 256); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
156 for(i = 0; i < 256; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
157 got[i].r = cols[i].red >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
158 got[i].g = cols[i].green >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
159 got[i].b = cols[i].blue >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
160 if(!SDL_iconcolors[i]) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
161 if(XAllocColor(GFX_Display, dcmap, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
162 cols + i)) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
163 SDL_iconcolors[i] = 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
164 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
165 /* index not available */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
166 got[i].r = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
167 got[i].g = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
168 got[i].b = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
169 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
170 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
171 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
172 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
173 |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
174 SDL_SetColors(sicon, got, 0, 256); |
| 0 | 175 } |
| 176 | |
| 177 bounds.x = 0; | |
| 178 bounds.y = 0; | |
| 179 bounds.w = icon->w; | |
| 180 bounds.h = icon->h; | |
| 181 if ( SDL_LowerBlit(icon, &bounds, sicon, &bounds) < 0 ) | |
| 182 goto done; | |
| 183 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
184 /* We need the mask as given, except in LSBfirst format instead of |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
185 MSBfirst. Reverse the bits in each byte. */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
186 masksize = ((sicon->w + 7) >> 3) * sicon->h; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
187 LSBmask = malloc(masksize); |
| 0 | 188 if ( LSBmask == NULL ) { |
| 189 goto done; | |
| 190 } | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
191 memset(LSBmask, 0, masksize); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
192 for(i = 0; i < masksize; i++) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
193 LSBmask[i] = reverse_byte(mask[i]); |
| 0 | 194 mask_pixmap = XCreatePixmapFromBitmapData(SDL_Display, WMwindow, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
195 (char *)LSBmask, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
196 sicon->w, sicon->h, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
197 1L, 0L, 1); |
| 0 | 198 |
| 199 /* Transfer the image to an X11 pixmap */ | |
| 200 icon_image = XCreateImage(SDL_Display, | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
201 DefaultVisual(SDL_Display, SDL_Screen), |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
202 DefaultDepth(SDL_Display, SDL_Screen), |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
203 ZPixmap, 0, sicon->pixels, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
204 sicon->w, sicon->h, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
205 32, 0); |
|
246
7c09c9e3b0c7
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
236
diff
changeset
|
206 icon_image->byte_order = (SDL_BYTEORDER == SDL_BIG_ENDIAN) |
|
7c09c9e3b0c7
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
236
diff
changeset
|
207 ? MSBFirst : LSBFirst; |
| 0 | 208 icon_pixmap = XCreatePixmap(SDL_Display, SDL_Root, sicon->w, sicon->h, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
209 DefaultDepth(SDL_Display, SDL_Screen)); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
210 gc = XCreateGC(SDL_Display, icon_pixmap, 0, &GCvalues); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
211 XPutImage(SDL_Display, icon_pixmap, gc, icon_image, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
212 0, 0, 0, 0, sicon->w, sicon->h); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
213 XFreeGC(SDL_Display, gc); |
| 0 | 214 XDestroyImage(icon_image); |
| 215 free(LSBmask); | |
| 216 sicon->pixels = NULL; | |
| 217 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
218 /* Some buggy window managers (some versions of Enlightenment, it |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
219 seems) need an icon window *and* icon pixmap to work properly, while |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
220 it screws up others. The default is only to use a pixmap. */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
221 p = getenv("SDL_VIDEO_X11_ICONWIN"); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
222 if(p && *p) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
223 icon_window = XCreateSimpleWindow(SDL_Display, SDL_Root, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
224 0, 0, sicon->w, sicon->h, 0, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
225 CopyFromParent, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
226 CopyFromParent); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
227 XSetWindowBackgroundPixmap(SDL_Display, icon_window, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
228 icon_pixmap); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
229 XClearWindow(SDL_Display, icon_window); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
230 } |
| 0 | 231 |
| 232 /* Set the window icon to the icon pixmap (and icon window) */ | |
| 233 wmhints = XAllocWMHints(); | |
| 234 wmhints->flags = (IconPixmapHint | IconMaskHint); | |
| 235 wmhints->icon_pixmap = icon_pixmap; | |
| 236 wmhints->icon_mask = mask_pixmap; | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
237 if(icon_window != None) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
238 wmhints->flags |= IconWindowHint; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
239 wmhints->icon_window = icon_window; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
240 } |
| 0 | 241 XSetWMHints(SDL_Display, WMwindow, wmhints); |
| 242 XFree(wmhints); | |
| 243 XSync(SDL_Display, False); | |
| 244 | |
| 245 done: | |
| 246 SDL_Unlock_EventThread(); | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
247 SDL_FreeSurface(sicon); |
| 0 | 248 } |
| 249 | |
| 250 void X11_SetCaption(_THIS, const char *title, const char *icon) | |
| 251 { | |
| 252 XTextProperty titleprop, iconprop; | |
| 253 | |
| 254 /* Lock the event thread, in multi-threading environments */ | |
| 255 SDL_Lock_EventThread(); | |
| 256 | |
| 257 if ( title != NULL ) { | |
| 258 XStringListToTextProperty((char **)&title, 1, &titleprop); | |
| 259 XSetWMName(SDL_Display, WMwindow, &titleprop); | |
| 260 XFree(titleprop.value); | |
| 261 } | |
| 262 if ( icon != NULL ) { | |
| 263 XStringListToTextProperty((char **)&icon, 1, &iconprop); | |
| 264 XSetWMIconName(SDL_Display, WMwindow, &iconprop); | |
| 265 XFree(iconprop.value); | |
| 266 } | |
| 267 XSync(SDL_Display, False); | |
| 268 | |
| 269 SDL_Unlock_EventThread(); | |
| 270 } | |
| 271 | |
| 272 /* Iconify the window */ | |
| 273 int X11_IconifyWindow(_THIS) | |
| 274 { | |
| 275 int result; | |
| 276 | |
| 277 SDL_Lock_EventThread(); | |
| 278 result = XIconifyWindow(SDL_Display, WMwindow, SDL_Screen); | |
| 279 XSync(SDL_Display, False); | |
| 280 SDL_Unlock_EventThread(); | |
| 281 return(result); | |
| 282 } | |
| 283 | |
| 284 SDL_GrabMode X11_GrabInputNoLock(_THIS, SDL_GrabMode mode) | |
| 285 { | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
286 int result; |
| 0 | 287 |
| 288 if ( this->screen == NULL ) { | |
| 289 return(SDL_GRAB_OFF); | |
| 290 } | |
| 291 if ( ! SDL_Window ) { | |
| 292 return(mode); /* Will be set later on mode switch */ | |
| 293 } | |
| 294 if ( mode == SDL_GRAB_OFF ) { | |
| 295 XUngrabPointer(SDL_Display, CurrentTime); | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
296 XUngrabKeyboard(SDL_Display, CurrentTime); |
| 0 | 297 } else { |
| 298 if ( this->screen->flags & SDL_FULLSCREEN ) { | |
| 299 /* Unbind the mouse from the fullscreen window */ | |
| 300 XUngrabPointer(SDL_Display, CurrentTime); | |
| 301 } | |
| 302 /* Try to grab the mouse */ | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
303 #if 0 /* We'll wait here until we actually grab, otherwise behavior undefined */ |
| 0 | 304 for ( numtries = 0; numtries < 10; ++numtries ) { |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
305 #else |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
306 while ( 1 ) { |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
307 #endif |
| 0 | 308 result = XGrabPointer(SDL_Display, SDL_Window, True, 0, |
| 309 GrabModeAsync, GrabModeAsync, | |
| 310 SDL_Window, None, CurrentTime); | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
311 if ( result == GrabSuccess ) { |
| 0 | 312 break; |
| 313 } | |
| 314 SDL_Delay(100); | |
| 315 } | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
316 if ( result != GrabSuccess ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
317 /* Uh, oh, what do we do here? */ ; |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
318 } |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
319 /* Now grab the keyboard */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
320 XGrabKeyboard(SDL_Display, WMwindow, True, |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
321 GrabModeAsync, GrabModeAsync, CurrentTime); |
| 0 | 322 |
| 323 /* Raise the window if we grab the mouse */ | |
| 324 if ( !(this->screen->flags & SDL_FULLSCREEN) ) | |
| 325 XRaiseWindow(SDL_Display, WMwindow); | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
326 |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
327 /* Make sure we register input focus */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
328 SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); |
| 0 | 329 } |
| 330 XSync(SDL_Display, False); | |
| 331 | |
| 332 return(mode); | |
| 333 } | |
| 334 | |
| 335 SDL_GrabMode X11_GrabInput(_THIS, SDL_GrabMode mode) | |
| 336 { | |
| 337 SDL_Lock_EventThread(); | |
| 338 mode = X11_GrabInputNoLock(this, mode); | |
| 339 SDL_Unlock_EventThread(); | |
| 340 | |
| 341 return(mode); | |
| 342 } | |
| 343 | |
| 344 /* If 'info' is the right version, this function fills it and returns 1. | |
| 345 Otherwise, in case of a version mismatch, it returns -1. | |
| 346 */ | |
| 347 static void lock_display(void) | |
| 348 { | |
| 349 SDL_Lock_EventThread(); | |
| 350 } | |
| 351 static void unlock_display(void) | |
| 352 { | |
| 353 /* Make sure any X11 transactions are completed */ | |
| 354 SDL_VideoDevice *this = current_video; | |
| 355 XSync(SDL_Display, False); | |
| 356 SDL_Unlock_EventThread(); | |
| 357 } | |
| 358 int X11_GetWMInfo(_THIS, SDL_SysWMinfo *info) | |
| 359 { | |
| 360 if ( info->version.major <= SDL_MAJOR_VERSION ) { | |
| 361 info->subsystem = SDL_SYSWM_X11; | |
| 362 info->info.x11.display = SDL_Display; | |
| 363 info->info.x11.window = SDL_Window; | |
| 364 if ( SDL_VERSIONNUM(info->version.major, | |
| 365 info->version.minor, | |
| 366 info->version.patch) >= 1002 ) { | |
| 367 info->info.x11.fswindow = FSwindow; | |
| 368 info->info.x11.wmwindow = WMwindow; | |
| 369 } | |
| 370 info->info.x11.lock_func = lock_display; | |
| 371 info->info.x11.unlock_func = unlock_display; | |
| 372 return(1); | |
| 373 } else { | |
| 374 SDL_SetError("Application not compiled with SDL %d.%d\n", | |
| 375 SDL_MAJOR_VERSION, SDL_MINOR_VERSION); | |
| 376 return(-1); | |
| 377 } | |
| 378 } |