Mercurial > mplayer.hg

comparison libvo/w32_common.c @ 31017:fca6cfc4d5ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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'.
author siretart
date Fri, 23 Apr 2010 10:22:44 +0000
parents 9b7b4eeea093
children 745f9833930b
comparison
equal deleted inserted replaced
31016:37bb4d020f50 31017:fca6cfc4d5ca
58 58
59 static HMONITOR (WINAPI* myMonitorFromWindow)(HWND, DWORD); 59 static HMONITOR (WINAPI* myMonitorFromWindow)(HWND, DWORD);
60 static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO); 60 static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO);
61 static BOOL (WINAPI* myEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); 61 static BOOL (WINAPI* myEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
62 62
63 static const struct keymap vk_map[] = { 63 static const struct mp_keymap vk_map[] = {
64 // special keys 64 // special keys
65 {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB}, {VK_CONTROL, KEY_CTRL}, 65 {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB}, {VK_CONTROL, KEY_CTRL},
66 66
67 // cursor keys 67 // cursor keys
68 {VK_LEFT, KEY_LEFT}, {VK_UP, KEY_UP}, {VK_RIGHT, KEY_RIGHT}, {VK_DOWN, KEY_DOWN}, 68 {VK_LEFT, KEY_LEFT}, {VK_UP, KEY_UP}, {VK_RIGHT, KEY_RIGHT}, {VK_DOWN, KEY_DOWN},