author  Gabriel Jacobo <gabomdq@gmail.com> 
Tue, 19 Jun 2012 14:19:05 0300  
changeset 6331  5732e1a80bde 
parent 6316  a89c79a3f0cd 
child 6336  6e6163b6ba69 
permissions  rwxrxrx 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1 
/* 
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

2 
Simple DirectMedia Layer 
6138  3 
Copyright (C) 19972012 Sam Lantinga <slouken@libsdl.org> 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

4 

5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

5 
This software is provided 'asis', without any express or implied 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

6 
warranty. In no event will the authors be held liable for any damages 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

7 
arising from the use of this software. 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

8 

5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

9 
Permission is granted to anyone to use this software for any purpose, 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

10 
including commercial applications, and to alter it and redistribute it 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

11 
freely, subject to the following restrictions: 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

12 

5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

13 
1. The origin of this software must not be misrepresented; you must not 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

14 
claim that you wrote the original software. If you use this software 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

15 
in a product, an acknowledgment in the product documentation would be 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

16 
appreciated but is not required. 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

17 
2. Altered source versions must be plainly marked as such, and must not be 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

18 
misrepresented as being the original software. 
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5531
diff
changeset

19 
3. This notice may not be removed or altered from any source distribution. 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

20 
*/ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

21 
#include "SDL_config.h" 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

22 

5481
22dfc3958dc3
Fixed so code will compile with SDL_config_minimal.h
Sam Lantinga <slouken@libsdl.org>
parents:
5478
diff
changeset

23 
#if SDL_VIDEO_DRIVER_X11 
22dfc3958dc3
Fixed so code will compile with SDL_config_minimal.h
Sam Lantinga <slouken@libsdl.org>
parents:
5478
diff
changeset

24 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

25 
#include "../SDL_sysvideo.h" 
4465
3e69e077cb95
Removed multimouse / multikeyboard support in anticipation of a real multimouse and multitouch API.
Sam Lantinga <slouken@libsdl.org>
parents:
3697
diff
changeset

26 
#include "../SDL_pixels_c.h" 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

27 
#include "../../events/SDL_keyboard_c.h" 
2940
b93965a16fe0
Fixed X11 mouse motion/button events  it's not actually safe to cast mouse events to device events.
Sam Lantinga <slouken@libsdl.org>
parents:
2931
diff
changeset

28 
#include "../../events/SDL_mouse_c.h" 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

29 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

30 
#include "SDL_x11video.h" 
2940
b93965a16fe0
Fixed X11 mouse motion/button events  it's not actually safe to cast mouse events to device events.
Sam Lantinga <slouken@libsdl.org>
parents:
2931
diff
changeset

31 
#include "SDL_x11mouse.h" 
4782
b6930aefd008
Finished X11 shapedwindow functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
3697
diff
changeset

32 
#include "SDL_x11shape.h" 
6316
a89c79a3f0cd
1.Moved all xinput2 functionality to its own file
Dimitris Zenios <dimitris.zenios@gmail.com>
parents:
6275
diff
changeset

33 
#include "SDL_x11xinput2.h" 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

34 

6188
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

35 
#if SDL_VIDEO_OPENGL_ES  SDL_VIDEO_OPENGL_ES2 
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

36 
#include "SDL_x11opengles.h" 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

37 
#endif 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

38 

4465
3e69e077cb95
Removed multimouse / multikeyboard support in anticipation of a real multimouse and multitouch API.
Sam Lantinga <slouken@libsdl.org>
parents:
3697
diff
changeset

39 
#include "SDL_timer.h" 
3241
08c5964f2a34
Fixed a few issues compiling with Mac OS X 10.6
Sam Lantinga <slouken@libsdl.org>
parents:
3225
diff
changeset

40 
#include "SDL_syswm.h" 
08c5964f2a34
Fixed a few issues compiling with Mac OS X 10.6
Sam Lantinga <slouken@libsdl.org>
parents:
3225
diff
changeset

41 

3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

42 
#define _NET_WM_STATE_REMOVE 0l 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

43 
#define _NET_WM_STATE_ADD 1l 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

44 
#define _NET_WM_STATE_TOGGLE 2l 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

45 

4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

46 
static SDL_bool 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

47 
X11_IsWindowOldFullscreen(_THIS, SDL_Window * window) 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

48 
{ 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

49 
SDL_VideoData *videodata = (SDL_VideoData *) _this>driverdata; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

50 

a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

51 
/* ICCCM2.0compliant window managers can handle fullscreen windows */ 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

52 
if ((window>flags & SDL_WINDOW_FULLSCREEN) && !videodata>net_wm) { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

53 
return SDL_TRUE; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

54 
} else { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

55 
return SDL_FALSE; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

56 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

57 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

58 

4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

59 
static SDL_bool 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

60 
X11_IsWindowMapped(_THIS, SDL_Window * window) 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

61 
{ 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

62 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

63 
SDL_VideoData *videodata = (SDL_VideoData *) _this>driverdata; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

64 
XWindowAttributes attr; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

65 

a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

66 
XGetWindowAttributes(videodata>display, data>xwindow, &attr); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

67 
if (attr.map_state != IsUnmapped) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

68 
return SDL_TRUE; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

69 
} else { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

70 
return SDL_FALSE; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

71 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

72 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

73 

a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

74 
static int 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

75 
X11_GetWMStateProperty(_THIS, SDL_Window * window, Atom atoms[3]) 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

76 
{ 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

77 
SDL_VideoData *data = (SDL_VideoData *) _this>driverdata; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

78 
int count = 0; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

79 

a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

80 
if (window>flags & SDL_WINDOW_FULLSCREEN) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

81 
atoms[count++] = data>_NET_WM_STATE_FULLSCREEN; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

82 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

83 
if (window>flags & SDL_WINDOW_MAXIMIZED) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

84 
atoms[count++] = data>_NET_WM_STATE_MAXIMIZED_VERT; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

85 
atoms[count++] = data>_NET_WM_STATE_MAXIMIZED_HORZ; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

86 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

87 
return count; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

88 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

89 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

90 
static int 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

91 
SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

92 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

93 
SDL_VideoData *videodata = (SDL_VideoData *) _this>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

94 
SDL_WindowData *data; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

95 
int numwindows = videodata>numwindows; 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

96 
int windowlistlength = videodata>windowlistlength; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

97 
SDL_WindowData **windowlist = videodata>windowlist; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

98 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

99 
/* Allocate the window data */ 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

100 
data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data)); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

101 
if (!data) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

102 
SDL_OutOfMemory(); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

103 
return 1; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

104 
} 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

105 
data>window = window; 
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

106 
data>xwindow = w; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

107 
#ifdef X_HAVE_UTF8_STRING 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

108 
if (SDL_X11_HAVE_UTF8) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

109 
data>ic = 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

110 
pXCreateIC(videodata>im, XNClientWindow, w, XNFocusWindow, w, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

111 
XNInputStyle, XIMPreeditNothing  XIMStatusNothing, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

112 
XNResourceName, videodata>classname, XNResourceClass, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

113 
videodata>classname, NULL); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

114 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

115 
#endif 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

116 
data>created = created; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

117 
data>videodata = videodata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

118 

2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

119 
/* Associate the data with the window */ 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

120 

3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

121 
if (numwindows < windowlistlength) { 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

122 
windowlist[numwindows] = data; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

123 
videodata>numwindows++; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

124 
} else { 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

125 
windowlist = 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

126 
(SDL_WindowData **) SDL_realloc(windowlist, 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

127 
(numwindows + 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

128 
1) * sizeof(*windowlist)); 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

129 
if (!windowlist) { 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

130 
SDL_OutOfMemory(); 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

131 
SDL_free(data); 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

132 
return 1; 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

133 
} 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

134 
windowlist[numwindows] = data; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

135 
videodata>numwindows++; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

136 
videodata>windowlistlength++; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

137 
videodata>windowlist = windowlist; 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

138 
} 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

139 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

140 
/* Fill in the SDL window with the window data */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

141 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

142 
XWindowAttributes attrib; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

143 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

144 
XGetWindowAttributes(data>videodata>display, w, &attrib); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

145 
window>x = attrib.x; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

146 
window>y = attrib.y; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

147 
window>w = attrib.width; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

148 
window>h = attrib.height; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

149 
if (attrib.map_state != IsUnmapped) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

150 
window>flags = SDL_WINDOW_SHOWN; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

151 
} else { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

152 
window>flags &= ~SDL_WINDOW_SHOWN; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

153 
} 
5182
073b86030262
Added the X11 framebuffer implementation. Simple! :)
Sam Lantinga <slouken@libsdl.org>
parents:
5088
diff
changeset

