annotate gui/wm/ws.c @ 35667:3ed198bf4f21

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