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 @@
 2009-09-04  Jan Djärv  <jan.h.d@swipnet.se>
 
+        * xterm.c (x_focus_changed): If we get a focusout and pointer
+        is invisible, make it visible.
+
         * xterm.h: Remove condition for declaration of
         x_*_window_to_frame.
 
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)
   else
     XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                    f->output_data.x->current_cursor);
+  f->pointer_invisible = invisible;
   UNBLOCK_INPUT;
 }
 
@@ -3372,6 +3373,8 @@ x_focus_changed (type, state, dpyinfo, frame, bufp)
       if (FRAME_XIC (frame))
         XUnsetICFocus (FRAME_XIC (frame));
 #endif
+      if (frame->pointer_invisible)
+        XTtoggle_invisible_pointer (frame, 0);
     }
 }