Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11wm.c @ 4328:4abf24b03b1d SDL-1.2
Only show the dynamic audio libraries if we'll be dynamically loading them
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 13 Oct 2009 06:45:02 +0000 |
| parents | ee58103d5354 |
| children | a1af511bbbdd |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 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 | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1168
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
246
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 #include <X11/Xlib.h> | |
| 25 #include <X11/Xutil.h> | |
| 26 | |
| 27 #include "SDL_version.h" | |
| 28 #include "SDL_timer.h" | |
| 29 #include "SDL_video.h" | |
| 30 #include "SDL_syswm.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
31 #include "../SDL_pixels_c.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
32 #include "../../events/SDL_events_c.h" |
| 0 | 33 #include "SDL_x11modes_c.h" |
| 34 #include "SDL_x11wm_c.h" | |
| 35 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
36 static Uint8 reverse_byte(Uint8 x) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
37 { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
38 x = (x & 0xaa) >> 1 | (x & 0x55) << 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
39 x = (x & 0xcc) >> 2 | (x & 0x33) << 2; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
40 x = (x & 0xf0) >> 4 | (x & 0x0f) << 4; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
41 return x; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
42 } |
| 0 | 43 |
| 44 void X11_SetIcon(_THIS, SDL_Surface *icon, Uint8 *mask) | |
| 45 { | |
| 46 SDL_Surface *sicon; | |
| 47 XWMHints *wmhints; | |
| 48 XImage *icon_image; | |
| 49 Pixmap icon_pixmap; | |
| 50 Pixmap mask_pixmap; | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
51 Window icon_window = None; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
52 GC gc; |
| 0 | 53 XGCValues GCvalues; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
54 int i, dbpp; |
| 0 | 55 SDL_Rect bounds; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
56 Uint8 *LSBmask; |
| 0 | 57 Visual *dvis; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
58 char *p; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
59 int masksize; |
| 0 | 60 |
| 61 SDL_Lock_EventThread(); | |
| 62 | |
| 63 /* The icon must use the default visual, depth and colormap of the | |
| 64 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
|
65 dvis = DefaultVisual(SDL_Display, SDL_Screen); |
| 0 | 66 dbpp = DefaultDepth(SDL_Display, SDL_Screen); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
67 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
|
68 if(this->hidden->visuals[i].visual == dvis) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
69 dbpp = this->hidden->visuals[i].bpp; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
70 break; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
71 } |
| 0 | 72 } |
| 73 | |
| 74 /* The Visual struct is supposed to be opaque but we cheat a little */ | |
| 75 sicon = SDL_CreateRGBSurface(SDL_SWSURFACE, icon->w, icon->h, | |
| 76 dbpp, | |
| 77 dvis->red_mask, dvis->green_mask, | |
| 78 dvis->blue_mask, 0); | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
79 if ( sicon == NULL ) |
| 0 | 80 goto done; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
81 |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
82 if(dbpp == 8) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
83 /* 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
|
84 the default colormap */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
85 SDL_Color want[256], got[256]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
86 int nwant; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
87 Colormap dcmap; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
88 int missing; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
89 dcmap = DefaultColormap(SDL_Display, SDL_Screen); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
90 if(icon->format->palette) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
91 /* 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
|
92 find those colours */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
93 nwant = icon->format->palette->ncolors; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
94 SDL_memcpy(want, icon->format->palette->colors, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
95 nwant * sizeof want[0]); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
96 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
97 /* 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
|
98 ideas */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
99 int r, g, b, i; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
100 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
|
101 for(g = 0; g < 256; g += 0x33) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
102 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
|
103 want[i].r = r; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
104 want[i].g = g; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
105 want[i].b = b; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
106 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
107 nwant = 216; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
108 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
109 if(SDL_iconcolors) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
110 /* free already allocated colours first */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
111 unsigned long freelist[512]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
112 int nfree = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
113 for(i = 0; i < 256; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
114 while(SDL_iconcolors[i]) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
115 freelist[nfree++] = i; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
116 SDL_iconcolors[i]--; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
117 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
118 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
119 XFreeColors(GFX_Display, dcmap, freelist, nfree, 0); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
120 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
121 if(!SDL_iconcolors) |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
122 SDL_iconcolors = SDL_malloc(256 * sizeof *SDL_iconcolors); |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
123 SDL_memset(SDL_iconcolors, 0, 256 * sizeof *SDL_iconcolors); |
|
236
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 /* try to allocate the colours */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
126 SDL_memset(got, 0, sizeof got); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
127 missing = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
128 for(i = 0; i < nwant; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
129 XColor c; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
130 c.red = want[i].r << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
131 c.green = want[i].g << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
132 c.blue = want[i].b << 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
133 c.flags = DoRed | DoGreen | DoBlue; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
134 if(XAllocColor(GFX_Display, dcmap, &c)) { |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
135 /* got the colour */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
136 SDL_iconcolors[c.pixel]++; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
137 got[c.pixel] = want[i]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
138 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
139 missing = 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
140 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
141 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
142 if(missing) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
143 /* 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
|
144 allocate all the rest as well */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
145 XColor cols[256]; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
146 for(i = 0; i < 256; i++) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
147 cols[i].pixel = i; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
148 XQueryColors(GFX_Display, dcmap, cols, 256); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
149 for(i = 0; i < 256; i++) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
150 got[i].r = cols[i].red >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
151 got[i].g = cols[i].green >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
152 got[i].b = cols[i].blue >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
153 if(!SDL_iconcolors[i]) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
154 if(XAllocColor(GFX_Display, dcmap, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
155 cols + i)) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
156 SDL_iconcolors[i] = 1; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
157 } else { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
158 /* index not available */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
159 got[i].r = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
160 got[i].g = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
161 got[i].b = 0; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
162 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
163 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
164 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
165 } |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
166 |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
167 SDL_SetColors(sicon, got, 0, 256); |
| 0 | 168 } |
| 169 | |
| 170 bounds.x = 0; | |
| 171 bounds.y = 0; | |
| 172 bounds.w = icon->w; | |
| 173 bounds.h = icon->h; | |
| 174 if ( SDL_LowerBlit(icon, &bounds, sicon, &bounds) < 0 ) | |
| 175 goto done; | |
| 176 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
177 /* 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
|
178 MSBfirst. Reverse the bits in each byte. */ |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
179 masksize = ((sicon->w + 7) >> 3) * sicon->h; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
180 LSBmask = SDL_malloc(masksize); |
| 0 | 181 if ( LSBmask == NULL ) { |
| 182 goto done; | |
| 183 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
184 SDL_memset(LSBmask, 0, masksize); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
185 for(i = 0; i < masksize; i++) |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
186 LSBmask[i] = reverse_byte(mask[i]); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
187 mask_pixmap = XCreatePixmapFromBitmapData(SDL_Display, WMwindow, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
188 (char *)LSBmask, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
189 sicon->w, sicon->h, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
190 1L, 0L, 1); |
| 0 | 191 |
| 192 /* Transfer the image to an X11 pixmap */ | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
193 icon_image = XCreateImage(SDL_Display, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
194 DefaultVisual(SDL_Display, SDL_Screen), |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
195 DefaultDepth(SDL_Display, SDL_Screen), |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
196 ZPixmap, 0, sicon->pixels, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
197 sicon->w, sicon->h, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
198 32, 0); |
|
246
7c09c9e3b0c7
From: "Mattias Engdeg�rd" <f91-men@nada.kth.se>
Sam Lantinga <slouken@libsdl.org>
parents:
236
diff
changeset
|
199 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
|
200 ? MSBFirst : LSBFirst; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
201 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
|
202 DefaultDepth(SDL_Display, SDL_Screen)); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
203 gc = XCreateGC(SDL_Display, icon_pixmap, 0, &GCvalues); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
204 XPutImage(SDL_Display, icon_pixmap, gc, icon_image, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
205 0, 0, 0, 0, sicon->w, sicon->h); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
206 XFreeGC(SDL_Display, gc); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
207 XDestroyImage(icon_image); |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
208 SDL_free(LSBmask); |
| 0 | 209 sicon->pixels = NULL; |
| 210 | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
211 /* 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
|
212 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
|
213 it screws up others. The default is only to use a pixmap. */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
214 p = SDL_getenv("SDL_VIDEO_X11_ICONWIN"); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
215 if(p && *p) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
216 icon_window = XCreateSimpleWindow(SDL_Display, SDL_Root, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
217 0, 0, sicon->w, sicon->h, 0, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
218 CopyFromParent, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
219 CopyFromParent); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
220 XSetWindowBackgroundPixmap(SDL_Display, icon_window, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
221 icon_pixmap); |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
222 XClearWindow(SDL_Display, icon_window); |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
223 } |
| 0 | 224 |
| 225 /* Set the window icon to the icon pixmap (and icon window) */ | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
226 wmhints = XAllocWMHints(); |
| 4247 | 227 wmhints->flags = (IconPixmapHint | IconMaskHint | InputHint); |
| 0 | 228 wmhints->icon_pixmap = icon_pixmap; |
| 229 wmhints->icon_mask = mask_pixmap; | |
| 4247 | 230 wmhints->input = True; |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
231 if(icon_window != None) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
232 wmhints->flags |= IconWindowHint; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
233 wmhints->icon_window = icon_window; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
234 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
235 XSetWMHints(SDL_Display, WMwindow, wmhints); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
236 XFree(wmhints); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
237 XSync(SDL_Display, False); |
| 0 | 238 |
| 239 done: | |
| 240 SDL_Unlock_EventThread(); | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
241 SDL_FreeSurface(sicon); |
| 0 | 242 } |
| 243 | |
| 1767 | 244 void X11_SetCaptionNoLock(_THIS, const char *title, const char *icon) |
| 0 | 245 { |
| 246 XTextProperty titleprop, iconprop; | |
| 1558 | 247 Status status; |
| 248 | |
| 249 #ifdef X_HAVE_UTF8_STRING | |
|
1849
b5a4ac87b98c
Fixed uninitialized variable warnings
Sam Lantinga <slouken@libsdl.org>
parents:
1767
diff
changeset
|
250 Atom _NET_WM_NAME = 0; |
|
b5a4ac87b98c
Fixed uninitialized variable warnings
Sam Lantinga <slouken@libsdl.org>
parents:
1767
diff
changeset
|
251 Atom _NET_WM_ICON_NAME = 0; |
| 1558 | 252 |
| 253 /* Look up some useful Atoms */ | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
254 if (SDL_X11_HAVE_UTF8) { |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
255 _NET_WM_NAME = XInternAtom(SDL_Display, "_NET_WM_NAME", False); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
256 _NET_WM_ICON_NAME = XInternAtom(SDL_Display, "_NET_WM_ICON_NAME", False); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
257 } |
| 1558 | 258 #endif |
| 0 | 259 |
| 260 if ( title != NULL ) { | |
| 3998 | 261 char *title_locale = SDL_iconv_utf8_locale(title); |
| 262 if ( !title_locale ) { | |
| 1558 | 263 SDL_OutOfMemory(); |
| 264 return; | |
| 265 } | |
| 3998 | 266 status = XStringListToTextProperty(&title_locale, 1, &titleprop); |
| 267 SDL_free(title_locale); | |
| 1558 | 268 if ( status ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
269 XSetTextProperty(SDL_Display, WMwindow, &titleprop, XA_WM_NAME); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
270 XFree(titleprop.value); |
| 1558 | 271 } |
|
913
a7a8c282d62e
Date: Mon, 28 Jun 2004 23:15:55 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
272 #ifdef X_HAVE_UTF8_STRING |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
273 if (SDL_X11_HAVE_UTF8) { |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
274 status = Xutf8TextListToTextProperty(SDL_Display, |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
275 (char **)&title, 1, XUTF8StringStyle, &titleprop); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
276 if ( status == Success ) { |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
277 XSetTextProperty(SDL_Display, WMwindow, &titleprop, _NET_WM_NAME); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
278 XFree(titleprop.value); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
279 } |
| 1558 | 280 } |
|
913
a7a8c282d62e
Date: Mon, 28 Jun 2004 23:15:55 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
281 #endif |
| 0 | 282 } |
| 283 if ( icon != NULL ) { | |
| 3998 | 284 char *icon_locale = SDL_iconv_utf8_locale(icon); |
| 285 if ( !icon_locale ) { | |
| 1558 | 286 SDL_OutOfMemory(); |
| 287 return; | |
| 288 } | |
| 3998 | 289 status = XStringListToTextProperty(&icon_locale, 1, &iconprop); |
| 290 SDL_free(icon_locale); | |
| 1558 | 291 if ( status ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
292 XSetTextProperty(SDL_Display, WMwindow, &iconprop, XA_WM_ICON_NAME); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
293 XFree(iconprop.value); |
| 1558 | 294 } |
|
913
a7a8c282d62e
Date: Mon, 28 Jun 2004 23:15:55 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
295 #ifdef X_HAVE_UTF8_STRING |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
296 if (SDL_X11_HAVE_UTF8) { |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
297 status = Xutf8TextListToTextProperty(SDL_Display, |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
298 (char **)&icon, 1, XUTF8StringStyle, &iconprop); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
299 if ( status == Success ) { |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
300 XSetTextProperty(SDL_Display, WMwindow, &iconprop, _NET_WM_ICON_NAME); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
301 XFree(iconprop.value); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
302 } |
| 1558 | 303 } |
|
913
a7a8c282d62e
Date: Mon, 28 Jun 2004 23:15:55 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
304 #endif |
| 0 | 305 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
306 XSync(SDL_Display, False); |
| 1767 | 307 } |
| 0 | 308 |
| 1767 | 309 void X11_SetCaption(_THIS, const char *title, const char *icon) |
| 310 { | |
| 311 SDL_Lock_EventThread(); | |
| 312 X11_SetCaptionNoLock(this, title, icon); | |
| 0 | 313 SDL_Unlock_EventThread(); |
| 314 } | |
| 315 | |
| 316 /* Iconify the window */ | |
| 317 int X11_IconifyWindow(_THIS) | |
| 318 { | |
| 319 int result; | |
| 320 | |
| 321 SDL_Lock_EventThread(); | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
322 result = XIconifyWindow(SDL_Display, WMwindow, SDL_Screen); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
323 XSync(SDL_Display, False); |
| 0 | 324 SDL_Unlock_EventThread(); |
| 325 return(result); | |
| 326 } | |
| 327 | |
| 328 SDL_GrabMode X11_GrabInputNoLock(_THIS, SDL_GrabMode mode) | |
| 329 { | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
99
diff
changeset
|
330 int result; |
| 0 | 331 |
| 332 if ( this->screen == NULL ) { | |
| 333 return(SDL_GRAB_OFF); | |
| 334 } | |
| 335 if ( ! SDL_Window ) { | |
| 336 return(mode); /* Will be set later on mode switch */ | |
| 337 } | |
| 338 if ( mode == SDL_GRAB_OFF ) { | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
339 XUngrabPointer(SDL_Display, CurrentTime); |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
340 XUngrabKeyboard(SDL_Display, CurrentTime); |
| 0 | 341 } else { |
| 342 if ( this->screen->flags & SDL_FULLSCREEN ) { | |
| 343 /* Unbind the mouse from the fullscreen window */ | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
344 XUngrabPointer(SDL_Display, CurrentTime); |
| 0 | 345 } |
| 346 /* Try to grab the mouse */ | |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
347 #if 0 /* We'll wait here until we actually grab, otherwise behavior undefined */ |
| 0 | 348 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
|
349 #else |
| 1767 | 350 for ( ; ; ) { |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
351 #endif |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
352 result = XGrabPointer(SDL_Display, SDL_Window, True, 0, |
| 0 | 353 GrabModeAsync, GrabModeAsync, |
| 354 SDL_Window, None, CurrentTime); | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
355 if ( result == GrabSuccess ) { |
| 0 | 356 break; |
| 357 } | |
| 358 SDL_Delay(100); | |
| 359 } | |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
360 if ( result != GrabSuccess ) { |
|
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
361 /* 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
|
362 } |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
363 /* Now grab the keyboard */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
364 XGrabKeyboard(SDL_Display, WMwindow, True, |
|
88
71774090f286
Hopefully fixed the fullscreen mode code for KDE
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
365 GrabModeAsync, GrabModeAsync, CurrentTime); |
| 0 | 366 |
| 367 /* Raise the window if we grab the mouse */ | |
| 368 if ( !(this->screen->flags & SDL_FULLSCREEN) ) | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
369 XRaiseWindow(SDL_Display, WMwindow); |
|
98
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
370 |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
371 /* Make sure we register input focus */ |
|
8a5aff5c1294
Fixed some problems with the fullscreen code. Wooo. :)
Sam Lantinga <slouken@lokigames.com>
parents:
88
diff
changeset
|
372 SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); |
|
3896
1a327643e741
X11 backend: tell app that mouse focus has been obtained when grabbing the
Ryan C. Gordon <icculus@icculus.org>
parents:
3872
diff
changeset
|
373 /* Since we grabbed the pointer, we have mouse focus, too. */ |
|
1a327643e741
X11 backend: tell app that mouse focus has been obtained when grabbing the
Ryan C. Gordon <icculus@icculus.org>
parents:
3872
diff
changeset
|
374 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); |
| 0 | 375 } |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
376 XSync(SDL_Display, False); |
| 0 | 377 |
| 378 return(mode); | |
| 379 } | |
| 380 | |
| 381 SDL_GrabMode X11_GrabInput(_THIS, SDL_GrabMode mode) | |
| 382 { | |
| 383 SDL_Lock_EventThread(); | |
| 384 mode = X11_GrabInputNoLock(this, mode); | |
| 385 SDL_Unlock_EventThread(); | |
| 386 | |
| 387 return(mode); | |
| 388 } | |
| 389 | |
| 390 /* If 'info' is the right version, this function fills it and returns 1. | |
| 391 Otherwise, in case of a version mismatch, it returns -1. | |
| 392 */ | |
| 393 static void lock_display(void) | |
| 394 { | |
| 395 SDL_Lock_EventThread(); | |
| 396 } | |
| 397 static void unlock_display(void) | |
| 398 { | |
| 399 /* Make sure any X11 transactions are completed */ | |
| 400 SDL_VideoDevice *this = current_video; | |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
401 XSync(SDL_Display, False); |
| 0 | 402 SDL_Unlock_EventThread(); |
| 403 } | |
| 3872 | 404 |
| 405 #include <stdio.h> | |
| 0 | 406 int X11_GetWMInfo(_THIS, SDL_SysWMinfo *info) |
| 407 { | |
| 408 if ( info->version.major <= SDL_MAJOR_VERSION ) { | |
| 409 info->subsystem = SDL_SYSWM_X11; | |
| 410 info->info.x11.display = SDL_Display; | |
| 411 info->info.x11.window = SDL_Window; | |
| 412 if ( SDL_VERSIONNUM(info->version.major, | |
| 413 info->version.minor, | |
| 414 info->version.patch) >= 1002 ) { | |
| 415 info->info.x11.fswindow = FSwindow; | |
| 416 info->info.x11.wmwindow = WMwindow; | |
| 417 } | |
| 3872 | 418 |
| 419 | |
| 420 if ( SDL_VERSIONNUM(info->version.major, | |
| 421 info->version.minor, | |
| 422 info->version.patch) >= 1212 ) { | |
| 423 info->info.x11.gfxdisplay = GFX_Display; | |
| 424 } | |
| 425 | |
| 0 | 426 info->info.x11.lock_func = lock_display; |
| 427 info->info.x11.unlock_func = unlock_display; | |
| 428 return(1); | |
| 429 } else { | |
| 430 SDL_SetError("Application not compiled with SDL %d.%d\n", | |
| 431 SDL_MAJOR_VERSION, SDL_MINOR_VERSION); | |
| 432 return(-1); | |
| 433 } | |
| 434 } |