Revert "Cleanup tooltips"

This reverts commit 20038f8a.

I am reverting this change because it was applied without prior discussion
on emacs-devel, and has been found to break the NS port.  It needs more
testing and review before it should be applied here.

src/dispextern.h

@@ -3461,6 +3461,8 @@ void gamma_correct (struct frame *, COLORREF *);
 void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
 void x_change_tool_bar_height (struct frame *f, int);
 
+extern Lisp_Object tip_frame;
+extern Window tip_window;
 extern frame_parm_handler x_frame_parm_handlers[];
 
 extern void start_hourglass (void);

src/frame.c

@@ -642,7 +642,6 @@ make_frame (bool mini_p)
   f->vertical_scroll_bar_type = vertical_scroll_bar_none;
   f->horizontal_scroll_bars = false;
   f->want_fullscreen = FULLSCREEN_NONE;
-  f->tooltip = false;
 #if ! defined (USE_GTK) && ! defined (HAVE_NS)
   f->last_tool_bar_item = -1;
 #endif
@@ -1261,16 +1260,13 @@ DEFUN ("frame-list", Fframe_list, Sframe_list,
        doc: /* Return a list of all live frames.  */)
   (void)
 {
+  Lisp_Object frames;
+  frames = Fcopy_sequence (Vframe_list);
 #ifdef HAVE_WINDOW_SYSTEM
-  Lisp_Object list = Qnil, tail, frame;
-
-  FOR_EACH_FRAME (tail, frame)
-    if (!FRAME_TOOLTIP_P (XFRAME (frame)))
-      list = Fcons (frame, list);
-  return list;
-#else /* !HAVE_WINDOW_SYSTEM */
-  return Fcopy_sequence (Vframe_list);
+  if (FRAMEP (tip_frame))
+    frames = Fdelq (tip_frame, frames);
 #endif
+  return frames;
 }
 
 /* Return CANDIDATE if it can be used as 'other-than-FRAME' frame on the
@@ -1561,7 +1557,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
 	}
     }
 
-  is_tooltip_frame = FRAME_TOOLTIP_P (f);
+  is_tooltip_frame = !NILP (Fframe_parameter (frame, Qtooltip));
 
   /* Run `delete-frame-functions' unless FORCE is `noelisp' or
      frame is a tooltip.  FORCE is set to `noelisp' when handling
@@ -4904,6 +4900,7 @@ syms_of_frame (void)
   DEFSYM (Qgeometry, "geometry");
   DEFSYM (Qicon_left, "icon-left");
   DEFSYM (Qicon_top, "icon-top");
+  DEFSYM (Qtooltip, "tooltip");
   DEFSYM (Quser_position, "user-position");
   DEFSYM (Quser_size, "user-size");
   DEFSYM (Qwindow_id, "window-id");
@@ -5025,8 +5022,6 @@ syms_of_frame (void)
   DEFSYM (Qvertical_scroll_bars, "vertical-scroll-bars");
   DEFSYM (Qvisibility, "visibility");
   DEFSYM (Qwait_for_wm, "wait-for-wm");
-  DEFSYM (Qtooltip_timer, "tooltip-timer");
-  DEFSYM (Qtooltip_parameters, "tooltip-parameters");
 
   {
     int i;

src/frame.h

@@ -309,9 +309,6 @@ struct frame
   ENUM_BF (output_method) output_method : 3;
 
 #ifdef HAVE_WINDOW_SYSTEM
-  /* True if this frame is a tooltip frame.  */
-  bool_bf tooltip : 1;
-
   /* See FULLSCREEN_ enum on top.  */
   ENUM_BF (fullscreen_type) want_fullscreen : 4;
 
@@ -864,9 +861,6 @@ default_pixels_per_inch_y (void)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \
   ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
 
-/* Whether F is a tooltip frame.  */
-#define FRAME_TOOLTIP_P(f) ((f)->tooltip)
-
 #else /* not HAVE_WINDOW_SYSTEM */
 
 /* If there is no window system, there are no scroll bars.  */
