1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-19 22:01:10 +00:00
Commit Graph

72 Commits

Author SHA1 Message Date
reimar
7be96c3792 Do not return pointer to on-stack memory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31184 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:58:17 +00:00
reimar
d08822aaac Fix return value (it was missing completely).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31183 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:55:39 +00:00
reimar
f62044777b Handle -wid Window being closed for direct3d and gl vos on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 17:53:47 +00:00
reimar
14c018a80f Avoid duplicating mouse-movement command-generation code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 16:13:57 +00:00
reimar
2f629d7969 Deduplicate enable_mouse_movements declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 15:49:46 +00:00
siretart
9cef48bac7 rename 'struct keymap' -> 'struct mp_keymap'
This avoids the compilation failure on kFreeBSD (at least amd64):

  In file included from libvo/vo_directfb2.c:44:
  libvo/video_out.h:267: error: redefinition of 'struct keymap'

This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn
includes sys/kbio.h, which defines another 'struct keymap'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-23 10:22:44 +00:00
reimar
1cd3b3c5dd Add support for VOFLAG_HIDDEN to the w32 backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:45 +00:00
reimar
bf6dc310dc Set the PixelFormat right after creating the window and set it only once.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 22:46:01 +00:00
reimar
4805ea9864 Add support for Windows OpenGL rendering onto a device instead of into a window.
Has little use except for experimenting - on Windows 9x it could be used to
render on monitors that were not managed by Windows, but that feature was
removed in newer Windows versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29946 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-21 22:27:40 +00:00
reimar
16c2a6660a Disable -keepaspect with -wid in w32_common code.
This does not work in a useful way and was unintentionally "enabled"
when -wid was made to use a separate window.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29559 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:20:21 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego
7155671f37 "MPlayer - The Movie Player" should be used as the player name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28955 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 09:47:51 +00:00
reimar
74efde9480 Calculate border size in aspect keeping code by using AdjustWindowRect
instead of GetClientRect and GetWindowRect since GetClientRect returns
nonsensical values if Window is still minimized.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28713 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-23 21:40:02 +00:00
diego
befc528297 Add standard license headers, unify header formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
reimar
c51ba3aed9 Support F- and numpad keys for w32_common based vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28214 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 17:00:11 +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
70dbf549e6 More robust w32 -wid size handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:54:01 +00:00
reimar
23a8967a4c Reindent after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:42:53 +00:00
reimar
c4386a8333 Do not override the vo_dwidth/vo_dheight values in vo_w32_config
in -wid mode because we ignore the requested size in that case. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:38:50 +00:00
diego
529028ff5d cosmetics: typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27975 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 19:32:19 +00:00
reimar
04d6de5ee2 Doxygen documentation for w32_common.c
Patch by Georgi Petrov (gogothebee gmail com) with several modifications by me.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27954 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 12:23:23 +00:00
reimar
69c3d22e00 Fix Windows OpenGL -wid:
Disable the Window instead of explicitly passing on click events.
This also makes Drag-and-Drop work if the -wid window supports it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27904 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-11 19:21:36 +00:00
reimar
b8abe420bc Make some variables static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25978 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 19:58:05 +00:00
reimar
6201d6027d Avoid a useless extra pointer variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25977 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 19:55:15 +00:00
reimar
7c763876c7 Do not uselessly erase background, OpenGL will take care of drawing everything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25976 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 19:47:54 +00:00
reimar
2272b20c3d Avoid -wid message processing blocking MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25974 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 16:49:24 +00:00
reimar
c5decb0718 Forward mouse messages to -wid Window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25972 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-10 10:01:25 +00:00
reimar
a09d0bac78 Make sure the -wid window does not get notified when we destroy our attached child window.
Previous behaviour seems to cause QT to do something stupid which makes
DestroyWindow hang (SMPlayer is an application where this happened).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25966 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 14:47:10 +00:00
reimar
83834ac968 Hack: Create a child window for Windows OpenGL with -wid, since (esp. nVidia)
drivers have problems drawing in other processes' windows. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25965 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 14:14:35 +00:00
reimar
8b068da7ad Implement keepaspect for Windows OpenGL vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25950 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-02 17:22:07 +00:00
reimar
2b316697f3 Avoid some pointer conversion warnings (the code is messy but not wrong)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25815 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 09:50:50 +00:00
reimar
da28fa2ab2 Fix some function types from unspecified to empty argument list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25813 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 09:40:15 +00:00
reimar
058d1f0886 Fix the bug where the window would become smaller each time vo_ontop is toggled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25747 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 21:01:30 +00:00
reimar
7b9f20c0ab Fix compilation after patch to remove global vo_hdc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 13:18:26 +00:00
reimar
e1e588421f Remove global vo_hdc, since it is recommended to release a DC as soon as possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24334 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 08:44:36 +00:00
reimar
265c1a174e Hack around some fullscreen issues with gl under Windows
(non-fullscreen window would not always return to original size).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23607 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-22 22:06:58 +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
edfdc4c0b5 Add support for tracking mouse movements.
Patch by Zuxy Meng (zuxy meng at gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22441 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 13:20:51 +00:00
reimar
51d6a768c7 Whitespace-only cosmetics: get rid of all remaining tabs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22434 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 10:39:02 +00:00
reimar
ad90e64ad9 Generate resize events when size of -wid window changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22433 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 10:30:55 +00:00
reimar
29a164309f Fix compilation under MinGW with X11 enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-17 12:33:09 +00:00
reimar
1719ee50e2 Adapt code to annoying ShowCursor semantics (increases/decreases and returns
an internal variable, cursor is show when this variable is >= 0)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20988 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 17:44:51 +00:00
reimar
97a3016cae Hack around Windows focus problem with -vo gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20673 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 21:44:53 +00:00
reimar
2de69adf98 Remove completely useless cursor variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20671 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 19:19:03 +00:00
reimar
15b474c59e Support backspace for -vo gl/gl2 under Windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20613 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-02 18:42:07 +00:00
reimar
384cb8f2a3 Fix window size bug when starting with -fs and returning
to windowed mode


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18992 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 10:22:29 +00:00
reimar
4ccabac9ba Do not fiddle (too much) with external (WinID) windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18953 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 14:57:25 +00:00
reimar
6d8ee8674d Convince windows to allow window sizes > screen size
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18932 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 11:14:25 +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
reimar
9e88af0e0c 10l, forgot to move aspect_save_screenres in last commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18090 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 11:23:03 +00:00