annotate input/input.c @ 25661:293aeec83153

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