summaryrefslogtreecommitdiffstats
path: root/etc/input.conf
Commit message (Collapse)AuthorAgeFilesLines
* input: minor additions to default key bindingswm42018-03-041-7/+23
| | | | | | | | | This adds key bindings for some semi-popular features. It also tries to cleanup some old bindings. For example w/e for panscan is now changed to w/W. In all cases, the old bindings are still kept and work, though. Part of an ongoing attempt to cleanup the default key bindings. See #973 for some context.
* input: add a keybinding to toggle hardware decodingwm42018-02-131-0/+1
| | | | | We sure as hell won't enable hardware decoding by default, but we can make it more accessible with a key binding.
* input.conf: use exact value for [ bindingwm42018-01-301-1/+1
| | | | | | This is supposed to undo the ] binding. This uses a value closer to the inverse. (Although it's not fully exact since the values are still stored as floating point instead as fractions.)
* osc: make cycling visibility an input.conf key bindingwm42017-11-031-0/+1
| | | | | As builtin script, it should not register global key bindings, and add them to input.conf instead. This is similar to what stats.lua does.
* input.conf: explicit bindings for stats overlayJulian2017-10-131-0/+2
|
* input: merge mouse wheel and axis keycodesJames Ross-Gowan2017-09-031-8/+4
| | | | | | | | | | | | | | | | | | | | | | Mouse wheel bindings have always been a cause of user confusion. Previously, on Wayland and macOS, precise touchpads would generate AXIS keycodes and notched mouse wheels would generate mouse button keycodes. On Windows, both types of device would generate AXIS keycodes and on X11, both types of device would generate mouse button keycodes. This made it pretty difficult for users to modify their mouse-wheel bindings, since it differed between platforms and in some cases, between devices. To make it more confusing, the keycodes used on Windows were changed in 18a45a42d524 without a deprecation period or adequate communication to users. This change aims to make mouse wheel binds less confusing. Both the mouse button and AXIS keycodes are now deprecated aliases of the new WHEEL keycodes. This will technically break input configs on Wayland and macOS that assign different commands to precise and non-precise scroll events, but this is probably uncommon (if anyone does it at all) and I think it's a fair tradeoff for finally fixing mouse wheel-related confusion on other platforms.
* input: use mnemonic names for mouse buttonsJames Ross-Gowan2017-09-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mpv's mouse button numbering is based on X11 button numbering, which allows for an arbitrary number of buttons and includes mouse wheel input as buttons 3-6. This button numbering was used throughout the codebase and exposed in input.conf, and it was difficult to remember which physical button each number actually referred to and which referred to the scroll wheel. In practice, PC mice only have between two and five buttons and one or two scroll wheel axes, which are more or less in the same location and have more or less the same function. This allows us to use names to refer to the buttons instead of numbers, which makes input.conf syntax a lot easier to remember. It also makes the syntax robust to changes in mpv's underlying numbering. The old MOUSE_BTNx names are still understood as deprecated aliases of the named buttons. This changes both the input.conf syntax and the MP_MOUSE_BTNx symbols in the codebase, since I think both would benefit from using names over numbers, especially since some platforms don't use X11 button numbering and handle different mouse buttons in different windowing system events. This also makes the names shorter, since otherwise they would be pretty long, and it removes the high-numbered MOUSE_BTNx_DBL names, since they weren't used. Names are the same as used in Qt: https://doc.qt.io/qt-5/qt.html#MouseButton-enum
* input.conf: drop TV/DVB bindingswm42017-06-271-8/+0
| | | | Is anyone still using them? Well, I'm removing them anyway.
* input: change license to LGPLwm42017-06-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cehoyos adds the step_property command in 7a71da01d, and it could be argued that copyright of this still applies to the later add/cycle commands (a668ae0ff90c4). While I'm not sure if this is really the case, stay conservative for now and mark these commands as GPL-only. Mark the command.c code too, although that is not being relicensed yet. I'm leaving the MP_CMD_* enum items, as they are obviously different. In commit 116ca0c7682, "veal" (essentially an anonymous author) adds an "osd_show_property_text" command (well, the commit message says "based on" that person's code, so it's not clear how much is from him or from albeu, who agreed to LGPL). This was later merged again with the "osd_show_text" command, and then all original code was removed in commit 58cc0f637f, so I claim that no copyright applies anymore. (Though technically the input.conf addition still might be copyrighted, so I'm just dropping it to get rid of the thought.) "kiriuja" added 2f376d1b39 (sub_load etc.) and be54f4813 (switch_audio). The latter is gone. I would argue that the former is fully rewritten with commits b7052b431c9 and 0f155921b0. But like in the step_property case, I will be overly conservative for now, and mark them as GPL-only, as this is potentially shaky and should be thought through first. (Not bothering with the command define/enum in the header, as it will be unused in LGPL mode anyway.) keycodes.c/h can be GPL, except for commit 2b1f95dcc2f8, which is a patch by someone who wasn't asked yet. Before doing something radical, I will wait for a reply.
* options: fix some missing --sub-ass-style-override renameswm42017-06-071-1/+1
| | | | | The option was renamed not to include "-style", but not all uses were updated.
* player: make screenshot commands honor the async flagwm42017-04-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | And also change input.conf to make all screenshots async. (Except the every-frame mode, which always uses synchronous mode and ignores the flag.) By default, the "screenshot" command is still asynchronous, because scripts etc. might depend on this behavior. This is only partially async. The code for determining the filename is still always run synchronously. Only encoding the screenshot and writing it to disk is asynchronous. We explicitly document the exact behavior as undefined, so it can be changed any time. Some of this is a bit messy, because I wanted to avoid duplicating the message display code between sync and async mode. In async mode, this is called from a worker thread, which is not safe because showing a message accesses the thread-unsafe OSD code. So the core has to be locked during this, which implies accessing the core and all that. So the code has weird locking calls, and we need to do core destruction in a more "controlled" manner (thus the outstanding_async field). (What I'd really want would be the OSD simply showing log messages instead.) This is pretty untested, so expect bugs. Fixes #4250.
* input.conf: change "L" to change loop-file by defaultwm42017-01-311-1/+1
|
* player: fix previous commitwm42016-10-031-2/+2
| | | | ...
* Use - as command-name separator everywhereTimotej Lazar2016-07-141-1/+1
| | | | | | | Old-style commands using _ as separator (e.g. show_progress) were still used in some places, including documentation and configuration files. This commit updates all such instances to the new style (show-progress) so that commands are easier to find in the manual.
* command: if only ab-loop-b is set, loop from start of filewm42016-04-211-1/+1
| | | | | | | | | | Commit 382bafcb changed the behavior for ab-loop-a. This commit changes ab-loop-b so that the behavior is symmetric. Adjust the OSD rendering accordingly to the two changes. Also fix mentions of the "ab_loop" command to the now preferred "ab-loop".
* player: implement SWITCH for dvb-channel-name property, add binding.Oliver Freyermuth2016-01-141-0/+4
| | | | | | | | The binding is similar to the tv-binding, just with capital letters. Switching the dvb-channel-name property compared to dvb-channel means the channel-name is shown on-screen when switching instead of "dvb-channel (error)" otherwise, and switching anyways happens without changing the card.
* input.conf: remove a redundant and a broken examplewm42015-12-221-2/+0
| | | | | | | window-scale is now mapped to Alt+0 etc. by default (although these bindings just use "set", not "cycle-values"). colormatrix can't be cycled anymore (would require using vf_format).
* input.conf: erase `audio-delay` from `Not assigned by default`openingnow2015-12-221-2/+0
| | | | | | | `ctrl+ +`is assigned as `add audio-delay` by default. Tested by running `mpv --input-test --force-window --idle` Signed-off-by: wm4 <wm4@nowhere>
* input.conf: add default bindings for changing window scalewm42015-11-171-0/+3
| | | | | | These are very much inspired by the hardcoded Cocoa bindings on OSX. Fixes #2500.
* input.conf: remap d/D keyswm42015-08-041-2/+1
| | | | | | | | | | Drop d for toggling framedrop. Toggling this is way too special to be at such a prominent place, and in fact I believe toggling it is pointless. Remap deinterlacing from D to d. It's relatively useful and non- destructive. As suggested in #973 (almost).
* player: remove higher-level remains of DVD/BD menu supportwm42015-08-031-14/+0
| | | | | | | | | | | | | | | Nobody wanted to restore this, so it gets the boot. If anyone still wants to volunteer to restore menu support, this would be welcome. (I might even try it myself if I feel masochistic and like wasting a lot of time for nothing.) But if it does get restored, it should be done differently. There were many stupid things about how it was done. For example, it somehow tried to pull mp_nav_events through all the layers (including needing to "buffer" them in the demuxer), which was needlessly complicated. It could be done simpler. This code was already inactive, so this commit actually changes nothing. Also keep in mind that normal DVD/BD playback still works.
* player: use exit code 0 by default for quit, 4 for signals, etc.Philip Sequeira2015-07-111-4/+4
| | | | | | Default key bindings in encoding mode also use code 4, because scripts will probably want to fail if encoding is aborted (leaving an incomplete file).
* input.conf: invert mouse volume controlMartin Herkt2015-06-301-2/+2
| | | | Scrolling right should increase volume, not decrease it.
* inpout.conf: make shift+o toggle between 2 states onlywm42015-06-031-1/+1
| | | | | | | | | | | | | The "osd" command cycles between 4 states (OSD level 0-3), which is probably confusing and inconvenient. OSD levels 0 and 2 are rarely needed. I would claim there is normally not much of a need to completely disable OSD by setting level 0 during playback. Level 2 is just slightly less information than level 3, and I'm not sure why it exists at all. Change it so that it toggles between level 3 and 1. Note that this ignores the default OSD level. If the default is 3, the first use of this key will set it to 3 again. Just assume 1 is the default. If someone complains, this could be improved.
* input: allow - as separator between commands, instead of _wm42015-05-251-21/+21
| | | | | | | | | | Wnile it seems quite logical to me that commands use _ as word separator, while properties use -, I can't really explain the difference, and it tends to confuse users as well. So always prefer - as separator for everything. Using _ still works, and will probably forever. Not doing so would probably create too much chaos and confusion.
* input.conf: add CTRL+s key binding for window screenshotswm42015-05-171-0/+1
|
* input.conf: map L to toggle infinite loopingwm42015-04-271-0/+1
|
* input.conf: unmap menu keywm42015-04-141-1/+0
| | | | | | This was mapped to a broken command, so it did nothing but printing an error message. The intended binding (cycling OSD level) doesn't seem to useful either, so just drop it.
* input: remove Linux joystick supportwm42015-03-241-14/+0
| | | | | | | | | | | Why did this exist in the first place? Other than being completely useless, this even caused some regressions in the past. For example, there was the case of a laptop exposing its accelerometer as joystick device, which led to extremely fun things due to the default mappings of axis movement being mapped to seeking. I suppose those who really want to use their joystick to control a media player (???) can configure it as mouse device or so.
* input.conf: add key binding to override ASS subtitle styleswm42015-03-081-0/+3
|
* input: use flag option type for some input commandswm42015-03-041-5/+5
| | | | | | | | | | This gets rid of the need for a second (or more) parameters; instead it can be all in one parameter. The (now) redundant parameter is still parsed for compatibility, though. The way the flags make each other conflict is a bit tricky: they have overlapping bits, and the option parser disallows setting already set bits.
* etc/input.conf: remove a leftoverwm42015-02-161-2/+0
| | | | This is already mapped by default.
* input.conf: bind 'A' to cycling aspect ratioswm42015-01-261-0/+2
| | | | | | | | | | Apparently broken files are popular enough that this is still needed. It's relatively often asked on the IRC channel, and I also found it on the archwiki mpv page. The list of aspect ratios is taken from the archwiki page, with "16:10" removed (because I doubt there are actually files with this aspect ratio).
* input.conf: add example for aspect ratio cyclingwm42014-12-081-0/+2
| | | | | This is requested oftem, but I don't know if it should be an actual default binding.
* input.conf: add some additional bindingswm42014-11-191-0/+4
|
* input.conf: Don't make ENTER exit the playerChrisK22014-11-151-1/+1
| | | | Apparently this is confusing.
* options: remove --volstepwm42014-09-211-12/+12
| | | | | | | It's just confusing; users are encouraged to edit input.conf instead (changing the argument to the "add" command). Update input.conf to keep the old behavior.
* input.conf: map ESC to exiting fullscreenwm42014-09-151-1/+1
| | | | | | | | | | Apparently making ESC exit fullscreen mode is the more popular convention compared to ESC quitting the program. It was also concluded that ESC should do nothing when the windows is already in normal state. See discussion in #973.
* command: remove broken quvi-format propertywm42014-09-011-2/+0
| | | | Never really worked, and libquvi is probably a lost cause anyway.
* input.conf: bind ctrl+cwm42014-08-221-0/+1
| | | | | Just like I can terminate it on the terminal with this key combination, I want to be able to do the same on the X window.
* input.conf: add some bindings for changing audio-delaywm42014-08-111-0/+2
| | | | | | Requested on: https://github.com/mpv-player/mpv/commit/90ec3334174e80c16f00971886223a3afabc1aca#commitcomment-7331673 Might remove or remap them again later.
* input.conf: make explanatory text more readablewm42014-08-111-30/+15
| | | | | Or at leats this is the intention. It's a bit hard to tell which information is needed, and which not.
* input.conf: change LEFT/RIGHT keys to seek 5s instead of 10swm42014-08-111-2/+2
|
* input.conf: map shift+pgup/dwn to the old seek bindingswm42014-08-091-2/+4
|
* input.conf: switch chapter seek next/previous keyswm42014-08-081-2/+2
| | | | | | "UP" seeks forward, so "PGUP" should skip to the next chapter. Fixes #998.
* input.conf: unmap some more obscure bindingswm42014-08-081-12/+11
| | | | | | | | | | Changing audio-delay is probably not needed. Changing balance "works", but not as expected (sets up a pan matrix to change left/right contributions to each other, rather than changing the relative volumes of each channel). I expect that the rest are not in use by anyone.
* input.conf: remap pgup/dwn to chapter seekswm42014-08-071-4/+8
| | | | | | As discussed in #973. Keep the old bindings for now; there's no reason to unmap them yet.
* input.conf: remap 2 keyswm42014-08-031-3/+4
| | | | | | | | | | Nobody uses 'c' (except accidentally) - remove. Everyone agrees that OSD level cycling on 'o' is dumb, so map it to show_progress instead. Cycling the OSD level is now available on 'O'. No reason to ummap 'P' yet. Also see issue #973.
* manpage: update config file locationswm42014-06-281-3/+3
| | | | Also add some explanations how the config paths are determined.
* input: readd some TV default key bindingswm42014-06-251-0/+4
| | | | Requested by a user. Closes #878.
* DOCS: remove en/ sub-directorywm42014-06-201-1/+1
| | | | | This additional sub-directory doesn't serve any purpose anymore. Get rid of it.
* input.conf: make ESC quit when encodingwm42014-06-131-0/+1
|
* command: redo ancient TV/DVB/PVR commandswm42014-06-111-6/+0
| | | | | | | | | | | | | | | | | | Convert all these commands to properties. (Except tv_last_channel, not sure what to do with this.) Also, internally, don't access stream details directly, but dispatch commands with stream ctrls. Many of the new properties are a bit strange, because they're write- only. Also remove some OSD output these commands produced, because I couldn't be bothered to port these. In general, this makes everything much cleaner, and will also make it easier to e.g. move the demuxer to its own thread. Don't bother updating input.conf, but changes.rst documents how old commands map to the new ones. Mostly untested, due to lack of hardware.
* etc/input.conf: add example how to change window size by key bindingwm42014-05-181-0/+1
| | | | Also drop a vague hint how to do it in the manpage.
* input: close window when window close button is pressed with --input-testwm42014-04-181-2/+2
| | | | | | | | | | | The window close button is usually mapped to the CLOSE_WIN pseudo-key. Until now, --input-test treated this pseudo-key like any other key (like the rest of the input handling code), so you couldn't close the window in this mode. The manpage had silly instructions and warnings how to deal with this. Just always quit when CLOSE_WIN is received, and improve the instructions.
* player: rename dvdnav to discnavxylosper2014-03-301-12/+12
| | | | | Now, navigation works both of DVD and non-BD-J Blu-ray. Therefore, rename all 'dvdnav' strings which are not DVD specific to 'discnav'
* input: allow input.conf bindings to be declared as builtinwm42014-02-251-0/+3
| | | | | | This might be helpful if we ever want cascading config files. Also, we will probably need it if we change the default input.conf bindings, and want to provide compatibility input.conf files.
* dvdnav: support mouse interactionwm42013-12-131-1/+2
|
* Add prelimimary (basic, possibly broken) dvdnav supportwm42013-12-121-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This readds a more or less completely new dvdnav implementation, though it's based on the code from before commit 41fbcee. Note that this is rather basic, and might be broken or not quite usable in many cases. Most importantly, navigation highlights are not correctly implemented. This would require changes in the FFmpeg dvdsub decoder (to apply a different internal CLUT), so supporting it is not really possible right now. And in fact, I don't think I ever want to support it, because it's a very small gain for a lot of work. Instead, mpv will display fake highlights, which are an approximate bounding box around the real highlights. Some things like mouse input or switching audio/subtitles stream using the dvdnav VM are not supported. Might be quite fragile on transitions: if dvdnav initiates a transition, and doesn't give us enough mpeg data to initialize video playback, the player will just quit. This is added only because some users seem to want it. I don't intend to make mpv a good DVD player, so the very basic minimum will have to do. How about you just convert your DVD to proper video files?
* input.conf: fix typowm42013-11-221-1/+1
|
* input.conf: clarify the magic how default key bindings are addedwm42013-11-061-3/+7
| | | | This is a confusing mechanism, so the explanation should bit more clear.
* command: replace speed_mult with multiply commandwm42013-10-311-4/+4
| | | | The compatibility layer still takes car