Mercurial > mplayer.hg

comparison gui/wm/ws.h @ 34465:3c1a1038bfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly handle the lack of XShm. The GUI compiles and runs fine without HAVE_SHM now.
author ib
date Thu, 12 Jan 2012 18:21:56 +0000
parents aa4bd0c197d8
children b03481253518
comparison
equal deleted inserted replaced
34464:251018f5254b 34465:3c1a1038bfc7
26 26
27 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
28 #include <X11/Xutil.h> 28 #include <X11/Xutil.h>
29 #include <X11/keysym.h> 29 #include <X11/keysym.h>
30 #include <X11/Xatom.h> 30 #include <X11/Xatom.h>
31 #ifdef HAVE_SHM
31 #include <X11/extensions/XShm.h> 32 #include <X11/extensions/XShm.h>
33 #endif
32 34
33 #define wsKeyReleased 0 35 #define wsKeyReleased 0
34 #define wsKeyPressed 1 36 #define wsKeyPressed 1
35 37
36 #define wsShift (1L << 0) 38 #define wsShift (1L << 0)
156 Atom AtomLeaderClient; 158 Atom AtomLeaderClient;
157 Atom AtomRemote; 159 Atom AtomRemote;
158 Atom AtomWMSizeHint; 160 Atom AtomWMSizeHint;
159 Atom AtomWMNormalHint; 161 Atom AtomWMNormalHint;
160 162
163 #ifdef HAVE_SHM
161 XShmSegmentInfo Shminfo; 164 XShmSegmentInfo Shminfo;
165 #endif
162 unsigned char *ImageData; 166 unsigned char *ImageData;
163 unsigned short int *ImageDataw; 167 unsigned short int *ImageDataw;
164 unsigned int *ImageDatadw; 168 unsigned int *ImageDatadw;
165 GC wGC; 169 GC wGC;
166 XGCValues wGCV; 170 XGCValues wGCV;