154 
data>visual = attrib.visual; 
5466  155 
data>colormap = attrib.colormap; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

156 
} 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

157 

9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

158 
{ 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

159 
Atom _NET_WM_STATE = data>videodata>_NET_WM_STATE; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

160 
Atom _NET_WM_STATE_MAXIMIZED_VERT = data>videodata>_NET_WM_STATE_MAXIMIZED_VERT; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

161 
Atom _NET_WM_STATE_MAXIMIZED_HORZ = data>videodata>_NET_WM_STATE_MAXIMIZED_HORZ; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

162 
Atom _NET_WM_STATE_FULLSCREEN = data>videodata>_NET_WM_STATE_FULLSCREEN; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

163 
Atom actualType; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

164 
int actualFormat; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

165 
unsigned long i, numItems, bytesAfter; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

166 
unsigned char *propertyValue = NULL; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

167 
long maxLength = 1024; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

168 

9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

169 
if (XGetWindowProperty(data>videodata>display, w, _NET_WM_STATE, 
3078  170 
0l, maxLength, False, XA_ATOM, &actualType, 
171 
&actualFormat, &numItems, &bytesAfter, 

172 
&propertyValue) == Success) { 

173 
Atom *atoms = (Atom *) propertyValue; 

3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

174 
int maximized = 0; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

175 
int fullscreen = 0; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

176 

9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

177 
for (i = 0; i < numItems; ++i) { 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

178 
if (atoms[i] == _NET_WM_STATE_MAXIMIZED_VERT) { 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

179 
maximized = 1; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

180 
} else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_HORZ) { 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

181 
maximized = 2; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

182 
} else if ( atoms[i] == _NET_WM_STATE_FULLSCREEN) { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

183 
fullscreen = 1; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

184 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

185 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

186 
if (maximized == 3) { 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

187 
window>flags = SDL_WINDOW_MAXIMIZED; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

188 
} else if (fullscreen == 1) { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

189 
window>flags = SDL_WINDOW_FULLSCREEN; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

190 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

191 
XFree(propertyValue); 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

192 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

193 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

194 

6024
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

195 
{ 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

196 
Window FocalWindow; 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

197 
int RevertTo=0; 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

198 
XGetInputFocus(data>videodata>display, &FocalWindow, &RevertTo); 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

199 
if (FocalWindow==w) 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

200 
{ 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

201 
window>flags = SDL_WINDOW_INPUT_FOCUS; 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

202 
SDL_SetKeyboardFocus(data>window); 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

203 
} 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

204 

38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

205 
if (window>flags & SDL_WINDOW_INPUT_GRABBED) { 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

206 
/* Tell x11 to clip mouse */ 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

207 
} 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

208 
} 
38e2f4644548
Set up window focus correctly when using an existing X11 window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6023
diff
changeset

209 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

210 
/* FIXME: How can I tell? 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

211 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

212 
DWORD style = GetWindowLong(hwnd, GWL_STYLE); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

213 
if (style & WS_VISIBLE) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

214 
if (style & (WS_BORDER  WS_THICKFRAME)) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

215 
window>flags &= ~SDL_WINDOW_BORDERLESS; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

216 
} else { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

217 
window>flags = SDL_WINDOW_BORDERLESS; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

218 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

219 
if (style & WS_THICKFRAME) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

220 
window>flags = SDL_WINDOW_RESIZABLE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

221 
} else { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

222 
window>flags &= ~SDL_WINDOW_RESIZABLE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

223 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

224 
if (style & WS_MINIMIZE) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

225 
window>flags = SDL_WINDOW_MINIMIZED; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

226 
} else { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

227 
window>flags &= ~SDL_WINDOW_MINIMIZED; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

228 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

229 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

230 
if (GetFocus() == hwnd) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

231 
int index = data>videodata>keyboard; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

232 
window>flags = SDL_WINDOW_INPUT_FOCUS; 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

233 
SDL_SetKeyboardFocus(index, data>window); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

234 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

235 
if (window>flags & SDL_WINDOW_INPUT_GRABBED) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

236 
RECT rect; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

237 
GetClientRect(hwnd, &rect); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

238 
ClientToScreen(hwnd, (LPPOINT) & rect); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

239 
ClientToScreen(hwnd, (LPPOINT) & rect + 1); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

240 
ClipCursor(&rect); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

241 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

242 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

243 
*/ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

244 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

245 
/* All done! */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

246 
window>driverdata = data; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

247 
return 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

248 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

249 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

250 
int 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

251 
X11_CreateWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

252 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

253 
SDL_VideoData *data = (SDL_VideoData *) _this>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

254 
SDL_DisplayData *displaydata = 
5246
58265e606e4e
Window coordinates are in the global space and windows are not tied to a particular display.
Sam Lantinga <slouken@libsdl.org>
parents:
5243
diff
changeset

255 
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)>driverdata; 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

256 
Display *display = data>display; 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

257 
int screen = displaydata>screen; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

258 
Visual *visual; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

259 
int depth; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

260 
XSetWindowAttributes xattr; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

261 
Window w; 
6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

262 
XSizeHints sizehints; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

263 
XWMHints wmhints; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

264 
XClassHint classhints; 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

265 
Atom _NET_WM_WINDOW_TYPE; 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

266 
Atom _NET_WM_WINDOW_TYPE_NORMAL; 
6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

267 
Atom _NET_WM_PID; 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

268 
int wmstate_count; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

269 
Atom wmstate_atoms[3]; 
6045
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

270 
Uint32 fevent = 0; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

271 

5088  272 
#if SDL_VIDEO_OPENGL_GLX 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

273 
if (window>flags & SDL_WINDOW_OPENGL) { 
1952
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

274 
XVisualInfo *vinfo; 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

275 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

276 
vinfo = X11_GL_GetVisual(_this, display, screen); 
1952
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

277 
if (!vinfo) { 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

278 
return 1; 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

279 
} 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

280 
visual = vinfo>visual; 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

281 
depth = vinfo>depth; 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

282 
XFree(vinfo); 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

283 
} else 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

284 
#endif 
6188
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

285 
#if SDL_VIDEO_OPENGL_ES  SDL_VIDEO_OPENGL_ES2 
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

286 
if (window>flags & SDL_WINDOW_OPENGL) { 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

287 
XVisualInfo *vinfo; 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

288 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

289 
vinfo = X11_GLES_GetVisual(_this, display, screen); 
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

290 
if (!vinfo) { 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

291 
return 1; 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

292 
} 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

293 
visual = vinfo>visual; 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

294 
depth = vinfo>depth; 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

295 
XFree(vinfo); 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

296 
} else 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

297 
#endif 
1952
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

298 
{ 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

299 
visual = displaydata>visual; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

300 
depth = displaydata>depth; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

301 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

302 

5386
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

303 
xattr.override_redirect = False; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

304 
xattr.background_pixel = 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

305 
xattr.border_pixel = 0; 
5466  306 

307 
if (visual>class == DirectColor) { 

308 
XColor *colorcells; 

309 
int i; 

310 
int ncolors; 

311 
int rmax, gmax, bmax; 

312 
int rmask, gmask, bmask; 

313 
int rshift, gshift, bshift; 

314 

315 
xattr.colormap = 

316 
XCreateColormap(display, RootWindow(display, screen), 

317 
visual, AllocAll); 

318 

319 
/* If we can't create a colormap, then we must die */ 

320 
if (!xattr.colormap) { 

321 
SDL_SetError("Could not create writable colormap"); 

322 
return 1; 

323 
} 

324 

325 
/* OK, we got a colormap, now fill it in as best as we can */ 

326 
colorcells = SDL_malloc(visual>map_entries * sizeof(XColor)); 

327 
if (!colorcells) { 

328 
SDL_OutOfMemory(); 

329 
return 1; 

330 
} 

331 
ncolors = visual>map_entries; 

332 
rmax = 0xffff; 

333 
gmax = 0xffff; 

334 
bmax = 0xffff; 

335 

336 
rshift = 0; 

337 
rmask = visual>red_mask; 

338 
while (0 == (rmask & 1)) { 

339 
rshift++; 

340 
rmask >>= 1; 

341 
} 

342 

343 
gshift = 0; 

344 
gmask = visual>green_mask; 

345 
while (0 == (gmask & 1)) { 

346 
gshift++; 

347 
gmask >>= 1; 

348 
} 

349 

350 
bshift = 0; 

351 
bmask = visual>blue_mask; 

352 
while (0 == (bmask & 1)) { 

353 
bshift++; 

354 
bmask >>= 1; 

355 
} 

356 

357 
/* build the color table pixel values */ 

358 
for (i = 0; i < ncolors; i++) { 

359 
Uint32 red = (rmax * i) / (ncolors  1); 

360 
Uint32 green = (gmax * i) / (ncolors  1); 

361 
Uint32 blue = (bmax * i) / (ncolors  1); 

362 

363 
Uint32 rbits = (rmask * i) / (ncolors  1); 

364 
Uint32 gbits = (gmask * i) / (ncolors  1); 

365 
Uint32 bbits = (bmask * i) / (ncolors  1); 

366 

367 
Uint32 pix = 

368 
(rbits << rshift)  (gbits << gshift)  (bbits << bshift); 

369 

370 
colorcells[i].pixel = pix; 

371 

372 
colorcells[i].red = red; 

373 
colorcells[i].green = green; 

374 
colorcells[i].blue = blue; 

375 

376 
colorcells[i].flags = DoRed  DoGreen  DoBlue; 

377 
} 

378 

379 
XStoreColors(display, xattr.colormap, colorcells, ncolors); 

380 

381 
SDL_free(colorcells); 

382 
} else { 

383 
xattr.colormap = 

384 
XCreateColormap(display, RootWindow(display, screen), 

385 
visual, AllocNone); 

386 
} 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

387 

5386
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

388 
w = XCreateWindow(display, RootWindow(display, screen), 
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

389 
window>x, window>y, window>w, window>h, 
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

390 
0, depth, InputOutput, visual, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

391 
(CWOverrideRedirect  CWBackPixel  CWBorderPixel  
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

392 
CWColormap), &xattr); 
1952
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

393 
if (!w) { 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

394 
SDL_SetError("Couldn't create window"); 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

395 
return 1; 
420716272158
Implemented X11 OpenGL support.
Sam Lantinga <slouken@libsdl.org>
parents:
1951
diff
changeset

396 
} 
6188
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

397 
#if SDL_VIDEO_OPENGL_ES  SDL_VIDEO_OPENGL_ES2 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

398 
if (window>flags & SDL_WINDOW_OPENGL) { 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

399 
/* Create the GLES window surface */ 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

400 
_this>gles_data>egl_surface = 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

401 
_this>gles_data>eglCreateWindowSurface(_this>gles_data> 
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

402 
egl_display, 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

403 
_this>gles_data>egl_config, 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

404 
(NativeWindowType) w, NULL); 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

405 

6188
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

406 
if (_this>gles_data>egl_surface == EGL_NO_SURFACE) { 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

407 
SDL_SetError("Could not create GLES window surface"); 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

408 
return 1; 
e82023802002
Fixed bug 1242  PATCH: Improve support for OpenGL ES under X11
Sam Lantinga <slouken@libsdl.org>
parents:
6167
diff
changeset

409 
} 
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

410 
} 
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3078
diff
changeset

411 
#endif 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

412 

5386
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

413 
if (window>flags & SDL_WINDOW_BORDERLESS) { 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

414 
SDL_bool set; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

415 
Atom WM_HINTS; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

416 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

417 
/* We haven't modified the window manager hints yet */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

418 
set = SDL_FALSE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

419 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

420 
/* First try to set MWM hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

421 
WM_HINTS = XInternAtom(display, "_MOTIF_WM_HINTS", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

422 
if (WM_HINTS != None) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

423 
/* Hints used by Motif compliant window managers */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

424 
struct 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

425 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

426 
unsigned long flags; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

427 
unsigned long functions; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

428 
unsigned long decorations; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

429 
long input_mode; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

430 
unsigned long status; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

431 
} MWMHints = { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

432 
(1L << 1), 0, 0, 0, 0}; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

433 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

434 
XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

435 
PropModeReplace, (unsigned char *) &MWMHints, 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

436 
sizeof(MWMHints) / 4); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

437 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

438 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

439 
/* Now try to set KWM hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

440 
WM_HINTS = XInternAtom(display, "KWM_WIN_DECORATION", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

441 
if (WM_HINTS != None) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

442 
long KWMHints = 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

443 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

444 
XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

445 
PropModeReplace, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

446 
(unsigned char *) &KWMHints, 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

447 
sizeof(KWMHints) / 4); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

448 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

449 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

450 
/* Now try to set GNOME hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

451 
WM_HINTS = XInternAtom(display, "_WIN_HINTS", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

452 
if (WM_HINTS != None) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

453 
long GNOMEHints = 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

454 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

455 
XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

456 
PropModeReplace, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

457 
(unsigned char *) &GNOMEHints, 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

458 
sizeof(GNOMEHints) / 4); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

459 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

460 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

461 
/* Finally set the transient hints if necessary */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

462 
if (!set) { 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

463 
XSetTransientForHint(display, w, RootWindow(display, screen)); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

464 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

465 
} else { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

466 
SDL_bool set; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

467 
Atom WM_HINTS; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

468 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

469 
/* We haven't modified the window manager hints yet */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

470 
set = SDL_FALSE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

471 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

472 
/* First try to unset MWM hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

473 
WM_HINTS = XInternAtom(display, "_MOTIF_WM_HINTS", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

474 
if (WM_HINTS != None) { 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

475 
XDeleteProperty(display, w, WM_HINTS); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

476 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

477 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

478 
/* Now try to unset KWM hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

479 
WM_HINTS = XInternAtom(display, "KWM_WIN_DECORATION", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

480 
if (WM_HINTS != None) { 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

481 
XDeleteProperty(display, w, WM_HINTS); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

482 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

483 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

484 
/* Now try to unset GNOME hints */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

485 
WM_HINTS = XInternAtom(display, "_WIN_HINTS", True); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

486 
if (WM_HINTS != None) { 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

487 
XDeleteProperty(display, w, WM_HINTS); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

488 
set = SDL_TRUE; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

489 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

490 
/* Finally unset the transient hints if necessary */ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

491 
if (!set) { 
4555  492 
XDeleteProperty(display, w, XA_WM_TRANSIENT_FOR); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

493 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

494 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

495 

6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

496 
/* Setup the normal size hints */ 
6275
963497e37d34
Fixed bug 1403  Creating a window with resizable flags may crash
Sam Lantinga <slouken@libsdl.org>
parents:
6188
diff
changeset

497 
sizehints.flags = 0; 
6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

498 
if (!(window>flags & SDL_WINDOW_RESIZABLE)) { 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

499 
sizehints.min_width = sizehints.max_width = window>w; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

500 
sizehints.min_height = sizehints.max_height = window>h; 
6275
963497e37d34
Fixed bug 1403  Creating a window with resizable flags may crash
Sam Lantinga <slouken@libsdl.org>
parents:
6188
diff
changeset

501 
sizehints.flags = (PMaxSize  PMinSize); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

502 
} 
6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

503 
sizehints.x = window>x; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

504 
sizehints.y = window>y; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

505 
sizehints.flags = USPosition; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

506 

6167
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

507 
/* Setup the input hints so we get keyboard input */ 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

508 
wmhints.input = True; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

509 
wmhints.flags = InputHint; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

510 

c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

511 
/* Setup the class hints so we can get an icon (AfterStep) */ 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

512 
classhints.res_name = data>classname; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

513 
classhints.res_class = data>classname; 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

514 

c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

515 
/* Set the size, input and class hints, and define WM_CLIENT_MACHINE and WM_LOCALE_NAME */ 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

516 
XSetWMProperties(display, w, NULL, NULL, NULL, 0, &sizehints, &wmhints, &classhints); 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

517 

c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

518 
/* Set the PID related to the window for the given hostname, if possible */ 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

519 
if (data>pid > 0) { 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

520 
_NET_WM_PID = XInternAtom(display, "_NET_WM_PID", False); 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

521 
XChangeProperty(display, w, _NET_WM_PID, XA_CARDINAL, 32, PropModeReplace, 
c071e1372341
X11: Move to XSetWMProperties and add support to _NET_WM_PID
Marco Trevisan (Treviño) <mail@3v1n0.net>
parents:
6138
diff
changeset

522 
(unsigned char *)&data>pid, 1); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

523 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

524 

4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

525 
/* Set the window manager state */ 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

526 
wmstate_count = X11_GetWMStateProperty(_this, window, wmstate_atoms); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

527 
if (wmstate_count > 0) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

528 
XChangeProperty(display, w, data>_NET_WM_STATE, XA_ATOM, 32, 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

529 
PropModeReplace, 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

530 
(unsigned char *)wmstate_atoms, wmstate_count); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

531 
} else { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

532 
XDeleteProperty(display, w, data>_NET_WM_STATE); 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

533 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

534 

4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

535 
/* Let the window manager know we're a "normal" window */ 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

536 
_NET_WM_WINDOW_TYPE = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False); 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

537 
_NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False); 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

538 
XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32, 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

539 
PropModeReplace, 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

540 
(unsigned char *)&_NET_WM_WINDOW_TYPE_NORMAL, 1); 
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

541 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

542 
/* Allow the window to be deleted by the window manager */ 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

543 
XSetWMProtocols(display, w, &data>WM_DELETE_WINDOW, 1); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

544 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

545 
if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) { 
4521
50125e8aab94
Let the window manager know we're a "normal" window
Sam Lantinga <slouken@libsdl.org>
parents:
4520
diff
changeset

546 
XDestroyWindow(display, w); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

547 
return 1; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

548 
} 
5386
762e67f81fc7
Simplified the X11 window creation
Sam Lantinga <slouken@libsdl.org>
parents:
5305
diff
changeset

549 

2325
c7bcf84ba1b9
Next version of internationalized input for X11. On my machine (famous last words :) with a US English keyboard and locale I can compose ` and e and get a text
Bob Pendleton <bob@pendleton.com>
parents:
2324
diff
changeset

550 
#ifdef X_HAVE_UTF8_STRING 
6045
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

551 
if (SDL_X11_HAVE_UTF8) { 
2325
c7bcf84ba1b9
Next version of internationalized input for X11. On my machine (famous last words :) with a US English keyboard and locale I can compose ` and e and get a text
Bob Pendleton <bob@pendleton.com>
parents:
2324
diff
changeset

552 
pXGetICValues(((SDL_WindowData *) window>driverdata)>ic, 
c7bcf84ba1b9
Next version of internationalized input for X11. On my machine (famous last words :) with a US English keyboard and locale I can compose ` and e and get a text
Bob Pendleton <bob@pendleton.com>
parents:
2324
diff
changeset

553 
XNFilterEvents, &fevent, NULL); 
2718
abacf2555bb4
Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton
Szymon Wilczek <kazeuser@gmail.com>
parents:
2710
diff
changeset

554 
} 
2325
c7bcf84ba1b9
Next version of internationalized input for X11. On my machine (famous last words :) with a US English keyboard and locale I can compose ` and e and get a text
Bob Pendleton <bob@pendleton.com>
parents:
2324
diff
changeset

555 
#endif 
c7bcf84ba1b9
Next version of internationalized input for X11. On my machine (famous last words :) with a US English keyboard and locale I can compose ` and e and get a text
Bob Pendleton <bob@pendleton.com>
parents:
2324
diff
changeset

556 

6316
a89c79a3f0cd
1.Moved all xinput2 functionality to its own file
Dimitris Zenios <dimitris.zenios@gmail.com>
parents:
6275
diff
changeset

557 
X11_Xinput2SelectTouch(_this, window); 
a89c79a3f0cd
1.Moved all xinput2 functionality to its own file
Dimitris Zenios <dimitris.zenios@gmail.com>
parents:
6275
diff
changeset

558 

6045
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

559 
XSelectInput(display, w, 
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

560 
(FocusChangeMask  EnterWindowMask  LeaveWindowMask  
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

561 
ExposureMask  ButtonPressMask  ButtonReleaseMask  
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

562 
PointerMotionMask  KeyPressMask  KeyReleaseMask  
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

563 
PropertyChangeMask  StructureNotifyMask  
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

564 
KeymapStateMask  fevent)); 
b8e995dab018
Fix crash on X servers without UTF8 support.
Ryan C. Gordon <icculus@icculus.org>
parents:
6024
diff
changeset

565 

5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

566 
XFlush(display); 
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

567 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

568 
return 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

569 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

570 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

571 
int 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

572 
X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

573 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

574 
Window w = (Window) data; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

575 

4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

576 
window>title = X11_GetWindowTitle(_this, w); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

577 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

578 
if (SetupWindowData(_this, window, w, SDL_FALSE) < 0) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

579 
return 1; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

580 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

581 
return 0; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

582 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

583 

4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

584 
char * 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

585 
X11_GetWindowTitle(_THIS, Window xwindow) 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

586 
{ 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

587 
SDL_VideoData *data = (SDL_VideoData *) _this>driverdata; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

588 
Display *display = data>display; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

589 
int status, real_format; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

590 
Atom real_type; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

591 
unsigned long items_read, items_left; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

592 
unsigned char *propdata; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

593 
char *title = NULL; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

594 

a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

595 
status = XGetWindowProperty(display, xwindow, data>_NET_WM_NAME, 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

596 
0L, 8192L, False, data>UTF8_STRING, &real_type, &real_format, 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

597 
&items_read, &items_left, &propdata); 
6023
6279958d571d
XGetWindowProperty() can report success but still give you a NULL pointer.
Ryan C. Gordon <icculus@icculus.org>
parents:
5981
diff
changeset

598 
if (status == Success && propdata) { 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

599 
title = SDL_strdup(SDL_static_cast(char*, propdata)); 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

600 
XFree(propdata); 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

601 
} else { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

602 
status = XGetWindowProperty(display, xwindow, XA_WM_NAME, 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

603 
0L, 8192L, False, XA_STRING, &real_type, &real_format, 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

604 
&items_read, &items_left, &propdata); 
6023
6279958d571d
XGetWindowProperty() can report success but still give you a NULL pointer.
Ryan C. Gordon <icculus@icculus.org>
parents:
5981
diff
changeset

605 
if (status == Success && propdata) { 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

606 
title = SDL_iconv_string("UTF8", "", SDL_static_cast(char*, propdata), items_read+1); 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

607 
} else { 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

608 
title = SDL_strdup(""); 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

609 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

610 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

611 
return title; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

612 
} 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

613 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

614 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

615 
X11_SetWindowTitle(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

616 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

617 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

618 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

619 
XTextProperty titleprop, iconprop; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

620 
Status status; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

621 
const char *title = window>title; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

622 
const char *icon = NULL; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

623 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

624 
#ifdef X_HAVE_UTF8_STRING 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

625 
Atom _NET_WM_NAME = data>videodata>_NET_WM_NAME; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

626 
Atom _NET_WM_ICON_NAME = data>videodata>_NET_WM_ICON_NAME; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

627 
#endif 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

628 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

629 
if (title != NULL) { 
2143
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

630 
char *title_locale = SDL_iconv_utf8_locale(title); 
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

631 
if (!title_locale) { 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

632 
SDL_OutOfMemory(); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

633 
return; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

634 
} 
2143
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

635 
status = XStringListToTextProperty(&title_locale, 1, &titleprop); 
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

636 
SDL_free(title_locale); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

637 
if (status) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

638 
XSetTextProperty(display, data>xwindow, &titleprop, XA_WM_NAME); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

639 
XFree(titleprop.value); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

640 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

641 
#ifdef X_HAVE_UTF8_STRING 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

642 
if (SDL_X11_HAVE_UTF8) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

643 
status = 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

644 
Xutf8TextListToTextProperty(display, (char **) &title, 1, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

645 
XUTF8StringStyle, &titleprop); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

646 
if (status == Success) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

647 
XSetTextProperty(display, data>xwindow, &titleprop, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

648 
_NET_WM_NAME); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

649 
XFree(titleprop.value); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

650 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

651 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

652 
#endif 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

653 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

654 
if (icon != NULL) { 
2143
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

655 
char *icon_locale = SDL_iconv_utf8_locale(icon); 
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

656 
if (!icon_locale) { 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

657 
SDL_OutOfMemory(); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

658 
return; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

659 
} 
2143
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

660 
status = XStringListToTextProperty(&icon_locale, 1, &iconprop); 
e906da4414a3
Fix for bug #447 merged from SDL 1.2
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset

661 
SDL_free(icon_locale); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

662 
if (status) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

663 
XSetTextProperty(display, data>xwindow, &iconprop, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

664 
XA_WM_ICON_NAME); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

665 
XFree(iconprop.value); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

666 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

667 
#ifdef X_HAVE_UTF8_STRING 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

668 
if (SDL_X11_HAVE_UTF8) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

669 
status = 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

670 
Xutf8TextListToTextProperty(display, (char **) &icon, 1, 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

671 
XUTF8StringStyle, &iconprop); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

672 
if (status == Success) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

673 
XSetTextProperty(display, data>xwindow, &iconprop, 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

674 
_NET_WM_ICON_NAME); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

675 
XFree(iconprop.value); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

676 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

677 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

678 
#endif 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

679 
} 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

680 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

681 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

682 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

683 
void 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

684 
X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon) 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

685 
{ 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

686 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

687 
Display *display = data>videodata>display; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

688 
Atom _NET_WM_ICON = data>videodata>_NET_WM_ICON; 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

689 

e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

690 
if (icon) { 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

691 
SDL_PixelFormat format; 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

692 
SDL_Surface *surface; 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

693 
int propsize; 
4528  694 
long *propdata; 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

695 

e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

696 
/* Convert the icon to ARGB for modern window managers */ 
5288  697 
SDL_InitFormat(&format, SDL_PIXELFORMAT_ARGB8888); 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

698 
surface = SDL_ConvertSurface(icon, &format, 0); 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

699 
if (!surface) { 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

700 
return; 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

701 
} 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

702 

e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

703 
/* Set the _NET_WM_ICON property */ 
2990  704 
propsize = 2 + (icon>w * icon>h); 
4566
40c833d951a1
Fixed memory corruption on AMD64
Sam Lantinga <slouken@libsdl.org>
parents:
4555
diff
changeset

705 
propdata = SDL_malloc(propsize * sizeof(long)); 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

706 
if (propdata) { 
4528  707 
int x, y; 
708 
Uint32 *src; 

709 
long *dst; 

710 

2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

711 
propdata[0] = icon>w; 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

712 
propdata[1] = icon>h; 
4528  713 
dst = &propdata[2]; 
714 
for (y = 0; y < icon>h; ++y) { 

715 
src = (Uint32*)((Uint8*)surface>pixels + y * surface>pitch); 

716 
for (x = 0; x < icon>w; ++x) { 

717 
*dst++ = *src++; 

718 
} 

719 
} 

3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

720 
XChangeProperty(display, data>xwindow, _NET_WM_ICON, XA_CARDINAL, 
2990  721 
32, PropModeReplace, (unsigned char *) propdata, 
722 
propsize); 

2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

723 
} 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

724 
SDL_FreeSurface(surface); 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

725 
} else { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

726 
XDeleteProperty(display, data>xwindow, _NET_WM_ICON); 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

727 
} 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

728 
XFlush(display); 
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

729 
} 
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

730 

e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2945
diff
changeset

731 
void 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

732 
X11_SetWindowPosition(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

733 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

734 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

735 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

736 

5478
6b65ff3cee62
Fixed bug 1167 (SDL_WINDOWPOS_CENTERED doesn't work if used right after fullscreen > windowed switch)
Sam Lantinga <slouken@libsdl.org>
parents:
5466
diff
changeset

737 
XMoveWindow(display, data>xwindow, window>x, window>y); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

738 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

739 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

740 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

741 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

742 
X11_SetWindowSize(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

743 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

744 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

745 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

746 

4937
24d44c7c4c63
Don't crash when resizing nonshaped windows
Sam Lantinga <slouken@libsdl.org>
parents:
4902
diff
changeset

747 
if (SDL_IsShapedWindow(window)) 
4782
b6930aefd008
Finished X11 shapedwindow functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
3697
diff
changeset

748 
X11_ResizeWindowShape(window); 
5531
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

749 
if (!(window>flags & SDL_WINDOW_RESIZABLE)) { 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

750 
/* Apparently, if the X11 Window is set to a 'nonresizable' window, you cannot resize it using the XResizeWindow, thus 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

751 
we must set the size hints to adjust the window size.*/ 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

752 
XSizeHints *sizehints = XAllocSizeHints(); 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

753 
long userhints; 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

754 

477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

755 
XGetWMNormalHints(display, data>xwindow, sizehints, &userhints); 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

756 

477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

757 
sizehints>min_width = sizehints>max_height = window>w; 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

758 
sizehints>min_height = sizehints>max_height = window>h; 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

759 

477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

760 
XSetWMNormalHints(display, data>xwindow, sizehints); 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

761 

477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

762 
XFree(sizehints); 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

763 
} else 
477f550f6efd
Fixed setting programmatically setting the size of a window on X11 for nonresizable windows.
Sam Lantinga <slouken@libsdl.org>
parents:
5481
diff
changeset

764 
XResizeWindow(display, data>xwindow, window>w, window>h); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

765 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

766 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

767 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

768 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

769 
X11_ShowWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

770 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

771 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

772 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

773 

3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

774 
XMapRaised(display, data>xwindow); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

775 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

776 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

777 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

778 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

779 
X11_HideWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

780 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

781 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

782 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

783 

3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

784 
XUnmapWindow(display, data>xwindow); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

785 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

786 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

787 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

788 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

789 
X11_RaiseWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

790 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

791 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

792 
Display *display = data>videodata>display; 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

793 

3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

794 
XRaiseWindow(display, data>xwindow); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

795 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

796 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

797 

3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

798 
static void 
5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

799 
SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized) 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

800 
{ 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

801 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

802 
SDL_DisplayData *displaydata = 
5246
58265e606e4e
Window coordinates are in the global space and windows are not tied to a particular display.
Sam Lantinga <slouken@libsdl.org>
parents:
5243
diff
changeset

803 
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)>driverdata; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

804 
Display *display = data>videodata>display; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

805 
Atom _NET_WM_STATE = data>videodata>_NET_WM_STATE; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

806 
Atom _NET_WM_STATE_MAXIMIZED_VERT = data>videodata>_NET_WM_STATE_MAXIMIZED_VERT; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

807 
Atom _NET_WM_STATE_MAXIMIZED_HORZ = data>videodata>_NET_WM_STATE_MAXIMIZED_HORZ; 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

808 
Atom _NET_WM_STATE_FULLSCREEN = data>videodata>_NET_WM_STATE_FULLSCREEN; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

809 

a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

810 
if (X11_IsWindowMapped(_this, window)) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

811 
XEvent e; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

812 

4524
a256e1dadf3f
Zero any fields not explicitly filled in.
Sam Lantinga <slouken@libsdl.org>
parents:
4522
diff
changeset

813 
SDL_zero(e); 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

814 
e.xany.type = ClientMessage; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

815 
e.xclient.message_type = _NET_WM_STATE; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

816 
e.xclient.format = 32; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

817 
e.xclient.window = data>xwindow; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

818 
e.xclient.data.l[0] = 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

819 
maximized ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

820 
e.xclient.data.l[1] = _NET_WM_STATE_MAXIMIZED_VERT; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

821 
e.xclient.data.l[2] = _NET_WM_STATE_MAXIMIZED_HORZ; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

822 
e.xclient.data.l[3] = 0l; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

823 

4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

824 
XSendEvent(display, RootWindow(display, displaydata>screen), 0, 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

825 
SubstructureNotifyMask  SubstructureRedirectMask, &e); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

826 
} else { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

827 
int count = 0; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

828 
Atom atoms[3]; 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

829 

4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

830 
if (window>flags & SDL_WINDOW_FULLSCREEN) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

831 
atoms[count++] = _NET_WM_STATE_FULLSCREEN; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

832 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

833 
if (maximized) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

834 
atoms[count++] = _NET_WM_STATE_MAXIMIZED_VERT; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

835 
atoms[count++] = _NET_WM_STATE_MAXIMIZED_HORZ; 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

836 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

837 
if (count > 0) { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

838 
XChangeProperty(display, data>xwindow, _NET_WM_STATE, XA_ATOM, 32, 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

839 
PropModeReplace, (unsigned char *)atoms, count); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

840 
} else { 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

841 
XDeleteProperty(display, data>xwindow, _NET_WM_STATE); 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

842 
} 
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

843 
} 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

844 
XFlush(display); 
3077
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

845 
} 
9b58f26ede81
Implemented X11 maximized state control
Sam Lantinga <slouken@libsdl.org>
parents:
3057
diff
changeset

846 

1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

847 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

848 
X11_MaximizeWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

849 
{ 
5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

850 
SetWindowMaximized(_this, window, SDL_TRUE); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

851 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

852 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

853 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

854 
X11_MinimizeWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

855 
{ 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

856 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

857 
SDL_DisplayData *displaydata = 
5246
58265e606e4e
Window coordinates are in the global space and windows are not tied to a particular display.
Sam Lantinga <slouken@libsdl.org>
parents:
5243
diff
changeset

858 
(SDL_DisplayData *) SDL_GetDisplayForWindow(window)>driverdata; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

859 
Display *display = data>videodata>display; 
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

860 

a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

861 
XIconifyWindow(display, data>xwindow, displaydata>screen); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

862 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

863 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

864 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

865 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

866 
X11_RestoreWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

867 
{ 
5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

868 
SetWindowMaximized(_this, window, SDL_FALSE); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

869 
X11_ShowWindow(_this, window); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

870 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

871 

5305
75f5ff92ad08
Fixed a host of issues with Windows fullscreen modes. Toggling fullscreen OpenGL works now in my test environment.
Sam Lantinga <slouken@libsdl.org>
parents:
5302
diff
changeset

872 
void 
75f5ff92ad08
Fixed a host of issues with Windows fullscreen modes. Toggling fullscreen OpenGL works now in my test environment.
Sam Lantinga <slouken@libsdl.org>
parents:
5302
diff
changeset

873 
X11_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * _display, SDL_bool fullscreen) 
5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

874 
{ 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

875 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
5305
75f5ff92ad08
Fixed a host of issues with Windows fullscreen modes. Toggling fullscreen OpenGL works now in my test environment.
Sam Lantinga <slouken@libsdl.org>
parents:
5302
diff
changeset

876 
SDL_DisplayData *displaydata = (SDL_DisplayData *) _display>driverdata; 
5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

877 
Display *display = data>videodata>display; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

878 
Atom _NET_WM_STATE = data>videodata>_NET_WM_STATE; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

879 
Atom _NET_WM_STATE_MAXIMIZED_VERT = data>videodata>_NET_WM_STATE_MAXIMIZED_VERT; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

880 
Atom _NET_WM_STATE_MAXIMIZED_HORZ = data>videodata>_NET_WM_STATE_MAXIMIZED_HORZ; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

881 
Atom _NET_WM_STATE_FULLSCREEN = data>videodata>_NET_WM_STATE_FULLSCREEN; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

882 

b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

883 
if (X11_IsWindowMapped(_this, window)) { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

884 
XEvent e; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

885 

b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

886 
SDL_zero(e); 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

887 
e.xany.type = ClientMessage; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

888 
e.xclient.message_type = _NET_WM_STATE; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

889 
e.xclient.format = 32; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

890 
e.xclient.window = data>xwindow; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

891 
e.xclient.data.l[0] = 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

892 
fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

893 
e.xclient.data.l[1] = _NET_WM_STATE_FULLSCREEN; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

894 
e.xclient.data.l[3] = 0l; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

895 

b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

896 
XSendEvent(display, RootWindow(display, displaydata>screen), 0, 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

897 
SubstructureNotifyMask  SubstructureRedirectMask, &e); 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

898 
} else { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

899 
int count = 0; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

900 
Atom atoms[3]; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

901 

b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

902 
if (fullscreen) { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

903 
atoms[count++] = _NET_WM_STATE_FULLSCREEN; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

904 
} 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

905 
if (window>flags & SDL_WINDOW_MAXIMIZED) { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

906 
atoms[count++] = _NET_WM_STATE_MAXIMIZED_VERT; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

907 
atoms[count++] = _NET_WM_STATE_MAXIMIZED_HORZ; 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

908 
} 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

909 
if (count > 0) { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

910 
XChangeProperty(display, data>xwindow, _NET_WM_STATE, XA_ATOM, 32, 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

911 
PropModeReplace, (unsigned char *)atoms, count); 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

912 
} else { 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

913 
XDeleteProperty(display, data>xwindow, _NET_WM_STATE); 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

914 
} 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

915 
} 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

916 
XFlush(display); 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

917 
} 
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

918 

5466  919 
int 
920 
X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp) 

921 
{ 

922 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 

923 
Display *display = data>videodata>display; 

924 
Visual *visual = data>visual; 

925 
Colormap colormap = data>colormap; 

926 
XColor *colorcells; 

927 
int ncolors; 

928 
int rmask, gmask, bmask; 

929 
int rshift, gshift, bshift; 

5981
75caa8a7d559
Fixed a whole slew of compiler warnings that Wall exposed.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset

930 
int i; 
5466  931 

932 
if (visual>class != DirectColor) { 

933 
SDL_SetError("Window doesn't have DirectColor visual"); 

934 
return 1; 

935 
} 

936 

937 
ncolors = visual>map_entries; 

938 
colorcells = SDL_malloc(ncolors * sizeof(XColor)); 

939 
if (!colorcells) { 

940 
SDL_OutOfMemory(); 

941 
return 1; 

942 
} 

943 

944 
rshift = 0; 

945 
rmask = visual>red_mask; 

946 
while (0 == (rmask & 1)) { 

947 
rshift++; 

948 
rmask >>= 1; 

949 
} 

950 

951 
gshift = 0; 

952 
gmask = visual>green_mask; 

953 
while (0 == (gmask & 1)) { 

954 
gshift++; 

955 
gmask >>= 1; 

956 
} 

957 

958 
bshift = 0; 

959 
bmask = visual>blue_mask; 

960 
while (0 == (bmask & 1)) { 

961 
bshift++; 

962 
bmask >>= 1; 

963 
} 

964 

965 
/* build the color table pixel values */ 

966 
for (i = 0; i < ncolors; i++) { 

967 
Uint32 rbits = (rmask * i) / (ncolors  1); 

968 
Uint32 gbits = (gmask * i) / (ncolors  1); 

969 
Uint32 bbits = (bmask * i) / (ncolors  1); 

970 
Uint32 pix = (rbits << rshift)  (gbits << gshift)  (bbits << bshift); 

971 

972 
colorcells[i].pixel = pix; 

973 

974 
colorcells[i].red = ramp[(0 * 256) + i]; 

975 
colorcells[i].green = ramp[(1 * 256) + i]; 

976 
colorcells[i].blue = ramp[(2 * 256) + i]; 

977 

978 
colorcells[i].flags = DoRed  DoGreen  DoBlue; 

979 
} 

980 

981 
XStoreColors(display, colormap, colorcells, ncolors); 

982 
XFlush(display); 

983 
SDL_free(colorcells); 

984 

985 
return 0; 

986 
} 

987 

5302
b1b9ec9874ba
Implemented X11 fullscreen toggling with modern window managers
Sam Lantinga <slouken@libsdl.org>
parents:
5288
diff
changeset

988 
void 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

989 
X11_SetWindowGrab(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

990 
{ 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

991 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

992 
Display *display = data>videodata>display; 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

993 
SDL_bool oldstyle_fullscreen; 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

994 

4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

995 
/* ICCCM2.0compliant window managers can handle fullscreen windows */ 
4522
a4da6b906abb
Fixed setting fullscreen and maximized states for windows that haven't been mapped yet.
Sam Lantinga <slouken@libsdl.org>
parents:
4521
diff
changeset

996 
oldstyle_fullscreen = X11_IsWindowOldFullscreen(_this, window); 
4518
a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

997 

a956a315fe67
Lots of prep for the "real" way to support fullscreen mode on modern window managers.
Sam Lantinga <slouken@libsdl.org>
parents:
4510
diff
changeset

998 
if (((window>flags & SDL_WINDOW_INPUT_GRABBED)  oldstyle_fullscreen) 
2876  999 
&& (window>flags & SDL_WINDOW_INPUT_FOCUS)) { 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1000 
/* Try to grab the mouse */ 
2876  1001 
for (;;) { 
1002 
int result = 

3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1003 
XGrabPointer(display, data>xwindow, True, 0, GrabModeAsync, 
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1004 
GrabModeAsync, data>xwindow, None, CurrentTime); 
2876  1005 
if (result == GrabSuccess) { 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1006 
break; 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1007 
} 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1008 
SDL_Delay(100); 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1009 
} 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1010 

91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1011 
/* Raise the window if we grab the mouse */ 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1012 
XRaiseWindow(display, data>xwindow); 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1013 

91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1014 
/* Now grab the keyboard */ 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1015 
XGrabKeyboard(display, data>xwindow, True, GrabModeAsync, 
2876  1016 
GrabModeAsync, CurrentTime); 
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1017 
} else { 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1018 
XUngrabPointer(display, CurrentTime); 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1019 
XUngrabKeyboard(display, CurrentTime); 
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset

1020 
} 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1021 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1022 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1023 
void 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1024 
X11_DestroyWindow(_THIS, SDL_Window * window) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1025 
{ 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1026 
SDL_WindowData *data = (SDL_WindowData *) window>driverdata; 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1027 
window>driverdata = NULL; 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1028 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1029 
if (data) { 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1030 
SDL_VideoData *videodata = (SDL_VideoData *) data>videodata; 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1031 
Display *display = videodata>display; 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1032 
int numwindows = videodata>numwindows; 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1033 
SDL_WindowData **windowlist = videodata>windowlist; 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1034 
int i; 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1035 

4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1036 
if (windowlist) { 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1037 
for (i = 0; i < numwindows; ++i) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1038 
if (windowlist[i] && (windowlist[i]>window == window)) { 
2324
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1039 
windowlist[i] = windowlist[numwindows  1]; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1040 
windowlist[numwindows  1] = NULL; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1041 
videodata>numwindows; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1042 
break; 
3202e4826c57
more valgrind errors fixed. Plus I ran make indent which changed a few files.
Bob Pendleton <bob@pendleton.com>
parents:
2323
diff
changeset

1043 
} 
2323
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1044 
} 
4ac07ae446d3
Fixed many valgrind errors. But, I broke testdyngl.
Bob Pendleton <bob@pendleton.com>
parents:
2322
diff
changeset

1045 
} 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1046 
#ifdef X_HAVE_UTF8_STRING 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1047 
if (data>ic) { 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1048 
XDestroyIC(data>ic); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1049 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1050 
#endif 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1051 
if (data>created) { 
3685
64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
Sam Lantinga <slouken@libsdl.org>
parents:
3241
diff
changeset

1052 
XDestroyWindow(display, data>xwindow); 
5031
5e3291605ad0
Added XFlush() so changes happen immediately instead of waiting for the next event loop.
Sam Lantinga <slouken@libsdl.org>
parents:
4937
diff
changeset

1053 
XFlush(display); 
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1054 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1055 
SDL_free(data); 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1056 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1057 
} 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1058 

7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1059 
SDL_bool 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset

1060 
X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) 
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
