emacs: src/gtkutil.c comparison

comparison src/gtkutil.c @ 109581:06384b3caebf

Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top. * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left) (menu-bar-showhide-tool-bar-menu-customize-disable) (menu-bar-showhide-tool-bar-menu-customize-enable-right) (menu-bar-showhide-tool-bar-menu-customize-enable-top) (menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions (menu-bar-showhide-tool-bar-menu): If tool bar is moveable, make a menu for Options => toolbar that can move it. * src/frame.c (Qtool_bar_position): New variable. (make_frame): Set tool_bar_position to Qtop. (frame_parms): Add tool-bar-position. (x_report_frame_params): Store tool_bar_position. (x_set_fringe_width): Reset wm size hint after fringe changes. * src/frame.h (struct frame): Add tool_bar_position. (Qbottom): Declare. * src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro. (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth. (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH. (xg_create_frame_widgets): Create a hobox for placing widgets vertically. Use gtk_box_pack_start. (xg_height_or_width_changed): Renamed from xg_height_changed. (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width. (xg_update_frame_menubar, free_frame_menubar): Change to xg_height_or_width_changed. (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar size correctly. Remove hardcoded 4, instead use handlebox size - toolbar size. (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar size correctly. Use handlebox size + toolbar size as additional size. (xg_pack_tool_bar): POS is a new parameter. Set orientation of tool bar based on pos. Only make handlebox_widget if NULL. Check if tool bar goes to vbox or hbox depending on pos. (xg_update_tool_bar_sizes): New function. (update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar height, call xg_update_tool_bar_sizes instead. (free_frame_tool_bar): Remove from hbox or vbox depending on toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero. (xg_change_toolbar_position): New function. * src/gtkutil.h (xg_change_toolbar_position): Declare. * src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT and FRAME_TOOLBAR_LEFT_WIDTH. * src/xfns.c (x_set_tool_bar_position): New function. (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT. (x_frame_parm_handlers): Add x_set_tool_bar_position. (syms_of_xfns): if USE_GTK, provide move-toolbar. * src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth. * src/xterm.h (struct x_output): Add toolbar_top_height, toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove toolbar_height. if USE_GTK: Add hbox_widget and toolbar_in_hbox. (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT) (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros. (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.

author	Jan D. <jan.h.d@swipnet.se>
date	Thu, 29 Jul 2010 18:49:59 +0200
parents	d03bc4a3fced
children	43eca6c9f493

comparison

equal deleted inserted replaced

-:3021343b766a
+:06384b3caebf
 #include <X11/Xft/Xft.h>
 #endif
 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \
 (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
+#define FRAME_TOTAL_PIXEL_WIDTH(f) \
+(FRAME_PIXEL_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f))
 /* Avoid "differ in sign" warnings */
 #define SSDATA(x)  ((char *) SDATA (x))
 #ifndef HAVE_GTK_WIDGET_SET_HAS_WINDOW
 compute_fringe_widths (f, 0);
 /* FRAME_TEXT_COLS_TO_PIXEL_WIDTH uses scroll_bar_actual_width, so call it
 after calculating that value.  */
-pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
+pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols)
++ FRAME_TOOLBAR_WIDTH (f);
 /* Do this before resize, as we don't know yet if we will be resized.  */
 xg_clear_under_internal_border (f);
 FRAME_PIXEL_WIDTH (f) = pixelwidth;
 FRAME_PIXEL_HEIGHT (f) = pixelheight;
 }
 }
-/* Handle height changes (i.e. add/remove menu/toolbar).
+/* Handle height/width changes (i.e. add/remove/move menu/toolbar).
 The policy is to keep the number of editable lines.  */
 static void
-xg_height_changed (FRAME_PTR f)
+xg_height_or_width_changed (FRAME_PTR f)
 {
 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
+FRAME_TOTAL_PIXEL_WIDTH (f),
+FRAME_TOTAL_PIXEL_HEIGHT (f));
 f->output_data.x->hint_flags = 0;
 x_wm_set_size_hint (f, 0, 0);
 }
 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget.
 int
 xg_create_frame_widgets (FRAME_PTR f)
 {
 GtkWidget *wtop;
-GtkWidget *wvbox;
+GtkWidget *wvbox, *whbox;
 GtkWidget *wfixed;
 GdkColor bg;
 GtkRcStyle *style;
 char *title = 0;
 wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 xg_set_screen (wtop, f);
 wvbox = gtk_vbox_new (FALSE, 0);
+whbox = gtk_hbox_new (FALSE, 0);
 wfixed = gtk_fixed_new ();  /* Must have this to place scroll bars  */
-if (! wtop || ! wvbox || ! wfixed)
+if (! wtop || ! wvbox || ! whbox || ! wfixed)
 {
 if (wtop) gtk_widget_destroy (wtop);
 if (wvbox) gtk_widget_destroy (wvbox);
+if (whbox) gtk_widget_destroy (whbox);
 if (wfixed) gtk_widget_destroy (wfixed);
 UNBLOCK_INPUT;
 return 0;
 }
 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);
 FRAME_GTK_OUTER_WIDGET (f) = wtop;
 FRAME_GTK_WIDGET (f) = wfixed;
 f->output_data.x->vbox_widget = wvbox;
+f->output_data.x->hbox_widget = whbox;
 gtk_widget_set_has_window (wfixed, TRUE);
 gtk_container_add (GTK_CONTAINER (wtop), wvbox);
-gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0);
+gtk_box_pack_start (GTK_BOX (wvbox), whbox, TRUE, TRUE, 0);
+gtk_box_pack_start (GTK_BOX (whbox), wfixed, TRUE, TRUE, 0);
 if (FRAME_EXTERNAL_TOOL_BAR (f))
 update_frame_tool_bar (f);
 /* We don't want this widget double buffered, because we draw on it
 hint_flags |= GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE;
 size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
 size_hints.height_inc = FRAME_LINE_HEIGHT (f);
 hint_flags |= GDK_HINT_BASE_SIZE;
-base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
+base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f);
 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0)
 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
 check_frame_size (f, &min_rows, &min_cols);
 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0);
 gtk_widget_show_all (x->menubar_widget);
 gtk_widget_size_request (x->menubar_widget, &req);
 FRAME_MENUBAR_HEIGHT (f) = req.height;
-xg_height_changed (f);
+xg_height_or_width_changed (f);
 UNBLOCK_INPUT;
 return 1;
 }
 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget);
 /* The menubar and its children shall be deleted when removed from
 the container.  */
 x->menubar_widget = 0;
 FRAME_MENUBAR_HEIGHT (f) = 0;
-xg_height_changed (f);
+xg_height_or_width_changed (f);
 UNBLOCK_INPUT;
 }
 }
 int
 g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar,
 		NULL);
 if (f)
 {
+GtkRequisition req, req2;
 FRAME_X_OUTPUT (f)->toolbar_detached = 1;
+gtk_widget_size_request (GTK_WIDGET (wbox), &req);
-/* When detaching a tool bar, not everything dissapear.  There are
+gtk_widget_size_request (w, &req2);
-a few pixels left that are used to drop the tool bar back into
+req.width -= req2.width;
-place.  */
+req.height -= req2.height;
-FRAME_TOOLBAR_HEIGHT (f) = 4;
+if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0)
-xg_height_changed (f);
+FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height;
+else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0)
+FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height;
+else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0)
+FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width;
+else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0)
+FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width;
+xg_height_or_width_changed (f);
 }
 }
 /* This callback is called when a tool bar is reattached.  We must set
 the height of the tool bar when this happens so frame sizes
 FRAME_PTR f = (FRAME_PTR) client_data;
 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL);
 if (f)
 {
-GtkRequisition req;
+GtkRequisition req, req2;
 FRAME_X_OUTPUT (f)->toolbar_detached = 0;
+gtk_widget_size_request (GTK_WIDGET (wbox), &req);
-gtk_widget_size_request (w, &req);
+gtk_widget_size_request (w, &req2);
-FRAME_TOOLBAR_HEIGHT (f) = req.height;
+req.width += req2.width;
-xg_height_changed (f);
+req.height += req2.height;
+if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0)
+FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height;
+else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0)
+FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height;
+else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0)
+FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width;
+else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0)
+FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width;
+xg_height_or_width_changed (f);
 }
 }
 /* This callback is called when the mouse enters or leaves a tool bar item.
 It is used for displaying and hiding the help text.
 event->area.height = max (height, event->area.height);
 return FALSE;
 }
-/* Attach a tool bar to frame F.  */
-static void
-xg_pack_tool_bar (FRAME_PTR f)
-{
-struct x_output *x = f->output_data.x;
-int vbox_pos = x->menubar_widget ? 1 : 0;
-x->handlebox_widget = gtk_handle_box_new ();
-g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached",
-G_CALLBACK (xg_tool_bar_detach_callback), f);
-g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached",
-G_CALLBACK (xg_tool_bar_attach_callback), f);
-gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
-x->toolbar_widget);
-gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget,
-FALSE, FALSE, 0);
-gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget,
-vbox_pos);
-gtk_widget_show (x->toolbar_widget);
-gtk_widget_show (x->handlebox_widget);
-}
-/* Create a tool bar for frame F.  */
 #ifdef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
 #define toolbar_set_orientation(w, o) \
 gtk_orientable_set_orientation (GTK_ORIENTABLE (w), o)
 #else
 #define toolbar_set_orientation(w, o) \
 gtk_toolbar_set_orientation (GTK_TOOLBAR (w), o)
 #endif
