1 files changed, 67 insertions, 54 deletions

diff --git a/mp_fifo.c b/mp_fifo.c
index 2f7d888706..4c8e9c6496 100644
--- a/mp_fifo.c
+++ b/mp_fifo.c
@@ -21,68 +21,81 @@
 #include "input/input.h"
 #include "input/mouse.h"
 #include "mp_fifo.h"
+#include "talloc.h"
+#include "options.h"
 
-int key_fifo_size = 7;
-static int *key_fifo_data = NULL;
-static int key_fifo_read=0;
-static int key_fifo_write=0;
 
-static void mplayer_put_key_internal(int code){
-  int fifo_free = key_fifo_read - key_fifo_write - 1;
-  if (fifo_free < 0) fifo_free += key_fifo_size;
-//  printf("mplayer_put_key(%d)\n",code);
-  if (key_fifo_data == NULL)
-    key_fifo_data = malloc(key_fifo_size * sizeof(int));
-  if(!fifo_free) return; // FIFO FULL!!
-  // reserve some space for key release events to avoid stuck keys
-  if((code & MP_KEY_DOWN) && fifo_free < (key_fifo_size >> 1))
-    return;
-  key_fifo_data[key_fifo_write]=code;
-  key_fifo_write=(key_fifo_write+1)%key_fifo_size;
-}
+struct mp_fifo {
+    struct MPOpts *opts;
+    int *data;
+    int readpos;
+    int writepos;
+    int size;
+    unsigned last_key_time[2];
+    int last_key[2];
+};
 
-int mplayer_get_key(int fd){
-  int key;
-//  printf("mplayer_get_key(%d)\n",fd);
-  if (key_fifo_data == NULL)
-    return MP_INPUT_NOTHING;
-  if(key_fifo_write==key_fifo_read) return MP_INPUT_NOTHING;
-  key=key_fifo_data[key_fifo_read];
-  key_fifo_read=(key_fifo_read+1)%key_fifo_size;
-//  printf("mplayer_get_key => %d\n",key);
-  return key;
+struct mp_fifo *mp_fifo_create(struct MPOpts *opts)
+{
+    struct mp_fifo *fifo = talloc_zero(NULL, struct mp_fifo);
+    fifo->opts = opts;
+    fifo->size = opts->key_fifo_size;
+    fifo->data = talloc_array_ptrtype(fifo, fifo->data, fifo->size);
+    return fifo;
 }
 
+static void mplayer_put_key_internal(struct mp_fifo *fifo, int code)
+{
+    int fifo_free = fifo->readpos - fifo->writepos - 1;
+    if (fifo_free < 0)
+        fifo_free += fifo->size;
+    if (!fifo_free)
+        return; // FIFO FULL!!
+    // reserve some space for key release events to avoid stuck keys
+    if((code & MP_KEY_DOWN) && fifo_free < (fifo->size >> 1))
+        return;
+    fifo->data[fifo->writepos++] = code;
+    fifo->writepos %= fifo->size;
+}
 
-unsigned doubleclick_time = 300;
+int mplayer_get_key(void *ctx, int fd)
+{
+    struct mp_fifo *fifo = ctx;
+    if (fifo->writepos == fifo->readpos)
+        return MP_INPUT_NOTHING;
+    int key = fifo->data[fifo->readpos++];
+    fifo->readpos %= fifo->size;
+    return key;
+}
 
-static void put_double(int code) {
+static void put_double(struct mp_fifo *fifo, int code)
+{
   if (code >= MOUSE_BTN0 && code <= MOUSE_BTN9)
-    mplayer_put_key_internal(code - MOUSE_BTN0 + MOUSE_BTN0_DBL);
+      mplayer_put_key_internal(fifo, code - MOUSE_BTN0 + MOUSE_BTN0_DBL);
 }
 
-void mplayer_put_key(int code) {
-  static unsigned last_key_time[2];
-  static int last_key[2];
-  unsigned now = GetTimerMS();
-  // ignore system-doubleclick if we generate these events ourselves
-  if (doubleclick_time &&
-      (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL &&
-      (code & ~MP_KEY_DOWN) <= MOUSE_BTN9_DBL)
-    return;
-  mplayer_put_key_internal(code);
-  if (code & MP_KEY_DOWN) {
-    code &= ~MP_KEY_DOWN;
-    last_key[1] = last_key[0];
-    last_key[0] = code;
-    last_key_time[1] = last_key_time[0];
-    last_key_time[0] = now;
-    if (last_key[1] == code &&
-        now - last_key_time[1] < doubleclick_time)
-      put_double(code);
-    return;
-  }
-  if (last_key[0] == code && last_key[1] == code &&
-      now - last_key_time[1] < doubleclick_time)
-    put_double(code);
+void mplayer_put_key(struct mp_fifo *fifo, int code)
+{
+    unsigned now = GetTimerMS();
+    int doubleclick_time = fifo->opts->doubleclick_time;
+    // ignore system-doubleclick if we generate these events ourselves
+    if (doubleclick_time
+        && (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL
+        && (code & ~MP_KEY_DOWN) <= MOUSE_BTN9_DBL)
+        return;
+    mplayer_put_key_internal(fifo, code);
+    if (code & MP_KEY_DOWN) {
+        code &= ~MP_KEY_DOWN;
+        fifo->last_key[1] = fifo->last_key[0];
+        fifo->last_key[0] = code;
+        fifo->last_key_time[1] = fifo->last_key_time[0];
+        fifo->last_key_time[0] = now;
+        if (fifo->last_key[1] == code
+            && now - fifo->last_key_time[1] < doubleclick_time)
+            put_double(fifo, code);
+        return;
+    }
+    if (fifo->last_key[0] == code && fifo->last_key[1] == code
+        && now - fifo->last_key_time[1] < doubleclick_time)
+        put_double(fifo, code);
 }