comparison src/gtkutil.c @ 111781:0bd93f14fcb6

Fix error in last merge. src/gtkutil.c (menubar_map_cb): Use xg_height_or_width_changed.

111780:e235f9dbb282

                 gpointer   user_data)
{
  FRAME_PTR f = (FRAME_PTR) user_data;
  struct x_output *x = f->output_data.x;
  GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl);
  
  if (! top || ! GTK_IS_WINDOW (top))
      gtk_widget_hide (previous_toplevel);
}

/* Callback called when Gtk+ thinks a tooltip should be displayed.

          GtkTooltip *tooltip,
          gpointer    user_data)
{
  FRAME_PTR f = (FRAME_PTR) user_data;
  struct x_output *x = f->output_data.x;
  if (x->ttip_widget == NULL) 
    {
      g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL);
      x->ttip_widget = tooltip;
      g_object_ref (G_OBJECT (tooltip));
      x->ttip_lbl = gtk_label_new ("");

  widget = GTK_WIDGET (x->ttip_lbl);
  gwin = gtk_widget_get_window (GTK_WIDGET (x->ttip_window));
  screen = gdk_drawable_get_screen (gwin);
  settings = gtk_settings_get_for_screen (screen);
  g_object_get (settings, "gtk-enable-tooltips", &tt_enabled, NULL);
  if (tt_enabled) 
    {
      g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL);
      /* Record that we disabled it so it can be enabled again.  */
      g_object_set_data (G_OBJECT (x->ttip_window), "restore-tt",
                         (gpointer)f);
    }
    
  /* Prevent Gtk+ from hiding tooltip on mouse move and such.  */
  g_object_set_data (G_OBJECT
                     (gtk_widget_get_display (GTK_WIDGET (x->ttip_window))),
                     "gdk-display-current-tooltip", NULL);

  gtk_tooltip_set_text (x->ttip_widget, SDATA (encoded_string));
  gtk_widget_size_request (GTK_WIDGET (x->ttip_window), &req);
  if (width) *width = req.width;
  if (height) *height = req.height;
  
  UNBLOCK_INPUT;

  return 1;
#endif /* USE_GTK_TOOLTIP */
}

          gdk_window_get_geometry (gtk_widget_get_window (FRAME_GTK_WIDGET (f)),
                                   0, 0,
                                   &pixelwidth, &pixelheight, 0);
      else return;
    }
  

  rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight);
  columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);

  if (columns != FRAME_COLS (f)

#ifdef USE_GTK_TOOLTIP
  /* Steal a tool tip window we can move ourselves.  */
  f->output_data.x->ttip_widget = 0;
  f->output_data.x->ttip_lbl = 0;
  f->output_data.x->ttip_window = 0;
  gtk_widget_set_tooltip_text (wtop, "Dummy text");  
  g_signal_connect (wtop, "query-tooltip", G_CALLBACK (qttip_cb), f);
#endif

  {
    GdkScreen *screen = gtk_widget_get_screen (wtop);

  if (dd->w) gtk_widget_destroy (dd->w);
  if (dd->timerid != 0) g_source_remove (dd->timerid);

  g_main_loop_quit (dd->loop);
  g_main_loop_unref (dd->loop);
  
  UNBLOCK_INPUT;

  return Qnil;
}

                                   dd);
    }
  return FALSE;
}

     
/* Pops up a modal dialog W and waits for response.
   We don't use gtk_dialog_run because we want to process emacs timers.
   The dialog W is not destroyed when this function returns.  */

static int

  record_unwind_protect (pop_down_dialog, make_save_value (&dd, 0));

  (void) xg_maybe_add_timer (&dd);
  g_main_loop_run (dd.loop);
  
  dd.w = 0;
  unbind_to (count, Qnil);

  return dd.response;
}

menubar_map_cb (GtkWidget *w, gpointer user_data)
{
  GtkRequisition req;
  FRAME_PTR f = (FRAME_PTR) user_data;
  gtk_widget_size_request (w, &req);
  if (FRAME_MENUBAR_HEIGHT (f) != req.height) 
    {
      FRAME_MENUBAR_HEIGHT (f) = req.height;
      xg_height_changed (f);
    }
}