+/* Attach a tool bar to frame F.  */
+static void
+xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos)
+{
+struct x_output *x = f->output_data.x;
+int into_hbox = EQ (pos, Qleft) || EQ (pos, Qright);
+toolbar_set_orientation (x->toolbar_widget,
+into_hbox
+? GTK_ORIENTATION_VERTICAL
+: GTK_ORIENTATION_HORIZONTAL);
+if (!x->handlebox_widget)
+{
+x->handlebox_widget = gtk_handle_box_new ();
+g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached",
+G_CALLBACK (xg_tool_bar_detach_callback), f);
+g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached",
+G_CALLBACK (xg_tool_bar_attach_callback), f);
+gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
+x->toolbar_widget);
+}
+if (into_hbox)
+{
+gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget,
+FALSE, FALSE, 0);
+if (EQ (pos, Qleft))
+gtk_box_reorder_child (GTK_BOX (x->hbox_widget),
+x->handlebox_widget,
+0);
+x->toolbar_in_hbox = 1;
+}
+else
+{
+int vbox_pos = x->menubar_widget ? 1 : 0;
+gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget,
+FALSE, FALSE, 0);
+if (EQ (pos, Qtop))
+gtk_box_reorder_child (GTK_BOX (x->vbox_widget),
+x->handlebox_widget,
+vbox_pos);
+x->toolbar_in_hbox = 0;
+}
+}
+/* Create a tool bar for frame F.  */
 static void
 xg_create_tool_bar (FRAME_PTR f)
 {
 struct x_output *x = f->output_data.x;
 gtk_widget_show (GTK_WIDGET (vb));
 gtk_widget_show (GTK_WIDGET (wbutton));
 gtk_widget_show (GTK_WIDGET (ti));
 }
