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

253 Commits

Author SHA1 Message Date
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
rathann
259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00
reimar
ff32ae1051 Move code to ignore mouse wheel "down" events to fifo.c (needed because
they too easily cause those "buttons" to get stuck), reducing code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21982 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 11:05:21 +00:00
diego
fa1c3630e3 grammar/spelling/wording in comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21956 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-18 09:03:42 +00:00
reimar
e5e820981f Do not abort on X11 errors, most are not at all fatal.
Makes -vo x11 work over non-trusted ssh X11 forwarding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21826 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 11:57:06 +00:00
reimar
c825b672f5 Get rid of completely useless includes that in addition hinder compilation
on MinGW


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21639 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-16 21:24:12 +00:00
nicodvb
2003857aa2 report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19856 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:13:41 +00:00
uau
5c9b90d7a1 Make some functions static.
Patch by Stefan Huehner, stefan at huehner org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18955 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 15:26:36 +00:00
reimar
37ee8c83cb Fix window position when changing videos while in fullscreen and for
window managers that modify position on Map. Oked by Alexander Strasser.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18718 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-15 08:00:37 +00:00
reimar
6fd578b711 typo fixes: Extenstion -> extension
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18509 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 17:56:04 +00:00
rathann
97bd024609 Simplify condition, since both time and time_last are unsigned.
Patch by Rich Felker.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18486 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 18:34:02 +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
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
reimar
3a54af84ad 10l, aspect_save_screenres must be always called in update_xinerama_info.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18161 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-20 16:17:06 +00:00
reimar
2f9248f074 Register for window-manager delete window events and quit MPlayer.
slightly modified patch from Rickard Narstrom (rickard narstrom at gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18150 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-19 15:58:10 +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
diego
1cbeb57911 Make -xy help output consistent, output an empty line before and after.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17728 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-04 17:33:56 +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