summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 17:02:04 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:06:14 +0100
commitd4bdd0473d6f43132257c9fb3848d829755167a3 (patch)
tree8021c2f7da1841393c8c832105e20cd527826d6c /input
parentbd48deba77bd5582c5829d6fe73a7d2571088aba (diff)
downloadmpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2
mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code.
Diffstat (limited to 'input')
-rw-r--r--input/appleir.c155
-rw-r--r--input/ar.c469
-rw-r--r--input/ar.h35
-rw-r--r--input/input.c1959
-rw-r--r--input/input.h219
-rw-r--r--input/joystick.c162
-rw-r--r--input/joystick.h26
-rw-r--r--input/keycodes.h214
-rw-r--r--input/lirc.c123
-rw-r--r--input/lirc.h30
10 files changed, 0 insertions, 3392 deletions
diff --git a/input/appleir.c b/input/appleir.c
deleted file mode 100644
index c64bc9648d..0000000000
--- a/input/appleir.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Linux Apple IR Remote input interface
- *
- * Copyright (C) 2008 Benjamin Zores <ben at geexbox dot org>
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include "ar.h"
-#include "input.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <linux/types.h>
-#include <linux/input.h>
-
-#include "mp_msg.h"
-
-// keycodes.h defines would conflict with linux/input.h ones
-#define AR_DEFINES_ONLY
-#include "keycodes.h"
-
-#define EVDEV_MAX_EVENTS 32
-
-/* ripped from AppleIR driver */
-#define USB_VENDOR_APPLE 0x05ac
-#define USB_DEV_APPLE_IR 0x8240
-#define USB_DEV_APPLE_IR_2 0x8242
-
-/* Apple IR Remote evdev mapping */
-#define APPLE_IR_MINUS KEY_VOLUMEDOWN
-#define APPLE_IR_PLUS KEY_VOLUMEUP
-#define APPLE_IR_MENU KEY_MENU
-#define APPLE_IR_FORWARD KEY_NEXTSONG
-#define APPLE_IR_PLAY KEY_PLAYPAUSE
-#define APPLE_IR_BACKWARD KEY_PREVIOUSSONG
-
-static const struct {
- int linux_keycode;
- int value;
- int mp_keycode;
-} apple_ir_mapping[] = {
- { APPLE_IR_PLAY, 1, AR_PLAY },
- { APPLE_IR_PLAY, 2, AR_PLAY_HOLD },
- { APPLE_IR_FORWARD, 1, AR_NEXT },
- { APPLE_IR_FORWARD, 2, AR_NEXT_HOLD },
- { APPLE_IR_BACKWARD, 1, AR_PREV },
- { APPLE_IR_BACKWARD, 2, AR_PREV_HOLD },
- { APPLE_IR_MENU, 1, AR_MENU },
- { APPLE_IR_MENU, 2, AR_MENU_HOLD },
- { APPLE_IR_PLUS, 1, AR_VUP },
- { APPLE_IR_MINUS, 1, AR_VDOWN },
- { -1, -1, -1 }
-};
-
-int mp_input_appleir_init (char *dev)
-{
- int i, fd;
-
- if (dev)
- {
- mp_tmsg (MSGT_INPUT, MSGL_V, "Initializing Apple IR on %s\n", dev);
- fd = open (dev, O_RDONLY | O_NONBLOCK);
- if (fd < 0)
- {
- mp_tmsg (MSGT_INPUT, MSGL_ERR,
- "Can't open Apple IR device: %s\n", strerror (errno));
- return -1;
- }
-
- return fd;
- }
- else
- {
- /* look for a valid AppleIR device on system */
- for (i = 0; i < EVDEV_MAX_EVENTS; i++)
- {
- struct input_id id;
- char file[64];
-
- sprintf (file, "/dev/input/event%d", i);
- fd = open (file, O_RDONLY | O_NONBLOCK);
- if (fd < 0)
- continue;
-
- ioctl (fd, EVIOCGID, &id);
- if (id.bustype == BUS_USB &&
- id.vendor == USB_VENDOR_APPLE &&
- (id.product == USB_DEV_APPLE_IR ||id.product == USB_DEV_APPLE_IR_2))
- {
- mp_tmsg (MSGT_INPUT, MSGL_V, "Detected Apple IR on %s\n", file);
- return fd;
- }
- close (fd);
- }
-
- mp_tmsg (MSGT_INPUT, MSGL_ERR,
- "Can't open Apple IR device: %s\n", strerror (errno));
- }
-
- return -1;
-}
-
-int mp_input_appleir_read(void *ctx, int fd)
-{
- struct input_event ev;
- int i, r;
-
- r = read (fd, &ev, sizeof (struct input_event));
- if (r <= 0 || r < sizeof (struct input_event))
- return MP_INPUT_NOTHING;
-
- /* check for key press only */
- if (ev.type != EV_KEY)
- return MP_INPUT_NOTHING;
-
- /* EvDev Key values:
- * 0: key release
- * 1: key press
- * 2: key auto-repeat
- */
- if (ev.value == 0)
- return MP_INPUT_NOTHING;
-
- /* find Linux evdev -> MPlayer keycode mapping */
- for (i = 0; apple_ir_mapping[i].linux_keycode != -1; i++)
- if (apple_ir_mapping[i].linux_keycode == ev.code &&
- apple_ir_mapping[i].value == ev.value)
- return apple_ir_mapping[i].mp_keycode;
-
- return MP_INPUT_NOTHING;
-}
diff --git a/input/ar.c b/input/ar.c
deleted file mode 100644
index 7b7cc8e3db..0000000000
--- a/input/ar.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Apple Remote input interface
- *
- * Copyright (C) 2007 Zoltan Ponekker <pontscho at kac.poliod.hu>
- *
- * (modified a bit by Ulion <ulion2002 at gmail.com>)
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/hid/IOHIDLib.h>
-#include <Carbon/Carbon.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "input.h"
-#include "ar.h"
-#include "keycodes.h"
-
-extern int slave_mode;
-
-extern const double NSAppKitVersionNumber;
-
-typedef struct cookie_keycode_map {
- char *cookies;
- int seq_len;
- int keycode;
-} cookie_keycode_map_t;
-
-/* On tiger, 5 always follows 6; on leopard, 18 always follows 19.
- * On leopard, there seems to be no cookie value of 5 or 6.
- * Following is the shortened cookie sequence list
- * keycode cookies_on_tiger cookies_on_leopard *down_state
- * AR_PREV_HOLD 14+6+3+2 31+19+3+2 yes
- * AR_NEXT_HOLD 14+6+4+2 31+19+4+2 yes
- * AR_MENU_HOLD 14+6+14+6 31+19+31+19
- * AR_VUP 14+12+11+6 31+29+28+19 yes
- * AR_VDOWN 14+13+11+6 31+30+28+19 yes
- * AR_MENU 14+7+6+14+7+6 31+20+19+31+20+19
- * AR_PLAY 14+8+6+14+8+6 31+21+19+31+21+19
- * AR_NEXT 14+9+6+14+9+6 31+22+19+31+22+19
- * AR_PREV 14+10+6+14+10+6 31+23+19+31+23+19
- * AR_PLAY_HOLD 18+14+6+18+14+6 35+31+19+35+31+19
- *
- * *down_state: A button with this feature has a pressed event and
- * a released event, with which we can trace the state of the button.
- * A button without this feature will only return one release event.
- *
- * hidden keys currently not implemented:
- * hold for 5 secs
- * MENU_NEXT_HOLD 15+14+6+15+14+6
- * MENU_PREV_HOLD 16+14+6+16+14+6
- * MENU_VUP_HOLD 20+14+6+20+14+6
- * MENU_VDOWN_HOLD 19+14+6+19+14+6
- *
- * It seems that pressing 'menu' and 'play' on the Apple Remote for
- * 5 seconds will trigger the make-pair function of the remote.
- * MENU_PLAY_HOLD 21+15+14+6+15+14+6
- */
-
-static const cookie_keycode_map_t ar_codes_tiger[] = {
- { "\x0E\x06\x03\x02", 4, AR_PREV_HOLD },
- { "\x0E\x06\x04\x02", 4, AR_NEXT_HOLD },
- { "\x0E\x06\x0E\x06", 4, AR_MENU_HOLD },
- { "\x0E\x0C\x0B\x06", 4, AR_VUP },
- { "\x0E\x0D\x0B\x06", 4, AR_VDOWN },
- { "\x0E\x07\x06\x0E\x07\x06", 6, AR_MENU },
- { "\x0E\x08\x06\x0E\x08\x06", 6, AR_PLAY },
- { "\x0E\x09\x06\x0E\x09\x06", 6, AR_NEXT },
- { "\x0E\x0A\x06\x0E\x0A\x06", 6, AR_PREV },
- { "\x12\x0E\x06\x12\x0E\x06", 6, AR_PLAY_HOLD },
- { NULL, 0, MP_INPUT_NOTHING },
-};
-
-static const cookie_keycode_map_t ar_codes_leopard[] = {
- { "\x1F\x13\x03\x02", 4, AR_PREV_HOLD },
- { "\x1F\x13\x04\x02", 4, AR_NEXT_HOLD },
- { "\x1F\x13\x1F\x13", 4, AR_MENU_HOLD },
- { "\x1F\x1D\x1C\x13", 4, AR_VUP },
- { "\x1F\x1E\x1C\x13", 4, AR_VDOWN },
- { "\x1F\x14\x13\x1F\x14\x13", 6, AR_MENU },
- { "\x1F\x15\x13\x1F\x15\x13", 6, AR_PLAY },
- { "\x1F\x16\x13\x1F\x16\x13", 6, AR_NEXT },
- { "\x1F\x17\x13\x1F\x17\x13", 6, AR_PREV },
- { "\x23\x1F\x13\x23\x1F\x13", 6, AR_PLAY_HOLD },
- { NULL, 0, MP_INPUT_NOTHING },
-};
-
-static int is_leopard;
-static const cookie_keycode_map_t *ar_codes;
-
-static IOHIDQueueInterface **queue;
-static IOHIDDeviceInterface **hidDeviceInterface = NULL;
-static int initialized = 0;
-static int hidDeviceIsOpen;
-
-/* Maximum number of elements in queue before oldest elements
- in queue begin to be lost. Set to 16 to hold at least 2 events. */
-static const int MAX_QUEUE_SIZE = 16;
-
-
-static int FindHIDDevices(mach_port_t masterPort,
- io_iterator_t *hidObjectIterator)
-{
- CFMutableDictionaryRef hidMatchDictionary;
- IOReturn ioReturnValue;
-
- // Set up a matching dictionary to search the I/O Registry
- // by class name for all HID class devices.
- hidMatchDictionary = IOServiceMatching("AppleIRController");
-
- // Now search I/O Registry for matching devices.
- ioReturnValue = IOServiceGetMatchingServices(masterPort,
- hidMatchDictionary,
- hidObjectIterator);
-
- // If search is unsuccessful, print message and hang.
- if (ioReturnValue != kIOReturnSuccess ||
- !IOIteratorIsValid(*hidObjectIterator)) {
- return -1;
- }
- return 0;
-}
-
-static int getHIDCookies(IOHIDDeviceInterface122 **handle,
- IOHIDElementCookie **cookies,
- int *nr_cookies)
-{
- CFTypeRef object;
- long number;
- CFArrayRef elements;
- CFDictionaryRef element;
- CFIndex i;
-
- *nr_cookies = 0;
-
- if (!handle || !(*handle))
- return -1;
-
- // Copy all elements, since we're grabbing most of the elements
- // for this device anyway, and thus, it's faster to iterate them
- // ourselves. When grabbing only one or two elements, a matching
- // dictionary should be passed in here instead of NULL.
- if (((*handle)->copyMatchingElements(handle, NULL, &elements)) != kIOReturnSuccess)
- return -1;
-
- // No elements, still a valid result.
- if (CFArrayGetCount(elements)==0)
- return 0;
-
- *cookies = calloc(CFArrayGetCount(elements), sizeof(IOHIDElementCookie));
- if (*cookies == NULL)
- return -1;
-
- for (i=0; i<CFArrayGetCount(elements); i++) {
- element = CFArrayGetValueAtIndex(elements, i);
-
- // Get cookie.
- object = CFDictionaryGetValue(element, CFSTR(kIOHIDElementCookieKey));
- if (object == 0 || CFGetTypeID(object) != CFNumberGetTypeID())
- continue;
- if (!CFNumberGetValue((CFNumberRef)object, kCFNumberLongType, &number))
- continue;
- (*cookies)[(*nr_cookies)++] = (IOHIDElementCookie)number;
- }
-
- return 0;
-}
-
-static int CreateHIDDeviceInterface(io_object_t hidDevice,
- IOHIDDeviceInterface ***hidDeviceInterface)
-{
- io_name_t className;
- IOCFPlugInInterface **plugInInterface = NULL;
- SInt32 score = 0;
-
- if (IOObjectGetClass(hidDevice, className) != kIOReturnSuccess)
- return -1;
-
- if (IOCreatePlugInInterfaceForService(hidDevice,
- kIOHIDDeviceUserClientTypeID,
- kIOCFPlugInInterfaceID,
- &plugInInterface,
- &score) != kIOReturnSuccess)
- return -1;
-
- // Call a method of the intermediate plugin to create the device interface
- if ((*plugInInterface)->QueryInterface(plugInInterface,
- CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID),
- (LPVOID)hidDeviceInterface) != S_OK
- || *hidDeviceInterface == NULL || **hidDeviceInterface == NULL) {
- (*plugInInterface)->Release(plugInInterface);
- return -1;
- }
-
- (*plugInInterface)->Release(plugInInterface);
-
- return 0;
-}
-
-int mp_input_ar_init(void)
-{
- io_iterator_t hidObjectIterator;
- io_object_t hidDevice;
- int i;
- IOHIDElementCookie *cookies = NULL;
- int nr_cookies = 0;
-
- if (initialized)
- mp_input_ar_close(-1);
-
- if (floor(NSAppKitVersionNumber) <= 824 /* NSAppKitVersionNumber10_4 */) {
- ar_codes = &ar_codes_tiger[0];
- is_leopard = 0;
- }
- else {
- ar_codes = &ar_codes_leopard[0];
- is_leopard = 1;
- }
-
- if (FindHIDDevices(kIOMasterPortDefault, &hidObjectIterator))
- return -1;
-
- // Multiple controls could be found, we only use the first usable one.
- while ((hidDevice = IOIteratorNext(hidObjectIterator))) {
- if (CreateHIDDeviceInterface(hidDevice, &hidDeviceInterface) < 0) {
- hidDeviceInterface = NULL;
- IOObjectRelease(hidDevice);
- continue;
- }
- if (getHIDCookies((IOHIDDeviceInterface122 **)hidDeviceInterface,
- &cookies,
- &nr_cookies) < 0) {
- (*hidDeviceInterface)->Release(hidDeviceInterface);
- hidDeviceInterface = NULL;
- IOObjectRelease(hidDevice);
- continue;
- }
- IOObjectRelease(hidDevice);
- break;
- }
- if (hidDeviceInterface == NULL)
- goto mp_input_ar_init_error;
-
- // Open the device.
- if ((*hidDeviceInterface)->open(hidDeviceInterface,
- kIOHIDOptionsTypeSeizeDevice) != kIOReturnSuccess)
- goto mp_input_ar_init_error;
- hidDeviceIsOpen = 1;
-
- if ((queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface)) == NULL
- || *queue == NULL)
- goto mp_input_ar_init_error;
-
- // Create the queue.
- (*queue)->create(queue, 0, MAX_QUEUE_SIZE);
-
- // Add elements to the queue to make the queue work.
- // On tiger, it's a sequence from 1 to 21,
- // maybe it's the range of cookie values.
- for (i = 0;i < nr_cookies;i++)
- (*queue)->addElement(queue, cookies[i], 0);
-
- // not used anymore
- free(cookies);
-
- // Start data delivery to the queue.
- (*queue)->start(queue);
-
- // not useful anymore
- IOObjectRelease(hidObjectIterator);
-
- initialized = 1;
- return 0;
-
-mp_input_ar_init_error:
- free(cookies);
- if (hidDeviceInterface != NULL) {
- if (*hidDeviceInterface != NULL) {
- (*hidDeviceInterface)->close(hidDeviceInterface);
- (*hidDeviceInterface)->Release(hidDeviceInterface);
- }
- hidDeviceInterface = NULL;
- }
- IOObjectRelease(hidObjectIterator);
- return -1;
-}
-
-static int is_mplayer_front(void)
-{
- ProcessSerialNumber myProc, frProc;
- Boolean sameProc;
- pid_t parentPID;
-
- if (GetFrontProcess(&frProc) == noErr
- && GetCurrentProcess(&myProc) == noErr
- && SameProcess(&frProc, &myProc, &sameProc) == noErr) {
- if (sameProc)
- return 1;
- // If MPlayer is running in slave mode, also check parent process.
- if (slave_mode && GetProcessPID(&frProc, &parentPID) == noErr)
- return parentPID==getppid();
- }
- return 0;
-}
-
-int mp_input_ar_read(void *ctx, int fd)
-{
- int i, down = 0;
- int ret = MP_INPUT_NOTHING;
- AbsoluteTime zeroTime = {0,0};
- IOHIDEventStruct event;
- static int prev_event = 0;
- IOReturn result = kIOReturnSuccess;
-
- const cookie_keycode_map_t *ar_code;
- int cookie_nr = 0;
- char cookie_queue[MAX_QUEUE_SIZE];
- int value_queue[MAX_QUEUE_SIZE];
-
- if (initialized == 0)
- return MP_INPUT_NOTHING;
-
- while ((result = (*queue)->getNextEvent(queue, &event, zeroTime, 0)) == kIOReturnSuccess) {
-#ifdef TEST
- printf(" - event cookie: %d, value: %d, long value: %d\n",
- (int)event.elementCookie, (int)event.value, (int)event.longValue);
-#endif
- // Shorten cookie sequence by removing cookies value 5 and 18,
- // since 5 always follows 6 (on tiger), 18 follows 19 (on leopard).
- if ((int)event.elementCookie == 5
- || ((int)event.elementCookie == 18 && is_leopard))
- continue;
- // Check valid cookie range.
- if ((int)event.elementCookie > 35 || (int)event.elementCookie < 2) {
- cookie_nr = 0;
- continue;
- }
- cookie_queue[cookie_nr] = (char)(int)event.elementCookie;
- value_queue[cookie_nr++] = event.value;
- // 4 cookies are necessary to make up a valid sequence.
- if (cookie_nr>=4) {
- // Find matching sequence.
- ar_code = ar_codes;
- while (ar_code->cookies != NULL &&
- (cookie_nr < ar_code->seq_len ||
- 0 != memcmp(ar_code->cookies,
- &cookie_queue[cookie_nr-ar_code->seq_len],
- ar_code->seq_len)))
- ++ar_code;
- if (ar_code->cookies != NULL) {
- ret = ar_code->keycode;
- switch (ret) {
- // For these 4 keys, the remote can keep a hold state.
- case AR_VUP:
- case AR_VDOWN:
- case AR_NEXT_HOLD:
- case AR_PREV_HOLD:
- for (i = cookie_nr-ar_code->seq_len; i < cookie_nr; ++i) {
- if (value_queue[i]) {
- down = MP_KEY_DOWN;
- break;
- }
- }
- break;
- default:
- down = 0;
- }
- }
- }
- }
-
- if (!is_mplayer_front()) {
- if (hidDeviceIsOpen) {
- (*hidDeviceInterface)->close(hidDeviceInterface);
- hidDeviceIsOpen = 0;
-
- // Read out all pending events.
- while (result == kIOReturnSuccess)
- result = (*queue)->getNextEvent(queue, &event, zeroTime, 0);
- }
- return MP_INPUT_NOTHING;
- }
- // If we are switched from running as a foreground process to a
- // background process and back again, re-open the device to make
- // sure we are not affected by the system or other applications
- // using the Apple Remote.
- else if (!hidDeviceIsOpen) {
- if ((*hidDeviceInterface)->open(hidDeviceInterface,
- kIOHIDOptionsTypeSeizeDevice) == kIOReturnSuccess)
- hidDeviceIsOpen = 1;
- }
-
- if (ret > 0)
- prev_event = ret;
- return ret | down;
-}
-
-int mp_input_ar_close(int fd)
-{
- if (initialized == 0)
- return 0;
-
- // Close the device.
- (*hidDeviceInterface)->close(hidDeviceInterface);
-
- // Stop data delivery to queue.
- (*queue)->stop(queue);
- // Dispose of queue.
- (*queue)->dispose(queue);
- // Release the queue we allocated.
- (*queue)->Release(queue);
-
- // Release the interface.
- (*hidDeviceInterface)->Release(hidDeviceInterface);
-
- initialized = 0;
- return 0;
-}
-
-#ifdef TEST
-int main(void)
-{
- int ret;
-
- if (mp_input_ar_init() < 0) {
- printf("Unable to initialize Apple Remote.\n");
- return 1;
- }
-
- while (1) {
- switch ((ret = mp_input_ar_read(NULL, 0)) & ~MP_KEY_DOWN) {
- case AR_PLAY: printf(" - AR_PLAY."); break;
- case AR_PLAY_HOLD: printf(" - AR_PLAY_HOLD."); break;
- case AR_NEXT: printf(" - AR_NEXT."); break;
- case AR_NEXT_HOLD: printf(" - AR_NEXT_HOLD."); break;
- case AR_PREV: printf(" - AR_PREV."); break;
- case AR_PREV_HOLD: printf(" - AR_PREV_HOLD."); break;
- case AR_MENU: printf(" - AR_MENU."); break;
- case AR_MENU_HOLD: printf(" - AR_MENU_HOLD."); break;
- case AR_VUP: printf(" - AR_VUP."); break;
- case AR_VDOWN: printf(" - AR_VDOWN."); break;
- }
- if ((ret > 0 )&&(ret & MP_KEY_DOWN))
- printf(" [hold]");
- if (ret > 0)
- printf("\n");
- }
-
- mp_input_ar_close(0);
- return 0;
-}
-#endif
diff --git a/input/ar.h b/input/ar.h
deleted file mode 100644
index dff6d12f8a..0000000000
--- a/input/ar.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Apple Remote input interface
- *
- * Copyright (C) 2007 Zoltan Ponekker <pontscho at kac.poliod.hu>
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_AR_H
-#define MPLAYER_AR_H
-
-/* MacOSX Driver */
-int mp_input_ar_init(void);
-int mp_input_ar_read(void *ctx, int fd);
-int mp_input_ar_close(int fd);
-
-/* Linux Driver */
-int mp_input_appleir_init(char* dev);
-int mp_input_appleir_read(void *ctx, int fd);
-
-#endif /* MPLAYER_AR_H */
diff --git a/input/input.c b/input/input.c
deleted file mode 100644
index 6643747e4d..0000000000
--- a/input/input.c
+++ /dev/null
@@ -1,1959 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <assert.h>
-
-#include "osdep/io.h"
-
-#include "input.h"
-#include "mp_fifo.h"
-#include "keycodes.h"
-#include "osdep/timer.h"
-#include "libavutil/avstring.h"
-#include "libavutil/common.h"
-#include "mp_msg.h"
-#include "m_config.h"
-#include "m_option.h"
-#include "path.h"
-#include "talloc.h"
-#include "options.h"
-#include "bstr.h"
-#include "stream/stream.h"
-
-#include "joystick.h"
-
-#ifdef CONFIG_LIRC
-#include "lirc.h"
-#endif
-
-#ifdef CONFIG_LIRCC
-#include <lirc/lircc.h>
-#endif
-
-#include "ar.h"
-
-#ifdef CONFIG_COCOA
-#include "osdep/cocoa_events.h"
-#endif
-
-#define MP_MAX_KEY_DOWN 32
-
-struct cmd_bind {
- int input[MP_MAX_KEY_DOWN + 1];
- char *cmd;
- char *location; // filename/line number of definition
- struct cmd_bind_section *owner;
-};
-
-struct key_name {
- int key;
- char *name;
-};
-
-/* This array defines all known commands.
- * The first field is an id used to recognize the command.
- * The second is the command name used in slave mode and input.conf.
- * Then comes the definition of each argument, first mandatory arguments
- * (ARG_INT, ARG_FLOAT, ARG_STRING) if any, then optional arguments
- * (OARG_INT(default), etc) if any. The command will be given the default
- * argument value if the user didn't give enough arguments to specify it.
- * A command can take a maximum of MP_CMD_MAX_ARGS arguments (10).
- */
-
-#define ARG_INT { .type = {"", NULL, &m_option_type_int} }
-#define ARG_FLOAT { .type = {"", NULL, &m_option_type_float} }
-#define ARG_STRING { .type = {"", NULL, &m_option_type_string} }
-#define ARG_CHOICE(c) { .type = {"", NULL, &m_option_type_choice, \
- M_CHOICES(c)} }
-
-#define OARG_FLOAT(def) { .type = {"", NULL, &m_option_type_float}, \
- .optional = true, .v.f = def }
-#define OARG_INT(def) { .type = {"", NULL, &m_option_type_int}, \
- .optional = true, .v.i = def }
-#define OARG_CHOICE(def, c) { .type = {"", NULL, &m_option_type_choice, \
- M_CHOICES(c)}, \
- .optional = true, .v.i = def }
-
-static int parse_cycle_dir(const struct m_option *opt, struct bstr name,
- struct bstr param, void *dst);
-static const struct m_option_type m_option_type_cycle_dir = {
- .name = "up|down",
- .parse = parse_cycle_dir,
-};
-
-static const mp_cmd_t mp_cmds[] = {
- { MP_CMD_IGNORE, "ignore", },
-
- { MP_CMD_RADIO_STEP_CHANNEL, "radio_step_channel", { ARG_INT } },
- { MP_CMD_RADIO_SET_CHANNEL, "radio_set_channel", { ARG_STRING } },
- { MP_CMD_RADIO_SET_FREQ, "radio_set_freq", { ARG_FLOAT } },
- { MP_CMD_RADIO_STEP_FREQ, "radio_step_freq", {ARG_FLOAT } },
-
- { MP_CMD_SEEK, "seek", {
- ARG_FLOAT,
- OARG_CHOICE(0, ({"relative", 0}, {"0", 0},
- {"absolute-percent", 1}, {"1", 1},
- {"absolute", 2}, {"2", 2})),
- OARG_CHOICE(0, ({"default-precise", 0}, {"0", 0},
- {"exact", 1}, {"1", 1},
- {"keyframes", -1}, {"-1", -1})),
- }},
- { MP_CMD_EDL_MARK, "edl_mark", },
- { MP_CMD_SPEED_MULT, "speed_mult", { ARG_FLOAT } },
- { MP_CMD_QUIT, "quit", { OARG_INT(0) } },
- { MP_CMD_STOP, "stop", },
- { MP_CMD_FRAME_STEP, "frame_step", },
- { MP_CMD_PLAYLIST_NEXT, "playlist_next", {
- OARG_CHOICE(0, ({"weak", 0}, {"0", 0},
- {"force", 1}, {"1", 1})),
- }},
- { MP_CMD_PLAYLIST_PREV, "playlist_prev", {
- OARG_CHOICE(0, ({"weak", 0}, {"0", 0},
- {"force", 1}, {"1", 1})),
- }},
- { MP_CMD_SUB_STEP, "sub_step", { ARG_INT } },
- { MP_CMD_OSD, "osd", { OARG_INT(-1) } },
- { MP_CMD_PRINT_TEXT, "print_text", { ARG_STRING } },
- { MP_CMD_SHOW_TEXT, "show_text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) } },
- { MP_CMD_SHOW_PROGRESS, "show_progress", },
- { MP_CMD_SUB_LOAD, "sub_load", { ARG_STRING } },
-
- { MP_CMD_TV_START_SCAN, "tv_start_scan", },
- { MP_CMD_TV_STEP_CHANNEL, "tv_step_channel", { ARG_INT } },
- { MP_CMD_TV_STEP_NORM, "tv_step_norm", },
- { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", },
- { MP_CMD_TV_SET_CHANNEL, "tv_set_channel", { ARG_STRING } },
- { MP_CMD_TV_LAST_CHANNEL, "tv_last_channel", },
- { MP_CMD_TV_SET_FREQ, "tv_set_freq", { ARG_FLOAT } },
- { MP_CMD_TV_STEP_FREQ, "tv_step_freq", { ARG_FLOAT } },
- { MP_CMD_TV_SET_NORM, "tv_set_norm", { ARG_STRING } },
-
- { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", { ARG_INT, ARG_INT } },
-
- { MP_CMD_SCREENSHOT, "screenshot", {
- OARG_CHOICE(2, ({"video", 0},
- {"window", 1},
- {"subtitles", 2})),
- OARG_CHOICE(0, ({"single", 0},
- {"each-frame", 1})),
- }},
- { MP_CMD_LOADFILE, "loadfile", {
- ARG_STRING,
- OARG_CHOICE(0, ({"replace", 0}, {"0", 0},
- {"append", 1}, {"1", 1})),
- }},
- { MP_CMD_LOADLIST, "loadlist", {
- ARG_STRING,
- OARG_CHOICE(0, ({"replace", 0}, {"0", 0},
- {"append", 1}, {"1", 1})),
- }},
- { MP_CMD_PLAYLIST_CLEAR, "playlist_clear", },
- { MP_CMD_RUN, "run", { ARG_STRING } },
-
- { MP_CMD_KEYDOWN_EVENTS, "key_down_event", { ARG_INT } },
- { MP_CMD_SET, "set", { ARG_STRING, ARG_STRING } },
- { MP_CMD_GET_PROPERTY, "get_property", { ARG_STRING } },
- { MP_CMD_ADD, "add", { ARG_STRING, OARG_FLOAT(0) } },
- { MP_CMD_CYCLE, "cycle", {
- ARG_STRING,
- { .type = {"", NULL, &m_option_type_cycle_dir},
- .optional = true,
- .v.f = 1 },
- }},
-
- { MP_CMD_SET_MOUSE_POS, "set_mouse_pos", { ARG_INT, ARG_INT } },
-
- { MP_CMD_AF_SWITCH, "af_switch", { ARG_STRING } },
- { MP_CMD_AF_ADD, "af_add", { ARG_STRING } },
- { MP_CMD_AF_DEL, "af_del", { ARG_STRING } },
- { MP_CMD_AF_CLR, "af_clr", },
- { MP_CMD_AF_CMDLINE, "af_cmdline", { ARG_STRING, ARG_STRING } },
-
- { MP_CMD_SHOW_CHAPTERS, "show_chapters", },
- { MP_CMD_SHOW_TRACKS, "show_tracks", },
-
- { MP_CMD_VO_CMDLINE, "vo_cmdline", { ARG_STRING } },
-
- {0}
-};
-
-// Map legacy commands to proper commands
-struct legacy_cmd {
- const char *old, *new;
-};
-static const struct legacy_cmd legacy_cmds[] = {
- {"loop", "cycle loop"},
- {"seek_chapter", "add chapter"},
- {"switch_angle", "cycle angle"},
- {"pause", "cycle pause"},
- {"volume", "add volume"},
- {"mute", "cycle mute"},
- {"audio_delay", "add audio-delay"},
- {"switch_audio", "cycle audio"},
- {"balance", "add balance"},
- {"vo_fullscreen", "no-osd cycle fullscreen"},
- {"panscan", "add panscan"},
- {"vo_ontop", "cycle ontop"},
- {"vo_rootwin", "cycle rootwin"},
- {"vo_border", "cycle border"},
- {"frame_drop", "cycle framedrop"},
- {"gamma", "add gamma"},
- {"brightness", "add brightness"},
- {"contrast", "add contrast"},
- {"saturation", "add saturation"},
- {"hue", "add hue"},
- {"switch_vsync", "cycle vsync"},
- {"sub_select", "cycle sub"},
- {"sub_pos", "add sub-pos"},
- {"sub_delay", "add sub-delay"},
- {"sub_visibility", "cycle sub-visibility"},
- {"forced_subs_only", "cycle sub-forced-only"},
- {"sub_scale", "add sub-scale"},
- {"ass_use_margins", "cycle ass-use-margins"},
- {"tv_set_brightness", "add tv-brightness"},
- {"tv_set_hue", "add tv-hue"},
- {"tv_set_saturation", "add tv-saturation"},
- {"tv_set_contrast", "add tv-contrast"},
- {"step_property_osd", "cycle"},
- {"step_property", "no-osd cycle"},
- {"set_property", "no-osd set"},
- {"set_property_osd", "set"},
- {"speed_set", "set speed"},
- {"osd_show_text", "show_text"},
- {"osd_show_property_text", "show_text"},
- {"osd_show_progression", "show_progress"},
- {"show_chapters_osd", "show_chapters"},
- {"show_tracks_osd", "show_tracks"},
- // Approximate (can fail if user added additional whitespace)
- {"pt_step 1", "playlist_next"},
- {"pt_step -1", "playlist_prev"},
- // Switch_ratio without argument resets aspect ratio
- {"switch_ratio ", "set aspect "},
- {"switch_ratio", "set aspect 0"},
- {0}
-};
-
-
-/// The names of the keys as used in input.conf
-/// If you add some new keys, you also need to add them here
-
-static const struct key_name key_names[] = {
- { ' ', "SPACE" },
- { '#', "SHARP" },
- { KEY_ENTER, "ENTER" },
- { KEY_TAB, "TAB" },
- { KEY_BACKSPACE, "BS" },
- { KEY_DELETE, "DEL" },
- { KEY_INSERT, "INS" },
- { KEY_HOME, "HOME" },
- { KEY_END, "END" },
- { KEY_PAGE_UP, "PGUP" },
- { KEY_PAGE_DOWN, "PGDWN" },
- { KEY_ESC, "ESC" },
- { KEY_PRINT, "PRINT" },
- { KEY_RIGHT, "RIGHT" },
- { KEY_LEFT, "LEFT" },
- { KEY_DOWN, "DOWN" },
- { KEY_UP, "UP" },
- { KEY_F+1, "F1" },
- { KEY_F+2, "F2" },
- { KEY_F+3, "F3" },
- { KEY_F+4, "F4" },
- { KEY_F+5, "F5" },
- { KEY_F+6, "F6" },
- { KEY_F+7, "F7" },
- { KEY_F+8, "F8" },
- { KEY_F+9, "F9" },
- { KEY_F+10, "F10" },
- { KEY_F+11, "F11" },
- { KEY_F+12, "F12" },
- { KEY_KP0, "KP0" },
- { KEY_KP1, "KP1" },
- { KEY_KP2, "KP2" },
- { KEY_KP3, "KP3" },
- { KEY_KP4, "KP4" },
- { KEY_KP5, "KP5" },
- { KEY_KP6, "KP6" },
- { KEY_KP7, "KP7" },
- { KEY_KP8, "KP8" },
- { KEY_KP9, "KP9" },
- { KEY_KPDEL, "KP_DEL" },
- { KEY_KPDEC, "KP_DEC" },
- { KEY_KPINS, "KP_INS" },
- { KEY_KPENTER, "KP_ENTER" },
- { MOUSE_BTN0, "MOUSE_BTN0" },
- { MOUSE_BTN1, "MOUSE_BTN1" },
- { MOUSE_BTN2, "MOUSE_BTN2" },
- { MOUSE_BTN3, "MOUSE_BTN3" },
- { MOUSE_BTN4, "MOUSE_BTN4" },
- { MOUSE_BTN5, "MOUSE_BTN5" },
- { MOUSE_BTN6, "MOUSE_BTN6" },
- { MOUSE_BTN7, "MOUSE_BTN7" },
- { MOUSE_BTN8, "MOUSE_BTN8" },
- { MOUSE_BTN9, "MOUSE_BTN9" },
- { MOUSE_BTN10, "MOUSE_BTN10" },
- { MOUSE_BTN11, "MOUSE_BTN11" },
- { MOUSE_BTN12, "MOUSE_BTN12" },
- { MOUSE_BTN13, "MOUSE_BTN13" },
- { MOUSE_BTN14, "MOUSE_BTN14" },
- { MOUSE_BTN15, "MOUSE_BTN15" },
- { MOUSE_BTN16, "MOUSE_BTN16" },
- { MOUSE_BTN17, "MOUSE_BTN17" },
- { MOUSE_BTN18, "MOUSE_BTN18" },
- { MOUSE_BTN19, "MOUSE_BTN19" },
- { MOUSE_BTN0_DBL, "MOUSE_BTN0_DBL" },
- { MOUSE_BTN1_DBL, "MOUSE_BTN1_DBL" },
- { MOUSE_BTN2_DBL, "MOUSE_BTN2_DBL" },
- { MOUSE_BTN3_DBL, "MOUSE_BTN3_DBL" },
- { MOUSE_BTN4_DBL, "MOUSE_BTN4_DBL" },
- { MOUSE_BTN5_DBL, "MOUSE_BTN5_DBL" },
- { MOUSE_BTN6_DBL, "MOUSE_BTN6_DBL" },
- { MOUSE_BTN7_DBL, "MOUSE_BTN7_DBL" },
- { MOUSE_BTN8_DBL, "MOUSE_BTN8_DBL" },
- { MOUSE_BTN9_DBL, "MOUSE_BTN9_DBL" },
- { MOUSE_BTN10_DBL, "MOUSE_BTN10_DBL" },
- { MOUSE_BTN11_DBL, "MOUSE_BTN11_DBL" },
- { MOUSE_BTN12_DBL, "MOUSE_BTN12_DBL" },
- { MOUSE_BTN13_DBL, "MOUSE_BTN13_DBL" },
- { MOUSE_BTN14_DBL, "MOUSE_BTN14_DBL" },
- { MOUSE_BTN15_DBL, "MOUSE_BTN15_DBL" },
- { MOUSE_BTN16_DBL, "MOUSE_BTN16_DBL" },
- { MOUSE_BTN17_DBL, "MOUSE_BTN17_DBL" },
- { MOUSE_BTN18_DBL, "MOUSE_BTN18_DBL" },
- { MOUSE_BTN19_DBL, "MOUSE_BTN19_DBL" },
- { JOY_AXIS1_MINUS, "JOY_UP" },
- { JOY_AXIS1_PLUS, "JOY_DOWN" },
- { JOY_AXIS0_MINUS, "JOY_LEFT" },
- { JOY_AXIS0_PLUS, "JOY_RIGHT" },
-
- { JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
- { JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
- { JOY_AXIS1_PLUS, "JOY_AXIS1_PLUS" },
- { JOY_AXIS1_MINUS, "JOY_AXIS1_MINUS" },
- { JOY_AXIS2_PLUS, "JOY_AXIS2_PLUS" },
- { JOY_AXIS2_MINUS, "JOY_AXIS2_MINUS" },
- { JOY_AXIS3_PLUS, "JOY_AXIS3_PLUS" },
- { JOY_AXIS3_MINUS, "JOY_AXIS3_MINUS" },
- { JOY_AXIS4_PLUS, "JOY_AXIS4_PLUS" },
- { JOY_AXIS4_MINUS, "JOY_AXIS4_MINUS" },
- { JOY_AXIS5_PLUS, "JOY_AXIS5_PLUS" },
- { JOY_AXIS5_MINUS, "JOY_AXIS5_MINUS" },
- { JOY_AXIS6_PLUS, "JOY_AXIS6_PLUS" },
- { JOY_AXIS6_MINUS, "JOY_AXIS6_MINUS" },
- { JOY_AXIS7_PLUS, "JOY_AXIS7_PLUS" },
- { JOY_AXIS7_MINUS, "JOY_AXIS7_MINUS" },
- { JOY_AXIS8_PLUS, "JOY_AXIS8_PLUS" },
- { JOY_AXIS8_MINUS, "JOY_AXIS8_MINUS" },
- { JOY_AXIS9_PLUS, "JOY_AXIS9_PLUS" },
- { JOY_AXIS9_MINUS, "JOY_AXIS9_MINUS" },
-
- { JOY_BTN0, "JOY_BTN0" },
- { JOY_BTN1, "JOY_BTN1" },
- { JOY_BTN2, "JOY_BTN2" },
- { JOY_BTN3, "JOY_BTN3" },
- { JOY_BTN4, "JOY_BTN4" },
- { JOY_BTN5, "JOY_BTN5" },
- { JOY_BTN6, "JOY_BTN6" },
- { JOY_BTN7, "JOY_BTN7" },
- { JOY_BTN8, "JOY_BTN8" },
- { JOY_BTN9, "JOY_BTN9" },
-
- { AR_PLAY, "AR_PLAY" },
- { AR_PLAY_HOLD, "AR_PLAY_HOLD" },
- { AR_NEXT, "AR_NEXT" },
- { AR_NEXT_HOLD, "AR_NEXT_HOLD" },
- { AR_PREV, "AR_PREV" },
- { AR_PREV_HOLD, "AR_PREV_HOLD" },
- { AR_MENU, "AR_MENU" },
- { AR_MENU_HOLD, "AR_MENU_HOLD" },
- { AR_VUP, "AR_VUP" },
- { AR_VDOWN, "AR_VDOWN" },
-
- { KEY_POWER, "POWER" },
- { KEY_MENU, "MENU" },
- { KEY_PLAY, "PLAY" },
- { KEY_PAUSE, "PAUSE" },
- { KEY_PLAYPAUSE, "PLAYPAUSE" },
- { KEY_STOP, "STOP" },
- { KEY_FORWARD, "FORWARD" },
- { KEY_REWIND, "REWIND" },
- { KEY_NEXT, "NEXT" },
- { KEY_PREV, "PREV" },
- { KEY_VOLUME_UP, "VOLUME_UP" },
- { KEY_VOLUME_DOWN, "VOLUME_DOWN" },
- { KEY_MUTE, "MUTE" },
-
- // These are kept for backward compatibility
- { KEY_PAUSE, "XF86_PAUSE" },
- { KEY_STOP, "XF86_STOP" },
- { KEY_PREV, "XF86_PREV" },
- { KEY_NEXT, "XF86_NEXT" },
-
- { KEY_CLOSE_WIN, "CLOSE_WIN" },
-
- { 0, NULL }
-};
-
-struct key_name modifier_names[] = {
- { KEY_MODIFIER_SHIFT, "Shift" },
- { KEY_MODIFIER_CTRL, "Ctrl" },
- { KEY_MODIFIER_ALT, "Alt" },
- { KEY_MODIFIER_META, "Meta" },
- { 0 }
-};
-
-#define KEY_MODIFIER_MASK (KEY_MODIFIER_SHIFT | KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_META)
-
-#ifndef MP_MAX_KEY_FD
-#define MP_MAX_KEY_FD 10
-#endif
-
-#ifndef MP_MAX_CMD_FD
-#define MP_MAX_CMD_FD 10
-#endif
-
-struct input_fd {
- int fd;
- union {
- int (*key)(void *ctx, int fd);
- int (*cmd)(int fd, char *dest, int size);
- } read_func;
- int (*close_func)(int fd);
- void *ctx;
- unsigned eof : 1;
- unsigned drop : 1;
- unsigned dead : 1;
- unsigned got_cmd : 1;
- unsigned no_select : 1;
- // These fields are for the cmd fds.
- char *buffer;
- int pos, size;
-};
-
-struct cmd_bind_section {
- struct cmd_bind *cmd_binds;
- bool is_builtin;
- char *section;
- struct cmd_bind_section *next;
-};
-
-struct cmd_queue {
- struct mp_cmd *first;
-};
-
-struct input_ctx {
- // Autorepeat stuff
- short ar_state;
- mp_cmd_t *ar_cmd;
- unsigned int last_ar;
- // Autorepeat config
- unsigned int ar_delay;
- unsigned int ar_rate;
- // Maximum number of queued commands from keypresses (limit to avoid
- // repeated slow commands piling up)
- int key_fifo_size;
-
- // these are the keys currently down
- int key_down[MP_MAX_KEY_DOWN];
- unsigned int num_key_down;
- unsigned int last_key_down;
-
- bool test;
-
- bool default_bindings;
- // List of command binding sections
- struct cmd_bind_section *cmd_bind_sections;
- // Name of currently used command section
- char *section;
- // Bitfield of mp_input_section_flags
- int section_flags;
-
- // Used to track whether we managed to read something while checking
- // events sources. If yes, the sources may have more queued.
- bool got_new_events;
-
- struct input_fd key_fds[MP_MAX_KEY_FD];
- unsigned int num_key_fd;
-
- struct input_fd cmd_fds[MP_MAX_CMD_FD];
- unsigned int num_cmd_fd;
-
- struct cmd_queue key_cmd_queue;
- struct cmd_queue control_cmd_queue;
-
- int wakeup_pipe[2];
-};
-
-
-int async_quit_request;
-
-static int print_key_list(m_option_t *cfg, char *optname, char *optparam);
-static int print_cmd_list(m_option_t *cfg, char *optname, char *optparam);
-
-// Our command line options
-static const m_option_t input_conf[] = {
- OPT_STRING("conf", input.config_file, CONF_GLOBAL, OPTDEF_STR("input.conf")),
- OPT_INT("ar-delay", input.ar_delay, CONF_GLOBAL),
- OPT_INT("ar-rate", input.ar_rate, CONF_GLOBAL),
- { "keylist", print_key_list, CONF_TYPE_PRINT_FUNC, CONF_GLOBAL | CONF_NOCFG },
- { "cmdlist", print_cmd_list, CONF_TYPE_PRINT_FUNC, CONF_GLOBAL | CONF_NOCFG },
- OPT_STRING("js-dev", input.js_dev, CONF_GLOBAL),
- OPT_STRING("ar-dev", input.ar_dev, CONF_GLOBAL),
- OPT_STRING("file", input.in_file, CONF_GLOBAL),
- OPT_MAKE_FLAGS("default-bindings", input.default_bindings, CONF_GLOBAL),
- OPT_MAKE_FLAGS("test", input.test, CONF_GLOBAL),
- { NULL, NULL, 0, 0, 0, 0, NULL}
-};
-
-static const m_option_t mp_input_opts[] = {
- { "input", (void *)&input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
- OPT_MAKE_FLAGS("joystick", input.use_joystick, CONF_GLOBAL),
- OPT_MAKE_FLAGS("lirc", input.use_lirc, CONF_GLOBAL),
- OPT_MAKE_FLAGS("lircc", input.use_lircc, CONF_GLOBAL),
- OPT_MAKE_FLAGS("ar", input.use_ar, CONF_GLOBAL),
- { NULL, NULL, 0, 0, 0, 0, NULL}
-};
-
-static int default_cmd_func(int fd, char *buf, int l);
-
-static const char builtin_input_conf[] =
-#include "input/input_conf.h"
-;
-
-// Encode the unicode codepoint as UTF-8, and append to the end of the
-// talloc'ed buffer.
-static char *append_utf8_buffer(char *buffer, uint32_t codepoint)
-{
- char data[8];
- uint8_t tmp;
- char *output = data;
- PUT_UTF8(codepoint, tmp, *output++ = tmp;);
- return talloc_strndup_append_buffer(buffer, data, output - data);
-}
-
-static char *get_key_name(int key, char *ret)
-{
- for (int i = 0; modifier_names[i].name; i++) {
- if (modifier_names[i].key & key) {
- ret = talloc_asprintf_append_buffer(ret, "%s+",
- modifier_names[i].name);
- key -= modifier_names[i].key;
- }
- }
- for (int i = 0; key_names[i].name != NULL; i++) {
- if (key_names[i].key == key)
- return talloc_asprintf_append_buffer(ret, "%s", key_names[i].name);
- }
-
- // printable, and valid unicode range
- if (key >= 32 && key <= 0x10FFFF)
- return append_utf8_buffer(ret, key);
-
- // Print the hex key code
- return talloc_asprintf_append_buffer(ret, "%#-8x", key);
-}
-
-static char *get_key_combo_name(int *keys, int max)
-{
- char *ret = talloc_strdup(NULL, "");
- while (1) {
- ret = get_key_name(*keys, ret);
- if (--max && *++keys)
- talloc_asprintf_append_buffer(ret, "-");
- else
- break;
- }
- return ret;
-}
-
-bool mp_input_is_abort_cmd(int cmd_id)
-{
- switch (cmd_id) {
- case MP_CMD_QUIT:
- case MP_CMD_PLAYLIST_NEXT:
- case MP_CMD_PLAYLIST_PREV:
- return true;
- }
- return false;
-}
-
-static int queue_count_cmds(struct cmd_queue *queue)
-{
- int res = 0;
- for (struct mp_cmd *cmd = queue->first; cmd; cmd = cmd->queue_next)
- res++;
- return res;
-}
-
-static bool queue_has_abort_cmds(struct cmd_queue *queue)
-{
- for (struct mp_cmd *cmd = queue->first; cmd; cmd = cmd->queue_next) {
- if (mp_input_is_abort_cmd(cmd->id))
- return true;
- }
- return false;
-}
-
-static void queue_remove(struct cmd_queue *queue, struct mp_cmd *cmd)
-{
- struct mp_cmd **p_prev = &queue->first;
- while (*p_prev != cmd) {
- p_prev = &(*p_prev)->queue_next;
- }
- // if this fails, cmd was not in the queue
- assert(*p_prev == cmd);
- *p_prev = cmd->queue_next;
-}
-
-static void queue_add(struct cmd_queue *queue, struct mp_cmd *cmd,
- bool at_head)
-{
- if (at_head) {
- cmd->queue_next = queue->first;
- queue->first = cmd;
- } else {
- struct mp_cmd **p_prev = &queue->first;
- while (*p_prev)
- p_prev = &(*p_prev)->queue_next;
- *p_prev = cmd;
- cmd->queue_next = NULL;
- }
-}
-
-int mp_input_add_cmd_fd(struct input_ctx *ictx, int fd, int select,
- int read_func(int fd, char *dest, int size),
- int close_func(int fd))
-{
- if (ictx->num_cmd_fd == MP_MAX_CMD_FD) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Too many command file descriptors, "
- "cannot register file descriptor %d.\n", fd);
- return 0;
- }
- if (select && fd < 0) {
- mp_msg(MSGT_INPUT, MSGL_ERR,
- "Invalid fd %d in mp_input_add_cmd_fd", fd);
- return 0;
- }
-
- ictx->cmd_fds[ictx->num_cmd_fd] = (struct input_fd){
- .fd = fd,
- .read_func.cmd = read_func ? read_func : default_cmd_func,
- .close_func = close_func,
- .no_select = !select
- };
- ictx->num_cmd_fd++;
-
- return 1;
-}
-
-void mp_input_rm_cmd_fd(struct input_ctx *ictx, int fd)
-{
- struct input_fd *cmd_fds = ictx->cmd_fds;
- unsigned int i;
-
- for (i = 0; i < ictx->num_cmd_fd; i++) {
- if (cmd_fds[i].fd == fd)
- break;
- }
- if (i == ictx->num_cmd_fd)
- return;
- if (cmd_fds[i].close_func)
- cmd_fds[i].close_func(cmd_fds[i].fd);
- talloc_free(cmd_fds[i].buffer);
-
- if (i + 1 < ictx->num_cmd_fd)
- memmove(&cmd_fds[i], &cmd_fds[i + 1],
- (ictx->num_cmd_fd - i - 1) * sizeof(struct input_fd));
- ictx->num_cmd_fd--;
-}
-
-void mp_input_rm_key_fd(struct input_ctx *ictx, int fd)
-{
- struct input_fd *key_fds = ictx->key_fds;
- unsigned int i;
-
- for (i = 0; i < ictx->num_key_fd; i++) {
- if (key_fds[i].fd == fd)
- break;
- }
- if (i == ictx->num_key_fd)
- return;
- if (key_fds[i].close_func)
- key_fds[i].close_func(key_fds[i].fd);
-
- if (i + 1 < ictx->num_key_fd)
- memmove(&key_fds[i], &key_fds[i + 1],
- (ictx->num_key_fd - i - 1) * sizeof(struct input_fd));
- ictx->num_key_fd--;
-}
-
-int mp_input_add_key_fd(struct input_ctx *ictx, int fd, int select,
- int read_func(void *ctx, int fd),
- int close_func(int fd), void *ctx)
-{
- if (ictx->num_key_fd == MP_MAX_KEY_FD) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Too many key file descriptors, "
- "cannot register file descriptor %d.\n", fd);
- return 0;
- }
- if (select && fd < 0) {
- mp_msg(MSGT_INPUT, MSGL_ERR,
- "Invalid fd %d in mp_input_add_key_fd", fd);
- return 0;
- }
-
- ictx->key_fds[ictx->num_key_fd] = (struct input_fd){
- .fd = fd,
- .read_func.key = read_func,
- .close_func = close_func,
- .no_select = !select,
- .ctx = ctx,
- };
- ictx->num_key_fd++;
-
- return 1;
-}
-
-static int parse_cycle_dir(const struct m_option *opt, struct bstr name,
- struct bstr param, void *dst)
-{
- float val;
- if (bstrcmp0(param, "up") == 0) {
- val = +1;
- } else if (bstrcmp0(param, "down") == 0) {
- val = -1;
- } else {
- return m_option_type_float.parse(opt, name, param, dst);
- }
- *(float *)dst = val;
- return 1;
-}
-
-static bool read_token(bstr str, bstr *out_rest, bstr *out_token)
-{
- bstr t = bstr_lstrip(str);
- int next = bstrcspn(t, WHITESPACE "#");
- // Handle comments
- if (t.start[next] == '#')
- t = bstr_splice(t, 0, next);
- if (!t.len)
- return false;
- *out_token = bstr_splice(t, 0, next);
- *out_rest = bstr_cut(t, next);
- return true;
-}
-
-static bool eat_token(bstr *str, const char *tok)
-{
- bstr rest, token;
- if (read_token(*str, &rest, &token) && bstrcmp0(token, tok) == 0) {
- *str = rest;
- return true;
- }
- return false;
-}
-
-static bool append_escape(bstr *code, char **str)
-{
- if (code->len < 1)
- return false;
- char replace = 0;
- switch (code->start[0]) {
- case '"': replace = '"'; break;
- case '\\': replace = '\\'; break;
- case 'b': replace = '\b'; break;
- case 'f': replace = '\f'; break;
- case 'n': replace = '\n'; break;
- case 'r': replace = '\r'; break;
- case 't': replace = '\t'; break;
- case 'e': replace = '\x1b'; break;
- case '\'': replace = '\''; break;
- }
- if (replace) {
- *str = talloc_strndup_append_buffer(*str, &replace, 1);
- *code = bstr_cut(*code, 1);
- return true;
- }
- if (code->start[0] == 'x' && code->len >= 3) {
- bstr num = bstr_splice(*code, 1, 3);
- char c = bstrtoll(num, &num, 16);
- if (!num.len)
- return false;
- *str = talloc_strndup_append_buffer(*str, &c, 1);
- *code = bstr_cut(*code, 3);
- return true;
- }
- if (code->start[0] == 'u' && code->len >= 5) {
- bstr num = bstr_splice(*code, 1, 5);
- int c = bstrtoll(num, &num, 16);
- if (num.len)
- return false;
- *str = append_utf8_buffer(*str, c);
- *code = bstr_cut(*code, 5);
- return true;
- }
- return false;
-}
-
-static bool read_escaped_string(void *talloc_ctx, bstr *str, bstr *literal)
-{
- bstr t = *str;
- char *new = talloc_strdup(talloc_ctx, "");
- while (t.len) {
- if (t.start[0] == '"')
- break;
- if (t.start[0] == '\\') {
- t = bstr_cut(t, 1);
- if (!append_escape(&t, &new))
- goto error;
- } else {
- new = talloc_strndup_append_buffer(new, t.start, 1);
- t = bstr_cut(t, 1);
- }
- }
- int len = str->len - t.len;
- *literal = new ? bstr0(new) : bstr_splice(*str, 0, len);
- *str = bstr_cut(*str, len);
- return true;
-error:
- talloc_free(new);
- return false;
-}
-
-mp_cmd_t *mp_input_parse_cmd(bstr str, const char *loc)
-{
- int pausing = 0;
- int on_osd = MP_ON_OSD_AUTO;
- struct mp_cmd *cmd = NULL;
- bstr start = str;
- void *tmp = talloc_new(NULL);
-
- if (eat_token(&str, "pausing")) {
- pausing = 1;
- } else if (eat_token(&str, "pausing_keep")) {
- pausing = 2;
- } else if (eat_token(&str, "pausing_toggle")) {
- pausing = 3;
- } else if (eat_token(&str, "pausing_keep_force")) {
- pausing = 4;
- }
-
- str = bstr_lstrip(str);
- for (const struct legacy_cmd *entry = legacy_cmds; entry->old; entry++) {
- size_t old_len = strlen(entry->old);
- if (bstrcasecmp(bstr_splice(str, 0, old_len),
- (bstr) {(char *)entry->old, old_len}) == 0)
- {
- mp_tmsg(MSGT_INPUT, MSGL_V, "Warning: command '%s' is "
- "deprecated, replaced with '%s' at %s.\n",
- entry->old, entry->new, loc);
- bstr s = bstr_cut(str, old_len);
- str = bstr0(talloc_asprintf(tmp, "%s%.*s", entry->new, BSTR_P(s)));
- start = str;
- break;
- }
- }
-
- if (eat_token(&str, "no-osd")) {
- on_osd = MP_ON_OSD_NO;
- } else if (eat_token(&str, "osd-bar")) {
- on_osd = MP_ON_OSD_BAR;
- } else if (eat_token(&str, "osd-msg")) {
- on_osd = MP_ON_OSD_MSG;
- } else if (eat_token(&str, "osd-msg-bar")) {
- on_osd = MP_ON_OSD_MSG | MP_ON_OSD_BAR;
- } else if (eat_token(&str, "osd-auto")) {
- // default
- }
-
- int cmd_idx = 0;
- while (mp_cmds[cmd_idx].name != NULL) {
- if (eat_token(&str, mp_cmds[cmd_idx].name))
- break;
- cmd_idx++;
- }
-
- if (mp_cmds[cmd_idx].name == NULL) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command '%.*s' not found.\n",
- BSTR_P(str));
- goto error;
- }
-
- cmd = talloc_ptrtype(NULL, cmd);
- *cmd = mp_cmds[cmd_idx];
- cmd->pausing = pausing;
- cmd->on_osd = on_osd;
-
- for (int i = 0; i < MP_CMD_MAX_ARGS; i++) {
- struct mp_cmd_arg *cmdarg = &cmd->args[i];
- if (!cmdarg->type.type)
- break;
- cmd->nargs++;
- str = bstr_lstrip(str);
- bstr arg = {0};
- if (cmdarg->type.type == &m_option_type_string &&
- bstr_eatstart0(&str, "\""))
- {
- if (!read_escaped_string(tmp, &str, &arg)) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command %s: argument %d "
- "has broken string escapes.\n", cmd->name, i + 1);
- goto error;
- }
- if (!bstr_eatstart0(&str, "\"")) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command %s: argument %d is "
- "unterminated.\n", cmd->name, i + 1);
- goto error;
- }
- } else {
- if (!read_token(str, &str, &arg))
- break;
- if (cmdarg->optional && bstrcmp0(arg, "-") == 0)
- continue;
- }
- // Prevent option API from trying to deallocate static strings
- cmdarg->v = ((struct mp_cmd_arg) {{0}}).v;
- int r = m_option_parse(&cmdarg->type, bstr0(cmd->name), arg, &cmdarg->v);
- if (r < 0) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command %s: argument %d "
- "can't be parsed: %s.\n", cmd->name, i + 1,
- m_option_strerror(r));
- goto error;
- }
- if (cmdarg->type.type == &m_option_type_string)
- cmdarg->v.s = talloc_steal(cmd, cmdarg->v.s);
- }
-
- bstr dummy;
- if (read_token(str, &dummy, &dummy)) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command %s has trailing unused "
- "arguments: '%.*s'.\n", cmd->name, BSTR_P(str));
- // Better make it fatal to make it clear something is wrong.
- goto error;
- }
-
- int min_args = 0;
- while (min_args < MP_CMD_MAX_ARGS && cmd->args[min_args].type.type
- && !cmd->args[min_args].optional)
- {
- min_args++;
- }
- if (cmd->nargs < min_args) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command %s requires at least %d "
- "arguments, we found only %d so far.\n", cmd->name, min_args,
- cmd->nargs);
- goto error;
- }
-
- bstr orig = (bstr) {start.start, str.start - start.start};
- cmd->original = bstrdup(cmd, bstr_strip(orig));
-
- talloc_free(tmp);
- return cmd;
-
-error:
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command was defined at %s.\n", loc);
- talloc_free(cmd);
- talloc_free(tmp);
- return NULL;
-}
-
-#define MP_CMD_MAX_SIZE 4096
-
-static int read_cmd(struct input_fd *mp_fd, char **ret)
-{
- char *end;
- *ret = NULL;
-
- // Allocate the buffer if it doesn't exist
- if (!mp_fd->buffer) {
- mp_fd->buffer = talloc_size(NULL, MP_CMD_MAX_SIZE);
- mp_fd->pos = 0;
- mp_fd->size = MP_CMD_MAX_SIZE;
- }
-
- // Get some data if needed/possible
- while (!mp_fd->got_cmd && !mp_fd->eof && (mp_fd->size - mp_fd->pos > 1)) {
- int r = mp_fd->read_func.cmd(mp_fd->fd, mp_fd->buffer + mp_fd->pos,
- mp_fd->size - 1 - mp_fd->pos);
- // Error ?
- if (r < 0) {
- switch (r) {
- case MP_INPUT_ERROR:
- case MP_INPUT_DEAD:
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Error while reading "
- "command file descriptor %d: %s\n",
- mp_fd->fd, strerror(errno));
- case MP_INPUT_NOTHING:
- return r;
- case MP_INPUT_RETRY:
- continue;
- }
- // EOF ?
- } else if (r == 0) {
- mp_fd->eof = 1;
- break;
- }
- mp_fd->pos += r;
- break;
- }
-
- mp_fd->got_cmd = 0;
-
- while (1) {
- int l = 0;
- // Find the cmd end
- mp_fd->buffer[mp_fd->pos] = '\0';
- end = strchr(mp_fd->buffer, '\r');
- if (end)
- *end = '\n';
- end = strchr(mp_fd->buffer, '\n');
- // No cmd end ?
- if (!end) {
- // If buffer is full we must drop all until the next \n
- if (mp_fd->size - mp_fd->pos <= 1) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Command buffer of file "
- "descriptor %d is full: dropping content.\n",
- mp_fd->fd);
- mp_fd->pos = 0;
- mp_fd->drop = 1;
- }
- break;
- }
- // We already have a cmd : set the got_cmd flag
- else if ((*ret)) {
- mp_fd->got_cmd = 1;
- break;
- }
-
- l = end - mp_fd->buffer;
-
- // Not dropping : put the cmd in ret
- if (!mp_fd->drop)
- *ret = talloc_strndup(NULL, mp_fd->buffer, l);
- else
- mp_fd->drop = 0;
- mp_fd->pos -= l + 1;
- memmove(mp_fd->buffer, end + 1, mp_fd->pos);
- }
-
- if (*ret)
- return 1;
- else
- return MP_INPUT_NOTHING;
-}
-
-static int default_cmd_func(int fd, char *buf, int l)
-{
- while (1) {
- int r = read(fd, buf, l);
- // Error ?
- if (r < 0) {
- if (errno == EINTR)
- continue;
- else if (errno == EAGAIN)
- return MP_INPUT_NOTHING;
- return MP_INPUT_ERROR;
- // EOF ?
- }
- return r;
- }
-}
-
-static int read_wakeup(void *ctx, int fd)
-{
- char buf[100];
- read(fd, buf, sizeof(buf));
- return MP_INPUT_NOTHING;
-}
-
-static bool bind_matches_key(struct cmd_bind *bind, int n, int *keys);
-
-static void append_bind_info(char **pmsg, struct cmd_bind *bind)
-{
- char *msg = *pmsg;
- struct mp_cmd *cmd = mp_input_parse_cmd(bstr0(bind->cmd), bind->location);
- bstr stripped = cmd ? cmd->original : bstr0(bind->cmd);
- msg = talloc_asprintf_append(msg, " '%.*s'", BSTR_P(stripped));
- if (!cmd)
- msg = talloc_asprintf_append(msg, " (invalid)");
- if (strcmp(bind->owner->section, "default") != 0)
- msg = talloc_asprintf_append(msg, " in section {%s}",
- bind->owner->section);
- if (bind->owner->is_builtin) {
- msg = talloc_asprintf_append(msg, " (default binding)");
- } else {
- msg = talloc_asprintf_append(msg, " in %s", bind->location);
- }
- *pmsg = msg;
-}
-
-static mp_cmd_t *handle_test(struct input_ctx *ictx, int n, int *keys)
-{
- char *key_buf = get_key_combo_name(keys, n);
- // "$>" to disable property substitution when invoking "show_text"
- char *msg = talloc_asprintf(NULL, "$>Key %s is bound to:\n", key_buf);
- talloc_free(key_buf);
-
- int count = 0;
- for (struct cmd_bind_section *bs = ictx->cmd_bind_sections;
- bs; bs = bs->next)
- {
- for (struct cmd_bind *bind = bs->cmd_binds; bind->cmd; bind++) {
- if (bind_matches_key(bind, n, keys)) {
- count++;
- msg = talloc_asprintf_append(msg, "%d. ", count);
- append_bind_info(&msg, bind);
- msg = talloc_asprintf_append(msg, "\n");
- }
- }
- }
-
- if (!count)
- msg = talloc_asprintf_append(msg, "(nothing)");
-
- mp_cmd_t *res = mp_input_parse_cmd(bstr0("show_text \"\""), "");
- res->args[0].v.s = talloc_steal(res, msg);
- return res;
-}
-
-static bool bind_matches_key(struct cmd_bind *bind, int n, int *keys)
-{
- int found = 1, s;
- for (s = 0; s < n && bind->input[s] != 0; s++) {
- if (bind->input[s] != keys[s]) {
- found = 0;
- break;
- }
- }
- return found && bind->input[s] == 0 && s == n;
-}
-
-static struct cmd_bind *find_bind_for_key(struct cmd_bind *binds, int n,
- int *keys)
-{
- int j;
-
- if (n <= 0)
- return NULL;
- for (j = 0; binds[j].cmd != NULL; j++) {
- if (bind_matches_key(&binds[j], n, keys))
- break;
- }
- return binds[j].cmd ? &binds[j] : NULL;
-}
-
-static struct cmd_bind_section *get_bind_section(struct input_ctx *ictx,
- bool builtin, bstr section)
-{
- struct cmd_bind_section *bind_section = ictx->cmd_bind_sections;
-
- if (section.len == 0)
- section = bstr0("default");
- while (bind_section) {
- if (bstrcmp0(section, bind_section->section) == 0
- && builtin == bind_section->is_builtin)
- return bind_section;
- if (bind_section->next == NULL)
- break;
- bind_section = bind_section->next;
- }
- if (bind_section) {
- bind_section->next = talloc_ptrtype(ictx, bind_section->next);
- bind_section = bind_section->next;
- } else {
- ictx->cmd_bind_sections = talloc_ptrtype(ictx, ictx->cmd_bind_sections);
- bind_section = ictx->cmd_bind_sections;
- }
- bind_section->cmd_binds = NULL;
- bind_section->section = bstrdup0(bind_section, section);
- bind_section->is_builtin = builtin;
- bind_section->next = NULL;
- return bind_section;
-}
-
-static struct cmd_bind *section_find_bind_for_key(struct input_ctx *ictx,
- bool builtin, char *section,
- int n, int *keys)
-{
- struct cmd_bind_section *bs = get_bind_section(ictx, builtin,
- bstr0(section));
- return bs->cmd_binds ? find_bind_for_key(bs->cmd_binds, n, keys) : NULL;
-}
-
-static mp_cmd_t *get_cmd_from_keys(struct input_ctx *ictx, int n, int *keys)
-{
- if (ictx->test)
- return handle_test(ictx, n, keys);
-
- struct cmd_bind *cmd
- = section_find_bind_for_key(ictx, false, ictx->section, n, keys);
- if (ictx->default_bindings && cmd == NULL)
- cmd = section_find_bind_for_key(ictx, true, ictx->section, n, keys);
- if (!(ictx->section_flags & MP_INPUT_NO_DEFAULT_SECTION)) {
- if (cmd == NULL)
- cmd = section_find_bind_for_key(ictx, false, "default", n, keys);
- if (ictx->default_bindings && cmd == NULL)
- cmd = section_find_bind_for_key(ictx, true, "default", n, keys);
- }
-
- if (cmd == NULL) {
- char *key_buf = get_key_combo_name(keys, n);
- mp_tmsg(MSGT_INPUT, MSGL_WARN,
- "No bind found for key '%s'.\n", key_buf);
- talloc_free(key_buf);
- return NULL;
- }
- mp_cmd_t *ret = mp_input_parse_cmd(bstr0(cmd->cmd), cmd->location);
- if (!ret) {
- char *key_buf = get_key_combo_name(keys, n);
- mp_tmsg(MSGT_INPUT, MSGL_ERR,
- "Invalid command for bound key '%s': '%s'\n", key_buf, cmd->cmd);
- talloc_free(key_buf);
- }
- return ret;
-}
-
-
-static mp_cmd_t *interpret_key(struct input_ctx *ictx, int code)
-{
- unsigned int j;
- mp_cmd_t *ret;
-
- /* On normal keyboards shift changes the character code of non-special
- * keys, so don't count the modifier separately for those. In other words
- * we want to have "a" and "A" instead of "a" and "Shift+A"; but a separate
- * shift modifier is still kept for special keys like arrow keys.
- */
- int unmod = code & ~KEY_MODIFIER_MASK;
- if (unmod >= 32 && unmod < MP_KEY_BASE)
- code &= ~KEY_MODIFIER_SHIFT;
-
- if (code & MP_KEY_DOWN) {
- if (ictx->num_key_down >= MP_MAX_KEY_DOWN) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Too many key down events "
- "at the same time\n");
- return NULL;
- }
- code &= ~MP_KEY_DOWN;
- // Check if we don't already have this key as pushed
- for (j = 0; j < ictx->num_key_down; j++) {
- if (ictx->key_down[j] == code)
- break;
- }
- if (j != ictx->num_key_down)
- return NULL;
- ictx->key_down[ictx->num_key_down] = code;
- ictx->num_key_down++;
- ictx->last_key_down = GetTimer();
- ictx->ar_state = 0;
- return NULL;
- }
- // button released or press of key with no separate down/up events
- for (j = 0; j < ictx->num_key_down; j++) {
- if (ictx->key_down[j] == code)
- break;
- }
- bool doubleclick = code >= MOUSE_BTN0_DBL && code < MOUSE_BTN_DBL_END;
- if (doubleclick) {
- int btn = code - MOUSE_BTN0_DBL + MOUSE_BTN0;
- if (!ictx->num_key_down
- || ictx->key_down[ictx->num_key_down - 1] != btn)
- return NULL;
- j = ictx->num_key_down - 1;
- ictx->key_down[j] = code;
- }
- if (j == ictx->num_key_down) { // was not already down; add temporarily
- if (ictx->num_key_down > MP_MAX_KEY_DOWN) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Too many key down events "
- "at the same time\n");
- return NULL;
- }
- ictx->key_down[ictx->num_key_down] = code;
- ictx->num_key_down++;
- ictx->last_key_down = 1;
- }
- // Interpret only maximal point of multibutton event
- ret = ictx->last_key_down ?
- get_cmd_from_keys(ictx, ictx->num_key_down, ictx->key_down)
- : NULL;
- if (doubleclick) {
- ictx->key_down[j] = code - MOUSE_BTN0_DBL + MOUSE_BTN0;
- return ret;
- }
- // Remove the key
- if (j + 1 < ictx->num_key_down)
- memmove(&ictx->key_down[j], &ictx->key_down[j + 1],
- (ictx->num_key_down - (j + 1)) * sizeof(int));
- ictx->num_key_down--;
- ictx->last_key_down = 0;
- ictx->ar_state = -1;
- mp_cmd_free(ictx->ar_cmd);
- ictx->ar_cmd = NULL;
- return ret;
-}
-
-static mp_cmd_t *check_autorepeat(struct input_ctx *ictx)
-{
- // No input : autorepeat ?
- if (ictx->ar_rate > 0 && ictx->ar_state >= 0 && ictx->num_key_down > 0
- && !(ictx->key_down[ictx->num_key_down - 1] & MP_NO_REPEAT_KEY)) {
- unsigned int t = GetTimer();
- // First time : wait delay
- if (ictx->ar_state == 0
- && (t - ictx->last_key_down) >= ictx->ar_delay * 1000) {
- ictx->ar_cmd = get_cmd_from_keys(ictx, ictx->num_key_down,
- ictx->key_down);
- if (!ictx->ar_cmd) {
- ictx->ar_state = -1;
- return NULL;
- }
- ictx->ar_state = 1;
- ictx->last_ar = t;
- return mp_cmd_clone(ictx->ar_cmd);
- // Then send rate / sec event
- } else if (ictx->ar_state == 1
- && (t - ictx->last_ar) >= 1000000 / ictx->ar_rate) {
- ictx->last_ar = t;
- return mp_cmd_clone(ictx->ar_cmd);
- }
- }
- return NULL;
-}
-
-void mp_input_feed_key(struct input_ctx *ictx, int code)
-{
- ictx->got_new_events = true;
- if (code == MP_INPUT_RELEASE_ALL) {
- memset(ictx->key_down, 0, sizeof(ictx->key_down));
- ictx->num_key_down = 0;
- ictx->last_key_down = 0;
- return;
- }
- struct mp_cmd *cmd = interpret_key(ictx, code);
- if (!cmd)
- return;
- struct cmd_queue *queue = &ictx->key_cmd_queue;
- if (queue_count_cmds(queue) >= ictx->key_fifo_size &&
- (!mp_input_is_abort_cmd(cmd->id) || queue_has_abort_cmds(queue)))
- {
- talloc_free(cmd);
- return;
- }
- queue_add(queue, cmd, false);
-}
-
-static void read_cmd_fd(struct input_ctx *ictx, struct input_fd *cmd_fd)
-{
- int r;
- char *text;
- while ((r = read_cmd(cmd_fd, &text)) >= 0) {
- ictx->got_new_events = true;
- struct mp_cmd *cmd = mp_input_parse_cmd(bstr0(text), "<pipe>");
- talloc_free(text);
- if (cmd)
- queue_add(&ictx->control_cmd_queue, cmd, false);
- if (!cmd_fd->got_cmd)
- return;
- }
- if (r == MP_INPUT_ERROR)
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Error on command file descriptor %d\n",
- cmd_fd->fd);
- else if (r == MP_INPUT_DEAD)
- cmd_fd->dead = true;
-}
-
-static void read_key_fd(struct input_ctx *ictx, struct input_fd *key_fd)
-{
- int code = key_fd->read_func.key(key_fd->ctx, key_fd->fd);
- if (code >= 0 || code == MP_INPUT_RELEASE_ALL) {
- mp_input_feed_key(ictx, code);
- return;
- }
-
- if (code == MP_INPUT_ERROR)
- mp_tmsg(MSGT_INPUT, MSGL_ERR,
- "Error on key input file descriptor %d\n", key_fd->fd);
- else if (code == MP_INPUT_DEAD) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR,
- "Dead key input on file descriptor %d\n", key_fd->fd);
- key_fd->dead = true;
- }
-}
-
-/**
- * \param time time to wait at most for an event in milliseconds
- */
-static void read_events(struct input_ctx *ictx, int time)
-{
- ictx->got_new_events = false;
- struct input_fd *key_fds = ictx->key_fds;
- struct input_fd *cmd_fds = ictx->cmd_fds;
- for (int i = 0; i < ictx->num_key_fd; i++)
- if (key_fds[i].dead) {
- mp_input_rm_key_fd(ictx, key_fds[i].fd);
- i--;
- } else if (time && key_fds[i].no_select)
- read_key_fd(ictx, &key_fds[i]);
- for (int i = 0; i < ictx->num_cmd_fd; i++)
- if (cmd_fds[i].dead || cmd_fds[i].eof) {
- mp_input_rm_cmd_fd(ictx, cmd_fds[i].fd);
- i--;
- } else if (time && cmd_fds[i].no_select)
- read_cmd_fd(ictx, &cmd_fds[i]);
- if (ictx->got_new_events)
- time = 0;
-#ifdef HAVE_POSIX_SELECT
- fd_set fds;
- FD_ZERO(&fds);
- int max_fd = 0;
- for (int i = 0; i < ictx->num_key_fd; i++) {
- if (key_fds[i].no_select)
- continue;
- if (key_fds[i].fd > max_fd)
- max_fd = key_fds[i].fd;
- FD_SET(key_fds[i].fd, &fds);
- }
- for (int i = 0; i < ictx->num_cmd_fd; i++) {
- if (cmd_fds[i].no_select)
- continue;
- if (cmd_fds[i].fd > max_fd)
- max_fd = cmd_fds[i].fd;
- FD_SET(cmd_fds[i].fd, &fds);
- }
- struct timeval tv, *time_val;
- if (time >= 0) {
- tv.tv_sec = time / 1000;
- tv.tv_usec = (time % 1000) * 1000;
- time_val = &tv;
- } else
- time_val = NULL;
- if (select(max_fd + 1, &fds, NULL, NULL, time_val) < 0) {
- if (errno != EINTR)
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Select error: %s\n",
- strerror(errno));
- FD_ZERO(&fds);
- }
-#else
- if (time)
- usec_sleep(time * 1000);
-#endif
-
-
- for (int i = 0; i < ictx->num_key_fd; i++) {
-#ifdef HAVE_POSIX_SELECT
- if (!key_fds[i].no_select && !FD_ISSET(key_fds[i].fd, &fds))
- continue;
-#endif
- read_key_fd(ictx, &key_fds[i]);
- }
-
- for (int i = 0; i < ictx->num_cmd_fd; i++) {
-#ifdef HAVE_POSIX_SELECT
- if (!cmd_fds[i].no_select && !FD_ISSET(cmd_fds[i].fd, &fds))
- continue;
-#endif
- read_cmd_fd(ictx, &cmd_fds[i]);
- }
-}
-
-/* To support blocking file descriptors we don't loop the read over
- * every source until it's known to be empty. Instead we use this wrapper
- * to run select() again.
- */
-static void read_all_fd_events(struct input_ctx *ictx, int time)
-{
- while (1) {
- read_events(ictx, time);
- if (!ictx->got_new_events)
- return;
- time = 0;
- }
-}
-
-static void read_all_events(struct input_ctx *ictx, int time)
-{
-#ifdef CONFIG_COCOA
- cocoa_events_read_all_events(ictx, time);
-#else
- read_all_fd_events(ictx, time);
-#endif
-}
-
-int mp_input_queue_cmd(struct input_ctx *ictx, mp_cmd_t *cmd)
-{
- ictx->got_new_events = true;
- if (!cmd)
- return 0;
- queue_add(&ictx->control_cmd_queue, cmd, true);
- return 1;
-}
-
-/**
- * \param peek_only when set, the returned command stays in the queue.
- * Do not free the returned cmd whe you set this!
- */
-mp_cmd_t *mp_input_get_cmd(struct input_ctx *ictx, int time, int peek_only)
-{
- if (async_quit_request)
- return mp_input_parse_cmd(bstr0("quit 1"), "");
-
- if (ictx->control_cmd_queue.first || ictx->key_cmd_queue.first)
- time = 0;
- read_all_events(ictx, time);
- struct cmd_queue *queue = &ictx->control_cmd_queue;
- if (!queue->first)
- queue = &ictx->key_cmd_queue;
- if (!queue->first) {
- struct mp_cmd *repeated = check_autorepeat(ictx);
- if (repeated)
- queue_add(queue, repeated, false);
- }
- struct mp_cmd *ret = queue->first;
- if (!ret)
- return NULL;
-
- if (!peek_only)
- queue_remove(queue, ret);
-
- return ret;
-}
-
-void mp_cmd_free(mp_cmd_t *cmd)
-{
- talloc_free(cmd);
-}
-
-mp_cmd_t *mp_cmd_clone(mp_cmd_t *cmd)
-{
- mp_cmd_t *ret;
- int i;
-
- ret = talloc_memdup(NULL, cmd, sizeof(mp_cmd_t));
- ret->name = talloc_strdup(ret, cmd->name);
- for (i = 0; i < MP_CMD_MAX_ARGS; i++) {
- if (cmd->args[i].type.type == &m_option_type_string)
- ret->args[i].v.s = talloc_strdup(ret, cmd->args[i].v.s);
- }
-
- return ret;
-}
-
-int mp_input_get_key_from_name(const char *name)
-{
- int modifiers = 0;
- const char *p;
- while ((p = strchr(name, '+'))) {
- for (struct key_name *m = modifier_names; m->name; m++)
- if (!bstrcasecmp(bstr0(m->name),
- (struct bstr){(char *)name, p - name})) {
- modifiers |= m->key;
- goto found;
- }
- if (!strcmp(name, "+"))
- return '+' + modifiers;
- return -1;
-found:
- name = p + 1;
- }
-
- struct bstr bname = bstr0(name);
-
- struct bstr rest;
- int code = bstr_decode_utf8(bname, &rest);
- if (code >= 0 && rest.len == 0)
- return code + modifiers;
-
- if (bstr_startswith0(bname, "0x"))
- return strtol(name, NULL, 16) + modifiers;
-
- for (int i = 0; key_names[i].name != NULL; i++) {
- if (strcasecmp(key_names[i].name, name) == 0)
- return key_names[i].key + modifiers;
- }
-
- return -1;
-}
-
-static int get_input_from_name(char *name, int *keys)
-{
- char *end, *ptr;
- int n = 0;
-
- ptr = name;
- n = 0;
- for (end = strchr(ptr, '-'); ptr != NULL; end = strchr(ptr, '-')) {
- if (end && end[1] != '\0') {
- if (end[1] == '-')
- end = &end[1];
- end[0] = '\0';
- }
- keys[n] = mp_input_get_key_from_name(ptr);
- if (keys[n] < 0)
- return 0;
- n++;
- if (end && end[1] != '\0' && n < MP_MAX_KEY_DOWN)
- ptr = &end[1];
- else
- break;
- }
- keys[n] = 0;
- return 1;
-}
-
-static void bind_keys(struct input_ctx *ictx, bool builtin, bstr section,
- const int keys[MP_MAX_KEY_DOWN + 1], bstr command,
- const char *loc)
-{
- int i = 0, j;
- struct cmd_bind *bind = NULL;
- struct cmd_bind_section *bind_section = NULL;
-
- bind_section = get_bind_section(ictx, builtin, section);
-
- if (bind_section->cmd_binds) {
- for (i = 0; bind_section->cmd_binds[i].cmd != NULL; i++) {
- for (j = 0; bind_section->cmd_binds[i].input[j] == keys[j] && keys[j] != 0; j++)
- /* NOTHING */;
- if (keys[j] == 0 && bind_section->cmd_binds[i].input[j] == 0 ) {
- bind = &bind_section->cmd_binds[i];
- break;
- }
- }
- }
-
- if (!bind) {
- bind_section->cmd_binds = talloc_realloc(bind_section,
- bind_section->cmd_binds,
- struct cmd_bind, i + 2);
- memset(&bind_section->cmd_binds[i], 0, 2 * sizeof(struct cmd_bind));
- bind = &bind_section->cmd_binds[i];
- }
- talloc_free(bind->cmd);
- bind->cmd = bstrdup0(bind_section->cmd_binds, command);
- bind->location = talloc_strdup(bind_section->cmd_binds, loc);
- bind->owner = bind_section;
- memcpy(bind->input, keys, (MP_MAX_KEY_DOWN + 1) * sizeof(int));
-}
-
-static int parse_config(struct input_ctx *ictx, bool builtin, bstr data,
- const char *location)
-{
- int n_binds = 0, keys[MP_MAX_KEY_DOWN + 1];
- int line_no = 0;
- char *cur_loc = NULL;
-
- while (data.len) {
- line_no++;
- if (cur_loc)
- talloc_free(cur_loc);
- cur_loc = talloc_asprintf(NULL, "%s:%d", location, line_no);
-
- bstr line = bstr_strip_linebreaks(bstr_getline(data, &data));
- line = bstr_lstrip(line);
- if (line.len == 0 || bstr_startswith0(line, "#"))
- continue;
- struct bstr command;
- // Find the key name starting a line
- struct bstr keyname = bstr_split(line, WHITESPACE, &command);
- command = bstr_strip(command);
- if (command.len == 0) {
- mp_tmsg(MSGT_INPUT, MSGL_ERR,
- "Unfinished key binding: %.*s at %s\n", BSTR_P(line),
- cur_loc);
- continue;
- }
- char *name = bstrdup0(NULL, keyname);
- if (!get_input_from_name(name, keys)) {
- talloc_free(name);
- mp_tmsg(MSGT_INPUT, MSGL_ERR,
- "Unknown key '%.*s' at %s\n", BSTR_P(keyname), cur_loc);
- continue;
- }
- talloc_free(name);
-
- bstr section = {0};
- if (bstr_startswith0(command, "{")) {
- int p = bstrchr(command, '}');
- if (p != -1) {
- section = bstr_strip(bstr_splice(command, 1, p));
- command = bstr_lstrip(bstr_cut(command, p + 1));
- }
- }
-
- bind_keys(ictx, builtin, section, keys, command, cur_loc);
- n_binds++;
-
- // Print warnings if invalid commands are encountered.
- talloc_free(mp_input_parse_cmd(command, cur_loc));
- }
-
- talloc_free(cur_loc);
-
- return n_binds;
-}
-
-static int parse_config_file(struct input_ctx *ictx, char *file)
-{
- stream_t *s = open_stream(file, NULL, NULL);
- if (!s) {
- mp_msg(MSGT_INPUT, MSGL_V, "Can't open input config file %s.\n", file);
- return 0;
- }
- bstr res = stream_read_complete(s, NULL, 1000000, 0);
- free_stream(s);
- mp_msg(MSGT_INPUT, MSGL_V, "Parsing input config file %s\n", file);
- int n_binds = parse_config(ictx, false, res, file);
- talloc_free(res.start);
- mp_msg(MSGT_INPUT, MSGL_V, "Input config file %s parsed: %d binds\n",
- file, n_binds);
- return 1;
-}
-
-void mp_input_set_section(struct input_ctx *ictx, char *name, int flags)
-{
- talloc_free(ictx->section);
- ictx->section = talloc_strdup(ictx, name ? name : "default");
- ictx->section_flags = flags;
-}
-
-char *mp_input_get_section(struct input_ctx *ictx)
-{
- return ictx->section;
-}
-
-struct input_ctx *mp_input_init(struct input_conf *input_conf)
-{
- struct input_ctx *ictx = talloc_ptrtype(NULL, ictx);
- *ictx = (struct input_ctx){
- .key_fifo_size = input_conf->key_fifo_size,
- .ar_state = -1,
- .ar_delay = input_conf->ar_delay,
- .ar_rate = input_conf->ar_rate,
- .default_bindings = input_conf->default_bindings,
- .test = input_conf->test,
- .wakeup_pipe = {-1, -1},
- };
- ictx->section = talloc_strdup(ictx, "default");
-
- parse_config(ictx, true, bstr0(builtin_input_conf), "<default>");
-
-#ifdef CONFIG_COCOA
- cocoa_events_init(ictx, read_all_fd_events);
-#endif
-
-#ifndef __MINGW32__
- long ret = pipe(ictx->wakeup_pipe);
- for (int i = 0; i < 2 && ret >= 0; i++) {
- ret = fcntl(ictx->wakeup_pipe[i], F_GETFL);
- if (ret < 0)
- break;
- ret = fcntl(ictx->wakeup_pipe[i], F_SETFL, ret | O_NONBLOCK);
- }
- if (ret < 0)
- mp_msg(MSGT_INPUT, MSGL_ERR,
- "Failed to initialize wakeup pipe: %s\n", strerror(errno));
- else
- mp_input_add_key_fd(ictx, ictx->wakeup_pipe[0], true, read_wakeup,
- NULL, NULL);
-#endif
-
- char *file;
- char *config_file = input_conf->config_file;
- file = config_file[0] != '/' ? get_path(config_file) : config_file;
- if (!file)
- return ictx;
-
- if (!parse_config_file(ictx, file)) {
- // free file if it was allocated by get_path(),
- // before it gets overwritten
- if (file != config_file)
- free(file);
- // Try global conf dir
- file = MPLAYER_CONFDIR "/input.conf";
- if (!parse_config_file(ictx, file))
- mp_msg(MSGT_INPUT, MSGL_V, "Falling back on default (hardcoded) "
- "input config\n");
- } else {
- // free file if it was allocated by get_path()
- if (file != config_file)
- free(file);
- }
-
-#ifdef CONFIG_JOYSTICK
- if (input_conf->use_joystick) {
- int fd = mp_input_joystick_init(input_conf->js_dev);
- if (fd < 0)
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't init input joystick\n");
- else
- mp_input_add_key_fd(ictx, fd, 1, mp_input_joystick_read,
- close, NULL);
- }
-#endif
-
-#ifdef CONFIG_LIRC
- if (input_conf->use_lirc) {
- int fd = mp_input_lirc_init();
- if (fd > 0)
- mp_input_add_cmd_fd(ictx, fd, 0, mp_input_lirc_read,
- mp_input_lirc_close);
- }
-#endif
-
-#ifdef CONFIG_LIRCC
- if (input_conf->use_lircc) {
- int fd = lircc_init("mpv", NULL);
- if (fd >= 0)
- mp_input_add_cmd_fd(ictx, fd, 1, NULL, lircc_cleanup);
- }
-#endif
-
-#ifdef CONFIG_APPLE_REMOTE
- if (input_conf->use_ar) {
- if (mp_input_ar_init() < 0)
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't init Apple Remote.\n");
- else
- mp_input_add_key_fd(ictx, -1, 0, mp_input_ar_read,
- mp_input_ar_close, NULL);
- }
-#endif
-
-#ifdef CONFIG_APPLE_IR
- if (input_conf->use_ar) {
- int fd = mp_input_appleir_init(input_conf->ar_dev);
- if (fd < 0)
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't init Apple Remote.\n");
- else
- mp_input_add_key_fd(ictx, fd, 1, mp_input_appleir_read,
- close, NULL);
- }
-#endif
-
- if (input_conf->in_file) {
- int mode = O_RDONLY;
-#ifndef __MINGW32__
- // Use RDWR for FIFOs to ensure they stay open over multiple accesses.
- // Note that on Windows due to how the API works, using RDONLY should
- // be ok.
- struct stat st;
- if (stat(input_conf->in_file, &st) == 0 && S_ISFIFO(st.st_mode))
- mode = O_RDWR;
- mode |= O_NONBLOCK;
-#endif
- int in_file_fd = open(input_conf->in_file, mode);
- if (in_file_fd >= 0)
- mp_input_add_cmd_fd(ictx, in_file_fd, 1, NULL, close);
- else
- mp_tmsg(MSGT_INPUT, MSGL_ERR, "Can't open %s: %s\n",
- input_conf->in_file, strerror(errno));
- }
-
- return ictx;
-}
-
-void mp_input_uninit(struct input_ctx *ictx)
-{
-#ifdef CONFIG_COCOA
- cocoa_events_uninit();
-#endif
-
- if (!ictx)
- return;
-
- for (int i = 0; i < ictx->num_key_fd; i++) {
- if (ictx->key_fds[i].close_func)
- ictx->key_fds[i].close_func(ictx->key_fds[i].fd);
- }
- for (int i = 0; i < ictx->num_cmd_fd; i++) {
- if (ictx->cmd_fds[i].close_func)
- ictx->cmd_fds[i].close_func(ictx->cmd_fds[i].fd);
- }
- for (int i = 0; i < 2; i++)
- if (ictx->wakeup_pipe[i] != -1)
- close(ictx->wakeup_pipe[i]);
- talloc_free(ictx);
-}
-
-void mp_input_register_options(m_config_t *cfg)
-{
- m_config_register_options(cfg, mp_input_opts);
-}
-
-static int print_key_list(m_option_t *cfg, char *optname, char *optparam)
-{
- int i;
- printf("\n");
- for (i = 0; key_names[i].name != NULL; i++)
- printf("%s\n", key_names[i].name);
- return M_OPT_EXIT;
-}
-
-static int print_cmd_list(m_option_t *cfg, char *optname, char *optparam)
-{
- const mp_cmd_t *cmd;
- int i, j;
-
- for (i = 0; (cmd = &mp_cmds[i])->name != NULL; i++) {
- printf("%-20.20s", cmd->name);
- for (j = 0; j < MP_CMD_MAX_ARGS && cmd->args[j].type.type; j++) {
- const char *type = cmd->args[j].type.type->name;
- if (cmd->args[j].optional)
- printf(" [%s]", type);
- else
- printf(" %s", type);
- }
- printf("\n");
- }
- return M_OPT_EXIT;
-}
-
-void mp_input_wakeup(struct input_ctx *ictx)
-{
- if (ictx->wakeup_pipe[1] >= 0)
- write(ictx->wakeup_pipe[1], &(char){0}, 1);
-}
-
-/**
- * \param time time to wait for an interruption in milliseconds
- */
-int mp_input_check_interrupt(struct input_ctx *ictx, int time)
-{
- for (int i = 0; ; i++) {
- if (async_quit_request || queue_has_abort_cmds(&ictx->key_cmd_queue) ||
- queue_has_abort_cmds(&ictx->control_cmd_queue)) {
- mp_tmsg(MSGT_INPUT, MSGL_WARN, "Received command to move to "
- "another file. Aborting current processing.\n");
- return true;
- }
- if (i)
- return false;
- read_all_events(ictx, time);
- }
-}
diff --git a/input/input.h b/input/input.h
deleted file mode 100644
index 59f2d031ff..0000000000
--- a/input/input.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_INPUT_H
-#define MPLAYER_INPUT_H
-
-#include <stdbool.h>
-#include "bstr.h"
-#include "m_option.h"
-
-// All command IDs
-enum mp_command_type {
- MP_CMD_IGNORE,
- MP_CMD_SEEK,
- MP_CMD_QUIT,
- MP_CMD_PLAYLIST_NEXT,
- MP_CMD_PLAYLIST_PREV,
- MP_CMD_OSD,
- MP_CMD_TV_STEP_CHANNEL,
- MP_CMD_TV_STEP_NORM,
- MP_CMD_TV_STEP_CHANNEL_LIST,
- MP_CMD_SCREENSHOT,
- MP_CMD_LOADFILE,
- MP_CMD_LOADLIST,
- MP_CMD_PLAYLIST_CLEAR,
- MP_CMD_SUB_STEP,
- MP_CMD_TV_SET_CHANNEL,
- MP_CMD_EDL_MARK,
- MP_CMD_TV_LAST_CHANNEL,
- MP_CMD_TV_SET_FREQ,
- MP_CMD_TV_SET_NORM,
- MP_CMD_FRAME_STEP,
- MP_CMD_SPEED_MULT,
- MP_CMD_RUN,
- MP_CMD_SUB_LOAD,
- MP_CMD_KEYDOWN_EVENTS,
- MP_CMD_SET,
- MP_CMD_GET_PROPERTY,
- MP_CMD_PRINT_TEXT,
- MP_CMD_SHOW_TEXT,
- MP_CMD_SHOW_PROGRESS,
- MP_CMD_RADIO_STEP_CHANNEL,
- MP_CMD_RADIO_SET_CHANNEL,
- MP_CMD_RADIO_SET_FREQ,
- MP_CMD_SET_MOUSE_POS,
- MP_CMD_ADD,
- MP_CMD_CYCLE,
- MP_CMD_RADIO_STEP_FREQ,
- MP_CMD_TV_STEP_FREQ,
- MP_CMD_TV_START_SCAN,
- MP_CMD_STOP,
-
- /// DVB commands
- MP_CMD_DVB_SET_CHANNEL = 5101,
-
- /// Audio Filter commands
- MP_CMD_AF_SWITCH,
- MP_CMD_AF_ADD,
- MP_CMD_AF_DEL,
- MP_CMD_AF_CLR,
- MP_CMD_AF_CMDLINE,
-
- MP_CMD_SHOW_CHAPTERS,
- MP_CMD_SHOW_TRACKS,
-
- /// Video output commands
- MP_CMD_VO_CMDLINE,
-};
-
-#define MP_CMD_MAX_ARGS 10
-
-// Error codes for the drivers
-
-// An error occurred but we can continue
-#define MP_INPUT_ERROR -1
-// A fatal error occurred, this driver should be removed
-#define MP_INPUT_DEAD -2
-// No input was available
-#define MP_INPUT_NOTHING -3
-//! Input will be available if you try again
-#define MP_INPUT_RETRY -4
-// Key FIFO was full - release events may be lost, zero button-down status
-#define MP_INPUT_RELEASE_ALL -5
-
-enum mp_on_osd {
- MP_ON_OSD_NO = 0, // prefer not using OSD
- MP_ON_OSD_AUTO = 1, // use default behavior of the specific command
- MP_ON_OSD_BAR = 2, // force a bar, if applicable
- MP_ON_OSD_MSG = 4, // force a message, if applicable
-};
-
-enum mp_input_section_flags {
- // If a key binding is not defined in the current section, search the
- // default section for it ("default" refers to bindings with no section
- // specified, not to the default input.conf aka builtin key bindings)
- MP_INPUT_NO_DEFAULT_SECTION = 1,
-};
-
-struct input_ctx;
-
-struct mp_cmd_arg {
- struct m_option type;
- bool optional;
- union {
- int i;
- float f;
- char *s;
- } v;
-};
-
-typedef struct mp_cmd {
- int id;
- char *name;
- struct mp_cmd_arg args[MP_CMD_MAX_ARGS];
- int nargs;
- int pausing;
- enum mp_on_osd on_osd;
- bstr original;
- struct mp_cmd *queue_next;
-} mp_cmd_t;
-
-
-// Executing this command will abort playback (play something else, or quit).
-bool mp_input_is_abort_cmd(int cmd_id);
-
-/* Add a new command input source.
- * "fd" is a file descriptor (use a negative value if you don't use any fd)
- * "select" tells whether to use select() on the fd to determine when to
- * try reading.
- * "read_func" is optional. If NULL a default function which reads data
- * directly from the fd will be used. It must return either text data
- * or one of the MP_INPUT error codes above.
- * "close_func" will be called when closing. Can be NULL. Its return value
- * is ignored (it's only there to allow using standard close() as the func).
- */
-int mp_input_add_cmd_fd(struct input_ctx *ictx, int fd, int select,
- int read_func(int fd, char *dest, int size),
- int close_func(int fd));
-
-// This removes a cmd driver, you usually don't need to use it.
-void mp_input_rm_cmd_fd(struct input_ctx *ictx, int fd);
-
-/* The args are similar to the cmd version above, except you must give
- * a read_func, and it should return key codes (ASCII plus keycodes.h).
- */
-int mp_input_add_key_fd(struct input_ctx *ictx, int fd, int select,
- int read_func(void *ctx, int fd),
- int close_func(int fd), void *ctx);
-
-// Feed a keypress (alternative to being returned from read_func above)
-void mp_input_feed_key(struct input_ctx *ictx, int code);
-
-// As for the cmd one you usually don't need this function.
-void mp_input_rm_key_fd(struct input_ctx *ictx, int fd);
-
-// Get input key from its name.
-int mp_input_get_key_from_name(const char *name);
-
-// Add a command to the command queue.
-int mp_input_queue_cmd(struct input_ctx *ictx, struct mp_cmd *cmd);
-
-/* Return next available command, or sleep up to "time" ms if none is
- * available. If "peek_only" is true return a reference to the command
- * but leave it queued.
- */
-struct mp_cmd *mp_input_get_cmd(struct input_ctx *ictx, int time,
- int peek_only);
-
-// Parse text and return corresponding struct mp_cmd.
-// The location parameter is for error messages.
-struct mp_cmd *mp_input_parse_cmd(bstr str, const char *location);
-
-// After getting a command from mp_input_get_cmd you need to free it using this
-// function
-void mp_cmd_free(struct mp_cmd *cmd);
-
-// This creates a copy of a command (used by the auto repeat stuff).
-struct mp_cmd *mp_cmd_clone(struct mp_cmd *cmd);
-
-// Set current input section
-// flags is a bitfield of enum mp_input_section_flags values
-void mp_input_set_section(struct input_ctx *ictx, char *name, int flags);
-
-// Get current input section
-char *mp_input_get_section(struct input_ctx *ictx);
-
-// Initialize the input system
-struct input_conf;
-struct input_ctx *mp_input_init(struct input_conf *input_conf);
-
-void mp_input_uninit(struct input_ctx *ictx);
-
-struct m_config;
-void mp_input_register_options(struct m_config *cfg);
-
-// Wake up sleeping input loop from another thread.
-void mp_input_wakeup(struct input_ctx *ictx);
-
-// Interruptible usleep: (used by libmpdemux)
-int mp_input_check_interrupt(struct input_ctx *ictx, int time);
-
-extern int async_quit_request;
-
-#endif /* MPLAYER_INPUT_H */
diff --git a/input/joystick.c b/input/joystick.c
deleted file mode 100644
index 673ae92184..0000000000
--- a/input/joystick.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include "joystick.h"
-#include "input.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "mp_msg.h"
-#include "keycodes.h"
-
-#ifndef JOY_AXIS_DELTA
-#define JOY_AXIS_DELTA 500
-#endif
-
-#ifndef JS_DEV
-#define JS_DEV "/dev/input/js0"
-#endif
-
-#include <linux/joystick.h>
-
-int axis[256];
-int btns = 0;
-
-int mp_input_joystick_init(char* dev) {
- int fd,l=0;
- int initialized = 0;
- struct js_event ev;
-
- mp_tmsg(MSGT_INPUT,MSGL_V,"Opening joystick device %s\n",dev ? dev : JS_DEV);
-
- fd = open( dev ? dev : JS_DEV , O_RDONLY | O_NONBLOCK );
- if(fd < 0) {
- mp_tmsg(MSGT_INPUT,MSGL_ERR,"Can't open joystick device %s: %s\n",dev ? dev : JS_DEV,strerror(errno));
- return -1;
- }
-
- while(! initialized) {
- l = 0;
- while((unsigned int)l < sizeof(struct js_event)) {
- int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l);
- if(r < 0) {
- if(errno == EINTR)
- continue;
- else if(errno == EAGAIN) {
- initialized = 1;
- break;
- }
- mp_tmsg(MSGT_INPUT,MSGL_ERR,"Error while reading joystick device: %s\n",strerror(errno));
- close(fd);
- return -1;
- }
- l += r;
- }
- if((unsigned int)l < sizeof(struct js_event)) {
- if(l > 0)
- mp_tmsg(MSGT_INPUT,MSGL_WARN,"Joystick: We lose %d bytes of data\n",l);
- break;
- }
- if(ev.type == JS_EVENT_BUTTON)
- btns |= (ev.value << ev.number);
- if(ev.type == JS_EVENT_AXIS)
- axis[ev.number] = ev.value;
- }
-
- return fd;
-}
-
-int mp_input_joystick_read(void *ctx, int fd) {
- struct js_event ev;
- int l=0;
-
- while((unsigned int)l < sizeof(struct js_event)) {
- int r = read(fd,&ev+l,sizeof(struct js_event)-l);
- if(r <= 0) {
- if(errno == EINTR)
- continue;
- else if(errno == EAGAIN)
- return MP_INPUT_NOTHING;
- if( r < 0)
- mp_tmsg(MSGT_INPUT,MSGL_ERR,"Error while reading joystick device: %s\n",strerror(errno));
- else
- mp_tmsg(MSGT_INPUT,MSGL_ERR,"Error while reading joystick device: %s\n","EOF");
- return MP_INPUT_DEAD;
- }
- l += r;
- }
-
- if((unsigned int)l < sizeof(struct js_event)) {
- if(l > 0)
- mp_tmsg(MSGT_INPUT,MSGL_WARN,"Joystick: We lose %d bytes of data\n",l);
- return MP_INPUT_NOTHING;
- }
-
- if(ev.type & JS_EVENT_INIT) {
- mp_tmsg(MSGT_INPUT,MSGL_WARN,"Joystick: warning init event, we have lost sync with driver.\n");
- ev.type &= ~JS_EVENT_INIT;
- if(ev.type == JS_EVENT_BUTTON) {
- int s = (btns >> ev.number) & 1;
- if(s == ev.value) // State is the same : ignore
- return MP_INPUT_NOTHING;
- }
- if(ev.type == JS_EVENT_AXIS) {
- if( ( axis[ev.number] == 1 && ev.value > JOY_AXIS_DELTA) ||
- (axis[ev.number] == -1 && ev.value < -JOY_AXIS_DELTA) ||
- (axis[ev.number] == 0 && ev.value >= -JOY_AXIS_DELTA && ev.value <= JOY_AXIS_DELTA)
- ) // State is the same : ignore
- return MP_INPUT_NOTHING;
- }
- }
-
- if(ev.type & JS_EVENT_BUTTON) {
- btns &= ~(1 << ev.number);
- btns |= (ev.value << ev.number);
- if(ev.value == 1)
- return (JOY_BTN0 + ev.number) | MP_KEY_DOWN;
- else
- return JOY_BTN0 + ev.number;
- } else if(ev.type & JS_EVENT_AXIS) {
- if(ev.value < -JOY_AXIS_DELTA && axis[ev.number] != -1) {
- axis[ev.number] = -1;
- return (JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_DOWN;
- } else if(ev.value > JOY_AXIS_DELTA && axis[ev.number] != 1) {
- axis[ev.number] = 1;
- return (JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_DOWN;
- } else if(ev.value <= JOY_AXIS_DELTA && ev.value >= -JOY_AXIS_DELTA && axis[ev.number] != 0) {
- int r = axis[ev.number] == 1 ? JOY_AXIS0_PLUS+(2*ev.number) : JOY_AXIS0_MINUS+(2*ev.number);
- axis[ev.number] = 0;
- return r;
- } else
- return MP_INPUT_NOTHING;
- } else {
- mp_tmsg(MSGT_INPUT,MSGL_WARN,"Joystick warning unknown event type %d\n",ev.type);
- return MP_INPUT_ERROR;
- }
-
- return MP_INPUT_NOTHING;
-}
diff --git a/input/joystick.h b/input/joystick.h
deleted file mode 100644
index b9480eb686..0000000000
--- a/input/joystick.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_JOYSTICK_H
-#define MPLAYER_JOYSTICK_H
-
-int mp_input_joystick_init(char* dev);
-
-int mp_input_joystick_read(void *ctx, int fd);
-
-#endif /* MPLAYER_JOYSTICK_H */
diff --git a/input/keycodes.h b/input/keycodes.h
deleted file mode 100644
index c86a4bc138..0000000000
--- a/input/keycodes.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * KEY code definitions for keys/events not passed by ASCII value
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_KEYCODES_H
-#define MPLAYER_KEYCODES_H
-
-#define MP_KEY_BASE (1<<21)
-
-// For appleir.c which includes another header with KEY_ENTER etc defines
-#ifndef AR_DEFINES_ONLY
-
-#define KEY_ENTER 13
-#define KEY_TAB 9
-
-/* Control keys */
-#define KEY_BACKSPACE (MP_KEY_BASE+0)
-#define KEY_DELETE (MP_KEY_BASE+1)
-#define KEY_INSERT (MP_KEY_BASE+2)
-#define KEY_HOME (MP_KEY_BASE+3)
-#define KEY_END (MP_KEY_BASE+4)
-#define KEY_PAGE_UP (MP_KEY_BASE+5)
-#define KEY_PAGE_DOWN (MP_KEY_BASE+6)
-#define KEY_ESC (MP_KEY_BASE+7)
-#define KEY_PRINT (MP_KEY_BASE+8)
-
-/* Control keys short name */
-#define KEY_BS KEY_BACKSPACE
-#define KEY_DEL KEY_DELETE
-#define KEY_INS KEY_INSERT
-#define KEY_PGUP KEY_PAGE_UP
-#define KEY_PGDOWN KEY_PAGE_DOWN
-#define KEY_PGDWN KEY_PAGE_DOWN
-
-/* Cursor movement */
-#define KEY_CRSR (MP_KEY_BASE+0x10)
-#define KEY_RIGHT (KEY_CRSR+0)
-#define KEY_LEFT (KEY_CRSR+1)
-#define KEY_DOWN (KEY_CRSR+2)
-#define KEY_UP (KEY_CRSR+3)
-
-/* Multimedia keyboard/remote keys */
-#define KEY_MM_BASE (MP_KEY_BASE+0x20)
-#define KEY_POWER (KEY_MM_BASE+0)
-#define KEY_MENU (KEY_MM_BASE+1)
-#define KEY_PLAY (KEY_MM_BASE+2)
-#define KEY_PAUSE (KEY_MM_BASE+3)
-#define KEY_PLAYPAUSE (KEY_MM_BASE+4)
-#define KEY_STOP (KEY_MM_BASE+5)
-#define KEY_FORWARD (KEY_MM_BASE+6)
-#define KEY_REWIND (KEY_MM_BASE+7)
-#define KEY_NEXT (KEY_MM_BASE+8)
-#define KEY_PREV (KEY_MM_BASE+9)
-#define KEY_VOLUME_UP (KEY_MM_BASE+10)
-#define KEY_VOLUME_DOWN (KEY_MM_BASE+11)
-#define KEY_MUTE (KEY_MM_BASE+12)
-
-/* Function keys */
-#define KEY_F (MP_KEY_BASE+0x40)
-
-/* Keypad keys */
-#define KEY_KEYPAD (MP_KEY_BASE+0x60)
-#define KEY_KP0 (KEY_KEYPAD+0)
-#define KEY_KP1 (KEY_KEYPAD+1)
-#define KEY_KP2 (KEY_KEYPAD+2)
-#define KEY_KP3 (KEY_KEYPAD+3)
-#define KEY_KP4 (KEY_KEYPAD+4)
-#define KEY_KP5 (KEY_KEYPAD+5)
-#define KEY_KP6 (KEY_KEYPAD+6)
-#define KEY_KP7 (KEY_KEYPAD+7)
-#define KEY_KP8 (KEY_KEYPAD+8)
-#define KEY_KP9 (KEY_KEYPAD+9)
-#define KEY_KPDEC (KEY_KEYPAD+10)
-#define KEY_KPINS (KEY_KEYPAD+11)
-#define KEY_KPDEL (KEY_KEYPAD+12)
-#define KEY_KPENTER (KEY_KEYPAD+13)
-
-
-// Joystick input module
-#define JOY_BASE (MP_KEY_BASE+0x70)
-#define JOY_AXIS0_PLUS (JOY_BASE+0)
-#define JOY_AXIS0_MINUS (JOY_BASE+1)
-#define JOY_AXIS1_PLUS (JOY_BASE+2)
-#define JOY_AXIS1_MINUS (JOY_BASE+3)
-#define JOY_AXIS2_PLUS (JOY_BASE+4)
-#define JOY_AXIS2_MINUS (JOY_BASE+5)
-#define JOY_AXIS3_PLUS (JOY_BASE+6)
-#define JOY_AXIS3_MINUS (JOY_BASE+7)
-#define JOY_AXIS4_PLUS (JOY_BASE+8)
-#define JOY_AXIS4_MINUS (JOY_BASE+9)
-#define JOY_AXIS5_PLUS (JOY_BASE+10)
-#define JOY_AXIS5_MINUS (JOY_BASE+11)
-#define JOY_AXIS6_PLUS (JOY_BASE+12)
-#define JOY_AXIS6_MINUS (JOY_BASE+13)
-#define JOY_AXIS7_PLUS (JOY_BASE+14)
-#define JOY_AXIS7_MINUS (JOY_BASE+15)
-#define JOY_AXIS8_PLUS (JOY_BASE+16)
-#define JOY_AXIS8_MINUS (JOY_BASE+17)
-#define JOY_AXIS9_PLUS (JOY_BASE+18)
-#define JOY_AXIS9_MINUS (JOY_BASE+19)
-
-#define JOY_BTN_BASE ((MP_KEY_BASE+0x90)|MP_NO_REPEAT_KEY)
-#define JOY_BTN0 (JOY_BTN_BASE+0)
-#define JOY_BTN1 (JOY_BTN_BASE+1)
-#define JOY_BTN2 (JOY_BTN_BASE+2)
-#define JOY_BTN3 (JOY_BTN_BASE+3)
-#define JOY_BTN4 (JOY_BTN_BASE+4)
-#define JOY_BTN5 (JOY_BTN_BASE+5)
-#define JOY_BTN6 (JOY_BTN_BASE+6)
-#define JOY_BTN7 (JOY_BTN_BASE+7)
-#define JOY_BTN8 (JOY_BTN_BASE+8)
-#define JOY_BTN9 (JOY_BTN_BASE+9)
-
-
-// Mouse events from VOs
-#define MOUSE_BASE ((MP_KEY_BASE+0xA0)|MP_NO_REPEAT_KEY)
-#define MOUSE_BTN0 (MOUSE_BASE+0)
-#define MOUSE_BTN1 (MOUSE_BASE+1)
-#define MOUSE_BTN2 (MOUSE_BASE+2)
-#define MOUSE_BTN3 (MOUSE_BASE+3)
-#define MOUSE_BTN4 (MOUSE_BASE+4)
-#define MOUSE_BTN5 (MOUSE_BASE+5)
-#define MOUSE_BTN6 (MOUSE_BASE+6)
-#define MOUSE_BTN7 (MOUSE_BASE+7)
-#define MOUSE_BTN8 (MOUSE_BASE+8)
-#define MOUSE_BTN9 (MOUSE_BASE+9)
-#define MOUSE_BTN10 (MOUSE_BASE+10)
-#define MOUSE_BTN11 (MOUSE_BASE+11)
-#define MOUSE_BTN12 (MOUSE_BASE+12)
-#define MOUSE_BTN13 (MOUSE_BASE+13)
-#define MOUSE_BTN14 (MOUSE_BASE+14)
-#define MOUSE_BTN15 (MOUSE_BASE+15)
-#define MOUSE_BTN16 (MOUSE_BASE+16)
-#define MOUSE_BTN17 (MOUSE_BASE+17)
-#define MOUSE_BTN18 (MOUSE_BASE+18)
-#define MOUSE_BTN19 (MOUSE_BASE+19)
-#define MOUSE_BTN_END (MOUSE_BASE+20)
-
-#define MOUSE_BASE_DBL ((MP_KEY_BASE+0xC0)|MP_NO_REPEAT_KEY)
-#define MOUSE_BTN0_DBL (MOUSE_BASE_DBL+0)
-#define MOUSE_BTN1_DBL (MOUSE_BASE_DBL+1)
-#define MOUSE_BTN2_DBL (MOUSE_BASE_DBL+2)
-#define MOUSE_BTN3_DBL (MOUSE_BASE_DBL+3)
-#define MOUSE_BTN4_DBL (MOUSE_BASE_DBL+4)
-#define MOUSE_BTN5_DBL (MOUSE_BASE_DBL+5)
-#define MOUSE_BTN6_DBL (MOUSE_BASE_DBL+6)
-#define MOUSE_BTN7_DBL (MOUSE_BASE_DBL+7)
-#define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8)
-#define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9)
-#define MOUSE_BTN10_DBL (MOUSE_BASE_DBL+10)
-#define MOUSE_BTN11_DBL (MOUSE_BASE_DBL+11)
-#define MOUSE_BTN12_DBL (MOUSE_BASE_DBL+12)
-#define MOUSE_BTN13_DBL (MOUSE_BASE_DBL+13)
-#define MOUSE_BTN14_DBL (MOUSE_BASE_DBL+14)
-#define MOUSE_BTN15_DBL (MOUSE_BASE_DBL+15)
-#define MOUSE_BTN16_DBL (MOUSE_BASE_DBL+16)
-#define MOUSE_BTN17_DBL (MOUSE_BASE_DBL+17)
-#define MOUSE_BTN18_DBL (MOUSE_BASE_DBL+18)
-#define MOUSE_BTN19_DBL (MOUSE_BASE_DBL+19)
-#define MOUSE_BTN_DBL_END (MOUSE_BASE_DBL+20)
-
-
-#endif // AR_DEFINES_ONLY
-
-// Apple Remote input module
-#define AR_BASE (MP_KEY_BASE+0xE0)
-#define AR_PLAY (AR_BASE + 0)
-#define AR_PLAY_HOLD (AR_BASE + 1)
-#define AR_NEXT (AR_BASE + 2)
-#define AR_NEXT_HOLD (AR_BASE + 3)
-#define AR_PREV (AR_BASE + 4)
-#define AR_PREV_HOLD (AR_BASE + 5)
-#define AR_MENU (AR_BASE + 6)
-#define AR_MENU_HOLD (AR_BASE + 7)
-#define AR_VUP (AR_BASE + 8)
-#define AR_VDOWN (AR_BASE + 9)
-
-#ifndef AR_DEFINES_ONLY
-
-
-/* Special keys */
-#define KEY_INTERN (MP_KEY_BASE+0x1000)
-#define KEY_CLOSE_WIN (KEY_INTERN+0)
-
-/* Modifiers added to individual keys */
-#define KEY_MODIFIER_SHIFT (1<<22)
-#define KEY_MODIFIER_CTRL (1<<23)
-#define KEY_MODIFIER_ALT (1<<24)
-#define KEY_MODIFIER_META (1<<25)
-
-#endif // AR_DEFINES_ONLY
-
-// Use this when the key shouldn't be auto-repeated (like mouse buttons)
-#define MP_NO_REPEAT_KEY (1<<28)
-
-#define MP_KEY_DOWN (1<<29)
-
-#endif /* MPLAYER_KEYCODES_H */
diff --git a/input/lirc.c b/input/lirc.c
deleted file mode 100644
index fd64beb479..0000000000
--- a/input/lirc.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <lirc/lirc_client.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "mp_msg.h"
-#include "input.h"
-#include "lirc.h"
-
-static struct lirc_config *lirc_config;
-char *lirc_configfile;
-
-static char* cmd_buf = NULL;
-
-int
-mp_input_lirc_init(void) {
- int lirc_sock;
- int mode;
-
- mp_tmsg(MSGT_LIRC,MSGL_V,"Setting up LIRC support...\n");
- if((lirc_sock=lirc_init("mpv",0))==-1){
- mp_tmsg(MSGT_LIRC,MSGL_V,"Failed to open LIRC support. You will not be able to use your remote control.\n");
- return -1;
- }
-
- mode = fcntl(lirc_sock, F_GETFL);
- if (mode < 0 || fcntl(lirc_sock, F_SETFL, mode | O_NONBLOCK) < 0) {
- mp_msg(MSGT_LIRC, MSGL_ERR, "setting non-blocking mode failed: %s\n",
- strerror(errno));
- lirc_deinit();
- return -1;
- }
-
- if(lirc_readconfig( lirc_configfile,&lirc_config,NULL )!=0 ){
- mp_tmsg(MSGT_LIRC,MSGL_ERR,"Failed to read LIRC config file %s.\n",
- lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile);
- lirc_deinit();
- return -1;
- }
-
- return lirc_sock;
-}
-
-int mp_input_lirc_read(int fd,char* dest, int s) {
- int r,cl = 0;
- char *code = NULL,*c = NULL;
-
- // We have something in the buffer return it
- if(cmd_buf != NULL) {
- int l = strlen(cmd_buf), w = l > s ? s : l;
- memcpy(dest,cmd_buf,w);
- l -= w;
- if(l > 0)
- memmove(cmd_buf,&cmd_buf[w],l+1);
- else {
- free(cmd_buf);
- cmd_buf = NULL;
- }
- return w;
- }
-
- // Nothing in the buffer, poll the lirc fd
- if(lirc_nextcode(&code) != 0) {
- mp_msg(MSGT_LIRC,MSGL_ERR,"Lirc error :(\n");
- return MP_INPUT_DEAD;
- }
-
- if(!code) return MP_INPUT_NOTHING;
-
- // We put all cmds in a single buffer separated by \n
- while((r = lirc_code2char(lirc_config,code,&c))==0 && c!=NULL) {
- int l = strlen(c);
- if(l <= 0)
- continue;
- cmd_buf = realloc(cmd_buf,cl+l+2);
- memcpy(&cmd_buf[cl],c,l);
- cl += l+1;
- cmd_buf[cl-1] = '\n';
- cmd_buf[cl] = '\0';
- }
-
- free(code);
-
- if(r < 0)
- return MP_INPUT_DEAD;
- else if(cmd_buf) // return the first command in the buffer
- return mp_input_lirc_read(fd,dest,s);
- else
- return MP_INPUT_RETRY;
-
-}
-
-int mp_input_lirc_close(int fd)
-{
- free(cmd_buf);
- cmd_buf = NULL;
- lirc_freeconfig(lirc_config);
- lirc_deinit();
- return 0;
-}
diff --git a/input/lirc.h b/input/lirc.h
deleted file mode 100644
index ac1937f91d..0000000000
--- a/input/lirc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_LIRC_H
-#define MPLAYER_LIRC_H
-
-int
-mp_input_lirc_init(void);
-
-int
-mp_input_lirc_read(int fd,char* dest, int s);
-
-int mp_input_lirc_close(int fd);
-
-#endif /* MPLAYER_LIRC_H */