summaryrefslogtreecommitdiffstats
path: root/libvo/w32_common.c
Commit message (Collapse)AuthorAgeFilesLines
* VO: w32_common: also generate VO_EVENT_MOVEreimar2011-07-061-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33650 b3059339-0415-0410-9bf9-f77b7e298cf2 Generate VO_EVENT_MOVE also with -wid. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33656 b3059339-0415-0410-9bf9-f77b7e298cf2
* Windows: vo/input: handle WM_XBUTTONDOWN messageRudolf Polzer2011-06-191-1/+16
| | | | | | | WM_XBUTTONDOWN is used for extra mouse buttons (mapped to button 5 and button 6 in mplayer2). Previously only vo_directx handled this message. Add support to w32_common.c event handling too (used by vo_direct3d and vo_gl/vo_gl2 on Windows).
* input: move all key code lists to input/keycodes.hUoti Urpala2011-05-021-2/+1
| | | | | | | | | | | | | Move the definitions of all special key codes (those not passed by ASCII value) to input/keycodes.h. Before they were spread between osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus some special values in input.h. This was especially inconvenient as the codes had to be coordinated to not conflict between the files. The change requires a bit of ugliness as appleir.c includes <linux/input.h> which contains various conflicting KEY_* definitions. Work around this by adding a special preprocessor variable which can be used to avoid defining these in keycodes.h.
* vo_gl: create stereo-capable window when using Quadbuffer 3Dreimar2010-11-141-0/+2
| | | | | | | Select a stereo pixel format for window when Quadbuffer OpenGL was selected as 3D mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32620 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: Move setting of pixel format from init to configreimar2010-11-141-21/+21
| | | | | | This allows it to depend on flags etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32619 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: minor cleanupreimar2010-11-141-18/+19
| | | | | | | | | | Some indentation fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32611 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify: Use early return instead of large if block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32612 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31189Uoti Urpala2010-05-301-6/+12
|\
| * Do not return pointer to on-stack memory.reimar2010-05-191-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31184 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix return value (it was missing completely).reimar2010-05-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31183 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle -wid Window being closed for direct3d and gl vos on Windows.reimar2010-05-191-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31182 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31097Uoti Urpala2010-04-261-9/+2
|\|
| * Avoid duplicating mouse-movement command-generation code.reimar2010-04-251-6/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deduplicate enable_mouse_movements declaration.reimar2010-04-251-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename 'struct keymap' -> 'struct mp_keymap'siretart2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r30514Uoti Urpala2010-03-091-24/+26
|\|
| * Add support for VOFLAG_HIDDEN to the w32 backend.reimar2010-02-041-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the PixelFormat right after creating the window and set it only once.reimar2010-02-041-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-2/+42
|\|
| * Add support for Windows OpenGL rendering onto a device instead of into a window.reimar2009-11-211-2/+42
| | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-1/+1
|\|
| * Disable -keepaspect with -wid in w32_common code.reimar2009-08-271-1/+1
| | | | | | | | | | | | | | 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
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-4/+4
| |
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-1/+1
|\|
| * "MPlayer - The Movie Player" should be used as the player name.diego2009-03-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28955 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28728Uoti Urpala2009-02-251-5/+6
|\|
| * Calculate border size in aspect keeping code by using AdjustWindowRectreimar2009-02-231-5/+6
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+18
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-0/+10
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Support F- and numpad keys for w32_common based vos.reimar2008-12-301-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28214 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28176Uoti Urpala2008-12-221-16/+18
|\| | | | | | | | | | | Conflicts: libvo/video_out.c libvo/x11_common.c
| * Add and use a special lookup function to do table-based translation to ↵reimar2008-12-201-16/+18
| | | | | | | | | | | | MPlayer keycodes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28172 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * More robust w32 -wid size handlingreimar2008-12-031-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent after previous commitreimar2008-12-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not override the vo_dwidth/vo_dheight values in vo_w32_configreimar2008-12-031-0/+3
| | | | | | | | | | | | | | 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
* | w32_common.c, vo_direct3d.c: Fix Windows compilation issuesUoti Urpala2008-12-021-2/+2
| | | | | | | | | | | | In w32_common.c the special "old_vo_defines.h" header was included too late. vo_direct3d.c was copied from svn without fixing the type of the control() function.
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-0/+98
|\|
| * cosmetics: typo fixesdiego2008-11-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27975 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Doxygen documentation for w32_common.creimar2008-11-181-0/+98
| | | | | | | | | | | | 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
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-15/+1
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Fix Windows OpenGL -wid:reimar2008-11-111-15/+1
| | | | | | | | | | | | | | 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
* | libvo: Move aspect.c static variables to vo structUoti Urpala2008-05-011-1/+1
| | | | | | | | This moves non-option variables. aspect.c still defines option globals.
* | input: Move cmd_queue to context structUoti Urpala2008-04-301-1/+1
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | Remove vo_depthonscreen references from non-X VOsUoti Urpala2008-04-231-5/+6
| | | | | | | | | | | | | | X-specific code uses this global as its internal variable (assuming that X is initialized if it is set). While using non-X VOs the variable is not accessed outside the VO. So make those VOs use their own variables instead of the global vo_depthonscreen.
* | Move vo_ontop to options structUoti Urpala2008-04-231-0/+2
|/ | | | | | | | | | | 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.
* Make some variables static.reimar2008-02-101-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a useless extra pointer variable.reimar2008-02-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25977 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not uselessly erase background, OpenGL will take care of drawing everything.reimar2008-02-101-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25976 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid -wid message processing blocking MPlayer.reimar2008-02-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25974 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forward mouse messages to -wid Window.reimar2008-02-101-1/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25972 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure the -wid window does not get notified when we destroy our attached ↵reimar2008-02-091-1/+1
| | | | | | | | | 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
* Hack: Create a child window for Windows OpenGL with -wid, since (esp. nVidia)reimar2008-02-091-8/+10
| | | | | | drivers have problems drawing in other processes' windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25965 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement keepaspect for Windows OpenGL vos.reimar2008-02-021-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25950 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid some pointer conversion warnings (the code is messy but not wrong)reimar2008-01-201-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some function types from unspecified to empty argument listreimar2008-01-201-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25813 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the bug where the window would become smaller each time vo_ontop is toggled.reimar2008-01-131-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25747 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after patch to remove global vo_hdcreimar2007-09-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove global vo_hdc, since it is recommended to release a DC as soon as ↵reimar2007-09-031-3/+3
| | | | | | possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24334 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around some fullscreen issues with gl under Windowsreimar2007-06-221-0/+3
| | | | | | (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
* Code cleanup: don't include a .c file in mplayer.c and fix a fewrathann2007-03-291-1/+1
| | | | | | | | | | | "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
* Add support for tracking mouse movements.reimar2007-03-041-0/+11
| | | | | | | Patch by Zuxy Meng (zuxy meng at gmail com) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Whitespace-only cosmetics: get rid of all remaining tabsreimar2007-03-041-114/+114
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22434 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generate resize events when size of -wid window changes.reimar2007-03-041-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22433 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation under MinGW with X11 enabledreimar2006-12-171-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trun