diff options
| author | Po Lu | 2021-12-12 14:20:18 +0800 |
|---|---|---|
| committer | Po Lu | 2021-12-12 14:20:18 +0800 |
| commit | 11b2dfca287dee4b4520d07e3ad6432870059100 (patch) | |
| tree | 6778557bb30bb2a7a29065c40f55395acd424ca0 /src | |
| parent | 4f987e189d129523a93b21427c24f761e7fb4c00 (diff) | |
| download | emacs-11b2dfca287dee4b4520d07e3ad6432870059100.tar.gz emacs-11b2dfca287dee4b4520d07e3ad6432870059100.zip | |
* src/xterm.c (x_detect_focus_change): Fix XI2 focus on GTK builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xterm.c b/src/xterm.c index 3d9dce27e82..0dc944fd819 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -5144,13 +5144,13 @@ x_detect_focus_change (struct x_display_info *dpyinfo, struct frame *frame, | |||
| 5144 | int focus_state | 5144 | int focus_state |
| 5145 | = focus_frame ? focus_frame->output_data.x->focus_state : 0; | 5145 | = focus_frame ? focus_frame->output_data.x->focus_state : 0; |
| 5146 | 5146 | ||
| 5147 | if (!((((xi_event->evtype == XI_Enter | 5147 | if (((((xi_event->evtype == XI_Enter |
| 5148 | || xi_event->evtype == XI_Leave) | 5148 | || xi_event->evtype == XI_Leave) |
| 5149 | && (((XIEnterEvent *) xi_event)->detail | 5149 | && (((XIEnterEvent *) xi_event)->detail |
| 5150 | != XINotifyInferior) | 5150 | != XINotifyInferior) |
| 5151 | && !(focus_state & FOCUS_EXPLICIT)) | 5151 | && !(focus_state & FOCUS_EXPLICIT)) |
| 5152 | || xi_event->evtype == XI_FocusIn | 5152 | || xi_event->evtype == XI_FocusIn |
| 5153 | || xi_event->evtype == XI_FocusOut))) | 5153 | || xi_event->evtype == XI_FocusOut))) |
| 5154 | x_focus_changed ((xi_event->evtype == XI_Enter | 5154 | x_focus_changed ((xi_event->evtype == XI_Enter |
| 5155 | || xi_event->evtype == XI_FocusIn | 5155 | || xi_event->evtype == XI_FocusIn |
| 5156 | ? FocusIn : FocusOut), | 5156 | ? FocusIn : FocusOut), |