comparison src/msw-proc.c @ 245:51092a27c943 r20-5b21

Import from CVS: tag r20-5b21
author cvs
date Mon, 13 Aug 2007 10:17:54 +0200
parents 41f2f0e326e9
children
comparison
equal deleted inserted replaced
244:78d4f1140794 245:51092a27c943
60 60
61 static Lisp_Object mswindows_find_frame (HWND hwnd); 61 static Lisp_Object mswindows_find_frame (HWND hwnd);
62 static Lisp_Object mswindows_find_console (HWND hwnd); 62 static Lisp_Object mswindows_find_console (HWND hwnd);
63 static Lisp_Object mswindows_key_to_emacs_keysym(int mswindows_key, int mods); 63 static Lisp_Object mswindows_key_to_emacs_keysym(int mswindows_key, int mods);
64 static int mswindows_modifier_state (BYTE* keymap, int has_AltGr); 64 static int mswindows_modifier_state (BYTE* keymap, int has_AltGr);
65 #if 0 /* NOTUSED */
65 static int mswindows_enqueue_timeout (int milliseconds); 66 static int mswindows_enqueue_timeout (int milliseconds);
66 static void mswindows_dequeue_timeout (int interval_id); 67 static void mswindows_dequeue_timeout (int interval_id);
67 68
68 /* Timeout queue */ 69 /* Timeout queue */
69 struct mswindows_timeout 70 struct mswindows_timeout
73 struct mswindows_timeout *next; 74 struct mswindows_timeout *next;
74 }; 75 };
75 typedef struct mswindows_timeout mswindows_timeout; 76 typedef struct mswindows_timeout mswindows_timeout;
76 static mswindows_timeout timeout_pool[MSW_TIMEOUT_MAX]; 77 static mswindows_timeout timeout_pool[MSW_TIMEOUT_MAX];
77 static mswindows_timeout *timeout_head = NULL; 78 static mswindows_timeout *timeout_head = NULL;
79
78 static int timeout_mswindows_id; 80 static int timeout_mswindows_id;
81 #endif
79 82
80 /*----------------------------------------------------------------------------*/ 83 /*----------------------------------------------------------------------------*/
81 /* Enqueue helpers */ 84 /* Enqueue helpers */
82 /*----------------------------------------------------------------------------*/ 85 /*----------------------------------------------------------------------------*/
83 86
245 mswindows_enqueue_keypress_event (hwnd, keysym, mods); 248 mswindows_enqueue_keypress_event (hwnd, keysym, mods);
246 else 249 else
247 { 250 {
248 int quit_ch = CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd))); 251 int quit_ch = CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd)));
249 BYTE keymap_orig[256]; 252 BYTE keymap_orig[256];
250 MSG msg = { hwnd, message, wParam, lParam, GetMessageTime(), GetMessagePos() }; 253 MSG msg = { hwnd, message, wParam, lParam, GetMessageTime(), (GetMessagePos()) };
251 memcpy (keymap_orig, keymap, 256); 254 memcpy (keymap_orig, keymap, 256);
252 255
253 /* Clear control and alt modifiers out of the keymap */ 256 /* Clear control and alt modifiers out of the keymap */
254 keymap [VK_RCONTROL] = 0; 257 keymap [VK_RCONTROL] = 0;
255 keymap [VK_LMENU] = 0; 258 keymap [VK_LMENU] = 0;