summaryrefslogtreecommitdiffstats
path: root/input
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge svn changes up to r26783Uoti Urpala2008-05-153-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-142-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
| * usec_sleep(0) is not the same as not sleeping at all.reimar2008-05-101-1/+1
| | | | | | | | | | | | Fixes massive slowdown on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26718 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input.c: Use talloc for all memory allocationsUoti Urpala2008-05-011-14/+10
| | | | | | | | | | | | Convert the remaining non-talloc memory allocations so that everything in the file consistently uses talloc. Make one additional minor code simplification in read_cmd.
* | Move input options to option structUoti Urpala2008-04-302-40/+40
| |
* | input: Use talloc for struct mp_cmd and things under itUoti Urpala2008-04-301-28/+12
| |
* | input: Move command filedescriptor list to context structUoti Urpala2008-04-302-29/+34
| |
* | input: Move cmd_queue to context structUoti Urpala2008-04-302-22/+23
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | input.c: Change a static variable to localUoti Urpala2008-04-301-14/+16
| |
* | input: Move key filedescriptor list to context structUoti Urpala2008-04-302-28/+34
| | | | | | | | | | The context variable is now passed to VOs too as it's now needed to add a callback on the X filedescriptor.
* | input.c: Move variable from static to localUoti Urpala2008-04-301-2/+1
| |
* | input.c: Move key down state to context structUoti Urpala2008-04-301-33/+36
| |
* | input.c: Use talloc for command bind allocationsUoti Urpala2008-04-301-31/+11
| |
* | input.[ch]: Move some type definitions from .h to .cUoti Urpala2008-04-302-10/+10
| | | | | | | | These aren't used outside input.c.
* | input.c: Remove mp_input_ prefixes from static function namesUoti Urpala2008-04-301-60/+58
| | | | | | | | The prefixes make the code unnecessarily verbose for no real benefit.
* | input.c: Make two functions staticUoti Urpala2008-04-301-3/+3
| |
* | Remove INITIALIZED_INPUT from mpctx->initialized_flagsUoti Urpala2008-04-301-0/+3
| | | | | | | | | | The input functions are never uninited except at exit. Move the uninit to player exit function and remove the flag.
* | input: Move command bind variables to context structUoti Urpala2008-04-302-58/+69
| |
* | Create a context for input.c stateUoti Urpala2008-04-302-45/+58
| | | | | | | | | | | | | | | | | | Start moving static variables to a context struct. Only autorepeat state is moved to the struct in this commit. mp_input_check_interrupt now requires the context variable. Change stream functions to pass it. It's still stored in a static variable in stream/.
* | input.c: Remove _st prefix from struct namesUoti Urpala2008-04-301-4/+4
| |
* | input.c: Use union instead of void *Uoti Urpala2008-04-291-6/+9
| |
* | input: Remove separate mp_input_add_event_fdUoti Urpala2008-04-296-54/+15
| | | | | | | | | | | | | | | | Use the same mp_input_add_key_fd for all uses and add a context argument to its callback that was before only in the event fd callbacks. Instead of checking in input.c whether keys were inserted to the keypress FIFO during the callback do the check in the callback before returning and set return value accordingly.
* | input.c: Revert code uglifications done for gcc 2.95Uoti Urpala2008-04-291-9/+5
| | | | | | | | | | | | It's unlikely that this branch will ever compile with gcc 2.95 again, so it's pointless to keep code uglifications done to work around its limitations.
* | input.c: Remove unnecessary #include "osdep/getch2.h"Uoti Urpala2008-04-291-1/+0
| |
* | Merge svn changes up to r26587Uoti Urpala2008-04-291-1/+1
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Use full path for libavutil #includes.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Mark some constant symbols as suchUoti Urpala2008-04-261-2/+2
| |
* | Add a context argument to mp_input_add_event_fd callbackUoti Urpala2008-04-232-3/+5
| |
* | input/input.c: Minor simplificationUoti Urpala2008-04-231-15/+17
|/
* Get rid of recursive make for the input/ subdirectory.diego2008-04-061-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix handling of comments in input.c, current code had useless ifs and in ↵reimar2008-03-111-4/+2
| | | | | | | | | addition could treat more data as comments than correct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26222 b3059339-0415-0410-9bf9-f77b7e298cf2
* joystick.c is only ever compiled on Linux, remove pointless #ifdefdiego2008-02-281-17/+0
| | | | | | | around the whole file and dummy functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26112 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-225-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-142-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new command to switch between dvdnav titlesben2008-01-242-0/+2
| | | | | | | | Based on parts of dvdnav monster patches from Otvos Attila git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add ass_use_margins command and property to shift subtitles to margins and backeugeni2008-01-232-0/+4
| | | | | | | on the fly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25842 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some types to constreimar2008-01-191-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a useless castreimar2008-01-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25754 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make several mapping tables related to input processing const.reimar2008-01-131-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25737 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
* Do not use exit_player in the signal handler, this code just can notreimar2008-01-082-0/+6
| | | | | | | | | be called from a signal handler. Instead only make the input system generate quit commands for the first CTRL+C and otherwise do getch2_disable and exit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2
* properties to change angle; patch by oattila chello hunicodvb2008-01-052-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25604 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Replace #define with #endif where I really meant to write #endif.diego2008-01-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25582 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guards to all header files that lack them.diego2008-01-014-2/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
* From now on, libmenu does not steal all input keys from input modules.ulion2007-12-262-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new function for parsing and queueing multi-commands separated by \n or \r.ulion2007-12-112-0/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore heading spaces when parsing command.ulion2007-12-101-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove hardcoded key->cmd bindings in libmenu, support custom key bindingsulion2007-12-042-1/+4
| | | | | | | by menu config file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not queue empty cmd.ulion2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25256 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use const char * to replace a char * parameter.ulion2007-11-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25178 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support select subtitle by source, add 4 properties:ulion2007-11-252-0/+8
| | | | | | | | | | | | | 1. sub_source for current sub source (sub file, vobsub, or from demuxer). 2. sub_file for all subtitles from files. 3. sub_vobsub for all subtitles from vobsub. 4. sub_demux for all subtitles from demuxer. Now mplayer can supply a stable and clear interface to external programs using mplayer in slave mode to select a subtitle by its source and its unique id for that source printed by mplayer using -identify parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25157 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix cmd filter memory leak, free the cmd after filter ate it.ulion2007-11-081-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24987 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix input.conf parse bug when comment follows key binding in the same line.ulion2007-10-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24906 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix input command parser for using only tab to separate the arguments.ulion2007-10-231-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24844 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling cosmeticsdiego2007-09-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24663 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes:diego2007-09-131-2/+2
| | | | | | | | | | | | | | | | | input.c: In function 'mp_input_set_section': input.c:1640: warning: suggest parentheses around assignment used as truth value input.c:1643: warning: suggest parentheses around assignment used as truth value mga_common.c: In function 'mga_init': mga_common.c:394: warning: suggest parentheses around assignment used as truth value playtreeparser.c: In function 'parse_smil': playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'ts_parse': libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'demux_open_ts': libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement X/27/0 packet decoding.voroshil2007-08-281-0/+1
| | | | | | | | | It contains information about navigation links. Modified patch from Otvos Attila oattila at chello dot hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up the way get_path is handled: Compile get_path.c to an object to linkdiego2007-08-281-2/+1
| | | | | | | | against instead of directly #including the C file and replace the many extern declarations by a proper header file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Process any waiting commands (got_cmd set). Should fix e.g. smplayer.reimar2007-08-271-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24245 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r24158, it is not necessary with unsigned bitfieldreimar2007-08-251-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24161 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change bitfield to unsigned so that we get the usual truth valuesreimar2007-08-251-6/+6
| | | | | | | (1 = true, 0 = false) instead of -1 for true. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24160 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around broken bitfields in gcc 4.2reimar2007-08-251-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix invalid fd check, the bug is somewhere else though.reimar2007-08-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24157 b3059339-0415-0410-9bf9-f77b7e298cf2
* HACK: check added fds for validity because otherwise mplayerreimar2007-08-251-0/+12
| | | | | | | crashes due to using FD_SET on -1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24156 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix loads of warningsreimar2007-08-251-6/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24155 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle queued commands from input event functions immediatelyuau2007-08-251-0/+6
| | | | | | | | | Check whether an event handler called mp_input_queue_cmd and return the command immediately if so. Currently x11_common.c creates commands from mouse position updates. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24154 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add separate event input type for terminal+vouau2007-08-252-2/+29
| | | | | | | | | | | Add an input/input.c fd type whose read function takes no arguments and returns no value. If such a function reads key or command events it'll add them to the queues itself. Use this type for terminal input which was special-cased before. The event function for X11-based VOs will use the same type later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24152 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a single select() for both key and slave inputuau2007-08-251-195/+117
| | | | | | | | | | | | | | | Previous code used two separate select() calls one after another, so that whenever it was running select() on one set of fds events in the other set would go unnoticed until later. Now there's a single select() which allows reacting immediately to any input source. The behavior of the new code differs somewhat from the old; for example multiple fds that stay readable are no longer handled in a round-robin fashion and the total amount the process sleeps can differ. Some tuning might be required later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24151 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make terminal input work more like VO key inputuau2007-08-251-4/+4
| | | | | | | | | | | | | | | | | The Unix version of getch2() could either return an internally buffered key or do a second-level select() in addition to the input.c one and then read more data. Change getch2() to always add all read keys with mplayer_put_key() (like video output window keyboard input does) and remove the internal select() from the Unix version. Make input.c call mplayer_get_key() directly. The primary motivation for this change is to make combining multiple event sources under one select() easier. Now getch2() only needs to be called when the corresponding fd is readable, and it will be possible to handle events from X-based VOs with the same code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24149 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused functionuau2007-08-251-18/+1