annotate libvo/x11_common.h @ 25447:139197373d1b

Move a variable to where it is used
author reimar
date Thu, 20 Dec 2007 12:51:24 +0000
parents 00aa61cde84a
children 3baf6a2283da
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4795
diff changeset
1
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4795
diff changeset
2 #ifndef X11_COMMON_H
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4795
diff changeset
3 #define X11_COMMON_H
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
4
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
5 #include <X11/Xlib.h>
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
6 #include <X11/Xutil.h>
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
7
14663
9d79600ff98d X11 headers must be included also when X11_FULLSCREEN is not defined (although
reimar
parents: 13843
diff changeset
8 #ifdef X11_FULLSCREEN
9d79600ff98d X11 headers must be included also when X11_FULLSCREEN is not defined (although
reimar
parents: 13843
diff changeset
9
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
10 #define vo_wm_LAYER 1
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
11 #define vo_wm_FULLSCREEN 2
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
12 #define vo_wm_STAYS_ON_TOP 4
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
13 #define vo_wm_ABOVE 8
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
14 #define vo_wm_BELOW 16
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
15 #define vo_wm_NETWM (vo_wm_FULLSCREEN | vo_wm_STAYS_ON_TOP | vo_wm_ABOVE | vo_wm_BELOW)
8864
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
16
12520
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
17 /* EWMH state actions, see
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
18 http://freedesktop.org/Standards/wm-spec/index.html#id2768769 */
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
19 #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
20 #define _NET_WM_STATE_ADD 1 /* add/set property */
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
21 #define _NET_WM_STATE_TOGGLE 2 /* toggle property */
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
22
8864
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
23 extern int metacity_hack;
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
24
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
25 extern int vo_fs_layer;
5997
b5fb9a927bf3 add WM detection, and wm specific fullscreen code. (???)
pontscho
parents: 5955
diff changeset
26 extern int vo_wm_type;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
27 extern int vo_fs_type;
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
28 extern char** vo_fstype_list;
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
29
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 723
diff changeset
30 extern char *mDisplayName;
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 723
diff changeset
31 extern Display *mDisplay;
2455
712a46dff92d printf-gcc3 patch, x11-commons mRootwin
sven
parents: 1811
diff changeset
32 extern Window mRootWin;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 723
diff changeset
33 extern int mScreen;
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 723
diff changeset
34 extern int mLocalDisplay;
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 723
diff changeset
35
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5835
diff changeset
36 extern int vo_mouse_autohide;
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 4993
diff changeset
37
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
38 extern int vo_init( void );
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
39 extern void vo_uninit( void );
6406
9bbbcd3a6762 Aii 10l forgot to commit with my last x11_common.c commit
atmos4
parents: 6095
diff changeset
40 extern void vo_hidecursor ( Display* , Window );
5651
b8d8d72776f2 fix playlist bug with gui and rewrite mousecursor show/hide code
pontscho
parents: 4993
diff changeset
41 extern void vo_showcursor( Display *disp, Window win );
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
42 extern void vo_x11_decoration( Display * vo_Display,Window w,int d );
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
43 extern void vo_x11_classhint( Display * display,Window window,char *name );
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 12972
diff changeset
44 extern void vo_x11_nofs_sizepos(int x, int y, int width, int height);
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
45 extern void vo_x11_sizehint( int x, int y, int width, int height, int max );
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
46 extern int vo_x11_check_events(Display *mydisplay);
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6406
diff changeset
47 extern void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask);
6013
7f6e02a16ac4 some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents: 5998
diff changeset
48 extern void vo_x11_fullscreen( void );
8864
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
49 extern void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer );
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 16958
diff changeset
50 extern void vo_x11_uninit(void);
7964
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7256
diff changeset
51 extern Colormap vo_x11_create_colormap(XVisualInfo *vinfo);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7256
diff changeset
52 extern uint32_t vo_x11_set_equalizer(char *name, int value);
143d730908ae here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents: 7256
diff changeset
53 extern uint32_t vo_x11_get_equalizer(char *name, int *value);
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 8864
diff changeset
54 extern void fstype_help(void);
10765
c8fb7e2690a3 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents: 10359
diff changeset
55 extern Window vo_x11_create_smooth_window( Display *mDisplay, Window mRoot,
c8fb7e2690a3 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents: 10359
diff changeset
56 Visual *vis, int x, int y, unsigned int width, unsigned int height,
c8fb7e2690a3 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents: 10359
diff changeset
57 int depth, Colormap col_map);
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 22886
diff changeset
58 extern void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 22886
diff changeset
59 unsigned int width, unsigned int height, int flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 22886
diff changeset
60 Colormap col_map, const char *classname, const char *title);
10765
c8fb7e2690a3 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents: 10359
diff changeset
61 extern void vo_x11_clearwindow_part(Display *mDisplay, Window vo_window,
c8fb7e2690a3 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
alex
parents: 10359
diff changeset
62 int img_width, int img_height, int use_fs);
10854
53611f557562 fix for warning in some vo_*.c
pl
parents: 10765
diff changeset
63 extern void vo_x11_clearwindow( Display *mDisplay, Window vo_window );
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 16958
diff changeset
64 extern void vo_x11_ontop(void);
12520
94e66acdb706 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
diego
parents: 11542
diff changeset
65 extern void vo_x11_ewmh_fullscreen( int action );
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6013
diff changeset
66
32
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
67 #endif
9e66f722790e the common x11 stuff
arpi_esp
parents:
diff changeset
68
4993
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
69 extern Window vo_window;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
70 extern GC vo_gc;
53c569d36b2c small changes in libvo's X11 support
pontscho
parents: 4981
diff changeset
71 extern XSizeHints vo_hint;
4795
b18e61cb457a small changes
pontscho
parents: 4425
diff changeset
72
10359
772571c63d45 move xv_set_eq to x11_common
iive
parents: 9317
diff changeset
73 #ifdef HAVE_XV
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
74 //XvPortID xv_port;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
75 extern unsigned int xv_port;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
76
10359
772571c63d45 move xv_set_eq to x11_common
iive
parents: 9317
diff changeset
77 extern int vo_xv_set_eq(uint32_t xv_port, char * name, int value);
772571c63d45 move xv_set_eq to x11_common
iive
parents: 9317
diff changeset
78 extern int vo_xv_get_eq(uint32_t xv_port, char * name, int *value);
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
79
22886
71b3e04d0555 "()" to "(void)" function param list fixes
uau
parents: 18287
diff changeset
80 extern int vo_xv_enable_vsync(void);
15864
9c674e162678 added forgotten xv_enable_vsync
reimar
parents: 15100
diff changeset
81
16958
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16280
diff changeset
82 extern void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height );
3ff863e54b93 Test if source image dimensions are too big.
al
parents: 16280
diff changeset
83
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
84 /*** colorkey handling ***/
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
85 typedef struct xv_ck_info_s
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
86 {
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
87 int method; ///< CK_METHOD_* constants
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
88 int source; ///< CK_SRC_* constants
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
89 } xv_ck_info_t;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
90
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
91 #define CK_METHOD_NONE 0 ///< no colorkey drawing
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
92 #define CK_METHOD_BACKGROUND 1 ///< set colorkey as window background
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
93 #define CK_METHOD_AUTOPAINT 2 ///< let xv draw the colorkey
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
94 #define CK_METHOD_MANUALFILL 3 ///< manually draw the colorkey
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
95 #define CK_SRC_USE 0 ///< use specified / default colorkey
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
96 #define CK_SRC_SET 1 ///< use and set specified / default colorkey
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
97 #define CK_SRC_CUR 2 ///< use current colorkey ( get it from xv )
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
98
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
99 extern xv_ck_info_t xv_ck_info;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
100 extern unsigned long xv_colorkey;
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
101
22886
71b3e04d0555 "()" to "(void)" function param list fixes
uau
parents: 18287
diff changeset
102 extern int vo_xv_init_colorkey(void);
15100
66956f842461 fix vo_xv_draw_colorkey to a workable state
iive
parents: 14884
diff changeset
103 extern void vo_xv_draw_colorkey(int32_t x, int32_t y, int32_t w, int32_t h);
14884
83a5a8262611 missing externs (fixes implicit declaration warnings)
rathann
parents: 14742
diff changeset
104 extern void xv_setup_colorkeyhandling(char const * ck_method_str, char const * ck_str);
14742
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
105
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
106 /*** test functions for common suboptions ***/
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
107 int xv_test_ck( void * arg );
76d461a061df Unified colorkey code for vo xv and vo xvmc.
al
parents: 14663
diff changeset
108 int xv_test_ckm( void * arg );
10359
772571c63d45 move xv_set_eq to x11_common
iive
parents: 9317
diff changeset
109 #endif
772571c63d45 move xv_set_eq to x11_common
iive
parents: 9317
diff changeset
110
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1137
diff changeset
111 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1137
diff changeset
112 extern void vo_setwindow( Window w,GC g );
1811
0483b88482f5 fix size ?
pontscho
parents: 1746
diff changeset
113 extern void vo_x11_putkey(int key);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1137
diff changeset
114 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 402
diff changeset
115
324
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
116 void saver_off( Display * );
720c640332c8 Szebb es jobb screensaver-kikapcsolo resz
laaz
parents: 32
diff changeset
117 void saver_on( Display * );
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
118
4425
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 3990
diff changeset
119 #ifdef HAVE_XF86VM
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 3990
diff changeset
120 void vo_vm_switch(uint32_t, uint32_t, int*, int*);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 3990
diff changeset
121 void vo_vm_close(Display*);
6144f63cbaa1 common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents: 3990
diff changeset
122 #endif
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4795
diff changeset
123
18174
0f897ffb95bc forgotten update_xinerama_info prototypes
reimar
parents: 18116
diff changeset
124 void update_xinerama_info(void);
0f897ffb95bc forgotten update_xinerama_info prototypes
reimar
parents: 18116
diff changeset
125
8864
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
126 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return);
b8c271750450 - sync with x11_common
pontscho
parents: 7964
diff changeset
127
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4795
diff changeset
128 #endif
7256
ec6dd0a29d93 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
jkeil
parents: 6953
diff changeset
129