annotate input/input.c @ 22365:baeb54a9c3e9

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