diff options
| author | Jan Djärv | 2009-09-04 05:33:49 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-09-04 05:33:49 +0000 |
| commit | 4da146f2c2e5b60ee9d5402cd7e363b1ce589e76 (patch) | |
| tree | feabf8272cc8c634a74ffefcb98af0406047e62c | |
| parent | 0a5e331a0e9e5c0a6ae1d84e87d615a86bfe86a7 (diff) | |
| download | emacs-4da146f2c2e5b60ee9d5402cd7e363b1ce589e76.tar.gz emacs-4da146f2c2e5b60ee9d5402cd7e363b1ce589e76.zip | |
(x_focus_changed): If we get a focusout and pointer
is invisible, make it visible.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4bbaf28cef1..9e94c8f03bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2009-09-04 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2009-09-04 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * xterm.c (x_focus_changed): If we get a focusout and pointer | ||
| 4 | is invisible, make it visible. | ||
| 5 | |||
| 3 | * xterm.h: Remove condition for declaration of | 6 | * xterm.h: Remove condition for declaration of |
| 4 | x_*_window_to_frame. | 7 | x_*_window_to_frame. |
| 5 | 8 | ||
diff --git a/src/xterm.c b/src/xterm.c index 1e13ae8858b..a2af7894cc2 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3139,6 +3139,7 @@ XTtoggle_invisible_pointer (f, invisible) | |||
| 3139 | else | 3139 | else |
| 3140 | XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 3140 | XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
| 3141 | f->output_data.x->current_cursor); | 3141 | f->output_data.x->current_cursor); |
| 3142 | f->pointer_invisible = invisible; | ||
| 3142 | UNBLOCK_INPUT; | 3143 | UNBLOCK_INPUT; |
| 3143 | } | 3144 | } |
| 3144 | 3145 | ||
| @@ -3372,6 +3373,8 @@ x_focus_changed (type, state, dpyinfo, frame, bufp) | |||
| 3372 | if (FRAME_XIC (frame)) | 3373 | if (FRAME_XIC (frame)) |
| 3373 | XUnsetICFocus (FRAME_XIC (frame)); | 3374 | XUnsetICFocus (FRAME_XIC (frame)); |
| 3374 | #endif | 3375 | #endif |
| 3376 | if (frame->pointer_invisible) | ||
| 3377 | XTtoggle_invisible_pointer (frame, 0); | ||
| 3375 | } | 3378 | } |
| 3376 | } | 3379 | } |
| 3377 | 3380 | ||