/* Recompute all the widgets of frame F, when the menu bar has been
   changed.  Value is non-zero if widgets were updated.  */

                    (gpointer) bar);
  g_signal_connect (G_OBJECT (wscroll),
                    "button-release-event",
                    end_callback,
                    (gpointer) bar);
  
  /* The scroll bar widget does not draw on a window of its own.  Instead
     it draws on the parent window, in this case the edit widget.  So
     whenever the edit widget is cleared, the scroll bar needs to redraw
     also, which causes flicker.  Put an event box between the edit widget
     and the scroll bar, so the scroll bar instead draws itself on the

             above.  */
          x_clear_area (FRAME_X_DISPLAY (f),
                        FRAME_X_WINDOW (f),
                        oldx, oldy, oldw, oldh, 0);
        }
      
      /* GTK does not redraw until the main loop is entered again, but
         if there are no X events pending we will not enter it.  So we sync
         here to get some events.  */
            
      x_sync (f);
      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);
    }
}

    {
      /* If we are releasing or moving the scroll bar, it has the grab.  */
      GtkWidget *w = gtk_grab_get_current ();
      retval = w != 0 && GTK_IS_SCROLLBAR (w);
    }
  
  return retval;
}




  /* Convert between the modifier bits GDK uses and the modifier bits
     Emacs uses.  This assumes GDK and X masks are the same, which they are when
     this is written.  */
  event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod);
  kbd_buffer_store_event (&event);
 
   /* Return focus to the frame after we have clicked on a detached
      tool bar button. */
   Fx_focus_frame (frame);
}

                                 GdkEventCrossing *event,
                                 gpointer client_data)
{
  GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w),
                                                      XG_TOOL_BAR_PROXY_BUTTON));
  
  return xg_tool_bar_help_callback (wbutton, event, client_data);
}

static GtkWidget *
xg_get_tool_bar_widgets (GtkWidget *vb, GtkWidget **wimage)

  g_signal_connect (G_OBJECT (wmenuitem),
                    "activate",
                    G_CALLBACK (xg_tool_bar_proxy_callback),
                    user_data);

  
  g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON,
                     (gpointer) wbutton);
  gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem);
  gtk_widget_set_sensitive (wmenuitem,
                            gtk_widget_get_sensitive (GTK_WIDGET (wbutton)));

                        G_CALLBACK (xg_tool_bar_attach_callback), f);
      gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
                         x->toolbar_widget);
    }

  if (into_hbox) 
    {
      gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget),
                                          GTK_POS_TOP);
      gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget,
                          FALSE, FALSE, 0);

{
  GtkToolItem *ti = gtk_tool_item_new ();
  Lisp_Object style = Ftool_bar_get_system_style ();
  int both_horiz = EQ (style, Qboth_horiz);
  int text_image = EQ (style, Qtext_image_horiz);
  
  GtkWidget *vb = both_horiz || text_image
    ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0);
  GtkWidget *wb = gtk_button_new ();
  GtkWidget *weventbox = gtk_event_box_new ();

      g_signal_connect (wb, "button-release-event",
                        G_CALLBACK (xg_tool_bar_button_cb),
                        NULL);

      g_object_set_data (G_OBJECT (wb), XG_FRAME_DATA, (gpointer)f);
          
      /* Use enter/leave notify to show help.  We use the events
         rather than the GtkButton specific signals "enter" and
         "leave", so we can have only one callback.  The event
         will tell us what kind of event it is.  */
      /* The EMACS_INT cast avoids a warning. */

      g_signal_connect (G_OBJECT (weventbox),
                        "leave-notify-event",
                        G_CALLBACK (xg_tool_bar_help_callback),
                        (gpointer) (EMACS_INT) i);
    }
  
  if (wbutton) *wbutton = wb;

  return ti;
}

                               x->handlebox_widget,
                               "position", &pos, NULL);
      if (pos == 0 || (pos == 1 && x->menubar_widget)) nt = req.height;
      else nb = req.height;
    }
  
  if (nl != FRAME_TOOLBAR_LEFT_WIDTH (f)
      || nr != FRAME_TOOLBAR_RIGHT_WIDTH (f)
      || nt != FRAME_TOOLBAR_TOP_HEIGHT (f)
      || nb != FRAME_TOOLBAR_BOTTOM_HEIGHT (f))
    {

  if (! x->toolbar_widget)
    xg_create_tool_bar (f);

  wtoolbar = GTK_TOOLBAR (x->toolbar_widget);
  dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar));
  
  for (i = 0; i < f->n_tool_bar_items; ++i)
    {
      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int idx;

    {
      int is_packed = x->handlebox_widget != 0;
      BLOCK_INPUT;
      /* We may have created the toolbar_widget in xg_create_tool_bar, but
         not the x->handlebox_widget which is created in xg_pack_tool_bar.  */
      if (is_packed) 
        {
          if (x->toolbar_in_hbox)
            gtk_container_remove (GTK_CONTAINER (x->hbox_widget),
                                  x->handlebox_widget);
          else

111781:0bd93f14fcb6

                 gpointer   user_data)
{
  FRAME_PTR f = (FRAME_PTR) user_data;
  struct x_output *x = f->output_data.x;
  GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl);

  if (! top || ! GTK_IS_WINDOW (top))
      gtk_widget_hide (previous_toplevel);
}

/* Callback called when Gtk+ thinks a tooltip should be displayed.

          GtkTooltip *tooltip,
          gpointer    user_data)
{
  FRAME_PTR f = (FRAME_PTR) user_data;
  struct x_output *x = f->output_data.x;
  if (x->ttip_widget == NULL)
    {
      g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL);
      x->ttip_widget = tooltip;
      g_object_ref (G_OBJECT (tooltip));
      x->ttip_lbl = gtk_label_new ("");

  widget = GTK_WIDGET (x->ttip_lbl);
  gwin = gtk_widget_get_window (GTK_WIDGET (x->ttip_window));
  screen = gdk_drawable_get_screen (gwin);
  settings = gtk_settings_get_for_screen (screen);
  g_object_get (settings, "gtk-enable-tooltips", &tt_enabled, NULL);
  if (tt_enabled)
    {
      g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL);
      /* Record that we disabled it so it can be enabled again.  */
      g_object_set_data (G_OBJECT (x->ttip_window), "restore-tt",
                         (gpointer)f);
    }

  /* Prevent Gtk+ from hiding tooltip on mouse move and such.  */
  g_object_set_data (G_OBJECT
                     (gtk_widget_get_display (GTK_WIDGET (x->ttip_window))),
                     "gdk-display-current-tooltip", NULL);

  gtk_tooltip_set_text (x->ttip_widget, SDATA (encoded_string));
  gtk_widget_size_request (GTK_WIDGET (x->ttip_window), &req);
  if (width) *width = req.width;
  if (height) *height = req.height;

  UNBLOCK_INPUT;

  return 1;
