diff --git a/etc/input.conf b/etc/input.conf index 837758c987..10b3b3d019 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -62,7 +62,9 @@ #Alt+up add video-pan-y 0.1 # move the video down #Alt+down add video-pan-y -0.1 # move the video up #Alt++ add video-zoom 0.1 # zoom in +#ZOOMIN add video-zoom 0.1 # zoom in #Alt+- add video-zoom -0.1 # zoom out +#ZOOMOUT add video-zoom -0.1 # zoom out #Alt+BS set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 # reset zoom and pan settings #PGUP add chapter 1 # seek to the next chapter #PGDWN add chapter -1 # seek to the previous chapter diff --git a/input/keycodes.c b/input/keycodes.c index 3f97b4a9ad..7fb1237965 100644 --- a/input/keycodes.c +++ b/input/keycodes.c @@ -165,6 +165,10 @@ static const struct key_name key_names[] = { { MP_KEY_CHANNEL_DOWN,"CHANNEL_DOWN" }, { MP_KEY_PLAYONLY, "PLAYONLY" }, { MP_KEY_PAUSEONLY, "PAUSEONLY" }, + { MP_KEY_BACK, "BACK" }, + { MP_KEY_TOOLS, "TOOLS" }, + { MP_KEY_ZOOMIN, "ZOOMIN" }, + { MP_KEY_ZOOMOUT, "ZOOMOUT" }, // These are kept for backward compatibility { MP_KEY_PAUSE, "XF86_PAUSE" }, diff --git a/input/keycodes.h b/input/keycodes.h index 6373a6e21a..e84cc92737 100644 --- a/input/keycodes.h +++ b/input/keycodes.h @@ -82,6 +82,10 @@ #define MP_KEY_CHANNEL_DOWN (MP_KEY_MM_BASE+22) #define MP_KEY_PLAYONLY (MP_KEY_MM_BASE+23) #define MP_KEY_PAUSEONLY (MP_KEY_MM_BASE+24) +#define MP_KEY_BACK (MP_KEY_MM_BASE+25) +#define MP_KEY_TOOLS (MP_KEY_MM_BASE+26) +#define MP_KEY_ZOOMIN (MP_KEY_MM_BASE+27) +#define MP_KEY_ZOOMOUT (MP_KEY_MM_BASE+28) /* Function keys */ #define MP_KEY_F (MP_KEY_BASE+0x40) diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 983609dd83..abd18fae28 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -132,6 +132,8 @@ static const struct mp_keymap keymap[] = { {XKB_KEY_XF86HomePage, MP_KEY_HOMEPAGE}, {XKB_KEY_XF86WWW, MP_KEY_WWW}, {XKB_KEY_XF86Mail, MP_KEY_MAIL}, {XKB_KEY_XF86Favorites, MP_KEY_FAVORITES}, {XKB_KEY_XF86Search, MP_KEY_SEARCH}, {XKB_KEY_XF86Sleep, MP_KEY_SLEEP}, + {XKB_KEY_XF86Back, MP_KEY_BACK}, {XKB_KEY_XF86Tools, MP_KEY_TOOLS}, + {XKB_KEY_XF86ZoomIn, MP_KEY_ZOOMIN}, {XKB_KEY_XF86ZoomOut, MP_KEY_ZOOMOUT}, {0, 0} }; diff --git a/video/out/x11_common.c b/video/out/x11_common.c index f63e1f02cd..3eaad12470 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -753,6 +753,8 @@ static const struct mp_keymap keymap[] = { {XF86XK_HomePage, MP_KEY_HOMEPAGE}, {XF86XK_WWW, MP_KEY_WWW}, {XF86XK_Mail, MP_KEY_MAIL}, {XF86XK_Favorites, MP_KEY_FAVORITES}, {XF86XK_Search, MP_KEY_SEARCH}, {XF86XK_Sleep, MP_KEY_SLEEP}, + {XF86XK_Back, MP_KEY_BACK}, {XF86XK_Tools, MP_KEY_TOOLS}, + {XF86XK_ZoomIn, MP_KEY_ZOOMIN}, {XF86XK_ZoomOut, MP_KEY_ZOOMOUT}, {0, 0} };