1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 17:42:17 +00:00
Commit Graph

63 Commits

Author SHA1 Message Date
Uoti Urpala
e66e17adc1 Move xv_port,xv_colorkey,xv_ck_info to x11 struct 2008-04-23 13:47:35 +03:00
Uoti Urpala
40f02f64fd Move vo_window to x11 struct 2008-04-23 13:46:40 +03:00
Uoti Urpala
7159af499c Move static X11 atoms to struct 2008-04-23 13:46:40 +03:00
Uoti Urpala
78172918ff Move vo_screenwidth,vo_screenheight to options struct 2008-04-23 13:46:40 +03:00
Uoti Urpala
432e8ff4a5 Move vo_depthonscreen to x11 struct 2008-04-23 13:46:40 +03:00
Uoti Urpala
eaab1ce896 Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo struct 2008-04-23 13:46:40 +03:00
Uoti Urpala
26039a38e3 Move global mDisplay to x11 state struct 2008-04-23 13:46:34 +03:00
Uoti Urpala
acf319b3ed Create a struct for X11 state
Will be used for common data between X11 VOs. The main reasons for
making it a separate struct rather than extra fields in the main VO
struct are that some field definitions need X headers and that the code
keeps basic X state such as the display connection over opening and
closing of individual VOs.
2008-04-23 13:41:07 +03:00
Uoti Urpala
d283d5236a x11_common.c: Make some functions static 2008-04-23 13:41:06 +03:00
Uoti Urpala
bfe569b76e Move vo_ontop to options struct
Add a 'struct vo *vo' argument to the x11_common.c functions that
access the variable so it's available as vo->opts->vo_ontop. To keep
VOs using the old API working create a global vo variable that is set
to the currently used old vo. "vo_ontop" will be #defined to
"global_vo->opts->vo_ontop", and x11_common.h will add defines like
the following when it is included by old VOs:
 #define vo_x11_ontop() vo_x11_ontop(global_vo)
so that they will call the function according to the new declaration.
2008-04-23 13:41:06 +03:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego
77eb726c3d Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:51:53 +00:00
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
reimar
f131aafff1 Make X11 window creation and (with -fixed-vo) management simpler and more
consistent by introducing a new function that handles most of the
ugly things. Changes of behaviour with some vos is unavoidable, bug reports
welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-27 10:26:13 +00:00
uau
208d4343ef "()" to "(void)" function param list fixes
patch from Stefan Huehner, stefan huehner org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 21:59:54 +00:00
uau
bee52bbd10 Remove updating of vo_mouse_timer_const from the main loop and also
remove the variable itself. Convert code in x11_common.c and OSD timing
that depended on the variable to use real time instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 21:36:02 +00:00
reimar
d9d16656b2 forgotten update_xinerama_info prototypes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18175 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-21 18:42:55 +00:00
reimar
7f3d9de556 Fix and improve xinerama support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-16 13:38:28 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
al
fb8da06ed7 Test if source image dimensions are too big.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16959 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-10 02:39:31 +00:00
reimar
cbf7b3b291 remove extern for variables that are already in headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16281 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-21 01:20:31 +00:00
reimar
7bbc8d045a added forgotten xv_enable_vsync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15865 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-30 10:16:35 +00:00
iive
595b013b7c fix vo_xv_draw_colorkey to a workable state
(using panscan makes x,y negative, so it is very bad idea they to be unsigned)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15101 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-10 16:02:28 +00:00
rathann
85199c9289 missing externs (fixes implicit declaration warnings)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14885 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 22:54:24 +00:00
al
f366d01286 Unified colorkey code for vo xv and vo xvmc.
Made the code also more flexible.

Colorkey drawing is now by default done as
proposed by Marko Macek.

Patch also approved by iive.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14743 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-20 22:43:25 +00:00
reimar
8e1442a9ff X11 headers must be included also when X11_FULLSCREEN is not defined (although
it is not really beautiful that their are included here in the first place)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14664 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-06 10:12:34 +00:00
reimar
1a7a3f8b38 fullscreen fixes and GUI support for vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13844 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-01 20:24:37 +00:00
nplourde
0b7de297e4 now use vo_rootwin var to check for -rootwin switch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12973 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-08 23:22:29 +00:00
diego
b753d80209 Metacity fullscreen issues, patch by Alexander Strasser <eclipse7@gmx.net>,
approved by Attila.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12521 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-02 02:34:39 +00:00
joey
640f93d018 runtime 'stay-on-top' functionality
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-30 16:36:10 +00:00
pl
1a7c7da8bf fix for warning in some vo_*.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10855 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-12 15:48:33 +00:00
alex
7988f6bde6 10000l. Never ever use such foolish GCC 3.x extensionscvs diff -u x11_common.c x11_common.h |more
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10766 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-31 23:13:45 +00:00
iive
a078b2a474 move xv_set_eq to x11_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10360 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-01 21:37:20 +00:00
filon
a3385947b2 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
- help (-fstype help) also availabible
- support state BELOW (someone may want to use it...) and by -fstype none forcing of
   not changing window layer (user request)
- drop icelayer option, it can be set by -fstype layer=<number>
- simplify vo_x11_fullscreen
- fs change code cleanup


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9318 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-07 19:38:39 +00:00
pontscho
52a7bad9a6 - sync with x11_common
- half rewrited font render engine (disabled by default)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8865 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-09 20:47:14 +00:00
arpi
e5947d8b27 here is a somewhat generic equalizer implementation for the X11 vo drivers
using the window's colormap (DirectColor).
this method is using the video card's hardware gamma ramp so it involves
no performance penalties at all.
patch by lucho <lucho@haemimont.bg>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7965 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-29 20:27:47 +00:00
jkeil
d0e59b4ff9 Add the code that chooses a good X11 truecolor visual to the vo_x11 config()
function.  This is useful for framebuffers on Sun hardware, where we have
multiple truecolor visuals of different depths available, and the root
window typically runs at depth 8, yet there are 24 bit true color visuals
available as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7257 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-03 18:10:42 +00:00
arpi
1d17fa69c3 ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
patch Kazunori Ueno <jagarl@creator.club.ne.jp>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6954 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-09 17:43:49 +00:00
atmos4
f41b7cf80e Aii 10l forgot to commit with my last x11_common.c commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6407 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-13 00:26:17 +00:00
arpi
e6bcec1c6b some cleanup, gl/gl2 updated to use vo_window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6096 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-14 23:44:35 +00:00
pontscho
1bff6e8bc3 some bugfix, x[11|mga|v] ( fullscreen with more files )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6014 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-08 16:41:44 +00:00
pontscho
48da357ce5 upsz, 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5999 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-06 15:48:07 +00:00
pontscho
92009fc2f5 add WM detection, and wm specific fullscreen code. (???)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5998 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-06 15:05:07 +00:00
pontscho
b6004b1b7c fix xmga fs, resize to movie size and mouse auto hide + dga
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5956 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-03 20:57:13 +00:00
pontscho
51f5418bd8 fix fullscreen (?)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5836 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-25 21:52:47 +00:00
pontscho
da6135b983 fix playlist bug with gui and rewrite mousecursor show/hide code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5652 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-16 17:41:29 +00:00
pontscho
62f6b6fada small changes in libvo's X11 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4994 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-08 20:14:08 +00:00
pontscho
df141d9d82 rewrite fullscreen support in some libvo driver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4982 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-07 17:50:25 +00:00
pontscho
57e3534b04 small changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4796 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-21 21:11:01 +00:00
arpi
b583968115 common -vm code, patch by Santi Béjar <tiarda@yahoo.es>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4426 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 00:37:27 +00:00