#endif /* USE_GTK_TOOLTIP */
}

          gdk_window_get_geometry (gtk_widget_get_window (FRAME_GTK_WIDGET (f)),
                                   0, 0,
                                   &pixelwidth, &pixelheight, 0);
      else return;
    }


  rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight);
  columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);

  if (columns != FRAME_COLS (f)

#ifdef USE_GTK_TOOLTIP
  /* Steal a tool tip window we can move ourselves.  */
  f->output_data.x->ttip_widget = 0;
  f->output_data.x->ttip_lbl = 0;
  f->output_data.x->ttip_window = 0;
  gtk_widget_set_tooltip_text (wtop, "Dummy text");
  g_signal_connect (wtop, "query-tooltip", G_CALLBACK (qttip_cb), f);
#endif

  {
    GdkScreen *screen = gtk_widget_get_screen (wtop);

  if (dd->w) gtk_widget_destroy (dd->w);
  if (dd->timerid != 0) g_source_remove (dd->timerid);

  g_main_loop_quit (dd->loop);
  g_main_loop_unref (dd->loop);

  UNBLOCK_INPUT;

  return Qnil;
}

                                   dd);
    }
  return FALSE;
}


/* Pops up a modal dialog W and waits for response.
   We don't use gtk_dialog_run because we want to process emacs timers.
   The dialog W is not destroyed when this function returns.  */

static int

  record_unwind_protect (pop_down_dialog, make_save_value (&dd, 0));

  (void) xg_maybe_add_timer (&dd);
  g_main_loop_run (dd.loop);

  dd.w = 0;
  unbind_to (count, Qnil);

  return dd.response;
}

menubar_map_cb (GtkWidget *w, gpointer user_data)
{
  GtkRequisition req;
  FRAME_PTR f = (FRAME_PTR) user_data;
  gtk_widget_size_request (w, &req);
  if (FRAME_MENUBAR_HEIGHT (f) != req.height)
    {
      FRAME_MENUBAR_HEIGHT (f) = req.height;
      xg_height_or_width_changed (f);
    }
}

