diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /libvo/video_out.h | |
parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz |
Merge svn changes up to r31097
Diffstat (limited to 'libvo/video_out.h')
-rw-r--r-- | libvo/video_out.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 0b5f71255c..1bdf74da96 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -35,6 +35,7 @@ #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 #define VO_EVENT_KEYPRESS 4 +#define VO_EVENT_REINIT 8 /* Obsolete: VOCTRL_QUERY_VAA 1 */ /* does the device support the required format */ @@ -311,6 +312,7 @@ extern int vo_rootwin; extern int vo_border; extern int vo_nomouse_input; +extern int enable_mouse_movements; extern int vo_pts; extern float vo_fps; @@ -336,17 +338,19 @@ extern char *monitor_hfreq_str; extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; -struct keymap { +struct mp_keymap { int from; int to; }; -int lookup_keymap_table(const struct keymap *map, int key); +int lookup_keymap_table(const struct mp_keymap *map, int key); struct vo_rect { int left, right, top, bottom, width, height; }; void calc_src_dst_rects(struct vo *vo, int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, struct vo_rect *borders, const struct vo_rect *crop); +struct input_ctx; +void vo_mouse_movement(struct vo *vo, int posx, int posy); static inline int aspect_scaling(void) { |