1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 04:45:33 +00:00
Commit Graph

270 Commits

Author SHA1 Message Date
cehoyos
0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 15:25:24 +00:00
diego
1e1de192f8 Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28191 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-24 16:57:35 +00:00
reimar
01405c8f50 100l, forgot an assignment, broke special keys handling for X11-based vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28175 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-21 04:11:51 +00:00
reimar
d1065dffe1 Add and use a special lookup function to do table-based translation to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28172 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:52:11 +00:00
reimar
c4460fd32c Use a table to translate X11 to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:12:45 +00:00
reimar
ca468a5f84 Simplify handling of X11 key events that are just passed through.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28168 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 10:25:13 +00:00
reimar
476c9bfd95 Set the base size window manager hint, otherwise some subtract the minimum
size of 4x4 from the numbers displayed to the user which might be confusing.
Based on patch by Bert Wesarg [bert wesarg googlemail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 19:01:49 +00:00
reimar
c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 20:19:25 +00:00
reimar
4fa4e8744d include limits.h for INT_MAX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27927 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:06:25 +00:00
reimar
4b9ee2e206 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:56:25 +00:00
reimar
c8d9e2eb60 Set modified window position and monitor aspect in vo_vm_switch instead of in
individual vo drivers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:28:35 +00:00
reimar
ebff32237b Set modeline_width/height to sane values in vo_vm_switch even when
the XF86VidMode extension is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:11:10 +00:00
reimar
87bee02b19 Replace some of the different inconsistent XGetGeometry uses by a
vo_x11_update_geometry function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:45:55 +00:00
ben
b086fadb3d Remove X11 backing store: this is now a useless flag.
Also, it is mandatory for Xserver 1.5.x (part of Xorg 7.4, shipped on all
Linux distributions starting from Oct. 08) and will be removed
from Xserver 1.6 anyhow ...

Patch by Stephane Marchesin (marchesin at icps dot u dash strasbg dot fr).

For more info, see long flame thread at:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-August/058323.html



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27849 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-29 22:03:36 +00:00
diego
73357cc804 Add missing support for some multimedia keys to X11 backend code.
patch by Jorge Lopez, jorgelt gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27747 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 15:58:44 +00:00
reimar
7756839a14 Remove already disabled and probably long obsolete code that worked around an OpenBox bug.
Patch by Julien Danjou [ julien danjou info ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27649 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 08:16:05 +00:00
reimar
0643fde0c3 Use already "prefetched" atoms instead of calling XInternAtom each time.
Patch by Julien Danjou [ julien danjou info ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27648 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 08:14:28 +00:00
diego
82f319af62 Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
diego
3b31fa5717 Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +00:00
reimar
983800b76f Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:46:07 +00:00
reimar
93f1a21bf7 Support -noborder with X11-based vos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:38:04 +00:00
reimar
839d579160 Make vo_x11_fullscreen not break vo_border (proper support still needs vo changes)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27335 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-22 18:33:53 +00:00
diego
f7867644cb Add parentheses to expression to avoid the warning:
libvo/x11_common.c: In function 'xss_suspend':
libvo/x11_common.c:1618: warning: suggest parentheses around && within ||


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-15 11:11:39 +00:00
diego
ad603f5559 cosmetics: Remove useless parentheses from from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:33:27 +00:00
attila
530df550e4 revert commits 26437-26439
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26468 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:58:01 +00:00
attila
d08bf2fc44 cosmetics: fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26439 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:15:08 +00:00
attila
f5ccd50211 move the #ifdef HAVE_XINERAMA to enclose the whole function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26438 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:12:24 +00:00
attila
d48f39e68c Always calculate the xinerama screen mplayer is on.
Bug reported by thomas.lindroth(<at>)gmail.com



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26437 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 11:08:59 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
reimar
a84db25ae4 Use a transform_color function to reduce code duplication
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25702 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 16:30:41 +00:00
uau
b5aa5692cd Remove unnecessary <signal.h> includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-09 01:17:49 +00:00
reimar
91ba3d6531 Remove some now unused screensaver stuff code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25638 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 12:22:03 +00:00
reimar
3259a15f61 Remove most of the messy screensaver code in favour of only XResetScreenSaver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25637 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 12:18:27 +00:00
reimar
f9b1151801 Use a screensaver_off variable to save current state and avoid
uselessly disabling twice.
Also needed for a future patch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25636 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 12:18:17 +00:00
reimar
36928c82e1 Add missing X11/extensions/scrnsaver.h include
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25510 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 18:51:05 +00:00
reimar
defbb2a545 Add support for XScreenSaverSuspend
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25494 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 11:09:43 +00:00
reimar
885bc7c7e1 Move more variables into the block where they are used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 12:57:36 +00:00
reimar
a3816c913b Move a variable to where it is used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 12:51:24 +00:00
uau
5bfedc0a2d Remove some pointless 'inline' qualifiers
Most of these functions aren't even used in the same translation unit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24918 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:10 +00:00
diego
b13b7a54c2 Allow XF86AudioLowerVolume/XF86AudioRaiseVolume keys to be handled by MPlayer.
patch by Michael Mauch, michael.mauch gmx de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24343 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-05 11:09:25 +00:00
reimar
a522f65ac2 Remove checks that in the worst case will completely break fullscreen
switching. If they are needed for something they must be done in
a more robust way.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24333 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 08:36:27 +00:00
reimar
5bf1615eba Make sure aspect hint is adjusted on aspect change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24332 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 08:33:35 +00:00
reimar
33f62a7510 Cosmetics: set vo_hint.flags at more consistent places (directly before
setting the corresponding values)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24331 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-02 22:09:55 +00:00
reimar
10f6c95996 make sure update_xinerama_info is always called even when using the
window-manager fullscreen hint, so that vo_screenwidth/height are right.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23895 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-28 22:21:29 +00:00
attila
d1f19fc77b document "default" behaviour if CopyFromParent is passed as colormap
to vo_x11_create_vo_window()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23843 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-22 18:31:17 +00:00
reimar
a237b8b6f3 Fix vo_x11_clearwindow_part: x position is one less to avoid not clearing
a line in case of rounding error, so width must be one larger, too.
y-case is already correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23680 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-27 13:09:39 +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
reimar
12c23915c9 Add missing return value for x11 error handler
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23635 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 10:46:40 +00:00
diego
5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +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