diff options
| author | Jared Finder | 2020-11-14 23:44:26 -0800 |
|---|---|---|
| committer | Eli Zaretskii | 2020-11-21 10:20:05 +0200 |
| commit | 2c7687738d0b7da60014a7af05ab199936617d71 (patch) | |
| tree | b0f7eb78c6d7a833df2098d3002493992e89b8b5 /src/term.c | |
| parent | 932cb10761b9f249c87d7c19778873691f2a5d46 (diff) | |
| download | emacs-2c7687738d0b7da60014a7af05ab199936617d71.tar.gz emacs-2c7687738d0b7da60014a7af05ab199936617d71.zip | |
Migrate usage of GPM_CLICK_EVENT to MOUSE_CLICK_EVENT.
* src/termhooks.h (enum event_kind):
* src/term.c (term_mouse_click, handle_one_term_event):
* src/keyboard.c (discard_mouse_events, make_lispy_event): Migrate
usage of GPM_CLICK_EVENT to MOUSE_CLICK_EVENT.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/term.c b/src/term.c index a0738594bfc..fee3b555751 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2481,7 +2481,7 @@ term_mouse_click (struct input_event *result, Gpm_Event *event, | |||
| 2481 | { | 2481 | { |
| 2482 | int i, j; | 2482 | int i, j; |
| 2483 | 2483 | ||
| 2484 | result->kind = GPM_CLICK_EVENT; | 2484 | result->kind = MOUSE_CLICK_EVENT; |
| 2485 | for (i = 0, j = GPM_B_LEFT; i < 3; i++, j >>= 1 ) | 2485 | for (i = 0, j = GPM_B_LEFT; i < 3; i++, j >>= 1 ) |
| 2486 | { | 2486 | { |
| 2487 | if (event->buttons & j) { | 2487 | if (event->buttons & j) { |
| @@ -2567,11 +2567,11 @@ handle_one_term_event (struct tty_display_info *tty, Gpm_Event *event) | |||
| 2567 | { | 2567 | { |
| 2568 | f->mouse_moved = 0; | 2568 | f->mouse_moved = 0; |
| 2569 | term_mouse_click (&ie, event, f); | 2569 | term_mouse_click (&ie, event, f); |
| 2570 | /* eassert (ie.kind == GPM_CLICK_EVENT); */ | 2570 | /* eassert (ie.kind == MOUSE_CLICK_EVENT); */ |
| 2571 | if (tty_handle_tab_bar_click (f, event->x, event->y, | 2571 | if (tty_handle_tab_bar_click (f, event->x, event->y, |
| 2572 | (ie.modifiers & down_modifier) != 0, &ie)) | 2572 | (ie.modifiers & down_modifier) != 0, &ie)) |
| 2573 | { | 2573 | { |
| 2574 | /* eassert (ie.kind == GPM_CLICK_EVENT | 2574 | /* eassert (ie.kind == MOUSE_CLICK_EVENT |
| 2575 | * || ie.kind == TAB_BAR_EVENT); */ | 2575 | * || ie.kind == TAB_BAR_EVENT); */ |
| 2576 | /* tty_handle_tab_bar_click stores 2 events in the event | 2576 | /* tty_handle_tab_bar_click stores 2 events in the event |
| 2577 | queue, so we are done here. */ | 2577 | queue, so we are done here. */ |
| @@ -2581,7 +2581,7 @@ handle_one_term_event (struct tty_display_info *tty, Gpm_Event *event) | |||
| 2581 | count += 2; | 2581 | count += 2; |
| 2582 | return count; | 2582 | return count; |
| 2583 | } | 2583 | } |
| 2584 | /* eassert (ie.kind == GPM_CLICK_EVENT); */ | 2584 | /* eassert (ie.kind == MOUSE_CLICK_EVENT); */ |
| 2585 | kbd_buffer_store_event (&ie); | 2585 | kbd_buffer_store_event (&ie); |
| 2586 | count++; | 2586 | count++; |
| 2587 | } | 2587 | } |