@@ -875,9 +869,6 @@ default_pixels_per_inch_y (void)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) ((void) f, 0)
 #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) ((void) f, 0)
 
-/* If there is no window system, there are no tooltips.  */
-#define FRAME_TOOLTIP_P(f) ((void) f, 0)
-
 #endif /* HAVE_WINDOW_SYSTEM */
 
 /* Whether horizontal scroll bars are currently enabled for frame F.  */

src/gtkutil.c

@@ -731,23 +731,14 @@ xg_show_tooltip (struct frame *f, int root_x, int root_y)
 bool
 xg_hide_tooltip (struct frame *f)
 {
+  bool ret = 0;
 #ifdef USE_GTK_TOOLTIP
-  struct x_output *x = FRAME_X_OUTPUT (f);
-
-  if (x->ttip_window)
+  if (f->output_data.x->ttip_window)
     {
       GtkWindow *win = f->output_data.x->ttip_window;
-
       block_input ();
       gtk_widget_hide (GTK_WIDGET (win));
 
-      /* Cancel call to xg_hide_tip.  */
-      if (x->ttip_timeout != 0)
-	{
-	  g_source_remove (x->ttip_timeout);
-	  x->ttip_timeout = 0;
-	}
-
       if (g_object_get_data (G_OBJECT (win), "restore-tt"))
         {
           GdkWindow *gwin = gtk_widget_get_window (GTK_WIDGET (win));
@@ -756,21 +747,11 @@ xg_hide_tooltip (struct frame *f)
           g_object_set (settings, "gtk-enable-tooltips", TRUE, NULL);
         }
       unblock_input ();
-      return 1;
-    }
-#endif
-  return 0;
-}
 
-/* One-shot timeout handler attached to GTK event loop in Fx_show_tip.  */
-
-gboolean
-xg_hide_tip (gpointer data)
-{
-#ifdef USE_GTK_TOOLTIP
-  xg_hide_tooltip ((struct frame *) data);
+      ret = 1;
+    }
 #endif
-  return FALSE;
+  return ret;
 }
 
 

src/gtkutil.h

@@ -178,7 +178,6 @@ extern bool xg_prepare_tooltip (struct frame *f,
 				int *height);
 extern void xg_show_tooltip (struct frame *f, int root_x, int root_y);
 extern bool xg_hide_tooltip (struct frame *f);
-extern gboolean xg_hide_tip (gpointer data);
 
 #ifdef USE_CAIRO
 extern void xg_page_setup_dialog (void);

src/menu.c

@@ -1400,12 +1400,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 #ifdef HAVE_WINDOW_SYSTEM
   /* Hide a previous tip, if any.  */
   if (!FRAME_TERMCAP_P (f))
-    {
-      Lisp_Object frame;
-
-      XSETFRAME (frame, f);
-      Fx_hide_tip (frame);
-    }
+    Fx_hide_tip ();
 #endif
 
 #ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */

src/nsfns.m

@@ -2658,6 +2658,10 @@ and GNUstep implementations ("distributor-specific release
   return make_number (1 << min (dpyinfo->n_planes, 24));
 }
 
