annotate gui/wm/ws.c @ 35673:2b7f93ef711d

Make functions static that only have file scope.
author ib
date Thu, 17 Jan 2013 16:51:50 +0000
parents 144d3a71db7d
children 5c2f331d306a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
1 /*
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
2 * This file is part of MPlayer.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
3 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
5 * it under the terms of the GNU General Public License as published by
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
7 * (at your option) any later version.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
8 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
12 * GNU General Public License for more details.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
13 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
14 * You should have received a copy of the GNU General Public License along
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
35666
01ac3cd2f101 Cosmetic: Relocate and revise comments on code origin.
ib
parents: 35665
diff changeset
17 *
01ac3cd2f101 Cosmetic: Relocate and revise comments on code origin.
ib
parents: 35665
diff changeset
18 * based on: AutoSpace Window System for Linux/Win32,
01ac3cd2f101 Cosmetic: Relocate and revise comments on code origin.
ib
parents: 35665
diff changeset
19 * written by pontscho/fresh!mindworkz
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
20 */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 #include <X11/Xlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23 #include <X11/Xproto.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24 #include <X11/Xutil.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
25 #include <X11/keysym.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
26 #include <X11/Xatom.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
27
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
28 #include <stdio.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
30 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
31 #include <unistd.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
32 #include <errno.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
33
33123
9566100d88a1 Replace inttypes.h by stdint.h and remove inttypes.h where unneeded.
ib
parents: 32833
diff changeset
34 #include <stdint.h>
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
35
33264
284fc94290b9 Replace all GUI exits by guiExit().
ib
parents: 33123
diff changeset
36 #include "gui/interface.h"
26382
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
37 #include "config.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
38 #include "libvo/x11_common.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
39 #include "libvo/video_out.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
40 #include "cpudetect.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
41 #include "libswscale/swscale.h"
32833
c4891d10ddbb Adjust #include paths after the merge of libavcore into libavutil in FFmpeg.
diego
parents: 32741
diff changeset
42 #include "libavutil/imgutils.h"
26382
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
43 #include "libmpcodecs/vf_scale.h"
33264
284fc94290b9 Replace all GUI exits by guiExit().
ib
parents: 33123
diff changeset
44 #include "mp_core.h"
26382
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
45 #include "mp_msg.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
46 #include "help_mp.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
47 #include "mplayer.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 23795
diff changeset
48 #include "mpbswap.h"
34033
395a736cd075 Add cursor autohide functionality to the GUI.
ib
parents: 34009
diff changeset
49 #include "osdep/timer.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
50 #include "ws.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
51 #include "wsxdnd.h"
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 26458
diff changeset
53 #ifdef CONFIG_XSHAPE
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54 #include <X11/extensions/shape.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
55 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
56
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 26458
diff changeset
57 #ifdef CONFIG_XF86VM
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
58 #include <X11/extensions/xf86vmode.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
60
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 #include <sys/ipc.h>
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
62 #ifdef HAVE_SHM
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
63 #include <sys/shm.h>
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
64 #endif
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65
34034
8c75091726d8 Replace numeric constant for cursor autohide time by symbolic constant.
ib
parents: 34033
diff changeset
66 #define MOUSEHIDE_DELAY 1000 // in milliseconds
8c75091726d8 Replace numeric constant for cursor autohide time by symbolic constant.
ib
parents: 34033
diff changeset
67
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
68 static wsWindow *mouse_win;
34081
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
69 static unsigned int mouse_time;
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
70
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
71 typedef struct {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
72 unsigned long flags;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
73 unsigned long functions;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
74 unsigned long decorations;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
75 long input_mode;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
76 unsigned long status;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
77 } MotifWmHints;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
78
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
79 static Atom wsMotifHints;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
81 int wsMaxX; // Screen width.
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
82 int wsMaxY; // Screen height.
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
83 int wsOrgX; // Screen origin x.
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
84 int wsOrgY; // Screen origin y.
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
85
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
86 Display *wsDisplay;
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
87 static int wsScreen;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
88 static Window wsRootWin;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
89
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
90 int wsDepthOnScreen;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
91 static int wsRedMask;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
92 static int wsGreenMask;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
93 static int wsBlueMask;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
94 static int wsOutMask;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
95 static int wsNonNativeOrder;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
96
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
97 #define wsWLCount 5
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
98 static wsWindow *wsWindowList[wsWLCount];
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
99
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
100 static int wsUseXShm = True;
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
101 static int wsUseXShape = True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
102
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
103 /* --- */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
104
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
105 #define PACK_RGB16(r, g, b, pixel) pixel = (b >> 3); \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
106 pixel <<= 6; \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
107 pixel |= (g >> 2); \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
108 pixel <<= 5; \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
109 pixel |= (r >> 3)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
110
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
111 #define PACK_RGB15(r, g, b, pixel) pixel = (b >> 3); \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
112 pixel <<= 5; \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
113 pixel |= (g >> 3); \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
114 pixel <<= 5; \
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
115 pixel |= (r >> 3)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
116
35667
3ed198bf4f21 Make variables static that only have file scope.
ib
parents: 35666
diff changeset
117 static enum PixelFormat out_pix_fmt = PIX_FMT_NONE;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
118
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
119 /* --- */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
120
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
121 #define MWM_HINTS_FUNCTIONS (1L << 0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
122 #define MWM_HINTS_DECORATIONS (1L << 1)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
123
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
124 #define MWM_FUNC_RESIZE (1L << 1)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
125 #define MWM_FUNC_MOVE (1L << 2)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
126 #define MWM_FUNC_MINIMIZE (1L << 3)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
127 #define MWM_FUNC_MAXIMIZE (1L << 4)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
128 #define MWM_FUNC_CLOSE (1L << 5)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
129
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
130 #define MWM_DECOR_ALL (1L << 0)
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
131
33994
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
132 /**
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
133 * @brief Update screen width, screen height and screen origin x and y
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
134 * from xinerama information.
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
135 *
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
136 * Set wsOrgX, wsOrgY, wsMaxX and wsMaxY as well as
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
137 * win->X, win->Y, win->Width and win->Height.
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
138 *
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
139 * @param win pointer to a ws window structure or NULL
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
140 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
141 static void wsUpdateXineramaInfo(wsWindow *win)
33994
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
142 {
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
143 if (win) {
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
144 vo_dx = win->X;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
145 vo_dy = win->Y;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
146 vo_dwidth = win->Width;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
147 vo_dheight = win->Height;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
148 }
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
149
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
150 vo_screenwidth = wsMaxX;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
151 vo_screenheight = wsMaxY;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
152
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
153 update_xinerama_info();
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
154
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
155 wsMaxX = vo_screenwidth;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
156 wsMaxY = vo_screenheight;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
157 wsOrgX = xinerama_x;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
158 wsOrgY = xinerama_y;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
159
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
160 if (win) {
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
161 win->X = wsOrgX;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
162 win->Y = wsOrgY;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
163 win->Width = wsMaxX;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
164 win->Height = wsMaxY;
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
165 }
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
166 }
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
167
35673
2b7f93ef711d Make functions static that only have file scope.
ib
parents: 35672
diff changeset
168 static int wsGetDepthOnScreen(void)
35636
840e473ba4c0 Restore GUI's X error handler after gtk_init().
ib
parents: 35635
diff changeset
169 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
170 int depth;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
171 XImage *mXImage;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
172 Visual *visual;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
173
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
174 if ((depth = vo_find_depth_from_visuals(wsDisplay, wsScreen, &visual)) > 0) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
175 mXImage = XCreateImage(wsDisplay, visual, depth, ZPixmap, 0, NULL,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
176 1, 1, 32, 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
177 wsDepthOnScreen = mXImage->bits_per_pixel;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
178 wsRedMask = mXImage->red_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
179 wsGreenMask = mXImage->green_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
180 wsBlueMask = mXImage->blue_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
181 #if HAVE_BIGENDIAN
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
182 wsNonNativeOrder = mXImage->byte_order == LSBFirst;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
183 #else
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
184 wsNonNativeOrder = mXImage->byte_order == MSBFirst;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
185 #endif
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
186 XDestroyImage(mXImage);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
187 } else {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
188 int bpp, ibpp;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
189 XWindowAttributes attribs;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
190
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
191 mXImage = XGetImage(wsDisplay, wsRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
192 bpp = mXImage->bits_per_pixel;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
193
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
194 XGetWindowAttributes(wsDisplay, wsRootWin, &attribs);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
195 ibpp = attribs.depth;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
196 mXImage = XGetImage(wsDisplay, wsRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
197 bpp = mXImage->bits_per_pixel;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
198
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
199 if ((ibpp + 7) / 8 != (bpp + 7) / 8)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
200 ibpp = bpp;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
201
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
202 wsDepthOnScreen = ibpp;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
203 wsRedMask = mXImage->red_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
204 wsGreenMask = mXImage->green_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
205 wsBlueMask = mXImage->blue_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
206 XDestroyImage(mXImage);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
207 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
208
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
209 return wsDepthOnScreen;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
210 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
211
35673
2b7f93ef711d Make functions static that only have file scope.
ib
parents: 35672
diff changeset
212 static int wsGetOutMask(void)
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
213 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
214 if ((wsDepthOnScreen == 32) && (wsRedMask == 0xff0000) && (wsGreenMask == 0x00ff00) && (wsBlueMask == 0x0000ff))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
215 return wsRGB32;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
216
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
217 if ((wsDepthOnScreen == 32) && (wsRedMask == 0x0000ff) && (wsGreenMask == 0x00ff00) && (wsBlueMask == 0xff0000))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
218 return wsBGR32;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
219
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
220 if ((wsDepthOnScreen == 24) && (wsRedMask == 0xff0000) && (wsGreenMask == 0x00ff00) && (wsBlueMask == 0x0000ff))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
221 return wsRGB24;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
222
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
223 if ((wsDepthOnScreen == 24) && (wsRedMask == 0x0000ff) && (wsGreenMask == 0x00ff00) && (wsBlueMask == 0xff0000))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
224 return wsBGR24;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
225
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
226 if ((wsDepthOnScreen == 16) && (wsRedMask == 0xf800) && (wsGreenMask == 0x7e0) && (wsBlueMask == 0x1f))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
227 return wsRGB16;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
228
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
229 if ((wsDepthOnScreen == 16) && (wsRedMask == 0x1f) && (wsGreenMask == 0x7e0) && (wsBlueMask == 0xf800))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
230 return wsBGR16;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
231
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
232 if ((wsDepthOnScreen == 15) && (wsRedMask == 0x7c00) && (wsGreenMask == 0x3e0) && (wsBlueMask == 0x1f))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
233 return wsRGB15;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
234
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
235 if ((wsDepthOnScreen == 15) && (wsRedMask == 0x1f) && (wsGreenMask == 0x3e0) && (wsBlueMask == 0x7c00))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
236 return wsBGR15;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
237
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
238 return 0;
35636
840e473ba4c0 Restore GUI's X error handler after gtk_init().
ib
parents: 35635
diff changeset
239 }
840e473ba4c0 Restore GUI's X error handler after gtk_init().
ib
parents: 35635
diff changeset
240
35631
d0231540cdbd Cosmetic: Harmonize parameter names.
ib
parents: 35622
diff changeset
241 void wsXInit(Display *display)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
242 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
243 int eventbase;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
244 int errorbase;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
245
35622
59456592c6d1 Add a message indicating start of initialization of X.
ib
parents: 35541
diff changeset
246 mp_msg(MSGT_GPLAYER, MSGL_V, "X init.\n");
59456592c6d1 Add a message indicating start of initialization of X.
ib
parents: 35541
diff changeset
247
35631
d0231540cdbd Cosmetic: Harmonize parameter names.
ib
parents: 35622
diff changeset
248 wsDisplay = display;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
249
35636
840e473ba4c0 Restore GUI's X error handler after gtk_init().
ib
parents: 35635
diff changeset
250 wsSetErrorHandler();
31323
c674bb16fa6d Install error handler as early as possible to avoid crashing.
reimar
parents: 31314
diff changeset
251
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
252 /* enable DND atoms */
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
253 wsXDNDInitialize();
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
254
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
255 { /* on remote display XShm will be disabled - LGB */
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
256 char *dispname = DisplayString(wsDisplay);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
257 int localdisp = 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27377
diff changeset
258
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
259 if (dispname && *dispname != ':') {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
260 localdisp = 0;
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35492
diff changeset
261 wsUseXShm = False;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
262 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
263
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
264 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE");
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
265
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
266 if (!localdisp)
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
267 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_RemoteDisplay);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
268 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
269
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
270 #ifdef HAVE_SHM
34461
e3d6a010e8ae Cosmetic: Remove braces.
ib
parents: 34460
diff changeset
271 if (!XShmQueryExtension(wsDisplay))
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
272 #endif
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35492
diff changeset
273 wsUseXShm = False;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
274
34460
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
275 if (!wsUseXShm)
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
276 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_NoXshm);
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
277
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 26458
diff changeset
278 #ifdef CONFIG_XSHAPE
34461
e3d6a010e8ae Cosmetic: Remove braces.
ib
parents: 34460
diff changeset
279 if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase))
34462
f305c10d20f8 Simplify XShape handling and setting of wsUseXShape.
ib
parents: 34461
diff changeset
280 #endif
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35492
diff changeset
281 wsUseXShape = False;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282
34460
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
283 if (!wsUseXShape)
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
284 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);
c4731df07bfe Always inform / warn about missing shared memory / shape extension
ib
parents: 34459
diff changeset
285
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
286 XSynchronize(wsDisplay, True);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
287
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
288 wsScreen = DefaultScreen(wsDisplay);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
289 wsRootWin = RootWindow(wsDisplay, wsScreen);
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 26458
diff changeset
290 #ifdef CONFIG_XF86VM
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
291 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
292 int clock;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
293 XF86VidModeModeLine modeline;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
294
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
295 XF86VidModeGetModeLine(wsDisplay, wsScreen, &clock, &modeline);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
296 wsMaxX = modeline.hdisplay;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
297 wsMaxY = modeline.vdisplay;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
298 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
299 #endif
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
300 {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
301 wsOrgX = wsOrgY = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
302
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
303 if (!wsMaxX)
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
304 wsMaxX = DisplayWidth(wsDisplay, wsScreen);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
305
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
306 if (!wsMaxY)
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
307 wsMaxY = DisplayHeight(wsDisplay, wsScreen);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
308 }
33994
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
309
8e5680eccf54 Move common code to new function wsUpdateXineramaInfo().
ib
parents: 33993
diff changeset
310 wsUpdateXineramaInfo(NULL);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
311
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
312 wsGetDepthOnScreen();
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
313
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
314 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Screen depth: %d\n", wsDepthOnScreen);
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
315 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] size: %dx%d\n", wsMaxX, wsMaxY);
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
316
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
317 #ifdef CONFIG_XINERAMA
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
318 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] origin: +%d+%d\n", wsOrgX, wsOrgY);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
319 #endif
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
320
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
321 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] red mask: 0x%x\n", wsRedMask);
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
322 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] green mask: 0x%x\n", wsGreenMask);
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
323 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] blue mask: 0x%x\n", wsBlueMask);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
324
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
325 #ifdef HAVE_SHM
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
326 if (wsUseXShm) {
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
327 int minor, major, shp;
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
328
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
329 XShmQueryVersion(wsDisplay, &major, &minor, &shp);
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
330 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShm version is %d.%d\n", major, minor);
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
331 }
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
332 #endif
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
333
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
334 #ifdef CONFIG_XSHAPE
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
335 if (wsUseXShape) {
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
336 int minor, major;
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
337
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
338 XShapeQueryVersion(wsDisplay, &major, &minor);
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
339 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] XShape version is %d.%d\n", major, minor);
33550
fea429f90bfd Cosmetic: Adjust indent.
ib
parents: 33549
diff changeset
340 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
341 #endif
33549
4f6e515e5bd1 Adjust message levels in wsXInit().
ib
parents: 33548
diff changeset
342
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
343 wsOutMask = wsGetOutMask();
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
344
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
345 switch (wsOutMask) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
346 case wsRGB32:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
347 out_pix_fmt = PIX_FMT_RGB32;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
348 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
349
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
350 case wsBGR32:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
351 out_pix_fmt = PIX_FMT_BGR32;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
352 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
353
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
354 case wsRGB24:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
355 out_pix_fmt = PIX_FMT_RGB24;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
356 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
357
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
358 case wsBGR24:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
359 out_pix_fmt = PIX_FMT_BGR24;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
360 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
361
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
362 case wsRGB16:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
363 out_pix_fmt = PIX_FMT_RGB565;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
364 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
365
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
366 case wsBGR16:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
367 out_pix_fmt = PIX_FMT_BGR565;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
368 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
369
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
370 case wsRGB15:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
371 out_pix_fmt = PIX_FMT_RGB555;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
372 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
373
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
374 case wsBGR15:
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
375 out_pix_fmt = PIX_FMT_BGR555;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
376 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
377 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
378 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
379
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
380 void wsXDone(void)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
381 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
382 XCloseDisplay(wsDisplay);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
383 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
384
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
385 /**
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
386 * @brief Inform about an X error that has occurred.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
387 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
388 * @param display display
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
389 * @param event pointer to an X error event structure
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
390 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
391 * @return 0
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
392 */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
393 static int wsErrorHandler(Display *display, XErrorEvent *event)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
394 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
395 char type[128];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
396
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
397 XGetErrorText(display, event->error_code, type, sizeof(type));
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
398
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
399 mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_WS_XError);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
400 mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] Error code: %d - %s\n", event->error_code, type);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
401 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Request code: %d (minor code: %d)\n", event->request_code, event->minor_code);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
402 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] MPlayer module: %s\n", current_module ? current_module : "(none)");
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
403
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
404 return 0;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
405 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
406
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
407 /**
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
408 * @brief Set the X error handler.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
409 */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
410 void wsSetErrorHandler(void)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
411 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
412 XSetErrorHandler(wsErrorHandler);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
413 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
414
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
415 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
416 // Handle events.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
417 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
418
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
419 static int wsSearch(Window win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
420 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
421 int i;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
422
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
423 for (i = 0; i < wsWLCount; i++)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
424 if (wsWindowList[i] && wsWindowList[i]->WindowID == win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
425 return i;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
426
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
427 return -1;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
428 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
429
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
430 void wsEvents(XEvent *event)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
431 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
432 unsigned long i = 0;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
433 int l;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
434 int x, y;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
435 Window child_window = 0;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
436
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
437 l = wsSearch(event->xany.window);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
438
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
439 if (l == -1)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
440 return;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
441
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
442 wsWindowList[l]->State = wsNone;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
443
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
444 switch (event->type) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
445 case ClientMessage:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
446
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
447 if (event->xclient.message_type == wsWindowList[l]->AtomProtocols) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
448 if ((Atom)event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
449 i = wsWindowClosed;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
450 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
451 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
452
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
453 if ((Atom)event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
454 i = wsWindowFocusIn;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
455 wsWindowList[l]->Focused = wsFocused;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
456 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
457 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
458
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
459 if ((Atom)event->xclient.data.l[0] == wsWindowList[l]->AtomRolle) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
460 mp_msg(MSGT_GPLAYER, MSGL_V, "[ws] role set.\n");
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
461 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
462 } else {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
463 /* try to process DND events */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
464 wsXDNDProcessClientMessage(&event->xclient);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
465 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
466
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
467 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
468
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
469 case MapNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
470
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
471 i = wsWindowMapped;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
472 wsWindowList[l]->Mapped = wsMapped;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
473 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
474
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
475 case UnmapNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
476
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
477 i = wsWindowUnmapped;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
478 wsWindowList[l]->Mapped = wsNo;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
479 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
480
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
481 case FocusIn:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
482
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
483 if (wsWindowList[l]->Focused == wsFocused)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
484 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
485
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
486 i = wsWindowFocusIn;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
487 wsWindowList[l]->Focused = wsFocused;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
488 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
489
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
490 case FocusOut:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
491
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
492 if (wsWindowList[l]->Focused == wsNo)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
493 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
494
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
495 i = wsWindowFocusOut;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
496 wsWindowList[l]->Focused = wsNo;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
497 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
498
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
499 case VisibilityNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
500
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
501 switch (event->xvisibility.state) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
502 case VisibilityUnobscured:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
503 i = wsWindowVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
504 wsWindowList[l]->Visible = wsVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
505 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
506
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
507 case VisibilityFullyObscured:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
508 i = wsWindowNotVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
509 wsWindowList[l]->Visible = wsNotVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
510 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
511
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
512 case VisibilityPartiallyObscured:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
513 i = wsWindowPartialVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
514 wsWindowList[l]->Visible = wsPVisible;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
515 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
516 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
517
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
518 expose:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
519 wsWindowList[l]->State = i;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
520
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
521 if (wsWindowList[l]->ReDraw)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
522 wsWindowList[l]->ReDraw();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
523
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
524 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
525
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
526 case Expose:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
527
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
528 wsWindowList[l]->State = wsWindowExpose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
529
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
530 if ((wsWindowList[l]->ReDraw) && (!event->xexpose.count))
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
531 wsWindowList[l]->ReDraw();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
532
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
533 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
534
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
535 case ConfigureNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
536
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
537 XTranslateCoordinates(wsDisplay, wsWindowList[l]->WindowID, wsRootWin, 0, 0, &x, &y, &child_window);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
538
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
539 if ((wsWindowList[l]->X != x) || (wsWindowList[l]->Y != y) || (wsWindowList[l]->Width != event->xconfigure.width) || (wsWindowList[l]->Height != event->xconfigure.height)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
540 wsWindowList[l]->X = x;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
541 wsWindowList[l]->Y = y;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
542 wsWindowList[l]->Width = event->xconfigure.width;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
543 wsWindowList[l]->Height = event->xconfigure.height;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
544 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
545
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
546 wsWindowList[l]->Rolled = wsNo;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
547
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
548 if (event->xconfigure.y < 0) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
549 i = wsWindowRolled;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
550 wsWindowList[l]->Rolled = wsRolled;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
551 goto expose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
552 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
553
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
554 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
555
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
556 case KeyPress:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
557
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
558 i = wsKeyPressed;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
559 goto keypressed;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
560
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
561 case KeyRelease:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
562
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
563 i = wsKeyReleased;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
564 keypressed:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
565 wsWindowList[l]->Alt = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
566 wsWindowList[l]->Shift = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
567 wsWindowList[l]->NumLock = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
568 wsWindowList[l]->Control = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
569 wsWindowList[l]->CapsLock = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
570
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
571 if (event->xkey.state & Mod1Mask)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
572 wsWindowList[l]->Alt = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
573
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
574 if (event->xkey.state & Mod2Mask)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
575 wsWindowList[l]->NumLock = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
576
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
577 if (event->xkey.state & ControlMask)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
578 wsWindowList[l]->Control = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
579
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
580 if (event->xkey.state & ShiftMask)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
581 wsWindowList[l]->Shift = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
582
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
583 if (event->xkey.state & LockMask)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
584 wsWindowList[l]->CapsLock = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
585
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
586 #if 0
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
587 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
588 KeySym keySym;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
589 keySym = XKeycodeToKeysym(wsDisplay, event->xkey.keycode, 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
590
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
591 if (keySym != NoSymbol) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
592 keySym = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym));
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
593
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
594 if (wsWindowList[l]->KeyHandler)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
595 wsWindowList[l]->KeyHandler(event->xkey.state, i, keySym);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
596 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
597 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
598 #else
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
599 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
600 int key;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
601 char buf[100];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
602 KeySym keySym;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
603 static XComposeStatus stat;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
604
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
605 XLookupString(&event->xkey, buf, sizeof(buf), &keySym, &stat);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
606 key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym));
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
607
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
608 if (wsWindowList[l]->KeyHandler)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
609 wsWindowList[l]->KeyHandler(event->xkey.keycode, i, key);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
610 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
611 #endif
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
612 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
613
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
614 case MotionNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
615
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
616 i = wsMoveMouse;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
617 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
618 /* pump all motion events from the display queue:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
619 * this way it works faster when moving the window */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
620 static XEvent e;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
621
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
622 if (event->xmotion.state) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
623 while (XCheckTypedWindowEvent(wsDisplay, event->xany.window, MotionNotify, &e)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
624 /* FIXME: need to make sure we didn't release/press the button in between...*/
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
625 /* FIXME: do we need some timeout here to make sure we don't spend too much time
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
626 * removing events from the queue? */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
627 event = &e;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
628 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
629 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
630 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
631
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
632 if (wsWindowList[l]->wsCursor != None) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
633 wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
634 mouse_win = wsWindowList[l];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
635 mouse_time = GetTimerMS();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
636 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
637
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
638 goto buttonreleased;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
639
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
640 case ButtonRelease:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
641
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
642 i = event->xbutton.button + 128;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
643
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
644 if (wsWindowList[l]->wsCursor != None) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
645 wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
646 mouse_win = wsWindowList[l];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
647 mouse_time = GetTimerMS();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
648 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
649
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
650 goto buttonreleased;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
651
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
652 case ButtonPress:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
653
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
654 i = event->xbutton.button;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
655
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
656 if (wsWindowList[l]->wsCursor != None) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
657 wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
658 mouse_win = wsWindowList[l];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
659 mouse_time = GetTimerMS();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
660 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
661
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
662 goto buttonreleased;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
663
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
664 case EnterNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
665
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
666 i = wsEnterWindow;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
667 goto buttonreleased;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
668
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
669 case LeaveNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
670
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
671 i = wsLeaveWindow;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
672 buttonreleased:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
673
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
674 if (wsWindowList[l]->MouseHandler)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
675 wsWindowList[l]->MouseHandler(i, event->xbutton.x, event->xbutton.y, event->xmotion.x_root, event->xmotion.y_root);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
676
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
677 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
678
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
679 case SelectionNotify:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
680
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
681 /* Handle DandD */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
682 wsXDNDProcessSelection(wsWindowList[l], event);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
683 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
684 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
685
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
686 XFlush(wsDisplay);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
687 XSync(wsDisplay, False);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
688 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
689
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
690 void wsHandleEvents(void)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
691 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
692 XEvent wsEvent;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
693 /* handle pending events */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
694 while (XPending(wsDisplay)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
695 XNextEvent(wsDisplay, &wsEvent);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
696 // printf("### X event: %d [%d]\n",wsEvent.type,delay);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
697 wsEvents(&wsEvent);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
698 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
699 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
700
33995
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
701 /**
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
702 * @brief Calculate and store the x and y position for a window.
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
703 *
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
704 * @param win pointer to a ws window structure
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
705 * @param x x position of the window (real/absolute or mock)
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
706 * @param y y position of the window (real/absolute or mock)
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
707 * @param width width of the area to place the window in
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
708 * @param height height of the area to place the window in
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
709 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
710 static void wsWindowPosition(wsWindow *win, int x, int y, int width, int height)
33995
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
711 {
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
712 switch (x) {
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
713 case -1:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
714 win->X = wsOrgX + (wsMaxX - width) / 2;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
715 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
716
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
717 case -2:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
718 win->X = wsOrgX + wsMaxX - width;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
719 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
720
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
721 default:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
722 win->X = x;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
723 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
724 }
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
725
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
726 switch (y) {
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
727 case -1:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
728 win->Y = wsOrgY + (wsMaxY - height) / 2;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
729 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
730
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
731 case -2:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
732 win->Y = wsOrgY + wsMaxY - height;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
733 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
734
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
735 default:
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
736 win->Y = y;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
737 break;
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
738 }
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
739 }
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
740
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
741 /**
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
742 * @brief Replace the size hints for the WM_NORMAL_HINTS property of a window.
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
743 *
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
744 * @param win pointer to a ws window structure
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
745 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
746 static void wsSizeHint(wsWindow *win)
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
747 {
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
748 XSizeHints size;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
749
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
750 size.flags = 0;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
751
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
752 /* obsolete, solely for compatibility reasons */
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
753 size.flags |= PPosition;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
754 size.x = win->X;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
755 size.y = win->Y;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
756
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
757 /* obsolete, solely for compatibility reasons */
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
758 size.flags |= PSize;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
759 size.width = win->Width;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
760 size.height = win->Height;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
761
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
762 /* a minimum of 4 is said to avoid off-by-one errors and be required by mga_vid */
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
763 size.flags |= PMinSize;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
764 size.min_width = 4;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
765 size.min_height = 4;
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
766
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
767 if (win->Property & wsMinSize) {
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
768 size.min_width = win->Width;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
769 size.min_height = win->Height;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
770 }
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
771
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
772 if (win->Property & wsMaxSize) {
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
773 size.flags |= PMaxSize;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
774 size.max_width = win->Width;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
775 size.max_height = win->Height;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
776 }
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
777
35657
eadf0731a29a Add property wsAspect.
ib
parents: 35656
diff changeset
778 if (vo_keepaspect && (win->Property & wsAspect)) {
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
779 size.flags |= PAspect;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
780 size.min_aspect.x = win->Width;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
781 size.min_aspect.y = win->Height;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
782 size.max_aspect.x = win->Width;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
783 size.max_aspect.y = win->Height;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
784 }
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
785
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
786 size.flags |= PBaseSize;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
787 size.base_width = 0;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
788 size.base_height = 0;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
789
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
790 size.flags |= PWinGravity;
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
791 size.win_gravity = StaticGravity;
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
792
35660
8de55114a330 Remove member SizeHint from wsWindow structure.
ib
parents: 35659
diff changeset
793 XSetWMNormalHints(wsDisplay, win->WindowID, &size);
35645
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
794 }
c0ec433fe432 Add new function wsSizeHint().
ib
parents: 35644
diff changeset
795
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
796 /**
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
797 * @brief Wait until a window is mapped if its property requires it.
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
798 *
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
799 * @param win pointer to a ws window structure
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
800 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
801 static void wsMapWait(wsWindow *win)
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
802 {
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
803 XEvent xev;
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
804
35653
59a6b817a287 Add the 'Mapped' information to wsMapWait().
ib
parents: 35652
diff changeset
805 if (win->Property & wsWaitMap) {
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
806 do
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
807 XNextEvent(wsDisplay, &xev);
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
808 while (xev.type != MapNotify || xev.xmap.event != win->WindowID);
35653
59a6b817a287 Add the 'Mapped' information to wsMapWait().
ib
parents: 35652
diff changeset
809
59a6b817a287 Add the 'Mapped' information to wsMapWait().
ib
parents: 35652
diff changeset
810 win->Mapped = wsMapped;
59a6b817a287 Add the 'Mapped' information to wsMapWait().
ib
parents: 35652
diff changeset
811 }
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
812 }
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
813
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
814 // ----------------------------------------------------------------------------------------------
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
815 // Create window.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
816 // X,Y : window position
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
817 // wX,wY : size of window
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
818 // bW : border width
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
819 // cV : visible mouse cursor on window
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
820 // D : visible frame, title, etc.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
821 // sR : screen ratio
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
822 // ----------------------------------------------------------------------------------------------
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
823
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
824 XClassHint wsClassHint;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
825 XTextProperty wsTextProperty;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
826 Window LeaderWindow;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
827
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
828 // ----------------------------------------------------------------------------------------------
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
829 // wsCreateWindow: create a new window on the screen.
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
830 // x,y : window position
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
831 // w,h : window size
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
832 // b : window border size
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
833 // c : mouse cursor visible
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
834 // p : properties - "decoration", visible titlebar, etc ...
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
835 // ----------------------------------------------------------------------------------------------
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
836 void wsCreateWindow(wsWindow *win, int x, int y, int w, int h, int b, int c, unsigned char p, char *label)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
837 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
838 int depth;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
839
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
840 win->Property = p;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
841
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
842 if (p & wsShowFrame)
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35492
diff changeset
843 win->Decorations = True;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
844
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
845 wsWindowPosition(win, x, y, w, h);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
846
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
847 win->Width = w;
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
848 win->Height = h;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
849 win->OldX = win->X;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
850 win->OldY = win->Y;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
851 win->OldWidth = win->Width;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
852 win->OldHeight = win->Height;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
853
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
854 /* Border size for window. */
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
855 win->BorderWidth = b;
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
856 /* Hide Mouse Cursor */
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
857 win->wsCursor = None;
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
858 win->wsMouseEventType = c;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
859 win->wsCursorData[0] = 0;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
860 win->wsCursorPixmap = XCreateBitmapFromData(wsDisplay, wsRootWin, win->wsCursorData, 1, 1);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
861
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
862 if (!(c & wsShowMouseCursor))
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
863 win->wsCursor = XCreatePixmapCursor(wsDisplay, win->wsCursorPixmap, win->wsCursorPixmap, &win->wsColor, &win->wsColor, 0, 0);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
864
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
865 depth = vo_find_depth_from_visuals(wsDisplay, wsScreen, NULL);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
866
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
867 if (depth < 15) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
868 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ColorDepthTooLow);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
869 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
870 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
871
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
872 XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
873
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
874 /* --- */
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
875 win->AtomLeaderClient = XInternAtom(wsDisplay, "WM_CLIENT_LEADER", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
876 win->AtomDeleteWindow = XInternAtom(wsDisplay, "WM_DELETE_WINDOW", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
877 win->AtomTakeFocus = XInternAtom(wsDisplay, "WM_TAKE_FOCUS", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
878 win->AtomRolle = XInternAtom(wsDisplay, "WM_WINDOW_ROLE", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
879 win->AtomWMSizeHint = XInternAtom(wsDisplay, "WM_SIZE_HINT", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
880 win->AtomWMNormalHint = XInternAtom(wsDisplay, "WM_NORMAL_HINT", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
881 win->AtomProtocols = XInternAtom(wsDisplay, "WM_PROTOCOLS", False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
882 win->AtomsProtocols[0] = win->AtomDeleteWindow;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
883 win->AtomsProtocols[1] = win->AtomTakeFocus;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
884 win->AtomsProtocols[2] = win->AtomRolle;
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
885 /* --- */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
886
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
887 win->WindowAttrib.background_pixel = BlackPixel(wsDisplay, wsScreen);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
888 win->WindowAttrib.border_pixel = WhitePixel(wsDisplay, wsScreen);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
889 win->WindowAttrib.colormap = XCreateColormap(wsDisplay, wsRootWin, win->VisualInfo.visual, AllocNone);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
890 win->WindowAttrib.event_mask = StructureNotifyMask | FocusChangeMask |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
891 ExposureMask | PropertyChangeMask |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
892 EnterWindowMask | LeaveWindowMask |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
893 VisibilityChangeMask |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
894 KeyPressMask | KeyReleaseMask;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
895
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
896 if ((c & wsHandleMouseButton))
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
897 win->WindowAttrib.event_mask |= ButtonPressMask | ButtonReleaseMask;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
898
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
899 if ((c & wsHandleMouseMove))
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
900 win->WindowAttrib.event_mask |= PointerMotionMask;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
901
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
902 win->WindowAttrib.cursor = win->wsCursor;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
903 win->WindowAttrib.override_redirect = False;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
904
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
905 if (p & wsOverredirect)
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
906 win->WindowAttrib.override_redirect = True;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
907
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
908 win->WindowMask = CWBackPixel | CWBorderPixel |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
909 CWColormap | CWEventMask | CWCursor |
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
910 CWOverrideRedirect;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
911
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
912 win->WindowID = XCreateWindow(wsDisplay,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
913 (win->Parent != 0 ? win->Parent : wsRootWin),
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
914 win->X, win->Y, win->Width, win->Height, win->BorderWidth,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
915 win->VisualInfo.depth,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
916 InputOutput,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
917 win->VisualInfo.visual,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
918 win->WindowMask, &win->WindowAttrib);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
919
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
920 wsClassHint.res_name = "MPlayer";
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
921
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
922 wsClassHint.res_class = "MPlayer";
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
923 XSetClassHint(wsDisplay, win->WindowID, &wsClassHint);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
924
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
925 wsSizeHint(win);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
926
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
927 win->WMHints.flags = InputHint | StateHint;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
928 win->WMHints.input = True;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
929 win->WMHints.initial_state = NormalState;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
930 XSetWMHints(wsDisplay, win->WindowID, &win->WMHints);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
931
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
932 wsWindowDecoration(win, win->Decorations);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
933 XStoreName(wsDisplay, win->WindowID, label);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
934 XmbSetWMProperties(wsDisplay, win->WindowID, label, label, NULL, 0, NULL, NULL, NULL);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
935
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
936 XSetWMProtocols(wsDisplay, win->WindowID, win->AtomsProtocols, 3);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
937 XChangeProperty(wsDisplay, win->WindowID,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
938 win->AtomLeaderClient,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
939 XA_WINDOW, 32, PropModeReplace,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
940 (unsigned char *)&LeaderWindow, 1);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
941
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
942 wsTextProperty.value = label;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
943 wsTextProperty.encoding = XA_STRING;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
944 wsTextProperty.format = 8;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
945 wsTextProperty.nitems = strlen(label);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
946 XSetWMIconName(wsDisplay, win->WindowID, &wsTextProperty);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
947
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
948 win->wGC = XCreateGC(wsDisplay, win->WindowID,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
949 GCForeground | GCBackground,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
950 &win->wGCV);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
951
35498
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
952 win->Visible = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
953 win->Focused = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
954 win->Mapped = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
955 win->Rolled = wsNo;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
956
35655
9ea476ced9ab Cosmetic: Change parameter names.
ib
parents: 35653
diff changeset
957 if (p & wsShowWindow) {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
958 XMapWindow(wsDisplay, win->WindowID);
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
959 wsMapWait(win);
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
960 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
961
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
962 wsCreateImage(win, win->Width, win->Height);
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34470
diff changeset
963 /* End of creating -------------------------------------------------------------------------- */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
964
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
965 {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
966 int i;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
967
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
968 for (i = 0; i < wsWLCount; i++)
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
969 if (wsWindowList[i] == NULL)
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
970 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
971
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
972 if (i == wsWLCount) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
973 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
974 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
975 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
976
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
977 wsWindowList[i] = win;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
978 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
979
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
980 XFlush(wsDisplay);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
981 XSync(wsDisplay, False);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
982
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
983 win->ReDraw = NULL;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
984 win->MouseHandler = NULL;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
985 win->KeyHandler = NULL;
33985
d99f341d8442 Replace all mp_dbg() calls by mp_msg().
ib
parents: 33977
diff changeset
986 mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window is created. ( %s ).\n", label);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
987 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
988
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
989 void wsDestroyWindow(wsWindow *win)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
990 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
991 int l;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
992
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
993 l = wsSearch(win->WindowID);
35354
2ce3d21157ed Check array index.
ib
parents: 34684
diff changeset
994
2ce3d21157ed Check array index.
ib
parents: 34684
diff changeset
995 if (l != -1)
2ce3d21157ed Check array index.
ib
parents: 34684
diff changeset
996 wsWindowList[l] = NULL;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
997
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
998 if (win->wsCursor != None) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
999 XFreeCursor(wsDisplay, win->wsCursor);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1000 win->wsCursor = None;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1001 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1002
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1003 XFreeGC(wsDisplay, win->wGC);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1004 XUnmapWindow(wsDisplay, win->WindowID);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1005 wsDestroyImage(win);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1006 XDestroyWindow(wsDisplay, win->WindowID);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1007 #if 0
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1008 win->ReDraw = NULL;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1009 win->MouseHandler = NULL;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1010 win->KeyHandler = NULL;
35498
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
1011 win->Visible = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
1012 win->Focused = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
1013 win->Mapped = wsNo;
c505a4aa9582 Rename wsNone wsNo and use it instead of a numeric constant.
ib
parents: 35497
diff changeset
1014 win->Rolled = wsNo;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1015 #endif
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1016 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1017
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1018 void wsSetTitle(wsWindow *win, char *name)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1019 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1020 XStoreName(wsDisplay, win->WindowID, name);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1021 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1022
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1023 void wsWindowDecoration(wsWindow *win, Bool decor)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1024 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1025 MotifWmHints wsMotifWmHints;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1026
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1027 wsMotifHints = XInternAtom(wsDisplay, "_MOTIF_WM_HINTS", 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1028
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1029 if (wsMotifHints == None)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1030 return;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1031
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1032 memset(&wsMotifWmHints, 0, sizeof(MotifWmHints));
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1033 wsMotifWmHints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1034
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1035 if (decor) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1036 wsMotifWmHints.functions = MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1037 wsMotifWmHints.decorations = MWM_DECOR_ALL;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1038 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1039
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1040 XChangeProperty(wsDisplay, win->WindowID, wsMotifHints, wsMotifHints, 32,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1041 PropModeReplace, (unsigned char *)&wsMotifWmHints, 5);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1042 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1043
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1044 void wsSetShape(wsWindow *win, char *data)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1045 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1046 #ifdef CONFIG_XSHAPE
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1047 if (!wsUseXShape)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1048 return;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1049
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1050 if (data) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1051 win->Mask = XCreateBitmapFromData(wsDisplay, win->WindowID, data, win->Width, win->Height);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1052 XShapeCombineMask(wsDisplay, win->WindowID, ShapeBounding, 0, 0, win->Mask, ShapeSet);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1053 XFreePixmap(wsDisplay, win->Mask);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1054 } else
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1055 XShapeCombineMask(wsDisplay, win->WindowID, ShapeBounding, 0, 0, None, ShapeSet);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1056 #endif
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1057 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1058
34081
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1059 /**
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1060 * @brief Set differently sized icons to a window.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1061 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1062 * This function sets the X icon hint as well as
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1063 * the properties KWM_WIN_ICON and _NET_WM_ICON.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1064 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1065 * @param display display
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1066 * @param Win window
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1067 * @param icon pointer to the icons
34081
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1068 */
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1069 void wsSetIcon(Display *display, Window Win, guiIcon_t *icon)
34081
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1070 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1071 XWMHints *wm;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1072 Atom iconatom;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1073 long data[2];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1074
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1075 if (icon->normal) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1076 wm = XGetWMHints(display, Win);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1077
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1078 if (!wm)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1079 wm = XAllocWMHints();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1080
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1081 wm->icon_pixmap = icon->normal;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1082 wm->icon_mask = icon->normal_mask;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1083 wm->flags |= IconPixmapHint | IconMaskHint;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1084
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1085 XSetWMHints(display, Win, wm);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1086 XFree(wm);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1087 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1088
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1089 if (icon->small || icon->normal) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1090 iconatom = XInternAtom(display, "KWM_WIN_ICON", False);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1091 data[0] = (icon->small ? icon->small : icon->normal);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1092 data[1] = (icon->small ? icon->small_mask : icon->normal_mask);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1093
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1094 XChangeProperty(display, Win, iconatom, iconatom, 32, PropModeReplace, (unsigned char *)data, 2);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1095 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1096
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1097 if (icon->collection) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1098 iconatom = XInternAtom(display, "_NET_WM_ICON", False);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1099 XChangeProperty(display, Win, iconatom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)icon->collection, icon->collection_size);
34081
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1100 }
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1101 }
66c5a04a5c32 Fix cursor autohide functionality of the GUI.
ib
parents: 34034
diff changeset
1102
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1103 // ----------------------------------------------------------------------------------------------
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1104 // Set window background to 'color'.
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1105 // ----------------------------------------------------------------------------------------------
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1106 void wsSetBackgroundRGB(wsWindow *win, int r, int g, int b)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1107 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1108 int color = 0;
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35499
diff changeset
1109
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1110 switch (wsOutMask) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1111 case wsRGB32:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1112 case wsRGB24:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1113 color = (r << 16) + (g << 8) + b;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1114 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1115
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1116 case wsBGR32:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1117 case wsBGR24:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1118 color = (b << 16) + (g << 8) + r;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1119 break;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1120
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1121 case wsRGB16:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1122 PACK_RGB16(b, g, r, color);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1123 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1124
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1125 case wsBGR16:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1126 PACK_RGB16(r, g, b, color);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1127 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1128
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1129 case wsRGB15:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1130 PACK_RGB15(b, g, r, color);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1131 break;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1132
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1133 case wsBGR15:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1134 PACK_RGB15(r, g, b, color);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1135 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1136 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1137
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1138 XSetWindowBackground(wsDisplay, win->WindowID, color);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1139 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1140
34009
5c33025ccfd8 Replace comment for wsFullScreen() by doxygen comment.
ib
parents: 34008
diff changeset
1141 /**
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1142 * @brief Clear the entire area in a window.
34009
5c33025ccfd8 Replace comment for wsFullScreen() by doxygen comment.
ib
parents: 34008
diff changeset
1143 *
5c33025ccfd8 Replace comment for wsFullScreen() by doxygen comment.
ib
parents: 34008
diff changeset
1144 * @param win pointer to a ws window structure
5c33025ccfd8 Replace comment for wsFullScreen() by doxygen comment.
ib
parents: 34008
diff changeset
1145 */
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1146 void wsClearWindow(wsWindow *win)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1147 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1148 XClearWindow(wsDisplay, win->WindowID);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1149 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1150
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1151 // ----------------------------------------------------------------------------------------------
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1152 // Move window to x, y.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1153 // ----------------------------------------------------------------------------------------------
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1154 void wsMoveWindow(wsWindow *win, Bool abs, int x, int y)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1155 {
33993
57d711d3dcca Change parameter b of wsMoveWindow().
ib
parents: 33992
diff changeset
1156 if (abs) {
57d711d3dcca Change parameter b of wsMoveWindow().
ib
parents: 33992
diff changeset
1157 win->X = x;
57d711d3dcca Change parameter b of wsMoveWindow().
ib
parents: 33992
diff changeset
1158 win->Y = y;
33995
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
1159 } else
9c2779f24077 Move common code to new function wsWindowPosition().
ib
parents: 33994
diff changeset
1160 wsWindowPosition(win, x, y, win->Width, win->Height);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1161
35651
ebaac70ff6dc Use wsSizeHint() in wsMoveWindow().
ib
parents: 35650
diff changeset
1162 wsSizeHint(win);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1163 XMoveWindow(wsDisplay, win->WindowID, win->X, win->Y);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1164 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1165
33998
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1166 /**
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1167 * @brief Move the window to the x and y position, but if it no longer fits
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1168 * into the screen, reposition it towards the upper left.
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1169 *
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1170 * @param win pointer to a ws window structure
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1171 * @param abs flag whether the position is real/absolute (True) or mock (False)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1172 * @param x x position of the window (real/absolute or mock)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1173 * @param y y position of the window (real/absolute or mock)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1174 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1175 void wsMoveWindowWithin(wsWindow *win, Bool abs, int x, int y)
33998
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1176 {
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1177 Bool fitting = True;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1178
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1179 wsMoveWindow(win, abs, x, y);
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1180
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1181 if (win->X + win->Width + 1 > wsMaxX) {
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1182 fitting = False;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1183 win->X = wsMaxX - win->Width;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1184
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1185 if (win->X < 0)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1186 win->X = 0;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1187 }
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1188
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1189 if (win->Y + win->Height + 1 > wsMaxY) {
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1190 fitting = False;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1191 win->Y = wsMaxY - win->Height;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1192
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1193 if (win->Y < 0)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1194 win->Y = 0;
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1195 }
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1196
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1197 if (!fitting)
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1198 wsMoveWindow(win, True, win->X, win->Y);
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1199 }
ca20e4098c1d Preserve x and y position of a double-size window if possible.
ib
parents: 33996
diff changeset
1200
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1201 // ----------------------------------------------------------------------------------------------
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1202 // Resize window to sx, sy.
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1203 // ----------------------------------------------------------------------------------------------
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1204 void wsResizeWindow(wsWindow *win, int sx, int sy)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1205 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1206 win->Width = sx;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1207 win->Height = sy;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1208
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1209 if (vo_wm_type == 0)
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1210 XUnmapWindow(wsDisplay, win->WindowID);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1211
35648
238c621810b6 Simplify wsSizeHint() by dropping parameter 'hints'.
ib
parents: 35646
diff changeset
1212 wsSizeHint(win);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1213 XResizeWindow(wsDisplay, win->WindowID, sx, sy);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1214
34124
7777da659cbe Fix bug in wsResizeWindow().
ib
parents: 34083
diff changeset
1215 if (vo_wm_type == 0)
7777da659cbe Fix bug in wsResizeWindow().
ib
parents: 34083
diff changeset
1216 XMapWindow(wsDisplay, win->WindowID);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1217 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1218
35355
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1219 /**
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1220 * @brief Switch window fullscreen state.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1221 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1222 * Switch normal window to fullscreen and fullscreen window to normal.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1223 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1224 * @param win pointer to a ws window structure
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1225 */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1226 void wsFullScreen(wsWindow *win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1227 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1228 if (win->isFullScreen) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1229 if (vo_fs_type & vo_wm_FULLSCREEN)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1230 /* window manager supports EWMH */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1231 vo_x11_ewmh_fullscreen(win->WindowID, _NET_WM_STATE_REMOVE);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1232 else {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1233 win->X = win->OldX;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1234 win->Y = win->OldY;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1235 win->Width = win->OldWidth;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1236 win->Height = win->OldHeight;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1237 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1238
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1239 win->isFullScreen = False;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1240 } else {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1241 if (vo_fs_type & vo_wm_FULLSCREEN)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1242 /* window manager supports EWMH */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1243 vo_x11_ewmh_fullscreen(win->WindowID, _NET_WM_STATE_ADD);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1244 else {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1245 win->OldX = win->X;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1246 win->OldY = win->Y;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1247 win->OldWidth = win->Width;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1248 win->OldHeight = win->Height;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1249 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1250
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1251 win->isFullScreen = True;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1252
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1253 wsUpdateXineramaInfo(win);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1254 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1255
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1256 /* unknown window manager and obsolete option -fsmode used */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1257 if (vo_wm_type == 0 && !(vo_fsmode & 16)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1258 XUnmapWindow(wsDisplay, win->WindowID); // required for MWM
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1259 XWithdrawWindow(wsDisplay, win->WindowID, wsScreen);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1260 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1261
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1262 /* restore window if window manager doesn't support EWMH */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1263 if (!(vo_fs_type & vo_wm_FULLSCREEN)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1264 wsSizeHint(win);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1265 wsWindowDecoration(win, win->Decorations && !win->isFullScreen);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1266 wsSetLayer(wsDisplay, win->WindowID, win->isFullScreen);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1267 XMoveResizeWindow(wsDisplay, win->WindowID, win->X, win->Y, win->Width, win->Height);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1268 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1269
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1270 /* some window managers lose ontop after fullscreen */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1271 if (!win->isFullScreen & vo_ontop)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1272 wsSetLayer(wsDisplay, win->WindowID, vo_ontop);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1273
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1274 wsRaiseWindowTop(wsDisplay, win->WindowID);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1275 XFlush(wsDisplay);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1276 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1277
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1278 /**
35355
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1279 * @brief Iconify a window.
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1280 *
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1281 * @param win pointer to a ws window structure
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1282 */
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1283 void wsIconify(wsWindow *win)
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1284 {
35355
c8478a499a17 Pass big parameter by reference rather than by value.
ib
parents: 35354
diff changeset
1285 XIconifyWindow(wsDisplay, win->WindowID, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1286 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1287
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1288 void wsVisibleWindow(wsWindow *win, int show)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1289 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1290 switch (show) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1291 case wsShowWindow:
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35499
diff changeset
1292
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1293 XMapRaised(wsDisplay, win->WindowID);
35652
f6c00eacd816 Add wsMapWait().
ib
parents: 35651
diff changeset
1294 wsMapWait(win);
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35499
diff changeset
1295
33952
75b858ef3666 Keep track of fullscreen state.
ib
parents: 33937
diff changeset
1296 if (vo_fs_type & vo_wm_FULLSCREEN)
75b858ef3666 Keep track of fullscreen state.
ib
parents: 33937
diff changeset
1297 win->isFullScreen = False;
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35499
diff changeset
1298
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1299 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1300
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1301 case wsHideWindow:
35541
ded4a8c2aa70 Cosmetic: Add some blank lines.
ib
parents: 35499
diff changeset
1302
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1303 XUnmapWindow(wsDisplay, win->WindowID);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1304 break;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1305 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1306
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1307 XFlush(wsDisplay);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1308 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1309
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1310 /**
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1311 * @brief Map a window and raise it to the top.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1312 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1313 * @param display display
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1314 * @param Win window
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1315 */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1316 void wsRaiseWindowTop(Display *display, Window Win)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1317 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1318 XMapRaised(display, Win); // NOTE TO MYSELF: is that really enough?
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1319 XRaiseWindow(display, Win); // NOTE TO MYSELF: is that really enough?
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1320 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1321
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1322 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1323 // Move window to selected layer
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1324 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1325
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1326 /**
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1327 * @brief Set the layer for a window.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1328 *
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1329 * @param display display
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1330 * @param Win window
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1331 * @param fullscreen whether to set fullscreen or normal layer
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1332 */
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1333 void wsSetLayer(Display *display, Window Win, Bool fullscreen)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1334 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1335 vo_x11_setlayer(display, Win, fullscreen);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1336 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1337
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1338 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1339 // Redraw screen.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1340 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1341 void wsPostRedisplay(wsWindow *win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1342 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1343 if (win->ReDraw) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1344 win->State = wsWindowExpose;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1345 win->ReDraw();
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1346 XFlush(wsDisplay);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1347 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1348 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1349
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1350 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1351 // Put 'Image' to window.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1352 // ----------------------------------------------------------------------------------------------
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1353 void wsCreateImage(wsWindow *win, int Width, int Height)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1354 {
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
1355 #ifdef HAVE_SHM
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1356 if (wsUseXShm) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1357 win->xImage = XShmCreateImage(wsDisplay, win->VisualInfo.visual,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1358 win->VisualInfo.depth, ZPixmap, NULL, &win->Shminfo, Width, Height);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1359
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1360 if (win->xImage == NULL) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1361 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
1362 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1363 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1364
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1365 win->Shminfo.shmid = shmget(IPC_PRIVATE, win->xImage->bytes_per_line * win->xImage->height, IPC_CREAT | 0777);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1366
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1367 if (win->Shminfo.shmid < 0) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1368 XDestroyImage(win->xImage);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1369 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
1370 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1371 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1372
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1373 win->Shminfo.shmaddr = (char *)shmat(win->Shminfo.shmid, 0, 0);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1374
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1375 if (win->Shminfo.shmaddr == ((char *)-1)) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1376 XDestroyImage(win->xImage);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1377
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1378 if (win->Shminfo.shmaddr != ((char *)-1))
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1379 shmdt(win->Shminfo.shmaddr);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1380
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1381 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
1382 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1383 }
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1384
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1385 win->xImage->data = win->Shminfo.shmaddr;
35493
411875efca3f Introduce boolean symbolic constants.
ib
parents: 35492
diff changeset
1386 win->Shminfo.readOnly = False;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1387 XShmAttach(wsDisplay, &win->Shminfo);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1388 XSync(wsDisplay, False);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1389 shmctl(win->Shminfo.shmid, IPC_RMID, 0);
34465
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
1390 } else
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
1391 #endif
3c1a1038bfc7 Properly handle the lack of XShm.
ib
parents: 34463
diff changeset
1392 {
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1393 win->xImage = XCreateImage(wsDisplay, win->VisualInfo.visual, win->VisualInfo.depth,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1394 ZPixmap, 0, 0, Width, Height,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1395 (wsDepthOnScreen == 3) ? 32 : wsDepthOnScreen,
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1396 0);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1397
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1398 if ((win->xImage->data = malloc(win->xImage->bytes_per_line * win->xImage->height)) == NULL) {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1399 mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_NotEnoughMemoryDrawBuffer);
33768
cee9987bc81d Remove guiExit().
ib
parents: 33550
diff changeset
1400 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1401 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1402 }
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1403
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1404 win->ImageData = (unsigned char *)win->xImage->data;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1405 win->ImageDataw = (unsigned short int *)win->xImage->data;
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1406 win->ImageDatadw = (unsigned int *)win->xImage->data;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1407 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1408
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1409 void wsDestroyImage(wsWindow *win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1410 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1411 if (win->xImage) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1412 XDestroyImage(win->xImage);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1413
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1414 #ifdef HAVE_SHM
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1415 if (wsUseXShm) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1416 XShmDetach(wsDisplay, &win->Shminfo);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1417 shmdt(win->Shminfo.shmaddr);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1418 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1419 #endif
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1420 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1421
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1422 win->xImage = NULL;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1423 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1424
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1425 void wsConvert(wsWindow *win, unsigned char *Image)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1426 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1427 static struct SwsContext *sws_ctx;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1428 const uint8_t *src[4] = { Image, NULL, NULL, NULL };
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1429 int src_stride[4] = { 4 * win->xImage->width, 0, 0, 0 };
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1430 uint8_t *dst[4] = { win->ImageData, NULL, NULL, NULL };
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1431 int dst_stride[4];
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1432 int i;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1433
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1434 sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, PIX_FMT_RGB32,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1435 win->xImage->width, win->xImage->height, out_pix_fmt,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1436 SWS_POINT, NULL, NULL, NULL);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1437 av_image_fill_linesizes(dst_stride, out_pix_fmt, win->xImage->width);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1438 sws_scale(sws_ctx, src, src_stride, 0, win->xImage->height, dst, dst_stride);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1439
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1440 if (!wsNonNativeOrder)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1441 return;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1442
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1443 switch (win->xImage->bits_per_pixel) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1444 case 32:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1445 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1446 uint32_t *d = (uint32_t *)win->ImageData;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1447
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1448 for (i = 0; i < win->xImage->width * win->xImage->height; i++)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1449 d[i] = bswap_32(d[i]);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1450
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1451 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1452 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1453
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1454 case 16:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1455 case 15:
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1456 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1457 uint16_t *d = (uint16_t *)win->ImageData;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1458
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1459 for (i = 0; i < win->xImage->width * win->xImage->height; i++)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1460 d[i] = bswap_16(d[i]);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1461
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1462 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1463 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1464 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1465 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1466
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1467 void wsPutImage(wsWindow *win)
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1468 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1469 #ifdef HAVE_SHM
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1470 if (wsUseXShm) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1471 XShmPutImage(wsDisplay, win->WindowID, win->wGC, win->xImage,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1472 0, 0,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1473 (win->Width - win->xImage->width) / 2, (win->Height - win->xImage->height) / 2,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1474 win->xImage->width, win->xImage->height, 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1475 } else
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1476 #endif
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1477 {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1478 XPutImage(wsDisplay, win->WindowID, win->wGC, win->xImage,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1479 0, 0,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1480 (win->Width - win->xImage->width) / 2, (win->Height - win->xImage->height) / 2,
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1481 win->xImage->width, win->xImage->height);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1482 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1483 }
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1484
35656
f2093dc82b5f Cosmetic: Rename wsTWindow wsWindow.
ib
parents: 35655
diff changeset
1485 void wsResizeImage(wsWindow *win, int Width, int Height)
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1486 {
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1487 wsDestroyImage(win);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1488 wsCreateImage(win, Width, Height);
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1489 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1490
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1491 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1492 // Show / hide mouse cursor.
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1493 // ----------------------------------------------------------------------------------------------
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1494 void wsVisibleMouse(wsWindow *win, int m)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1495 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1496 switch (m) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1497 case wsShowMouseCursor:
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1498
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1499 if (win->wsCursor != None) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1500 XFreeCursor(wsDisplay, win->wsCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1501 win->wsCursor = None;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1502 }
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1503
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1504 XDefineCursor(wsDisplay, win->WindowID, 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1505 break;
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1506
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1507 case wsHideMouseCursor:
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1508
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1509 win->wsCursor = XCreatePixmapCursor(wsDisplay, win->wsCursorPixmap, win->wsCursorPixmap, &win->wsColor, &win->wsColor, 0, 0);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1510 XDefineCursor(wsDisplay, win->WindowID, win->wsCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1511 break;
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1512 }
33539
5bdc088113f7 Cosmetic: Format to MPlayer coding style.
ib
parents: 33529
diff changeset
1513
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1514 XFlush(wsDisplay);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1515 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1516
35639
2e7f2ecaaf0b Don't define a function by a macro.
ib
parents: 35637
diff changeset
1517 /**
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1518 * @brief Handle automatic hiding of the cursor.
35639
2e7f2ecaaf0b Don't define a function by a macro.
ib
parents: 35637
diff changeset
1519 */
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1520 void wsAutohideCursor(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1521 {
35672
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1522 if (mouse_win && (GetTimerMS() - mouse_time >= MOUSEHIDE_DELAY)) {
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1523 wsVisibleMouse(mouse_win, wsHideMouseCursor);
144d3a71db7d Cosmetic: Relocate some functions.
ib
parents: 35670
diff changeset
1524 mouse_win = NULL;
33542
107084241b00 Add support for _NET_WM_ICON
ib
parents: 33541
diff changeset
1525 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1526 }