annotate input/input.c @ 29614:1e19b831575b

100l, forgot to use "test" for checking the value of the quicktime variable
author reimar
date Tue, 08 Sep 2009 08:50:03 +0000
parents 94d2be22a185
children e255f9571156
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28112
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
1 /*
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
2 * This file is part of MPlayer.
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
3 *
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
5 * it under the terms of the GNU General Public License as published by
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
7 * (at your option) any later version.
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
8 *
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
12 * GNU General Public License for more details.
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
13 *
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
14 * You should have received a copy of the GNU General Public License along
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
17 */
142c53391eb7 Add standard GPL license header.
diego
parents: 27633
diff changeset
18
16860
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
19 #include "config.h"
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
20
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
21 #include <stdlib.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
22 #include <string.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
23 #include <stdio.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
24 #include <unistd.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
25 #include <errno.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
26 #include <sys/types.h>
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
27 #include <sys/stat.h>
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
28 #include <sys/time.h>
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
29 #include <fcntl.h>
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
30 #include <ctype.h>
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
31
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
32 #include "input.h"
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
33 #include "mouse.h"
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
34 #ifdef MP_DEBUG
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
35 #include <assert.h>
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
36 #endif
24129
50e1e79056b6 Make terminal input work more like VO key input
uau
parents: 24128
diff changeset
37 #include "mp_fifo.h"
16860
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
38 #include "osdep/getch2.h"
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
39 #include "osdep/keycodes.h"
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
40 #include "osdep/timer.h"
26543
606fe14e4e6c Use full path for libavutil #includes.
diego
parents: 26190
diff changeset
41 #include "libavutil/avstring.h"
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
42 #include "mp_msg.h"
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
43 #include "help_mp.h"
16860
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
44 #include "m_config.h"
a68ede010f66 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16856
diff changeset
45 #include "m_option.h"
24242
76f5d8892c04 Clean up the way get_path is handled: Compile get_path.c to an object to link
diego
parents: 24225
diff changeset
46 #include "get_path.h"
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
47
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
48 #include "joystick.h"
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
49
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
50 #ifdef CONFIG_LIRC
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
51 #include "lirc.h"
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
52 #endif
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
53
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
54 #ifdef CONFIG_LIRCC
10215
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
55 #include <lirc/lircc.h>
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
56 #endif
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
57
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
58 #include "ar.h"
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
59
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
60 /// This array defines all known commands.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
61 /// The first field is an id used to recognize the command without too many strcmp.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
62 /// The second is obviously the command name.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
63 /// The third is the minimum number of arguments this command needs.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
64 /// Then comes the definition of each argument, terminated with an arg of type -1.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
65 /// A command can take a maximum of MP_CMD_MAX_ARGS-1 arguments (-1 because of
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
66 /// the last one) which is actually 9.
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
67
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
68 /// For the args, the first field is the type (actually int, float or string), the second
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
69 /// is the default value wich is used for optional arguments
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
70
25709
24ee00528e18 Make several mapping tables related to input processing const.
reimar
parents: 25626
diff changeset
71 static const mp_cmd_t mp_cmds[] = {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
72 #ifdef CONFIG_RADIO
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19533
diff changeset
73 { MP_CMD_RADIO_STEP_CHANNEL, "radio_step_channel", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }},
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19533
diff changeset
74 { MP_CMD_RADIO_SET_CHANNEL, "radio_set_channel", 1, { { MP_CMD_ARG_STRING, {0}}, {-1,{0}} }},
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19533
diff changeset
75 { MP_CMD_RADIO_SET_FREQ, "radio_set_freq", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
21042
c549c2de24ce new slave command: radio_step_freq
voroshil
parents: 21008
diff changeset
76 { MP_CMD_RADIO_STEP_FREQ, "radio_step_freq", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19533
diff changeset
77 #endif
14718
11376fd550ac Make seek command parameter float.
reimar
parents: 14684
diff changeset
78 { MP_CMD_SEEK, "seek", 1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
79 { MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } },
17925
caa86b1793fe Move audio_delay to a property and add a few read only properties to
albeu
parents: 17911
diff changeset
80 { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
81 { MP_CMD_SPEED_INCR, "speed_incr", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
82 { MP_CMD_SPEED_MULT, "speed_mult", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
83 { MP_CMD_SPEED_SET, "speed_set", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
13338
1820ef597cdb quit slave mode command now accepts an exit value, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13228
diff changeset
84 { MP_CMD_QUIT, "quit", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
26877
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26797
diff changeset
85 { MP_CMD_STOP, "stop", 0, { {-1,{0}} } },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
86 { MP_CMD_PAUSE, "pause", 0, { {-1,{0}} } },
13626
741649fe31cb allow to step only one frame forward by pressing s.
reimar
parents: 13603
diff changeset
87 { MP_CMD_FRAME_STEP, "frame_step", 0, { {-1,{0}} } },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
88 { 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
89 { 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
90 { MP_CMD_PLAY_ALT_SRC_STEP, "alt_src_step",1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } },
23727
2de8f66b3570 Add a loop command and property.
albeu
parents: 23725
diff changeset
91 { MP_CMD_LOOP, "loop", 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
92 { MP_CMD_SUB_DELAY, "sub_delay",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
93 { MP_CMD_SUB_STEP, "sub_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
94 { MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
18223
cdf3cb516027 Align osd_show_text with osd_show_property_text.
albeu
parents: 18222
diff changeset
95 { MP_CMD_OSD_SHOW_TEXT, "osd_show_text", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
18222
8c35bd43135f Add a new command: osd_show_property_text that show an expanded property
albeu
parents: 18206
diff changeset
96 { MP_CMD_OSD_SHOW_PROPERTY_TEXT, "osd_show_property_text",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17890
diff changeset
97 { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
23568
519e42b716aa The audio balance feature implemented with af_pan.
zuxy
parents: 23510
diff changeset
98 { MP_CMD_BALANCE, "balance", 1, { { MP_CMD_ARG_FLOAT,{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
99 { MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } },
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17890
diff changeset
100 { MP_CMD_MUTE, "mute", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
101 { MP_CMD_CONTRAST, "contrast",1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7111
diff changeset
102 { MP_CMD_GAMMA, "gamma", 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
103 { 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
104 { 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
105 { 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
106 { 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
107 { MP_CMD_SUB_POS, "sub_pos", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
108 { MP_CMD_SUB_ALIGNMENT, "sub_alignment",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17928
diff changeset
109 { MP_CMD_SUB_VISIBILITY, "sub_visibility", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
15706
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15504
diff changeset
110 { MP_CMD_SUB_LOAD, "sub_load", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15504
diff changeset
111 { MP_CMD_SUB_REMOVE, "sub_remove", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
15128
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15046
diff changeset
112 { MP_CMD_SUB_SELECT, "vobsub_lang", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } }, // for compatibility
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15046
diff changeset
113 { MP_CMD_SUB_SELECT, "sub_select", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } },
25129
c04b64054255 Support select subtitle by source, add 4 properties:
ulion
parents: 24959
diff changeset
114 { MP_CMD_SUB_SOURCE, "sub_source", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } },
c04b64054255 Support select subtitle by source, add 4 properties:
ulion
parents: 24959
diff changeset
115 { MP_CMD_SUB_VOB, "sub_vob", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } },
c04b64054255 Support select subtitle by source, add 4 properties:
ulion
parents: 24959
diff changeset
116 { MP_CMD_SUB_DEMUX, "sub_demux", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } },
c04b64054255 Support select subtitle by source, add 4 properties:
ulion
parents: 24959
diff changeset
117 { MP_CMD_SUB_FILE, "sub_file", 0, { { MP_CMD_ARG_INT,{-2} }, {-1,{0}} } },
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14681
diff changeset
118 { MP_CMD_SUB_LOG, "sub_log", 0, { {-1,{0}} } },
23725
a0432f65040e Add the sub_scale property and command.
albeu
parents: 23573
diff changeset
119 { MP_CMD_SUB_SCALE, "sub_scale",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
120 #ifdef CONFIG_ASS
25814
4ba9b9bdf123 Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents: 25766
diff changeset
121 { MP_CMD_ASS_USE_MARGINS, "ass_use_margins", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
4ba9b9bdf123 Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents: 25766
diff changeset
122 #endif
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8275
diff changeset
123 { MP_CMD_GET_PERCENT_POS, "get_percent_pos", 0, { {-1,{0}} } },
15504
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15285
diff changeset
124 { MP_CMD_GET_TIME_POS, "get_time_pos", 0, { {-1,{0}} } },
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8275
diff changeset
125 { MP_CMD_GET_TIME_LENGTH, "get_time_length", 0, { {-1,{0}} } },
19533
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
126 { MP_CMD_GET_FILENAME, "get_file_name", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
127 { MP_CMD_GET_VIDEO_CODEC, "get_video_codec", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
128 { MP_CMD_GET_VIDEO_BITRATE, "get_video_bitrate", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
129 { MP_CMD_GET_VIDEO_RESOLUTION, "get_video_resolution", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
130 { MP_CMD_GET_AUDIO_CODEC, "get_audio_codec", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
131 { MP_CMD_GET_AUDIO_BITRATE, "get_audio_bitrate", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
132 { MP_CMD_GET_AUDIO_SAMPLES, "get_audio_samples", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
133 { MP_CMD_GET_META_TITLE, "get_meta_title", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
134 { MP_CMD_GET_META_ARTIST, "get_meta_artist", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
135 { MP_CMD_GET_META_ALBUM, "get_meta_album", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
136 { MP_CMD_GET_META_YEAR, "get_meta_year", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
137 { MP_CMD_GET_META_COMMENT, "get_meta_comment", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
138 { MP_CMD_GET_META_TRACK, "get_meta_track", 0, { {-1,{0}} } },
0fc9a4ca9e66 extended slave mode with metadata retrieval commands
ben
parents: 19491
diff changeset
139 { MP_CMD_GET_META_GENRE, "get_meta_genre", 0, { {-1,{0}} } },
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15162
diff changeset
140 { MP_CMD_SWITCH_AUDIO, "switch_audio", 0, { { MP_CMD_ARG_INT,{-1} }, {-1,{0}} } },
25576
54512595b406 properties to change angle; patch by oattila chello hu
nicodvb
parents: 25502
diff changeset
141 { MP_CMD_SWITCH_ANGLE, "switch_angle", 0, { { MP_CMD_ARG_INT,{-1} }, {-1,{0}} } },
25817
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25814
diff changeset
142 { MP_CMD_SWITCH_TITLE, "switch_title", 0, { { MP_CMD_ARG_INT,{-1} }, {-1,{0}} } },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
143 #ifdef CONFIG_TV
24105
9e71e0345c35 Automatic TV channels scanning ability for MPlayer.
voroshil
parents: 24037
diff changeset
144 { MP_CMD_TV_START_SCAN, "tv_start_scan", 0, { {-1,{0}} }},
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
145 { 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
146 { 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
147 { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", 0, { {-1,{0}} } },
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8365
diff changeset
148 { MP_CMD_TV_SET_CHANNEL, "tv_set_channel", 1, { { MP_CMD_ARG_STRING, {0}}, {-1,{0}} }},
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8534
diff changeset
149 { MP_CMD_TV_LAST_CHANNEL, "tv_last_channel", 0, { {-1,{0}} } },
10521
141141fdd250 I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents: 10398
diff changeset
150 { MP_CMD_TV_SET_FREQ, "tv_set_freq", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
22667
e1859558b37d New slave command: tv_step_freq <offset in MHz>
voroshil
parents: 22444
diff changeset
151 { MP_CMD_TV_STEP_FREQ, "tv_step_freq", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
10521
141141fdd250 I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents: 10398
diff changeset
152 { MP_CMD_TV_SET_NORM, "tv_set_norm", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
18206
4bc744cb60e7 Handle the tv color control commands with the properties.
albeu
parents: 18100
diff changeset
153 { MP_CMD_TV_SET_BRIGHTNESS, "tv_set_brightness", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
4bc744cb60e7 Handle the tv color control commands with the properties.
albeu
parents: 18100
diff changeset
154 { MP_CMD_TV_SET_CONTRAST, "tv_set_contrast", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
4bc744cb60e7 Handle the tv color control commands with the properties.
albeu
parents: 18100
diff changeset
155 { MP_CMD_TV_SET_HUE, "tv_set_hue", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
4bc744cb60e7 Handle the tv color control commands with the properties.
albeu
parents: 18100
diff changeset
156 { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
157 #endif
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17928
diff changeset
158 { MP_CMD_SUB_FORCED_ONLY, "forced_subs_only", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27345
diff changeset
159 #ifdef CONFIG_DVBIN
12306
661a6e80030f slave command dvb_set_channel now takes 2 arguments: channel card
nicodvb
parents: 11793
diff changeset
160 { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
10626
fd97f3727f15 Finnaly commit Nico's dvb menu. Sorry for committing this
albeu
parents: 10624
diff changeset
161 #endif
13339
1c787349d286 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13338
diff changeset
162 { MP_CMD_SWITCH_RATIO, "switch_ratio", 0, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
17928
e0f20946e398 Convert fullscreen, panscan, color controls, ontop, rootwin,
albeu
parents: 17925
diff changeset
163 { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
e0f20946e398 Convert fullscreen, panscan, color controls, ontop, rootwin,
albeu
parents: 17925
diff changeset
164 { MP_CMD_VO_ONTOP, "vo_ontop", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19342
diff changeset
165 { MP_CMD_FILE_FILTER, "file_filter", 1, { { MP_CMD_ARG_INT, {0}}, {-1,{0}}}},
17928
e0f20946e398 Convert fullscreen, panscan, color controls, ontop, rootwin,
albeu
parents: 17925
diff changeset
166 { MP_CMD_VO_ROOTWIN, "vo_rootwin", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
e0f20946e398 Convert fullscreen, panscan, color controls, ontop, rootwin,
albeu
parents: 17925
diff changeset
167 { MP_CMD_VO_BORDER, "vo_border", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
19833
10f36060390a Add repeated screenshot mode to vf_screenshot.
eugeni
parents: 19777
diff changeset
168 { MP_CMD_SCREENSHOT, "screenshot", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6183
diff changeset
169 { MP_CMD_PANSCAN, "panscan",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
13228
a47aaa6b7324 slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13091
diff changeset
170 { MP_CMD_SWITCH_VSYNC, "switch_vsync", 0, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
16227
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16071
diff changeset
171 { MP_CMD_LOADFILE, "loadfile", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16071
diff changeset
172 { MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
14087
26937d8c5c9e enable the run slave commande even without libmenu
aurel
parents: 13991
diff changeset
173 { MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
6888
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6818
diff changeset
174 { MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27345
diff changeset
175 #ifdef CONFIG_TV_TELETEXT
23900
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
176 { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
24244
e446bad0872c Implement X/27/0 packet decoding.
voroshil
parents: 24242
diff changeset
177 { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
23900
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
178 #endif
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
179
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
180 #ifdef CONFIG_GUI
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
181 { MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
182 { MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
183 { MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
184 { MP_CMD_GUI_PLAY, "gui_play", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
185 { MP_CMD_GUI_STOP, "gui_stop", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
186 { MP_CMD_GUI_PLAYLIST, "gui_playlist", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
187 { MP_CMD_GUI_PREFERENCES, "gui_preferences", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
188 { MP_CMD_GUI_SKINBROWSER, "gui_skinbrowser", 0, { {-1,{0}} } },
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
189 #endif
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
190
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
191 #ifdef CONFIG_DVDNAV
27068
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
192 { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
193 #endif
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
194
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
195 #ifdef CONFIG_MENU
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
196 { MP_CMD_MENU, "menu",1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
197 { MP_CMD_SET_MENU, "set_menu",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
198 { MP_CMD_CHELP, "help", 0, { {-1,{0}} } },
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
199 { MP_CMD_CEXIT, "exit", 0, { {-1,{0}} } },
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
200 { MP_CMD_CHIDE, "hide", 0, { {MP_CMD_ARG_INT,{3000}}, {-1,{0}} } },
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
201 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
202
10884
bbdaa93c469e slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents: 10802
diff changeset
203 { MP_CMD_GET_VO_FULLSCREEN, "get_vo_fullscreen", 0, { {-1,{0}} } },
bbdaa93c469e slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents: 10802
diff changeset
204 { MP_CMD_GET_SUB_VISIBILITY, "get_sub_visibility", 0, { {-1,{0}} } },
16323
60c6693b2b2b add key_down_eventto slave mode, used to inject key down event with mplayer_put_key
nplourde
parents: 16227
diff changeset
205 { MP_CMD_KEYDOWN_EVENTS, "key_down_event", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17890
diff changeset
206 { MP_CMD_SET_PROPERTY, "set_property", 2, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17890
diff changeset
207 { MP_CMD_GET_PROPERTY, "get_property", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
23412
f6c225ffe60d Allow setting the direction in the step_property command.
albeu
parents: 22751
diff changeset
208 { MP_CMD_STEP_PROPERTY, "step_property", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
209
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19110
diff changeset
210 { MP_CMD_SEEK_CHAPTER, "seek_chapter", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
19850
4919b3ce8d5e report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents: 19833
diff changeset
211 { MP_CMD_SET_MOUSE_POS, "set_mouse_pos", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
212
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
213 { 0, NULL, 0, {} }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
214 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
215
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
216 /// The names of the keys as used in input.conf
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
217 /// If you add some new keys, you also need to add them here
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
218
25709
24ee00528e18 Make several mapping tables related to input processing const.
reimar
parents: 25626
diff changeset
219 static const mp_key_name_t key_names[] = {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
220 { ' ', "SPACE" },
22444
76090b5fdf5d Allow to add/modify keybind for '#'
reimar
parents: 22255
diff changeset
221 { '#', "SHARP" },
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
222 { KEY_ENTER, "ENTER" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
223 { KEY_TAB, "TAB" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
224 { KEY_CTRL, "CTRL" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
225 { KEY_BACKSPACE, "BS" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
226 { KEY_DELETE, "DEL" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
227 { KEY_INSERT, "INS" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
228 { KEY_HOME, "HOME" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
229 { KEY_END, "END" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
230 { KEY_PAGE_UP, "PGUP" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
231 { KEY_PAGE_DOWN, "PGDWN" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
232 { KEY_ESC, "ESC" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
233 { KEY_RIGHT, "RIGHT" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
234 { KEY_LEFT, "LEFT" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
235 { KEY_DOWN, "DOWN" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
236 { KEY_UP, "UP" },
9891
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
237 { KEY_F+1, "F1" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
238 { KEY_F+2, "F2" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
239 { KEY_F+3, "F3" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
240 { KEY_F+4, "F4" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
241 { KEY_F+5, "F5" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
242 { KEY_F+6, "F6" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
243 { KEY_F+7, "F7" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
244 { KEY_F+8, "F8" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
245 { KEY_F+9, "F9" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
246 { KEY_F+10, "F10" },
11793
faa111ce1315 Support binding F11 and F12 keys to commands.
diego
parents: 11542
diff changeset
247 { KEY_F+11, "F11" },
faa111ce1315 Support binding F11 and F12 keys to commands.
diego
parents: 11542
diff changeset
248 { KEY_F+12, "F12" },
9891
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
249 { KEY_KP0, "KP0" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
250 { KEY_KP1, "KP1" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
251 { KEY_KP2, "KP2" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
252 { KEY_KP3, "KP3" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
253 { KEY_KP4, "KP4" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
254 { KEY_KP5, "KP5" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
255 { KEY_KP6, "KP6" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
256 { KEY_KP7, "KP7" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
257 { KEY_KP8, "KP8" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
258 { KEY_KP9, "KP9" },
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
259 { KEY_KPDEL, "KP_DEL" },
10802
alex
parents: 10626
diff changeset
260 { KEY_KPDEC, "KP_DEC" },
alex
parents: 10626
diff changeset
261 { KEY_KPINS, "KP_INS" },
9891
150d1ef4204d keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents: 9836
diff changeset
262 { KEY_KPENTER, "KP_ENTER" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
263 { MOUSE_BTN0, "MOUSE_BTN0" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
264 { MOUSE_BTN1, "MOUSE_BTN1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
265 { MOUSE_BTN2, "MOUSE_BTN2" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
266 { MOUSE_BTN3, "MOUSE_BTN3" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
267 { MOUSE_BTN4, "MOUSE_BTN4" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
268 { MOUSE_BTN5, "MOUSE_BTN5" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
269 { MOUSE_BTN6, "MOUSE_BTN6" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
270 { MOUSE_BTN7, "MOUSE_BTN7" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
271 { MOUSE_BTN8, "MOUSE_BTN8" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
272 { MOUSE_BTN9, "MOUSE_BTN9" },
16974
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
273 { MOUSE_BTN0_DBL, "MOUSE_BTN0_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
274 { MOUSE_BTN1_DBL, "MOUSE_BTN1_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
275 { MOUSE_BTN2_DBL, "MOUSE_BTN2_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
276 { MOUSE_BTN3_DBL, "MOUSE_BTN3_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
277 { MOUSE_BTN4_DBL, "MOUSE_BTN4_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
278 { MOUSE_BTN5_DBL, "MOUSE_BTN5_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
279 { MOUSE_BTN6_DBL, "MOUSE_BTN6_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
280 { MOUSE_BTN7_DBL, "MOUSE_BTN7_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
281 { MOUSE_BTN8_DBL, "MOUSE_BTN8_DBL" },
62d979592493 Add double-click mouse events.
joey
parents: 16968
diff changeset
282 { MOUSE_BTN9_DBL, "MOUSE_BTN9_DBL" },
4524
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
283 { JOY_AXIS1_MINUS, "JOY_UP" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
284 { JOY_AXIS1_PLUS, "JOY_DOWN" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
285 { JOY_AXIS0_MINUS, "JOY_LEFT" },
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
286 { JOY_AXIS0_PLUS, "JOY_RIGHT" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
287
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
288 { JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
289 { JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
290 { JOY_AXIS1_PLUS, "JOY_AXIS1_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
291 { JOY_AXIS1_MINUS, "JOY_AXIS1_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
292 { JOY_AXIS2_PLUS, "JOY_AXIS2_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
293 { JOY_AXIS2_MINUS, "JOY_AXIS2_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
294 { JOY_AXIS3_PLUS, "JOY_AXIS3_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
295 { JOY_AXIS3_MINUS, "JOY_AXIS3_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
296 { JOY_AXIS4_PLUS, "JOY_AXIS4_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
297 { JOY_AXIS4_MINUS, "JOY_AXIS4_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
298 { JOY_AXIS5_PLUS, "JOY_AXIS5_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
299 { JOY_AXIS5_MINUS, "JOY_AXIS5_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
300 { JOY_AXIS6_PLUS, "JOY_AXIS6_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
301 { JOY_AXIS6_MINUS, "JOY_AXIS6_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
302 { JOY_AXIS7_PLUS, "JOY_AXIS7_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
303 { JOY_AXIS7_MINUS, "JOY_AXIS7_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
304 { JOY_AXIS8_PLUS, "JOY_AXIS8_PLUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
305 { JOY_AXIS8_MINUS, "JOY_AXIS8_MINUS" },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
306 { JOY_AXIS9_PLUS, "JOY_AXIS9_PLUS" },
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
307 { JOY_AXIS9_MINUS, "JOY_AXIS9_MINUS" },
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
308
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
309 { JOY_BTN0, "JOY_BTN0" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
310 { JOY_BTN1, "JOY_BTN1" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
311 { JOY_BTN2, "JOY_BTN2" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
312 { JOY_BTN3, "JOY_BTN3" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
313 { JOY_BTN4, "JOY_BTN4" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
314 { JOY_BTN5, "JOY_BTN5" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
315 { JOY_BTN6, "JOY_BTN6" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
316 { JOY_BTN7, "JOY_BTN7" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
317 { JOY_BTN8, "JOY_BTN8" },
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
318 { JOY_BTN9, "JOY_BTN9" },
9822
1e761763566c Support for "internet" or "multimedia" keyboards in X11.
albeu
parents: 9734
diff changeset
319
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
320 { AR_PLAY, "AR_PLAY" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
321 { AR_PLAY_HOLD, "AR_PLAY_HOLD" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
322 { AR_NEXT, "AR_NEXT" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
323 { AR_NEXT_HOLD, "AR_NEXT_HOLD" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
324 { AR_PREV, "AR_PREV" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
325 { AR_PREV_HOLD, "AR_PREV_HOLD" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
326 { AR_MENU, "AR_MENU" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
327 { AR_MENU_HOLD, "AR_MENU_HOLD" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
328 { AR_VUP, "AR_VUP" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
329 { AR_VDOWN, "AR_VDOWN" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
330
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
331 { KEY_POWER, "POWER" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
332 { KEY_MENU, "MENU" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
333 { KEY_PLAY, "PLAY" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
334 { KEY_PAUSE, "PAUSE" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
335 { KEY_PLAYPAUSE, "PLAYPAUSE" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
336 { KEY_STOP, "STOP" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
337 { KEY_FORWARD, "FORWARD" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
338 { KEY_REWIND, "REWIND" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
339 { KEY_NEXT, "NEXT" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
340 { KEY_PREV, "PREV" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
341 { KEY_VOLUME_UP, "VOLUME_UP" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
342 { KEY_VOLUME_DOWN, "VOLUME_DOWN" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
343 { KEY_MUTE, "MUTE" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
344
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
345 // These are kept for backward compatibility
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
346 { KEY_PAUSE, "XF86_PAUSE" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
347 { KEY_STOP, "XF86_STOP" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
348 { KEY_PREV, "XF86_PREV" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
349 { KEY_NEXT, "XF86_NEXT" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
350
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
351 { KEY_CLOSE_WIN, "CLOSE_WIN" },
9822
1e761763566c Support for "internet" or "multimedia" keyboards in X11.
albeu
parents: 9734
diff changeset
352
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
353 { 0, NULL }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
354 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
355
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
356 // This is the default binding. The content of input.conf overrides these.
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
357 // The first arg is a null terminated array of key codes.
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
358 // The second is the command
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
359
25709
24ee00528e18 Make several mapping tables related to input processing const.
reimar
parents: 25626
diff changeset
360 static const mp_cmd_bind_t def_cmd_binds[] = {
5061
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
361
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
362 { { MOUSE_BTN3, 0 }, "seek 10" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
363 { { MOUSE_BTN4, 0 }, "seek -10" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
364 { { MOUSE_BTN5, 0 }, "volume 1" },
40a97bdff44c small changes in event handling
pontscho
parents: 5053
diff changeset
365 { { MOUSE_BTN6, 0 }, "volume -1" },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
366
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
367 #ifdef CONFIG_DVDNAV
27068
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
368 { { KEY_KP8, 0 }, "dvdnav up" }, // up
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
369 { { KEY_KP2, 0 }, "dvdnav down" }, // down
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
370 { { KEY_KP4, 0 }, "dvdnav left" }, // left
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
371 { { KEY_KP6, 0 }, "dvdnav right" }, // right
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
372 { { KEY_KP5, 0 }, "dvdnav menu" }, // menu
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
373 { { KEY_KPENTER, 0 }, "dvdnav select" }, // select
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
374 { { MOUSE_BTN0, 0 }, "dvdnav mouse" }, //select
d7e0e33c546f Change DVDNAV command key names.
ben
parents: 26877
diff changeset
375 { { KEY_KP7, 0 }, "dvdnav prev" }, // previous menu
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
376 #endif
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5218
diff changeset
377
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
378 { { KEY_RIGHT, 0 }, "seek 10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
379 { { KEY_LEFT, 0 }, "seek -10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
380 { { KEY_UP, 0 }, "seek 60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
381 { { KEY_DOWN, 0 }, "seek -60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
382 { { KEY_PAGE_UP, 0 }, "seek 600" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
383 { { KEY_PAGE_DOWN, 0 }, "seek -600" },
18100
826a0faa2a0f Switch audio delay keys to something more sane (+ to increase, - to decrease)
diego
parents: 17935
diff changeset
384 { { '+', 0 }, "audio_delay 0.100" },
826a0faa2a0f Switch audio delay keys to something more sane (+ to increase, - to decrease)
diego
parents: 17935
diff changeset
385 { { '-', 0 }, "audio_delay -0.100" },
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
386 { { '[', 0 }, "speed_mult 0.9091" },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
387 { { ']', 0 }, "speed_mult 1.1" },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
388 { { '{', 0 }, "speed_mult 0.5" },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
389 { { '}', 0 }, "speed_mult 2.0" },
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13642
diff changeset
390 { { KEY_BACKSPACE, 0 }, "speed_set 1.0" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
391 { { 'q', 0 }, "quit" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
392 { { KEY_ESC, 0 }, "quit" },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
393 { { 'p', 0 }, "pause" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
394 { { ' ', 0 }, "pause" },
13642
86f21713c356 Make '.' key default for framestepping
reimar
parents: 13626
diff changeset
395 { { '.', 0 }, "frame_step" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
396 { { KEY_HOME, 0 }, "pt_up_step 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
397 { { KEY_END, 0 }, "pt_up_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
398 { { '>', 0 }, "pt_step 1" },
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5061
diff changeset
399 { { KEY_ENTER, 0 }, "pt_step 1 1" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
400 { { '<', 0 }, "pt_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
401 { { KEY_INS, 0 }, "alt_src_step 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
402 { { KEY_DEL, 0 }, "alt_src_step -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
403 { { 'o', 0 }, "osd" },
18222
8c35bd43135f Add a new command: osd_show_property_text that show an expanded property
albeu
parents: 18206
diff changeset
404 { { 'I', 0 }, "osd_show_property_text \"${filename}\"" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
405 { { 'z', 0 }, "sub_delay -0.1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
406 { { 'x', 0 }, "sub_delay +0.1" },
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
407 { { 'g', 0 }, "sub_step -1" },
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
408 { { 'y', 0 }, "sub_step +1" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
409 { { '9', 0 }, "volume -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
410 { { '/', 0 }, "volume -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
411 { { '0', 0 }, "volume 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
412 { { '*', 0 }, "volume 1" },
23568
519e42b716aa The audio balance feature implemented with af_pan.
zuxy
parents: 23510
diff changeset
413 { { '(', 0 }, "balance -0.1" },
519e42b716aa The audio balance feature implemented with af_pan.
zuxy
parents: 23510
diff changeset
414 { { ')', 0 }, "balance 0.1" },
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6304
diff changeset
415 { { 'm', 0 }, "mute" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
416 { { '1', 0 }, "contrast -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
417 { { '2', 0 }, "contrast 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
418 { { '3', 0 }, "brightness -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
419 { { '4', 0 }, "brightness 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
420 { { '5', 0 }, "hue -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
421 { { '6', 0 }, "hue 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
422 { { '7', 0 }, "saturation -1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
423 { { '8', 0 }, "saturation 1" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
424 { { 'd', 0 }, "frame_drop" },
20973
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20950
diff changeset
425 { { 'D', 0 }, "step_property deinterlace" },
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4956
diff changeset
426 { { '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
427 { { 't', 0 }, "sub_pos +1" },
8921
b06f6d56d039 use 'a' for subtitle aligment instead for useless gui aboutbox
arpi
parents: 8627
diff changeset
428 { { 'a', 0 }, "sub_alignment" },
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7517
diff changeset
429 { { 'v', 0 }, "sub_visibility" },
20977
28714c74c444 Since vobsub_lang and sub_select do the same, 'b' and 'j' were bound
reimar
parents: 20973
diff changeset
430 { { 'j', 0 }, "sub_select" },
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
431 { { 'F', 0 }, "forced_subs_only" },
15046
b7aa70b05d76 Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents: 14718
diff changeset
432 { { '#', 0 }, "switch_audio" },
20950
4d9da4734f83 associated _ to 'step_property switch_video'
nicodvb
parents: 20915
diff changeset
433 { { '_', 0 }, "step_property switch_video" },
21008
b50f601f88e8 bind TAB to 'step_property switch_program'
nicodvb
parents: 20977
diff changeset
434 { { KEY_TAB, 0 }, "step_property switch_program" },
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
435 { { 'i', 0 }, "edl_mark" },
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27068
diff changeset
436 #ifdef CONFIG_TV
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
437 { { 'h', 0 }, "tv_step_channel 1" },
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
438 { { 'k', 0 }, "tv_step_channel -1" },
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
439 { { 'n', 0 }, "tv_step_norm" },
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6304
diff changeset
440 { { 'u', 0 }, "tv_step_chanlist" },
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4850
diff changeset
441 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27345
diff changeset
442 #ifdef CONFIG_TV_TELETEXT
23900
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
443 { { 'X', 0 }, "step_property teletext_mode 1" },
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
444 { { 'W', 0 }, "step_property teletext_page 1" },
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
445 { { 'Q', 0 }, "step_property teletext_page -1" },
b5cc28c45d73 Teletext support.
voroshil
parents: 23727
diff changeset
446 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
447 #ifdef CONFIG_JOYSTICK
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
448 { { JOY_AXIS0_PLUS, 0 }, "seek 10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
449 { { JOY_AXIS0_MINUS, 0 }, "seek -10" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
450 { { JOY_AXIS1_MINUS, 0 }, "seek 60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
451 { { JOY_AXIS1_PLUS, 0 }, "seek -60" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
452 { { JOY_BTN0, 0 }, "pause" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
453 { { JOY_BTN1, 0 }, "osd" },
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
454 { { JOY_BTN2, 0 }, "volume 1"},
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
455 { { JOY_BTN3, 0 }, "volume -1"},
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
456 #endif
27388
ac03760f7fcc Rename all preprocessor directives related to Apple / Mac OS X.
diego
parents: 27370
diff changeset
457 #ifdef CONFIG_APPLE_REMOTE
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
458 { { AR_PLAY, 0}, "pause" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
459 { { AR_PLAY_HOLD, 0}, "quit" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
460 { { AR_NEXT, 0 }, "seek 30" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
461 { { AR_NEXT_HOLD, 0 }, "seek 120" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
462 { { AR_PREV, 0 }, "seek -10" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
463 { { AR_PREV_HOLD, 0 }, "seek -120" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
464 { { AR_MENU, 0 }, "osd" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
465 { { AR_MENU_HOLD, 0 }, "mute" },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
466 { { AR_VUP, 0 }, "volume 1"},
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
467 { { AR_VDOWN, 0 }, "volume -1"},
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
468 #endif
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10917
diff changeset
469 { { 'T', 0 }, "vo_ontop" },
4732
876f0ea71526 vo_fullscreen added
alex
parents: 4657
diff changeset
470 { { 'f', 0 }, "vo_fullscreen" },
19833
10f36060390a Add repeated screenshot mode to vf_screenshot.
eugeni
parents: 19777
diff changeset
471 { { 's', 0 }, "screenshot 0" },
10f36060390a Add repeated screenshot mode to vf_screenshot.
eugeni
parents: 19777
diff changeset
472 { { 'S', 0 }, "screenshot 1" },
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6183
diff changeset
473 { { 'w', 0 }, "panscan -0.1" },
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6183
diff changeset
474 { { 'e', 0 }, "panscan +0.1" },
9822
1e761763566c Support for "internet" or "multimedia" keyboards in X11.
albeu
parents: 9734
diff changeset
475
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
476 { { KEY_POWER, 0 }, "quit" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
477 { { KEY_MENU, 0 }, "osd" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
478 { { KEY_PLAY, 0 }, "pause" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
479 { { KEY_PAUSE, 0 }, "pause" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
480 { { KEY_PLAYPAUSE, 0 }, "pause" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
481 { { KEY_STOP, 0 }, "quit" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
482 { { KEY_FORWARD, 0 }, "seek 60" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
483 { { KEY_REWIND, 0 }, "seek -60" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
484 { { KEY_NEXT, 0 }, "pt_step 1" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
485 { { KEY_PREV, 0 }, "pt_step -1" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
486 { { KEY_VOLUME_UP, 0 }, "volume 1" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
487 { { KEY_VOLUME_DOWN, 0 }, "volume -1" },
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
488 { { KEY_MUTE, 0 }, "mute" },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
489
16892
3470c810527b libvo input cleanup: remove the dependency on libinput,
albeu
parents: 16860
diff changeset
490 { { KEY_CLOSE_WIN, 0 }, "quit" },
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
491
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19110
diff changeset
492 { { '!', 0 }, "seek_chapter -1" },
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19110
diff changeset
493 { { '@', 0 }, "seek_chapter 1" },
25576
54512595b406 properties to change angle; patch by oattila chello hu
nicodvb
parents: 25502
diff changeset
494 { { 'A', 0 }, "switch_angle 1" },
26877
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26797
diff changeset
495 { { 'U', 0 }, "stop" },
9822
1e761763566c Support for "internet" or "multimedia" keyboards in X11.
albeu
parents: 9734
diff changeset
496
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
497 { { 0 }, NULL }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
498 };
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
499
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
500
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
501 #ifdef CONFIG_GUI
25709
24ee00528e18 Make several mapping tables related to input processing const.
reimar
parents: 25626
diff changeset
502 static const mp_cmd_bind_t gui_def_cmd_binds[] = {
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
503
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
504 { { 'l', 0 }, "gui_loadfile" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
505 { { 't', 0 }, "gui_loadsubtitle" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
506 { { KEY_ENTER, 0 }, "gui_play" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
507 { { KEY_ESC, 0 }, "gui_stop" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
508 { { 'p', 0 }, "gui_playlist" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
509 { { 'r', 0 }, "gui_preferences" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
510 { { 'c', 0 }, "gui_skinbrowser" },
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
511
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
512 { { 0 }, NULL }
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
513 };
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
514 #endif
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
515
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
516 #ifndef MP_MAX_KEY_FD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
517 #define MP_MAX_KEY_FD 10
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
518 #endif
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 #ifndef MP_MAX_CMD_FD
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
521 #define MP_MAX_CMD_FD 10
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
522 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
523
5473
39dae98304af dvdnav event added, queue size 10->100, added void* event arg type - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
524 #define CMD_QUEUE_SIZE 100
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
525
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
526 typedef struct mp_input_fd {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
527 int fd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
528 void* read_func;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
529 mp_close_func_t close_func;
24140
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
530 unsigned eof : 1;
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
531 unsigned drop : 1;
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
532 unsigned dead : 1;
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
533 unsigned got_cmd : 1;
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
534 unsigned no_select : 1;
e92ef0d2a976 Change bitfield to unsigned so that we get the usual truth values
reimar
parents: 24138
diff changeset
535 unsigned no_readfunc_retval : 1;
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
536 // These fields are for the cmd fds.
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
537 char* buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
538 int pos,size;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
539 } mp_input_fd_t;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
540
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
541 typedef struct mp_cmd_filter_st mp_cmd_filter_t;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
542
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
543 struct mp_cmd_filter_st {
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
544 mp_input_cmd_filter filter;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
545 void* ctx;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
546 mp_cmd_filter_t* next;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
547 };
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
548
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
549 typedef struct mp_cmd_bind_section_st mp_cmd_bind_section_t;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
550
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
551 struct mp_cmd_bind_section_st {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
552 mp_cmd_bind_t* cmd_binds;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
553 char* section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
554 mp_cmd_bind_section_t* next;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
555 };
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
556
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
557 // These are the user defined binds
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
558 static mp_cmd_bind_section_t* cmd_binds_section = NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
559 static char* section = NULL;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
560 static mp_cmd_bind_t* cmd_binds = NULL;
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
561 static mp_cmd_bind_t* cmd_binds_default = NULL;
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
562 static mp_cmd_filter_t* cmd_filters = NULL;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
563
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
564 // Callback to allow the menu filter to grab the incoming keys
25502
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25319
diff changeset
565 int (*mp_input_key_cb)(int code) = NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
566
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25576
diff changeset
567 int async_quit_request;
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25576
diff changeset
568
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
569 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
570 static unsigned int num_key_fd = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
571 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
572 static unsigned int num_cmd_fd = 0;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
573 static mp_cmd_t* cmd_queue[CMD_QUEUE_SIZE];
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
574 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
575
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
576 // this is the key currently down
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
577 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
578 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
579
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
580 // Autorepeat stuff
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
581 static short ar_state = -1;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
582 static mp_cmd_t* ar_cmd = NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
583 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
584
10215
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
585 static int use_joystick = 1, use_lirc = 1, use_lircc = 1;
29023
d1647b4a4838 Rename 'default-binds' input option to 'default-bindings'.
diego
parents: 28843
diff changeset
586 static int default_bindings = 1;
6551
c930dffac92c Fix after the patch of Dominik Mierzejewski. Try the user's input.conf
albeu
parents: 6545
diff changeset
587 static char* config_file = "input.conf";
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
588
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
589 /* Apple Remote */
27388
ac03760f7fcc Rename all preprocessor directives related to Apple / Mac OS X.
diego
parents: 27370
diff changeset
590 #ifdef CONFIG_APPLE_REMOTE
26767
5f304bb41cd9 Keep AppleIR enabled by default on MacOSX but have it disable on Linux.
ben
parents: 26765
diff changeset
591 static int use_ar = 1;
26797
029a3d52e15e fix compilation of input.c if neither macosx/linux apple remote code
ben
parents: 26767
diff changeset
592 #else
26765
2873fbda71f8 Do not enable AppleIR by default.
ben
parents: 26763
diff changeset
593 static int use_ar = 0;
26767
5f304bb41cd9 Keep AppleIR enabled by default on MacOSX but have it disable on Linux.
ben
parents: 26765
diff changeset
594 #endif
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
595
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
596 static char* js_dev = NULL;
26763
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
597 static char* ar_dev = NULL;
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
598
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
599 static char* in_file = NULL;
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
600 static int in_file_fd = -1;
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
601
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
602 static int mp_input_print_key_list(m_option_t* cfg);
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
603 static int mp_input_print_cmd_list(m_option_t* cfg);
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
604
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
605 // Our command line options
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
606 static m_option_t input_conf[] = {
4836
f832f7bcf76b Added an option to select the input config file
albeu
parents: 4826
diff changeset
607 { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
26763
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
608 { "ar-dev", &ar_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
609 { "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
610 { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
611 { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
612 { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
613 { "js-dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
614 { "file", &in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
29023
d1647b4a4838 Rename 'default-binds' input option to 'default-bindings'.
diego
parents: 28843
diff changeset
615 { "default-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
d1647b4a4838 Rename 'default-binds' input option to 'default-bindings'.
diego
parents: 28843
diff changeset
616 { "nodefault-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
617 { NULL, NULL, 0, 0, 0, 0, NULL}
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
618 };
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
619
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
620 static m_option_t mp_input_opts[] = {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
621 { "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
622 { "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
623 { "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
624 { "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
625 { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
10215
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
626 { "nolircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
627 { "lircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
628 { "noar", &use_ar, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
629 { "ar", &use_ar, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
630 { NULL, NULL, 0, 0, 0, 0, NULL}
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
631 };
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
632
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
633 static int
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
634 mp_input_default_cmd_func(int fd,char* buf, int l);
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
635
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
636 static char*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
637 mp_input_get_key_name(int key);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
638
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
639
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
640 int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
641 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
642 if(num_cmd_fd == MP_MAX_CMD_FD) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
643 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyCmdFds,fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
644 return 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
645 }
24137
46d7af639861 Fix invalid fd check, the bug is somewhere else though.
reimar
parents: 24136
diff changeset
646 if (select && fd < 0) {
24136
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
647 mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_cmd_fd", fd);
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
648 return 0;
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
649 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
650
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
651 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
652 cmd_fds[num_cmd_fd].fd = fd;
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
653 cmd_fds[num_cmd_fd].read_func = read_func ? read_func : mp_input_default_cmd_func;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
654 cmd_fds[num_cmd_fd].close_func = close_func;
24141
a911d41e4e99 Revert r24158, it is not necessary with unsigned bitfield
reimar
parents: 24140
diff changeset
655 cmd_fds[num_cmd_fd].no_select = !select;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
656 num_cmd_fd++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
657
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
658 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
659 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
660
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
661 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
662 mp_input_rm_cmd_fd(int fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
663 unsigned int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
664
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
665 for(i = 0; i < num_cmd_fd; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
666 if(cmd_fds[i].fd == fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
667 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
668 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
669 if(i == num_cmd_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
670 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
671 if(cmd_fds[i].close_func)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
672 cmd_fds[i].close_func(cmd_fds[i].fd);
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
673 if(cmd_fds[i].buffer)
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
674 free(cmd_fds[i].buffer);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
675
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
676 if(i + 1 < num_cmd_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
677 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
678 num_cmd_fd--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
679 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
680
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
681 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
682 mp_input_rm_key_fd(int fd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
683 unsigned int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
684
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
685 for(i = 0; i < num_key_fd; i++) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
686 if(key_fds[i].fd == fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
687 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
688 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
689 if(i == num_key_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
690 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
691 if(key_fds[i].close_func)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
692 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
693
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
694 if(i + 1 < num_key_fd)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
695 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
696 num_key_fd--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
697 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
698
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
699 int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
700 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
701 if(num_key_fd == MP_MAX_KEY_FD) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
702 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds,fd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
703 return 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
704 }
24137
46d7af639861 Fix invalid fd check, the bug is somewhere else though.
reimar
parents: 24136
diff changeset
705 if (select && fd < 0) {
24136
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
706 mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_key_fd", fd);
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
707 return 0;
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
708 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
709
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
710 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
711 key_fds[num_key_fd].fd = fd;
24128
1fc0b327dbfc Remove unused function
uau
parents: 24127
diff changeset
712 key_fds[num_key_fd].read_func = read_func;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
713 key_fds[num_key_fd].close_func = close_func;
24141
a911d41e4e99 Revert r24158, it is not necessary with unsigned bitfield
reimar
parents: 24140
diff changeset
714 key_fds[num_key_fd].no_select = !select;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
715 num_key_fd++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
716
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
717 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
718 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
719
24132
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
720 int
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
721 mp_input_add_event_fd(int fd, void (*read_func)(void))
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
722 {
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
723 if(num_key_fd == MP_MAX_KEY_FD) {
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
724 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds,fd);
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
725 return 0;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
726 }
24136
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
727 if (fd < 0) {
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
728 mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_event_fd", fd);
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
729 return 0;
a659694f00bc HACK: check added fds for validity because otherwise mplayer
reimar
parents: 24135
diff changeset
730 }
24132
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
731
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
732 memset(&key_fds[num_key_fd],0,sizeof(mp_input_fd_t));
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
733 key_fds[num_key_fd].fd = fd;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
734 key_fds[num_key_fd].read_func = read_func;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
735 key_fds[num_key_fd].close_func = NULL;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
736 key_fds[num_key_fd].no_readfunc_retval = 1;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
737 num_key_fd++;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
738
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
739 return 1;
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
740 }
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
741
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
742 void mp_input_rm_event_fd(int fd)
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
743 {
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
744 mp_input_rm_key_fd(fd);
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
745 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
746
25319
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
747 int mp_input_parse_and_queue_cmds(const char *str) {
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
748 int cmd_num = 0;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
749
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
750 while (*str == '\n' || *str == '\r' || *str == ' ')
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
751 ++str;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
752 while (*str) {
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
753 mp_cmd_t *cmd;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
754 size_t len = strcspn(str, "\r\n");
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
755 char *cmdbuf = malloc(len+1);
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
756 av_strlcpy(cmdbuf, str, len+1);
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
757 cmd = mp_input_parse_cmd(cmdbuf);
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
758 if (cmd) {
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
759 mp_input_queue_cmd(cmd);
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
760 ++cmd_num;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
761 }
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
762 str += len;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
763 while (*str == '\n' || *str == '\r' || *str == ' ')
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
764 ++str;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
765 free(cmdbuf);
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
766 }
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
767 return cmd_num;
50a30be5300c Add new function for parsing and queueing multi-commands separated by \n or \r.
ulion
parents: 25303
diff changeset
768 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
769
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
770 mp_cmd_t*
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
771 mp_input_parse_cmd(char* str) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
772 int i,l;
28835
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
773 int pausing = -1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
774 char *ptr,*e;
25766
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
775 mp_cmd_t *cmd;
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
776 const mp_cmd_t *cmd_def;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
777
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
778 #ifdef MP_DEBUG
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
779 assert(str != NULL);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
780 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
781
25303
9139c368a493 Ignore heading spaces when parsing command.
ulion
parents: 25263
diff changeset
782 // Ignore heading spaces.
9139c368a493 Ignore heading spaces when parsing command.
ulion
parents: 25263
diff changeset
783 while (str[0] == ' ' || str[0] == '\t')
9139c368a493 Ignore heading spaces when parsing command.
ulion
parents: 25263
diff changeset
784 ++str;
9139c368a493 Ignore heading spaces when parsing command.
ulion
parents: 25263
diff changeset
785
13991
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
786 if (strncmp(str, "pausing ", 8) == 0) {
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
787 pausing = 1;
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
788 str = &str[8];
17241
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
789 } else if (strncmp(str, "pausing_keep ", 13) == 0) {
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
790 pausing = 2;
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
791 str = &str[13];
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
792 } else if (strncmp(str, "pausing_toggle ", 15) == 0) {
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
793 pausing = 3;
3ab613cdf96a add "pausing_keep" and "pausing_toggle" input cmd prefixes
ods15
parents: 16974
diff changeset
794 str = &str[15];
27633
6a7cdd00599f Add an experimental pausing_keep_force slave mode command prefix
reimar
parents: 27391
diff changeset
795 } else if (strncmp(str, "pausing_keep_force ", 19) == 0) {
6a7cdd00599f Add an experimental pausing_keep_force slave mode command prefix
reimar
parents: 27391
diff changeset
796 pausing = 4;
6a7cdd00599f Add an experimental pausing_keep_force slave mode command prefix
reimar
parents: 27391
diff changeset
797 str = &str[19];
13991
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
798 }
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
799
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
800 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
801 /* NOTHING */;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
802 if(ptr[0] != '\0')
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
803 l = ptr-str;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
804 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
805 l = strlen(str);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
806
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
807 if(l == 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
808 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
809
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
810 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
811 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
812 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
813 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
814
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
815 if(mp_cmds[i].name == NULL)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
816 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
817
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
818 cmd_def = &mp_cmds[i];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
819
18885
5c8acc972551 rm unnecesary casts from void* - part 4
reynaldo
parents: 18878
diff changeset
820 cmd = calloc(1, sizeof(mp_cmd_t));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
821 cmd->id = cmd_def->id;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
822 cmd->name = strdup(cmd_def->name);
28835
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
823 if (pausing == -1) {
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
824 switch (cmd->id) {
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
825 case MP_CMD_KEYDOWN_EVENTS:
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
826 case MP_CMD_SET_MOUSE_POS:
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
827 pausing = 4; break;
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
828 default:
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
829 pausing = 0; break;
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
830 }
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28112
diff changeset
831 }
13991
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13946
diff changeset
832 cmd->pausing = pausing;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
833
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
834 ptr = str;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
835
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
836 for(i=0; ptr && i < MP_CMD_MAX_ARGS; i++) {
24816
ba929c5ee0bc Fix input command parser for using only tab to separate the arguments.
ulion
parents: 24424
diff changeset
837 while(ptr[0] != ' ' && ptr[0] != '\t' && ptr[0] != '\0') ptr++;
ba929c5ee0bc Fix input command parser for using only tab to separate the arguments.
ulion
parents: 24424
diff changeset
838 if(ptr[0] == '\0') break;
4826
a0e8eac85aca Also use tab as cmd arg sepparator
albeu
parents: 4821
diff changeset
839 while(ptr[0] == ' ' || ptr[0] == '\t') ptr++;
24878
6163f5ead8a5 Fix input.conf parse bug when comment follows key binding in the same line.
ulion
parents: 24816
diff changeset
840 if(ptr[0] == '\0' || ptr[0] == '#') break;
6757
f72fc85934e5 10L bugs founds by Jindrich Makovicka <makovicki at KMLinux dot fjfi dot cvuti dot cz>
albeu
parents: 6551
diff changeset
841 cmd->args[i].type = cmd_def->args[i].type;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
842 switch(cmd_def->args[i].type) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
843 case MP_CMD_ARG_INT:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
844 errno = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
845 cmd->args[i].v.i = atoi(ptr);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
846 if(errno != 0) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
847 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrArgMustBeInt,cmd_def->name,i+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
848 ptr = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
849 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
850 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
851 case MP_CMD_ARG_FLOAT:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
852 errno = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
853 cmd->args[i].v.f = atof(ptr);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
854 if(errno != 0) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
855 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrArgMustBeFloat,cmd_def->name,i+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
856 ptr = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
857 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
858 break;
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
859 case MP_CMD_ARG_STRING: {
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
860 char term;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
861 char* ptr2 = ptr, *start;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
862
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
863 if(ptr[0] == '\'' || ptr[0] == '"') {
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
864 term = ptr[0];
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
865 ptr2++;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
866 } else
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
867 term = ' ';
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
868 start = ptr2;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
869 while(1) {
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
870 e = strchr(ptr2,term);
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
871 if(!e) break;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
872 if(e <= ptr2 || *(e - 1) != '\\') break;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
873 ptr2 = e + 1;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
874 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
875
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
876 if(term != ' ' && (!e || e[0] == '\0')) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
877 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnterminatedArg,cmd_def->name,i+1);
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
878 ptr = NULL;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
879 break;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
880 } else if(!e) e = ptr+strlen(ptr);
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
881 l = e-start;
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
882 ptr2 = start;
15162
9c7c363837c9 when parsing one cmd argument, only un-escape _this_ argument, not the following ones
aurel
parents: 15128
diff changeset
883 for(e = strchr(ptr2,'\\') ; e && e<start+l ; e = strchr(ptr2,'\\')) {
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
884 memmove(e,e+1,strlen(e));
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
885 ptr2 = e + 1;
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 10594
diff changeset
886 l--;
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
887 }
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18858
diff changeset
888 cmd->args[i].v.s = malloc(l+1);
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 10594
diff changeset
889 strncpy(cmd->args[i].v.s,start,l);
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 10594
diff changeset
890 cmd->args[i].v.s[l] = '\0';
14681
f6d4ef286a6b fix "Unknown argument" with cmd containing spaces
aurel
parents: 14542
diff changeset
891 if(term != ' ') ptr += l+2;
8225
c032962b51a1 Add quoting support for string arguments (fix loading of file with space in
albeu
parents: 8196
diff changeset
892 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
893 case -1:
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
894 ptr = NULL;
14325
000250ff9516 Add missing break that caused an irritating error message all the time when using slave mode.
reimar
parents: 14087
diff changeset
895 break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
896 default :
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
897 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownArg,i);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
898 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
899 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
900 cmd->nargs = i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
901
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
902 if(cmd_def->nargs > cmd->nargs) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
903 /* mp_msg(MSGT_INPUT,MSGL_ERR,"Got command '%s' but\n",str); */
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
904 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2FewArgs,cmd_def->name,cmd_def->nargs,cmd->nargs);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
905 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
906 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
907 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
908
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
909 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
910 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
911 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
912 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
913 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
914
5200
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
915 if(i < MP_CMD_MAX_ARGS)
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
916 cmd->args[i].type = -1;
022c957633a3 10L bug fix. Thx to Fredrik Kuivinen <freku045@student.liu.se>.
albeu
parents: 5198
diff changeset
917
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
918 return cmd;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
919 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
920
29361
94d2be22a185 Increase slave mode buffer so that one can load files with a deeper
ben
parents: 29263
diff changeset
921 #define MP_CMD_MAX_SIZE 4096
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
922
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
923 static int
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
924 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
925 char* end;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
926 (*ret) = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
927
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
928 // Allocate the buffer if it doesn't exist
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
929 if(!mp_fd->buffer) {
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18858
diff changeset
930 mp_fd->buffer = malloc(MP_CMD_MAX_SIZE);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
931 mp_fd->pos = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
932 mp_fd->size = MP_CMD_MAX_SIZE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
933 }
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
934
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
935 // Get some data if needed/possible
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
936 while (!mp_fd->got_cmd && !mp_fd->eof && (mp_fd->size - mp_fd->pos > 1) ) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
937 int r = ((mp_cmd_func_t)mp_fd->read_func)(mp_fd->fd,mp_fd->buffer+mp_fd->pos,mp_fd->size - 1 - mp_fd->pos);
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
938 // Error ?
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
939 if(r < 0) {
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
940 switch(r) {
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
941 case MP_INPUT_ERROR:
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
942 case MP_INPUT_DEAD:
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
943 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingCmdFd,mp_fd->fd,strerror(errno));
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
944 case MP_INPUT_NOTHING:
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
945 return r;
15825
8549fc0fb5b1 consume empty lirc events at once.
reimar
parents: 15706
diff changeset
946 case MP_INPUT_RETRY:
8549fc0fb5b1 consume empty lirc events at once.
reimar
parents: 15706
diff changeset
947 continue;
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
948 }
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
949 // EOF ?
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
950 } else if(r == 0) {
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
951 mp_fd->eof = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
952 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
953 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
954 mp_fd->pos += r;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
955 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
956 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
957
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
958 mp_fd->got_cmd = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
959
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
960 while(1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
961 int l = 0;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
962 // Find the cmd end
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
963 mp_fd->buffer[mp_fd->pos] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
964 end = strchr(mp_fd->buffer,'\n');
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
965 // No cmd end ?
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
966 if(!end) {
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
967 // If buffer is full we must drop all until the next \n
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
968 if(mp_fd->size - mp_fd->pos <= 1) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
969 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCmdBufferFullDroppingContent,mp_fd->fd);
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
970 mp_fd->pos = 0;
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
971 mp_fd->drop = 1;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
972 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
973 break;
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
974 }
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
975 // We already have a cmd : set the got_cmd flag
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
976 else if((*ret)) {
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
977 mp_fd->got_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
978 break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
979 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
980
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
981 l = end - mp_fd->buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
982
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
983 // Not dropping : put the cmd in ret
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
984 if (!mp_fd->drop) {
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18858
diff changeset
985 (*ret) = malloc(l+1);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
986 strncpy((*ret),mp_fd->buffer,l);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
987 (*ret)[l] = '\0';
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
988 } else { // Remove the dropping flag
24127
faf9baa673c0 Use bitfield instead of manual bit fiddling in input.c
uau
parents: 24105
diff changeset
989 mp_fd->drop = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
990 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
991 if( mp_fd->pos - (l+1) > 0)
5571
124bfc43c044 Fix the bug pointed out by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
albeu
parents: 5473
diff changeset
992 memmove(mp_fd->buffer,end+1,mp_fd->pos-(l+1));
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
993 mp_fd->pos -= l+1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
994 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
995
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
996 if(*ret)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
997 return 1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
998 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
999 return MP_INPUT_NOTHING;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1000 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1001
7912
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1002 static int
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1003 mp_input_default_cmd_func(int fd,char* buf, int l) {
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1004
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1005 while(1) {
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1006 int r = read(fd,buf,l);
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1007 // Error ?
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1008 if(r < 0) {
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1009 if(errno == EINTR)
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1010 continue;
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1011 else if(errno == EAGAIN)
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1012 return MP_INPUT_NOTHING;
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1013 return MP_INPUT_ERROR;
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1014 // EOF ?
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1015 }
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1016 return r;
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1017 }
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1018
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1019 }
e15e76559bd5 Reverse Arpi's commit and put the right fix in place.
albeu
parents: 7911
diff changeset
1020
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1021
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1022 void
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1023 mp_input_add_cmd_filter(mp_input_cmd_filter func, void* ctx) {
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8225
diff changeset
1024 mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t))/*, *prev*/;
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1025
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1026 filter->filter = func;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1027 filter->ctx = ctx;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1028 filter->next = cmd_filters;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1029 cmd_filters = filter;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1030 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1031
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1032
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1033 static char*
25766
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
1034 mp_input_find_bind_for_key(const 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
1035 int j;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1036
21432
6f2116ad422a Simplify: 1 > 0 seems to be a rather safe assumption to make ;-)
reimar
parents: 21042
diff changeset
1037 if (n <= 0) return NULL;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1038 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
1039 int found = 1,s;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1040 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
1041 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
1042 found = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1043 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1044 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1045 }
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1046 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
1047 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1048 }
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1049 return binds[j].cmd;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1050 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1051
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1052 static mp_cmd_bind_section_t*
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1053 mp_input_get_bind_section(char *section) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1054 mp_cmd_bind_section_t* bind_section = cmd_binds_section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1055
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1056 if (section==NULL) section="default";
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1057 while (bind_section) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1058 if(strcmp(section,bind_section->section)==0) return bind_section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1059 if(bind_section->next==NULL) break;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1060 bind_section=bind_section->next;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1061 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1062 if(bind_section) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1063 bind_section->next=malloc(sizeof(mp_cmd_bind_section_t));
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1064 bind_section=bind_section->next;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1065 } else {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1066 cmd_binds_section=malloc(sizeof(mp_cmd_bind_section_t));
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1067 bind_section=cmd_binds_section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1068 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1069 bind_section->cmd_binds=NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1070 bind_section->section=strdup(section);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1071 bind_section->next=NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1072 return bind_section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1073 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1074
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1075 static mp_cmd_t*
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1076 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
1077 char* cmd = NULL;
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1078 mp_cmd_t* ret;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1079
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1080 if(cmd_binds)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1081 cmd = mp_input_find_bind_for_key(cmd_binds,n,keys);
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1082 if(cmd_binds_default && cmd == NULL)
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1083 cmd = mp_input_find_bind_for_key(cmd_binds_default,n,keys);
29023
d1647b4a4838 Rename 'default-binds' input option to 'default-bindings'.
diego
parents: 28843
diff changeset
1084 if(default_bindings && cmd == NULL)
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1085 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
1086
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1087 if(cmd == NULL) {
16793
8d4fb5469efb Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents: 16492
diff changeset
1088 mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,mp_input_get_key_name(keys[0]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1089 if(n > 1) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1090 int s;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1091 for(s=1; s < n; s++)
6183
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6138
diff changeset
1092 mp_msg(MSGT_INPUT,MSGL_WARN,"-%s",mp_input_get_key_name(keys[s]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1093 }
6183
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6138
diff changeset
1094 mp_msg(MSGT_INPUT,MSGL_WARN," \n");
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1095 return NULL;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1096 }
21965
5a2311125dc4 Add ignore key bind
reimar
parents: 21743
diff changeset
1097 if (strcmp(cmd, "ignore") == 0) return NULL;
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1098 ret = mp_input_parse_cmd(cmd);
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1099 if(!ret) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1100 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrInvalidCommandForKey,mp_input_get_key_name(key_down[0]));
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1101 if( num_key_down > 1) {
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1102 unsigned int s;
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1103 for(s=1; s < num_key_down; s++)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1104 mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(key_down[s]));
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1105 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1106 mp_msg(MSGT_INPUT,MSGL_ERR," : %s \n",cmd);
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1107 }
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1108 return ret;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1109 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1110
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1111
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1112 static mp_cmd_t*
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1113 interpret_key(int code, int paused)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1114 {
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1115 unsigned int j;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1116 mp_cmd_t* ret;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1117
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1118 if(mp_input_key_cb) {
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1119 if (code & MP_KEY_DOWN)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1120 return NULL;
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1121 code &= ~(MP_KEY_DOWN|MP_NO_REPEAT_KEY);
25502
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25319
diff changeset
1122 if (mp_input_key_cb(code))
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1123 return NULL;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1124 }
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1125
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1126 if(code & MP_KEY_DOWN) {
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1127 if(num_key_down > MP_MAX_KEY_DOWN) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1128 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2ManyKeyDowns);
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1129 return NULL;
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1130 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1131 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
1132 // Check if we don't already have this key as pushed
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1133 for(j = 0; j < num_key_down; j++) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1134 if(key_down[j] == code)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1135 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1136 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1137 if(j != num_key_down)
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1138 return NULL;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1139 key_down[num_key_down] = code;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1140 num_key_down++;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1141 last_key_down = GetTimer();
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1142 ar_state = 0;
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1143 return NULL;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1144 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1145 // 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
1146 // 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
1147 // send only release event
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1148 for(j = 0; j < num_key_down; j++) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1149 if(key_down[j] == code)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1150 break;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1151 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1152 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
1153 if(num_key_down > MP_MAX_KEY_DOWN) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1154 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2ManyKeyDowns);
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1155 return NULL;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1156 }
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1157 key_down[num_key_down] = code;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1158 num_key_down++;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1159 last_key_down = 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1160 }
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1161 // We ignore key from last combination
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1162 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
1163 // Remove the key
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1164 if(j+1 < num_key_down)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1165 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
1166 num_key_down--;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1167 last_key_down = 0;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1168 ar_state = -1;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1169 if(ar_cmd) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1170 mp_cmd_free(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1171 ar_cmd = NULL;
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1172 }
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1173 return ret;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1174 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1175
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1176 static mp_cmd_t *check_autorepeat(int paused)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1177 {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1178 // No input : autorepeat ?
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1179 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
1180 unsigned int t = GetTimer();
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1181 // First time : wait delay
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1182 if(ar_state == 0 && (t - last_key_down) >= ar_delay*1000) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1183 ar_cmd = mp_input_get_cmd_from_keys(num_key_down,key_down,paused);
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1184 if(!ar_cmd) {
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1185 ar_state = -1;
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1186 return NULL;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1187 }
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1188 ar_state = 1;
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1189 last_ar = t;
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1190 return mp_cmd_clone(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1191 // Then send rate / sec event
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1192 } 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
1193 last_ar = t;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1194 return mp_cmd_clone(ar_cmd);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1195 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1196 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1197 return NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1198 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1199
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1200
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1201 static mp_cmd_t *read_events(int time, int paused)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1202 {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1203 int i;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1204 int got_cmd = 0;
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1205 mp_cmd_t *autorepeat_cmd;
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1206 #ifdef HAVE_POSIX_SELECT
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1207 fd_set fds;
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1208 #endif
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1209 for (i = 0; i < num_key_fd; i++)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1210 if (key_fds[i].dead) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1211 mp_input_rm_key_fd(key_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1212 i--;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1213 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1214 for (i = 0; i < num_cmd_fd; i++)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1215 if (cmd_fds[i].dead || cmd_fds[i].eof) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1216 mp_input_rm_cmd_fd(cmd_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1217 i--;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1218 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1219 else if (cmd_fds[i].got_cmd)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1220 got_cmd = 1;
22751
3d83d77f5a6b Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in line
diego
parents: 22667
diff changeset
1221 #ifdef HAVE_POSIX_SELECT
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1222 FD_ZERO(&fds);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1223 if (!got_cmd) {
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1224 int max_fd = 0, num_fd = 0;
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1225 for (i = 0; i < num_key_fd; i++) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1226 if (key_fds[i].no_select)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1227 continue;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1228 if (key_fds[i].fd > max_fd)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1229 max_fd = key_fds[i].fd;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1230 FD_SET(key_fds[i].fd, &fds);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1231 num_fd++;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1232 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1233 for (i = 0; i < num_cmd_fd; i++) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1234 if (cmd_fds[i].no_select)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1235 continue;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1236 if (cmd_fds[i].fd > max_fd)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1237 max_fd = cmd_fds[i].fd;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1238 FD_SET(cmd_fds[i].fd, &fds);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1239 num_fd++;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1240 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1241 if (num_fd > 0) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1242 struct timeval tv, *time_val;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1243 if (time >= 0) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1244 tv.tv_sec = time / 1000;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1245 tv.tv_usec = (time % 1000) * 1000;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1246 time_val = &tv;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1247 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1248 else
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1249 time_val = NULL;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1250 if (select(max_fd + 1, &fds, NULL, NULL, time_val) < 0) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1251 if (errno != EINTR)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1252 mp_msg(MSGT_INPUT, MSGL_ERR, MSGTR_INPUT_INPUT_ErrSelect,
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1253 strerror(errno));
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1254 FD_ZERO(&fds);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1255 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1256 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1257 }
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1258 #else
26686
45fc8351ca9b usec_sleep(0) is not the same as not sleeping at all.
reimar
parents: 26543
diff changeset
1259 if (!got_cmd && time)
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1260 usec_sleep(time * 1000);
9836
8016c8455f1d allow select()less compilation
faust3
parents: 9822
diff changeset
1261 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1262
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1263
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1264 for (i = 0; i < num_key_fd; i++) {
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1265 int code;
22751
3d83d77f5a6b Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in line
diego
parents: 22667
diff changeset
1266 #ifdef HAVE_POSIX_SELECT
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1267 if (!key_fds[i].no_select && !FD_ISSET(key_fds[i].fd, &fds))
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1268 continue;
9836
8016c8455f1d allow select()less compilation
faust3
parents: 9822
diff changeset
1269 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1270
24132
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
1271 if (key_fds[i].no_readfunc_retval) { // getch2 handler special-cased for now
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24131
diff changeset
1272 ((void (*)(void))key_fds[i].read_func)();
24134
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1273 if (cmd_queue_length)
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1274 return NULL;
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1275 code = mplayer_get_key(0);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1276 if (code < 0)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1277 code = MP_INPUT_NOTHING;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1278 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1279 else
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1280 code = ((mp_key_func_t)key_fds[i].read_func)(key_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1281 if (code >= 0) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1282 mp_cmd_t *ret = interpret_key(code, paused);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1283 if (ret)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1284 return ret;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1285 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1286 else if (code == MP_INPUT_ERROR)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1287 mp_msg(MSGT_INPUT, MSGL_ERR, MSGTR_INPUT_INPUT_ErrOnKeyInFd,
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1288 key_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1289 else if (code == MP_INPUT_DEAD) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1290 mp_msg(MSGT_INPUT, MSGL_ERR, MSGTR_INPUT_INPUT_ErrDeadKeyOnFd,
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1291 key_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1292 key_fds[i].dead = 1;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1293 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1294 }
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1295 autorepeat_cmd = check_autorepeat(paused);
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1296 if (autorepeat_cmd)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1297 return autorepeat_cmd;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1298
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1299 for (i = 0; i < num_cmd_fd; i++) {
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1300 char *cmd;
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1301 int r;
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1302 #ifdef HAVE_POSIX_SELECT
24225
d15e78b799b5 Process any waiting commands (got_cmd set). Should fix e.g. smplayer.
reimar
parents: 24141
diff changeset
1303 if (!cmd_fds[i].no_select && !FD_ISSET(cmd_fds[i].fd, &fds) &&
d15e78b799b5 Process any waiting commands (got_cmd set). Should fix e.g. smplayer.
reimar
parents: 24141
diff changeset
1304 !cmd_fds[i].got_cmd)
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1305 continue;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1306 #endif
24135
84bc662dc979 Fix loads of warnings
reimar
parents: 24134
diff changeset
1307 r = mp_input_read_cmd(&cmd_fds[i], &cmd);
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1308 if (r >= 0) {
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1309 mp_cmd_t *ret = mp_input_parse_cmd(cmd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1310 free(cmd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1311 if (ret)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1312 return ret;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1313 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1314 else if (r == MP_INPUT_ERROR)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1315 mp_msg(MSGT_INPUT, MSGL_ERR, MSGTR_INPUT_INPUT_ErrOnCmdFd,
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1316 cmd_fds[i].fd);
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1317 else if (r == MP_INPUT_DEAD)
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1318 cmd_fds[i].dead = 1;
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1319 }
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1320
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1321 return NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1322 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1323
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1324
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1325 int
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1326 mp_input_queue_cmd(mp_cmd_t* cmd) {
25228
475c6659f31c Do not queue empty cmd.
ulion
parents: 25150
diff changeset
1327 if(!cmd || cmd_queue_length >= CMD_QUEUE_SIZE)
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1328 return 0;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1329 cmd_queue[cmd_queue_end] = cmd;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1330 cmd_queue_end = (cmd_queue_end + 1) % CMD_QUEUE_SIZE;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1331 cmd_queue_length++;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1332 return 1;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1333 }
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1334
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1335 static mp_cmd_t*
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1336 mp_input_get_queued_cmd(int peek_only) {
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1337 mp_cmd_t* ret;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1338
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1339 if(cmd_queue_length == 0)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1340 return NULL;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1341
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1342 ret = cmd_queue[cmd_queue_start];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1343
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1344 if (!peek_only) {
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1345 cmd_queue_length--;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1346 cmd_queue_start = (cmd_queue_start + 1) % CMD_QUEUE_SIZE;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1347 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1348
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1349 return ret;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1350 }
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1351
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1352 /**
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1353 * \param peek_only when set, the returned command stays in the queue.
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1354 * Do not free the returned cmd whe you set this!
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1355 */
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1356 mp_cmd_t*
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1357 mp_input_get_cmd(int time, int paused, int peek_only) {
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1358 mp_cmd_t* ret = NULL;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1359 mp_cmd_filter_t* cf;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1360 int from_queue;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1361
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25576
diff changeset
1362 if (async_quit_request)
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25576
diff changeset
1363 return mp_input_parse_cmd("quit 1");
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1364 while(1) {
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1365 from_queue = 1;
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1366 ret = mp_input_get_queued_cmd(peek_only);
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1367 if(ret) break;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1368 from_queue = 0;
24131
30028bbcb9e8 Use a single select() for both key and slave input
uau
parents: 24129
diff changeset
1369 ret = read_events(time, paused);
24134
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1370 if (!ret) {
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1371 from_queue = 1;
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1372 ret = mp_input_get_queued_cmd(peek_only);
e18a800a02e7 Handle queued commands from input event functions immediately
uau
parents: 24132
diff changeset
1373 }
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1374 break;
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1375 }
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1376 if(!ret) return NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1377
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1378 for(cf = cmd_filters ; cf ; cf = cf->next) {
24959
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1379 if(cf->filter(ret,paused,cf->ctx)) {
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1380 if (peek_only && from_queue)
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1381 // The filter ate the cmd, so we remove it from queue
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1382 ret = mp_input_get_queued_cmd(0);
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1383 mp_cmd_free(ret);
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1384 return NULL;
24959
f13b32b2bee4 Fix cmd filter memory leak, free the cmd after filter ate it.
ulion
parents: 24878
diff changeset
1385 }
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1386 }
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1387
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1388 if (!from_queue && peek_only)
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1389 mp_input_queue_cmd(ret);
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1390
8196
419bdbfdb660 Add the possibilty to grab the keys and to filter the commands
albeu
parents: 8164
diff changeset
1391 return ret;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1392 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1393
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1394 void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1395 mp_cmd_free(mp_cmd_t* cmd) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1396 int i;
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1397 //#ifdef MP_DEBUG
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1398 // assert(cmd != NULL);
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1399 //#endif
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
1400 if ( !cmd ) return;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1401
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1402 if(cmd->name)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1403 free(cmd->name);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1404
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1405 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
1406 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
1407 free(cmd->args[i].v.s);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1408 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1409 free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1410 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1411
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1412 mp_cmd_t*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1413 mp_cmd_clone(mp_cmd_t* cmd) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1414 mp_cmd_t* ret;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1415 int i;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1416 #ifdef MP_DEBUG
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1417 assert(cmd != NULL);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1418 #endif
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1419
18878
3bf0d70b4c7f rm unnecesary casts from void* - part 2
reynaldo
parents: 18858
diff changeset
1420 ret = malloc(sizeof(mp_cmd_t));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1421 memcpy(ret,cmd,sizeof(mp_cmd_t));
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1422 if(cmd->name)
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1423 ret->name = strdup(cmd->name);
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1424 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
1425 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
1426 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
1427 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1428
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1429 return ret;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1430 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1431
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1432 static char key_str[12];
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1433
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1434 static char*
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1435 mp_input_get_key_name(int key) {
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1436 int i;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1437
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1438 for(i = 0; key_names[i].name != NULL; i++) {
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1439 if(key_names[i].key == key)
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1440 return key_names[i].name;
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1441 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1442
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1443 if(isascii(key)) {
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1444 snprintf(key_str,12,"%c",(char)key);
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1445 return key_str;
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1446 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1447
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1448 // Print the hex key code
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1449 snprintf(key_str,12,"%#-8x",key);
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1450 return key_str;
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1451
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1452 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1453
25263
96d0992c7920 Remove hardcoded key->cmd bindings in libmenu, support custom key bindings
ulion
parents: 25228
diff changeset
1454 int
25150
c4376432f72f Use const char * to replace a char * parameter.
ulion
parents: 25129
diff changeset
1455 mp_input_get_key_from_name(const char *name) {
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1456 int i,ret = 0,len = strlen(name);
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1457 if(len == 1) { // Direct key code
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1458 ret = (unsigned char)name[0];
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1459 return ret;
6394
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1460 } else if(len > 2 && strncasecmp("0x",name,2) == 0)
5dded1a5cfbb Add support for hex key code in input.conf
albeu
parents: 6311
diff changeset
1461 return strtol(name,NULL,16);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1462
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1463 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
1464 if(strcasecmp(key_names[i].name,name) == 0)
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1465 return key_names[i].key;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1466 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1467
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1468 return -1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1469 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1470
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1471 static int
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1472 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
1473 char *end,*ptr;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1474 int n=0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1475
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1476 ptr = name;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1477 n = 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1478 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
1479 if(end && end[1] != '\0') {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1480 if(end[1] == '-')
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1481 end = &end[1];
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1482 end[0] = '\0';
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1483 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1484 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
1485 if(keys[n] < 0) {
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1486 return 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1487 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1488 n++;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1489 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
1490 ptr = &end[1];
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1491 else
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1492 break;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1493 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1494 keys[n] = 0;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1495 return 1;
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1496 }
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1497
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1498 #define BS_MAX 256
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1499 #define SPACE_CHAR " \n\r\t"
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1500
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1501 void
25766
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
1502 mp_input_bind_keys(const int keys[MP_MAX_KEY_DOWN+1], char* cmd) {
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1503 int i = 0,j;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1504 mp_cmd_bind_t* bind = NULL;
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1505 mp_cmd_bind_section_t* bind_section = NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1506 char *section=NULL, *p;
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1507
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1508 #ifdef MP_DEBUG
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1509 assert(keys != NULL);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1510 assert(cmd != NULL);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1511 #endif
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1512
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1513 if(*cmd=='{' && (p=strchr(cmd,'}'))) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1514 *p=0;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1515 section=++cmd;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1516 cmd=++p;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1517 // Jump beginning space
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1518 for( ; cmd[0] != '\0' && strchr(SPACE_CHAR,cmd[0]) != NULL ; cmd++)
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1519 /* NOTHING */;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1520 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1521 bind_section=mp_input_get_bind_section(section);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1522
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1523 if(bind_section->cmd_binds) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1524 for(i = 0; bind_section->cmd_binds[i].cmd != NULL ; i++) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1525 for(j = 0 ; bind_section->cmd_binds[i].input[j] == keys[j] && keys[j] != 0 ; j++)
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1526 /* NOTHING */;
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1527 if(keys[j] == 0 && bind_section->cmd_binds[i].input[j] == 0 ) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1528 bind = &bind_section->cmd_binds[i];
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1529 break;
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1530 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1531 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1532 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1533
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1534 if(!bind) {
25726
831e4eaa70a9 Remove a useless cast
reimar
parents: 25709
diff changeset
1535 bind_section->cmd_binds = realloc(bind_section->cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1536 memset(&bind_section->cmd_binds[i],0,2*sizeof(mp_cmd_bind_t));
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1537 bind = &bind_section->cmd_binds[i];
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1538 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1539 if(bind->cmd)
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1540 free(bind->cmd);
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1541 bind->cmd = strdup(cmd);
4850
13ea8fab37dd Small bugfix (memcpy too small without sizeof(int) :( )
albeu
parents: 4842
diff changeset
1542 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
1543 }
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1544
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1545 void
25766
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
1546 mp_input_add_binds(const mp_cmd_bind_t* list) {
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1547 int i;
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1548 for(i = 0 ; list[i].cmd ; i++)
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1549 mp_input_bind_keys(list[i].input,list[i].cmd);
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1550 }
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1551
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1552 static void
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1553 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
1554 int i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1555
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1556 if(!binds)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1557 return;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1558
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1559 for(i = 0; binds[i].cmd != NULL; i++)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1560 free(binds[i].cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1561
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1562 free(binds);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1563
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1564 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1565
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1566 static int
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1567 mp_input_parse_config(char *file) {
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1568 int fd;
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1569 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
1570 char *iter,*end;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1571 char buffer[BS_MAX];
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1572 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
1573
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1574 fd = open(file,O_RDONLY);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1575
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1576 if(fd < 0) {
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13808
diff changeset
1577 mp_msg(MSGT_INPUT,MSGL_V,"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
1578 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1579 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1580
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1581 mp_msg(MSGT_INPUT,MSGL_V,"Parsing input config file %s\n",file);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1582
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1583 while(1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1584 if(! eof && bs < BS_MAX-1) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1585 if(bs > 0) bs--;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1586 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
1587 if(r < 0) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1588 if(errno == EINTR)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1589 continue;
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1590 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno));
6463
5deb9a35214f 10L forgot to close input.conf fd
albeu
parents: 6394
diff changeset
1591 close(fd);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1592 return 0;
8274
be311f828476 Fix endless-loop if no newline at input.conf EOF
atmos4
parents: 8254
diff changeset
1593 } else if(r == 0) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1594 eof = 1;
8274
be311f828476 Fix endless-loop if no newline at input.conf EOF
atmos4
parents: 8254
diff changeset
1595 } else {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1596 bs += r+1;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1597 buffer[bs-1] = '\0';
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1598 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1599 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1600 // Empty buffer : return
8275
1fb6b78d62d6 10l my last fix choked the last command definition, this fix seems to work correct.
atmos4
parents: 8274
diff changeset
1601 if(bs <= 1) {
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13808
diff changeset
1602 mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds);
6463
5deb9a35214f 10L forgot to close input.conf fd
albeu
parents: 6394
diff changeset
1603 close(fd);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1604 return 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1605 }
4826
a0e8eac85aca Also use tab as cmd arg sepparator
albeu
parents: 4821
diff changeset
1606
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1607 iter = buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1608
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1609 if(comments) {
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1610 for( ; iter[0] != '\0' && iter[0] != '\n' ; iter++)
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1611 /* NOTHING */;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1612 if(iter[0] == '\0') { // Buffer was full of comment
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1613 bs = 0;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1614 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1615 }
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1616 iter++;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1617 r = strlen(iter);
26190
e9617c54bb04 Fix handling of comments in input.c, current code had useless ifs and in addition
reimar
parents: 25817
diff changeset
1618 memmove(buffer,iter,r+1);
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1619 bs = r+1;
26190
e9617c54bb04 Fix handling of comments in input.c, current code had useless ifs and in addition
reimar
parents: 25817
diff changeset
1620 comments = 0;
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1621 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1622 }
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1623
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1624 // Find the wanted key
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1625 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
1626 // Jump beginning space
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1627 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
1628 /* NOTHING */;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1629 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
1630 bs = 0;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1631 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1632 }
4763
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1633 if(iter[0] == '#') { // Comments
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1634 comments = 1;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1635 continue;
b85890a5b0e5 Added comments support in input.conf (comments lines with #)
albeu
parents: 4732
diff changeset
1636 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1637 // Find the end of the key code name
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1638 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
1639 /*NOTHING */;
10398
9a061dbdba3e Output typos fixed.
diego
parents: 10272
diff changeset
1640 if(end[0] == '\0') { // Key name doesn't fit in the buffer
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1641 if(buffer == iter) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1642 if(eof && (buffer-iter) == bs)
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1643 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnfinishedBinding,iter);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1644 else
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1645 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1646 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1647 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1648 memmove(buffer,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1649 bs = end-iter;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1650 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1651 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1652 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1653 char name[end-iter+1];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1654 strncpy(name,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1655 name[end-iter] = '\0';
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1656 if(! mp_input_get_input_from_name(name,keys)) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1657 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,name);
6463
5deb9a35214f 10L forgot to close input.conf fd
albeu
parents: 6394
diff changeset
1658 close(fd);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1659 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1660 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1661 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1662 if( bs > (end-buffer))
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1663 memmove(buffer,end,bs - (end-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1664 bs -= end-buffer;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1665 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1666 } else { // Get the command
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1667 while(iter[0] == ' ' || iter[0] == '\t') iter++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1668 // Found new line
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1669 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
1670 int i;
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1671 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrNoCmdForKey,mp_input_get_key_name(keys[0]));
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1672 for(i = 1; keys[i] != 0 ; i++)
5198
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1673 mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(keys[i]));
a528f6c891b5 A bug fix in the auto-repeat stuff + moved all printf to mp_msg
albeu
parents: 5137
diff changeset
1674 mp_msg(MSGT_INPUT,MSGL_ERR,"\n");
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1675 keys[0] = 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1676 if(iter > buffer) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1677 memmove(buffer,iter,bs- (iter-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1678 bs -= (iter-buffer);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1679 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1680 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1681 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1682 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
1683 /* NOTHING */;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1684 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
1685 if(iter == buffer) {
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1686 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer);
6463
5deb9a35214f 10L forgot to close input.conf fd
albeu
parents: 6394
diff changeset
1687 close(fd);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1688 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1689 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1690 memmove(buffer,iter,end - iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1691 bs = end - iter;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1692 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1693 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1694 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1695 char cmd[end-iter+1];
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1696 strncpy(cmd,iter,end-iter);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1697 cmd[end-iter] = '\0';
8275
1fb6b78d62d6 10l my last fix choked the last command definition, this fix seems to work correct.
atmos4
parents: 8274
diff changeset
1698 //printf("Set bind %d => %s\n",keys[0],cmd);
4842
b048e303e8f1 Really take tab as a space in cmd parsing.
albeu
parents: 4836
diff changeset
1699 mp_input_bind_keys(keys,cmd);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1700 n_binds++;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1701 }
4589
4ce20c55a18a Added support for key combination and mouse buttons key code
albeu
parents: 4525
diff changeset
1702 keys[0] = 0;
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1703 end++;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1704 if(bs > (end-buffer))
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1705 memmove(buffer,end,bs-(end-buffer));
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1706 bs -= (end-buffer);
4821
5a71377d2759 Fixed bug with comments in input.conf parser
albeu
parents: 4763
diff changeset
1707 buffer[bs-1] = '\0';
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1708 continue;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1709 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1710 }
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1711 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrWhyHere);
6463
5deb9a35214f 10L forgot to close input.conf fd
albeu
parents: 6394
diff changeset
1712 close(fd);
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1713 mp_input_set_section(NULL);
4525
46c4e34b4e76 Tell the user when we fallback on default config.
albeu
parents: 4524
diff changeset
1714 return 0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1715 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1716
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1717 void
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1718 mp_input_set_section(char *name) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1719 mp_cmd_bind_section_t* bind_section = NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1720
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1721 cmd_binds=NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1722 cmd_binds_default=NULL;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1723 if(section) free(section);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1724 if(name) section=strdup(name); else section=strdup("default");
24424
0c4f1a88eaae warning fixes:
diego
parents: 24244
diff changeset
1725 if((bind_section=mp_input_get_bind_section(section)))
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1726 cmd_binds=bind_section->cmd_binds;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1727 if(strcmp(section,"default")==0) return;
24424
0c4f1a88eaae warning fixes:
diego
parents: 24244
diff changeset
1728 if((bind_section=mp_input_get_bind_section(NULL)))
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1729 cmd_binds_default=bind_section->cmd_binds;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1730 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1731
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1732 char*
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1733 mp_input_get_section(void) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1734 return section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1735 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1736
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1737 void
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1738 mp_input_init(int use_gui) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1739 char* file;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1740
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1741 #ifdef CONFIG_GUI
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1742 if(use_gui)
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1743 mp_input_add_binds(gui_def_cmd_binds);
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17838
diff changeset
1744 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1745
4836
f832f7bcf76b Added an option to select the input config file
albeu
parents: 4826
diff changeset
1746 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
1747 if(!file)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1748 return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1749
12942
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1750 if( !mp_input_parse_config(file)) {
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1751 // free file if it was allocated by get_path(),
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1752 // before it gets overwritten
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1753 if( file != config_file)
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1754 {
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1755 free(file);
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1756 }
6551
c930dffac92c Fix after the patch of Dominik Mierzejewski. Try the user's input.conf
albeu
parents: 6545
diff changeset
1757 // Try global conf dir
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10215
diff changeset
1758 file = MPLAYER_CONFDIR "/input.conf";
6551
c930dffac92c Fix after the patch of Dominik Mierzejewski. Try the user's input.conf
albeu
parents: 6545
diff changeset
1759 if(! mp_input_parse_config(file))
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13808
diff changeset
1760 mp_msg(MSGT_INPUT,MSGL_V,"Falling back on default (hardcoded) input config\n");
6551
c930dffac92c Fix after the patch of Dominik Mierzejewski. Try the user's input.conf
albeu
parents: 6545
diff changeset
1761 }
12942
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1762 else
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1763 {
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1764 // free file if it was allocated by get_path()
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1765 if( file != config_file)
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1766 free(file);
abe577c2b12e Corrected my mistake in the last memfix patch.
al
parents: 12890
diff changeset
1767 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1768
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
1769 #ifdef CONFIG_JOYSTICK
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1770 if(use_joystick) {
5722
8346974080fe Added -input js-dev xx option to specifies the joystick device to use.
albeu
parents: 5571
diff changeset
1771 int fd = mp_input_joystick_init(js_dev);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1772 if(fd < 0)
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1773 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitJoystick);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1774 else
4524
01a0cf736e0d Fix the bugs the previous version should fix (and those introduced
albeu
parents: 4518
diff changeset
1775 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
1776 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1777 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1778
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
1779 #ifdef CONFIG_LIRC
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1780 if(use_lirc) {
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1781 int fd = mp_input_lirc_init();
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1782 if(fd > 0)
7883
d375383e1a48 rewrote the lirc code to remove the fork
arpi
parents: 7870
diff changeset
1783 mp_input_add_cmd_fd(fd,0,mp_input_lirc_read,mp_input_lirc_close);
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1784 }
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1785 #endif
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1786
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27388
diff changeset
1787 #ifdef CONFIG_LIRCC
10215
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1788 if(use_lircc) {
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1789 int fd = lircc_init("mplayer", NULL);
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1790 if(fd >= 0)
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1791 mp_input_add_cmd_fd(fd,1,NULL,(mp_close_func_t)lircc_cleanup);
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1792 }
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1793 #endif
dd32fe16a36c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
alex
parents: 10116
diff changeset
1794
27388
ac03760f7fcc Rename all preprocessor directives related to Apple / Mac OS X.
diego
parents: 27370
diff changeset
1795 #ifdef CONFIG_APPLE_REMOTE
24037
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1796 if(use_ar) {
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1797 if(mp_input_ar_init() < 0)
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1798 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote);
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1799 else
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1800 mp_input_add_key_fd(-1,0,mp_input_ar_read,mp_input_ar_close);
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1801 }
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1802 #endif
c7f95196dfe5 Apple Remote support
diego
parents: 23900
diff changeset
1803
27388
ac03760f7fcc Rename all preprocessor directives related to Apple / Mac OS X.
diego
parents: 27370
diff changeset
1804 #ifdef CONFIG_APPLE_IR
26763
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1805 if(use_ar) {
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1806 int fd = mp_input_appleir_init(ar_dev);
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1807 if(fd < 0)
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1808 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote);
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1809 else
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1810 mp_input_add_key_fd(fd,1,mp_input_appleir_read,(mp_close_func_t)close);
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1811 }
c13288eeb9f6 Add support for AppleIR Remote as an input under Linux systems.
ben
parents: 26686
diff changeset
1812 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29023
diff changeset
1813
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1814 if(in_file) {
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1815 struct stat st;
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1816 if(stat(in_file,&st))
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1817 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantStatFile,in_file,strerror(errno));
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1818 else {
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1819 in_file_fd = open(in_file,S_ISFIFO(st.st_mode) ? O_RDWR : O_RDONLY);
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1820 if(in_file_fd >= 0)
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1821 mp_input_add_cmd_fd(in_file_fd,1,NULL,(mp_close_func_t)close);
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1822 else
16856
d222ea8f2cb4 translatable eng strings to new section on help_mp-en
reynaldo
parents: 16793
diff changeset
1823 mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantOpenFile,in_file,strerror(errno));
7840
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1824 }
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1825 }
813dff319582 New feature to let mplayer read commands from a file. Mostly
albeu
parents: 7779
diff changeset
1826
4432
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1827 }
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1828
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1829 void
5105f5da01d6 Added lirc support in input
albeu
parents: 4418
diff changeset
1830 mp_input_uninit(void) {
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1831 unsigned int i;
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1832 mp_cmd_bind_section_t* bind_section;
4518
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1833
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1834 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
1835 if(key_fds[i].close_func)
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1836 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
1837 }
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1838
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1839 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
1840 if(cmd_fds[i].close_func)
83128eed25f1 Corrected the quit bug and added support for up to 10 axis
albeu
parents: 4432
diff changeset
1841 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
1842 }
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1843 while (cmd_binds_section) {
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1844 mp_input_free_binds(cmd_binds_section->cmd_binds);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1845 free(cmd_binds_section->section);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1846 bind_section=cmd_binds_section->next;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1847 free(cmd_binds_section);
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1848 cmd_binds_section=bind_section;
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1849 }
15710094cb15 implement "bind sections"
voroshil
parents: 23412
diff changeset
1850 cmd_binds_section=NULL;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1851 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents:
diff changeset
1852
4657
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1853 void
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1854 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
1855 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
1856 }
610a11e4db36 Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents: 4589
diff changeset
1857
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
1858 static int mp_input_print_key_list(m_option_t* cfg) {
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1859 int i;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1860 printf("\n");
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1861 for(i= 0; key_names[i].name != NULL ; i++)
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1862 printf("%s\n",key_names[i].name);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1863 exit(0);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1864 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1865
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
1866 static int mp_input_print_cmd_list(m_option_t* cfg) {
25766
6201cc9cca7f Fix some types to const
reimar
parents: 25726
diff changeset
1867 const mp_cmd_t *cmd;
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1868 int i,j;
19110
08888397444e marks several strings inside structs as const when they hold just
reynaldo
parents: 18889
diff changeset
1869 const char* type;
5218
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1870
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1871 for(i = 0; (cmd = &mp_cmds[i])->name != NULL ; i++) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1872 printf("%-20.20s",cmd->name);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1873 for(j= 0 ; j < MP_CMD_MAX_ARGS && cmd->args[j].type != -1 ; j++) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1874 switch(cmd->args[j].type) {
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1875 case MP_CMD_ARG_INT:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1876 type = "Integer";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1877 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1878 case MP_CMD_ARG_FLOAT:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1879 type = "Float";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1880 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1881 case MP_CMD_ARG_STRING:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1882 type = "String";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1883 break;
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1884 default:
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1885 type = "??";
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1886 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1887 if(j+1 > cmd->nargs)
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1888 printf(" [%s]",type);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1889 else
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1890 printf(" %s",type);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1891 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1892 printf("\n");
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1893 }
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1894 exit(0);
11c7ccce8ae3 Added options -input keylist and -input cmdlist to list all know
albeu
parents: 5200
diff changeset
1895 }
7862
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1896
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1897 int
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1898 mp_input_check_interrupt(int time) {
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1899 mp_cmd_t* cmd;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1900 if((cmd = mp_input_get_cmd(time,0,1)) == NULL)
7862
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1901 return 0;
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1902 switch(cmd->id) {
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1903 case MP_CMD_QUIT:
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1904 case MP_CMD_PLAY_TREE_STEP:
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1905 case MP_CMD_PLAY_TREE_UP_STEP:
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1906 case MP_CMD_PLAY_ALT_SRC_STEP:
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1907 // The cmd will be executed when we are back in the main loop
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1908 return 1;
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1909 }
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1910 // remove the cmd from the queue
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13345
diff changeset
1911 cmd = mp_input_get_cmd(time,0,0);
7862
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1912 mp_cmd_free(cmd);
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1913 return 0;
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7840
diff changeset
1914 }