annotate input/input.c @ 5136:79ea91540f29

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