diff options
| author | Eli Zaretskii | 2022-04-13 16:48:13 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2022-04-13 16:48:13 +0300 |
| commit | be42fdc6dc60bec1d14065d04dc43b693398c591 (patch) | |
| tree | 79dd16153ac7fd3f97193e56192f7821502f436a /src | |
| parent | 918669cb3db21eebc9fb409098a4395f131379ee (diff) | |
| download | emacs-be42fdc6dc60bec1d14065d04dc43b693398c591.tar.gz emacs-be42fdc6dc60bec1d14065d04dc43b693398c591.zip | |
; * src/xterm.c (x_term_init): Fix whitespace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/xterm.c b/src/xterm.c index 86db1a5c5f8..db9266f10bc 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -12684,7 +12684,7 @@ x_scroll_bar_expose (struct scroll_bar *bar, const XEvent *event) | |||
| 12684 | /* Switch to scroll bar foreground color. */ | 12684 | /* Switch to scroll bar foreground color. */ |
| 12685 | if (f->output_data.x->scroll_bar_foreground_pixel != -1) | 12685 | if (f->output_data.x->scroll_bar_foreground_pixel != -1) |
| 12686 | XSetForeground (FRAME_X_DISPLAY (f), gc, | 12686 | XSetForeground (FRAME_X_DISPLAY (f), gc, |
| 12687 | f->output_data.x->scroll_bar_foreground_pixel); | 12687 | f->output_data.x->scroll_bar_foreground_pixel); |
| 12688 | 12688 | ||
| 12689 | /* Draw a one-pixel border just inside the edges of the scroll bar. */ | 12689 | /* Draw a one-pixel border just inside the edges of the scroll bar. */ |
| 12690 | XDrawRectangle (FRAME_X_DISPLAY (f), w, gc, | 12690 | XDrawRectangle (FRAME_X_DISPLAY (f), w, gc, |
| @@ -14677,19 +14677,19 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 14677 | memset (&compose_status, 0, sizeof (compose_status)); | 14677 | memset (&compose_status, 0, sizeof (compose_status)); |
| 14678 | orig_keysym = keysym; | 14678 | orig_keysym = keysym; |
| 14679 | 14679 | ||
| 14680 | /* Common for all keysym input events. */ | 14680 | /* Common for all keysym input events. */ |
| 14681 | XSETFRAME (inev.ie.frame_or_window, f); | 14681 | XSETFRAME (inev.ie.frame_or_window, f); |
| 14682 | inev.ie.modifiers | 14682 | inev.ie.modifiers |
| 14683 | = x_x_to_emacs_modifiers (FRAME_DISPLAY_INFO (f), modifiers); | 14683 | = x_x_to_emacs_modifiers (FRAME_DISPLAY_INFO (f), modifiers); |
| 14684 | inev.ie.timestamp = xkey.time; | 14684 | inev.ie.timestamp = xkey.time; |
| 14685 | 14685 | ||
| 14686 | /* First deal with keysyms which have defined | 14686 | /* First deal with keysyms which have defined |
| 14687 | translations to characters. */ | 14687 | translations to characters. */ |
| 14688 | if (keysym >= 32 && keysym < 128) | 14688 | if (keysym >= 32 && keysym < 128) |
| 14689 | /* Avoid explicitly decoding each ASCII character. */ | 14689 | /* Avoid explicitly decoding each ASCII character. */ |
| 14690 | { | 14690 | { |
| 14691 | inev.ie.kind = ASCII_KEYSTROKE_EVENT; | 14691 | inev.ie.kind = ASCII_KEYSTROKE_EVENT; |
| 14692 | inev.ie.code = keysym; | 14692 | inev.ie.code = keysym; |
| 14693 | 14693 | ||
| 14694 | #ifdef HAVE_XINPUT2 | 14694 | #ifdef HAVE_XINPUT2 |
| 14695 | if (event->xkey.time == pending_keystroke_time) | 14695 | if (event->xkey.time == pending_keystroke_time) |
| @@ -14734,7 +14734,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 14734 | Vx_keysym_table, | 14734 | Vx_keysym_table, |
| 14735 | Qnil), | 14735 | Qnil), |
| 14736 | FIXNATP (c))) | 14736 | FIXNATP (c))) |
| 14737 | { | 14737 | { |
| 14738 | inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFIXNAT (c)) | 14738 | inev.ie.kind = (SINGLE_BYTE_CHAR_P (XFIXNAT (c)) |
| 14739 | ? ASCII_KEYSTROKE_EVENT | 14739 | ? ASCII_KEYSTROKE_EVENT |
| 14740 | : MULTIBYTE_CHAR_KEYSTROKE_EVENT); | 14740 | : MULTIBYTE_CHAR_KEYSTROKE_EVENT); |
| @@ -14751,11 +14751,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 14751 | } | 14751 | } |
| 14752 | #endif | 14752 | #endif |
| 14753 | 14753 | ||
| 14754 | goto done_keysym; | 14754 | goto done_keysym; |
| 14755 | } | 14755 | } |
| 14756 | 14756 | ||
| 14757 | /* Random non-modifier sorts of keysyms. */ | 14757 | /* Random non-modifier sorts of keysyms. */ |
| 14758 | if (((keysym >= XK_BackSpace && keysym <= XK_Escape) | 14758 | if (((keysym >= XK_BackSpace && keysym <= XK_Escape) |
| 14759 | || keysym == XK_Delete | 14759 | || keysym == XK_Delete |
| 14760 | #ifdef XK_ISO_Left_Tab | 14760 | #ifdef XK_ISO_Left_Tab |
| 14761 | || (keysym >= XK_ISO_Left_Tab | 14761 | || (keysym >= XK_ISO_Left_Tab |
| @@ -22480,7 +22480,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 22480 | vendor ? build_string (vendor) : empty_unibyte_string)); | 22480 | vendor ? build_string (vendor) : empty_unibyte_string)); |
| 22481 | block_input (); | 22481 | block_input (); |
| 22482 | terminal->next_terminal = terminal_list; | 22482 | terminal->next_terminal = terminal_list; |
| 22483 | terminal_list = terminal; | 22483 | terminal_list = terminal; |
| 22484 | } | 22484 | } |
| 22485 | 22485 | ||
| 22486 | /* Don't let the initial kboard remain current longer than necessary. | 22486 | /* Don't let the initial kboard remain current longer than necessary. |