+static int
+xg_update_tool_bar_sizes (FRAME_PTR f)
+{
+struct x_output *x = f->output_data.x;
+GtkRequisition req;
+int nl = 0, nr = 0, nt = 0, nb = 0;
+gtk_widget_size_request (GTK_WIDGET (x->handlebox_widget), &req);
+if (x->toolbar_in_hbox)
+{
+int pos;
+gtk_container_child_get (GTK_CONTAINER (x->hbox_widget),
+x->handlebox_widget,
+"position", &pos, NULL);
+if (pos == 0) nl = req.width;
+else nr = req.width;
+}
+else
+{
+int pos;
+gtk_container_child_get (GTK_CONTAINER (x->vbox_widget),
+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))
+{
+FRAME_TOOLBAR_RIGHT_WIDTH (f) = FRAME_TOOLBAR_LEFT_WIDTH (f)
+= FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0;
+FRAME_TOOLBAR_LEFT_WIDTH (f) = nl;
+FRAME_TOOLBAR_RIGHT_WIDTH (f) = nr;
+FRAME_TOOLBAR_TOP_HEIGHT (f) = nt;
+FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = nb;
+return 1;
+}
+return 0;
+}
 /* Update the tool bar for frame F.  Add new buttons and remove old.  */
 extern Lisp_Object Qx_gtk_map_stock;
 void
 update_frame_tool_bar (FRAME_PTR f)
 {
 int i;
-GtkRequisition old_req, new_req;
 struct x_output *x = f->output_data.x;
 int hmargin = 0, vmargin = 0;
 GtkToolbar *wtoolbar;
 GtkToolItem *ti;
 GtkTextDirection dir;
 if (! x->toolbar_widget)
 xg_create_tool_bar (f);
 wtoolbar = GTK_TOOLBAR (x->toolbar_widget);
-gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req);
 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));
 {
 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i++);
 if (ti) gtk_widget_hide_all (GTK_WIDGET (ti));
 } while (ti != NULL);
