#include "atimer.h"
#include "gtkutil.h"
#include "termhooks.h"
+#include "keyboard.h"
+#include "charset.h"
+#include "coding.h"
#include <gdk/gdkkeysyms.h>
+
#define FRAME_TOTAL_PIXEL_HEIGHT(f) \
- (PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
+ (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
+
+\f
+/***********************************************************************
+ Display handling functions
+ ***********************************************************************/
+
+#ifdef HAVE_GTK_MULTIDISPLAY
+
+/* Return the GdkDisplay that corresponds to the X display DPY. */
+static GdkDisplay *
+xg_get_gdk_display (dpy)
+ Display *dpy;
+{
+ return gdk_x11_lookup_xdisplay (dpy);
+}
+
+/* When the GTK widget W is to be created on a display for F that
+ is not the default display, set the display for W.
+ W can be a GtkMenu or a GtkWindow widget. */
+static void
+xg_set_screen (w, f)
+ GtkWidget *w;
+ FRAME_PTR f;
+{
+ if (FRAME_X_DISPLAY (f) != GDK_DISPLAY ())
+ {
+ GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
+ GdkScreen *gscreen = gdk_display_get_default_screen (gdpy);
+
+ if (GTK_IS_MENU (w))
+ gtk_menu_set_screen (GTK_MENU (w), gscreen);
+ else
+ gtk_window_set_screen (GTK_WINDOW (w), gscreen);
+ }
+}
+
+
+#else /* not HAVE_GTK_MULTIDISPLAY */
+
+/* Make some defines so we can use the GTK 2.2 functions when
+ compiling with GTK 2.0. */
+#define xg_set_screen(w, f)
+#define gdk_xid_table_lookup_for_display(dpy, w) gdk_xid_table_lookup (w)
+#define gdk_pixmap_foreign_new_for_display(dpy, p) gdk_pixmap_foreign_new (p)
+#define gdk_cursor_new_for_display(dpy, c) gdk_cursor_new (c)
+#define gdk_x11_lookup_xdisplay(dpy) 0
+#define GdkDisplay void
+
+#endif /* not HAVE_GTK_MULTIDISPLAY */
+
+/* Open a display named by DISPLAY_NAME. The display is returned in *DPY.
+ *DPY is set to NULL if the display can't be opened.
+
+ Returns non-zero if display could be opened, zero if display could not
+ be opened, and less than zero if the GTK version doesn't support
+ multipe displays. */
+int
+xg_display_open (display_name, dpy)
+ char *display_name;
+ Display **dpy;
+{
+#ifdef HAVE_GTK_MULTIDISPLAY
+ GdkDisplay *gdpy;
+
+ gdpy = gdk_display_open (display_name);
+ *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL;
+
+ return gdpy != NULL;
+
+#else /* not HAVE_GTK_MULTIDISPLAY */
+
+ return -1;
+#endif /* not HAVE_GTK_MULTIDISPLAY */
+}
+
+
+void
+xg_display_close (Display *dpy)
+{
+#ifdef HAVE_GTK_MULTIDISPLAY
+ GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy);
+
+ /* GTK 2.2 has a bug that makes gdk_display_close crash (bug
+ http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way
+ we can continue running, but there will be memory leaks. */
+
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4
+
+ /* If this is the default display, we must change it before calling
+ dispose, otherwise it will crash. */
+ if (gdk_display_get_default () == gdpy)
+ {
+ struct x_display_info *dpyinfo;
+ Display *new_dpy = 0;
+ GdkDisplay *gdpy_new;
+
+ /* Find another display. */
+ for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
+ if (dpyinfo->display != dpy)
+ {
+ new_dpy = dpyinfo->display;
+ break;
+ }
+
+ if (! new_dpy) return; /* Emacs will exit anyway. */
+
+ gdpy_new = gdk_x11_lookup_xdisplay (new_dpy);
+ gdk_display_manager_set_default_display (gdk_display_manager_get (),
+ gdpy_new);
+ }
+
+ g_object_run_dispose (G_OBJECT (gdpy));
+
+#else
+ /* I hope this will be fixed in GTK 2.4. It is what bug 85715 says. */
+ gdk_display_close (gdpy);
+#endif
+#endif /* HAVE_GTK_MULTIDISPLAY */
+}
+
\f
/***********************************************************************
Utility functions
NULL if no timer is started. */
static struct atimer *xg_timer;
-/* The cursor used for scroll bars and popup menus.
- We only have one cursor for all scroll bars and all popup menus. */
-static GdkCursor *xg_left_ptr_cursor;
-
/* The next two variables and functions are taken from lwlib. */
static widget_value *widget_value_free_list;
}
}
-/* Set *CURSOR on W and all widgets W contain. We must do like this
- for scroll bars and menu because they create widgets internally,
- and it is those widgets that are visible.
- If *CURSOR is NULL, create a GDK_LEFT_PTR cursor and set *CURSOR to
- the created cursor. */
-void
+/* Create and return the cursor to be used for popup menus and
+ scroll bars on display DPY. */
+GdkCursor *
+xg_create_default_cursor (dpy)
+ Display *dpy;
+{
+ GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy);
+ return gdk_cursor_new_for_display (gdpy, GDK_LEFT_PTR);
+}
+
+/* For the image defined in IMG, make and return a GdkPixmap for
+ the pixmap in *GPIX, and a GdkBitmap for the mask in *GMASK.
+ If IMG has no mask, *GMASK is set to NULL.
+ The image is defined on the display where frame F is. */
+static void
+xg_get_gdk_pixmap_and_mask (f, img, gpix, gmask)
+ FRAME_PTR f;
+ struct image *img;
+ GdkPixmap **gpix;
+ GdkBitmap **gmask;
+{
+ GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
+
+ *gpix = gdk_pixmap_foreign_new_for_display (gdpy, img->pixmap);
+ *gmask = img->mask ?
+ (GdkBitmap*) gdk_pixmap_foreign_new_for_display (gdpy, img->mask)
+ : 0;
+}
+
+
+/* Set CURSOR on W and all widgets W contain. We must do like this
+ for scroll bars and menu because they create widgets internally,
+ and it is those widgets that are visible. */
+static void
xg_set_cursor (w, cursor)
GtkWidget *w;
- GdkCursor **cursor;
+ GdkCursor *cursor;
{
GList *children = gdk_window_peek_children (w->window);
- /* Create the cursor unless already created. */
- if (! *cursor)
- *cursor = gdk_cursor_new (GDK_LEFT_PTR);
-
- gdk_window_set_cursor (w->window, *cursor);
+ gdk_window_set_cursor (w->window, cursor);
/* The scroll bar widget has more than one GDK window (had to look at
the source to figure this out), and there is no way to set cursor
Ditto for menus. */
for ( ; children; children = g_list_next (children))
- gdk_window_set_cursor (GDK_WINDOW (children->data), *cursor);
+ gdk_window_set_cursor (GDK_WINDOW (children->data), cursor);
}
/* Timer function called when a timeout occurs for xg_timer.
/* Start the xg_timer with an interval of 0.1 seconds, if not already started.
xg_process_timeouts is called when the timer expires. The timer
- stared is continuous, i.e. runs until xg_stop_timer is called. */
+ started is continuous, i.e. runs until xg_stop_timer is called. */
static void
xg_start_timer ()
{
xg_list_insert (xg_list_node *list, xg_list_node *node)
{
xg_list_node *list_start = list->next;
-
+
if (list_start) list_start->prev = node;
node->next = list_start;
node->prev = 0;
char *str;
{
char *utf8_str = str;
-
+
/* If not UTF-8, try current locale. */
if (str && !g_utf8_validate (str, -1, NULL))
utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0);
xg_set_geometry (f)
FRAME_PTR f;
{
- if (f->output_data.x->size_hint_flags & USPosition)
+ if (f->size_hint_flags & USPosition)
{
- int left = f->output_data.x->left_pos;
- int xneg = f->output_data.x->size_hint_flags & XNegative;
- int top = f->output_data.x->top_pos;
- int yneg = f->output_data.x->size_hint_flags & YNegative;
+ int left = f->left_pos;
+ int xneg = f->size_hint_flags & XNegative;
+ int top = f->top_pos;
+ int yneg = f->size_hint_flags & YNegative;
char geom_str[32];
-
+
if (xneg)
left = -left;
if (yneg)
top = -top;
sprintf (geom_str, "=%dx%d%c%d%c%d",
- PIXEL_WIDTH (f),
+ FRAME_PIXEL_WIDTH (f),
FRAME_TOTAL_PIXEL_HEIGHT (f),
(xneg ? '-' : '+'), left,
(yneg ? '-' : '+'), top);
}
}
-
+
/* Resize the outer window of frame F after chainging the height.
This happend when the menu bar or the tool bar is added or removed.
COLUMNS/ROWS is the size the edit area shall have after the resize. */
int rows;
{
gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
- PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
+ FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f));
/* base_height is now changed. */
x_wm_set_size_hint (f, 0, 0);
gdk_window_process_all_updates ();
}
+/* This gets called after the frame F has been cleared. Since that is
+ done with X calls, we need to redraw GTK widget (scroll bars). */
+void
+xg_frame_cleared (f)
+ FRAME_PTR f;
+{
+ GtkWidget *w = f->output_data.x->widget;
+
+ if (w)
+ {
+ gtk_container_set_reallocate_redraws (GTK_CONTAINER (w), TRUE);
+ gtk_container_foreach (GTK_CONTAINER (w),
+ (GtkCallback) gtk_widget_queue_draw,
+ 0);
+ gdk_window_process_all_updates ();
+ }
+}
+
/* Function to handle resize of our widgets. Since Emacs has some layouts
that does not fit well with GTK standard containers, we do most layout
manually.
{
int mbheight = FRAME_MENUBAR_HEIGHT (f);
int tbheight = FRAME_TOOLBAR_HEIGHT (f);
- int rows = PIXEL_TO_CHAR_HEIGHT (f, pixelheight - mbheight - tbheight);
- int columns = PIXEL_TO_CHAR_WIDTH (f, pixelwidth);
-
+ int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight
+ - mbheight - tbheight));
+ int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
+
if (FRAME_GTK_WIDGET (f)
- && (columns != FRAME_WIDTH (f) || rows != FRAME_HEIGHT (f)
- || pixelwidth != PIXEL_WIDTH (f) || pixelheight != PIXEL_HEIGHT (f)))
+ && (columns != FRAME_COLS (f) || rows != FRAME_LINES (f)
+ || pixelwidth != FRAME_PIXEL_WIDTH (f) || pixelheight != FRAME_PIXEL_HEIGHT (f)))
{
struct x_output *x = f->output_data.x;
GtkAllocation all;
all.height = pixelheight - mbheight - tbheight;
gtk_widget_size_allocate (x->edit_widget, &all);
- gdk_window_process_all_updates ();
change_frame_size (f, rows, columns, 0, 1, 0);
SET_FRAME_GARBAGED (f);
int cols;
int rows;
{
- int pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows)
+ int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
+ FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
- int pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);
-
+ int pixelwidth;
+
/* Take into account the size of the scroll bar. Always use the
number of columns occupied by the scroll bar here otherwise we
might end up with a frame width that is not a multiple of the
frame's character width which is bad for vertically split
windows. */
- f->output_data.x->vertical_scroll_bar_extra
- = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
- ? 0
- : (FRAME_SCROLL_BAR_COLS (f)
- * FONT_WIDTH (f->output_data.x->font)));
+ f->scroll_bar_actual_width
+ = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f);
+
+ compute_fringe_widths (f, 0);
- x_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);
/* Must resize our top level widget. Font size may have changed,
but not rows/cols. */
gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
pixelwidth, pixelheight);
xg_resize_widgets (f, pixelwidth, pixelheight);
+ x_wm_set_size_hint (f, 0, 0);
+ SET_FRAME_GARBAGED (f);
+ cancel_mouse_face (f);
}
-/* Convert an X Window WSESC to its corresponding GtkWidget.
+/* Convert an X Window WSESC on display DPY to its corresponding GtkWidget.
Must be done like this, because GtkWidget:s can have "hidden"
X Window that aren't accessible.
Return 0 if no widget match WDESC. */
GtkWidget *
-xg_win_to_widget (wdesc)
+xg_win_to_widget (dpy, wdesc)
+ Display *dpy;
Window wdesc;
{
gpointer gdkwin;
GtkWidget *gwdesc = 0;
BLOCK_INPUT;
- gdkwin = gdk_xid_table_lookup (wdesc);
+
+ gdkwin = gdk_xid_table_lookup_for_display (gdk_x11_lookup_xdisplay (dpy),
+ wdesc);
if (gdkwin)
{
GdkEvent event;
event.any.window = gdkwin;
gwdesc = gtk_get_event_widget (&event);
}
-
+
UNBLOCK_INPUT;
return gwdesc;
}
gdk_colormap_query_color (map, pixel, c);
}
+/* Turning off double buffering for our GtkFixed widget has the side
+ effect of turning it off also for its children (scroll bars).
+ But we want those to be double buffered to not flicker so handle
+ expose manually here.
+ WIDGET is the GtkFixed widget that gets exposed.
+ EVENT is the expose event.
+ USER_DATA is unused.
+
+ Return TRUE to tell GTK that this expose event has been fully handeled
+ and that GTK shall do nothing more with it. */
+static gboolean
+xg_fixed_handle_expose (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer user_data)
+{
+ GList *iter;
+
+ for (iter = GTK_FIXED (widget)->children; iter; iter = g_list_next (iter))
+ {
+ GtkFixedChild *child_data = (GtkFixedChild *) iter->data;
+ GtkWidget *child = child_data->widget;
+ GdkWindow *window = child->window;
+ GdkRegion *region = gtk_widget_region_intersect (child, event->region);
+
+ if (! gdk_region_empty (region))
+ {
+ GdkEvent child_event;
+ child_event.expose = *event;
+ child_event.expose.region = region;
+
+ /* Turn on double buffering, i.e. draw to an off screen area. */
+ gdk_window_begin_paint_region (window, region);
+
+ /* Tell child to redraw itself. */
+ gdk_region_get_clipbox (region, &child_event.expose.area);
+ gtk_widget_send_expose (child, &child_event);
+ gdk_window_process_updates (window, TRUE);
+
+ /* Copy off screen area to the window. */
+ gdk_window_end_paint (window);
+ }
+
+ gdk_region_destroy (region);
+ }
+
+ return TRUE;
+}
+
/* Create and set up the GTK widgets for frame F.
Return 0 if creation failed, non-zero otherwise. */
int
GtkRcStyle *style;
int i;
char *title = 0;
-
+
BLOCK_INPUT;
wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ xg_set_screen (wtop, f);
+
wvbox = gtk_vbox_new (FALSE, 0);
wfixed = gtk_fixed_new (); /* Must have this to place scroll bars */
-
+
if (! wtop || ! wvbox || ! wfixed)
{
if (wtop) gtk_widget_destroy (wtop);
gtk_widget_set_name (wfixed, SDATA (Vx_resource_name));
/* If this frame has a title or name, set it in the title bar. */
- if (! NILP (f->title)) title = SDATA (f->title);
- else if (! NILP (f->name)) title = SDATA (f->name);
+ if (! NILP (f->title)) title = SDATA (ENCODE_UTF_8 (f->title));
+ else if (! NILP (f->name)) title = SDATA (ENCODE_UTF_8 (f->name));
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;
gtk_fixed_set_has_window (GTK_FIXED (wfixed), TRUE);
- gtk_widget_set_size_request (wfixed,
- PIXEL_WIDTH (f),
- PIXEL_HEIGHT (f));
-
+ gtk_widget_set_size_request (wfixed, FRAME_PIXEL_WIDTH (f),
+ FRAME_PIXEL_HEIGHT (f));
+
gtk_container_add (GTK_CONTAINER (wtop), wvbox);
gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0);
later on when tool bar items are added. */
if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0)
FRAME_TOOLBAR_HEIGHT (f) = 34;
-
- gtk_widget_set_double_buffered (wvbox, FALSE);
+
+
+ /* We don't want this widget double buffered, because we draw on it
+ with regular X drawing primitives, so from a GTK/GDK point of
+ view, the widget is totally blank. When an expose comes, this
+ will make the widget blank, and then Emacs redraws it. This flickers
+ a lot, so we turn off double buffering. */
gtk_widget_set_double_buffered (wfixed, FALSE);
- gtk_widget_set_double_buffered (wtop, FALSE);
-
+
+ /* Turning off double buffering above has the side effect of turning
+ it off also for its children (scroll bars). But we want those
+ to be double buffered to not flicker so handle expose manually. */
+ g_signal_connect (G_OBJECT (wfixed), "expose-event",
+ G_CALLBACK (xg_fixed_handle_expose), 0);
+
/* GTK documents says use gtk_window_set_resizable. But then a user
can't shrink the window from its starting size. */
gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE);
GTK is to destroy the widget. We want Emacs to do that instead. */
g_signal_connect (G_OBJECT (wtop), "delete-event",
G_CALLBACK (gtk_true), 0);
-
+
/* Convert our geometry parameters into a geometry string
and specify it.
GTK will itself handle calculating the real position this way. */
/* Must use g_strdup because gtk_widget_modify_style does g_free. */
style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>");
gtk_widget_modify_style (wfixed, style);
-
+
/* GTK does not set any border, and they look bad with GTK. */
- f->output_data.x->border_width = 0;
- f->output_data.x->internal_border_width = 0;
+ f->border_width = 0;
+ f->internal_border_width = 0;
UNBLOCK_INPUT;
gint hint_flags = 0;
int base_width, base_height;
int min_rows = 0, min_cols = 0;
- int win_gravity = f->output_data.x->win_gravity;
-
+ int win_gravity = f->win_gravity;
+
if (flags)
{
memset (&size_hints, 0, sizeof (size_hints));
f->output_data.x->hint_flags = hint_flags;
}
else
- flags = f->output_data.x->size_hint_flags;
-
+ flags = f->size_hint_flags;
+
size_hints = f->output_data.x->size_hints;
hint_flags = f->output_data.x->hint_flags;
hint_flags |= GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE;
- size_hints.width_inc = FONT_WIDTH (f->output_data.x->font);
- size_hints.height_inc = f->output_data.x->line_height;
+ size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
+ size_hints.height_inc = FRAME_LINE_HEIGHT (f);
hint_flags |= GDK_HINT_BASE_SIZE;
- base_width = CHAR_TO_PIXEL_WIDTH (f, 0);
- base_height = CHAR_TO_PIXEL_HEIGHT (f, 0)
+ base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
+ 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);
size_hints.min_width = base_width + min_cols * size_hints.width_inc;
size_hints.min_height = base_height + min_rows * size_hints.height_inc;
-
+
/* These currently have a one to one mapping with the X values, but I
don't think we should rely on that. */
hint_flags |= GDK_HINT_WIN_GRAVITY;
get_dialog_title (char key)
{
char *title = "";
-
+
switch (key) {
case 'E': case 'e':
title = "Error";
g_signal_connect (G_OBJECT (wdialog), "delete-event",
G_CALLBACK (dialog_delete_callback), 0);
-
+
if (deactivate_cb)
{
g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0);
GtkWidget *w;
GtkRequisition req;
- if (strcmp (item->name, "message") == 0)
+ if (item->name && strcmp (item->name, "message") == 0)
{
/* This is the text part of the dialog. */
w = gtk_label_new (utf8_label);
gtk_widget_size_request (w, &req);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (wdialog)->vbox),
req.height);
- if (strlen (item->value) > 0)
+ if (item->value && strlen (item->value) > 0)
button_spacing = 2*req.width/strlen (item->value);
}
else
{
/* This is one button to add to the dialog. */
- w = gtk_button_new_with_mnemonic (utf8_label);
+ w = gtk_button_new_with_label (utf8_label);
if (! item->enabled)
gtk_widget_set_sensitive (w, FALSE);
if (select_cb)
GtkFileSelection *filesel;
int filesel_done = XG_FILE_NOT_DONE;
char *fn = 0;
-
+
filewin = gtk_file_selection_new (prompt);
filesel = GTK_FILE_SELECTION (filewin);
+ xg_set_screen (filewin, f);
+
gtk_widget_set_name (filewin, "emacs-filedialog");
gtk_window_set_transient_for (GTK_WINDOW (filewin),
gtk_file_selection_hide_fileop_buttons (filesel);
}
-
+
gtk_widget_show_all (filewin);
-
+
while (filesel_done == XG_FILE_NOT_DONE)
gtk_main_iteration ();
The menu bar and all sub menus under the menu bar in a frame
share the same structure, hence the reference count.
-
+
Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly
allocated xg_menu_cb_data if CL_DATA is NULL. */
static xg_menu_cb_data *
xg_list_node *iter;
for (iter = xg_menu_cb_list.next; iter; iter = iter->next)
- mark_object (&((xg_menu_cb_data *) iter)->menu_bar_vector);
+ mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector);
for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next)
{
xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter;
if (! NILP (cb_data->help))
- mark_object (&cb_data->help);
+ mark_object (cb_data->help);
}
}
{
xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data;
gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : client_data;
-
+
if (! NILP (data->help) && data->cl_data->highlight_cb)
{
GtkCallback func = (GtkCallback) data->cl_data->highlight_cb;
GtkWidget *wlbl;
GtkWidget *wkey;
GtkWidget *wbox;
-
+
wbox = gtk_hbox_new (FALSE, 0);
- wlbl = gtk_label_new_with_mnemonic (utf8_label);
+ wlbl = gtk_label_new (utf8_label);
wkey = gtk_label_new (utf8_key);
gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (wkey), 0.0, 0.5);
-
+
gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0);
gtk_widget_set_name (wlbl, MENU_ITEM_NAME);
gtk_widget_set_name (wkey, MENU_ITEM_NAME);
+ gtk_widget_set_name (wbox, MENU_ITEM_NAME);
return wbox;
}
UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally).
UTF8_KEY is the text representing the key binding.
ITEM is the widget_value describing the menu item.
-
+
GROUP is an in/out parameter. If the menu item to be created is not
part of any radio menu group, *GROUP contains NULL on entry and exit.
If the menu item to be created is part of a radio menu group, on entry
{
GtkWidget *w;
GtkWidget *wtoadd = 0;
-
+
+ /* It has been observed that some menu items have a NULL name field.
+ This will lead to this function being called with a NULL utf8_label.
+ GTK crashes on that so we set a blank label. Why there is a NULL
+ name remains to be investigated. */
+ if (! utf8_label) utf8_label = " ";
+
if (utf8_key)
wtoadd = make_widget_for_menu_item (utf8_label, utf8_key);
-
+
if (item->button_type == BUTTON_TYPE_TOGGLE)
{
*group = NULL;
if (utf8_key) w = gtk_check_menu_item_new ();
- else w = gtk_check_menu_item_new_with_mnemonic (utf8_label);
+ else w = gtk_check_menu_item_new_with_label (utf8_label);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected);
}
else if (item->button_type == BUTTON_TYPE_RADIO)
{
if (utf8_key) w = gtk_radio_menu_item_new (*group);
- else w = gtk_radio_menu_item_new_with_mnemonic (*group, utf8_label);
+ else w = gtk_radio_menu_item_new_with_label (*group, utf8_label);
*group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w));
if (item->selected)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE);
{
*group = NULL;
if (utf8_key) w = gtk_menu_item_new ();
- else w = gtk_menu_item_new_with_mnemonic (utf8_label);
+ else w = gtk_menu_item_new_with_label (utf8_label);
}
-
+
if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd);
if (! item->enabled) gtk_widget_set_sensitive (w, FALSE);
return w;
}
-/* Return non-zero if NAME specifies a separator (GTK only has one
+/* Return non-zero if LABEL specifies a separator (GTK only has one
separator type) */
static int
-xg_separator_p (char *name)
+xg_separator_p (char *label)
{
- return strcmp (name, "--") == 0
- || strcmp (name, "--:") == 0
- || strcmp (name, "---") == 0;
+ if (! label) return 0;
+ else if (strlen (label) > 3
+ && strncmp (label, "--", 2) == 0
+ && label[2] != '-')
+ {
+ static char* separator_names[] = {
+ "space",
+ "no-line",
+ "single-line",
+ "double-line",
+ "single-dashed-line",
+ "double-dashed-line",
+ "shadow-etched-in",
+ "shadow-etched-out",
+ "shadow-etched-in-dash",
+ "shadow-etched-out-dash",
+ "shadow-double-etched-in",
+ "shadow-double-etched-out",
+ "shadow-double-etched-in-dash",
+ "shadow-double-etched-out-dash",
+ 0,
+ };
+
+ int i;
+
+ label += 2;
+ for (i = 0; separator_names[i]; ++i)
+ if (strcmp (label, separator_names[i]) == 0)
+ return 1;
+ }
+ else
+ {
+ /* Old-style separator, maybe. It's a separator if it contains
+ only dashes. */
+ while (*label == '-')
+ ++label;
+ if (*label == 0) return 1;
+ }
+
+ return 0;
}
-GtkWidget *xg_did_tearoff;
+static int xg_detached_menus;
+
+/* Returns non-zero if there are detached menus. */
+int
+xg_have_tear_offs ()
+{
+ return xg_detached_menus > 0;
+}
/* Callback invoked when a detached menu window is removed. Here we
- delete the popup menu.
+ decrease the xg_detached_menus count.
WIDGET is the top level window that is removed (the parent of the menu).
- EVENT is the event that triggers the window removal.
- CLIENT_DATA points to the menu that is detached.
-
- Returns TRUE to tell GTK to stop processing this event. */
-static gboolean
-tearoff_remove (widget, event, client_data)
+ CLIENT_DATA is not used. */
+static void
+tearoff_remove (widget, client_data)
GtkWidget *widget;
- GdkEvent *event;
gpointer client_data;
{
- gtk_widget_destroy (GTK_WIDGET (client_data));
- return TRUE;
+ if (xg_detached_menus > 0) --xg_detached_menus;
}
-/* Callback invoked when a menu is detached. It sets the xg_did_tearoff
- variable.
+/* Callback invoked when a menu is detached. It increases the
+ xg_detached_menus count.
WIDGET is the GtkTearoffMenuItem.
- CLIENT_DATA is not used. */
+ CLIENT_DATA is not used. */
static void
tearoff_activate (widget, client_data)
GtkWidget *widget;
gpointer client_data;
{
GtkWidget *menu = gtk_widget_get_parent (widget);
- if (! gtk_menu_get_tearoff_state (GTK_MENU (menu)))
- return;
-
- xg_did_tearoff = menu;
-}
-
-/* If a detach of a popup menu is done, this function should be called
- to keep the menu around until the detached window is removed.
- MENU is the top level menu for the popup,
- SUBMENU is the menu that got detached (that is MENU or a
- submenu of MENU), see the xg_did_tearoff variable. */
-void
-xg_keep_popup (menu, submenu)
- GtkWidget *menu;
- GtkWidget *submenu;
-{
- GtkWidget *p;
-
- /* Find the top widget for the detached menu. */
- p = gtk_widget_get_toplevel (submenu);
-
- /* Delay destroying the menu until the detached menu is removed. */
- g_signal_connect (G_OBJECT (p), "unmap_event",
- G_CALLBACK (tearoff_remove), menu);
+ if (gtk_menu_get_tearoff_state (GTK_MENU (menu)))
+ {
+ ++xg_detached_menus;
+ g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)),
+ "destroy",
+ G_CALLBACK (tearoff_remove), 0);
+ }
}
-int xg_debug = 0;
/* Create a menu item widget, and connect the callbacks.
ITEM decribes the menu item.
cb_data->help = item->help;
cb_data->cl_data = cl_data;
cb_data->call_data = item->call_data;
-
+
g_signal_connect (G_OBJECT (w),
"destroy",
G_CALLBACK (menuitem_destroy_callback),
return w;
}
+static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback,
+ GCallback, GCallback, int, int, int,
+ GtkWidget *, xg_menu_cb_data *, char *));
+
/* Create a full menu tree specified by DATA.
F is the frame the created menu belongs to.
SELECT_CB is the callback to use when a menu item is selected.
if (! topmenu)
{
- if (! menu_bar_p) wmenu = gtk_menu_new ();
+ if (! menu_bar_p)
+ {
+ wmenu = gtk_menu_new ();
+ xg_set_screen (wmenu, f);
+ }
else wmenu = gtk_menu_bar_new ();
/* Put cl_data on the top menu for easier access. */
g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data);
g_signal_connect (G_OBJECT (wmenu), "destroy",
G_CALLBACK (menu_destroy_callback), cl_data);
-
+
if (name)
gtk_widget_set_name (wmenu, name);
g_signal_connect (G_OBJECT (wmenu),
"grab-notify", G_CALLBACK (menu_grab_callback), 0);
}
-
+
if (! menu_bar_p && add_tearoff_p)
{
GtkWidget *tearoff = gtk_tearoff_menu_item_new ();
for (item = data; item; item = item->next)
{
GtkWidget *w;
-
+
if (pop_up_p && !item->contents && !item->call_data
&& !xg_separator_p (item->name))
{
utf8_label = get_utf8_string (item->name);
gtk_menu_set_title (GTK_MENU (wmenu), utf8_label);
- w = gtk_menu_item_new_with_mnemonic (utf8_label);
+ w = gtk_menu_item_new_with_label (utf8_label);
gtk_widget_set_sensitive (w, FALSE);
if (utf8_label && utf8_label != item->name) g_free (utf8_label);
}
highlight_cb,
0,
0,
- 1,
+ add_tearoff_p,
0,
cl_data,
0);
GCallback highlight_cb;
{
GtkWidget *w = 0;
+ int menu_bar_p = strcmp (type, "menubar") == 0;
+ int pop_up_p = strcmp (type, "popup") == 0;
+
if (strcmp (type, "dialog") == 0)
{
w = create_dialog (val, select_cb, deactivate_cb);
+ xg_set_screen (w, f);
gtk_window_set_transient_for (GTK_WINDOW (w),
GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE);
-
- if (w)
- gtk_widget_set_name (w, "emacs-dialog");
+ gtk_widget_set_name (w, "emacs-dialog");
}
- else if (strcmp (type, "menubar") == 0 || strcmp (type, "popup") == 0)
+ else if (menu_bar_p || pop_up_p)
{
w = create_menus (val->contents,
f,
select_cb,
deactivate_cb,
highlight_cb,
- strcmp (type, "popup") == 0,
- strcmp (type, "menubar") == 0,
- 1,
+ pop_up_p,
+ menu_bar_p,
+ menu_bar_p,
0,
0,
name);
/* Set the cursor to an arrow for popup menus when they are mapped.
This is done by default for menu bar menus. */
- if (strcmp (type, "popup") == 0)
+ if (pop_up_p)
{
/* Must realize so the GdkWindow inside the widget is created. */
gtk_widget_realize (w);
- xg_set_cursor (w, &xg_left_ptr_cursor);
+ xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
}
}
else
return w;
}
+/* Return the label for menu item WITEM. */
static const char *
xg_get_menu_item_label (witem)
GtkMenuItem *witem;
return gtk_label_get_label (wlabel);
}
+/* Return non-zero if the menu item WITEM has the text LABEL. */
static int
xg_item_label_same_p (witem, label)
GtkMenuItem *witem;
char *label;
{
- int is_same;
+ int is_same = 0;
char *utf8_label = get_utf8_string (label);
-
- is_same = strcmp (utf8_label, xg_get_menu_item_label (witem)) == 0;
- if (utf8_label != label) g_free (utf8_label);
+ const char *old_label = witem ? xg_get_menu_item_label (witem) : 0;
+
+ if (! old_label && ! utf8_label)
+ is_same = 1;
+ else if (old_label && utf8_label)
+ is_same = strcmp (utf8_label, old_label) == 0;
+
+ if (utf8_label && utf8_label != label) g_free (utf8_label);
return is_same;
}
GtkWidget *wcont;
GList *list;
{
- /* We must copy list because gtk_container_remove changes it. */
- GList *clist = g_list_copy (list);
GList *iter;
- for (iter = clist; iter; iter = g_list_next (iter))
+ for (iter = list; iter; iter = g_list_next (iter))
{
GtkWidget *w = GTK_WIDGET (iter->data);
/* Add a ref to w so we can explicitly destroy it later. */
gtk_widget_ref (w);
gtk_container_remove (GTK_CONTAINER (wcont), w);
-
+
/* If there is a menu under this widget that has been detached,
there is a reference to it, and just removing w from the
container does not destroy the submenu. By explicitly
removing the detached window also if there was one. */
gtk_widget_destroy (w);
}
- g_list_free (clist);
}
/* Update the top level names in MENUBAR (i.e. not submenus).
F is the frame the menu bar belongs to.
- LIST is a list with the current menu bar names (menu item widgets).
+ *LIST is a list with the current menu bar names (menu item widgets).
+ ITER is the item within *LIST that shall be updated.
+ POS is the numerical position, starting at 0, of ITER in *LIST.
VAL describes what the menu bar shall look like after the update.
SELECT_CB is the callback to use when a menu item is selected.
HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
+ CL_DATA points to the callback data to be used for this menu bar.
This function calls itself to walk through the menu bar names. */
static void
-xg_update_menubar (menubar, f, list, val, select_cb, highlight_cb, cl_data)
+xg_update_menubar (menubar, f, list, iter, pos, val,
+ select_cb, highlight_cb, cl_data)
GtkWidget *menubar;
FRAME_PTR f;
- GList *list;
+ GList **list;
+ GList *iter;
+ int pos;
widget_value *val;
GCallback select_cb;
GCallback highlight_cb;
xg_menu_cb_data *cl_data;
{
- if (! list && ! val)
+ if (! iter && ! val)
return;
- else if (list && ! val)
+ else if (iter && ! val)
{
- /* Item(s) have been removed. Remove all remaining items from list. */
- remove_from_container (menubar, list);
+ /* Item(s) have been removed. Remove all remaining items. */
+ remove_from_container (menubar, iter);
/* All updated. */
val = 0;
- list = 0;
+ iter = 0;
}
- else if (! list && val)
+ else if (! iter && val)
{
/* Item(s) added. Add all new items in one call. */
create_menus (val, f, select_cb, 0, highlight_cb,
/* All updated. */
val = 0;
- list = 0;
+ iter = 0;
}
- /* Below this neither list or val is NULL */
- else if (xg_item_label_same_p (GTK_MENU_ITEM (list->data), val->name))
+ /* Below this neither iter or val is NULL */
+ else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name))
{
/* This item is still the same, check next item. */
val = val->next;
- list = g_list_next (list);
+ iter = g_list_next (iter);
+ ++pos;
}
else /* This item is changed. */
{
- GtkMenuItem *witem = GTK_MENU_ITEM (list->data);
+ GtkMenuItem *witem = GTK_MENU_ITEM (iter->data);
GtkMenuItem *witem2 = 0;
- int pos = 0;
int val_in_menubar = 0;
- int list_in_new_menubar = 0;
- GList *list2;
- GList *iter;
+ int iter_in_new_menubar = 0;
+ GList *iter2;
widget_value *cur;
-
- /* Get position number for witem. */
- list2 = gtk_container_get_children (GTK_CONTAINER (menubar));
- for (iter = list2; iter; iter = g_list_next (iter))
- {
- if (list->data == iter->data) break;
- ++pos;
- }
-
/* See if the changed entry (val) is present later in the menu bar */
- for (iter = g_list_next (list);
- iter && ! val_in_menubar;
- iter = g_list_next (iter))
+ for (iter2 = iter;
+ iter2 && ! val_in_menubar;
+ iter2 = g_list_next (iter2))
{
- witem2 = GTK_MENU_ITEM (iter->data);
+ witem2 = GTK_MENU_ITEM (iter2->data);
val_in_menubar = xg_item_label_same_p (witem2, val->name);
}
- /* See if the current entry (list) is present later in the
+ /* See if the current entry (iter) is present later in the
specification for the new menu bar. */
- for (cur = val; cur && ! list_in_new_menubar; cur = cur->next)
- list_in_new_menubar = xg_item_label_same_p (witem, cur->name);
+ for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next)
+ iter_in_new_menubar = xg_item_label_same_p (witem, cur->name);
- if (val_in_menubar && ! list_in_new_menubar)
+ if (val_in_menubar && ! iter_in_new_menubar)
{
+ int nr = pos;
+
/* This corresponds to:
Current: A B C
New: A C
Remove B. */
-
+
gtk_widget_ref (GTK_WIDGET (witem));
gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem));
gtk_widget_destroy (GTK_WIDGET (witem));
/* Must get new list since the old changed. */
- list = gtk_container_get_children (GTK_CONTAINER (menubar));
- while (pos-- > 0) list = g_list_next (list);
+ g_list_free (*list);
+ *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
+ while (nr-- > 0) iter = g_list_next (iter);
}
- else if (! val_in_menubar && ! list_in_new_menubar)
+ else if (! val_in_menubar && ! iter_in_new_menubar)
{
/* This corresponds to:
Current: A B C
is up to date when leaving the minibuffer. */
GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
char *utf8_label = get_utf8_string (val->name);
-
- gtk_label_set_text_with_mnemonic (wlabel, utf8_label);
+ GtkWidget *submenu = gtk_menu_item_get_submenu (witem);
+
+ gtk_label_set_text (wlabel, utf8_label);
- list = g_list_next (list);
+ /* If this item has a submenu that has been detached, change
+ the title in the WM decorations also. */
+ if (submenu && gtk_menu_get_tearoff_state (GTK_MENU (submenu)))
+ /* Set the title of the detached window. */
+ gtk_menu_set_title (GTK_MENU (submenu), utf8_label);
+
+ iter = g_list_next (iter);
val = val->next;
+ ++pos;
}
- else if (! val_in_menubar && list_in_new_menubar)
+ else if (! val_in_menubar && iter_in_new_menubar)
{
/* This corresponds to:
Current: A B C
New: A X B C
Insert X. */
+ int nr = pos;
GList *group = 0;
GtkWidget *w = xg_create_one_menuitem (val,
f,
gtk_widget_set_name (w, MENU_ITEM_NAME);
gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos);
- list = gtk_container_get_children (GTK_CONTAINER (menubar));
- while (pos-- > 0) list = g_list_next (list);
- list = g_list_next (list);
+ g_list_free (*list);
+ *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
+ while (nr-- > 0) iter = g_list_next (iter);
+ iter = g_list_next (iter);
val = val->next;
+ ++pos;
}
- else /* if (val_in_menubar && list_in_new_menubar) */
+ else /* if (val_in_menubar && iter_in_new_menubar) */
{
+ int nr = pos;
/* This corresponds to:
Current: A B C
New: A C B
GTK_WIDGET (witem2), pos);
gtk_widget_unref (GTK_WIDGET (witem2));
+ g_list_free (*list);
+ *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
+ while (nr-- > 0) iter = g_list_next (iter);
val = val->next;
- list = gtk_container_get_children (GTK_CONTAINER (menubar));
- while (pos-- > 0) list = g_list_next (list);
- list = g_list_next (list);
+ ++pos;
}
-
}
/* Update the rest of the menu bar. */
- xg_update_menubar (menubar, f, list, val, select_cb, highlight_cb, cl_data);
+ xg_update_menubar (menubar, f, list, iter, pos, val,
+ select_cb, highlight_cb, cl_data);
}
/* Update the menu item W so it corresponds to VAL.
GtkLabel *wkey = 0;
char *utf8_label;
char *utf8_key;
+ const char *old_label = 0;
+ const char *old_key = 0;
xg_menu_item_cb_data *cb_data;
-
- wchild = gtk_bin_get_child (GTK_BIN (w));
+
+ wchild = gtk_bin_get_child (GTK_BIN (w));
utf8_label = get_utf8_string (val->name);
utf8_key = get_utf8_string (val->key);
wlbl = GTK_LABEL (list->data);
wkey = GTK_LABEL (list->next->data);
+ g_list_free (list);
+
if (! utf8_key)
{
/* Remove the key and keep just the label. */
gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (wlbl));
wkey = 0;
}
+
}
else /* Just a label. */
{
{
GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key);
GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd));
+
wlbl = GTK_LABEL (list->data);
wkey = GTK_LABEL (list->next->data);
+ g_list_free (list);
gtk_container_remove (GTK_CONTAINER (w), wchild);
gtk_container_add (GTK_CONTAINER (w), wtoadd);
}
}
- if (utf8_key && strcmp (utf8_key, gtk_label_get_label (wkey)) != 0)
+
+ if (wkey) old_key = gtk_label_get_label (wkey);
+ if (wlbl) old_label = gtk_label_get_label (wlbl);
+
+ if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0))
gtk_label_set_text (wkey, utf8_key);
- if (strcmp (utf8_label, gtk_label_get_label (wlbl)) != 0)
- gtk_label_set_text_with_mnemonic (wlbl, utf8_label);
+ if (! old_label || strcmp (utf8_label, old_label) != 0)
+ gtk_label_set_text (wlbl, utf8_label);
+
+ if (utf8_key && utf8_key != val->key) g_free (utf8_key);
+ if (utf8_label && utf8_label != val->name) g_free (utf8_label);
- if (utf8_key != val->key) g_free (utf8_key);
- if (utf8_label != val->name) g_free (utf8_label);
-
if (! val->enabled && GTK_WIDGET_SENSITIVE (w))
gtk_widget_set_sensitive (w, FALSE);
else if (val->enabled && ! GTK_WIDGET_SENSITIVE (w))
cb_data->call_data = val->call_data;
cb_data->help = val->help;
cb_data->cl_data = cl_data;
-
+
/* We assume the callback functions don't change. */
if (val->call_data && ! val->contents)
{
widget_value *cur;
int has_tearoff_p = 0;
GList *first_radio = 0;
-
+
if (submenu)
list = gtk_container_get_children (GTK_CONTAINER (submenu));
-
+
for (cur = val, iter = list;
cur && iter;
iter = g_list_next (iter), cur = cur->next)
if (cur && first_radio) remove_from_container (submenu, first_radio);
else remove_from_container (submenu, iter);
}
-
+
if (cur)
{
/* More items added. Create them. */
cl_data,
0);
}
-
+
+ if (list) g_list_free (list);
+
return newsub;
}
{
xg_menu_cb_data *cl_data;
GList *list = gtk_container_get_children (GTK_CONTAINER (menubar));
- GList *iter;
if (! list) return;
-
+
cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar),
XG_FRAME_DATA);
- if (! deep_p)
- {
- widget_value *cur = val->contents;
- xg_update_menubar (menubar, f, list, cur,
- select_cb, highlight_cb, cl_data);
- }
- else
+ xg_update_menubar (menubar, f, &list, list, 0, val->contents,
+ select_cb, highlight_cb, cl_data);
+
+ if (deep_p);
{
widget_value *cur;
/* Update all sub menus.
- We must keep the submenu names (GTK menu item widgets) since the
+ We must keep the submenus (GTK menu item widgets) since the
X Window in the XEvent that activates the menu are those widgets. */
/* Update cl_data, menu_item things in F may have changed. */
for (cur = val->contents; cur; cur = cur->next)
{
+ GList *iter;
GtkWidget *sub = 0;
GtkWidget *newsub;
GtkMenuItem *witem;
break;
}
}
-
+
newsub = xg_update_submenu (sub,
f,
cur->contents,
a new menu bar item, it has no sub menu yet. So we set the
newly created sub menu under witem. */
if (newsub != sub)
- gtk_menu_item_set_submenu (witem, newsub);
-
+ {
+ xg_set_screen (newsub, f);
+ gtk_menu_item_set_submenu (witem, newsub);
+ }
}
}
+ g_list_free (list);
gtk_widget_show_all (menubar);
}
{
struct x_output *x = f->output_data.x;
GtkRequisition req;
-
+
if (!x->menubar_widget || GTK_WIDGET_MAPPED (x->menubar_widget))
return 0;
/* The height has changed, resize outer widget and set columns
rows to what we had before adding the menu bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
-
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
+
SET_FRAME_GARBAGED (f);
UNBLOCK_INPUT;
+
+ return 1;
}
/* Get rid of the menu bar of frame F, and free its storage.
/* The height has changed, resize outer widget and set columns
rows to what we had before removing the menu bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
SET_FRAME_GARBAGED (f);
UNBLOCK_INPUT;
to indicate that callback should do nothing. */
int xg_ignore_gtk_scrollbar;
-/* After we send a scroll bar event, x_set_toolkit_scroll_bar_thumb will
- be called. For some reason that needs to be debugged, it gets called
- with bad values. Thus, we set this variable to ignore those calls. */
-int xg_ignore_next_thumb;
-
/* SET_SCROLL_BAR_X_WINDOW assumes the second argument fits in
32 bits. But we want to store pointers, and they may be larger
than 32 bits. Keep a mapping from integer index to widget pointers
return 0;
}
+/* Return the scrollbar id for X Window WID on display DPY.
+ Return -1 if WID not in id_to_widget. */
+int
+xg_get_scroll_id_for_window (dpy, wid)
+ Display *dpy;
+ Window wid;
+{
+ int idx;
+ GtkWidget *w;
+
+ w = xg_win_to_widget (dpy, wid);
+
+ if (w)
+ {
+ for (idx = 0; idx < id_to_widget.max_size; ++idx)
+ if (id_to_widget.widgets[idx] == w)
+ return idx;
+ }
+
+ return -1;
+}
+
/* Callback invoked when scroll bar WIDGET is destroyed.
DATA is the index into id_to_widget for WIDGET.
- We free pointer to last scroll bar value here and remove the index. */
+ We free pointer to last scroll bar values here and remove the index. */
static void
xg_gtk_scroll_destroy (widget, data)
GtkWidget *widget;
{
gpointer p;
int id = (int)data;
-
+
p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
if (p) xfree (p);
xg_remove_widget_from_map (id);
/* Callback for button press/release events. Used to start timer so that
the scroll bar repetition timer in GTK gets handeled.
+ Also, sets bar->dragging to Qnil when dragging (button release) is done.
WIDGET is the scroll bar widget the event is for (not used).
EVENT contains the event.
- USER_DATA is 0 (not used).
+ USER_DATA points to the struct scrollbar structure.
Returns FALSE to tell GTK that it shall continue propagate the event
to widgets. */
{
if (event->type == GDK_BUTTON_PRESS && ! xg_timer)
xg_start_timer ();
- else if (event->type == GDK_BUTTON_RELEASE && xg_timer)
- xg_stop_timer ();
-
+ else if (event->type == GDK_BUTTON_RELEASE)
+ {
+ struct scroll_bar *bar = (struct scroll_bar *) user_data;
+ if (xg_timer) xg_stop_timer ();
+ bar->dragging = Qnil;
+ }
+
return FALSE;
}
GtkWidget *wscroll;
GtkObject *vadj;
int scroll_id;
-
+
/* Page, step increment values are not so important here, they
will be corrected in x_set_toolkit_scroll_bar_thumb. */
vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX,
wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj));
gtk_widget_set_name (wscroll, scroll_bar_name);
gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS);
-
+
scroll_id = xg_store_widget_in_map (wscroll);
-
- g_signal_connect (G_OBJECT (vadj),
+
+ g_signal_connect (G_OBJECT (wscroll),
"value-changed",
scroll_callback,
- (gpointer)bar);
+ (gpointer) bar);
g_signal_connect (G_OBJECT (wscroll),
"destroy",
G_CALLBACK (xg_gtk_scroll_destroy),
- (gpointer)scroll_id);
+ (gpointer) scroll_id);
/* Connect to button press and button release to detect if any scroll bar
has the pointer. */
g_signal_connect (G_OBJECT (wscroll),
"button-press-event",
G_CALLBACK (scroll_bar_button_cb),
- (gpointer)1);
+ (gpointer) bar);
g_signal_connect (G_OBJECT (wscroll),
"button-release-event",
G_CALLBACK (scroll_bar_button_cb),
- 0);
-
+ (gpointer) bar);
+
gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget),
- wscroll, 0, 0);
+ wscroll, -1, -1);
/* Set the cursor to an arrow. */
- xg_set_cursor (wscroll, &xg_left_ptr_cursor);
+ xg_set_cursor (wscroll, FRAME_X_DISPLAY_INFO (f)->xg_cursor);
SET_SCROLL_BAR_X_WINDOW (bar, scroll_id);
}
}
}
+/* Find left/top for widget W in GtkFixed widget WFIXED. */
+static void
+xg_find_top_left_in_fixed (w, wfixed, left, top)
+ GtkWidget *w, *wfixed;
+ int *left, *top;
+{
+ GList *iter;
+
+ for (iter = GTK_FIXED (wfixed)->children; iter; iter = g_list_next (iter))
+ {
+ GtkFixedChild *child = (GtkFixedChild *) iter->data;
+
+ if (child->widget == w)
+ {
+ *left = child->x;
+ *top = child->y;
+ return;
+ }
+ }
+
+ /* Shall never end up here. */
+ abort ();
+}
/* Update the position of the vertical scroll bar represented by SCROLLBAR_ID
in frame F.
TOP/LEFT are the new pixel positions where the bar shall appear.
WIDTH, HEIGHT is the size in pixels the bar shall have. */
void
-xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height)
+xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height,
+ real_left, canon_width)
FRAME_PTR f;
int scrollbar_id;
int top;
int width;
int height;
{
- GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id);
- if (wscroll)
- {
- int gheight = max (height, 1);
+ GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id);
- gtk_fixed_move (GTK_FIXED (f->output_data.x->edit_widget),
- wscroll, left, top);
+ if (wscroll)
+ {
+ GtkWidget *wfixed = f->output_data.x->edit_widget;
+ int winextra = canon_width > width ? (canon_width - width) / 2 : 0;
+ int bottom = top + height;
+
+ gint slider_width;
+ int oldtop, oldleft, oldbottom;
+ GtkRequisition req;
- gtk_widget_set_size_request (wscroll, width, gheight);
+ /* Get old values. */
+ xg_find_top_left_in_fixed (wscroll, wfixed, &oldleft, &oldtop);
+ gtk_widget_size_request (wscroll, &req);
+ oldbottom = oldtop + req.height;
+
+ /* Scroll bars in GTK has a fixed width, so if we say width 16, it
+ will only be its fixed width (14 is default) anyway, the rest is
+ blank. We are drawing the mode line across scroll bars when
+ the frame is split:
+ |bar| |fringe|
+ ----------------
+ mode line
+ ----------------
+ |bar| |fringe|
+
+ When we "unsplit" the frame:
+
+ |bar| |fringe|
+ -| |-| |
+ m¦ |i| |
+ -| |-| |
+ | | | |
+
+
+ the remains of the mode line can be seen in these blank spaces.
+ So we must clear them explicitly.
+ GTK scroll bars should do that, but they don't.
+ Also, the canonical width may be wider than the width for the
+ scroll bar so that there is some space (typically 1 pixel) between
+ the scroll bar and the edge of the window and between the scroll
+ bar and the fringe. */
+
+ if (oldtop != -1 && oldleft != -1)
+ {
+ int gtkextral, gtkextrah;
+ int xl, xr, wbl, wbr;
+ int bottomdiff, topdiff;
+
+ gtk_widget_style_get (wscroll, "slider_width", &slider_width, NULL);
+ gtkextral = width > slider_width ? (width - slider_width) / 2 : 0;
+ gtkextrah = gtkextral ? (width - slider_width - gtkextral) : 0;
+
+ xl = real_left;
+ wbl = gtkextral + winextra;
+ wbr = gtkextrah + winextra;
+ xr = left + gtkextral + slider_width;
+ bottomdiff = abs (oldbottom - bottom);
+ topdiff = abs (oldtop - top);
+
+ if (oldleft != left)
+ {
+ gdk_window_clear_area (wfixed->window, xl, top, wbl, height);
+ gdk_window_clear_area (wfixed->window, xr, top, wbr, height);
+ }
- /* Must force out update so wscroll gets the resize.
- Otherwise, the gdk_window_clear clears the old window size. */
- gdk_window_process_all_updates ();
+ if (oldtop > top)
+ {
+ gdk_window_clear_area (wfixed->window, xl, top, wbl, topdiff);
+ gdk_window_clear_area (wfixed->window, xr, top, wbr, topdiff);
+ }
+ else if (oldtop < top)
+ {
+ gdk_window_clear_area (wfixed->window, xl, oldtop, wbl, topdiff);
+ gdk_window_clear_area (wfixed->window, xr, oldtop, wbr, topdiff);
+ }
- /* The scroll bar doesn't explicitly redraw the whole window
- when a resize occurs. Since the scroll bar seems to be fixed
- in width it doesn't fill the space reserved, so we must clear
- the whole window. */
- gdk_window_clear (wscroll->window);
+ if (oldbottom > bottom)
+ {
+ gdk_window_clear_area (wfixed->window, xl, bottom, wbl,
+ bottomdiff);
+ gdk_window_clear_area (wfixed->window, xr, bottom, wbr,
+ bottomdiff);
+ }
+ else if (oldbottom < bottom)
+ {
+ gdk_window_clear_area (wfixed->window, xl, oldbottom, wbl,
+ bottomdiff);
+ gdk_window_clear_area (wfixed->window, xr, oldbottom, wbr,
+ bottomdiff);
+ }
+ }
- /* Since we are not using a pure gtk event loop, we must force out
- pending update events with this call. */
- gdk_window_process_all_updates ();
+ /* Move and resize to new values. */
+ gtk_fixed_move (GTK_FIXED (wfixed), wscroll, left, top);
+ gtk_widget_set_size_request (wscroll, width, height);
+
+ /* Must force out update so changed scroll bars gets redrawn. */
+ gdk_window_process_all_updates ();
- SET_FRAME_GARBAGED (f);
- cancel_mouse_face (f);
- }
+ SET_FRAME_GARBAGED (f);
+ cancel_mouse_face (f);
+ }
}
/* Set the thumb size and position of scroll bar BAR. We are currently
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
- BLOCK_INPUT;
- if (wscroll && ! xg_ignore_next_thumb)
+ if (wscroll && NILP (bar->dragging))
{
GtkAdjustment *adj;
gdouble shown;
gdouble top;
int size, value;
-
+ int new_step;
+ int changed = 0;
+
adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
+ /* We do the same as for MOTIF in xterm.c, assume 30 chars per line
+ rather than the real portion value. This makes the thumb less likely
+ to resize and that looks better. */
+ portion = WINDOW_TOTAL_LINES (XWINDOW (bar->window)) * 30;
+ /* When the thumb is at the bottom, position == whole.
+ So we need to increase `whole' to make space for the thumb. */
+ whole += portion;
+
if (whole <= 0)
top = 0, shown = 1;
else
{
- shown = (gdouble) portion / whole;
top = (gdouble) position / whole;
+ shown = (gdouble) portion / whole;
}
- size = shown * whole;
- size = min (size, whole);
+ size = shown * XG_SB_RANGE;
+ size = min (size, XG_SB_RANGE);
size = max (size, 1);
- value = top * whole;
- value = min (value, whole - size);
+ value = top * XG_SB_RANGE;
+ value = min (value, XG_SB_MAX - size);
value = max (value, XG_SB_MIN);
- adj->upper = max (whole, size);
- adj->page_size = (int)size;
+ /* Assume all lines are of equal size. */
+ new_step = size / max (1, FRAME_LINES (f));
- /* Assume a page increment is about 95% of the page size */
- adj->page_increment = (int) (0.95*adj->page_size);
+ if ((int) adj->page_size != size
+ || (int) adj->step_increment != new_step)
+ {
+ adj->page_size = size;
+ adj->step_increment = new_step;
+ /* Assume a page increment is about 95% of the page size */
+ adj->page_increment = (int) (0.95*adj->page_size);
+ changed = 1;
+ }
- /* Assume all lines are equal. */
- adj->step_increment = portion / max (1, FRAME_HEIGHT (f));
+ if (changed || (int) gtk_range_get_value (GTK_RANGE (wscroll)) != value)
+ {
+ GtkWidget *wfixed = f->output_data.x->edit_widget;
- /* gtk_range_set_value invokes the callback. Set
- ignore_gtk_scrollbar to make the callback do nothing */
- xg_ignore_gtk_scrollbar = 1;
- gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value);
- xg_ignore_gtk_scrollbar = 0;
- }
+ BLOCK_INPUT;
- /* Make sure the scroll bar is redrawn with new thumb */
- gtk_widget_queue_draw (wscroll);
- gdk_window_process_all_updates ();
- xg_ignore_next_thumb = 0;
- UNBLOCK_INPUT;
+ /* gtk_range_set_value invokes the callback. Set
+ ignore_gtk_scrollbar to make the callback do nothing */
+ xg_ignore_gtk_scrollbar = 1;
+
+ if ((int) gtk_range_get_value (GTK_RANGE (wscroll)) != value)
+ gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value);
+ else if (changed)
+ gtk_adjustment_changed (adj);
+
+ xg_ignore_gtk_scrollbar = 0;
+
+ UNBLOCK_INPUT;
+ }
+ }
}
\f
FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
Lisp_Object key, frame;
struct input_event event;
+ EVENT_INIT (event);
if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
return;
idx *= TOOL_BAR_ITEM_NSLOTS;
-
+
key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
XSETFRAME (frame, f);
event.kind = TOOL_BAR_EVENT;
/* The height has changed, resize outer widget and set columns
rows to what we had before detaching the tool bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
}
}
/* The height has changed, resize outer widget and set columns
rows to what we had before detaching the tool bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
}
}
}
if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
- return;
+ return FALSE;
if (event->type == GDK_ENTER_NOTIFY)
{
}
+/* This callback is called when a tool bar item shall be redrawn.
+ It modifies the expose event so that the GtkImage widget redraws the
+ whole image. This to overcome a bug that makes GtkImage draw the image
+ in the wrong place when it tries to redraw just a part of the image.
+ W is the GtkImage to be redrawn.
+ EVENT is the expose event for W.
+ CLIENT_DATA is unused.
+
+ Returns FALSE to tell GTK to keep processing this event. */
+static gboolean
+xg_tool_bar_item_expose_callback (w, event, client_data)
+ GtkWidget *w;
+ GdkEventExpose *event;
+ gpointer client_data;
+{
+ gint width, height;
+
+ gdk_drawable_get_size (event->window, &width, &height);
+
+ event->area.x -= width > event->area.width ? width-event->area.width : 0;
+ event->area.y -= height > event->area.height ? height-event->area.height : 0;
+
+ event->area.x = max (0, event->area.x);
+ event->area.y = max (0, event->area.y);
+
+ event->area.width = max (width, event->area.width);
+ event->area.height = max (height, event->area.height);
+
+ return FALSE;
+}
+
+/* This callback is called when a tool bar shall be redrawn.
+ We need to update the tool bar from here in case the image cache
+ has deleted the pixmaps used in the tool bar.
+ W is the GtkToolbar to be redrawn.
+ EVENT is the expose event for W.
+ CLIENT_DATA is pointing to the frame for this tool bar.
+
+ Returns FALSE to tell GTK to keep processing this event. */
+static gboolean
+xg_tool_bar_expose_callback (w, event, client_data)
+ GtkWidget *w;
+ GdkEventExpose *event;
+ gpointer client_data;
+{
+ update_frame_tool_bar ((FRAME_PTR) client_data);
+ return FALSE;
+}
+
static void
xg_create_tool_bar (f)
FRAME_PTR f;
x->handlebox_widget = gtk_handle_box_new ();
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_set_name (x->toolbar_widget, "emacs-toolbar");
+
+ /* We only have icons, so override any user setting. We could
+ use the caption property of the toolbar item (see update_frame_tool_bar
+ below), but some of those strings are long, making the toolbar so
+ long it does not fit on the screen. The GtkToolbar widget makes every
+ item equal size, so the longest caption determine the size of every
+ tool bar item. I think the creators of the GtkToolbar widget
+ counted on 4 or 5 character long strings. */
+ gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
+ gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget),
+ GTK_ORIENTATION_HORIZONTAL);
+
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);
+ g_signal_connect (G_OBJECT (x->toolbar_widget),
+ "expose-event",
+ G_CALLBACK (xg_tool_bar_expose_callback),
+ f);
gtk_widget_show_all (x->handlebox_widget);
gtk_widget_size_request (x->toolbar_widget, &req);
FRAME_TOOLBAR_HEIGHT (f) = req.height;
-
+
/* The height has changed, resize outer widget and set columns
rows to what we had before adding the tool bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
-
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
+
SET_FRAME_GARBAGED (f);
}
int i;
GtkRequisition old_req, new_req;
GList *icon_list;
+ GList *iter;
struct x_output *x = f->output_data.x;
if (! FRAME_GTK_WIDGET (f))
return;
BLOCK_INPUT;
-
+
if (! x->toolbar_widget)
xg_create_tool_bar (f);
gtk_widget_size_request (x->toolbar_widget, &old_req);
icon_list = gtk_container_get_children (GTK_CONTAINER (x->toolbar_widget));
+ iter = icon_list;
for (i = 0; i < f->n_tool_bar_items; ++i)
{
int img_id;
struct image *img;
Lisp_Object image;
- GtkWidget *wicon = icon_list ? GTK_WIDGET (icon_list->data) : 0;
+ GtkWidget *wicon = iter ? GTK_WIDGET (iter->data) : 0;
- if (icon_list) icon_list = g_list_next (icon_list);
+ if (iter) iter = g_list_next (iter);
/* If image is a vector, choose the image according to the
button state. */
img_id = lookup_image (f, image);
img = IMAGE_FROM_ID (f, img_id);
+ prepare_image_for_display (f, img);
+
+ if (img->load_failed_p || img->pixmap == None)
+ {
+ if (wicon) gtk_widget_hide (wicon);
+ continue;
+ }
if (! wicon)
{
- GdkPixmap *gpix = gdk_pixmap_foreign_new (img->pixmap);
- GdkBitmap *gmask = img->mask ?
- (GdkBitmap*) gdk_pixmap_foreign_new (img->mask) : 0;
+ GdkPixmap *gpix;
+ GdkBitmap *gmask;
+ GtkWidget *w;
- GtkWidget *w = gtk_image_new_from_pixmap (gpix, gmask);
+ xg_get_gdk_pixmap_and_mask (f, img, &gpix, &gmask);
+ w = gtk_image_new_from_pixmap (gpix, gmask);
gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
0, 0, 0,
w,
GTK_SIGNAL_FUNC (xg_tool_bar_callback),
(gpointer)i);
-
+
/* Save the image so we can see if an update is needed when
this function is called again. */
g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA,
- (gpointer)img);
+ (gpointer)img->pixmap);
+
+ /* Catch expose events to overcome an annoying redraw bug, see
+ comment for xg_tool_bar_item_expose_callback. */
+ g_signal_connect (G_OBJECT (w),
+ "expose-event",
+ G_CALLBACK (xg_tool_bar_item_expose_callback),
+ 0);
/* We must set sensitive on the button that is the parent
of the GtkImage parent. Go upwards until we find the button. */
while (! GTK_IS_BUTTON (w))
w = gtk_widget_get_parent (w);
-
+
if (w)
{
/* Save the frame in the button so the xg_tool_bar_callback
/* The child of the tool bar is a button. Inside that button
is a vbox. Inside that vbox is the GtkImage. */
GtkWidget *wvbox = gtk_bin_get_child (GTK_BIN (wicon));
- GList *ch = gtk_container_get_children (GTK_CONTAINER (wvbox));
- GtkImage *wimage = GTK_IMAGE (ch->data);
- struct image *old_img = g_object_get_data (G_OBJECT (wimage),
- XG_TOOL_BAR_IMAGE_DATA);
-
- if (! old_img
- || old_img->pixmap != img->pixmap
- || old_img->mask != img->mask)
+ GList *chlist = gtk_container_get_children (GTK_CONTAINER (wvbox));
+ GtkImage *wimage = GTK_IMAGE (chlist->data);
+ Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
+ XG_TOOL_BAR_IMAGE_DATA);
+ g_list_free (chlist);
+
+ if (old_img != img->pixmap)
{
- GdkPixmap *gpix = gdk_pixmap_foreign_new (img->pixmap);
- GdkBitmap *gmask = img->mask ?
- (GdkBitmap*) gdk_pixmap_foreign_new (img->mask) : 0;
+ GdkPixmap *gpix;
+ GdkBitmap *gmask;
+ xg_get_gdk_pixmap_and_mask (f, img, &gpix, &gmask);
gtk_image_set_from_pixmap (wimage, gpix, gmask);
}
g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
- (gpointer)img);
+ (gpointer)img->pixmap);
gtk_widget_set_sensitive (wicon, enabled_p);
gtk_widget_show (wicon);
}
-
+
#undef PROP
}
/* Remove buttons not longer needed. We just hide them so they
can be reused later on. */
- while (icon_list)
+ while (iter)
{
- GtkWidget *w = GTK_WIDGET (icon_list->data);
+ GtkWidget *w = GTK_WIDGET (iter->data);
gtk_widget_hide (w);
- icon_list = g_list_next (icon_list);
+ iter = g_list_next (iter);
}
gtk_widget_size_request (x->toolbar_widget, &new_req);
if (old_req.height != new_req.height)
{
FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
}
- /* Must force out update so changed images gets redrawn. */
- gdk_window_process_all_updates ();
+ if (icon_list) g_list_free (icon_list);
UNBLOCK_INPUT;
}
if (x->toolbar_widget)
{
- fprintf(stderr, "Remove toolbar\n");
BLOCK_INPUT;
gtk_container_remove (GTK_CONTAINER (x->vbox_widget),
x->handlebox_widget);
/* The height has changed, resize outer widget and set columns
rows to what we had before removing the tool bar. */
- xg_resize_outer_widget (f, FRAME_WIDTH (f), FRAME_HEIGHT (f));
+ xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
SET_FRAME_GARBAGED (f);
UNBLOCK_INPUT;
xg_initialize ()
{
xg_ignore_gtk_scrollbar = 0;
- xg_ignore_next_thumb = 0;
- xg_left_ptr_cursor = 0;
- xg_did_tearoff = 0;
-
+ xg_detached_menus = 0;
xg_menu_cb_list.prev = xg_menu_cb_list.next =
xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0;
}
#endif /* USE_GTK */
+
+/* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3
+ (do not change this comment) */