From be49ba7461368989e0a8ac7d1f555d2f042e8c52 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 12 Nov 2012 20:02:46 +0400 Subject: [PATCH] * frame.h (struct frame): Convert external_tool_bar member to 1-bit unsigned bitfield. * termhooks.h (struct terminal): Remove mouse_moved member since all users are long dead. Adjust comment on mouse_position_hook. --- src/ChangeLog | 7 +++++++ src/frame.h | 2 +- src/termhooks.h | 18 +----------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e35e307c4ee..e8ac547ff2a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-11-12 Dmitry Antipov + + * frame.h (struct frame): Convert external_tool_bar member to + 1-bit unsigned bitfield. + * termhooks.h (struct terminal): Remove mouse_moved member since + all users are long dead. Adjust comment on mouse_position_hook. + 2012-11-12 Dmitry Antipov Simplify by using FOR_EACH_FRAME here and there. diff --git a/src/frame.h b/src/frame.h index 1dc3ebbaf13..35cbc44becc 100644 --- a/src/frame.h +++ b/src/frame.h @@ -237,7 +237,7 @@ struct frame #if defined (USE_GTK) || defined (HAVE_NS) /* Nonzero means using a tool bar that comes from the toolkit. */ - int external_tool_bar; + unsigned external_tool_bar : 1; #endif /* Margin at the top of the frame. Used to display the tool-bar. */ diff --git a/src/termhooks.h b/src/termhooks.h index 2d97fcdbc1e..b35c927fc53 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -414,14 +414,6 @@ struct terminal int memory_below_frame; /* Terminal remembers lines scrolled off bottom */ -#if 0 /* These are not used anywhere. */ - /* EMACS_INT baud_rate; */ /* Output speed in baud */ - int min_padding_speed; /* Speed below which no padding necessary. */ - int dont_calculate_costs; /* Nonzero means don't bother computing - various cost tables; we won't use them. */ -#endif - - /* Window-based redisplay interface for this device (0 for tty devices). */ struct redisplay_interface *rif; @@ -469,10 +461,7 @@ struct terminal Otherwise, set *bar_window to Qnil, and *x and *y to the column and row of the character cell the mouse is over. - Set *time to the time the mouse was at the returned position. - - This should clear mouse_moved until the next motion - event arrives. */ + Set *time to the time the mouse was at the returned position. */ void (*mouse_position_hook) (struct frame **f, int, Lisp_Object *bar_window, enum scroll_bar_part *part, @@ -480,11 +469,6 @@ struct terminal Lisp_Object *y, Time *); - /* The window system handling code should set this if the mouse has - moved since the last call to the mouse_position_hook. Calling that - hook should clear this. */ - int mouse_moved; - /* When a frame's focus redirection is changed, this hook tells the window system code to re-decide where to put the highlight. Under X, this means that Emacs lies about where the focus is. */ -- 2.39.2