diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-20 19:17:43 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-20 19:17:43 +0200 |
| commit | 0afb326035e66663a90c4609f21560ce772e9718 (patch) | |
| tree | 07f443e2bd39745ac7430cff9534529958be9c53 /osdep | |
| parent | 4a26b4c024498c9b1be4723121d86e0c2b386ed2 (diff) | |
| parent | 5bb2f9787f557bd91d5eb9021238ed7b131d5fa9 (diff) | |
| download | mpv-0afb326035e66663a90c4609f21560ce772e9718.tar.bz2 mpv-0afb326035e66663a90c4609f21560ce772e9718.tar.xz | |
Merge branch 'hr-seek'
* hr-seek:
input: add default keybindings Shift+[arrow] for small exact seeks
input: support bindings with modifier keys for X input
core: audio: make ogg missing audio timing workaround more complex
core: add support for precise non-keyframe-limited seeks
core: add struct for queued seek info
commands: add generic option -> property wrapper
options: add "choice" option type, use for -pts-association-mode
core: remove looping in update_video(), modify command handling a bit
core: seek: use accurate seek mode with audio-only files
core: avoid using sh_video->pts as "current pts"
libvo: register X11 connection fd in input event system
core: timing: add special handling of long frame intervals
core: move central play loop to a separate function
Conflicts:
DOCS/tech/slave.txt
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/keycodes.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/osdep/keycodes.h b/osdep/keycodes.h index 4d153a24aa..d197c8e3e9 100644 --- a/osdep/keycodes.h +++ b/osdep/keycodes.h @@ -94,4 +94,10 @@ #define KEY_INTERN (0x1000) #define KEY_CLOSE_WIN (KEY_INTERN+0) +/* Modifiers added to individual keys */ +#define KEY_MODIFIER_SHIFT 0x2000 +#define KEY_MODIFIER_CTRL 0x4000 +#define KEY_MODIFIER_ALT 0x8000 +#define KEY_MODIFIER_META 0x10000 + #endif /* MPLAYER_KEYCODES_H */ |