diff options
| author | Po Lu | 2022-01-26 13:46:28 +0800 |
|---|---|---|
| committer | Po Lu | 2022-01-26 13:51:06 +0800 |
| commit | 3e00ab5efb33fd26a38f718d348012e7b718b0a8 (patch) | |
| tree | 2826cb66b2b0af521958a7796f4f6bbcaa9a7eae /src | |
| parent | f97c3f9ced9acc79f71643b846f4afd8615b88b8 (diff) | |
| download | emacs-3e00ab5efb33fd26a38f718d348012e7b718b0a8.tar.gz emacs-3e00ab5efb33fd26a38f718d348012e7b718b0a8.zip | |
; * src/xterm.c (handle_one_xevent): Fix formatting of XI2 switch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 919c8b12ab2..b2cdbe6a0f0 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10357,10 +10357,12 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 10357 | } | 10357 | } |
| 10358 | x_detect_focus_change (dpyinfo, any, event, &inev.ie); | 10358 | x_detect_focus_change (dpyinfo, any, event, &inev.ie); |
| 10359 | goto XI_OTHER; | 10359 | goto XI_OTHER; |
| 10360 | |||
| 10360 | case XI_FocusOut: | 10361 | case XI_FocusOut: |
| 10361 | any = x_any_window_to_frame (dpyinfo, focusout->event); | 10362 | any = x_any_window_to_frame (dpyinfo, focusout->event); |
| 10362 | x_detect_focus_change (dpyinfo, any, event, &inev.ie); | 10363 | x_detect_focus_change (dpyinfo, any, event, &inev.ie); |
| 10363 | goto XI_OTHER; | 10364 | goto XI_OTHER; |
| 10365 | |||
| 10364 | case XI_Enter: | 10366 | case XI_Enter: |
| 10365 | 10367 | ||
| 10366 | any = x_top_window_to_frame (dpyinfo, enter->event); | 10368 | any = x_top_window_to_frame (dpyinfo, enter->event); |
| @@ -10502,6 +10504,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 10502 | x_note_mouse_movement (dpyinfo->last_mouse_glyph_frame, &ev); | 10504 | x_note_mouse_movement (dpyinfo->last_mouse_glyph_frame, &ev); |
| 10503 | #endif | 10505 | #endif |
| 10504 | goto XI_OTHER; | 10506 | goto XI_OTHER; |
| 10507 | |||
| 10505 | case XI_Motion: | 10508 | case XI_Motion: |
| 10506 | { | 10509 | { |
| 10507 | struct xi_device_t *device; | 10510 | struct xi_device_t *device; |
| @@ -10782,6 +10785,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 10782 | do_help = 1; | 10785 | do_help = 1; |
| 10783 | goto XI_OTHER; | 10786 | goto XI_OTHER; |
| 10784 | } | 10787 | } |
| 10788 | |||
| 10785 | case XI_ButtonRelease: | 10789 | case XI_ButtonRelease: |
| 10786 | case XI_ButtonPress: | 10790 | case XI_ButtonPress: |
| 10787 | { | 10791 | { |
| @@ -10981,6 +10985,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 10981 | #endif | 10985 | #endif |
| 10982 | goto XI_OTHER; | 10986 | goto XI_OTHER; |
| 10983 | } | 10987 | } |
| 10988 | |||
| 10984 | case XI_KeyPress: | 10989 | case XI_KeyPress: |
| 10985 | { | 10990 | { |
| 10986 | int state = xev->mods.effective; | 10991 | int state = xev->mods.effective; |
| @@ -11350,6 +11355,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11350 | } | 11355 | } |
| 11351 | goto XI_OTHER; | 11356 | goto XI_OTHER; |
| 11352 | } | 11357 | } |
| 11358 | |||
| 11353 | case XI_KeyRelease: | 11359 | case XI_KeyRelease: |
| 11354 | x_display_set_last_user_time (dpyinfo, xev->time); | 11360 | x_display_set_last_user_time (dpyinfo, xev->time); |
| 11355 | 11361 | ||
| @@ -11387,7 +11393,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11387 | case XI_PropertyEvent: | 11393 | case XI_PropertyEvent: |
| 11388 | case XI_HierarchyChanged: | 11394 | case XI_HierarchyChanged: |
| 11389 | case XI_DeviceChanged: | 11395 | case XI_DeviceChanged: |
| 11390 | |||
| 11391 | #ifdef XISlaveSwitch | 11396 | #ifdef XISlaveSwitch |
| 11392 | if (xi_event->evtype == XI_DeviceChanged | 11397 | if (xi_event->evtype == XI_DeviceChanged |
| 11393 | && (((XIDeviceChangedEvent *) xi_event)->reason | 11398 | && (((XIDeviceChangedEvent *) xi_event)->reason |
| @@ -11396,6 +11401,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11396 | #endif | 11401 | #endif |
| 11397 | x_init_master_valuators (dpyinfo); | 11402 | x_init_master_valuators (dpyinfo); |
| 11398 | goto XI_OTHER; | 11403 | goto XI_OTHER; |
| 11404 | |||
| 11399 | #ifdef XI_TouchBegin | 11405 | #ifdef XI_TouchBegin |
| 11400 | case XI_TouchBegin: | 11406 | case XI_TouchBegin: |
| 11401 | { | 11407 | { |
| @@ -11482,6 +11488,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11482 | 11488 | ||
| 11483 | goto XI_OTHER; | 11489 | goto XI_OTHER; |
| 11484 | } | 11490 | } |
| 11491 | |||
| 11485 | case XI_TouchUpdate: | 11492 | case XI_TouchUpdate: |
| 11486 | { | 11493 | { |
| 11487 | struct xi_device_t *device; | 11494 | struct xi_device_t *device; |
| @@ -11524,6 +11531,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11524 | 11531 | ||
| 11525 | goto XI_OTHER; | 11532 | goto XI_OTHER; |
| 11526 | } | 11533 | } |
| 11534 | |||
| 11527 | case XI_TouchEnd: | 11535 | case XI_TouchEnd: |
| 11528 | { | 11536 | { |
| 11529 | struct xi_device_t *device; | 11537 | struct xi_device_t *device; |
| @@ -11554,6 +11562,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11554 | 11562 | ||
| 11555 | goto XI_OTHER; | 11563 | goto XI_OTHER; |
| 11556 | } | 11564 | } |
| 11565 | |||
| 11557 | #endif | 11566 | #endif |
| 11558 | #ifdef XI_GesturePinchBegin | 11567 | #ifdef XI_GesturePinchBegin |
| 11559 | case XI_GesturePinchBegin: | 11568 | case XI_GesturePinchBegin: |
| @@ -11599,6 +11608,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11599 | *finish = X_EVENT_DROP; | 11608 | *finish = X_EVENT_DROP; |
| 11600 | goto XI_OTHER; | 11609 | goto XI_OTHER; |
| 11601 | } | 11610 | } |
| 11611 | |||
| 11602 | case XI_GesturePinchEnd: | 11612 | case XI_GesturePinchEnd: |
| 11603 | { | 11613 | { |
| 11604 | x_display_set_last_user_time (dpyinfo, xi_event->time); | 11614 | x_display_set_last_user_time (dpyinfo, xi_event->time); |
| @@ -11617,6 +11627,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11617 | default: | 11627 | default: |
| 11618 | goto XI_OTHER; | 11628 | goto XI_OTHER; |
| 11619 | } | 11629 | } |
| 11630 | |||
| 11620 | xi_done_keysym: | 11631 | xi_done_keysym: |
| 11621 | #ifdef HAVE_X_I18N | 11632 | #ifdef HAVE_X_I18N |
| 11622 | if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea)) | 11633 | if (FRAME_XIC (f) && (FRAME_XIC_STYLE (f) & XIMStatusArea)) |
| @@ -11625,6 +11636,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11625 | if (must_free_data) | 11636 | if (must_free_data) |
| 11626 | XFreeEventData (dpyinfo->display, &event->xcookie); | 11637 | XFreeEventData (dpyinfo->display, &event->xcookie); |
| 11627 | goto done_keysym; | 11638 | goto done_keysym; |
| 11639 | |||
| 11628 | XI_OTHER: | 11640 | XI_OTHER: |
| 11629 | if (must_free_data) | 11641 | if (must_free_data) |
| 11630 | XFreeEventData (dpyinfo->display, &event->xcookie); | 11642 | XFreeEventData (dpyinfo->display, &event->xcookie); |