# HG changeset patch # User ib # Date 1308062034 0 # Node ID e559de2975784937a9f5b8996838c43cf5e8a105 # Parent 766bdb69691189e48a77b26716859c1816aaee41 Remove unused key definitions. diff -r 766bdb696911 -r e559de297578 gui/wm/ws.c --- a/gui/wm/ws.c Tue Jun 14 14:21:49 2011 +0000 +++ b/gui/wm/ws.c Tue Jun 14 14:33:54 2011 +0000 @@ -1272,5 +1272,3 @@ XFree( wm ); } - -#include "wsmkeys.h" diff -r 766bdb696911 -r e559de297578 gui/wm/wskeys.h --- a/gui/wm/wskeys.h Tue Jun 14 14:21:49 2011 +0000 +++ b/gui/wm/wskeys.h Tue Jun 14 14:33:54 2011 +0000 @@ -19,136 +19,11 @@ #ifndef MPLAYER_GUI_WSKEYS_H #define MPLAYER_GUI_WSKEYS_H -#define wsKeyNone -1 - -#define wsosbrackets '[' -#define wscsbrackets ']' - -#define wsq 'q' -#define wsa 'a' -#define wsz 'z' -#define wsw 'w' -#define wss 's' -#define wsx 'x' -#define wse 'e' -#define wsd 'd' -#define wsr 'r' -#define wsf 'f' -#define wsv 'v' -#define wst 't' -#define wsg 'g' -#define wsb 'b' -#define wsy 'y' -#define wsh 'h' -#define wsn 'n' -#define wsu 'u' -#define wsj 'j' -#define wsm 'm' -#define wsi 'i' -#define wsk 'k' -#define wso 'o' -#define wsl 'l' -#define wsp 'p' -#define wsc 'c' - -#define wsQ 'Q' -#define wsA 'A' -#define wsZ 'Z' -#define wsW 'W' -#define wsS 'S' -#define wsX 'X' -#define wsE 'E' -#define wsD 'D' -#define wsR 'R' -#define wsF 'F' -#define wsV 'V' -#define wsT 'T' -#define wsG 'G' -#define wsB 'B' -#define wsY 'Y' -#define wsH 'H' -#define wsN 'N' -#define wsU 'U' -#define wsJ 'J' -#define wsM 'M' -#define wsI 'I' -#define wsK 'K' -#define wsO 'O' -#define wsL 'L' -#define wsP 'P' -#define wsC 'C' - -#define ws0 '0' -#define ws1 '1' -#define ws2 '2' -#define ws3 '3' -#define ws4 '4' -#define ws5 '5' -#define ws6 '6' -#define ws7 '7' -#define ws8 '8' -#define ws9 '9' - -#define wsSpace ' ' -#define wsMinus '-' -#define wsPlus '+' -#define wsMul '*' -#define wsDiv '/' -#define wsLess '<' -#define wsMore '>' - -#define wsUp 0x52 + 256 -#define wsDown 0x54 + 256 -#define wsLeft 0x51 + 256 -#define wsRight 0x53 + 256 -#define wsLeftCtrl 0xe3 + 256 -#define wsRightCtrl 0xe4 + 256 -#define wsLeftAlt 0xe9 + 256 -#define wsRightAlt 0x7e + 256 -#define wsLeftShift 0xe1 + 256 -#define wsRightShift 0xe2 + 256 #define wsEnter 0x0d + 256 -#define wsBackSpace 0x08 + 256 -#define wsCapsLock 0xe5 + 256 -#define wsTab 0x09 + 256 -#define wsF1 0xbe + 256 -#define wsF2 0xbf + 256 -#define wsF3 0xc0 + 256 -#define wsF4 0xc1 + 256 -#define wsF5 0xc2 + 256 -#define wsF6 0xc3 + 256 -#define wsF7 0xc4 + 256 -#define wsF8 0xc5 + 256 -#define wsF9 0xc6 + 256 -#define wsF10 0xc7 + 256 -#define wsF11 0xc8 + 256 -#define wsF12 0xc9 + 256 -#define wsInsert 0x63 + 256 -#define wsDelete 0xff + 256 -#define wsHome 0x50 + 256 -#define wsEnd 0x57 + 256 -#define wsPageUp 0x55 + 256 -#define wsPageDown 0x56 + 256 -#define wsNumLock 0x7f + 256 #define wsEscape 0x1b + 256 -#define wsGrayEnter 0x8d + 256 -#define wsGrayPlus 0xab + 256 -#define wsGrayMinus 0xad + 256 #define wsGrayMul 0xaa + 256 #define wsGrayDiv 0xaf + 256 -#define wsGrayInsert 0xb0 + 256 -#define wsGrayDelete 0xae + 256 -#define wsGrayEnd 0xb1 + 256 -#define wsGrayDown 0xb2 + 256 -#define wsGrayPageDown 0xb3 + 256 -#define wsGrayLeft 0xb4 + 256 -#define wsGray5 0xb5 + 256 -#define wsGrayRight 0xb6 + 256 -#define wsGrayHome 0xb7 + 256 -#define wsGrayUp 0xb8 + 256 -#define wsGrayPageUp 0xb9 + 256 - //Keys for multimedia keyboard #define wsXF86LowerVolume 0x11 + 256 @@ -168,14 +43,4 @@ #define wsXFMMVolDown 0xa6 #define wsXFMMMute 0x99 -#define wsKeyNumber 130 - -typedef struct -{ - int code; - const char * name; -} TwsKeyNames; - -extern const TwsKeyNames wsKeyNames[ wsKeyNumber ]; - #endif /* MPLAYER_GUI_WSKEYS_H */ diff -r 766bdb696911 -r e559de297578 gui/wm/wsmkeys.h --- a/gui/wm/wsmkeys.h Tue Jun 14 14:21:49 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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_GUI_WSMKEYS_H -#define MPLAYER_GUI_WSMKEYS_H - -#include "wskeys.h" - -const TwsKeyNames wsKeyNames[ wsKeyNumber ] = - { - { wsq, "q" }, { wsa, "a" }, { wsz, "z" }, { wsw, "w" }, { wss, "s" }, { wsx, "x" }, - { wse, "e" }, { wsd, "d" }, { wsr, "r" }, { wsf, "f" }, { wsv, "v" }, { wst, "t" }, - { wsg, "g" }, { wsb, "b" }, { wsy, "y" }, { wsh, "h" }, { wsn, "n" }, { wsu, "u" }, - { wsj, "j" }, { wsm, "m" }, { wsi, "i" }, { wsk, "k" }, { wso, "o" }, { wsl, "l" }, - { wsp, "p" }, { wsc, "c" }, - - { wsQ, "Q" }, { wsA, "A" }, { wsZ, "Z" }, { wsW, "W" }, { wsS, "S" }, { wsX, "X" }, - { wsE, "E" }, { wsD, "D" }, { wsR, "R" }, { wsF, "F" }, { wsV, "V" }, { wsT, "T" }, - { wsG, "G" }, { wsB, "B" }, { wsY, "Y" }, { wsH, "H" }, { wsN, "N" }, { wsU, "U" }, - { wsJ, "J" }, { wsM, "M" }, { wsI, "I" }, { wsK, "K" }, { wsO, "O" }, { wsL, "L" }, - { wsP, "P" }, { wsC, "C" }, - - { wsUp, "Up" }, { wsDown, "Down" }, { wsLeft, "Left" }, - { wsRight, "Right" }, { wsPageUp, "PageUp" }, { wsPageDown, "PageDown" }, - - { wsLeftCtrl, "LeftCtrl" }, { wsRightCtrl, "RightCtrl" }, { wsLeftAlt, "LeftAlt" }, - { wsRightAlt, "RightAlt" }, { wsLeftShift, "LeftShift" }, { wsRightShift, "RightShift" }, - - - { wsBackSpace, "BackSpace" }, - { wsCapsLock, "CapsLock" }, - { wsNumLock, "NumLock" }, - - { wsF1, "F1" }, { wsF2, "F2" }, { wsF3, "F3" }, { wsF4, "F4" }, { wsF5, "F5" }, - { wsF6, "F6" }, { wsF7, "F7" }, { wsF8, "F8" }, { wsF9, "F9" }, { wsF10, "F10" }, - { wsF11, "F11" }, { wsF12, "F12" }, - - { wsEnter, "Enter" }, { wsTab, "Tab" }, { wsSpace, "Space" }, - { wsInsert, "Insert" }, { wsDelete, "Delete" }, { wsHome, "Home" }, - { wsEnd, "End" }, { wsEscape, "Escape" }, - - { wsosbrackets, "[" }, { wscsbrackets, "]" }, - { wsMore, "<" }, { wsLess, ">" }, - { wsMinus, "-" }, { wsPlus, "+" }, - { wsMul, "*" }, { wsDiv, "/" }, - - { ws0, "0" }, { ws1, "1" }, { ws2, "2" }, { ws3, "3" }, { ws4, "4" }, - { ws5, "5" }, { ws6, "6" }, { ws7, "7" }, { ws8, "8" }, { ws9, "9" }, - - { wsGrayEnter, "GrayEnter" }, { wsGrayPlus, "GrayPlus" }, - { wsGrayMinus, "GrayMinus" }, { wsGrayMul, "GrayMul" }, - { wsGrayDiv, "GrayDiv" }, { wsGrayInsert, "GrayInsert" }, - { wsGrayDelete, "GrayDelete" }, { wsGrayEnd, "GrayEnd" }, - { wsGrayDown, "GrayDown" }, { wsGrayPageDown, "GrayPageDown" }, - { wsGrayLeft, "GrayLeft" }, { wsGray5, "Gray5" }, - { wsGrayRight, "GrayRight" }, { wsGrayHome, "GrayHome" }, - { wsGrayUp, "GrayUp" }, { wsGrayPageUp, "GrayPageUp" }, - - { wsXF86LowerVolume, "XF86LowerVolume" }, - { wsXF86RaiseVolume, "XF86RaiseVolume" }, - { wsXF86Mute, "XF86Mute" }, - { wsXF86Play, "XF86Play" }, - { wsXF86Stop, "XF86Stop" }, - { wsXF86Prev, "XF86Prev" }, - { wsXF86Next, "XF86Next" }, - { wsXF86Media, "XF86Media" }, - - { wsKeyNone, "None" } - }; - -#endif /* MPLAYER_GUI_WSMKEYS_H */