mirror of
https://github.com/mpv-player/mpv
synced 2025-04-01 14:50:07 +00:00
x11: remove wskeys.h
Use the <X11/keysym.h> xlib header instead. I'm not sure why mplayer defined these constants itself.
This commit is contained in:
wm4
Uoti Urpala
parent
f561c19fe1
commit
adf100cd49
@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of MPlayer.
|
|
||||||
*
|
|
||||||
* MPlayer is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* MPlayer is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MPLAYER_WSKEYS_H
|
|
||||||
#define MPLAYER_WSKEYS_H
|
|
||||||
|
|
||||||
#define wsPause 0xff13
|
|
||||||
#define wsUp 0xff52
|
|
||||||
#define wsDown 0xff54
|
|
||||||
#define wsLeft 0xff51
|
|
||||||
#define wsRight 0xff53
|
|
||||||
#define wsLeftCtrl 0xffe3
|
|
||||||
#define wsRightCtrl 0xffe4
|
|
||||||
#define wsLeftAlt 0xffe9
|
|
||||||
#define wsRightAlt 0xff7e
|
|
||||||
#define wsLeftShift 0xffe1
|
|
||||||
#define wsRightShift 0xffe2
|
|
||||||
#define wsEnter 0xff0d
|
|
||||||
#define wsBackSpace 0xff08
|
|
||||||
#define wsCapsLock 0xffe5
|
|
||||||
#define wsTab 0xff09
|
|
||||||
#define wsF1 0xffbe
|
|
||||||
#define wsF2 0xffbf
|
|
||||||
#define wsF3 0xffc0
|
|
||||||
#define wsF4 0xffc1
|
|
||||||
#define wsF5 0xffc2
|
|
||||||
#define wsF6 0xffc3
|
|
||||||
#define wsF7 0xffc4
|
|
||||||
#define wsF8 0xffc5
|
|
||||||
#define wsF9 0xffc6
|
|
||||||
#define wsF10 0xffc7
|
|
||||||
#define wsF11 0xffc8
|
|
||||||
#define wsF12 0xffc9
|
|
||||||
#define wsInsert 0xff63
|
|
||||||
#define wsDelete 0xffff
|
|
||||||
#define wsHome 0xff50
|
|
||||||
#define wsEnd 0xff57
|
|
||||||
#define wsPageUp 0xff55
|
|
||||||
#define wsPageDown 0xff56
|
|
||||||
#define wsNumLock 0xff7f
|
|
||||||
#define wsEscape 0xff1b
|
|
||||||
#define wsGrayEnter 0xff8d
|
|
||||||
#define wsGrayPlus 0xffab
|
|
||||||
#define wsGraySeparator 0xffac
|
|
||||||
#define wsGrayMinus 0xffad
|
|
||||||
#define wsGrayMul 0xffaa
|
|
||||||
#define wsGrayDiv 0xffaf
|
|
||||||
#define wsGrayDecimal 0xffae
|
|
||||||
#define wsGray0 0xffb0
|
|
||||||
#define wsGray1 0xffb1
|
|
||||||
#define wsGray2 0xffb2
|
|
||||||
#define wsGray3 0xffb3
|
|
||||||
#define wsGray4 0xffb4
|
|
||||||
#define wsGray5 0xffb5
|
|
||||||
#define wsGray6 0xffb6
|
|
||||||
#define wsGray7 0xffb7
|
|
||||||
#define wsGray8 0xffb8
|
|
||||||
#define wsGray9 0xffb9
|
|
||||||
#define wsGrayHome 0xff95
|
|
||||||
#define wsGrayLeft 0xff96
|
|
||||||
#define wsGrayUp 0xff97
|
|
||||||
#define wsGrayRight 0xff98
|
|
||||||
#define wsGrayDown 0xff99
|
|
||||||
#define wsGrayPgUp 0xff9a
|
|
||||||
#define wsGrayPgDn 0xff9b
|
|
||||||
#define wsGrayEnd 0xff9c
|
|
||||||
#define wsGray5Dup 0xff9d
|
|
||||||
#define wsGrayInsert 0xff9e
|
|
||||||
#define wsGrayDelete 0xff9f
|
|
||||||
|
|
||||||
#endif /* MPLAYER_WSKEYS_H */
|
|
||||||
@ -46,6 +46,7 @@
|
|||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
|
||||||
#ifdef CONFIG_XSS
|
#ifdef CONFIG_XSS
|
||||||
#include <X11/extensions/scrnsaver.h>
|
#include <X11/extensions/scrnsaver.h>
|
||||||
@ -536,42 +537,40 @@ void vo_uninit(struct vo_x11_state *x11)
|
|||||||
talloc_free(x11);
|
talloc_free(x11);
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "wskeys.h"
|
|
||||||
|
|
||||||
static const struct mp_keymap keymap[] = {
|
static const struct mp_keymap keymap[] = {
|
||||||
// special keys
|
// special keys
|
||||||
{wsPause, KEY_PAUSE}, {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS},
|
{XK_Pause, KEY_PAUSE}, {XK_Escape, KEY_ESC}, {XK_BackSpace, KEY_BS},
|
||||||
{wsTab, KEY_TAB}, {wsEnter, KEY_ENTER},
|
{XK_Tab, KEY_TAB}, {XK_Return, KEY_ENTER},
|
||||||
{XK_Menu, KEY_MENU}, {XK_Print, KEY_PRINT},
|
{XK_Menu, KEY_MENU}, {XK_Print, KEY_PRINT},
|
||||||
|
|
||||||
// cursor keys
|
// cursor keys
|
||||||
{wsLeft, KEY_LEFT}, {wsRight, KEY_RIGHT}, {wsUp, KEY_UP}, {wsDown, KEY_DOWN},
|
{XK_Left, KEY_LEFT}, {XK_Right, KEY_RIGHT}, {XK_Up, KEY_UP}, {XK_Down, KEY_DOWN},
|
||||||
|
|
||||||
// navigation block
|
// navigation block
|
||||||
{wsInsert, KEY_INSERT}, {wsDelete, KEY_DELETE}, {wsHome, KEY_HOME}, {wsEnd, KEY_END},
|
{XK_Insert, KEY_INSERT}, {XK_Delete, KEY_DELETE}, {XK_Home, KEY_HOME}, {XK_End, KEY_END},
|
||||||
{wsPageUp, KEY_PAGE_UP}, {wsPageDown, KEY_PAGE_DOWN},
|
{XK_Page_Up, KEY_PAGE_UP}, {XK_Page_Down, KEY_PAGE_DOWN},
|
||||||
|
|
||||||
// F-keys
|
// F-keys
|
||||||
{wsF1, KEY_F+1}, {wsF2, KEY_F+2}, {wsF3, KEY_F+3}, {wsF4, KEY_F+4},
|
{XK_F1, KEY_F+1}, {XK_F2, KEY_F+2}, {XK_F3, KEY_F+3}, {XK_F4, KEY_F+4},
|
||||||
{wsF5, KEY_F+5}, {wsF6, KEY_F+6}, {wsF7, KEY_F+7}, {wsF8, KEY_F+8},
|
{XK_F5, KEY_F+5}, {XK_F6, KEY_F+6}, {XK_F7, KEY_F+7}, {XK_F8, KEY_F+8},
|
||||||
{wsF9, KEY_F+9}, {wsF10, KEY_F+10}, {wsF11, KEY_F+11}, {wsF12, KEY_F+12},
|
{XK_F9, KEY_F+9}, {XK_F10, KEY_F+10}, {XK_F11, KEY_F+11}, {XK_F12, KEY_F+12},
|
||||||
|
|
||||||
// numpad independent of numlock
|
// numpad independent of numlock
|
||||||
{wsGrayMinus, '-'}, {wsGrayPlus, '+'}, {wsGrayMul, '*'}, {wsGrayDiv, '/'},
|
{XK_KP_Subtract, '-'}, {XK_KP_Add, '+'}, {XK_KP_Multiply, '*'}, {XK_KP_Divide, '/'},
|
||||||
{wsGrayEnter, KEY_KPENTER},
|
{XK_KP_Enter, KEY_KPENTER},
|
||||||
|
|
||||||
// numpad with numlock
|
// numpad with numlock
|
||||||
{wsGray0, KEY_KP0}, {wsGray1, KEY_KP1}, {wsGray2, KEY_KP2},
|
{XK_KP_0, KEY_KP0}, {XK_KP_1, KEY_KP1}, {XK_KP_2, KEY_KP2},
|
||||||
{wsGray3, KEY_KP3}, {wsGray4, KEY_KP4}, {wsGray5, KEY_KP5},
|
{XK_KP_3, KEY_KP3}, {XK_KP_4, KEY_KP4}, {XK_KP_5, KEY_KP5},
|
||||||
{wsGray6, KEY_KP6}, {wsGray7, KEY_KP7}, {wsGray8, KEY_KP8},
|
{XK_KP_6, KEY_KP6}, {XK_KP_7, KEY_KP7}, {XK_KP_8, KEY_KP8},
|
||||||
{wsGray9, KEY_KP9}, {wsGrayDecimal, KEY_KPDEC},
|
{XK_KP_9, KEY_KP9}, {XK_KP_Decimal, KEY_KPDEC},
|
||||||
{wsGraySeparator, KEY_KPDEC},
|
{XK_KP_Separator, KEY_KPDEC},
|
||||||
|
|
||||||
// numpad without numlock
|
// numpad without numlock
|
||||||
{wsGrayInsert, KEY_KPINS}, {wsGrayEnd, KEY_KP1}, {wsGrayDown, KEY_KP2},
|
{XK_KP_Insert, KEY_KPINS}, {XK_KP_End, KEY_KP1}, {XK_KP_Down, KEY_KP2},
|
||||||
{wsGrayPgDn, KEY_KP3}, {wsGrayLeft, KEY_KP4}, {wsGray5Dup, KEY_KP5},
|
{XK_KP_Page_Down, KEY_KP3}, {XK_KP_Left, KEY_KP4}, {XK_KP_Begin, KEY_KP5},
|
||||||
{wsGrayRight, KEY_KP6}, {wsGrayHome, KEY_KP7}, {wsGrayUp, KEY_KP8},
|
{XK_KP_Right, KEY_KP6}, {XK_KP_Home, KEY_KP7}, {XK_KP_Up, KEY_KP8},
|
||||||
{wsGrayPgUp, KEY_KP9}, {wsGrayDelete, KEY_KPDEL},
|
{XK_KP_Page_Up, KEY_KP9}, {XK_KP_Delete, KEY_KPDEL},
|
||||||
|
|
||||||
#ifdef XF86XK_AudioPause
|
#ifdef XF86XK_AudioPause
|
||||||
{XF86XK_MenuKB, KEY_MENU},
|
{XF86XK_MenuKB, KEY_MENU},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user