From 9cef48bac77cbeefe7dade7cb38fb3a00a16733a Mon Sep 17 00:00:00 2001 From: siretart Date: Fri, 23 Apr 2010 10:22:44 +0000 Subject: rename 'struct keymap' -> 'struct mp_keymap' This avoids the compilation failure on kFreeBSD (at least amd64): In file included from libvo/vo_directfb2.c:44: libvo/video_out.h:267: error: redefinition of 'struct keymap' This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn includes sys/kbio.h, which defines another 'struct keymap'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/x11_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libvo/x11_common.c') diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 5c21fee975..08252198d3 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -561,7 +561,7 @@ void vo_uninit(void) #include "wskeys.h" #ifdef XF86XK_AudioPause -static const struct keymap keysym_map[] = { +static const struct mp_keymap keysym_map[] = { {XF86XK_MenuKB, KEY_MENU}, {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP}, {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT}, @@ -577,7 +577,7 @@ static void vo_x11_putkey_ext(int keysym) } #endif -static const struct keymap keymap[] = { +static const struct mp_keymap keymap[] = { // special keys {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS}, {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER}, -- cgit v1.2.3 From 2f629d79698d1c297e63b3013e002159d37e1ad3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 25 Apr 2010 15:49:46 +0000 Subject: Deduplicate enable_mouse_movements declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/x11_common.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libvo/x11_common.c') diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 08252198d3..ff5b84f998 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -85,7 +85,6 @@ #define WIN_LAYER_ONTOP 6 #define WIN_LAYER_ABOVE_DOCK 10 -extern int enable_mouse_movements; int fs_layer = WIN_LAYER_ABOVE_DOCK; static int orig_layer = 0; static int old_gravity = NorthWestGravity; -- cgit v1.2.3 From 14c018a80f4908a6540e76e08047dcbf6d9dc059 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 25 Apr 2010 16:13:57 +0000 Subject: Avoid duplicating mouse-movement command-generation code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/x11_common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libvo/x11_common.c') diff --git a/libvo/x11_common.c b/libvo/x11_common.c index ff5b84f998..525772ace1 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -873,12 +873,7 @@ int vo_x11_check_events(Display * mydisplay) } break; case MotionNotify: - if(enable_mouse_movements) - { - char cmd_str[40]; - sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y); - mp_input_queue_cmd(mp_input_parse_cmd(cmd_str)); - } + vo_mouse_movement(Event.xmotion.x, Event.xmotion.y); if (vo_mouse_autohide) { -- cgit v1.2.3