#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
-#include "keythread.h"
#include <assert.h>
#include <aalib.h>
+#ifndef WIN32
+# ifdef X_DISPLAY_MISSING
+# error Xlib required due to XInitThreads
+# endif
+# include <vlc_xlib.h>
+#endif
+
/* TODO
* - what about RGB palette ?
*/
*****************************************************************************/
static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Prepare(vout_display_t *, picture_t *);
-static void Display(vout_display_t *, picture_t *);
+static void PictureDisplay(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
/* */
vout_display_cfg_t state;
picture_pool_t *pool;
- key_thread_t *keys;
};
/**
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
+#ifndef WIN32
+ if (!vlc_xlib_init (object))
+ return VLC_EGENERIC;
+#endif
+
/* Allocate structure */
vd->sys = sys = calloc(1, sizeof(*sys));
if (!sys)
vd->pool = Pool;
vd->prepare = Prepare;
- vd->display = Display;
+ vd->display = PictureDisplay;
vd->control = Control;
vd->manage = Manage;
vout_display_SendEventFullscreen(vd, false);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
- sys->keys = vlc_CreateKeyThread(vd);
return VLC_SUCCESS;
error:
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys = vd->sys;
- vlc_DestroyKeyTread(sys->keys);
if (sys->pool)
picture_pool_Delete(sys->pool);
aa_close(sys->aa_context);
/**
* Display a picture
*/
-static void Display(vout_display_t *vd, picture_t *picture)
+static void PictureDisplay(vout_display_t *vd, picture_t *picture)
{
vout_display_sys_t *sys = vd->sys;
/* TODO keys support to complete */
case AA_UP:
- vlc_EmitKey(sys->keys, KEY_UP);
+ vout_display_SendEventKey(vd, KEY_UP);
break;
case AA_DOWN:
- vlc_EmitKey(sys->keys, KEY_DOWN);
+ vout_display_SendEventKey(vd, KEY_DOWN);
break;
case AA_RIGHT:
- vlc_EmitKey(sys->keys, KEY_RIGHT);
+ vout_display_SendEventKey(vd, KEY_RIGHT);
break;
case AA_LEFT:
- vlc_EmitKey(sys->keys, KEY_LEFT);
+ vout_display_SendEventKey(vd, KEY_LEFT);
break;
case AA_BACKSPACE:
- vlc_EmitKey(sys->keys, KEY_BACKSPACE);
+ vout_display_SendEventKey(vd, KEY_BACKSPACE);
break;
case AA_ESC:
- vlc_EmitKey(sys->keys, KEY_ESC);
+ vout_display_SendEventKey(vd, KEY_ESC);
break;
default:
if (event >= 0x20 && event <= 0x7f)
- vlc_EmitKey(sys->keys, event);
+ vout_display_SendEventKey(vd, event);
break;
}
}