x11: cleanup, refactor

Move things that are used by vo_xv only into vo_xv, same for vo_x11.

Rename some functions exported by x11_common, like vo_init to
vo_x11_common. Make functions not used outsode of x11_common.c private
to that file. Eliminate all global variables defined by x11_common
(except error handler and colormap stuff).

There shouldn't be any functional changes, and only code is moved
around. There are some minor simplifications in the X11 init code, as
we completely remove the ability to initialize X11 and X11+VO
separately (see commit b4d9647 "mplayer: do not create X11 state in player frontend"),
and the respective functions are conflated into vo_x11_init() and
vo_x11_uninit().

1 files changed, 2 insertions, 0 deletions

diff --git a/core/options.h b/core/options.h
index d1c58fdda9..10eb7135fd 100644
--- a/core/options.h
+++ b/core/options.h
@@ -35,6 +35,8 @@ typedef struct MPOpts {
     int requested_input_range;
     int requested_output_range;
     int cursor_autohide_delay;
+    char** vo_fstype_list;
+    int vo_stop_screensaver;
 
     // ranges -100 - 100, 1000 if the vo default should be used
     int vo_gamma_gamma;