/* Recompute all the widgets of frame F, when the menu bar has been
   changed.  Value is non-zero if widgets were updated.  */

                    (gpointer) bar);
  g_signal_connect (G_OBJECT (wscroll),
                    "button-release-event",
                    end_callback,
                    (gpointer) bar);

  /* The scroll bar widget does not draw on a window of its own.  Instead
     it draws on the parent window, in this case the edit widget.  So
     whenever the edit widget is cleared, the scroll bar needs to redraw
     also, which causes flicker.  Put an event box between the edit widget
     and the scroll bar, so the scroll bar instead draws itself on the

             above.  */
          x_clear_area (FRAME_X_DISPLAY (f),
                        FRAME_X_WINDOW (f),
                        oldx, oldy, oldw, oldh, 0);
        }

      /* GTK does not redraw until the main loop is entered again, but
         if there are no X events pending we will not enter it.  So we sync
         here to get some events.  */

      x_sync (f);
      SET_FRAME_GARBAGED (f);
      cancel_mouse_face (f);
    }
}

    {
      /* If we are releasing or moving the scroll bar, it has the grab.  */
      GtkWidget *w = gtk_grab_get_current ();
      retval = w != 0 && GTK_IS_SCROLLBAR (w);
    }

  return retval;
}




  /* Convert between the modifier bits GDK uses and the modifier bits
     Emacs uses.  This assumes GDK and X masks are the same, which they are when
     this is written.  */
  event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod);
  kbd_buffer_store_event (&event);

   /* Return focus to the frame after we have clicked on a detached
      tool bar button. */
   Fx_focus_frame (frame);
}

                                 GdkEventCrossing *event,
                                 gpointer client_data)
{
  GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w),
                                                      XG_TOOL_BAR_PROXY_BUTTON));

  return xg_tool_bar_help_callback (wbutton, event, client_data);
}

static GtkWidget *
xg_get_tool_bar_widgets (GtkWidget *vb, GtkWidget **wimage)

  g_signal_connect (G_OBJECT (wmenuitem),
                    "activate",
                    G_CALLBACK (xg_tool_bar_proxy_callback),
                    user_data);


  g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON,
                     (gpointer) wbutton);
  gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem);
  gtk_widget_set_sensitive (wmenuitem,
                            gtk_widget_get_sensitive (GTK_WIDGET (wbutton)));

                        G_CALLBACK (xg_tool_bar_attach_callback), f);
      gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
                         x->toolbar_widget);
    }

  if (into_hbox)
    {
      gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget),
                                          GTK_POS_TOP);
      gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget,
                          FALSE, FALSE, 0);

{
  GtkToolItem *ti = gtk_tool_item_new ();
  Lisp_Object style = Ftool_bar_get_system_style ();
  int both_horiz = EQ (style, Qboth_horiz);
  int text_image = EQ (style, Qtext_image_horiz);

  GtkWidget *vb = both_horiz || text_image
    ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0);
  GtkWidget *wb = gtk_button_new ();
  GtkWidget *weventbox = gtk_event_box_new ();

      g_signal_connect (wb, "button-release-event",
                        G_CALLBACK (xg_tool_bar_button_cb),
                        NULL);

      g_object_set_data (G_OBJECT (wb), XG_FRAME_DATA, (gpointer)f);

      /* Use enter/leave notify to show help.  We use the events
         rather than the GtkButton specific signals "enter" and
         "leave", so we can have only one callback.  The event
         will tell us what kind of event it is.  */
      /* The EMACS_INT cast avoids a warning. */

      g_signal_connect (G_OBJECT (weventbox),
                        "leave-notify-event",
                        G_CALLBACK (xg_tool_bar_help_callback),
                        (gpointer) (EMACS_INT) i);
    }

  if (wbutton) *wbutton = wb;

  return ti;
}

                               x->handlebox_widget,
                               "position", &pos, NULL);
      if (pos == 0 || (pos == 1 && x->menubar_widget)) nt = req.height;
      else nb = req.height;
    }

  if (nl != FRAME_TOOLBAR_LEFT_WIDTH (f)
      || nr != FRAME_TOOLBAR_RIGHT_WIDTH (f)
      || nt != FRAME_TOOLBAR_TOP_HEIGHT (f)
      || nb != FRAME_TOOLBAR_BOTTOM_HEIGHT (f))
    {

  if (! x->toolbar_widget)
    xg_create_tool_bar (f);

  wtoolbar = GTK_TOOLBAR (x->toolbar_widget);
  dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar));

  for (i = 0; i < f->n_tool_bar_items; ++i)
    {
      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int idx;

    {
      int is_packed = x->handlebox_widget != 0;
      BLOCK_INPUT;
      /* We may have created the toolbar_widget in xg_create_tool_bar, but
         not the x->handlebox_widget which is created in xg_pack_tool_bar.  */
      if (is_packed)
        {
          if (x->toolbar_in_hbox)
            gtk_container_remove (GTK_CONTAINER (x->hbox_widget),
                                  x->handlebox_widget);
          else