annotate input/input.c @ 7949:0aedfdc5d6ef

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