annotate input/input.c @ 6078:4a9c7041141d

cleanups, removed swscaler, osd support - by Joey Parrish <joey@yunamusic.com>
author arpi
date Mon, 13 May 2002 20:47:03 +0000
parents 8346974080fe
children 69b3c25728fb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1 #include "../config.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
2
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
3 #ifdef HAVE_NEW_INPUT
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
4
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
5 #include <stdlib.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
6 #include <string.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
7 #include <stdio.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
8 #include <unistd.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
9 #include <errno.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
10 #include <signal.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
11 #include <sys/types.h>
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
12 #include <sys/time.h>
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
13 #include <fcntl.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
14
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
15 #include "input.h"
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
16 #include "mouse.h"
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
17 #ifdef MP_DEBUG
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
18 #include <assert.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
19 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
20 #include "../linux/getch2.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
21 #include "../linux/keycodes.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
22 #include "../linux/timer.h"
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
23 #include "../cfgparser.h"
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
24
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
25 #include "joystick.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
26
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
27 #ifdef HAVE_LIRC
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
28 #include "lirc.h"
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
29 #endif
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
30
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
31 /// This array defines all know commands.
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
32 /// The first field is an id used to recognize the command without too many strcmp
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
33 /// The second is abviously the command name
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
34 /// The third is the minimum number of argument this command need
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
35 /// Then come the definition of each argument, terminated with and arg of type -1
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
36 /// A command can take maximum MP_CMD_MAX_ARGS-1 arguments (-1 because of
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
37 /// the terminal one) wich is actually 9
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
38
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
39 /// For the args, the first field is the type (actually int, float or string), the second
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
40 /// is the default value wich is used for optional arguments
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
41
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
42 static mp_cmd_t mp_cmds[] = {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
43 { MP_CMD_SEEK, "seek", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
44 { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
45 { MP_CMD_QUIT, "quit", 0, { {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
46 { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
5053
146513806b2f lexical fixes (COSMETIC :)) and one 'real fix': grap_frames -> grab_frames -- feel free to flame and reverse
alex
parents: 5046
diff changeset
47 { MP_CMD_GRAB_FRAMES, "grab_frames",0, { {-1,{0}} } },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
48 { MP_CMD_PLAY_TREE_STEP, "pt_step",1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
49 { MP_CMD_PLAY_TREE_UP_STEP, "pt_up_step",1, { { MP_CMD_ARG_INT,{0} }, { MP_CMD_ARG_INT ,{0}}, {-1,{0}} } },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
50 { MP_CMD_PLAY_ALT_SRC_STEP, "alt_src_step",1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
51 { MP_CMD_SUB_DELAY, "sub_delay",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
52 { MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
53 { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
54 { MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
55 { MP_CMD_CONTRAST, "contrast",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
56 { MP_CMD_BRIGHTNESS, "brightness",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
57 { MP_CMD_HUE, "hue",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
58 { MP_CMD_SATURATION, "saturation",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
59 { MP_CMD_FRAMEDROPPING, "frame_drop",0, { { MP_CMD_ARG_INT,{-1} }, {-1,{0}} } },
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4956
diff changeset
60 { MP_CMD_SUB_POS, "sub_pos", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
61 #ifdef USE_TV
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
62 { MP_CMD_TV_STEP_CHANNEL, "tv_step_channel", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }},
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
63 { MP_CMD_TV_STEP_NORM, "tv_step_norm",0, { {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
64 { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", 0, { {-1,{0}} } },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
65 #endif
4732
876f0ea71526 vo_fullscreen added
alex
parents: 4657
diff changeset
66 { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {-1,{0}} } },
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
67
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
68 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
69 { MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
70 { MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
71 { MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
72 { MP_CMD_GUI_PLAY, "gui_play", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
73 { MP_CMD_GUI_STOP, "gui_stop", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
74 { MP_CMD_GUI_PLAYLIST, "gui_playlist", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
75 { MP_CMD_GUI_PREFERENCES, "gui_preferences", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
76 { MP_CMD_GUI_SKINBROWSER, "gui_skinbrowser", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
77 #endif
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
78
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
79 #ifdef USE_DVDNAV
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
80 { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
5473
39dae98304af dvdnav event added, queue size 10->100, added void* event arg type - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
81 { MP_CMD_DVDNAV_EVENT, "dvdnav_event", 1, { { MP_CMD_ARG_VOID, {0}}, {-1, {0}} } },
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
82 #endif
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
83
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
84 { 0, NULL, 0, {} }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
85 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
86
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
87 /// The names of the key for input.conf
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
88 /// If you add some new keys, you also need to add them here
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
89
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
90 static mp_key_name_t key_names[] = {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
91 { ' ', "SPACE" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
92 { KEY_ENTER, "ENTER" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
93 { KEY_TAB, "TAB" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
94 { KEY_CTRL, "CTRL" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
95 { KEY_BACKSPACE, "BS" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
96 { KEY_DELETE, "DEL" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
97 { KEY_INSERT, "INS" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
98 { KEY_HOME, "HOME" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
99 { KEY_END, "END" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
100 { KEY_PAGE_UP, "PGUP" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
101 { KEY_PAGE_DOWN, "PGDWN" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
102 { KEY_ESC, "ESC" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
103 { KEY_RIGHT, "RIGHT" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
104 { KEY_LEFT, "LEFT" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
105 { KEY_DOWN, "DOWN" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
106 { KEY_UP, "UP" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
107 { MOUSE_BTN0, "MOUSE_BTN0" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
108 { MOUSE_BTN1, "MOUSE_BTN1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
109 { MOUSE_BTN2, "MOUSE_BTN2" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
110 { MOUSE_BTN3, "MOUSE_BTN3" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
111 { MOUSE_BTN4, "MOUSE_BTN4" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
112 { MOUSE_BTN5, "MOUSE_BTN5" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
113 { MOUSE_BTN6, "MOUSE_BTN6" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
114 { MOUSE_BTN7, "MOUSE_BTN7" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
115 { MOUSE_BTN8, "MOUSE_BTN8" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
116 { MOUSE_BTN9, "MOUSE_BTN9" },
4524
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
117 { JOY_AXIS1_MINUS, "JOY_UP" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
118 { JOY_AXIS1_PLUS, "JOY_DOWN" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
119 { JOY_AXIS0_MINUS, "JOY_LEFT" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
120 { JOY_AXIS0_PLUS, "JOY_RIGHT" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
121
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
122 { JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
123 { JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
124 { JOY_AXIS1_PLUS, "JOY_AXIS1_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
125 { JOY_AXIS1_MINUS, "JOY_AXIS1_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
126 { JOY_AXIS2_PLUS, "JOY_AXIS2_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
127 { JOY_AXIS2_MINUS, "JOY_AXIS2_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
128 { JOY_AXIS3_PLUS, "JOY_AXIS3_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
129 { JOY_AXIS3_MINUS, "JOY_AXIS3_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
130 { JOY_AXIS4_PLUS, "JOY_AXIS4_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
131 { JOY_AXIS4_MINUS, "JOY_AXIS4_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
132 { JOY_AXIS5_PLUS, "JOY_AXIS5_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
133 { JOY_AXIS5_MINUS, "JOY_AXIS5_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
134 { JOY_AXIS6_PLUS, "JOY_AXIS6_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
135 { JOY_AXIS6_MINUS, "JOY_AXIS6_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
136 { JOY_AXIS7_PLUS, "JOY_AXIS7_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
137 { JOY_AXIS7_MINUS, "JOY_AXIS7_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
138 { JOY_AXIS8_PLUS, "JOY_AXIS8_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
139 { JOY_AXIS8_MINUS, "JOY_AXIS8_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
140 { JOY_AXIS9_PLUS, "JOY_AXIS9_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
141 { JOY_AXIS9_MINUS, "JOY_AXIS9_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
142
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
143 { JOY_BTN0, "JOY_BTN0" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
144 { JOY_BTN1, "JOY_BTN1" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
145 { JOY_BTN2, "JOY_BTN2" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
146 { JOY_BTN3, "JOY_BTN3" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
147 { JOY_BTN4, "JOY_BTN4" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
148 { JOY_BTN5, "JOY_BTN5" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
149 { JOY_BTN6, "JOY_BTN6" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
150 { JOY_BTN7, "JOY_BTN7" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
151 { JOY_BTN8, "JOY_BTN8" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
152 { JOY_BTN9, "JOY_BTN9" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
153 { 0, NULL }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
154 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
155
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
156 // This is the default binding. The content of input.conf override these ones.
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
157 // The first args is a null terminated array of key codes.
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
158 // The second is the command
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
159
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
160 static mp_cmd_bind_t def_cmd_binds[] = {
5061
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
161
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
162 { { MOUSE_BTN3, 0 }, "seek 10" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
163 { { MOUSE_BTN4, 0 }, "seek -10" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
164 { { MOUSE_BTN5, 0 }, "volume 1" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
165 { { MOUSE_BTN6, 0 }, "volume -1" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
166
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
167 #ifdef USE_DVDNAV
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
168 { { 'K', 0 }, "dvdnav 1" }, // up
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
169 { { 'J', 0 }, "dvdnav 2" }, // down
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
170 { { 'H', 0 }, "dvdnav 3" }, // left
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
171 { { 'L', 0 }, "dvdnav 4" }, // right
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
172 { { 'M', 0 }, "dvdnav 5" }, // menu
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
173 { { 'S', 0 }, "dvdnav 6" }, // select
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
174 #endif
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
175
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
176 { { KEY_RIGHT, 0 }, "seek 10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
177 { { KEY_LEFT, 0 }, "seek -10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
178 { { KEY_UP, 0 }, "seek 60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
179 { { KEY_DOWN, 0 }, "seek -60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
180 { { KEY_PAGE_UP, 0 }, "seek 600" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
181 { { KEY_PAGE_DOWN, 0 }, "seek -600" },
5136
79ea91540f29 ENTER now quits after last file
gabucino
parents: 5135
diff changeset
182 { { '-', 0 }, "audio_delay 0.100" },
79ea91540f29 ENTER now quits after last file
gabucino
parents: 5135
diff changeset
183 { { '+', 0 }, "audio_delay -0.100" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
184 { { 'q', 0 }, "quit" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
185 { { KEY_ESC, 0 }, "quit" },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
186 #ifndef HAVE_NEW_GUI
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
187 { { 'p', 0 }, "pause" },
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
188 #endif
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
189 { { ' ', 0 }, "pause" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
190 { { KEY_HOME, 0 }, "pt_up_step 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
191 { { KEY_END, 0 }, "pt_up_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
192 { { '>', 0 }, "pt_step 1" },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
193 #ifndef HAVE_NEW_GUI
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
194 { { KEY_ENTER, 0 }, "pt_step 1 1" },
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
195 #endif
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
196 { { '<', 0 }, "pt_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
197 { { KEY_INS, 0 }, "alt_src_step 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
198 { { KEY_DEL, 0 }, "alt_src_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
199 { { 'o', 0 }, "osd" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
200 { { 'z', 0 }, "sub_delay -0.1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
201 { { 'x', 0 }, "sub_delay +0.1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
202 { { '9', 0 }, "volume -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
203 { { '/', 0 }, "volume -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
204 { { '0', 0 }, "volume 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
205 { { '*', 0 }, "volume 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
206 { { '1', 0 }, "contrast -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
207 { { '2', 0 }, "contrast 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
208 { { '3', 0 }, "brightness -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
209 { { '4', 0 }, "brightness 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
210 { { '5', 0 }, "hue -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
211 { { '6', 0 }, "hue 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
212 { { '7', 0 }, "saturation -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
213 { { '8', 0 }, "saturation 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
214 { { 'd', 0 }, "frame_drop" },
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4956
diff changeset
215 { { 'r', 0 }, "sub_pos -1" },
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4956
diff changeset
216 { { 't', 0 }, "sub_pos +1" },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
217 #ifdef USE_TV
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
218 { { 'h', 0 }, "tv_step_channel 1" },
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
219 { { 'k', 0 }, "tv_step_channel -1" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
220 { { 'n', 0 }, "tv_step_norm" },
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
221 { { 'm', 0 }, "tv_step_chanlist" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
222 #endif
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
223 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
224 { { 'l', 0 }, "gui_loadfile" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
225 { { 't', 0 }, "gui_loadsubtitle" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
226 { { 'a', 0 }, "gui_about" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
227 { { KEY_ENTER, 0 }, "gui_play" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
228 { { 's', 0 }, "gui_stop" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
229 { { 'p', 0 }, "gui_playlist" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
230 { { 'r', 0 }, "gui_preferences" },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
231 { { 'c', 0 }, "gui_skinbrowser" },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
232 #endif
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
233 #ifdef HAVE_JOYSTICK
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
234 { { JOY_AXIS0_PLUS, 0 }, "seek 10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
235 { { JOY_AXIS0_MINUS, 0 }, "seek -10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
236 { { JOY_AXIS1_MINUS, 0 }, "seek 60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
237 { { JOY_AXIS1_PLUS, 0 }, "seek -60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
238 { { JOY_BTN0, 0 }, "pause" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
239 { { JOY_BTN1, 0 }, "osd" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
240 { { JOY_BTN2, 0 }, "volume 1"},
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
241 { { JOY_BTN3, 0 }, "volume -1"},
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
242 #endif
4732
876f0ea71526 vo_fullscreen added
alex
parents: 4657
diff changeset
243 { { 'f', 0 }, "vo_fullscreen" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
244 { { 0 }, NULL }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
245 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
246
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
247 #ifndef MP_MAX_KEY_FD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
248 #define MP_MAX_KEY_FD 10
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
249 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
250
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
251 #ifndef MP_MAX_CMD_FD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
252 #define MP_MAX_CMD_FD 10
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
253 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
254
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
255 #define MP_FD_EOF (1<<0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
256 #define MP_FD_DROP (1<<1)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
257 #define MP_FD_DEAD (1<<2)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
258 #define MP_FD_GOT_CMD (1<<3)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
259 #define MP_FD_NO_SELECT (1<<4)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
260
5473
39dae98304af dvdnav event added, queue size 10->100, added void* event arg type - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
261 #define CMD_QUEUE_SIZE 100
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
262
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
263 typedef struct mp_input_fd {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
264 int fd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
265 void* read_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
266 mp_close_func_t close_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
267 int flags;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
268 // This fields are for the cmd fds
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
269 char* buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
270 int pos,size;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
271 } mp_input_fd_t;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
272
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
273 // These are the user defined binds
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
274 static mp_cmd_bind_t* cmd_binds = NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
275
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
276 static mp_input_fd_t key_fds[MP_MAX_KEY_FD];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
277 static unsigned int num_key_fd = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
278 static mp_input_fd_t cmd_fds[MP_MAX_CMD_FD];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
279 static unsigned int num_cmd_fd = 0;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
280 static mp_cmd_t* cmd_queue[CMD_QUEUE_SIZE];
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
281 static unsigned int cmd_queue_length = 0,cmd_queue_start = 0, cmd_queue_end = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
282
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
283 // this is the key currently down
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
284 static int key_down[MP_MAX_KEY_DOWN];
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
285 static unsigned int num_key_down = 0, last_key_down = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
286
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
287 // Autorepeat stuff
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
288 static short ar_state = -1;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
289 static mp_cmd_t* ar_cmd = NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
290 static unsigned int ar_delay = 100, ar_rate = 8, last_ar = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
291
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
292 static int use_joystick = 1, use_lirc = 1;
4836
f832f7bcf76b Added an option to select the input config file
albeu
parents: 4826
diff changeset
293 static char* config_file = "input.conf";
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
294
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
295 static char* js_dev = NULL;
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
296
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
297 static int mp_input_print_key_list(config_t* cfg);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
298 static int mp_input_print_cmd_list(config_t* cfg);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
299
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
300 // Our command line options
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
301 static config_t input_conf[] = {
4836
f832f7bcf76b Added an option to select the input config file
albeu
parents: 4826
diff changeset
302 { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
303 { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
304 { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
305 { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
306 { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
307 { "js-dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
308 { NULL, NULL, 0, 0, 0, 0, NULL}
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
309 };
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
310
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
311 static config_t mp_input_opts[] = {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
312 { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
313 { "nojoystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
314 { "joystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
315 { "nolirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
316 { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
317 { NULL, NULL, 0, 0, 0, 0, NULL}
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
318 };
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
319
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
320 static int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
321 mp_input_default_key_func(int fd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
322
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
323 static char*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
324 mp_input_get_key_name(int key);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
325
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
326
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
327 int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
328 mp_input_add_cmd_fd(int fd, int select, mp_cmd_func_t read_func, mp_close_func_t close_func) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
329 if(num_cmd_fd == MP_MAX_CMD_FD) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
330 mp_msg(MSGT_INPUT,MSGL_ERR,"Too much command fd, unable to register fd %d\n",fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
331 return 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
332 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
333
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
334 memset(&cmd_fds[num_cmd_fd],0,sizeof(mp_input_fd_t));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
335 cmd_fds[num_cmd_fd].fd = fd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
336 cmd_fds[num_cmd_fd].read_func = read_func ? read_func : (mp_cmd_func_t)read;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
337 cmd_fds[num_cmd_fd].close_func = close_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
338 if(!select)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
339 cmd_fds[num_cmd_fd].flags = MP_FD_NO_SELECT;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
340 num_cmd_fd++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
341
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
342 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
343 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
344
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
345 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
346 mp_input_rm_cmd_fd(int fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
347 unsigned int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
348
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
349 for(i = 0; i < num_cmd_fd; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
350 if(cmd_fds[i].fd == fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
351 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
352 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
353 if(i == num_cmd_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
354 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
355 if(cmd_fds[i].close_func)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
356 cmd_fds[i].close_func(cmd_fds[i].fd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
357
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
358 if(i + 1 < num_cmd_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
359 memmove(&cmd_fds[i],&cmd_fds[i+1],(num_cmd_fd - i - 1)*sizeof(mp_input_fd_t));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
360 num_cmd_fd--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
361 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
362
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
363 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
364 mp_input_rm_key_fd(int fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
365 unsigned int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
366
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
367 for(i = 0; i < num_key_fd; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
368 if(key_fds[i].fd == fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
369 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
370 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
371 if(i == num_key_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
372 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
373 if(key_fds[i].close_func)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
374 key_fds[i].close_func(key_fds[i].fd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
375
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
376 if(i + 1 < num_key_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
377 memmove(&key_fds[i],&key_fds[i+1],(num_key_fd - i - 1)*sizeof(mp_input_fd_t));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
378 num_key_fd--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
379 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
380
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
381 int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
382 mp_input_add_key_fd(int fd, int select, mp_key_func_t read_func, mp_close_func_t close_func) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
383 if(num_key_fd == MP_MAX_KEY_FD) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
384 mp_msg(MSGT_INPUT,MSGL_ERR,"Too much key fd, unable to register fd %d\n",fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
385 return 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
386 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
387
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
388 memset(&key_fds[num_key_fd],0,sizeof(mp_input_fd_t));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
389 key_fds[num_key_fd].fd = fd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
390 key_fds[num_key_fd].read_func = read_func ? read_func : mp_input_default_key_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
391 key_fds[num_key_fd].close_func = close_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
392 if(!select)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
393 key_fds[num_key_fd].flags |= MP_FD_NO_SELECT;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
394 num_key_fd++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
395
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
396 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
397 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
398
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
399
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
400
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
401 static mp_cmd_t*
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
402 mp_input_parse_cmd(char* str) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
403 int i,l;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
404 char *ptr,*e;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
405 mp_cmd_t *cmd, *cmd_def;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
406
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
407 #ifdef MP_DEBUG
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
408 assert(str != NULL);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
409 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
410
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
411 for(ptr = str ; ptr[0] != '\0' && ptr[0] != '\t' && ptr[0] != ' ' ; ptr++)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
412 /* NOTHING */;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
413 if(ptr[0] != '\0')
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
414 l = ptr-str;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
415 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
416 l = strlen(str);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
417
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
418 if(l == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
419 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
420
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
421 for(i=0; mp_cmds[i].name != NULL; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
422 if(strncasecmp(mp_cmds[i].name,str,l) == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
423 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
424 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
425
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
426 if(mp_cmds[i].name == NULL)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
427 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
428
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
429 cmd_def = &mp_cmds[i];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
430
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
431 cmd = (mp_cmd_t*)malloc(sizeof(mp_cmd_t));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
432 cmd->id = cmd_def->id;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
433 cmd->name = strdup(cmd_def->name);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
434
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
435 ptr = str;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
436
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
437 for(i=0; ptr && i < MP_CMD_MAX_ARGS; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
438 ptr = strchr(ptr,' ');
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
439 if(!ptr) break;
4826
a0e8eac85aca Also use tab as cmd arg sepparator
albeu
parents: 4821
diff changeset
440 while(ptr[0] == ' ' || ptr[0] == '\t') ptr++;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
441 if(ptr[0] == '\0') break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
442 switch(cmd_def->args[i].type) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
443 case MP_CMD_ARG_INT:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
444 errno = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
445 cmd->args[i].v.i = atoi(ptr);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
446 if(errno != 0) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
447 mp_msg(MSGT_INPUT,MSGL_ERR,"Command %s : argument %d isn't an integer\n",cmd_def->name,i+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
448 ptr = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
449 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
450 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
451 case MP_CMD_ARG_FLOAT:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
452 errno = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
453 cmd->args[i].v.f = atof(ptr);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
454 if(errno != 0) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
455 mp_msg(MSGT_INPUT,MSGL_ERR,"Command %s : argument %d isn't a float\n",cmd_def->name,i+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
456 ptr = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
457 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
458 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
459 case MP_CMD_ARG_STRING:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
460 e = strchr(ptr,' ');
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
461 if(!e) e = ptr+strlen(ptr);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
462 l = e-ptr;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
463 cmd->args[i].v.s = (char*)malloc((l+1)*sizeof(char));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
464 strncpy(cmd->args[i].v.s,ptr,l);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
465 cmd->args[i].v.s[l] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
466 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
467 case -1:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
468 ptr = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
469 default :
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
470 mp_msg(MSGT_INPUT,MSGL_ERR,"Unknown argument %d\n",i);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
471 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
472 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
473 cmd->nargs = i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
474
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
475 if(cmd_def->nargs > cmd->nargs) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
476 mp_msg(MSGT_INPUT,MSGL_ERR,"Got command '%s' but\n",str);
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
477 mp_msg(MSGT_INPUT,MSGL_ERR,"command %s require at least %d arguments, we found only %d so far\n",cmd_def->name,cmd_def->nargs,cmd->nargs);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
478 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
479 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
480 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
481
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
482 for( ; i < MP_CMD_MAX_ARGS && cmd_def->args[i].type != -1 ; i++) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
483 memcpy(&cmd->args[i],&cmd_def->args[i],sizeof(mp_cmd_arg_t));
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
484 if(cmd_def->args[i].type == MP_CMD_ARG_STRING && cmd_def->args[i].v.s != NULL)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
485 cmd->args[i].v.s = strdup(cmd_def->args[i].v.s);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
486 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
487
5200
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
488 if(i < MP_CMD_MAX_ARGS)
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
489 cmd->args[i].type = -1;
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
490
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
491 return cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
492 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
493
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
494 static int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
495 mp_input_default_key_func(int fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
496 int r,code=0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
497 unsigned int l;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
498 l = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
499 while(l < sizeof(int)) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
500 r = read(fd,(&code)+l,sizeof(int)-l);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
501 if(r <= 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
502 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
503 l +=r;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
504 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
505 return code;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
506 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
507
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
508 #define MP_CMD_MAX_SIZE 256
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
509
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
510 static int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
511 mp_input_read_cmd(mp_input_fd_t* mp_fd, char** ret) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
512 char* end;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
513 (*ret) = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
514
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
515 // Allocate the buffer if it dont exist
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
516 if(!mp_fd->buffer) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
517 mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE*sizeof(char));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
518 mp_fd->pos = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
519 mp_fd->size = MP_CMD_MAX_SIZE;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
520 }
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
521
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
522 // Get some data if needed/possible
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
523 while( !(mp_fd->flags & MP_FD_GOT_CMD) && !(mp_fd->flags & MP_FD_EOF) && (mp_fd->size - mp_fd->pos > 1) ) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
524 int r = ((mp_cmd_func_t)mp_fd->read_func)(mp_fd->fd,mp_fd->buffer+mp_fd->pos,mp_fd->size - 1 - mp_fd->pos);
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
525 // Error ?
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
526 if(r < 0) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
527 if(errno == EINTR)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
528 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
529 else if(errno == EAGAIN)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
530 break;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
531 mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading cmd fd %d : %s\n",mp_fd->fd,strerror(errno));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
532 return MP_INPUT_ERROR;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
533 // EOF ?
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
534 } else if(r == 0) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
535 mp_fd->flags |= MP_FD_EOF;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
536 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
537 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
538 mp_fd->pos += r;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
539 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
540 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
541
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
542 // Reset the got_cmd flag
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
543 mp_fd->flags &= ~MP_FD_GOT_CMD;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
544
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
545 while(1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
546 int l = 0;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
547 // Find the cmd end
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
548 mp_fd->buffer[mp_fd->pos] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
549 end = strchr(mp_fd->buffer,'\n');
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
550 // No cmd end ?
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
551 if(!end) {
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
552 // If buffer is full we must drop all until the next \n
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
553 if(mp_fd->size - mp_fd->pos <= 1) {
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
554 mp_msg(MSGT_INPUT,MSGL_ERR,"Cmd buffer of fd %d is full : dropping content\n",mp_fd->fd);
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
555 mp_fd->pos = 0;
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
556 mp_fd->flags |= MP_FD_DROP;
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
557 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
558 break;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
559 }
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
560 // We alredy have a cmd : set the got_cmd flag
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
561 else if((*ret)) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
562 mp_fd->flags |= MP_FD_GOT_CMD;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
563 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
564 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
565
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
566 l = end - mp_fd->buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
567
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
568 // Not dropping : put the cmd in ret
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
569 if( ! (mp_fd->flags & MP_FD_DROP)) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
570 (*ret) = (char*)malloc((l+1)*sizeof(char));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
571 strncpy((*ret),mp_fd->buffer,l);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
572 (*ret)[l] = '\0';
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
573 } else { // Remove the dropping flag
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
574 mp_fd->flags &= ~MP_FD_DROP;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
575 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
576 if( mp_fd->pos - (l+1) > 0)
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
577 memmove(mp_fd->buffer,end+1,mp_fd->pos-(l+1));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
578 mp_fd->pos -= l+1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
579 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
580
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
581 if(*ret)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
582 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
583 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
584 return MP_INPUT_NOTHING;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
585 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
586
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
587 static char*
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
588 mp_input_find_bind_for_key(mp_cmd_bind_t* binds, int n,int* keys) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
589 int j;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
590
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
591 for(j = 0; binds[j].cmd != NULL; j++) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
592 if(n > 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
593 int found = 1,s;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
594 for(s = 0; s < n && binds[j].input[s] != 0; s++) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
595 if(binds[j].input[s] != keys[s]) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
596 found = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
597 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
598 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
599 }
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
600 if(found && binds[j].input[s] == 0 && s == n)
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
601 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
602 else
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
603 continue;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
604 } else if(n == 1){
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
605 if(binds[j].input[0] == keys[0] && binds[j].input[1] == 0)
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
606 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
607 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
608 }
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
609 return binds[j].cmd;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
610 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
611
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
612 static mp_cmd_t*
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
613 mp_input_get_cmd_from_keys(int n,int* keys, int paused) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
614 char* cmd = NULL;
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
615 mp_cmd_t* ret;
5053
146513806b2f lexical fixes (COSMETIC :)) and one 'real fix': grap_frames -> grab_frames -- feel free to flame and reverse
alex
parents: 5046
diff changeset
616 // In pause mode we return pause for the first key which come
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
617 if(paused)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
618 return mp_input_parse_cmd("pause");
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
619
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
620 if(cmd_binds)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
621 cmd = mp_input_find_bind_for_key(cmd_binds,n,keys);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
622 if(cmd == NULL)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
623 cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
624
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
625 if(cmd == NULL) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
626 mp_msg(MSGT_INPUT,MSGL_ERR,"No bind found for key %s",mp_input_get_key_name(keys[0]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
627 if(n > 1) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
628 int s;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
629 for(s=1; s < n; s++)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
630 mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(keys[s]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
631 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
632 mp_msg(MSGT_INPUT,MSGL_ERR," \n");
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
633 return NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
634 }
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
635 ret = mp_input_parse_cmd(cmd);
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
636 if(!ret) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
637 mp_msg(MSGT_INPUT,MSGL_ERR,"Invalid command for binded key %s",mp_input_get_key_name(key_down[0]));
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
638 if( num_key_down > 1) {
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
639 unsigned int s;
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
640 for(s=1; s < num_key_down; s++)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
641 mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(key_down[s]));
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
642 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
643 mp_msg(MSGT_INPUT,MSGL_ERR," : %s \n",cmd);
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
644 }
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
645 return ret;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
646 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
647
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
648 static mp_cmd_t*
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
649 mp_input_read_keys(int time,int paused) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
650 fd_set fds;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
651 struct timeval tv,*time_val;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
652 int i,n=0,max_fd = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
653 mp_cmd_t* ret;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
654 static int last_loop = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
655
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
656 if(num_key_fd == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
657 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
658
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
659 FD_ZERO(&fds);
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
660 // Remove fd marked as dead and build the fd_set
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
661 for(i = 0; (unsigned int)i < num_key_fd; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
662 if( (key_fds[i].flags & MP_FD_DEAD) ) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
663 mp_input_rm_key_fd(key_fds[i].fd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
664 i--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
665 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
666 } else if(key_fds[i].flags & MP_FD_NO_SELECT)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
667 continue;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
668 if(key_fds[i].fd > max_fd)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
669 max_fd = key_fds[i].fd;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
670 FD_SET(key_fds[i].fd,&fds);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
671 n++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
672 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
673
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
674 if(num_key_fd == 0)
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
675 return NULL;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
676
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
677 if(time >= 0 ) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
678 tv.tv_sec=time/1000;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
679 tv.tv_usec = (time%1000)*1000;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
680 time_val = &tv;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
681 } else
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
682 time_val = NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
683
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
684 while(n > 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
685 if(select(max_fd+1,&fds,NULL,NULL,time_val) < 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
686 if(errno == EINTR)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
687 continue;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
688 mp_msg(MSGT_INPUT,MSGL_ERR,"Select error : %s\n",strerror(errno));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
689 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
690 break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
691 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
692
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
693 for(i = last_loop + 1 ; i != last_loop ; i++) {
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
694 int code = -1;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
695 unsigned int j;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
696 // This is to check all fd in turn
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
697 if((unsigned int)i >= num_key_fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
698 i = -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
699 last_loop++;
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
700 last_loop %= (num_key_fd+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
701 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
702 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
703 // No input from this fd
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
704 if(! (key_fds[i].flags & MP_FD_NO_SELECT) && ! FD_ISSET(key_fds[i].fd,&fds))
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
705 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
706 if(key_fds[i].fd == 0) { // stdin is handled by getch2
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
707 code = getch2(time);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
708 if(code < 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
709 code = MP_INPUT_NOTHING;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
710 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
711 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
712 code = ((mp_key_func_t)key_fds[i].read_func)(key_fds[i].fd);
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
713 if(code < 0) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
714 if(code == MP_INPUT_ERROR)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
715 mp_msg(MSGT_INPUT,MSGL_ERR,"Error on key input fd %d\n",key_fds[i].fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
716 else if(code == MP_INPUT_DEAD) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
717 mp_msg(MSGT_INPUT,MSGL_ERR,"Dead key input on fd %d\n",key_fds[i].fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
718 key_fds[i].flags |= MP_FD_DEAD;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
719 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
720 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
721 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
722 // key pushed
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
723 if(code & MP_KEY_DOWN) {
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
724 if(num_key_down > MP_MAX_KEY_DOWN) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
725 mp_msg(MSGT_INPUT,MSGL_ERR,"Too much key down at the same time\n");
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
726 continue;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
727 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
728 code &= ~MP_KEY_DOWN;
5053
146513806b2f lexical fixes (COSMETIC :)) and one 'real fix': grap_frames -> grab_frames -- feel free to flame and reverse
alex
parents: 5046
diff changeset
729 // Check if we don't already have this key as pushed
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
730 for(j = 0; j < num_key_down; j++) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
731 if(key_down[j] == code)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
732 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
733 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
734 if(j != num_key_down)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
735 continue;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
736 key_down[num_key_down] = code;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
737 num_key_down++;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
738 last_key_down = GetTimer();
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
739 ar_state = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
740 continue;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
741 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
742 // key released
5053
146513806b2f lexical fixes (COSMETIC :)) and one 'real fix': grap_frames -> grab_frames -- feel free to flame and reverse
alex
parents: 5046
diff changeset
743 // Check if the key is in the down key, driver which can't send push event
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
744 // send only release event
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
745 for(j = 0; j < num_key_down; j++) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
746 if(key_down[j] == code)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
747 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
748 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
749 if(j == num_key_down) { // key was not in the down keys : add it
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
750 if(num_key_down > MP_MAX_KEY_DOWN) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
751 mp_msg(MSGT_INPUT,MSGL_ERR,"Too much key down at the same time\n");
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
752 continue;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
753 }
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
754 key_down[num_key_down] = code;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
755 num_key_down++;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
756 last_key_down = 1;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
757 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
758 // We ignore key from last combination
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
759 ret = last_key_down ? mp_input_get_cmd_from_keys(num_key_down,key_down,paused) : NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
760 // Remove the key
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
761 if(j+1 < num_key_down)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
762 memmove(&key_down[j],&key_down[j+1],(num_key_down-(j+1))*sizeof(int));
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
763 num_key_down--;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
764 last_key_down = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
765 ar_state = -1;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
766 if(ar_cmd) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
767 mp_cmd_free(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
768 ar_cmd = NULL;
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
769 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
770 if(ret)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
771 return ret;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
772 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
773
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
774 last_loop = 0;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
775
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
776 // No input : autorepeat ?
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
777 if(ar_rate > 0 && ar_state >=0 && num_key_down > 0 && ! (key_down[num_key_down-1] & MP_NO_REPEAT_KEY)) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
778 unsigned int t = GetTimer();
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
779 // First time : wait delay
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
780 if(ar_state == 0 && (t - last_key_down) >= ar_delay*1000) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
781 ar_cmd = mp_input_get_cmd_from_keys(num_key_down,key_down,paused);
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
782 if(!ar_cmd) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
783 ar_state = -1;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
784 return NULL;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
785 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
786 ar_state = 1;
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
787 last_ar = t;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
788 return mp_cmd_clone(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
789 // Then send rate / sec event
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
790 } else if(ar_state == 1 && (t -last_ar) >= 1000000/ar_rate) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
791 last_ar = t;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
792 return mp_cmd_clone(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
793 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
794 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
795
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
796 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
797 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
798
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
799 static mp_cmd_t*
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
800 mp_input_read_cmds(int time) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
801 fd_set fds;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
802 struct timeval tv,*time_val;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
803 int i,n = 0,max_fd = 0,got_cmd = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
804 mp_cmd_t* ret;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
805 static int last_loop = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
806
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
807 if(num_cmd_fd == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
808 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
809
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
810 FD_ZERO(&fds);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
811 for(i = 0; (unsigned int)i < num_cmd_fd ; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
812 if( (cmd_fds[i].flags & MP_FD_DEAD) || (cmd_fds[i].flags & MP_FD_EOF) ) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
813 mp_input_rm_cmd_fd(cmd_fds[i].fd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
814 i--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
815 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
816 } else if(cmd_fds[i].flags & MP_FD_NO_SELECT)
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
817 continue;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
818 if(cmd_fds[i].flags & MP_FD_GOT_CMD)
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
819 got_cmd = 1;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
820 if(cmd_fds[i].fd > max_fd)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
821 max_fd = cmd_fds[i].fd;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
822 FD_SET(cmd_fds[i].fd,&fds);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
823 n++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
824 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
825
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
826 if(num_cmd_fd == 0)
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
827 return NULL;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
828
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
829 if(time >= 0) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
830 tv.tv_sec=time/1000;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
831 tv.tv_usec = (time%1000)*1000;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
832 time_val = &tv;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
833 } else
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
834 time_val = NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
835
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
836 while(n > 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
837 if((i = select(max_fd+1,&fds,NULL,NULL,time_val)) <= 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
838 if(i < 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
839 if(errno == EINTR)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
840 continue;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
841 mp_msg(MSGT_INPUT,MSGL_ERR,"Select error : %s\n",strerror(errno));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
842 }
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
843 if(!got_cmd)
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
844 return NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
845 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
846 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
847 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
848
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
849 for(i = last_loop + 1; i != last_loop ; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
850 int r = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
851 char* cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
852 if((unsigned int)i >= num_cmd_fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
853 i = -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
854 last_loop++;
4892
35dd38bbd7f3 Fix when stdin is used as a file
albeu
parents: 4858
diff changeset
855 last_loop %= (num_cmd_fd+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
856 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
857 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
858 if( ! (cmd_fds[i].flags & MP_FD_NO_SELECT) && ! FD_ISSET(cmd_fds[i].fd,&fds) && ! (cmd_fds[i].flags & MP_FD_GOT_CMD) )
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
859 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
860
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
861 r = mp_input_read_cmd(&cmd_fds[i],&cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
862 if(r < 0) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
863 if(r == MP_INPUT_ERROR)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
864 mp_msg(MSGT_INPUT,MSGL_ERR,"Error on cmd fd %d\n",cmd_fds[i].fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
865 else if(r == MP_INPUT_DEAD)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
866 cmd_fds[i].flags |= MP_FD_DEAD;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
867 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
868 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
869 ret = mp_input_parse_cmd(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
870 free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
871 if(!ret)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
872 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
873 last_loop = i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
874 return ret;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
875 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
876
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
877 last_loop = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
878 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
879 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
880
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
881 int
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
882 mp_input_queue_cmd(mp_cmd_t* cmd) {
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
883 if(cmd_queue_length >= CMD_QUEUE_SIZE)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
884 return 0;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
885 cmd_queue[cmd_queue_end] = cmd;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
886 cmd_queue_end = (cmd_queue_end + 1) % CMD_QUEUE_SIZE;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
887 cmd_queue_length++;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
888 return 1;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
889 }
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
890
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
891 static mp_cmd_t*
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
892 mp_input_get_queued_cmd(void) {
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
893 mp_cmd_t* ret;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
894
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
895 if(cmd_queue_length == 0)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
896 return NULL;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
897
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
898 ret = cmd_queue[cmd_queue_start];
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
899
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
900 cmd_queue_length--;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
901 cmd_queue_start = (cmd_queue_start + 1) % CMD_QUEUE_SIZE;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
902
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
903 return ret;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
904 }
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
905
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
906 mp_cmd_t*
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
907 mp_input_get_cmd(int time, int paused) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
908 mp_cmd_t* ret;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
909
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
910 ret = mp_input_get_queued_cmd();
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
911 if(ret)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
912 return ret;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
913
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
914 ret = mp_input_read_keys(time,paused);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
915 if(ret)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
916 return ret;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
917
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
918 return mp_input_read_cmds(time);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
919 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
920
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
921 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
922 mp_cmd_free(mp_cmd_t* cmd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
923 int i;
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
924 //#ifdef MP_DEBUG
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
925 // assert(cmd != NULL);
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
926 //#endif
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
927 if ( !cmd ) return;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
928
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
929 if(cmd->name)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
930 free(cmd->name);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
931
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
932 for(i=0; i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
933 if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
934 free(cmd->args[i].v.s);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
935 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
936 free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
937 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
938
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
939 mp_cmd_t*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
940 mp_cmd_clone(mp_cmd_t* cmd) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
941 mp_cmd_t* ret;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
942 int i;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
943 #ifdef MP_DEBUG
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
944 assert(cmd != NULL);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
945 #endif
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
946
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
947 ret = (mp_cmd_t*)malloc(sizeof(mp_cmd_t));
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
948 memcpy(ret,cmd,sizeof(mp_cmd_t));
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
949 if(cmd->name)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
950 ret->name = strdup(cmd->name);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
951 for(i = 0; i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
952 if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
953 ret->args[i].v.s = strdup(cmd->args[i].v.s);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
954 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
955
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
956 return ret;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
957 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
958
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
959 static char key_str[2];
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
960
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
961 static char*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
962 mp_input_get_key_name(int key) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
963 int i;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
964
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
965 for(i = 0; key_names[i].name != NULL; i++) {
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
966 if(key_names[i].key == key)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
967 return key_names[i].name;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
968 }
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
969
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
970 if(key >> 8 == 0) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
971 snprintf(key_str,2,"%c",(char)key);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
972 return key_str;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
973 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
974
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
975 return NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
976 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
977
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
978 static int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
979 mp_input_get_key_from_name(char* name) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
980 int i,ret = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
981 if(strlen(name) == 1) { // Direct key code
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
982 (char)ret = name[0];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
983 return ret;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
984 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
985
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
986 for(i = 0; key_names[i].name != NULL; i++) {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
987 if(strcasecmp(key_names[i].name,name) == 0)
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
988 return key_names[i].key;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
989 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
990
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
991 return -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
992 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
993
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
994 static int
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
995 mp_input_get_input_from_name(char* name,int* keys) {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
996 char *end,*ptr;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
997 int n=0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
998
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
999 ptr = name;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1000 n = 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1001 for(end = strchr(ptr,'-') ; ptr != NULL ; end = strchr(ptr,'-')) {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1002 if(end && end[1] != '\0') {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1003 if(end[1] == '-')
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1004 end = &end[1];
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1005 end[0] = '\0';
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1006 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1007 keys[n] = mp_input_get_key_from_name(ptr);
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1008 if(keys[n] < 0) {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1009 return 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1010 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1011 n++;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1012 if(end && end[1] != '\0' && n < MP_MAX_KEY_DOWN)
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1013 ptr = &end[1];
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1014 else
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1015 break;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1016 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1017 keys[n] = 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1018 return 1;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1019 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1020
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1021 void
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1022 mp_input_bind_keys(int keys[MP_MAX_KEY_DOWN+1], char* cmd) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1023 int i = 0,j;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1024 mp_cmd_bind_t* bind = NULL;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1025
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1026 #ifdef MP_DEBUG
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1027 assert(keys != NULL);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1028 assert(cmd != NULL);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1029 #endif
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1030
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1031 if(cmd_binds) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1032 for(i = 0; cmd_binds[i].cmd != NULL ; i++) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1033 for(j = 0 ; cmd_binds[i].input[j] == keys[j] && keys[j] != 0 ; j++)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1034 /* NOTHING */;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1035 if(keys[j] == 0 && cmd_binds[i].input[j] == 0 ) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1036 bind = &cmd_binds[i];
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1037 break;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1038 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1039 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1040 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1041
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1042 if(!bind) {
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1043 cmd_binds = (mp_cmd_bind_t*)realloc(cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1044 memset(&cmd_binds[i],0,2*sizeof(mp_cmd_bind_t));
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1045 bind = &cmd_binds[i];
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1046 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1047 if(bind->cmd)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1048 free(bind->cmd);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1049 bind->cmd = strdup(cmd);
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1050 memcpy(bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int));
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1051 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1052
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1053
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1054 static void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1055 mp_input_free_binds(mp_cmd_bind_t* binds) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1056 int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1057
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1058 if(!binds)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1059 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1060
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1061 for(i = 0; binds[i].cmd != NULL; i++)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1062 free(binds[i].cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1063
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1064 free(binds);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1065
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1066 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1067
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1068
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1069 #define BS_MAX 256
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1070 #define SPACE_CHAR " \n\r\t"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1071
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1072 static int
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1073 mp_input_parse_config(char *file) {
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1074 int fd;
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1075 int bs = 0,r,eof = 0,comments = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1076 char *iter,*end;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1077 char buffer[BS_MAX];
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1078 int n_binds = 0, keys[MP_MAX_KEY_DOWN+1] = { 0 };
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1079 mp_cmd_bind_t* binds = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1080
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1081 fd = open(file,O_RDONLY);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1082
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1083 if(fd < 0) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1084 mp_msg(MSGT_INPUT,MSGL_ERR,"Can't open input config file %s : %s\n",file,strerror(errno));
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1085 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1086 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1087
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1088 mp_msg(MSGT_INPUT,MSGL_V,"Parsing input config file %s\n",file);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1089
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1090 while(1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1091 if(! eof && bs < BS_MAX-1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1092 if(bs > 0) bs--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1093 r = read(fd,buffer+bs,BS_MAX-1-bs);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1094 if(r < 0) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1095 if(errno == EINTR)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1096 continue;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1097 mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading input config file %s : %s\n",file,strerror(errno));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1098 mp_input_free_binds(binds);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1099 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1100 } else if(r == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1101 eof = 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1102 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1103 bs += r+1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1104 buffer[bs-1] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1105 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1106 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1107 // Empty buffer : return
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1108 if(bs <= 0) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1109 mp_msg(MSGT_INPUT,MSGL_INFO,"Input config file %s parsed : %d binds\n",file,n_binds);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1110 if(binds)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1111 cmd_binds = binds;
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1112 return 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1113 }
4826
a0e8eac85aca Also use tab as cmd arg sepparator
albeu
parents: 4821
diff changeset
1114
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1115 iter = buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1116
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1117 if(comments) {
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1118 for( ; iter[0] != '\0' && iter[0] != '\n' ; iter++)
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1119 /* NOTHING */;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1120 if(iter[0] == '\0') { // Buffer was full of comment
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1121 bs = 0;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1122 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1123 }
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1124 iter++;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1125 r = strlen(iter);
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1126 if(r)
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1127 memmove(buffer,iter,r+1);
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1128 bs = r+1;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1129 if(iter[0] != '#')
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1130 comments = 0;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1131 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1132 }
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1133
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1134 // Find the wanted key
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1135 if(keys[0] == 0) {
5053
146513806b2f lexical fixes (COSMETIC :)) and one 'real fix': grap_frames -> grab_frames -- feel free to flame and reverse
alex
parents: 5046
diff changeset
1136 // Jump beginning space
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1137 for( ; iter[0] != '\0' && strchr(SPACE_CHAR,iter[0]) != NULL ; iter++)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1138 /* NOTHING */;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1139 if(iter[0] == '\0') { // Buffer was full of space char
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1140 bs = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1141 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1142 }
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1143 if(iter[0] == '#') { // Comments
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1144 comments = 1;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1145 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1146 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1147 // Find the end of the key code name
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1148 for(end = iter; end[0] != '\0' && strchr(SPACE_CHAR,end[0]) == NULL ; end++)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1149 /*NOTHING */;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1150 if(end[0] == '\0') { // Key name don't fit in the buffer
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1151 if(buffer == iter) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1152 if(eof && (buffer-iter) == bs)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1153 mp_msg(MSGT_INPUT,MSGL_ERR,"Unfinished binding %s\n",iter);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1154 else
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1155 mp_msg(MSGT_INPUT,MSGL_ERR,"Buffer is too small for this key name : %s\n",iter);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1156 mp_input_free_binds(binds);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1157 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1158 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1159 memmove(buffer,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1160 bs = end-iter;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1161 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1162 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1163 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1164 char name[end-iter+1];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1165 strncpy(name,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1166 name[end-iter] = '\0';
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1167 if(! mp_input_get_input_from_name(name,keys)) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1168 mp_msg(MSGT_INPUT,MSGL_ERR,"Unknown key '%s'\n",name);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1169 mp_input_free_binds(binds);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1170 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1171 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1172 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1173 if( bs > (end-buffer))
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1174 memmove(buffer,end,bs - (end-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1175 bs -= end-buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1176 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1177 } else { // Get the command
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1178 while(iter[0] == ' ' || iter[0] == '\t') iter++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1179 // Found new line
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1180 if(iter[0] == '\n' || iter[0] == '\r') {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1181 int i;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1182 mp_msg(MSGT_INPUT,MSGL_ERR,"No command found for key %s" ,mp_input_get_key_name(keys[0]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1183 for(i = 1; keys[i] != 0 ; i++)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1184 mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(keys[i]));
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1185 mp_msg(MSGT_INPUT,MSGL_ERR,"\n");
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1186 keys[0] = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1187 if(iter > buffer) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1188 memmove(buffer,iter,bs- (iter-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1189 bs -= (iter-buffer);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1190 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1191 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1192 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1193 for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] != '\0' ; end++)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1194 /* NOTHING */;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1195 if(end[0] == '\0' && ! (eof && ((end+1) - buffer) == bs)) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1196 if(iter == buffer) {
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1197 mp_msg(MSGT_INPUT,MSGL_ERR,"Buffer is too small for command %s\n",buffer);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1198 mp_input_free_binds(binds);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1199 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1200 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1201 memmove(buffer,iter,end - iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1202 bs = end - iter;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1203 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1204 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1205 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1206 char cmd[end-iter+1];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1207 strncpy(cmd,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1208 cmd[end-iter] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1209 //printf("Set bind %d => %s\n",code,cmd);
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1210 mp_input_bind_keys(keys,cmd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1211 n_binds++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1212 }
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1213 keys[0] = 0;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1214 end++;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1215 if(bs > (end-buffer))
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1216 memmove(buffer,end,bs-(end-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1217 bs -= (end-buffer);
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1218 buffer[bs-1] = '\0';
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1219 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1220 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1221 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1222 mp_msg(MSGT_INPUT,MSGL_ERR,"What are we doing here ?\n");
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1223 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1224 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1225
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1226 extern char *get_path(char *filename);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1227
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1228 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1229 mp_input_init(void) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1230 char* file;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1231
4836
f832f7bcf76b Added an option to select the input config file
albeu
parents: 4826
diff changeset
1232 file = config_file[0] != '/' ? get_path(config_file) : config_file;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1233 if(!file)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1234 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1235
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1236 if(! mp_input_parse_config(file))
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1237 mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) config\n");
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1238
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1239 #ifdef HAVE_JOYSTICK
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1240 if(use_joystick) {
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
1241 int fd = mp_input_joystick_init(js_dev);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1242 if(fd < 0)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1243 mp_msg(MSGT_INPUT,MSGL_ERR,"Can't init input joystick\n");
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1244 else
4524
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
1245 mp_input_add_key_fd(fd,1,mp_input_joystick_read,(mp_close_func_t)close);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1246 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1247 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1248
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1249 #ifdef HAVE_LIRC
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1250 if(use_lirc) {
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1251 int fd = mp_input_lirc_init();
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1252 if(fd > 0)
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1253 mp_input_add_cmd_fd(fd,1,NULL,(mp_close_func_t)close);
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1254 }
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1255 #endif
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1256
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1257 }
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1258
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1259 void
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1260 mp_input_uninit(void) {
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1261 unsigned int i;
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1262
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1263 for(i=0; i < num_key_fd; i++) {
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1264 if(key_fds[i].close_func)
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1265 key_fds[i].close_func(key_fds[i].fd);
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1266 }
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1267
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1268 for(i=0; i < num_cmd_fd; i++) {
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1269 if(cmd_fds[i].close_func)
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1270 cmd_fds[i].close_func(cmd_fds[i].fd);
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1271 }
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1272
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1273
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1274 #ifdef HAVE_LIRC
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1275 if(use_lirc)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1276 mp_input_lirc_uninit();
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1277 #endif
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1278
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1279 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1280
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1281 void
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1282 mp_input_register_options(m_config_t* cfg) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1283 m_config_register_options(cfg,mp_input_opts);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1284 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1285
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1286 static int mp_input_print_key_list(config_t* cfg) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1287 int i;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1288 printf("\n");
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1289 for(i= 0; key_names[i].name != NULL ; i++)
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1290 printf("%s\n",key_names[i].name);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1291 exit(0);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1292 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1293
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1294 static int mp_input_print_cmd_list(config_t* cfg) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1295 mp_cmd_t *cmd;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1296 int i,j;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1297 char* type;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1298
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1299 for(i = 0; (cmd = &mp_cmds[i])->name != NULL ; i++) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1300 printf("%-20.20s",cmd->name);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1301 for(j= 0 ; j < MP_CMD_MAX_ARGS && cmd->args[j].type != -1 ; j++) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1302 switch(cmd->args[j].type) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1303 case MP_CMD_ARG_INT:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1304 type = "Integer";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1305 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1306 case MP_CMD_ARG_FLOAT:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1307 type = "Float";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1308 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1309 case MP_CMD_ARG_STRING:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1310 type = "String";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1311 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1312 default:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1313 type = "??";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1314 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1315 if(j+1 > cmd->nargs)
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1316 printf(" [%s]",type);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1317 else
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1318 printf(" %s",type);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1319 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1320 printf("\n");
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1321 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1322 exit(0);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1323 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1324
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1325 #endif /* HAVE_NEW_INPUT */