diff options
| author | Eli Zaretskii | 2015-08-02 17:56:39 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-08-02 17:56:39 +0300 |
| commit | 1bc3c754fca31f5576a56ddfa3fce524b6b04eef (patch) | |
| tree | e16cb9999a632e4e733f049fd9c5cee84123904b | |
| parent | c6a626ebac9827f23f87ab1774609b35c3046f57 (diff) | |
| download | emacs-1bc3c754fca31f5576a56ddfa3fce524b6b04eef.tar.gz emacs-1bc3c754fca31f5576a56ddfa3fce524b6b04eef.zip | |
Whitespace fixes
; * src/w32fns.c (get_wm_chars, deliver_wm_chars, w32_wnd_proc):
Whitespace fixes.
| -rw-r--r-- | src/w32fns.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 31d23c4d37d..ad93bd41851 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -2848,11 +2848,11 @@ get_wm_chars (HWND aWnd, int *buf, int buflen, int ignore_ctrl, int ctrl, | |||
| 2848 | *ctrl_cnt = 0; | 2848 | *ctrl_cnt = 0; |
| 2849 | if (is_dead) | 2849 | if (is_dead) |
| 2850 | *is_dead = -1; | 2850 | *is_dead = -1; |
| 2851 | eassert(w32_unicode_gui); | 2851 | eassert (w32_unicode_gui); |
| 2852 | while (buflen | 2852 | while (buflen |
| 2853 | /* Should be called only when w32_unicode_gui: */ | 2853 | /* Should be called only when w32_unicode_gui: */ |
| 2854 | && PeekMessageW(&msg, aWnd, WM_KEYFIRST, WM_KEYLAST, | 2854 | && PeekMessageW (&msg, aWnd, WM_KEYFIRST, WM_KEYLAST, |
| 2855 | PM_NOREMOVE | PM_NOYIELD) | 2855 | PM_NOREMOVE | PM_NOYIELD) |
| 2856 | && (msg.message == WM_CHAR || msg.message == WM_SYSCHAR | 2856 | && (msg.message == WM_CHAR || msg.message == WM_SYSCHAR |
| 2857 | || msg.message == WM_DEADCHAR || msg.message == WM_SYSDEADCHAR | 2857 | || msg.message == WM_DEADCHAR || msg.message == WM_SYSDEADCHAR |
| 2858 | || msg.message == WM_UNICHAR)) | 2858 | || msg.message == WM_UNICHAR)) |
| @@ -2861,7 +2861,7 @@ get_wm_chars (HWND aWnd, int *buf, int buflen, int ignore_ctrl, int ctrl, | |||
| 2861 | characters which come BEFORE the next keyup/keydown message. */ | 2861 | characters which come BEFORE the next keyup/keydown message. */ |
| 2862 | int dead; | 2862 | int dead; |
| 2863 | 2863 | ||
| 2864 | GetMessageW(&msg, aWnd, msg.message, msg.message); | 2864 | GetMessageW (&msg, aWnd, msg.message, msg.message); |
| 2865 | dead = (msg.message == WM_DEADCHAR || msg.message == WM_SYSDEADCHAR); | 2865 | dead = (msg.message == WM_DEADCHAR || msg.message == WM_SYSDEADCHAR); |
| 2866 | if (is_dead) | 2866 | if (is_dead) |
| 2867 | *is_dead = (dead ? msg.wParam : -1); | 2867 | *is_dead = (dead ? msg.wParam : -1); |
| @@ -2920,7 +2920,7 @@ get_wm_chars (HWND aWnd, int *buf, int buflen, int ignore_ctrl, int ctrl, | |||
| 2920 | && ((vk >= VK_NUMPAD0 && vk <= VK_DIVIDE) | 2920 | && ((vk >= VK_NUMPAD0 && vk <= VK_DIVIDE) |
| 2921 | || (exp && ((vk >= VK_PRIOR && vk <= VK_DOWN) || | 2921 | || (exp && ((vk >= VK_PRIOR && vk <= VK_DOWN) || |
| 2922 | vk == VK_INSERT || vk == VK_DELETE || vk == VK_CLEAR))) | 2922 | vk == VK_INSERT || vk == VK_DELETE || vk == VK_CLEAR))) |
| 2923 | && strchr("0123456789/*-+.,", code_unit)) | 2923 | && strchr ("0123456789/*-+.,", code_unit)) |
| 2924 | continue; | 2924 | continue; |
| 2925 | *buf++ = code_unit; | 2925 | *buf++ = code_unit; |
| 2926 | buflen--; | 2926 | buflen--; |
| @@ -2974,7 +2974,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam, | |||
| 2974 | windows_msg.time = GetMessageTime (); | 2974 | windows_msg.time = GetMessageTime (); |
| 2975 | TranslateMessage (&windows_msg); | 2975 | TranslateMessage (&windows_msg); |
| 2976 | } | 2976 | } |
| 2977 | count = get_wm_chars (hwnd, buf, sizeof(buf)/sizeof(*buf), 1, | 2977 | count = get_wm_chars (hwnd, buf, sizeof (buf)/sizeof (*buf), 1, |
| 2978 | /* The message may have been synthesized by | 2978 | /* The message may have been synthesized by |
| 2979 | who knows what; be conservative. */ | 2979 | who knows what; be conservative. */ |
| 2980 | modifier_set (VK_LCONTROL) | 2980 | modifier_set (VK_LCONTROL) |
| @@ -3140,7 +3140,7 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam, | |||
| 3140 | if (type_CtrlAlt) | 3140 | if (type_CtrlAlt) |
| 3141 | { | 3141 | { |
| 3142 | /* Out of bound bitmap: */ | 3142 | /* Out of bound bitmap: */ |
| 3143 | SHORT r = VkKeyScanW( *b ), bitmap = 0x1FF; | 3143 | SHORT r = VkKeyScanW (*b), bitmap = 0x1FF; |
| 3144 | 3144 | ||
| 3145 | FPRINTF_WM_CHARS((stderr, "VkKeyScanW %#06x %#04x\n", (int)r, | 3145 | FPRINTF_WM_CHARS((stderr, "VkKeyScanW %#06x %#04x\n", (int)r, |
| 3146 | wParam)); | 3146 | wParam)); |
| @@ -3203,12 +3203,12 @@ deliver_wm_chars (int do_translate, HWND hwnd, UINT msg, UINT wParam, | |||
| 3203 | other cases, we ignore the delivered character. */ | 3203 | other cases, we ignore the delivered character. */ |
| 3204 | #define S_TYPES_TO_IGNORE_CHARACTER_PAYLOAD "aldb" | 3204 | #define S_TYPES_TO_IGNORE_CHARACTER_PAYLOAD "aldb" |
| 3205 | #define S_TYPES_TO_REPORT_CHARACTER_PAYLOAD_WITH_MODIFIERS "" | 3205 | #define S_TYPES_TO_REPORT_CHARACTER_PAYLOAD_WITH_MODIFIERS "" |
| 3206 | if (strchr(S_TYPES_TO_IGNORE_CHARACTER_PAYLOAD, | 3206 | if (strchr (S_TYPES_TO_IGNORE_CHARACTER_PAYLOAD, |
| 3207 | type_CtrlAlt[hairy])) | 3207 | type_CtrlAlt[hairy])) |
| 3208 | return 0; | 3208 | return 0; |
| 3209 | /* If in neither list, report all the modifiers we see COMBINED | 3209 | /* If in neither list, report all the modifiers we see COMBINED |
| 3210 | WITH the reported character. */ | 3210 | WITH the reported character. */ |
| 3211 | if (strchr(S_TYPES_TO_REPORT_CHARACTER_PAYLOAD_WITH_MODIFIERS, | 3211 | if (strchr (S_TYPES_TO_REPORT_CHARACTER_PAYLOAD_WITH_MODIFIERS, |
| 3212 | type_CtrlAlt[hairy])) | 3212 | type_CtrlAlt[hairy])) |
| 3213 | strip_ExtraMods = 0; | 3213 | strip_ExtraMods = 0; |
| 3214 | } | 3214 | } |
| @@ -3572,7 +3572,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) | |||
| 3572 | keycode, and expansion. (Additionally, one knows | 3572 | keycode, and expansion. (Additionally, one knows |
| 3573 | boundaries of expansion of different keypresses.) */ | 3573 | boundaries of expansion of different keypresses.) */ |
| 3574 | res = deliver_wm_chars (1, hwnd, msg, wParam, lParam, 1); | 3574 | res = deliver_wm_chars (1, hwnd, msg, wParam, lParam, 1); |
| 3575 | windows_translate = -( res != 0 ); | 3575 | windows_translate = -(res != 0); |
| 3576 | if (res > 0) /* Bound to character(s) or a deadkey */ | 3576 | if (res > 0) /* Bound to character(s) or a deadkey */ |
| 3577 | break; | 3577 | break; |
| 3578 | /* deliver_wm_chars may make some branches after this vestigal. */ | 3578 | /* deliver_wm_chars may make some branches after this vestigal. */ |