[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117175: On X, always make pointer visible when dele
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r117175: On X, always make pointer visible when deleting frame (Bug#17609). |
Date: |
Wed, 28 May 2014 08:00:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117175
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-28 12:00:10 +0400
message:
On X, always make pointer visible when deleting frame (Bug#17609).
* frame.c (frame_make_pointer_visible, frame_make_pointer_invisible):
Pass frame as arg.
* frame.h (frame_make_pointer_visible, frame_make_pointer_invisible):
Adjust prototypes.
* cmds.c (Fself_insert_command): Use SELECTED_FRAME.
* keyboard.c (gobble_input): If there is no terminal input error,
make sure the pointer is visible for all frames on this terminal.
* xterm.c (x_free_frame_resources): Always enable pointer visibility.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/cmds.c cmds.c-20091113204419-o5vbwnq5f7feedwu-214
src/frame.c frame.c-20091113204419-o5vbwnq5f7feedwu-243
src/frame.h frame.h-20091113204419-o5vbwnq5f7feedwu-229
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-28 00:50:44 +0000
+++ b/src/ChangeLog 2014-05-28 08:00:10 +0000
@@ -1,3 +1,15 @@
+2014-05-28 Dmitry Antipov <address@hidden>
+
+ On X, always make pointer visible when deleting frame (Bug#17609).
+ * frame.c (frame_make_pointer_visible, frame_make_pointer_invisible):
+ Pass frame as arg.
+ * frame.h (frame_make_pointer_visible, frame_make_pointer_invisible):
+ Adjust prototypes.
+ * cmds.c (Fself_insert_command): Use SELECTED_FRAME.
+ * keyboard.c (gobble_input): If there is no terminal input error,
+ make sure the pointer is visible for all frames on this terminal.
+ * xterm.c (x_free_frame_resources): Always enable pointer visibility.
+
2014-05-28 Stefan Monnier <address@hidden>
* data.c (Fzerop): Move to Elisp.
=== modified file 'src/cmds.c'
--- a/src/cmds.c 2014-03-04 03:14:11 +0000
+++ b/src/cmds.c 2014-05-28 08:00:10 +0000
@@ -315,7 +315,7 @@
int val = internal_self_insert (character, XFASTINT (n));
if (val == 2)
nonundocount = 0;
- frame_make_pointer_invisible ();
+ frame_make_pointer_invisible (SELECTED_FRAME ());
}
return Qnil;
=== modified file 'src/frame.c'
--- a/src/frame.c 2014-04-03 20:46:04 +0000
+++ b/src/frame.c 2014-05-28 08:00:10 +0000
@@ -4373,16 +4373,11 @@
#endif /* HAVE_WINDOW_SYSTEM */
void
-frame_make_pointer_invisible (void)
+frame_make_pointer_invisible (struct frame *f)
{
if (! NILP (Vmake_pointer_invisible))
{
- struct frame *f;
- if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
- return;
-
- f = SELECTED_FRAME ();
- if (f && !f->pointer_invisible
+ if (f && FRAME_LIVE_P (f) && !f->pointer_invisible
&& FRAME_TERMINAL (f)->toggle_invisible_pointer_hook)
{
f->mouse_moved = 0;
@@ -4393,17 +4388,11 @@
}
void
-frame_make_pointer_visible (void)
+frame_make_pointer_visible (struct frame *f)
{
/* We don't check Vmake_pointer_invisible here in case the
pointer was invisible when Vmake_pointer_invisible was set to nil. */
- struct frame *f;
-
- if (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)))
- return;
-
- f = SELECTED_FRAME ();
- if (f && f->pointer_invisible && f->mouse_moved
+ if (f && FRAME_LIVE_P (f) && f->pointer_invisible && f->mouse_moved
&& FRAME_TERMINAL (f)->toggle_invisible_pointer_hook)
{
FRAME_TERMINAL (f)->toggle_invisible_pointer_hook (f, 0);
=== modified file 'src/frame.h'
--- a/src/frame.h 2014-04-04 16:59:50 +0000
+++ b/src/frame.h 2014-05-28 08:00:10 +0000
@@ -995,8 +995,8 @@
#endif /* HAVE_WINDOW_SYSTEM */
extern bool window_system_available (struct frame *);
extern void check_window_system (struct frame *);
-extern void frame_make_pointer_invisible (void);
-extern void frame_make_pointer_visible (void);
+extern void frame_make_pointer_invisible (struct frame *);
+extern void frame_make_pointer_visible (struct frame *);
extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
extern Lisp_Object Vframe_list;
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2014-05-28 00:50:44 +0000
+++ b/src/keyboard.c 2014-05-28 08:00:10 +0000
@@ -6877,6 +6877,20 @@
}
}
+ /* If there was no error, make sure the pointer
+ is visible for all frames on this terminal. */
+ if (nr >= 0)
+ {
+ Lisp_Object tail, frame;
+
+ FOR_EACH_FRAME (tail, frame)
+ {
+ struct frame *f = XFRAME (frame);
+ if (FRAME_TERMINAL (f) == t)
+ frame_make_pointer_visible (f);
+ }
+ }
+
if (hold_quit.kind != NO_EVENT)
kbd_buffer_store_event (&hold_quit);
}
@@ -6887,8 +6901,6 @@
if (err && !nread)
nread = -1;
- frame_make_pointer_visible ();
-
return nread;
}
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2014-05-14 13:55:37 +0000
+++ b/src/xterm.c 2014-05-28 08:00:10 +0000
@@ -9233,6 +9233,10 @@
commands to the X server. */
if (dpyinfo->display)
{
+ /* Always exit with visible pointer to avoid weird issue
+ with Xfixes (Bug#17609). */
+ FRAME_DISPLAY_INFO (f)->toggle_visible_pointer (f, 0);
+
/* We must free faces before destroying windows because some
font-driver (e.g. xft) access a window while finishing a
face. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117175: On X, always make pointer visible when deleting frame (Bug#17609).,
Dmitry Antipov <=