vim: src/gui_gtk_x11.c comparison

comparison src/gui_gtk_x11.c @ 856:8cd729851562 v7.0g

updated for version 7.0g

author	vimboss
date	Sun, 30 Apr 2006 18:54:39 +0000
parents	e73f2978bd40
children	b933657f7c9d

comparison

equal deleted inserted replaced

-:d2a4f08396fe
+:8cd729851562
 if (blink_state == BLINK_NONE)
 	gui_mch_start_blink();
 /* make sure keyboard input goes to the draw area (if this is focus for a window) */
 if (widget != gui.drawarea)
-gtk_widget_grab_focus(gui.drawarea);
+	gtk_widget_grab_focus(gui.drawarea);
 return TRUE;
 }
 /*ARGSUSED*/
 #ifdef FEAT_GUI_GNOME
 if (using_gnome && widget != NULL)
 {
 # ifdef HAVE_GTK2
-GtkWidget *parent;
+	GtkWidget *parent;
 	BonoboDockItem *dockitem;
 	parent	 = gtk_widget_get_parent(widget);
-if (G_TYPE_FROM_INSTANCE(parent) == BONOBO_TYPE_DOCK_ITEM)
+	if (G_TYPE_FROM_INSTANCE(parent) == BONOBO_TYPE_DOCK_ITEM)
-{
+	{
-/* Only menu & toolbar are dock items.  Could tabline be?
+	    /* Only menu & toolbar are dock items.  Could tabline be?
-* Seem to be only the 2 defined in GNOME */
+	     * Seem to be only the 2 defined in GNOME */
-widget = parent;
+	    widget = parent;
-dockitem = BONOBO_DOCK_ITEM(widget);
+	    dockitem = BONOBO_DOCK_ITEM(widget);
-if (dockitem == NULL || dockitem->is_floating)
+	    if (dockitem == NULL || dockitem->is_floating)
-return 0;
+		return 0;
-item_orientation = bonobo_dock_item_get_orientation(dockitem);
+	    item_orientation = bonobo_dock_item_get_orientation(dockitem);
-}
+	}
 # else
 	GnomeDockItem *dockitem;
 	widget	 = widget->parent;
 	dockitem = GNOME_DOCK_ITEM(widget);
 * values have been used (those that dictate our initial size)
 * Let forced (i.e., correct) values thruogh always.
 */
 if (!(force_width && force_height)  &&  init_window_hints_state > 0)
 {
-/* Don't do it! */
+	/* Don't do it! */
-init_window_hints_state = 2;
+	init_window_hints_state = 2;
-return;
+	return;
 }
 /* This also needs to be done when the main window isn't there yet,
 * otherwise the hints don't work. */
 width  = gui_get_base_width();
 * we wish to be instead of the legitimate minimum so that we actually
 * resize correctly.
 */
 if (force_width && force_height)
 {
-min_width  = force_width;
+	min_width  = force_width;
-min_height = force_height;
+	min_height = force_height;
 }
 else
 {
-min_width  = width  + MIN_COLUMNS * gui.char_width;
+	min_width  = width  + MIN_COLUMNS * gui.char_width;
-min_height = height + MIN_LINES   * gui.char_height;
+	min_height = height + MIN_LINES   * gui.char_height;
 }
 /* Avoid an expose event when the size didn't change. */
 if (width != old_width
 	    || height != old_height
-|| min_width != old_min_width
+	    || min_width != old_min_width
 	    || min_height != old_min_height
 	    || gui.char_width != old_char_width
 	    || gui.char_height != old_char_height)
 {
 	GdkGeometry	geometry;
 	geometry.width_inc   = gui.char_width;
 	geometry.height_inc  = gui.char_height;
 	geometry.base_width  = width;
 	geometry.base_height = height;
-geometry.min_width   = min_width;
+	geometry.min_width   = min_width;
-geometry.min_height  = min_height;
+	geometry.min_height  = min_height;
 	geometry_mask	     = GDK_HINT_BASE_SIZE|GDK_HINT_RESIZE_INC
 			       |GDK_HINT_MIN_SIZE;
 # ifdef HAVE_GTK2
 	/* Using gui.formwin as geometry widget doesn't work as expected
 	 * with GTK+ 2 -- dunno why.  Presumably all the resizing hacks
 				      &geometry, geometry_mask);
 # else
 	gtk_window_set_geometry_hints(GTK_WINDOW(gui.mainwin), gui.formwin,
 				      &geometry, geometry_mask);
 # endif
-old_width       = width;
+	old_width       = width;
-old_height      = height;
+	old_height      = height;
-old_min_width   = min_width;
+	old_min_width   = min_width;
-old_min_height  = min_height;
+	old_min_height  = min_height;
-old_char_width  = gui.char_width;
+	old_char_width  = gui.char_width;
-old_char_height = gui.char_height;
+	old_char_height = gui.char_height;
 }
 }
 #ifdef FEAT_TOOLBAR
 /* Remove any old labels. */
 while (gtk_notebook_get_nth_page(GTK_NOTEBOOK(gui.tabline), nr) != NULL)
 	gtk_notebook_remove_page(GTK_NOTEBOOK(gui.tabline), nr);
 if (gtk_notebook_current_page(GTK_NOTEBOOK(gui.tabline)) != curtabidx)
-gtk_notebook_set_page(GTK_NOTEBOOK(gui.tabline), curtabidx);
+	gtk_notebook_set_page(GTK_NOTEBOOK(gui.tabline), curtabidx);
 /* Make sure everything is in place before drawing text. */
 gui_mch_update();
 ignore_tabline_evt = FALSE;
 if (gui.tabline == NULL)
 	return;
 ignore_tabline_evt = TRUE;
 if (gtk_notebook_current_page(GTK_NOTEBOOK(gui.tabline)) != nr - 1)
-gtk_notebook_set_page(GTK_NOTEBOOK(gui.tabline), nr - 1);
+	gtk_notebook_set_page(GTK_NOTEBOOK(gui.tabline), nr - 1);
 ignore_tabline_evt = FALSE;
 }
 #endif /* FEAT_GUI_TABLINE */
 gtk_tooltips_enable(GTK_TOOLTIPS(tabline_tooltip));
 {
 	GtkWidget *page, *label, *event_box;
-/* Add the first tab. */
+	/* Add the first tab. */
 	page = gtk_vbox_new(FALSE, 0);
 	gtk_widget_show(page);
 	gtk_container_add(GTK_CONTAINER(gui.tabline), page);
 	label = gtk_label_new("-Empty-");
 	gtk_widget_show(label);
 	gtk_misc_set_padding(GTK_MISC(label), 2, 2);
 	gtk_container_add(GTK_CONTAINER(event_box), label);
 	gtk_notebook_set_tab_label(GTK_NOTEBOOK(gui.tabline), page, event_box);
 }
 gtk_signal_connect(GTK_OBJECT(gui.tabline), "switch_page",
-GTK_SIGNAL_FUNC(on_select_tab), NULL);
+		       GTK_SIGNAL_FUNC(on_select_tab), NULL);
 /* Create a popup menu for the tab line and connect it. */
 tabline_menu = create_tabline_menu();
 gtk_signal_connect_object(GTK_OBJECT(gui.tabline), "button_press_event",
-GTK_SIGNAL_FUNC(on_tabline_menu), GTK_OBJECT(tabline_menu));
+	    GTK_SIGNAL_FUNC(on_tabline_menu), GTK_OBJECT(tabline_menu));
 #endif
 gui.formwin = gtk_form_new();
 gtk_container_border_width(GTK_CONTAINER(gui.formwin), 0);
 gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK);
 * only its widgets.  Arguably, this could be common code and we not use
 * the window focus at all, but let's be safe.
 */
 if (gtk_socket_id == 0)
 {
-gtk_signal_connect(GTK_OBJECT(gui.mainwin), "focus_out_event",
+	gtk_signal_connect(GTK_OBJECT(gui.mainwin), "focus_out_event",
-GTK_SIGNAL_FUNC(focus_out_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_out_event), NULL);
-gtk_signal_connect(GTK_OBJECT(gui.mainwin), "focus_in_event",
+	gtk_signal_connect(GTK_OBJECT(gui.mainwin), "focus_in_event",
-GTK_SIGNAL_FUNC(focus_in_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_in_event), NULL);
 }
 else
 {
-gtk_signal_connect(GTK_OBJECT(gui.drawarea), "focus_out_event",
+	gtk_signal_connect(GTK_OBJECT(gui.drawarea), "focus_out_event",
-GTK_SIGNAL_FUNC(focus_out_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_out_event), NULL);
-gtk_signal_connect(GTK_OBJECT(gui.drawarea), "focus_in_event",
+	gtk_signal_connect(GTK_OBJECT(gui.drawarea), "focus_in_event",
-GTK_SIGNAL_FUNC(focus_in_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_in_event), NULL);
 #ifdef FEAT_GUI_TABLINE
-gtk_signal_connect(GTK_OBJECT(gui.tabline), "focus_out_event",
+	gtk_signal_connect(GTK_OBJECT(gui.tabline), "focus_out_event",
-GTK_SIGNAL_FUNC(focus_out_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_out_event), NULL);
-gtk_signal_connect(GTK_OBJECT(gui.tabline), "focus_in_event",
+	gtk_signal_connect(GTK_OBJECT(gui.tabline), "focus_in_event",
-GTK_SIGNAL_FUNC(focus_in_event), NULL);
+			       GTK_SIGNAL_FUNC(focus_in_event), NULL);
 #endif /* FEAT_GUI_TABLINE */
 }
 gtk_signal_connect(GTK_OBJECT(gui.drawarea), "motion_notify_event",
 		       GTK_SIGNAL_FUNC(motion_notify_event), NULL);
 /* When in a GtkPlug, we can't guarantee valid heights (as a round
 * no. of char-heights), so we have to manually sanitise them.
 * Widths seem to sort themselves out, don't ask me why.
 */
 if (gtk_socket_id != 0)
-usable_height -= (gui.char_height - (gui.char_height/2)); /* sic. */
+	usable_height -= (gui.char_height - (gui.char_height/2)); /* sic. */
 gtk_form_freeze(GTK_FORM(gui.formwin));
 gui_resize_shell(event->width, usable_height);
 gtk_form_thaw(GTK_FORM(gui.formwin));
 static gboolean
 check_startup_plug_hints(gpointer data)
 {
 if (init_window_hints_state == 1)
 {
-/* Safe to use normal hints now */
+	/* Safe to use normal hints now */
-init_window_hints_state = 0;
+	init_window_hints_state = 0;
-update_window_manager_hints(0, 0);
+	update_window_manager_hints(0, 0);
-return FALSE;   /* stop timer */
+	return FALSE;   /* stop timer */
 }
 /* Keep on trying */
 init_window_hints_state = 1;
 return TRUE;
 	    gtk_widget_set_uposition(gui.mainwin, x, y);
 #endif
 	vim_free(gui.geom);
 	gui.geom = NULL;
-/* From now until everyone's stopped trying to set the window hints
+	/* From now until everyone's stopped trying to set the window hints
-* to their correct minimum values, stop them being set as we need
+	 * to their correct minimum values, stop them being set as we need
-* them to remain at our required size for the parent GtkSocket to
+	 * them to remain at our required size for the parent GtkSocket to
-* give us the right initial size.
+	 * give us the right initial size.
-*/
+	 */
 	if (gtk_socket_id != 0  &&  (mask & WidthValue || mask & HeightValue))
-{
+	{
-guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
+	    guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
-guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
+	    guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
 #ifdef HAVE_GTK2
-pixel_width  += get_menu_tool_width();
+	    pixel_width  += get_menu_tool_width();
-pixel_height += get_menu_tool_height();
+	    pixel_height += get_menu_tool_height();
 #endif
-update_window_manager_hints(pixel_width, pixel_height);
+	    update_window_manager_hints(pixel_width, pixel_height);
-init_window_hints_state = 1;
+	    init_window_hints_state = 1;
-g_timeout_add(1000, check_startup_plug_hints, NULL);
+	    g_timeout_add(1000, check_startup_plug_hints, NULL);
-}
+	}
 }
 gtk_form_set_size(GTK_FORM(gui.formwin),
 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
 update_window_manager_hints(0, 0);
 #else  /* HAVE_GTK2 */
 /* this will cause the proper resizement to happen too */
 if (gtk_socket_id == 0)
-update_window_manager_hints(0, 0);
+	update_window_manager_hints(0, 0);
 /* With GTK+ 2, changing the size of the form widget doesn't resize
 * the window.  So let's do it the other way around and resize the
 * main window instead. */
 width  += get_menu_tool_width();
 height += get_menu_tool_height();
 if (gtk_socket_id == 0)
-gtk_window_resize(GTK_WINDOW(gui.mainwin), width, height);
+	gtk_window_resize(GTK_WINDOW(gui.mainwin), width, height);
 else
-update_window_manager_hints(width, height);
+	update_window_manager_hints(width, height);
 #if 0
 if (!resize_idle_installed)
 {
 	g_idle_add_full(GDK_PRIORITY_EVENTS + 10,
 }
 }
 # endif /* !HAVE_GTK2 */
 #endif /* FEAT_SIGN_ICONS */

Mercurial > vim

comparison src/gui_gtk_x11.c @ 856:8cd729851562 v7.0g