2008-07-01 22:57:50 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
1997-11-24 22:37:52 +00:00
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
2008-06-22 14:28:52 +00:00
|
|
|
#include "config.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtklabel.h"
|
2004-02-26 18:58:26 +00:00
|
|
|
#include "gtkmarshalers.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkradiobutton.h"
|
2005-03-22 02:14:55 +00:00
|
|
|
#include "gtkprivate.h"
|
2002-10-13 23:56:31 +00:00
|
|
|
#include "gtkintl.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gtkradiobutton
|
|
|
|
* @Short_description: A choice from multiple check buttons
|
|
|
|
* @Title: GtkRadioButton
|
|
|
|
* @See_also: #GtkComboBox
|
|
|
|
*
|
|
|
|
* A single radio button performs the same basic function as a #GtkCheckButton,
|
|
|
|
* as its position in the object hierarchy reflects. It is only when multiple
|
|
|
|
* radio buttons are grouped together that they become a different user
|
|
|
|
* interface component in their own right.
|
|
|
|
*
|
|
|
|
* Every radio button is a member of some group of radio buttons. When one is
|
|
|
|
* selected, all other radio buttons in the same group are deselected. A
|
|
|
|
* #GtkRadioButton is one way of giving the user a choice from many options.
|
|
|
|
*
|
|
|
|
* Radio button widgets are created with gtk_radio_button_new(), passing %NULL
|
|
|
|
* as the argument if this is the first radio button in a group. In subsequent
|
|
|
|
* calls, the group you wish to add this button to should be passed as an
|
|
|
|
* argument. Optionally, gtk_radio_button_new_with_label() can be used if you
|
|
|
|
* want a text label on the radio button.
|
|
|
|
*
|
|
|
|
* Alternatively, when adding widgets to an existing group of radio buttons,
|
|
|
|
* use gtk_radio_button_new_from_widget() with a #GtkRadioButton that already
|
|
|
|
* has a group assigned to it. The convenience function
|
|
|
|
* gtk_radio_button_new_with_label_from_widget() is also provided.
|
|
|
|
*
|
|
|
|
* To retrieve the group a #GtkRadioButton is assigned to, use
|
|
|
|
* gtk_radio_button_get_group().
|
|
|
|
*
|
|
|
|
* To remove a #GtkRadioButton from one group and make it part of a new one,
|
|
|
|
* use gtk_radio_button_set_group().
|
|
|
|
*
|
|
|
|
* The group list does not need to be freed, as each #GtkRadioButton will remove
|
|
|
|
* itself and its list item when it is destroyed.
|
|
|
|
*
|
|
|
|
* <example>
|
|
|
|
* <title>How to create a group of two radio buttons.</title>
|
|
|
|
* <programlisting>
|
|
|
|
* void create_radio_buttons (void) {
|
|
|
|
*
|
|
|
|
* GtkWidget *window, *radio1, *radio2, *box, *entry;
|
|
|
|
* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
|
|
|
* box = gtk_vbox_new (TRUE, 2);
|
|
|
|
*
|
|
|
|
* /* Create a radio button with a GtkEntry widget */
|
|
|
|
* radio1 = gtk_radio_button_new (NULL);
|
|
|
|
* entry = gtk_entry_new (<!-- -->);
|
|
|
|
* gtk_container_add (GTK_CONTAINER (radio1), entry);
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* /* Create a radio button with a label */
|
|
|
|
* radio2 = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio1),
|
|
|
|
* "I'm the second radio button.");
|
|
|
|
*
|
|
|
|
* /* Pack them into a box, then show all the widgets */
|
|
|
|
* gtk_box_pack_start (GTK_BOX (box), radio1, TRUE, TRUE, 2);
|
|
|
|
* gtk_box_pack_start (GTK_BOX (box), radio2, TRUE, TRUE, 2);
|
|
|
|
* gtk_container_add (GTK_CONTAINER (window), box);
|
|
|
|
* gtk_widget_show_all (window);
|
|
|
|
* return;
|
|
|
|
* }
|
|
|
|
* </programlisting>
|
|
|
|
* </example>
|
|
|
|
*
|
|
|
|
* When an unselected button in the group is clicked the clicked button
|
|
|
|
* receives the #GtkToggleButton::toggled signal, as does the previously
|
|
|
|
* selected button.
|
|
|
|
* Inside the #GtkToggleButton::toggled handler, gtk_toggle_button_get_active()
|
|
|
|
* can be used to determine if the button has been selected or deselected.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
struct _GtkRadioButtonPrivate
|
2010-07-07 23:04:11 +00:00
|
|
|
{
|
|
|
|
GSList *group;
|
|
|
|
};
|
|
|
|
|
1998-06-24 06:25:14 +00:00
|
|
|
enum {
|
2002-10-13 23:56:31 +00:00
|
|
|
PROP_0,
|
2007-06-04 14:37:17 +00:00
|
|
|
PROP_GROUP
|
1998-06-24 06:25:14 +00:00
|
|
|
};
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
static void gtk_radio_button_destroy (GtkObject *object);
|
|
|
|
static gboolean gtk_radio_button_focus (GtkWidget *widget,
|
|
|
|
GtkDirectionType direction);
|
|
|
|
static void gtk_radio_button_clicked (GtkButton *button);
|
|
|
|
static void gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
|
|
|
|
GdkRectangle *area);
|
2002-10-13 23:56:31 +00:00
|
|
|
static void gtk_radio_button_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_radio_button_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2006-05-14 04:25:34 +00:00
|
|
|
G_DEFINE_TYPE (GtkRadioButton, gtk_radio_button, GTK_TYPE_CHECK_BUTTON)
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2004-02-26 18:58:26 +00:00
|
|
|
static guint group_changed_signal = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_radio_button_class_init (GtkRadioButtonClass *class)
|
|
|
|
{
|
2002-10-13 23:56:31 +00:00
|
|
|
GObjectClass *gobject_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkButtonClass *button_class;
|
|
|
|
GtkCheckButtonClass *check_button_class;
|
2001-10-16 21:02:24 +00:00
|
|
|
GtkWidgetClass *widget_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
gobject_class = G_OBJECT_CLASS (class);
|
1997-11-24 22:37:52 +00:00
|
|
|
object_class = (GtkObjectClass*) class;
|
2001-10-16 21:02:24 +00:00
|
|
|
widget_class = (GtkWidgetClass*) class;
|
1997-11-24 22:37:52 +00:00
|
|
|
button_class = (GtkButtonClass*) class;
|
|
|
|
check_button_class = (GtkCheckButtonClass*) class;
|
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
gobject_class->set_property = gtk_radio_button_set_property;
|
|
|
|
gobject_class->get_property = gtk_radio_button_get_property;
|
1998-06-24 06:25:14 +00:00
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* GtkRadioButton:group:
|
|
|
|
*
|
|
|
|
* Sets a new group for a radio button.
|
|
|
|
*/
|
2002-10-13 23:56:31 +00:00
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_GROUP,
|
|
|
|
g_param_spec_object ("group",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Group"),
|
2004-07-23 15:37:27 +00:00
|
|
|
P_("The radio button whose group this widget belongs to."),
|
2002-10-13 23:56:31 +00:00
|
|
|
GTK_TYPE_RADIO_BUTTON,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_WRITABLE));
|
1997-11-24 22:37:52 +00:00
|
|
|
object_class->destroy = gtk_radio_button_destroy;
|
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
widget_class->focus = gtk_radio_button_focus;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
button_class->clicked = gtk_radio_button_clicked;
|
|
|
|
|
|
|
|
check_button_class->draw_indicator = gtk_radio_button_draw_indicator;
|
2004-02-26 18:58:26 +00:00
|
|
|
|
|
|
|
class->group_changed = NULL;
|
|
|
|
|
|
|
|
/**
|
2005-04-03 07:11:09 +00:00
|
|
|
* GtkRadioButton::group-changed:
|
2004-02-26 18:58:26 +00:00
|
|
|
* @style: the object which received the signal
|
|
|
|
*
|
|
|
|
* Emitted when the group of radio buttons that a radio button belongs
|
|
|
|
* to changes. This is emitted when a radio button switches from
|
|
|
|
* being alone to being part of a group of 2 or more buttons, or
|
2007-06-03 04:56:00 +00:00
|
|
|
* vice-versa, and when a button is moved from one group of 2 or
|
2004-02-26 18:58:26 +00:00
|
|
|
* more buttons to a different one, but not when the composition
|
|
|
|
* of the group that a button belongs to changes.
|
2004-02-26 20:59:01 +00:00
|
|
|
*
|
|
|
|
* Since: 2.4
|
2004-02-26 18:58:26 +00:00
|
|
|
*/
|
2005-09-01 05:11:46 +00:00
|
|
|
group_changed_signal = g_signal_new (I_("group-changed"),
|
2004-02-26 18:58:26 +00:00
|
|
|
G_OBJECT_CLASS_TYPE (object_class),
|
|
|
|
G_SIGNAL_RUN_FIRST,
|
|
|
|
G_STRUCT_OFFSET (GtkRadioButtonClass, group_changed),
|
|
|
|
NULL, NULL,
|
|
|
|
_gtk_marshal_VOID__VOID,
|
|
|
|
G_TYPE_NONE, 0);
|
2010-07-07 23:04:11 +00:00
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
g_type_class_add_private (class, sizeof (GtkRadioButtonPrivate));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_radio_button_init (GtkRadioButton *radio_button)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate *priv;
|
2010-07-07 23:04:11 +00:00
|
|
|
|
|
|
|
radio_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_button,
|
|
|
|
GTK_TYPE_RADIO_BUTTON,
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate);
|
2010-07-07 23:04:11 +00:00
|
|
|
priv = radio_button->priv;
|
|
|
|
|
2010-03-06 10:29:31 +00:00
|
|
|
gtk_widget_set_has_window (GTK_WIDGET (radio_button), FALSE);
|
2010-03-01 16:41:37 +00:00
|
|
|
gtk_widget_set_receives_default (GTK_WIDGET (radio_button), FALSE);
|
1999-01-22 08:12:00 +00:00
|
|
|
|
|
|
|
GTK_TOGGLE_BUTTON (radio_button)->active = TRUE;
|
|
|
|
|
2002-02-22 13:34:28 +00:00
|
|
|
GTK_BUTTON (radio_button)->depress_on_activate = FALSE;
|
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
priv->group = g_slist_prepend (NULL, radio_button);
|
1999-01-22 08:12:00 +00:00
|
|
|
|
2001-11-16 22:56:21 +00:00
|
|
|
_gtk_button_set_depressed (GTK_BUTTON (radio_button), TRUE);
|
1999-01-22 08:12:00 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (radio_button), GTK_STATE_ACTIVE);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-24 06:25:14 +00:00
|
|
|
static void
|
2002-10-13 23:56:31 +00:00
|
|
|
gtk_radio_button_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-24 06:25:14 +00:00
|
|
|
{
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
GtkRadioButton *radio_button;
|
|
|
|
|
|
|
|
radio_button = GTK_RADIO_BUTTON (object);
|
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
switch (prop_id)
|
1998-06-24 06:25:14 +00:00
|
|
|
{
|
|
|
|
GSList *slist;
|
2007-02-28 16:16:54 +00:00
|
|
|
GtkRadioButton *button;
|
1998-06-24 06:25:14 +00:00
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
case PROP_GROUP:
|
2007-06-04 14:37:17 +00:00
|
|
|
button = g_value_get_object (value);
|
2007-02-28 16:16:54 +00:00
|
|
|
|
|
|
|
if (button)
|
|
|
|
slist = gtk_radio_button_get_group (button);
|
1998-06-24 06:25:14 +00:00
|
|
|
else
|
|
|
|
slist = NULL;
|
|
|
|
gtk_radio_button_set_group (radio_button, slist);
|
|
|
|
break;
|
|
|
|
default:
|
2002-10-13 23:56:31 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-06-24 06:25:14 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2002-10-13 23:56:31 +00:00
|
|
|
gtk_radio_button_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-24 06:25:14 +00:00
|
|
|
{
|
2002-10-13 23:56:31 +00:00
|
|
|
switch (prop_id)
|
1998-06-24 06:25:14 +00:00
|
|
|
{
|
|
|
|
default:
|
2002-10-13 23:56:31 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-06-24 06:25:14 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_set_group:
|
|
|
|
* @radio_button: a #GtkRadioButton.
|
|
|
|
* @group: an existing radio button group, such as one returned from
|
|
|
|
* gtk_radio_button_get_group().
|
|
|
|
*
|
|
|
|
* Sets a #GtkRadioButton's group. It should be noted that this does not change
|
|
|
|
* the layout of your interface in any way, so if you are changing the group,
|
|
|
|
* it is likely you will need to re-arrange the user interface to reflect these
|
|
|
|
* changes.
|
|
|
|
*/
|
1998-03-18 21:11:04 +00:00
|
|
|
void
|
|
|
|
gtk_radio_button_set_group (GtkRadioButton *radio_button,
|
1999-01-22 08:12:00 +00:00
|
|
|
GSList *group)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate *priv;
|
2004-02-26 18:58:26 +00:00
|
|
|
GtkWidget *old_group_singleton = NULL;
|
|
|
|
GtkWidget *new_group_singleton = NULL;
|
2010-07-07 23:04:11 +00:00
|
|
|
|
1998-04-18 20:33:35 +00:00
|
|
|
g_return_if_fail (GTK_IS_RADIO_BUTTON (radio_button));
|
|
|
|
g_return_if_fail (!g_slist_find (group, radio_button));
|
1999-01-22 08:12:00 +00:00
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
priv = radio_button->priv;
|
|
|
|
|
|
|
|
if (priv->group)
|
1998-03-18 21:11:04 +00:00
|
|
|
{
|
1998-04-18 20:33:35 +00:00
|
|
|
GSList *slist;
|
2004-02-26 18:58:26 +00:00
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
priv->group = g_slist_remove (priv->group, radio_button);
|
|
|
|
|
|
|
|
if (priv->group && !priv->group->next)
|
|
|
|
old_group_singleton = g_object_ref (priv->group->data);
|
|
|
|
|
|
|
|
for (slist = priv->group; slist; slist = slist->next)
|
1998-03-18 21:11:04 +00:00
|
|
|
{
|
1998-04-18 20:33:35 +00:00
|
|
|
GtkRadioButton *tmp_button;
|
|
|
|
|
|
|
|
tmp_button = slist->data;
|
2010-07-07 23:04:11 +00:00
|
|
|
|
|
|
|
tmp_button->priv->group = priv->group;
|
1998-03-18 21:11:04 +00:00
|
|
|
}
|
|
|
|
}
|
1998-04-18 20:33:35 +00:00
|
|
|
|
2004-02-26 18:58:26 +00:00
|
|
|
if (group && !group->next)
|
|
|
|
new_group_singleton = g_object_ref (group->data);
|
2010-07-07 23:04:11 +00:00
|
|
|
|
|
|
|
priv->group = g_slist_prepend (group, radio_button);
|
|
|
|
|
1998-04-18 20:33:35 +00:00
|
|
|
if (group)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-04-18 20:33:35 +00:00
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
for (slist = group; slist; slist = slist->next)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-04-18 20:33:35 +00:00
|
|
|
GtkRadioButton *tmp_button;
|
|
|
|
|
|
|
|
tmp_button = slist->data;
|
2010-07-07 23:04:11 +00:00
|
|
|
|
|
|
|
tmp_button->priv->group = priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
1999-01-22 08:12:00 +00:00
|
|
|
|
2004-02-26 18:58:26 +00:00
|
|
|
g_object_ref (radio_button);
|
|
|
|
|
2005-04-03 07:11:09 +00:00
|
|
|
g_object_notify (G_OBJECT (radio_button), "group");
|
2004-02-26 18:58:26 +00:00
|
|
|
g_signal_emit (radio_button, group_changed_signal, 0);
|
|
|
|
if (old_group_singleton)
|
|
|
|
{
|
|
|
|
g_signal_emit (old_group_singleton, group_changed_signal, 0);
|
|
|
|
g_object_unref (old_group_singleton);
|
|
|
|
}
|
|
|
|
if (new_group_singleton)
|
|
|
|
{
|
|
|
|
g_signal_emit (new_group_singleton, group_changed_signal, 0);
|
|
|
|
g_object_unref (new_group_singleton);
|
|
|
|
}
|
|
|
|
|
1999-01-22 08:12:00 +00:00
|
|
|
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button), group == NULL);
|
2004-02-26 18:58:26 +00:00
|
|
|
|
|
|
|
g_object_unref (radio_button);
|
1998-03-18 21:11:04 +00:00
|
|
|
}
|
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_new:
|
|
|
|
* @group: an existing radio button group, or %NULL if you are creating a new group.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkRadioButton. To be of any practical value, a widget should
|
|
|
|
* then be packed into the radio button.
|
|
|
|
*
|
|
|
|
* Returns: a new radio button.
|
|
|
|
*/
|
1998-03-18 21:11:04 +00:00
|
|
|
GtkWidget*
|
|
|
|
gtk_radio_button_new (GSList *group)
|
|
|
|
{
|
|
|
|
GtkRadioButton *radio_button;
|
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, NULL);
|
1998-03-18 21:11:04 +00:00
|
|
|
|
1999-01-22 08:12:00 +00:00
|
|
|
if (group)
|
|
|
|
gtk_radio_button_set_group (radio_button, group);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
return GTK_WIDGET (radio_button);
|
|
|
|
}
|
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_new_with_label:
|
|
|
|
* @group: an existing radio button group, or %NULL if you are creating a new
|
|
|
|
* group.
|
|
|
|
* @label: the text label to display next to the radio button.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkRadioButton with a text label.
|
|
|
|
*
|
|
|
|
* Returns: a new radio button.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidget*
|
|
|
|
gtk_radio_button_new_with_label (GSList *group,
|
|
|
|
const gchar *label)
|
|
|
|
{
|
|
|
|
GtkWidget *radio_button;
|
|
|
|
|
2001-08-28 05:05:53 +00:00
|
|
|
radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON, "label", label, NULL) ;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-08-27 01:05:07 +00:00
|
|
|
if (group)
|
2001-08-29 02:20:02 +00:00
|
|
|
gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
return radio_button;
|
|
|
|
}
|
|
|
|
|
2001-06-05 18:22:30 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_radio_button_new_with_mnemonic:
|
|
|
|
* @group: the radio button group
|
|
|
|
* @label: the text of the button, with an underscore in front of the
|
|
|
|
* mnemonic character
|
|
|
|
* @returns: a new #GtkRadioButton
|
|
|
|
*
|
Mass fixing of trivial doc bugs. (#63544, #57007, #64141, #63472, #57108,
* gtk/gtkiconfactory.c, gtk/gtktextbuffer.c, gtk/gtktreemodel.c,
gtk/gtkwindow.c, gtk/gtknotebook.c, gtk/gtkradiobutton.c,
gtk/gtktextiter.c, gtk/gtkdialog.c: Mass fixing of trivial doc bugs.
(#63544, #57007, #64141, #63472, #57108, #60818, #61562)
* gtk/tmpl/gtkaccellabel.sgml, gtk/tmpl/gtkcombo.sgml,
gtk/tmpl/gtkentry.sgml, gtk/tmpl/gtkhscrollbar.sgml,
gtk/tmpl/gtkvscrollbar.sgml, gtk/tmpl/gtktoolbar.sgml,
gtk/tmpl/gtkdialog.sgml, gtk/tmpl/gtkstatusbar.sgml:
Mass fixing of trivial doc bugs. (#55579, #56760, #58769, #55918,
#64154, #60422, #54697)
2001-11-10 22:06:44 +00:00
|
|
|
* Creates a new #GtkRadioButton containing a label, adding it to the same
|
|
|
|
* group as @group. The label will be created using
|
|
|
|
* gtk_label_new_with_mnemonic(), so underscores in @label indicate the
|
|
|
|
* mnemonic for the button.
|
2001-06-05 18:22:30 +00:00
|
|
|
**/
|
|
|
|
GtkWidget*
|
|
|
|
gtk_radio_button_new_with_mnemonic (GSList *group,
|
|
|
|
const gchar *label)
|
|
|
|
{
|
|
|
|
GtkWidget *radio_button;
|
|
|
|
|
2005-03-26 05:49:15 +00:00
|
|
|
radio_button = g_object_new (GTK_TYPE_RADIO_BUTTON,
|
|
|
|
"label", label,
|
|
|
|
"use-underline", TRUE,
|
|
|
|
NULL);
|
2001-06-05 18:22:30 +00:00
|
|
|
|
2001-08-27 01:05:07 +00:00
|
|
|
if (group)
|
2001-08-29 02:20:02 +00:00
|
|
|
gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_button), group);
|
2001-06-05 18:22:30 +00:00
|
|
|
|
|
|
|
return radio_button;
|
|
|
|
}
|
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_new_from_widget:
|
|
|
|
* @radio_group_member: an existing #GtkRadioButton.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkRadioButton, adding it to the same group as @radio_group_member.
|
|
|
|
* As with gtk_radio_button_new(), a widget should be packed into the radio button.
|
|
|
|
*
|
|
|
|
* Returns: a new radio button.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidget*
|
2007-06-27 11:28:55 +00:00
|
|
|
gtk_radio_button_new_from_widget (GtkRadioButton *radio_group_member)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GSList *l = NULL;
|
2007-06-27 11:28:55 +00:00
|
|
|
if (radio_group_member)
|
|
|
|
l = gtk_radio_button_get_group (radio_group_member);
|
1997-11-24 22:37:52 +00:00
|
|
|
return gtk_radio_button_new (l);
|
|
|
|
}
|
|
|
|
|
2010-05-19 22:40:58 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_new_with_label_from_widget:
|
|
|
|
* @radio_group_member: widget to get radio group from or %NULL
|
|
|
|
* @label: a text string to display next to the radio button.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkRadioButton with a text label, adding it to the same group
|
|
|
|
* as @radio_group_member.
|
|
|
|
*
|
|
|
|
* Returns: a new radio button.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidget*
|
2007-06-27 11:28:55 +00:00
|
|
|
gtk_radio_button_new_with_label_from_widget (GtkRadioButton *radio_group_member,
|
1997-11-24 22:37:52 +00:00
|
|
|
const gchar *label)
|
|
|
|
{
|
|
|
|
GSList *l = NULL;
|
2007-06-27 11:28:55 +00:00
|
|
|
if (radio_group_member)
|
|
|
|
l = gtk_radio_button_get_group (radio_group_member);
|
1997-11-24 22:37:52 +00:00
|
|
|
return gtk_radio_button_new_with_label (l, label);
|
|
|
|
}
|
|
|
|
|
2001-06-05 18:22:30 +00:00
|
|
|
/**
|
|
|
|
* gtk_radio_button_new_with_mnemonic_from_widget:
|
2010-02-19 16:53:17 +00:00
|
|
|
* @radio_group_member: (allow-none): widget to get radio group from or %NULL
|
2001-06-05 18:22:30 +00:00
|
|
|
* @label: the text of the button, with an underscore in front of the
|
|
|
|
* mnemonic character
|
|
|
|
* @returns: a new #GtkRadioButton
|
|
|
|
*
|
|
|
|
* Creates a new #GtkRadioButton containing a label. The label
|
|
|
|
* will be created using gtk_label_new_with_mnemonic(), so underscores
|
|
|
|
* in @label indicate the mnemonic for the button.
|
|
|
|
**/
|
|
|
|
GtkWidget*
|
2007-06-27 11:28:55 +00:00
|
|
|
gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member,
|
2001-06-05 18:22:30 +00:00
|
|
|
const gchar *label)
|
|
|
|
{
|
|
|
|
GSList *l = NULL;
|
2007-06-27 11:28:55 +00:00
|
|
|
if (radio_group_member)
|
|
|
|
l = gtk_radio_button_get_group (radio_group_member);
|
2001-06-05 18:22:30 +00:00
|
|
|
return gtk_radio_button_new_with_mnemonic (l, label);
|
|
|
|
}
|
|
|
|
|
2009-12-10 10:23:40 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_radio_button_get_group:
|
|
|
|
* @radio_button: a #GtkRadioButton.
|
|
|
|
*
|
|
|
|
* Retrieves the group assigned to a radio button.
|
|
|
|
*
|
|
|
|
* Return value: (element-type GtkRadioButton) (transfer none): a linked list
|
|
|
|
* containing all the radio buttons in the same group
|
|
|
|
* as @radio_button. The returned list is owned by the radio button
|
|
|
|
* and must not be modified or freed.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
GSList*
|
2001-06-24 15:34:48 +00:00
|
|
|
gtk_radio_button_get_group (GtkRadioButton *radio_button)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_RADIO_BUTTON (radio_button), NULL);
|
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
return radio_button->priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_radio_button_destroy (GtkObject *object)
|
|
|
|
{
|
2004-02-26 18:58:26 +00:00
|
|
|
GtkWidget *old_group_singleton = NULL;
|
2010-07-07 23:04:11 +00:00
|
|
|
GtkRadioButton *radio_button = GTK_RADIO_BUTTON (object);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate *priv = radio_button->priv;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkRadioButton *tmp_button;
|
|
|
|
GSList *tmp_list;
|
2004-02-26 18:58:26 +00:00
|
|
|
gboolean was_in_group;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
was_in_group = priv->group && priv->group->next;
|
|
|
|
|
|
|
|
priv->group = g_slist_remove (priv->group, radio_button);
|
|
|
|
if (priv->group && !priv->group->next)
|
|
|
|
old_group_singleton = priv->group->data;
|
2004-02-26 18:58:26 +00:00
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
tmp_list = priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
tmp_button = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
tmp_button->priv->group = priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-09-21 15:23:14 +00:00
|
|
|
/* this button is no longer in the group */
|
2010-07-07 23:04:11 +00:00
|
|
|
priv->group = NULL;
|
2004-02-26 18:58:26 +00:00
|
|
|
|
|
|
|
if (old_group_singleton)
|
|
|
|
g_signal_emit (old_group_singleton, group_changed_signal, 0);
|
|
|
|
if (was_in_group)
|
|
|
|
g_signal_emit (radio_button, group_changed_signal, 0);
|
2008-08-07 14:12:32 +00:00
|
|
|
|
|
|
|
GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
static void
|
|
|
|
get_coordinates (GtkWidget *widget,
|
|
|
|
GtkWidget *reference,
|
|
|
|
gint *x,
|
|
|
|
gint *y)
|
|
|
|
{
|
2010-08-11 21:03:29 +00:00
|
|
|
GtkAllocation allocation;
|
|
|
|
|
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
*x = allocation.x + allocation.width / 2;
|
|
|
|
*y = allocation.y + allocation.height / 2;
|
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
gtk_widget_translate_coordinates (widget, reference, *x, *y, x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
left_right_compare (gconstpointer a,
|
|
|
|
gconstpointer b,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
gint x1, y1, x2, y2;
|
|
|
|
|
|
|
|
get_coordinates ((GtkWidget *)a, data, &x1, &y1);
|
|
|
|
get_coordinates ((GtkWidget *)b, data, &x2, &y2);
|
|
|
|
|
|
|
|
if (y1 == y2)
|
|
|
|
return (x1 < x2) ? -1 : ((x1 == x2) ? 0 : 1);
|
|
|
|
else
|
|
|
|
return (y1 < y2) ? -1 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
up_down_compare (gconstpointer a,
|
|
|
|
gconstpointer b,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
gint x1, y1, x2, y2;
|
|
|
|
|
|
|
|
get_coordinates ((GtkWidget *)a, data, &x1, &y1);
|
|
|
|
get_coordinates ((GtkWidget *)b, data, &x2, &y2);
|
|
|
|
|
|
|
|
if (x1 == x2)
|
|
|
|
return (y1 < y2) ? -1 : ((y1 == y2) ? 0 : 1);
|
|
|
|
else
|
|
|
|
return (x1 < x2) ? -1 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_radio_button_focus (GtkWidget *widget,
|
|
|
|
GtkDirectionType direction)
|
|
|
|
{
|
|
|
|
GtkRadioButton *radio_button = GTK_RADIO_BUTTON (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate *priv = radio_button->priv;
|
2001-10-16 21:02:24 +00:00
|
|
|
GSList *tmp_slist;
|
2002-03-02 21:18:07 +00:00
|
|
|
|
|
|
|
/* Radio buttons with draw_indicator unset focus "normally", since
|
|
|
|
* they look like buttons to the user.
|
|
|
|
*/
|
|
|
|
if (!GTK_TOGGLE_BUTTON (widget)->draw_indicator)
|
2006-05-02 23:56:43 +00:00
|
|
|
return GTK_WIDGET_CLASS (gtk_radio_button_parent_class)->focus (widget, direction);
|
2001-10-16 21:02:24 +00:00
|
|
|
|
|
|
|
if (gtk_widget_is_focus (widget))
|
|
|
|
{
|
2006-11-16 14:32:47 +00:00
|
|
|
GtkSettings *settings = gtk_widget_get_settings (widget);
|
2001-10-16 21:02:24 +00:00
|
|
|
GSList *focus_list, *tmp_list;
|
|
|
|
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
|
|
|
|
GtkWidget *new_focus = NULL;
|
2006-11-16 14:32:47 +00:00
|
|
|
gboolean cursor_only;
|
|
|
|
gboolean wrap_around;
|
2001-10-16 21:02:24 +00:00
|
|
|
|
|
|
|
switch (direction)
|
|
|
|
{
|
|
|
|
case GTK_DIR_LEFT:
|
|
|
|
case GTK_DIR_RIGHT:
|
2010-07-07 23:04:11 +00:00
|
|
|
focus_list = g_slist_copy (priv->group);
|
2001-10-16 21:02:24 +00:00
|
|
|
focus_list = g_slist_sort_with_data (focus_list, left_right_compare, toplevel);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_UP:
|
|
|
|
case GTK_DIR_DOWN:
|
2010-07-07 23:04:11 +00:00
|
|
|
focus_list = g_slist_copy (priv->group);
|
2001-10-16 21:02:24 +00:00
|
|
|
focus_list = g_slist_sort_with_data (focus_list, up_down_compare, toplevel);
|
|
|
|
break;
|
2007-01-14 04:30:06 +00:00
|
|
|
case GTK_DIR_TAB_FORWARD:
|
|
|
|
case GTK_DIR_TAB_BACKWARD:
|
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
return FALSE;
|
2001-10-16 21:02:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (direction == GTK_DIR_LEFT || direction == GTK_DIR_UP)
|
|
|
|
focus_list = g_slist_reverse (focus_list);
|
|
|
|
|
|
|
|
tmp_list = g_slist_find (focus_list, widget);
|
|
|
|
|
|
|
|
if (tmp_list)
|
|
|
|
{
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkWidget *child = tmp_list->data;
|
|
|
|
|
2010-03-02 04:19:28 +00:00
|
|
|
if (gtk_widget_get_mapped (child) && gtk_widget_is_sensitive (child))
|
2001-10-16 21:02:24 +00:00
|
|
|
{
|
|
|
|
new_focus = child;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-16 14:32:47 +00:00
|
|
|
g_object_get (settings,
|
|
|
|
"gtk-keynav-cursor-only", &cursor_only,
|
|
|
|
"gtk-keynav-wrap-around", &wrap_around,
|
|
|
|
NULL);
|
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
if (!new_focus)
|
|
|
|
{
|
2006-11-16 14:32:47 +00:00
|
|
|
if (cursor_only)
|
2006-11-16 12:56:30 +00:00
|
|
|
{
|
|
|
|
g_slist_free (focus_list);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2006-11-16 14:32:47 +00:00
|
|
|
if (!wrap_around)
|
|
|
|
{
|
|
|
|
g_slist_free (focus_list);
|
|
|
|
gtk_widget_error_bell (widget);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2001-10-16 21:02:24 +00:00
|
|
|
tmp_list = focus_list;
|
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkWidget *child = tmp_list->data;
|
|
|
|
|
2010-03-02 04:19:28 +00:00
|
|
|
if (gtk_widget_get_mapped (child) && gtk_widget_is_sensitive (child))
|
2001-10-16 21:02:24 +00:00
|
|
|
{
|
|
|
|
new_focus = child;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
g_slist_free (focus_list);
|
|
|
|
|
|
|
|
if (new_focus)
|
|
|
|
{
|
|
|
|
gtk_widget_grab_focus (new_focus);
|
2006-11-16 12:56:30 +00:00
|
|
|
|
|
|
|
if (!cursor_only)
|
|
|
|
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (new_focus), TRUE);
|
2001-10-16 21:02:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GtkRadioButton *selected_button = NULL;
|
|
|
|
|
|
|
|
/* We accept the focus if, we don't have the focus and
|
|
|
|
* - we are the currently active button in the group
|
|
|
|
* - there is no currently active radio button.
|
|
|
|
*/
|
|
|
|
|
2010-07-07 23:04:11 +00:00
|
|
|
tmp_slist = priv->group;
|
2001-10-16 21:02:24 +00:00
|
|
|
while (tmp_slist)
|
|
|
|
{
|
|
|
|
if (GTK_TOGGLE_BUTTON (tmp_slist->data)->active)
|
|
|
|
selected_button = tmp_slist->data;
|
|
|
|
tmp_slist = tmp_slist->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (selected_button && selected_button != radio_button)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
gtk_widget_grab_focus (widget);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_radio_button_clicked (GtkButton *button)
|
|
|
|
{
|
2010-07-07 23:04:11 +00:00
|
|
|
GtkRadioButton *radio_button = GTK_RADIO_BUTTON (button);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkRadioButtonPrivate *priv = radio_button->priv;
|
2010-07-07 23:04:11 +00:00
|
|
|
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button);
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkToggleButton *tmp_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
GSList *tmp_list;
|
|
|
|
gint toggled;
|
2001-11-16 22:56:21 +00:00
|
|
|
gboolean depressed;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
toggled = FALSE;
|
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
g_object_ref (GTK_WIDGET (button));
|
1999-01-22 08:12:00 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (toggle_button->active)
|
|
|
|
{
|
|
|
|
tmp_button = NULL;
|
2010-07-07 23:04:11 +00:00
|
|
|
tmp_list = priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
tmp_button = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
1999-01-22 08:12:00 +00:00
|
|
|
if (tmp_button->active && tmp_button != toggle_button)
|
1997-11-24 22:37:52 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
tmp_button = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!tmp_button)
|
|
|
|
{
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
toggled = TRUE;
|
|
|
|
toggle_button->active = !toggle_button->active;
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
toggled = TRUE;
|
|
|
|
toggle_button->active = !toggle_button->active;
|
2010-07-07 23:04:11 +00:00
|
|
|
|
|
|
|
tmp_list = priv->group;
|
1997-11-24 22:37:52 +00:00
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
tmp_button = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
if (tmp_button->active && (tmp_button != toggle_button))
|
|
|
|
{
|
|
|
|
gtk_button_clicked (GTK_BUTTON (tmp_button));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE);
|
|
|
|
}
|
|
|
|
|
2001-11-16 22:56:21 +00:00
|
|
|
if (toggle_button->inconsistent)
|
|
|
|
depressed = FALSE;
|
|
|
|
else if (button->in_button && button->button_down)
|
|
|
|
depressed = !toggle_button->active;
|
|
|
|
else
|
|
|
|
depressed = toggle_button->active;
|
|
|
|
|
2010-03-03 20:49:33 +00:00
|
|
|
if (gtk_widget_get_state (GTK_WIDGET (button)) != new_state)
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1999-01-12 15:12:14 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (toggled)
|
2006-02-22 17:29:07 +00:00
|
|
|
{
|
|
|
|
gtk_toggle_button_toggled (toggle_button);
|
|
|
|
|
|
|
|
g_object_notify (G_OBJECT (toggle_button), "active");
|
|
|
|
}
|
1999-01-12 15:12:14 +00:00
|
|
|
|
2001-11-16 22:56:21 +00:00
|
|
|
_gtk_button_set_depressed (button, depressed);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (button));
|
1999-01-22 08:12:00 +00:00
|
|
|
|
2002-10-13 23:56:31 +00:00
|
|
|
g_object_unref (button);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
|
|
|
|
GdkRectangle *area)
|
|
|
|
{
|
2010-08-11 21:03:29 +00:00
|
|
|
GtkAllocation allocation;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidget *widget;
|
2002-10-17 20:20:52 +00:00
|
|
|
GtkWidget *child;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkButton *button;
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType state_type;
|
|
|
|
GtkShadowType shadow_type;
|
2010-08-11 21:03:29 +00:00
|
|
|
GtkStyle *style;
|
|
|
|
GdkWindow *window;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint x, y;
|
Fix G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
Mon Apr 2 10:47:57 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_class_init): Fix
G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
stupidity.
Mon Apr 2 00:51:11 2001 Owen Taylor <otaylor@redhat.com>
[ First pass at adding style properties. Still needs some definite
fine-tuning. ]
* gtk/gtkbutton.c: Add ::default_spacing style property.
* gtk/gtkcheckbutton.[ch] gtkradiobutton.c: Add ::indicator_size,
::indicator_spacing style properties.
* gtk/gtkoptionmenu.c: Add ::indicator_size, ::indicator_spacing
style properties.
* gtk/gtk{,h,v}paned.[ch]: Make handle_size a style property
rather than a normal property.
* gtk/gtkwidget.c: Add an ::interior_focus style property to
draw focus inside buttons, in the Windows/Java Metal/etc. style.
* gtk/gtkbutton.c gtk/gtkcheckbutton.c gtk/gtktogglenbutton.c:
Honor ::interior_focus.
* gtk/gtkentry.c: Don't draw focus at all when ::interior_focus is
TRUE.
* gtk/gtkrange.[ch] gtk/gtk{h,v}scrollbar.c gtk/gtk{h,v}scale.c:
Add ::slider_width, ::trough_border, ::stepper_size,
::stepper_spacing style properties.
* gtk/gtkscale.[ch] Add ::slider-length style property.
2001-04-02 15:51:28 +00:00
|
|
|
gint indicator_size, indicator_spacing;
|
2001-12-04 03:27:30 +00:00
|
|
|
gint focus_width;
|
|
|
|
gint focus_pad;
|
2010-06-02 04:28:22 +00:00
|
|
|
guint border_width;
|
2001-12-04 03:27:30 +00:00
|
|
|
gboolean interior_focus;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-01-07 15:47:35 +00:00
|
|
|
widget = GTK_WIDGET (check_button);
|
|
|
|
|
|
|
|
if (gtk_widget_is_drawable (widget))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
button = GTK_BUTTON (check_button);
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (check_button);
|
|
|
|
|
2010-06-02 04:28:22 +00:00
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
|
|
|
|
2010-08-11 21:03:29 +00:00
|
|
|
style = gtk_widget_get_style (widget);
|
2001-12-04 03:27:30 +00:00
|
|
|
gtk_widget_style_get (widget,
|
2005-03-26 05:49:15 +00:00
|
|
|
"interior-focus", &interior_focus,
|
2001-12-04 03:27:30 +00:00
|
|
|
"focus-line-width", &focus_width,
|
|
|
|
"focus-padding", &focus_pad,
|
|
|
|
NULL);
|
|
|
|
|
2010-08-11 21:03:29 +00:00
|
|
|
window = gtk_widget_get_window (widget);
|
|
|
|
|
Fix G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
Mon Apr 2 10:47:57 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_class_init): Fix
G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
stupidity.
Mon Apr 2 00:51:11 2001 Owen Taylor <otaylor@redhat.com>
[ First pass at adding style properties. Still needs some definite
fine-tuning. ]
* gtk/gtkbutton.c: Add ::default_spacing style property.
* gtk/gtkcheckbutton.[ch] gtkradiobutton.c: Add ::indicator_size,
::indicator_spacing style properties.
* gtk/gtkoptionmenu.c: Add ::indicator_size, ::indicator_spacing
style properties.
* gtk/gtk{,h,v}paned.[ch]: Make handle_size a style property
rather than a normal property.
* gtk/gtkwidget.c: Add an ::interior_focus style property to
draw focus inside buttons, in the Windows/Java Metal/etc. style.
* gtk/gtkbutton.c gtk/gtkcheckbutton.c gtk/gtktogglenbutton.c:
Honor ::interior_focus.
* gtk/gtkentry.c: Don't draw focus at all when ::interior_focus is
TRUE.
* gtk/gtkrange.[ch] gtk/gtk{h,v}scrollbar.c gtk/gtk{h,v}scale.c:
Add ::slider_width, ::trough_border, ::stepper_size,
::stepper_spacing style properties.
* gtk/gtkscale.[ch] Add ::slider-length style property.
2001-04-02 15:51:28 +00:00
|
|
|
_gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing);
|
|
|
|
|
2010-08-11 21:03:29 +00:00
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
|
|
|
|
x = allocation.x + indicator_spacing + border_width;
|
|
|
|
y = allocation.y + (allocation.height - indicator_size) / 2;
|
2001-12-04 03:27:30 +00:00
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
child = gtk_bin_get_child (GTK_BIN (check_button));
|
2010-03-01 06:47:38 +00:00
|
|
|
if (!interior_focus || !(child && gtk_widget_get_visible (child)))
|
2001-12-04 03:27:30 +00:00
|
|
|
x += focus_width + focus_pad;
|
2002-02-22 13:34:28 +00:00
|
|
|
|
|
|
|
if (toggle_button->inconsistent)
|
|
|
|
shadow_type = GTK_SHADOW_ETCHED_IN;
|
|
|
|
else if (toggle_button->active)
|
1997-11-24 22:37:52 +00:00
|
|
|
shadow_type = GTK_SHADOW_IN;
|
|
|
|
else
|
|
|
|
shadow_type = GTK_SHADOW_OUT;
|
2001-02-19 22:25:30 +00:00
|
|
|
|
2002-02-22 13:34:28 +00:00
|
|
|
if (button->activate_timeout || (button->button_down && button->in_button))
|
|
|
|
state_type = GTK_STATE_ACTIVE;
|
|
|
|
else if (button->in_button)
|
|
|
|
state_type = GTK_STATE_PRELIGHT;
|
2010-02-27 04:24:24 +00:00
|
|
|
else if (!gtk_widget_is_sensitive (widget))
|
2002-11-10 20:52:34 +00:00
|
|
|
state_type = GTK_STATE_INSENSITIVE;
|
2002-02-22 13:34:28 +00:00
|
|
|
else
|
|
|
|
state_type = GTK_STATE_NORMAL;
|
|
|
|
|
Remove all references to offscreen flag which was no longer used.
Thu Jun 1 23:05:13 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Remove all references to
offscreen flag which was no longer used.
* gtk/gtkprivate.h (enum): Remove unused flags and compress.
* gtk/gtkframe.c (gtk_frame_set_label_widget): Check
for non-null label_widget->parent.
* gtk/gtkentry.c: Get rid of code to deal with PangoAttribute
which no longer was used.
* gdk/gdkpango.c (gdk_pango_context_get_info): make static.
* gdk/gdkpango.c (gdk_draw_layout[_line]): Add checks
for null arguments.
* gdk/x11/gdkgeometry-x11.c (gdk_window_scroll): add
check for destroyed windows.
Thu Jun 1 13:48:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimmulticontext.c: Add a finalize method and unref
the slave context there.
* gtk/gtkinvisible.[ch]: Make reference counting behavior
identical to GtkWindow.
Thu Jun 1 01:54:11 2000 Owen Taylor <otaylor@redhat.com>
* Makefile.am gdk/gdkpango.c: Copy the layout render function from
pangox to here, so we can write them independent of rendering
system, using GDK primitives.
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c
gdk/x11/gdkdrawable-x11.c: Remove draw_layout() from the vtable,
since we have a rendering-system independent implementation in
terms of draw_glyphs().
* gdk/gdkpango.c gdkdrawable.h (gdk_draw_layout_line): New
function to render a single line.
* gdk/x11/gdkpango.c: Move the guts of this file mostly
into ../gdkpango.c, which simplifies things, since we
don't have to deal with raw X gc's.
Fri May 19 04:28:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch]: Add get_log_attrs() function to
get the logical attributes for a given GtkTextLine.
Tue May 30 16:05:39 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track
g_locale_get_codeset() to g_get_codeset() change.
Tue May 30 15:03:19 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testcalendar.c (calendar_font_selection_ok): Use font
descriptions.
* gtk/gtkentry.c (gtk_entry_draw_text): Center text within
the entry.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
redoing (vastly simplifying) for Pango. Still needs quite
a bit of work. (Size selection is currently poor. List of
predefined sizes is not a good idea, since all of these
sizes won't necessarily be distinct.)
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
CODESET results for LANG=C.
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
which takes a stringized pango font description;
ignore the older 'font' and 'fontset' declarations.
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
field with a GdkFont derived via gdk_font_from_description(),
for compatibility. (Should we just remove it entirely?
Probably too much compatibility breakage, but people
should be migrating to the new Pango stuff as quickly
as possible.)
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
redoing; there are some bugs in size allocation right
now, the semi-existant distinction between header / day
fonts was removed, but, with Pango, could actually
be made functional in a nice way.
* gtk/testcalender: Move calender from examples into this
directory as a test program. (We really need to restrcture
testgtk into a whole directory full of tests for every
widget or functionality group, separated into multiple .c
files.)
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (file_exists): Fix stupid typo that
was keeping RC file from being loaded.
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
RC file font code.
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
Add function to load a GdkFont from a PangoFontDescription.
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
to have any widget for the label, use a GtkLabel widget
to display the text. (Based partially on a patch from
Anders Carlson.)
(Quite a bit of code reorganization - strip 90% of the
guts out of gtkaspectframe and add a single virtual
func to GtkFrameClass - compute_child_allocation.)
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
(Removed clist->row_center_offset field because caching
it wasn't saving time or code, added private function
_gtk_clist_create_cell_layout()).
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c: Pangoized.
* gtk/[hv]ruler.c: Pangoized
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_init):
Use gtk_clist_set_column_auto_resize() to remove need
need for manual column width computations.
Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktooltips.[ch]: Replace custom drawing with a GtkLabel,
ensuring Pango correctness, and considerably simplifying the
code.
* gtk/gtklabel.c gtk[hv]scale.c: 1000 => PANGO_SCALE.
* gtk/gtklabel.c (gtk_label_size_request): Fixed incorrect
getting of numbers of lines.
* gtk/gtklabel.c (gtk_label_size_request): Set the requisition
to the actual requested width of the lable, not to the wrap
width we set.
* gtk/gtktextchild.h: Remove extraneous include of gtk/gtk.h.
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
* gtk/gtktextview.c: Fix structure inheritance.
* gtk/gtkprogressbar.c: Pangoize.
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextview.c (gtk_text_view_get_first_para_iter): Encapsulate
in a function.
* gtk/gtktextlayout.c (find_display_line_above): Fixed
bug with computing line tops.
* gtk/gtktextview.c (changed_handler): Fix < , <= confusion.
Thu May 18 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix up the x_offset
and y_offset coordinates to do what we need now. (The offset between
buffer and layout coordinates has been reintroduced, but is a
bit different than before.)
* gtk/gtktextview.[ch]: No longer inherit from GtkLayout; instead
handle the adjustments ourselves, and scroll as necessary using
the new gdk_window_scroll().
The advantage of this is that when we are incrementally revalidating,
we are essentially rearranging things around the visible portion
of the screen. With the old setup, the visible portion of the
screen was moved around in the layout, so scrolling and redrawing
to track that caused jumping of the display. Since we now
control the scrolling ourselves, we can suppress this and
only redraw when things actually change.
Thu May 18 18:47:25 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (redisplay_mark): We need to invalidate
the region not just redisplay it after-all, since we store the
cursors in the LineDisplay. (Ugly interactions here between
GtkLayout and GtkTextBTree here.)
* gtk/gtktextbtree.c (redisplay_region): Fixed reversed comparison.
Thu May 18 18:43:21 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.h gdk/x11/gdkgeometry-x11.c (gdk_window_scroll):
Added function to scroll contents of a window while keeping the
window constant. Works by XCopyArea or guffaw-scrolling depending
on the details of how the window is set up. (guffaw-scrolling
still needs to be filled in.)
Wed May 17 22:36:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextiter.c gtk/gtkmain.c: Add a debug key for the text widget,
move the debugging that was tied to a global variable
to that.
* gtk/gtkmarshal.list: Add NONE:INT,INT,INT
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.c: Keep a separate
validated flag, in line data instead of setting height/width to
-1. This allows us to perform operations with partially invalid
buffer (using the old size for invalid lines) and thus to do
incremental vaidation. Keep height/width aggregates up to date
when deleting text and rebalancing the tree.
* gtk/gtktextbtree.[ch]: Add functions validate a line
(gtk_text_btree_validate_line), and to validate up
to a number of pixels (gtk_text_btree_validate).
* gtk/gtktextlayout.[ch]: Add an ::invalidated signal
that indicates that something is changed and a revalidation
pass is needed. Change ::need_repaint to ::changed, and
make it take old and new yranges instead of a rectangle.
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.[ch]: Move
the line_data_destroy() function from
gtk_text_btree_add_view() to a virtual function in
GtkTextLayout
* gtk/gtktextbtree.[ch]: Remove gtk_text_btree_get_damage_range(),
since we are handling partial repaints in a different fashion
now.
* gtk/gtktextbtree.[ch]: Only repaint the changed portion
of the selection instead of queueing a repaint on the
entire widget.
* gtk/gtktextbuffer.[ch] gtk/gtktextbtree.[ch]: Move
get_selection_bounds() down to btree, make the function
in buffer a wrapper around the btree function.
* gtk/gtktextlayout.[ch]: Add functions to check if the
layout is valid and to recompute either a range of pixels
aroudn a line or a certain total number of pixels.
* gtk/gtktextlayout.[ch]: Cache a single line display;
now that we only redraw the needed portions, the hit rate
for this cache is quite high.
* gtk/gtktextview.[ch]: Keep track of the first paragraph
on the screen so that when re-laying-out the buffer, we can
keep the same place. This requires connecting to ::value_changed
on the adjustments
* gtk/gtktextview.[ch]: Add idle functions to revalidate
the buffer after we receive an ::invalidated signal.
Wed May 17 22:10:47 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_size_allocate): Set upper
to max of allocation and layout size, not just to the
layout size.
* gtk/gtk[hv]scrollbar.c (gtk_[hv]scrollbar_calc_slider_size):
Invalidate window so it gets redrawn properly.
* gdk/gdkwindow.c (gdk_window_invalidate_rect): Allow rect == NULL
to mean the entire window.
* gdk/gdkevents.h: Move definition for GDK_PRIORITY_REDRAW
into public header.
Mon May 15 14:51:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextmark.c (gtk_text_mark_get_name): Add function
to get the name of a mark.
* gtk/gtktextlayout.c (gtk_text_layout_get_line_at_y): Add a function
to find the paragraph from a y position.
Thu May 11 12:57:20 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_invalidate_upward): Valid
nodes have width/height >= 0, not > 0.
Tue May 9 21:29:06 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c (gtk_text_layout_get_line_display):
Add a size_only flag, so when we only need the size, we don't create
useless appearance attributes.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Remove
duplicate setting of font description.
* gtk/gtkscale.c: Use PANGO_SCALE instead of 1000
Wed Apr 26 01:53:23 2000 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (EXTRA_DIST): Add OLD_STAMP into
EXTRA_DIST. It does not work well when the file that
everything depends on is not in the tarball.
Wed Apr 26 00:56:14 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c: Some hacks and fixes so that it basically
works when not sitting in the GTK+ build tree.
2000-05-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_line_next_could_contain_tag):
Properly determine the ordering of the tag root and the current
line within the tree. Previous algorithm only worked if the tag
root's immediate parent was the common root of both the current
line and the tag root.
Wed Apr 26 00:43:00 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (set_para_values): Fix some bugs in
alignment.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Track
the widget text directional dynamically.
* gtk/gtktextview.[ch]: Added functions to get and set default
wrap mode.
Tue Apr 25 23:47:38 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_location): Fix bug
in cursor location computation.
Tue Apr 25 23:22:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_set_size): Clamp hadjustment/
vadjusment values properly when layout gets smaller.
* gtk/gtktextview.c (need_repaint_handler): Areas being
passed in are far completely inaccurate, and sometimes
too small, so, for now, just queue a redraw on the
whole visible region.
2000-04-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (summary_destroy): new function to
destroy tag summary nodes
(gtk_text_line_next_could_contain_tag): this function was
totally broken if the line passed in wasn't below the tag
root. Fix it.
(gtk_text_btree_first_could_contain_tag): In the tag == NULL
"wildcard" case, we have to do a linear scan. Blah.
(gtk_text_btree_last_could_contain_tag): In tag == NULL case,
we have to do the linear scan
(tag_removed_cb): When a tag is removed from the tag table,
remove the GtkTextTagInfo node from the btree.
(gtk_text_btree_spew): Implement the spew function, for
our debugging pleasure.
Tue Apr 25 19:40:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
a problem with referring to the wrong buffer.
* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
font description to gtk_style_new() - otherwise things
don't work without a .gtkrc file.
* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
tags table if we create it ourself, too.
* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
it was conflicting with XKB modifiers.
* gtk/gtktextview.[ch]: Add simple support for
GtkIMContext.
Mon Apr 24 19:34:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
with deletion from last commit.
Mon Apr 24 19:29:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_create_pango_context): Set the language
in the context from the current locale.
* gtk/gtkentry.c (gtk_entry_size_request): Use language from the
context, not hardcoded value.
* gtk/gtkentry.c (gtk_entry_move_cursor): Make character movement visual,
not logical.
Sun Apr 23 23:39:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtktextdisplay.c: Don't handle selections as
attributes - that doesn't handle partial-glyph selection
properly. Instead use new pango_layout_line_get_x_ranges()
functionality to draw the selection.
* gtk/gtkentry.c: Simplify code since pango_layout_line_index_to_x()
now properly handles out-of-range coordinates.
* gtk/gtktextbuffer.c: Emit "mark_set" when the cursor is moved.
* gtk/gtktextiter.h gtk/gtktextiterprivate.h: Make gtk_text_iter_get_line_byte()
public.
* gtk/gtktextlayout.[ch]: Properly set the direction in the PangoContext
for paragraphs opposite to the base direction of the widget.
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c: Fixes for alignment.
* gtk/gtktextlayout.c: Don't split segments on marks, since that
causes Arabic words to reshape as you cursor through.
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Implement virtual
cursor position when moving vertically with the arrow keys and
scrolling with page-up/page-down. (Arrow keys save only the X,
scrolling saves both X and Y.)
This means you can line-up / line-down or page-up / page-down
without losing your place, and also that moving vertically
with the cursor keys keeps the same X position, not the same
character count:
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Make vertical
arrow keys move by display lines, not paragraphs.
Tue Apr 18 14:16:50 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c: Make sure that the bin window is at least
as big as the allocation. (Should we also make sure that the
bin window is big enough to completely cover widget->window?)
* gtk/gtktextview.c (gtk_text_view_get_visible_rect): Add
function to get the onscreen rectangle.
* gdk/x11/gdkwindow-x11.c (gdk_window_get_pointer): Correctly account
for offsets in window coordinates.
Sun Apr 16 16:13:27 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_get_cursor_locations): Fix index/offset
confusion.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Set the default direction
from the widget direction.
* gtk/gtktexttag.c gtk/gtktexttagprivate.h (gtk_text_tag_set_arg):
Add a "direction" attribute.
* gtk/gtktextview.c: global s/tkxt/text_view/.
* gtk/testtext.c: Added long block of text in Arabic, to test out
the direction attributes. (Some problems with the shaping system
for arabic become obvious - like the fact the cursor splits words
into unjoined pieces.)
Fri Apr 14 12:54:34 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (render_layout): Add overstrike handling.
* gtk/gtktextlayout.c: Fix up alignment.
* gtk/testtext.c: Add some tests for centering, wrapping.
Fri Apr 14 09:26:22 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add a draw_glyphs() operation to the drawable vtable and gdk_draw_glyphs().
If we wrote GTK+-specific layout-render function this could just replace
the draw_layout() operation in the vtable.
* gtk/gtkentry.c: Move guts of gtk_entry_get_cursor_locations to
pango_layout_get_cursor_pos() and use that function.
* gtk/gtktextchild.[ch]: add gtk_ onto pixmap_segment_new(), since it
is a non-static symbol.
* gtk/gtktextbtree.[ch]: Replace gtk_text_btree_find_line_data_by_y()
with gtk_text_btree_find_line_by_y()
* gtk/gtktextdisplay.c: Rewrote for Pango - uses a custom layout
renderer that handles GtkTextAppearance attributes.
* gtk/gtktexttag.[ch] gtk/gtktexttagprivate.h:
- Move the values in the style that don't affect geometry into a
GtkTextAppearance structure.
- Change underline to take a PangoUnderline and "font" a string
representation of a font description
- Add a "font_desc" attribute which takes a FontDescription structure.
* gtk/gtktextlayout.[ch]:
- Get rid of the display-line list per each line. Instead, we
generate, on demand, a GtkTextLineDisplay structure which]
contains a PangoLayout * and other necesary information
(offsets, cursor locations) for displaying a paragraph.
- Get rid of the code to wrap lines, create display chunks,
etc. Instead, we just go through a paragraph and convert
it into the necessary inputs to a PangoLayout.
- Implement a new attribute type, GtkTextAttrAppearance. This
holds a GtkTextAppearance, and is used to pass colors,
stipple, etc, through from the layout to the display without
having to use lots and lots of individual attributes.
- Reimplement gtk_layout_get_iter_at_pixel() gtk_layout_get_iter_pos()
in terms of PangoLayout functions.
* gtk/gtktextview.c:
- Handle passing the necessary PangoContext to the layout
- Some fixups in painting to deal with the automatic backing store
and offsetting of GTK+-1.4
- Add a style_set handler so that the default style reacts
properly to theme changes.
* gtk/gtktext?*.[ch]: Random code-style fixes.
* gtk/testtext.c: Substitute in languages that Pango handles now for Thai
Mon Apr 10 10:33:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext?*.[ch]: Check in Havoc's port of the Tk text widget,
in original form preparatory to Pango-ization and gdkimcontext-ization.
Thu Apr 6 19:25:39 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.c: Move default implementations to real_* vfuncs,
so that we can derive from gtkimcontext in language bindings properly.
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.
Wed Apr 5 16:27:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.[ch]: Base class for new input context system
* gtk/gtkimmulticontext.[ch]: Proxy input context that allows
the real input context implementation to be loaded from modules
and switched on the fly.
* gtk/gtkcontextsimple.[ch]: Simple implementation of an input
context that just does direct keysymbol => unicode translation.
* gtk/gtkentry.[ch]: Start switching editing over to using
GtkInputContext. (No handling of preedit yet.)
Wed Apr 5 15:48:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktypeutils.h (GTK_CHECK_GET_CLASS): Fix problem with one too
many substitutions. (klass should not be subsituted.)
Wed Apr 5 00:18:14 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Pango
* configure.in docs/Makefile.am: Add test for sgml2html
and allow 'make dist' without building html, but print out
warnings in that case. (For making snapshots)
* gdk/Makefile.am gdk/x11/Makefile.am gtk/Makefile.am:
Add Pango libraries and C flags
* gdk/gdkdraw.c gdk/gdkdrawable.h gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add function (gdk_draw_layout) to draw a pango layout.
* gdk/gdkpango.h gdk/x11/gdkpango-x11.c: New file with functions
for getting Pango contexts for GDK.
* gtk/gtkeditable.c: Get rid of dead code gtk_editable_parent_set()
* gtk/gtkentry.[ch]: Complete rewrite to use Pango, add bidirectional
editing.
* gtk/gtkentry.c: Hack in simple Hebrew input with direct
keysym => unicode translations. More languages can be added
here, but real input-method support is needed.
* docs/Changes-1.4.txt: Added note about entry behavior.
* gtk/gtkenums.h gtk/gtkwidget.[ch] testgtk.c gtkprivate.h: Add functions
to set the reading direction for a widget and the global direction.
Add test which allows toggling the global direction. Two private
flags are used to store the direction. (GTK_DIRECTION_SET + GTK_DIRECTION_LTR)
* gtk/gtkcheckbutton.c gtk/gtkframe.c gtk/gtkhbbox.c gtk/gtkhbox.c
gtk/gtkradiobutton.c gtk/gtkspinbutton.c gtk/gtktable.c
* gtk/gtk[hv]scale.c gtk/gtkscale.[ch]: Draw numbers using Pango
* gtk/gtklabel.[ch]: Moved to Pango and considerably rewritten. Line breaking,
underlining now handled by Pango.
* gtk/gtkstyle.[ch] gtk/gtkrc.[ch]: Add a PangoFontDescription
to RCStyle and Style. (Having both this and the old font name and GdkFont
is temporary.)
* gtk/gtkwidget.[ch] (gtk_widget_create_pango_{context,layout}): Added
convenience functions for creating contexts and layouts for widgets.
* gtk/testgtk.c: Enhance label tests with multilingual labels.
2000-06-02 03:14:07 +00:00
|
|
|
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
|
2010-08-11 21:03:29 +00:00
|
|
|
x = allocation.x + allocation.width - (indicator_size + x - allocation.x);
|
Remove all references to offscreen flag which was no longer used.
Thu Jun 1 23:05:13 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Remove all references to
offscreen flag which was no longer used.
* gtk/gtkprivate.h (enum): Remove unused flags and compress.
* gtk/gtkframe.c (gtk_frame_set_label_widget): Check
for non-null label_widget->parent.
* gtk/gtkentry.c: Get rid of code to deal with PangoAttribute
which no longer was used.
* gdk/gdkpango.c (gdk_pango_context_get_info): make static.
* gdk/gdkpango.c (gdk_draw_layout[_line]): Add checks
for null arguments.
* gdk/x11/gdkgeometry-x11.c (gdk_window_scroll): add
check for destroyed windows.
Thu Jun 1 13:48:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimmulticontext.c: Add a finalize method and unref
the slave context there.
* gtk/gtkinvisible.[ch]: Make reference counting behavior
identical to GtkWindow.
Thu Jun 1 01:54:11 2000 Owen Taylor <otaylor@redhat.com>
* Makefile.am gdk/gdkpango.c: Copy the layout render function from
pangox to here, so we can write them independent of rendering
system, using GDK primitives.
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c
gdk/x11/gdkdrawable-x11.c: Remove draw_layout() from the vtable,
since we have a rendering-system independent implementation in
terms of draw_glyphs().
* gdk/gdkpango.c gdkdrawable.h (gdk_draw_layout_line): New
function to render a single line.
* gdk/x11/gdkpango.c: Move the guts of this file mostly
into ../gdkpango.c, which simplifies things, since we
don't have to deal with raw X gc's.
Fri May 19 04:28:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch]: Add get_log_attrs() function to
get the logical attributes for a given GtkTextLine.
Tue May 30 16:05:39 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track
g_locale_get_codeset() to g_get_codeset() change.
Tue May 30 15:03:19 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testcalendar.c (calendar_font_selection_ok): Use font
descriptions.
* gtk/gtkentry.c (gtk_entry_draw_text): Center text within
the entry.
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
redoing (vastly simplifying) for Pango. Still needs quite
a bit of work. (Size selection is currently poor. List of
predefined sizes is not a good idea, since all of these
sizes won't necessarily be distinct.)
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
CODESET results for LANG=C.
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
which takes a stringized pango font description;
ignore the older 'font' and 'fontset' declarations.
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
field with a GdkFont derived via gdk_font_from_description(),
for compatibility. (Should we just remove it entirely?
Probably too much compatibility breakage, but people
should be migrating to the new Pango stuff as quickly
as possible.)
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
redoing; there are some bugs in size allocation right
now, the semi-existant distinction between header / day
fonts was removed, but, with Pango, could actually
be made functional in a nice way.
* gtk/testcalender: Move calender from examples into this
directory as a test program. (We really need to restrcture
testgtk into a whole directory full of tests for every
widget or functionality group, separated into multiple .c
files.)
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (file_exists): Fix stupid typo that
was keeping RC file from being loaded.
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
RC file font code.
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
Add function to load a GdkFont from a PangoFontDescription.
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
to have any widget for the label, use a GtkLabel widget
to display the text. (Based partially on a patch from
Anders Carlson.)
(Quite a bit of code reorganization - strip 90% of the
guts out of gtkaspectframe and add a single virtual
func to GtkFrameClass - compute_child_allocation.)
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
(Removed clist->row_center_offset field because caching
it wasn't saving time or code, added private function
_gtk_clist_create_cell_layout()).
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c: Pangoized.
* gtk/[hv]ruler.c: Pangoized
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_init):
Use gtk_clist_set_column_auto_resize() to remove need
need for manual column width computations.
Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktooltips.[ch]: Replace custom drawing with a GtkLabel,
ensuring Pango correctness, and considerably simplifying the
code.
* gtk/gtklabel.c gtk[hv]scale.c: 1000 => PANGO_SCALE.
* gtk/gtklabel.c (gtk_label_size_request): Fixed incorrect
getting of numbers of lines.
* gtk/gtklabel.c (gtk_label_size_request): Set the requisition
to the actual requested width of the lable, not to the wrap
width we set.
* gtk/gtktextchild.h: Remove extraneous include of gtk/gtk.h.
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
* gtk/gtktextview.c: Fix structure inheritance.
* gtk/gtkprogressbar.c: Pangoize.
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextview.c (gtk_text_view_get_first_para_iter): Encapsulate
in a function.
* gtk/gtktextlayout.c (find_display_line_above): Fixed
bug with computing line tops.
* gtk/gtktextview.c (changed_handler): Fix < , <= confusion.
Thu May 18 18:53:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (gtk_text_layout_draw): Fix up the x_offset
and y_offset coordinates to do what we need now. (The offset between
buffer and layout coordinates has been reintroduced, but is a
bit different than before.)
* gtk/gtktextview.[ch]: No longer inherit from GtkLayout; instead
handle the adjustments ourselves, and scroll as necessary using
the new gdk_window_scroll().
The advantage of this is that when we are incrementally revalidating,
we are essentially rearranging things around the visible portion
of the screen. With the old setup, the visible portion of the
screen was moved around in the layout, so scrolling and redrawing
to track that caused jumping of the display. Since we now
control the scrolling ourselves, we can suppress this and
only redraw when things actually change.
Thu May 18 18:47:25 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (redisplay_mark): We need to invalidate
the region not just redisplay it after-all, since we store the
cursors in the LineDisplay. (Ugly interactions here between
GtkLayout and GtkTextBTree here.)
* gtk/gtktextbtree.c (redisplay_region): Fixed reversed comparison.
Thu May 18 18:43:21 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.h gdk/x11/gdkgeometry-x11.c (gdk_window_scroll):
Added function to scroll contents of a window while keeping the
window constant. Works by XCopyArea or guffaw-scrolling depending
on the details of how the window is set up. (guffaw-scrolling
still needs to be filled in.)
Wed May 17 22:36:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextiter.c gtk/gtkmain.c: Add a debug key for the text widget,
move the debugging that was tied to a global variable
to that.
* gtk/gtkmarshal.list: Add NONE:INT,INT,INT
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.c: Keep a separate
validated flag, in line data instead of setting height/width to
-1. This allows us to perform operations with partially invalid
buffer (using the old size for invalid lines) and thus to do
incremental vaidation. Keep height/width aggregates up to date
when deleting text and rebalancing the tree.
* gtk/gtktextbtree.[ch]: Add functions validate a line
(gtk_text_btree_validate_line), and to validate up
to a number of pixels (gtk_text_btree_validate).
* gtk/gtktextlayout.[ch]: Add an ::invalidated signal
that indicates that something is changed and a revalidation
pass is needed. Change ::need_repaint to ::changed, and
make it take old and new yranges instead of a rectangle.
* gtk/gtktextbtree.[ch] gtk/gtktextlayout.[ch]: Move
the line_data_destroy() function from
gtk_text_btree_add_view() to a virtual function in
GtkTextLayout
* gtk/gtktextbtree.[ch]: Remove gtk_text_btree_get_damage_range(),
since we are handling partial repaints in a different fashion
now.
* gtk/gtktextbtree.[ch]: Only repaint the changed portion
of the selection instead of queueing a repaint on the
entire widget.
* gtk/gtktextbuffer.[ch] gtk/gtktextbtree.[ch]: Move
get_selection_bounds() down to btree, make the function
in buffer a wrapper around the btree function.
* gtk/gtktextlayout.[ch]: Add functions to check if the
layout is valid and to recompute either a range of pixels
aroudn a line or a certain total number of pixels.
* gtk/gtktextlayout.[ch]: Cache a single line display;
now that we only redraw the needed portions, the hit rate
for this cache is quite high.
* gtk/gtktextview.[ch]: Keep track of the first paragraph
on the screen so that when re-laying-out the buffer, we can
keep the same place. This requires connecting to ::value_changed
on the adjustments
* gtk/gtktextview.[ch]: Add idle functions to revalidate
the buffer after we receive an ::invalidated signal.
Wed May 17 22:10:47 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_size_allocate): Set upper
to max of allocation and layout size, not just to the
layout size.
* gtk/gtk[hv]scrollbar.c (gtk_[hv]scrollbar_calc_slider_size):
Invalidate window so it gets redrawn properly.
* gdk/gdkwindow.c (gdk_window_invalidate_rect): Allow rect == NULL
to mean the entire window.
* gdk/gdkevents.h: Move definition for GDK_PRIORITY_REDRAW
into public header.
Mon May 15 14:51:31 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextmark.c (gtk_text_mark_get_name): Add function
to get the name of a mark.
* gtk/gtktextlayout.c (gtk_text_layout_get_line_at_y): Add a function
to find the paragraph from a y position.
Thu May 11 12:57:20 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_invalidate_upward): Valid
nodes have width/height >= 0, not > 0.
Tue May 9 21:29:06 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c (gtk_text_layout_get_line_display):
Add a size_only flag, so when we only need the size, we don't create
useless appearance attributes.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Remove
duplicate setting of font description.
* gtk/gtkscale.c: Use PANGO_SCALE instead of 1000
Wed Apr 26 01:53:23 2000 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am (EXTRA_DIST): Add OLD_STAMP into
EXTRA_DIST. It does not work well when the file that
everything depends on is not in the tarball.
Wed Apr 26 00:56:14 2000 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c: Some hacks and fixes so that it basically
works when not sitting in the GTK+ build tree.
2000-05-03 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_line_next_could_contain_tag):
Properly determine the ordering of the tag root and the current
line within the tree. Previous algorithm only worked if the tag
root's immediate parent was the common root of both the current
line and the tag root.
Wed Apr 26 00:43:00 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (set_para_values): Fix some bugs in
alignment.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Track
the widget text directional dynamically.
* gtk/gtktextview.[ch]: Added functions to get and set default
wrap mode.
Tue Apr 25 23:47:38 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_get_iter_location): Fix bug
in cursor location computation.
Tue Apr 25 23:22:59 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c (gtk_layout_set_size): Clamp hadjustment/
vadjusment values properly when layout gets smaller.
* gtk/gtktextview.c (need_repaint_handler): Areas being
passed in are far completely inaccurate, and sometimes
too small, so, for now, just queue a redraw on the
whole visible region.
2000-04-25 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (summary_destroy): new function to
destroy tag summary nodes
(gtk_text_line_next_could_contain_tag): this function was
totally broken if the line passed in wasn't below the tag
root. Fix it.
(gtk_text_btree_first_could_contain_tag): In the tag == NULL
"wildcard" case, we have to do a linear scan. Blah.
(gtk_text_btree_last_could_contain_tag): In tag == NULL case,
we have to do the linear scan
(tag_removed_cb): When a tag is removed from the tag table,
remove the GtkTextTagInfo node from the btree.
(gtk_text_btree_spew): Implement the spew function, for
our debugging pleasure.
Tue Apr 25 19:40:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
a problem with referring to the wrong buffer.
* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
font description to gtk_style_new() - otherwise things
don't work without a .gtkrc file.
* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
tags table if we create it ourself, too.
* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
it was conflicting with XKB modifiers.
* gtk/gtktextview.[ch]: Add simple support for
GtkIMContext.
Mon Apr 24 19:34:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
with deletion from last commit.
Mon Apr 24 19:29:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_create_pango_context): Set the language
in the context from the current locale.
* gtk/gtkentry.c (gtk_entry_size_request): Use language from the
context, not hardcoded value.
* gtk/gtkentry.c (gtk_entry_move_cursor): Make character movement visual,
not logical.
Sun Apr 23 23:39:18 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c gtk/gtktextdisplay.c: Don't handle selections as
attributes - that doesn't handle partial-glyph selection
properly. Instead use new pango_layout_line_get_x_ranges()
functionality to draw the selection.
* gtk/gtkentry.c: Simplify code since pango_layout_line_index_to_x()
now properly handles out-of-range coordinates.
* gtk/gtktextbuffer.c: Emit "mark_set" when the cursor is moved.
* gtk/gtktextiter.h gtk/gtktextiterprivate.h: Make gtk_text_iter_get_line_byte()
public.
* gtk/gtktextlayout.[ch]: Properly set the direction in the PangoContext
for paragraphs opposite to the base direction of the widget.
* gtk/gtktextlayout.[ch] gtk/gtktextdisplay.c: Fixes for alignment.
* gtk/gtktextlayout.c: Don't split segments on marks, since that
causes Arabic words to reshape as you cursor through.
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Implement virtual
cursor position when moving vertically with the arrow keys and
scrolling with page-up/page-down. (Arrow keys save only the X,
scrolling saves both X and Y.)
This means you can line-up / line-down or page-up / page-down
without losing your place, and also that moving vertically
with the cursor keys keeps the same X position, not the same
character count:
* gtk/gtktextlayout.[ch] gtk/gtktextview.[ch]: Make vertical
arrow keys move by display lines, not paragraphs.
Tue Apr 18 14:16:50 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtklayout.c: Make sure that the bin window is at least
as big as the allocation. (Should we also make sure that the
bin window is big enough to completely cover widget->window?)
* gtk/gtktextview.c (gtk_text_view_get_visible_rect): Add
function to get the onscreen rectangle.
* gdk/x11/gdkwindow-x11.c (gdk_window_get_pointer): Correctly account
for offsets in window coordinates.
Sun Apr 16 16:13:27 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_get_cursor_locations): Fix index/offset
confusion.
* gtk/gtktextview.c (gtk_text_view_ensure_layout): Set the default direction
from the widget direction.
* gtk/gtktexttag.c gtk/gtktexttagprivate.h (gtk_text_tag_set_arg):
Add a "direction" attribute.
* gtk/gtktextview.c: global s/tkxt/text_view/.
* gtk/testtext.c: Added long block of text in Arabic, to test out
the direction attributes. (Some problems with the shaping system
for arabic become obvious - like the fact the cursor splits words
into unjoined pieces.)
Fri Apr 14 12:54:34 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextdisplay.c (render_layout): Add overstrike handling.
* gtk/gtktextlayout.c: Fix up alignment.
* gtk/testtext.c: Add some tests for centering, wrapping.
Fri Apr 14 09:26:22 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdrawable.h gdk/gdkdraw.c gdk/gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add a draw_glyphs() operation to the drawable vtable and gdk_draw_glyphs().
If we wrote GTK+-specific layout-render function this could just replace
the draw_layout() operation in the vtable.
* gtk/gtkentry.c: Move guts of gtk_entry_get_cursor_locations to
pango_layout_get_cursor_pos() and use that function.
* gtk/gtktextchild.[ch]: add gtk_ onto pixmap_segment_new(), since it
is a non-static symbol.
* gtk/gtktextbtree.[ch]: Replace gtk_text_btree_find_line_data_by_y()
with gtk_text_btree_find_line_by_y()
* gtk/gtktextdisplay.c: Rewrote for Pango - uses a custom layout
renderer that handles GtkTextAppearance attributes.
* gtk/gtktexttag.[ch] gtk/gtktexttagprivate.h:
- Move the values in the style that don't affect geometry into a
GtkTextAppearance structure.
- Change underline to take a PangoUnderline and "font" a string
representation of a font description
- Add a "font_desc" attribute which takes a FontDescription structure.
* gtk/gtktextlayout.[ch]:
- Get rid of the display-line list per each line. Instead, we
generate, on demand, a GtkTextLineDisplay structure which]
contains a PangoLayout * and other necesary information
(offsets, cursor locations) for displaying a paragraph.
- Get rid of the code to wrap lines, create display chunks,
etc. Instead, we just go through a paragraph and convert
it into the necessary inputs to a PangoLayout.
- Implement a new attribute type, GtkTextAttrAppearance. This
holds a GtkTextAppearance, and is used to pass colors,
stipple, etc, through from the layout to the display without
having to use lots and lots of individual attributes.
- Reimplement gtk_layout_get_iter_at_pixel() gtk_layout_get_iter_pos()
in terms of PangoLayout functions.
* gtk/gtktextview.c:
- Handle passing the necessary PangoContext to the layout
- Some fixups in painting to deal with the automatic backing store
and offsetting of GTK+-1.4
- Add a style_set handler so that the default style reacts
properly to theme changes.
* gtk/gtktext?*.[ch]: Random code-style fixes.
* gtk/testtext.c: Substitute in languages that Pango handles now for Thai
Mon Apr 10 10:33:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktext?*.[ch]: Check in Havoc's port of the Tk text widget,
in original form preparatory to Pango-ization and gdkimcontext-ization.
Thu Apr 6 19:25:39 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.c: Move default implementations to real_* vfuncs,
so that we can derive from gtkimcontext in language bindings properly.
Thu Apr 6 16:02:52 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.[ch]: Use gdk_keyval_to_unicode to gdk_unicode_to_keyval.
Add a compose table including (almost) all the compose combinations
from X. This is 6k of static, shared data as opposed to 50k or so of dynamic
data in the XIM implementation.
* gdk/gdk.h gdk/gdkkeyuni.c gdk/win32/gdkevents-win32.c (gdk_keyval_to_unicode, gdk_unicode_to_keyval):
Moved functions to convert keyvalues from and to unicode here from
the win32 port and made them public.
Wed Apr 5 16:37:29 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkeditable.c (gtk_editable_insert_text): Allow new_text_length == -1.
Wed Apr 5 16:27:45 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.[ch]: Base class for new input context system
* gtk/gtkimmulticontext.[ch]: Proxy input context that allows
the real input context implementation to be loaded from modules
and switched on the fly.
* gtk/gtkcontextsimple.[ch]: Simple implementation of an input
context that just does direct keysymbol => unicode translation.
* gtk/gtkentry.[ch]: Start switching editing over to using
GtkInputContext. (No handling of preedit yet.)
Wed Apr 5 15:48:41 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktypeutils.h (GTK_CHECK_GET_CLASS): Fix problem with one too
many substitutions. (klass should not be subsituted.)
Wed Apr 5 00:18:14 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Pango
* configure.in docs/Makefile.am: Add test for sgml2html
and allow 'make dist' without building html, but print out
warnings in that case. (For making snapshots)
* gdk/Makefile.am gdk/x11/Makefile.am gtk/Makefile.am:
Add Pango libraries and C flags
* gdk/gdkdraw.c gdk/gdkdrawable.h gdkwindow.c gdk/x11/gdkdrawable-x11.c:
Add function (gdk_draw_layout) to draw a pango layout.
* gdk/gdkpango.h gdk/x11/gdkpango-x11.c: New file with functions
for getting Pango contexts for GDK.
* gtk/gtkeditable.c: Get rid of dead code gtk_editable_parent_set()
* gtk/gtkentry.[ch]: Complete rewrite to use Pango, add bidirectional
editing.
* gtk/gtkentry.c: Hack in simple Hebrew input with direct
keysym => unicode translations. More languages can be added
here, but real input-method support is needed.
* docs/Changes-1.4.txt: Added note about entry behavior.
* gtk/gtkenums.h gtk/gtkwidget.[ch] testgtk.c gtkprivate.h: Add functions
to set the reading direction for a widget and the global direction.
Add test which allows toggling the global direction. Two private
flags are used to store the direction. (GTK_DIRECTION_SET + GTK_DIRECTION_LTR)
* gtk/gtkcheckbutton.c gtk/gtkframe.c gtk/gtkhbbox.c gtk/gtkhbox.c
gtk/gtkradiobutton.c gtk/gtkspinbutton.c gtk/gtktable.c
* gtk/gtk[hv]scale.c gtk/gtkscale.[ch]: Draw numbers using Pango
* gtk/gtklabel.[ch]: Moved to Pango and considerably rewritten. Line breaking,
underlining now handled by Pango.
* gtk/gtkstyle.[ch] gtk/gtkrc.[ch]: Add a PangoFontDescription
to RCStyle and Style. (Having both this and the old font name and GdkFont
is temporary.)
* gtk/gtkwidget.[ch] (gtk_widget_create_pango_{context,layout}): Added
convenience functions for creating contexts and layouts for widgets.
* gtk/testgtk.c: Enhance label tests with multilingual labels.
2000-06-02 03:14:07 +00:00
|
|
|
|
2010-03-03 20:49:33 +00:00
|
|
|
if (gtk_widget_get_state (widget) == GTK_STATE_PRELIGHT)
|
2002-02-22 13:34:28 +00:00
|
|
|
{
|
|
|
|
GdkRectangle restrict_area;
|
|
|
|
GdkRectangle new_area;
|
2010-08-11 21:03:29 +00:00
|
|
|
|
|
|
|
restrict_area.x = allocation.x + border_width;
|
|
|
|
restrict_area.y = allocation.y + border_width;
|
|
|
|
restrict_area.width = allocation.width - (2 * border_width);
|
|
|
|
restrict_area.height = allocation.height - (2 * border_width);
|
|
|
|
|
2002-02-22 13:34:28 +00:00
|
|
|
if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
|
|
|
|
{
|
2010-08-11 21:03:29 +00:00
|
|
|
gtk_paint_flat_box (style, window,
|
|
|
|
GTK_STATE_PRELIGHT,
|
2002-02-22 13:34:28 +00:00
|
|
|
GTK_SHADOW_ETCHED_OUT,
|
|
|
|
area, widget, "checkbutton",
|
|
|
|
new_area.x, new_area.y,
|
|
|
|
new_area.width, new_area.height);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-08-11 21:03:29 +00:00
|
|
|
gtk_paint_option (style, window,
|
2001-09-19 00:49:52 +00:00
|
|
|
state_type, shadow_type,
|
1998-11-06 22:05:02 +00:00
|
|
|
area, widget, "radiobutton",
|
Fix G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
Mon Apr 2 10:47:57 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_class_init): Fix
G_VALUE_NO_COPY_CONTENTS instead of G_SIGNAL_TYPE_STATIC_SCOPE
stupidity.
Mon Apr 2 00:51:11 2001 Owen Taylor <otaylor@redhat.com>
[ First pass at adding style properties. Still needs some definite
fine-tuning. ]
* gtk/gtkbutton.c: Add ::default_spacing style property.
* gtk/gtkcheckbutton.[ch] gtkradiobutton.c: Add ::indicator_size,
::indicator_spacing style properties.
* gtk/gtkoptionmenu.c: Add ::indicator_size, ::indicator_spacing
style properties.
* gtk/gtk{,h,v}paned.[ch]: Make handle_size a style property
rather than a normal property.
* gtk/gtkwidget.c: Add an ::interior_focus style property to
draw focus inside buttons, in the Windows/Java Metal/etc. style.
* gtk/gtkbutton.c gtk/gtkcheckbutton.c gtk/gtktogglenbutton.c:
Honor ::interior_focus.
* gtk/gtkentry.c: Don't draw focus at all when ::interior_focus is
TRUE.
* gtk/gtkrange.[ch] gtk/gtk{h,v}scrollbar.c gtk/gtk{h,v}scale.c:
Add ::slider_width, ::trough_border, ::stepper_size,
::stepper_spacing style properties.
* gtk/gtkscale.[ch] Add ::slider-length style property.
2001-04-02 15:51:28 +00:00
|
|
|
x, y, indicator_size, indicator_size);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|