+
+/* Unused dummy def needed for compatibility. */
+Lisp_Object tip_frame;
+
 /* TODO: move to xdisp or similar */
 static void
 compute_tip_xy (struct frame *f,

src/w32term.c

@@ -5024,10 +5024,11 @@ w32_read_socket (struct terminal *terminal,
 	  /* wParam non-zero means Window is about to be shown, 0 means
 	     about to be hidden.  */
 	  /* Redo the mouse-highlight after the tooltip has gone.  */
-	  if (!msg.msg.wParam
-	      && dpyinfo->w32_tooltip_frame
-	      && FRAME_W32_WINDOW (dpyinfo->w32_tooltip_frame) == msg.msg.hwnd)
-	    x_redo_mouse_highlight (dpyinfo);
+	  if (!msg.msg.wParam && msg.msg.hwnd == tip_window)
+	    {
+	      tip_window = NULL;
+	      x_redo_mouse_highlight (dpyinfo);
+	    }
 
 	  /* If window has been obscured or exposed by another window
 	     being maximized or minimized/restored, then recheck
@@ -5393,7 +5394,7 @@ w32_read_socket (struct terminal *terminal,
 	struct frame *f = XFRAME (frame);
 	/* The tooltip has been drawn already.  Avoid the
 	   SET_FRAME_GARBAGED below.  */
-	if (FRAME_TOOLTIP_P (f))
+	if (EQ (frame, tip_frame))
 	  continue;
 
 	/* Check "visible" frames and mark each as obscured or not.
@@ -5870,7 +5871,7 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
       /* Don't change the size of a tip frame; there's no point in
 	 doing it because it's done in Fx_show_tip, and it leads to
 	 problems because the tip frame has no widget.  */
-      if (!FRAME_TOOLTIP_P (f))
+      if (NILP (tip_frame) || XFRAME (tip_frame) != f)
 	adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
 			   FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 3,
 			   false, Qfont);
@@ -6568,8 +6569,6 @@ x_free_frame_resources (struct frame *f)
     dpyinfo->w32_focus_event_frame = 0;
   if (f == dpyinfo->x_highlight_frame)
     dpyinfo->x_highlight_frame = 0;
-  if (f == dpyinfo->w32_tooltip_frame)
-    dpyinfo->w32_tooltip_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
 

src/w32term.h

@@ -186,9 +186,6 @@ struct w32_display_info
   /* The frame waiting to be auto-raised in w32_read_socket.  */
   struct frame *w32_pending_autoraise_frame;
 
-  /* Tooltip frame on this display.  */
-  struct frame *w32_tooltip_frame;
-
   /* The frame where the mouse was last time we reported a mouse event.  */
   struct frame *last_mouse_frame;
 

src/xdisp.c

@@ -2841,7 +2841,11 @@ init_iterator (struct it *it, struct window *w,
      frames when the fringes are turned off.  But leave the dimensions
      zero for tooltip frames, as these glyphs look ugly there and also
      sabotage calculations of tooltip dimensions in x-show-tip.  */
-  if (!FRAME_TOOLTIP_P (it->f))
+#ifdef HAVE_WINDOW_SYSTEM
+  if (!(FRAME_WINDOW_P (it->f)
+	&& FRAMEP (tip_frame)
+	&& it->f == XFRAME (tip_frame)))
+#endif
     {
       if (it->line_wrap == TRUNCATE)
 	{
@@ -11709,7 +11713,7 @@ x_consider_frame_title (Lisp_Object frame)
   if ((FRAME_WINDOW_P (f)
        || FRAME_MINIBUF_ONLY_P (f)
        || f->explicit_name)
-      && !FRAME_TOOLTIP_P (f))
+      && NILP (Fframe_parameter (frame, Qtooltip)))
     {
       /* Do we have more than one visible frame on this X display?  */
       Lisp_Object tail, other_frame, fmt;
@@ -11726,7 +11730,7 @@ x_consider_frame_title (Lisp_Object frame)
 	  if (tf != f
 	      && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
 	      && !FRAME_MINIBUF_ONLY_P (tf)
-	      && !FRAME_TOOLTIP_P (tf)
+	      && !EQ (other_frame, tip_frame)
 	      && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
 	    break;
 	}
@@ -11789,6 +11793,13 @@ prepare_menu_bars (void)
 {
   bool all_windows = windows_or_buffers_changed || update_mode_lines;
   bool some_windows = REDISPLAY_SOME_P ();
+  Lisp_Object tooltip_frame;
+
+#ifdef HAVE_WINDOW_SYSTEM
+  tooltip_frame = tip_frame;
+#else
+  tooltip_frame = Qnil;
+#endif
 
   if (FUNCTIONP (Vpre_redisplay_function))
     {
@@ -11829,7 +11840,7 @@ prepare_menu_bars (void)
 	      && !XBUFFER (w->contents)->text->redisplay)
 	    continue;
 
-	  if (!FRAME_TOOLTIP_P (f)
+	  if (!EQ (frame, tooltip_frame)
 	      && (FRAME_ICONIFIED_P (f)
 		  || FRAME_VISIBLE_P (f) == 1
 		  /* Exclude TTY frames that are obscured because they
@@ -11866,7 +11877,7 @@ prepare_menu_bars (void)
 	  struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
 
 	  /* Ignore tooltip frame.  */
-	  if (FRAME_TOOLTIP_P (f))
+	  if (EQ (frame, tooltip_frame))
 	    continue;
 
 	  if (some_windows

src/xterm.c

@@ -987,7 +987,8 @@ static void
 x_update_begin (struct frame *f)
 {
 #ifdef USE_CAIRO
-  if (FRAME_TOOLTIP_P (f) && ! FRAME_VISIBLE_P (f))
+  if (! NILP (tip_frame) && XFRAME (tip_frame) == f
+      && ! FRAME_VISIBLE_P (f))
     return;
 
   if (! FRAME_CR_SURFACE (f))
@@ -7838,9 +7839,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
     case UnmapNotify:
       /* Redo the mouse-highlight after the tooltip has gone.  */
-      if (dpyinfo->x_tooltip_frame
-	  && FRAME_X_WINDOW (dpyinfo->x_tooltip_frame) == event->xunmap.window)
-	x_redo_mouse_highlight (dpyinfo);
+      if (event->xunmap.window == tip_window)
+        {
+          tip_window = 0;
+          x_redo_mouse_highlight (dpyinfo);
+        }
 
       f = x_top_window_to_frame (dpyinfo, event->xunmap.window);
       if (f)		/* F may no longer exist if
@@ -8430,7 +8433,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
 #ifdef USE_X_TOOLKIT
           /* Tip frames are pure X window, set size for them.  */
-          if (FRAME_TOOLTIP_P (f))
+          if (! NILP (tip_frame) && XFRAME (tip_frame) == f)
             {
               if (FRAME_PIXEL_HEIGHT (f) != configureEvent.xconfigure.height
                   || FRAME_PIXEL_WIDTH (f) != configureEvent.xconfigure.width)
@@ -9611,7 +9614,7 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
       /* Don't change the size of a tip frame; there's no point in
 	 doing it because it's done in Fx_show_tip, and it leads to
 	 problems because the tip frame has no widget.  */
-      if (!FRAME_TOOLTIP_P (f))
+      if (NILP (tip_frame) || XFRAME (tip_frame) != f)
 	{
 	  adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
 			     FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 3,
@@ -10686,7 +10689,7 @@ x_set_window_size (struct frame *f, bool change_gravity,
   /* The following breaks our calculations.  If it's really needed,
      think of something else.  */
 #if false
-  if (!FRAME_TOOLTIP_P (f))
+  if (NILP (tip_frame) || XFRAME (tip_frame) != f)
     {
       int text_width, text_height;
 
@@ -11337,8 +11340,6 @@ x_free_frame_resources (struct frame *f)
     dpyinfo->x_focus_event_frame = 0;
   if (f == dpyinfo->x_highlight_frame)
     dpyinfo->x_highlight_frame = 0;
-  if (f == dpyinfo->x_tooltip_frame)
-    dpyinfo->x_tooltip_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
 

src/xterm.h

@@ -362,9 +362,6 @@ struct x_display_info
   /* The frame waiting to be auto-raised in XTread_socket.  */
   struct frame *x_pending_autoraise_frame;
 
-  /* Tooltip frame on this display.  */
-  struct frame *x_tooltip_frame;
-
   /* The frame where the mouse was last time we reported a ButtonPress event.  */
   struct frame *last_mouse_frame;
 
@@ -578,7 +575,6 @@ struct x_output
   GtkTooltip *ttip_widget;
   GtkWidget *ttip_lbl;
   GtkWindow *ttip_window;
-  guint ttip_timeout;
 #endif /* USE_GTK_TOOLTIP */
 
 #endif /* USE_GTK */