master 9b308a333b: Avoid focus and allow monospace text in tooltip frames on Haiku

[Po Lu]

branch: master
commit 9b308a333bcb5cc040cb09d0d676ed5d260f0920
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Avoid focus and allow monospace text in tooltip frames on Haiku
    
    * src/haikufns.c (Fx_show_tip): Set avoid focus on tooltip
    frames.
    
    * src/haikuterm.c (haiku_default_font_parameter): Don't special
    case the default font on tooltip frames, since the bug that was
    supposed to work around has already been fixed.
---
 src/haikufns.c  | 1 +
 src/haikuterm.c | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/haikufns.c b/src/haikufns.c
index 52bb13bc89..6a5fdf5548 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -2001,6 +2001,7 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   BWindow_resize (FRAME_HAIKU_WINDOW (tip_f), width, height);
   haiku_set_offset (tip_f, root_x, root_y, 1);
   BWindow_set_tooltip_decoration (FRAME_HAIKU_WINDOW (tip_f));
+  BWindow_set_avoid_focus (FRAME_HAIKU_WINDOW (tip_f), true);
   BView_set_view_cursor (FRAME_HAIKU_VIEW (tip_f),
                         FRAME_OUTPUT_DATA (XFRAME (frame))->current_cursor);
   SET_FRAME_VISIBLE (tip_f, 1);
diff --git a/src/haikuterm.c b/src/haikuterm.c
index ad89985b74..7380420e53 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -2479,10 +2479,7 @@ haiku_default_font_parameter (struct frame *f, 
Lisp_Object parms)
       struct haiku_font_pattern ptn;
       ptn.specified = 0;
 
-      if (f->tooltip)
-       BFont_populate_plain_family (&ptn);
-      else
-       BFont_populate_fixed_family (&ptn);
+      BFont_populate_fixed_family (&ptn);
 
       if (ptn.specified & FSPEC_FAMILY)
        font = font_open_by_name (f, build_unibyte_string (ptn.family));