summaryrefslogtreecommitdiffstats
path: root/libvo/vo_x11.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28537Uoti Urpala2009-02-121-0/+17
|\
| * Add standard license headers, unify header formatting.diego2009-02-081-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+0
|\|
| * Remove pointless forward declaration.diego2008-12-231-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28184 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-251-25/+12
|\|
| * Clear the whole window on resize in vo_x11 since we do notreimar2008-11-231-1/+3
| | | | | | | | | | | | | | yet know how large the borders will be. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28011 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify vo_x11 check_events functionreimar2008-11-231-7/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28010 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not draw in window if our image has not yet been adjusted to the new ↵reimar2008-11-231-0/+5
| | | | | | | | | | | | | | | | | | | | window size. Fixes some cases of borders not being black in fullscreen when fullscreen image is scaled down. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28009 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary xf86vmode.h include.reimar2008-11-231-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28008 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some usnused variables and commented-out code.reimar2008-11-231-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28007 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.reimar2008-11-231-9/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28006 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-41/+6
|\|
| * Simplify handling of "flags" parameterreimar2008-11-211-13/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27977 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add forgotten initialization if Flip_Flag to 0.reimar2008-11-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27976 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor common code like -wid handling, vo_gc creation etc. out intoreimar2008-11-191-29/+2
| | | | | | | | | | | | | | x11_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-80/+26
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Remove explicit setting of vo_ontop since that is already done by ↵reimar2008-11-151-3/+0
| | | | | | | | | | | | vo_x11_create_vo_window git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a duplicated vo_x11_selectinput_witherrreimar2008-11-151-8/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27936 b3059339-0415-0410-9bf9-f77b7e298cf2
| * respect -vf dsize etc. also for -rootwin, just like vo_xv does.reimar2008-11-151-10/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27935 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused variables.reimar2008-11-151-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.reimar2008-11-151-1/+1
| | | | | | | | | | | | | | This fixes the -vm bug that the created window is too small. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27925 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) samereimar2008-11-151-12/+2
| | | | | | | | | | | | | | boiler-plate code with them, just with different bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set modified window position and monitor aspect in vo_vm_switch instead of inreimar2008-11-151-4/+0
| | | | | | | | | | | | | | individual vo drivers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace some of the different inconsistent XGetGeometry uses by areimar2008-11-151-3/+1
| | | | | | | | | | | | | | vo_x11_update_geometry function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code from unused and since ages deprecated draw_frame function.reimar2008-11-151-21/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_x11: do not replace the vo_gc created by the Gui.reimar2008-11-151-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27915 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.reimar2008-11-151-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics for vo_x11 control() to make it more similar to vo_xv.creimar2008-11-151-8/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27913 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+7
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * fixed image format detection for 15 bit color depthsfaust32008-10-171-1/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27796 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-3/+0
|\|
| * Remove duplicated prototype for XShmGetEventBase(), becausediego2008-08-091-3/+0
| | | | | | | | | | | | | | | | | | - it is used in other places without checking, - it is a workaround for a bug elsewhere, - if the problem is real at all, there should be a proper configure check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27444 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Change a bunch of X11-specific preprocessor directives.diego2008-08-041-6/+6
| | | | | | | | | | | | | | Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:diego2008-07-301-2/+2
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove useless parentheses from from return statements.diego2008-05-161-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove variable arguments from vo control() functionsUoti Urpala2008-04-231-1/+1
| | | | | | | | | | No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder.
* | Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-231-16/+4
|/ | | | | | | | These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code.
* typo fix: inited --> initializeddiego2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary <signal.h> includesuau2008-01-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
* Format mapping table should be constreimar2007-12-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25267 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark the vo_functions_t definitions as const where possible.reimar2007-12-021-1/+1
| | | | | | | | This is not possible for xover and anything supporting vidix due to horrible hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make vo info structs constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable.diego2007-08-151-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24065 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make X11 window creation and (with -fixed-vo) management simpler and morereimar2007-06-271-28/+2
| | | | | | | | | 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
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove more pointless fastmemcpy.h includes in libvoreimar2007-05-271-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23394 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify -flip handling on vo_x11.creimar2007-05-121-6/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23302 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash with -flip on 64 bit systems, the result ofreimar2007-05-121-1/+1
| | | | | | | stride*height _must_ be sign extended. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factor common code out of if in x11_common.creimar2007-05-121-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23300 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* "()" to "(void)" function param list fixesuau2007-04-011-1/+1
| | | | | | | patch from Stefan Huehner, stefan huehner org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common vo initialization code to video_out.creimar2007-02-171-9/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, missing () in check for 32bit endian-conversion hackreimar2006-12-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21615 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for different endianness on client and server with -vo x11reimar2006-12-121-0/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21602 b3059339-0415-0410-9bf9-f77b7e298cf2
* Align image data pointer, this is also in preparation of an upcoming patchreimar2006-12-121-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21601 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use XCreateImage instead of XGetImage, this is not only more correct andreimar2006-12-121-3/+5
| | | | | | | | similar to the SHM case, it also eliminates the massive startup delay over ssh (at least when you have a tiny upstream). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21600 b3059339-0415-0410-9bf9-f77b7e298cf2
* Proper detection of corresponding MPlayer image format for X server format ↵reimar2006-10-231-41/+58
| | | | | | for vo_x11. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20415 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove dead code (condition can obviously never be true)reimar2006-10-131-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20202 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org.diego2006-07-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move postproc ---> libswscalelucabe2006-06-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18866 b3059339-0415-0410-9bf9-f77b7e298cf2
* Software Scaler headers usage cleanuplucabe