-new_req.height = 0;
+if (f->n_tool_bar_items != 0)
-if (pack_tool_bar && f->n_tool_bar_items != 0)
+{
-xg_pack_tool_bar (f);
+if (pack_tool_bar)
+xg_pack_tool_bar (f, f->tool_bar_position);
+gtk_widget_show (x->toolbar_widget);
-gtk_widget_size_request (GTK_WIDGET (wtoolbar), &new_req);
+gtk_widget_show (x->handlebox_widget);
-if (old_req.height != new_req.height
+if (xg_update_tool_bar_sizes (f))
-&& ! FRAME_X_OUTPUT (f)->toolbar_detached)
+xg_height_or_width_changed (f);
-{
+}
-FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
-xg_height_changed (f);
-}
 UNBLOCK_INPUT;
 }
 /* Deallocate all resources for the tool bar on frame F.
 Remove the tool bar.  */
 {
 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)
-gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
+{
-x->handlebox_widget);
+if (x->toolbar_in_hbox)
+gtk_container_remove (GTK_CONTAINER (x->hbox_widget),
+x->handlebox_widget);
+else
+gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
+x->handlebox_widget);
+}
 else
 gtk_widget_destroy (x->toolbar_widget);
 x->toolbar_widget = 0;
 x->handlebox_widget = 0;
-FRAME_TOOLBAR_HEIGHT (f) = 0;
+FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0;
-xg_height_changed (f);
+FRAME_TOOLBAR_LEFT_WIDTH (f) = FRAME_TOOLBAR_RIGHT_WIDTH (f) = 0;
+xg_height_or_width_changed (f);
 UNBLOCK_INPUT;
 }
+}
+int
+xg_change_toolbar_position (FRAME_PTR f, Lisp_Object pos)
+{
+struct x_output *x = f->output_data.x;
+if (! x->toolbar_widget || ! x->handlebox_widget)
+return 1;
+BLOCK_INPUT;
+g_object_ref (x->handlebox_widget);
+if (x->toolbar_in_hbox)
+gtk_container_remove (GTK_CONTAINER (x->hbox_widget),
+x->handlebox_widget);
+else
+gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
+x->handlebox_widget);
+xg_pack_tool_bar (f, pos);
+g_object_unref (x->handlebox_widget);
+if (xg_update_tool_bar_sizes (f))
+xg_height_or_width_changed (f);
+UNBLOCK_INPUT;
+return 1;
 }
 /***********************************************************************

Mercurial > emacs

comparison src/gtkutil.c @ 109581:06384b3caebf