fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
|
|
|
|
* Copyright (C) 1998 Tim Janik
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* 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
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include "gtkmain.h"
|
|
|
|
#include "gtksignal.h"
|
|
|
|
#include "gtkaccellabel.h"
|
|
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
ARG_0,
|
|
|
|
ARG_ACCEL_WIDGET,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void gtk_accel_label_class_init (GtkAccelLabelClass *klass);
|
|
|
|
static void gtk_accel_label_init (GtkAccelLabel *accel_label);
|
|
|
|
static void gtk_accel_label_set_arg (GtkAccelLabel *accel_label,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_accel_label_get_arg (GtkAccelLabel *accel_label,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_accel_label_destroy (GtkObject *object);
|
|
|
|
static void gtk_accel_label_finalize (GtkObject *object);
|
|
|
|
static void gtk_accel_label_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition);
|
|
|
|
static gint gtk_accel_label_expose_event (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event);
|
|
|
|
|
|
|
|
static GtkAccelLabelClass *accel_label_class = NULL;
|
|
|
|
static GtkLabelClass *parent_class = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
GtkType
|
|
|
|
gtk_accel_label_get_type (void)
|
|
|
|
{
|
|
|
|
static GtkType accel_label_type = 0;
|
|
|
|
|
|
|
|
if (!accel_label_type)
|
|
|
|
{
|
|
|
|
GtkTypeInfo accel_label_info =
|
|
|
|
{
|
|
|
|
"GtkAccelLabel",
|
|
|
|
sizeof (GtkAccelLabel),
|
|
|
|
sizeof (GtkAccelLabelClass),
|
|
|
|
(GtkClassInitFunc) gtk_accel_label_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_accel_label_init,
|
|
|
|
(GtkArgSetFunc) gtk_accel_label_set_arg,
|
|
|
|
(GtkArgGetFunc) gtk_accel_label_get_arg,
|
|
|
|
};
|
|
|
|
|
|
|
|
accel_label_type = gtk_type_unique (gtk_label_get_type (), &accel_label_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return accel_label_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_class_init (GtkAccelLabelClass *class)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkMiscClass *misc_class;
|
|
|
|
GtkLabelClass *label_class;
|
|
|
|
|
|
|
|
accel_label_class = class;
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
misc_class = (GtkMiscClass*) class;
|
|
|
|
label_class = (GtkLabelClass*) class;
|
|
|
|
|
|
|
|
parent_class = gtk_type_class (gtk_label_get_type ());
|
|
|
|
|
|
|
|
gtk_object_add_arg_type ("GtkAccelLabel::accel_widget", GTK_TYPE_WIDGET, GTK_ARG_READWRITE, ARG_ACCEL_WIDGET);
|
|
|
|
|
|
|
|
object_class->destroy = gtk_accel_label_destroy;
|
|
|
|
object_class->finalize = gtk_accel_label_finalize;
|
|
|
|
|
|
|
|
widget_class->size_request = gtk_accel_label_size_request;
|
|
|
|
widget_class->expose_event = gtk_accel_label_expose_event;
|
|
|
|
|
|
|
|
class->signal_quote1 = g_strdup ("<:");
|
|
|
|
class->signal_quote2 = g_strdup (":>");
|
|
|
|
class->mod_name_shift = g_strdup ("Shft");
|
|
|
|
class->mod_name_control = g_strdup ("Ctl");
|
|
|
|
class->mod_name_alt = g_strdup ("Alt");
|
|
|
|
class->mod_separator = g_strdup ("+");
|
|
|
|
class->accel_seperator = g_strdup (" / ");
|
|
|
|
class->latin1_to_char = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_set_arg (GtkAccelLabel *accel_label,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_ACCEL_WIDGET:
|
|
|
|
gtk_accel_label_set_accel_widget (accel_label, (GtkWidget*) GTK_VALUE_OBJECT (*arg));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_get_arg (GtkAccelLabel *accel_label,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_ACCEL_WIDGET:
|
|
|
|
GTK_VALUE_OBJECT (*arg) = (GtkObject*) accel_label->accel_widget;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
arg->type = GTK_TYPE_INVALID;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_init (GtkAccelLabel *accel_label)
|
|
|
|
{
|
|
|
|
accel_label->queue_id = 0;
|
|
|
|
accel_label->accel_padding = 3;
|
|
|
|
accel_label->accel_widget = NULL;
|
|
|
|
accel_label->accel_string = NULL;
|
|
|
|
|
|
|
|
gtk_accel_label_refetch (accel_label);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkWidget*
|
|
|
|
gtk_accel_label_new (const gchar *string)
|
|
|
|
{
|
|
|
|
GtkAccelLabel *accel_label;
|
|
|
|
|
|
|
|
g_return_val_if_fail (string != NULL, NULL);
|
|
|
|
|
|
|
|
accel_label = gtk_type_new (GTK_TYPE_ACCEL_LABEL);
|
|
|
|
|
|
|
|
gtk_label_set (GTK_LABEL (accel_label), string);
|
|
|
|
|
|
|
|
return GTK_WIDGET (accel_label);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_destroy (GtkObject *object)
|
|
|
|
{
|
|
|
|
GtkAccelLabel *accel_label;
|
|
|
|
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_ACCEL_LABEL (object));
|
|
|
|
|
|
|
|
accel_label = GTK_ACCEL_LABEL (object);
|
|
|
|
|
|
|
|
gtk_accel_label_set_accel_widget (accel_label, NULL);
|
|
|
|
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_finalize (GtkObject *object)
|
|
|
|
{
|
|
|
|
GtkAccelLabel *accel_label;
|
|
|
|
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_ACCEL_LABEL (object));
|
|
|
|
|
|
|
|
accel_label = GTK_ACCEL_LABEL (object);
|
|
|
|
|
|
|
|
g_free (accel_label->accel_string);
|
|
|
|
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
1998-06-18 03:22:09 +00:00
|
|
|
guint
|
|
|
|
gtk_accel_label_accelerator_width (GtkAccelLabel *accel_label)
|
|
|
|
{
|
1998-06-18 22:32:36 +00:00
|
|
|
g_return_val_if_fail (accel_label != NULL, 0);
|
|
|
|
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), 0);
|
1998-06-18 03:22:09 +00:00
|
|
|
|
|
|
|
return accel_label->accel_padding + accel_label->accel_string_width;
|
|
|
|
}
|
|
|
|
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
static void
|
|
|
|
gtk_accel_label_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
|
|
|
GtkAccelLabel *accel_label;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_ACCEL_LABEL (widget));
|
|
|
|
g_return_if_fail (requisition != NULL);
|
|
|
|
|
|
|
|
accel_label = GTK_ACCEL_LABEL (widget);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->size_request)
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
|
|
|
|
|
|
|
|
accel_label->accel_string_width = gdk_string_width (GTK_WIDGET (accel_label)->style->font,
|
|
|
|
accel_label->accel_string);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_accel_label_expose_event (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event)
|
|
|
|
{
|
|
|
|
GtkMisc *misc;
|
|
|
|
GtkAccelLabel *accel_label;
|
|
|
|
|
|
|
|
g_return_val_if_fail (widget != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (widget), FALSE);
|
|
|
|
g_return_val_if_fail (event != NULL, FALSE);
|
|
|
|
|
|
|
|
accel_label = GTK_ACCEL_LABEL (widget);
|
|
|
|
misc = GTK_MISC (accel_label);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_DRAWABLE (accel_label))
|
|
|
|
{
|
|
|
|
guint ac_width;
|
|
|
|
|
1998-06-18 03:22:09 +00:00
|
|
|
ac_width = gtk_accel_label_accelerator_width (accel_label);
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
|
1998-06-18 03:22:09 +00:00
|
|
|
if (widget->allocation.width >= widget->requisition.width + ac_width)
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
{
|
|
|
|
guint x;
|
|
|
|
guint y;
|
|
|
|
|
|
|
|
widget->allocation.width -= ac_width;
|
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
|
|
|
|
widget->allocation.width += ac_width;
|
|
|
|
|
|
|
|
x = widget->allocation.x + widget->allocation.width - misc->xpad - ac_width;
|
|
|
|
|
|
|
|
y = (widget->allocation.y * (1.0 - misc->yalign) +
|
|
|
|
(widget->allocation.y + widget->allocation.height -
|
|
|
|
(widget->requisition.height - misc->ypad * 2)) *
|
|
|
|
misc->yalign + widget->style->font->ascent) + 1.5;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (accel_label) == GTK_STATE_INSENSITIVE)
|
|
|
|
gdk_draw_string (widget->window,
|
|
|
|
widget->style->font,
|
|
|
|
widget->style->white_gc,
|
|
|
|
x + 1,
|
|
|
|
y + 1,
|
|
|
|
accel_label->accel_string);
|
|
|
|
|
|
|
|
gdk_draw_string (widget->window,
|
|
|
|
widget->style->font,
|
|
|
|
widget->style->fg_gc[GTK_WIDGET_STATE (accel_label)],
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
accel_label->accel_string);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_accel_label_queue_refetch (GtkAccelLabel *accel_label)
|
|
|
|
{
|
|
|
|
g_return_if_fail (accel_label != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
|
|
|
|
|
|
|
|
if (accel_label->queue_id == 0)
|
|
|
|
accel_label->queue_id = gtk_idle_add_priority (GTK_PRIORITY_HIGH - 2,
|
|
|
|
(GtkFunction) gtk_accel_label_refetch,
|
|
|
|
accel_label);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
|
|
|
|
GtkWidget *accel_widget)
|
|
|
|
{
|
|
|
|
g_return_if_fail (accel_label != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
|
|
|
|
if (accel_widget != NULL)
|
|
|
|
g_return_if_fail (GTK_IS_WIDGET (accel_widget));
|
|
|
|
|
|
|
|
if (accel_widget != accel_label->accel_widget)
|
|
|
|
{
|
|
|
|
if (accel_label->accel_widget)
|
|
|
|
{
|
|
|
|
gtk_signal_disconnect_by_func (GTK_OBJECT (accel_label->accel_widget),
|
|
|
|
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch),
|
|
|
|
accel_label);
|
|
|
|
gtk_widget_unref (accel_label->accel_widget);
|
|
|
|
}
|
|
|
|
if (accel_label->queue_id)
|
|
|
|
{
|
|
|
|
gtk_idle_remove (accel_label->queue_id);
|
|
|
|
accel_label->queue_id = 0;
|
|
|
|
}
|
|
|
|
accel_label->accel_widget = accel_widget;
|
|
|
|
if (accel_label->accel_widget)
|
|
|
|
{
|
|
|
|
gtk_widget_ref (accel_label->accel_widget);
|
|
|
|
gtk_signal_connect_object_after (GTK_OBJECT (accel_label->accel_widget),
|
|
|
|
"add-accelerator",
|
|
|
|
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch),
|
|
|
|
GTK_OBJECT (accel_label));
|
|
|
|
gtk_signal_connect_object_after (GTK_OBJECT (accel_label->accel_widget),
|
|
|
|
"remove-accelerator",
|
|
|
|
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch),
|
|
|
|
GTK_OBJECT (accel_label));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gtk_accel_label_refetch (GtkAccelLabel *accel_label)
|
|
|
|
{
|
|
|
|
GtkAccelLabelClass *class;
|
|
|
|
|
|
|
|
g_return_val_if_fail (accel_label != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), FALSE);
|
|
|
|
|
|
|
|
class = GTK_ACCEL_LABEL_CLASS (GTK_OBJECT (accel_label)->klass);
|
|
|
|
|
|
|
|
g_free (accel_label->accel_string);
|
|
|
|
accel_label->accel_string = NULL;
|
|
|
|
|
|
|
|
if (accel_label->accel_widget)
|
|
|
|
{
|
|
|
|
GtkAccelEntry *entry = NULL;
|
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
slist = gtk_accel_group_entries_from_object (GTK_OBJECT (accel_label->accel_widget));
|
|
|
|
for (; slist; slist = slist->next)
|
|
|
|
{
|
|
|
|
entry = slist->data;
|
|
|
|
if (entry->accel_flags & GTK_ACCEL_VISIBLE)
|
|
|
|
{
|
|
|
|
GString *gstring;
|
|
|
|
gboolean had_mod;
|
|
|
|
|
|
|
|
gstring = g_string_new (accel_label->accel_string);
|
|
|
|
if (gstring->len)
|
|
|
|
g_string_append (gstring, class->accel_seperator);
|
|
|
|
else
|
|
|
|
g_string_append (gstring, " ");
|
|
|
|
|
|
|
|
if (entry->accel_flags & GTK_ACCEL_SIGNAL_VISIBLE)
|
|
|
|
{
|
|
|
|
g_string_append (gstring, class->signal_quote1);
|
|
|
|
g_string_append (gstring, gtk_signal_name (entry->signal_id));
|
|
|
|
g_string_append (gstring, class->signal_quote2);
|
|
|
|
}
|
|
|
|
|
|
|
|
had_mod = FALSE;
|
|
|
|
if (entry->accelerator_mods & GDK_SHIFT_MASK)
|
|
|
|
{
|
|
|
|
g_string_append (gstring, class->mod_name_shift);
|
|
|
|
had_mod = TRUE;
|
|
|
|
}
|
|
|
|
if (entry->accelerator_mods & GDK_CONTROL_MASK)
|
|
|
|
{
|
|
|
|
if (had_mod)
|
|
|
|
g_string_append (gstring, class->mod_separator);
|
|
|
|
g_string_append (gstring, class->mod_name_control);
|
|
|
|
had_mod = TRUE;
|
|
|
|
}
|
|
|
|
if (entry->accelerator_mods & GDK_MOD1_MASK)
|
|
|
|
{
|
|
|
|
if (had_mod)
|
|
|
|
g_string_append (gstring, class->mod_separator);
|
|
|
|
g_string_append (gstring, class->mod_name_alt);
|
|
|
|
had_mod = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (had_mod)
|
|
|
|
g_string_append (gstring, class->mod_separator);
|
|
|
|
if (entry->accelerator_key < 0x80 ||
|
|
|
|
(entry->accelerator_key > 0x80 &&
|
|
|
|
entry->accelerator_key <= 0xff &&
|
|
|
|
class->latin1_to_char))
|
|
|
|
{
|
|
|
|
switch (entry->accelerator_key)
|
|
|
|
{
|
|
|
|
case ' ':
|
|
|
|
g_string_append (gstring, "Space");
|
|
|
|
break;
|
|
|
|
case '\\':
|
|
|
|
g_string_append (gstring, "Backslash");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_string_append_c (gstring, toupper (entry->accelerator_key));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gchar *tmp;
|
|
|
|
|
|
|
|
tmp = gtk_accelerator_name (entry->accelerator_key, 0);
|
|
|
|
if (tmp[0] != 0 && tmp[1] == 0)
|
|
|
|
tmp[0] = toupper (tmp[0]);
|
|
|
|
g_string_append (gstring, tmp);
|
|
|
|
g_free (tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (accel_label->accel_string);
|
|
|
|
accel_label->accel_string = gstring->str;
|
|
|
|
g_string_free (gstring, FALSE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!accel_label->accel_string)
|
|
|
|
accel_label->accel_string = g_strdup ("");
|
|
|
|
|
|
|
|
if (accel_label->queue_id)
|
|
|
|
{
|
|
|
|
gtk_idle_remove (accel_label->queue_id);
|
|
|
|
accel_label->queue_id = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (accel_label));
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|