1997-11-24 22:37:52 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* 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
|
1997-12-23 02:12:10 +00:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
1997-11-24 22:37:52 +00:00
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library 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
|
|
|
*/
|
|
|
|
#include <ctype.h>
|
1997-12-23 02:12:10 +00:00
|
|
|
#include <unistd.h>
|
1998-05-03 22:41:32 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/param.h>
|
1997-12-23 02:12:10 +00:00
|
|
|
#include <fcntl.h>
|
1997-11-24 22:37:52 +00:00
|
|
|
#include <string.h>
|
1997-12-23 02:12:10 +00:00
|
|
|
#include <stdio.h>
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkrc.h"
|
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
|
|
|
#include "gtkbindings.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
enum {
|
1997-12-23 02:12:10 +00:00
|
|
|
TOKEN_INVALID = G_TOKEN_LAST,
|
1998-05-01 04:23:59 +00:00
|
|
|
TOKEN_INCLUDE,
|
1997-11-24 22:37:52 +00:00
|
|
|
TOKEN_ACTIVE,
|
|
|
|
TOKEN_BASE,
|
|
|
|
TOKEN_BG,
|
|
|
|
TOKEN_BG_PIXMAP,
|
|
|
|
TOKEN_FG,
|
|
|
|
TOKEN_FONT,
|
|
|
|
TOKEN_FONTSET,
|
|
|
|
TOKEN_INSENSITIVE,
|
|
|
|
TOKEN_NORMAL,
|
|
|
|
TOKEN_PIXMAP_PATH,
|
|
|
|
TOKEN_PRELIGHT,
|
|
|
|
TOKEN_SELECTED,
|
|
|
|
TOKEN_STYLE,
|
|
|
|
TOKEN_TEXT,
|
|
|
|
TOKEN_WIDGET,
|
1998-06-30 11:05:20 +00:00
|
|
|
TOKEN_WIDGET_CLASS,
|
|
|
|
TOKEN_LAST
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct _GtkRcStyle GtkRcStyle;
|
|
|
|
typedef struct _GtkRcSet GtkRcSet;
|
1998-03-08 21:47:14 +00:00
|
|
|
typedef struct _GtkRcNode GtkRcNode;
|
1998-05-03 22:41:32 +00:00
|
|
|
typedef struct _GtkRcFile GtkRcFile;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
struct _GtkRcNode
|
|
|
|
{
|
|
|
|
GdkColormap *cmap;
|
|
|
|
GtkStyle *style;
|
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
struct _GtkRcStyle
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
char *font_name;
|
|
|
|
char *fontset_name;
|
|
|
|
char *bg_pixmap_name[5];
|
1998-03-08 21:47:14 +00:00
|
|
|
GtkStyle *proto_style;
|
|
|
|
GList *styles;
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkRcSet
|
|
|
|
{
|
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
|
|
|
GtkPatternSpec pspec;
|
|
|
|
GtkRcStyle *rc_style;
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
struct _GtkRcFile
|
|
|
|
{
|
|
|
|
time_t mtime;
|
|
|
|
gchar *name;
|
|
|
|
gchar *canonical_name;
|
|
|
|
gboolean reload;
|
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
static guint gtk_rc_style_hash (const char *name);
|
|
|
|
static gint gtk_rc_style_compare (const char *a,
|
|
|
|
const char *b);
|
|
|
|
static GtkRcStyle* gtk_rc_style_find (const char *name);
|
|
|
|
static GtkRcStyle* gtk_rc_styles_match (GSList *sets,
|
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 path_length,
|
|
|
|
gchar *path,
|
|
|
|
gchar *path_reversed);
|
1998-03-08 21:47:14 +00:00
|
|
|
static GtkStyle* gtk_rc_style_init (GtkRcStyle *rc_style,
|
|
|
|
GdkColormap *cmap);
|
1998-05-03 22:41:32 +00:00
|
|
|
static void gtk_rc_parse_file (const gchar *filename,
|
|
|
|
gboolean reload);
|
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
static void gtk_rc_parse_any (const gchar *input_name,
|
|
|
|
gint input_fd,
|
|
|
|
const gchar *input_string);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_statement (GScanner *scanner);
|
|
|
|
static guint gtk_rc_parse_style (GScanner *scanner);
|
|
|
|
static guint gtk_rc_parse_base (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_bg (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_fg (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_text (GScanner *scanner,
|
1998-03-08 21:47:14 +00:00
|
|
|
GtkStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_bg_pixmap (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkRcStyle *rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_font (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkRcStyle *rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_fontset (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkRcStyle *rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_state (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GtkStateType *state);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_color (GScanner *scanner,
|
1997-12-23 02:12:10 +00:00
|
|
|
GdkColor *color);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_pixmap_path (GScanner *scanner);
|
1997-12-23 02:12:10 +00:00
|
|
|
static void gtk_rc_parse_pixmap_path_string (gchar *pix_path);
|
|
|
|
static char* gtk_rc_find_pixmap_in_path (GScanner *scanner,
|
|
|
|
gchar *pixmap_file);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_widget_style (GScanner *scanner);
|
|
|
|
static guint gtk_rc_parse_widget_class_style (GScanner *scanner);
|
1998-05-03 22:41:32 +00:00
|
|
|
static void gtk_rc_clear_hash_node (gpointer key,
|
|
|
|
gpointer data,
|
|
|
|
gpointer user_data);
|
|
|
|
static void gtk_rc_clear_styles (void);
|
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
static GScannerConfig gtk_rc_scanner_config =
|
|
|
|
{
|
|
|
|
(
|
|
|
|
" \t\n"
|
|
|
|
) /* cset_skip_characters */,
|
|
|
|
(
|
|
|
|
G_CSET_a_2_z
|
|
|
|
"_"
|
|
|
|
G_CSET_A_2_Z
|
|
|
|
) /* cset_identifier_first */,
|
|
|
|
(
|
|
|
|
G_CSET_a_2_z
|
|
|
|
"_0123456789"
|
|
|
|
G_CSET_A_2_Z
|
|
|
|
G_CSET_LATINS
|
|
|
|
G_CSET_LATINC
|
|
|
|
) /* cset_identifier_nth */,
|
|
|
|
( "#\n" ) /* cpair_comment_single */,
|
|
|
|
|
|
|
|
TRUE /* case_sensitive */,
|
|
|
|
|
|
|
|
TRUE /* skip_comment_multi */,
|
|
|
|
TRUE /* skip_comment_single */,
|
|
|
|
TRUE /* scan_comment_multi */,
|
|
|
|
TRUE /* scan_identifier */,
|
|
|
|
FALSE /* scan_identifier_1char */,
|
|
|
|
FALSE /* scan_identifier_NULL */,
|
|
|
|
TRUE /* scan_symbols */,
|
|
|
|
TRUE /* scan_binary */,
|
|
|
|
TRUE /* scan_octal */,
|
|
|
|
TRUE /* scan_float */,
|
|
|
|
TRUE /* scan_hex */,
|
|
|
|
TRUE /* scan_hex_dollar */,
|
1998-02-27 16:31:06 +00:00
|
|
|
TRUE /* scan_string_sq */,
|
1997-12-23 02:12:10 +00:00
|
|
|
TRUE /* scan_string_dq */,
|
|
|
|
TRUE /* numbers_2_int */,
|
|
|
|
FALSE /* int_2_float */,
|
|
|
|
TRUE /* identifier_2_string */,
|
|
|
|
TRUE /* char_2_token */,
|
|
|
|
TRUE /* symbol_2_token */,
|
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static struct
|
|
|
|
{
|
1998-05-01 04:23:59 +00:00
|
|
|
gchar *name;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1998-05-01 04:23:59 +00:00
|
|
|
} symbols[] = {
|
|
|
|
{ "include", TOKEN_INCLUDE },
|
|
|
|
{ "ACTIVE", TOKEN_ACTIVE },
|
|
|
|
{ "base", TOKEN_BASE },
|
|
|
|
{ "bg", TOKEN_BG },
|
|
|
|
{ "bg_pixmap", TOKEN_BG_PIXMAP },
|
|
|
|
{ "fg", TOKEN_FG },
|
|
|
|
{ "font", TOKEN_FONT },
|
|
|
|
{ "fontset", TOKEN_FONTSET },
|
|
|
|
{ "INSENSITIVE", TOKEN_INSENSITIVE },
|
|
|
|
{ "NORMAL", TOKEN_NORMAL },
|
|
|
|
{ "pixmap_path", TOKEN_PIXMAP_PATH },
|
|
|
|
{ "PRELIGHT", TOKEN_PRELIGHT },
|
|
|
|
{ "SELECTED", TOKEN_SELECTED },
|
|
|
|
{ "style", TOKEN_STYLE },
|
|
|
|
{ "text", TOKEN_TEXT },
|
|
|
|
{ "widget", TOKEN_WIDGET },
|
|
|
|
{ "widget_class", TOKEN_WIDGET_CLASS },
|
|
|
|
};
|
|
|
|
static guint nsymbols = sizeof (symbols) / sizeof (symbols[0]);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static GHashTable *rc_style_ht = NULL;
|
1998-06-30 11:05:20 +00:00
|
|
|
static GSList *gtk_rc_sets_widget = NULL;
|
|
|
|
static GSList *gtk_rc_sets_widget_class = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
#define GTK_RC_MAX_PIXMAP_PATHS 128
|
|
|
|
static gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS];
|
|
|
|
|
1998-05-01 16:15:39 +00:00
|
|
|
/* The files we have parsed, to reread later if necessary */
|
1998-05-03 22:41:32 +00:00
|
|
|
GSList *rc_files = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-21 19:24:01 +00:00
|
|
|
static GtkImageLoader image_loader = NULL;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_rc_init (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
|
|
|
|
(GCompareFunc) gtk_rc_style_compare);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_string (const gchar *rc_string)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1997-12-23 02:12:10 +00:00
|
|
|
g_return_if_fail (rc_string != NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_any ("-", -1, rc_string);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_parse_file (const gchar *filename, gboolean reload)
|
1997-12-23 02:12:10 +00:00
|
|
|
{
|
1998-05-03 22:41:32 +00:00
|
|
|
GtkRcFile *rc_file = NULL;
|
|
|
|
struct stat statbuf;
|
|
|
|
GSList *tmp_list;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
g_return_if_fail (filename != NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
tmp_list = rc_files;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
rc_file = tmp_list->data;
|
|
|
|
if (!strcmp (rc_file->name, filename))
|
|
|
|
break;
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!tmp_list)
|
|
|
|
{
|
|
|
|
rc_file = g_new (GtkRcFile, 1);
|
|
|
|
rc_file->name = g_strdup (filename);
|
|
|
|
rc_file->canonical_name = NULL;
|
|
|
|
rc_file->mtime = 0;
|
|
|
|
rc_file->reload = reload;
|
|
|
|
|
|
|
|
rc_files = g_slist_append (rc_files, rc_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rc_file->canonical_name)
|
|
|
|
{
|
|
|
|
/* Get the absolute pathname */
|
|
|
|
|
|
|
|
if (rc_file->name[0] == '/')
|
|
|
|
rc_file->canonical_name = rc_file->name;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GString *str;
|
|
|
|
gchar buffer[MAXPATHLEN];
|
|
|
|
|
|
|
|
#if defined(sun) && !defined(__SVR4)
|
|
|
|
if(!getwd(buffer))
|
|
|
|
#else
|
|
|
|
if(!getcwd(buffer, MAXPATHLEN))
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
|
|
|
|
str = g_string_new (buffer);
|
|
|
|
g_string_append_c (str, '/');
|
|
|
|
g_string_append (str, rc_file->name);
|
|
|
|
|
|
|
|
rc_file->canonical_name = str->str;
|
|
|
|
g_string_free (str, FALSE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-05-13 00:24:57 +00:00
|
|
|
if (!lstat (rc_file->canonical_name, &statbuf))
|
1998-05-03 22:41:32 +00:00
|
|
|
{
|
|
|
|
gint fd;
|
|
|
|
|
|
|
|
rc_file->mtime = statbuf.st_mtime;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
fd = open (rc_file->canonical_name, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_rc_parse_any (filename, fd, NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
close (fd);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-05-01 16:15:39 +00:00
|
|
|
void
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_rc_parse (const gchar *filename)
|
|
|
|
{
|
|
|
|
g_return_if_fail (filename != NULL);
|
|
|
|
|
|
|
|
gtk_rc_parse_file (filename, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-05-01 16:15:39 +00:00
|
|
|
gtk_rc_clear_hash_node (gpointer key,
|
|
|
|
gpointer data,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
GtkRcStyle *rc_style = data;
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
g_free (rc_style->name);
|
|
|
|
g_free (rc_style->font_name);
|
|
|
|
g_free (rc_style->fontset_name);
|
|
|
|
|
|
|
|
for (i=0 ; i<5 ; i++)
|
|
|
|
g_free (rc_style->bg_pixmap_name[i]);
|
|
|
|
|
|
|
|
gtk_style_unref (rc_style->proto_style);
|
|
|
|
|
|
|
|
tmp_list = rc_style->styles;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkRcNode *node = tmp_list->data;
|
|
|
|
|
|
|
|
gdk_colormap_unref (node->cmap);
|
|
|
|
gtk_style_unref (node->style);
|
|
|
|
|
|
|
|
g_free (node);
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (rc_style);
|
|
|
|
}
|
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_clear_styles (void)
|
1998-05-01 16:15:39 +00:00
|
|
|
{
|
1998-05-03 22:41:32 +00:00
|
|
|
GSList *tmp_list;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
|
|
|
/* Clear out all old rc_styles */
|
|
|
|
|
|
|
|
g_hash_table_foreach (rc_style_ht, gtk_rc_clear_hash_node, NULL);
|
|
|
|
g_hash_table_destroy (rc_style_ht);
|
|
|
|
rc_style_ht = NULL;
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
tmp_list = gtk_rc_sets_widget;
|
1998-05-01 16:15:39 +00:00
|
|
|
while (tmp_list)
|
|
|
|
{
|
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
|
|
|
GtkRcSet *rc_set;
|
|
|
|
|
|
|
|
rc_set = tmp_list->data;
|
|
|
|
gtk_pattern_spec_free_segs (&rc_set->pspec);
|
1998-05-01 16:15:39 +00:00
|
|
|
g_free (rc_set);
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
g_slist_free (gtk_rc_sets_widget);
|
|
|
|
gtk_rc_sets_widget = NULL;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
tmp_list = gtk_rc_sets_widget_class;
|
1998-05-01 16:15:39 +00:00
|
|
|
while (tmp_list)
|
|
|
|
{
|
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
|
|
|
GtkRcSet *rc_set;
|
|
|
|
|
|
|
|
rc_set = tmp_list->data;
|
|
|
|
gtk_pattern_spec_free_segs (&rc_set->pspec);
|
1998-05-01 16:15:39 +00:00
|
|
|
g_free (rc_set);
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
g_slist_free (gtk_rc_sets_widget_class);
|
|
|
|
gtk_rc_sets_widget_class = NULL;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
|
|
|
gtk_rc_init ();
|
1998-05-03 22:41:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
gtk_rc_reparse_all (void)
|
|
|
|
{
|
|
|
|
GSList *tmp_list;
|
|
|
|
gboolean mtime_modified = FALSE;
|
|
|
|
GtkRcFile *rc_file;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
struct stat statbuf;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
/* Check through and see if any of the RC's have had their
|
|
|
|
* mtime modified. If so, reparse everything.
|
|
|
|
*/
|
|
|
|
tmp_list = rc_files;
|
1998-05-01 16:15:39 +00:00
|
|
|
while (tmp_list)
|
|
|
|
{
|
1998-05-03 22:41:32 +00:00
|
|
|
rc_file = tmp_list->data;
|
|
|
|
|
1998-05-12 22:11:56 +00:00
|
|
|
if (!lstat (rc_file->name, &statbuf) &&
|
1998-05-03 22:41:32 +00:00
|
|
|
(statbuf.st_mtime > rc_file->mtime))
|
|
|
|
{
|
|
|
|
mtime_modified = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
1998-05-01 16:15:39 +00:00
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
1998-05-03 22:41:32 +00:00
|
|
|
|
|
|
|
if (mtime_modified)
|
|
|
|
{
|
|
|
|
gtk_rc_clear_styles();
|
|
|
|
|
|
|
|
tmp_list = rc_files;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
rc_file = tmp_list->data;
|
|
|
|
if (rc_file->reload)
|
|
|
|
gtk_rc_parse_file (rc_file->name, FALSE);
|
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return mtime_modified;
|
1998-05-01 16:15:39 +00:00
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkStyle*
|
|
|
|
gtk_rc_get_style (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkRcStyle *rc_style;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
if (gtk_rc_sets_widget)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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
|
|
|
gchar *path, *path_reversed;
|
|
|
|
guint path_length;
|
|
|
|
|
|
|
|
gtk_widget_path (widget, &path_length, &path, &path_reversed);
|
1998-06-30 11:05:20 +00:00
|
|
|
rc_style = gtk_rc_styles_match (gtk_rc_sets_widget, path_length, path, path_reversed);
|
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
|
|
|
g_free (path);
|
|
|
|
g_free (path_reversed);
|
|
|
|
|
|
|
|
if (rc_style)
|
|
|
|
return gtk_rc_style_init (rc_style, gtk_widget_get_colormap (widget));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
if (gtk_rc_sets_widget_class)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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
|
|
|
gchar *path, *path_reversed;
|
|
|
|
guint path_length;
|
|
|
|
|
|
|
|
gtk_widget_class_path (widget, &path_length, &path, &path_reversed);
|
1998-06-30 11:05:20 +00:00
|
|
|
rc_style = gtk_rc_styles_match (gtk_rc_sets_widget_class, path_length, path, path_reversed);
|
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
|
|
|
g_free (path);
|
|
|
|
g_free (path_reversed);
|
|
|
|
|
|
|
|
if (rc_style)
|
|
|
|
return gtk_rc_style_init (rc_style, gtk_widget_get_colormap (widget));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-02-27 16:31:06 +00:00
|
|
|
return NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_add_widget_name_style (GtkStyle *style,
|
|
|
|
const char *pattern)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkRcStyle *rc_style;
|
|
|
|
GtkRcSet *rc_set;
|
|
|
|
int i;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_style_ref (style);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_style = g_new (GtkRcStyle, 1);
|
|
|
|
rc_style->name = NULL;
|
|
|
|
rc_style->font_name = NULL;
|
|
|
|
rc_style->fontset_name = NULL;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
rc_style->bg_pixmap_name[i] = NULL;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
rc_style->styles = g_list_append (NULL, style);
|
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
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set = g_new (GtkRcSet, 1);
|
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_pattern_spec_init (&rc_set->pspec, pattern);
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set->rc_style = rc_style;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 12:34:36 +00:00
|
|
|
gtk_rc_sets_widget = g_slist_prepend (gtk_rc_sets_widget, rc_set);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_rc_add_widget_class_style (GtkStyle *style,
|
|
|
|
const char *pattern)
|
|
|
|
{
|
|
|
|
GtkRcStyle *rc_style;
|
|
|
|
GtkRcSet *rc_set;
|
|
|
|
int i;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_style_ref (style);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_style = g_new (GtkRcStyle, 1);
|
|
|
|
rc_style->name = NULL;
|
|
|
|
rc_style->font_name = NULL;
|
|
|
|
rc_style->fontset_name = NULL;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
rc_style->bg_pixmap_name[i] = NULL;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
rc_style->styles = g_list_append (NULL, style);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set = g_new (GtkRcSet, 1);
|
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_pattern_spec_init (&rc_set->pspec, pattern);
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set->rc_style = rc_style;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 12:34:36 +00:00
|
|
|
gtk_rc_sets_widget_class = g_slist_prepend (gtk_rc_sets_widget_class, rc_set);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_parse_any (const gchar *input_name,
|
|
|
|
gint input_fd,
|
|
|
|
const gchar *input_string)
|
|
|
|
{
|
|
|
|
GScanner *scanner;
|
|
|
|
guint i;
|
1998-05-01 04:23:59 +00:00
|
|
|
gboolean done;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
scanner = g_scanner_new (>k_rc_scanner_config);
|
|
|
|
|
|
|
|
if (input_fd >= 0)
|
|
|
|
{
|
|
|
|
g_assert (input_string == NULL);
|
|
|
|
|
|
|
|
g_scanner_input_file (scanner, input_fd);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_assert (input_string != NULL);
|
|
|
|
|
|
|
|
g_scanner_input_text (scanner, input_string, strlen (input_string));
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
scanner->input_name = input_name;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
g_scanner_freeze_symbol_table (scanner);
|
1997-12-23 02:12:10 +00:00
|
|
|
for (i = 0; i < nsymbols; i++)
|
1998-05-13 00:24:57 +00:00
|
|
|
g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
|
1998-06-30 11:05:20 +00:00
|
|
|
g_scanner_thaw_symbol_table (scanner);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
done = FALSE;
|
|
|
|
while (!done)
|
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
if (g_scanner_peek_next_token (scanner) == G_TOKEN_EOF)
|
|
|
|
done = TRUE;
|
|
|
|
else
|
1997-12-23 02:12:10 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint expected_token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
expected_token = gtk_rc_parse_statement (scanner);
|
|
|
|
|
|
|
|
if (expected_token != G_TOKEN_NONE)
|
|
|
|
{
|
|
|
|
gchar *symbol_name;
|
|
|
|
gchar *msg;
|
|
|
|
|
|
|
|
msg = NULL;
|
|
|
|
if (expected_token > TOKEN_INVALID &&
|
|
|
|
expected_token < TOKEN_LAST)
|
|
|
|
{
|
|
|
|
for (i = 0; i < nsymbols; i++)
|
|
|
|
if (symbols[i].token == expected_token)
|
|
|
|
msg = symbols[i].name;
|
|
|
|
if (msg)
|
|
|
|
msg = g_strconcat ("e.g. `", msg, "'", NULL);
|
|
|
|
}
|
|
|
|
if (scanner->token > TOKEN_INVALID &&
|
|
|
|
scanner->token < TOKEN_LAST)
|
|
|
|
{
|
|
|
|
symbol_name = "???";
|
|
|
|
for (i = 0; i < nsymbols; i++)
|
|
|
|
if (symbols[i].token == scanner->token)
|
|
|
|
symbol_name = symbols[i].name;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
symbol_name = NULL;
|
|
|
|
g_scanner_unexp_token (scanner,
|
|
|
|
expected_token,
|
|
|
|
NULL,
|
|
|
|
"keyword",
|
|
|
|
symbol_name,
|
|
|
|
msg,
|
|
|
|
TRUE);
|
|
|
|
g_free (msg);
|
|
|
|
done = TRUE;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
}
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
g_scanner_destroy (scanner);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static guint
|
|
|
|
gtk_rc_style_hash (const char *name)
|
|
|
|
{
|
|
|
|
guint result;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
result = 0;
|
|
|
|
while (*name)
|
|
|
|
result += (result << 3) + *name++;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_rc_style_compare (const char *a,
|
|
|
|
const char *b)
|
|
|
|
{
|
|
|
|
return (strcmp (a, b) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkRcStyle*
|
|
|
|
gtk_rc_style_find (const char *name)
|
|
|
|
{
|
|
|
|
GtkRcStyle *rc_style;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_style = g_hash_table_lookup (rc_style_ht, (gpointer) name);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return rc_style;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkRcStyle*
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_styles_match (GSList *sets,
|
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 path_length,
|
|
|
|
gchar *path,
|
|
|
|
gchar *path_reversed)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkRcSet *rc_set;
|
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
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
while (sets)
|
|
|
|
{
|
|
|
|
rc_set = sets->data;
|
|
|
|
sets = sets->next;
|
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
|
|
|
|
|
|
|
if (gtk_pattern_match (&rc_set->pspec, path_length, path, path_reversed))
|
1997-11-24 22:37:52 +00:00
|
|
|
return rc_set->rc_style;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
static GtkStyle *
|
|
|
|
gtk_rc_style_init (GtkRcStyle *rc_style, GdkColormap *cmap)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GdkFont *old_font;
|
1998-03-09 06:07:34 +00:00
|
|
|
gboolean match_cmap = FALSE;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint i;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkStyle *style = NULL;
|
1998-03-09 06:07:34 +00:00
|
|
|
GtkRcNode *node;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
tmp_list = rc_style->styles;
|
|
|
|
|
1998-03-09 06:07:34 +00:00
|
|
|
for (i=0; i<5; i++)
|
|
|
|
if (rc_style->bg_pixmap_name[i])
|
|
|
|
match_cmap = TRUE;
|
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
while (tmp_list)
|
|
|
|
{
|
1998-03-09 06:07:34 +00:00
|
|
|
node = (GtkRcNode *)tmp_list->data;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-03-09 06:07:34 +00:00
|
|
|
if (!match_cmap || (node->cmap == cmap))
|
|
|
|
{
|
|
|
|
style = node->style;
|
|
|
|
break;
|
|
|
|
}
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
if (!style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-03-09 06:07:34 +00:00
|
|
|
node = g_new (GtkRcNode, 1);
|
1998-03-08 21:47:14 +00:00
|
|
|
style = gtk_style_copy (rc_style->proto_style);
|
1998-03-09 06:07:34 +00:00
|
|
|
|
|
|
|
/* FIXME, this leaks colormaps, but if we don't do this, then we'll
|
|
|
|
* be screwed, because we identify colormaps by address equality
|
|
|
|
*/
|
|
|
|
gdk_colormap_ref (cmap);
|
|
|
|
|
|
|
|
node->style = style;
|
|
|
|
node->cmap = cmap;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (rc_style->fontset_name)
|
|
|
|
{
|
1998-03-08 21:47:14 +00:00
|
|
|
old_font = style->font;
|
|
|
|
style->font = gdk_fontset_load (rc_style->fontset_name);
|
|
|
|
if (style->font)
|
1997-12-18 02:17:14 +00:00
|
|
|
gdk_font_unref (old_font);
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
1998-03-08 21:47:14 +00:00
|
|
|
style->font = old_font;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
else if (rc_style->font_name)
|
|
|
|
{
|
1998-03-08 21:47:14 +00:00
|
|
|
old_font = style->font;
|
|
|
|
style->font = gdk_font_load (rc_style->font_name);
|
|
|
|
if (style->font)
|
1997-12-18 02:17:14 +00:00
|
|
|
gdk_font_unref (old_font);
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
1998-03-08 21:47:14 +00:00
|
|
|
style->font = old_font;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
if (rc_style->bg_pixmap_name[i])
|
|
|
|
{
|
|
|
|
if (strcmp (rc_style->bg_pixmap_name[i], "<parent>") == 0)
|
1998-03-08 21:47:14 +00:00
|
|
|
style->bg_pixmap[i] = (GdkPixmap*) GDK_PARENT_RELATIVE;
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
1998-05-21 19:24:01 +00:00
|
|
|
{
|
|
|
|
if(image_loader)
|
|
|
|
style->bg_pixmap[i] = image_loader(NULL, cmap, NULL,
|
1998-03-08 21:47:14 +00:00
|
|
|
&style->bg[i],
|
|
|
|
rc_style->bg_pixmap_name[i]);
|
1998-05-21 19:24:01 +00:00
|
|
|
else
|
|
|
|
style->bg_pixmap[i] =
|
|
|
|
gdk_pixmap_colormap_create_from_xpm (NULL, cmap,
|
|
|
|
NULL,
|
|
|
|
&style->bg[i],
|
|
|
|
rc_style->bg_pixmap_name[i]);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-03-09 06:07:34 +00:00
|
|
|
rc_style->styles = g_list_append (rc_style->styles, node);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
return style;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_statement (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_peek_next_token (scanner);
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
switch (token)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
case TOKEN_INCLUDE:
|
1998-05-01 04:23:59 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_INCLUDE)
|
|
|
|
return TOKEN_INCLUDE;
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-05-01 04:23:59 +00:00
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_rc_parse_file (scanner->value.v_string, FALSE);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
|
|
|
|
|
|
|
case TOKEN_STYLE:
|
|
|
|
return gtk_rc_parse_style (scanner);
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
case TOKEN_PIXMAP_PATH:
|
|
|
|
return gtk_rc_parse_pixmap_path (scanner);
|
|
|
|
|
|
|
|
case TOKEN_WIDGET:
|
|
|
|
return gtk_rc_parse_widget_style (scanner);
|
|
|
|
|
|
|
|
case TOKEN_WIDGET_CLASS:
|
|
|
|
return gtk_rc_parse_widget_class_style (scanner);
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_scanner_get_next_token (scanner);
|
|
|
|
return /* G_TOKEN_SYMBOL */ TOKEN_STYLE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_style (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkRcStyle *rc_style;
|
|
|
|
GtkRcStyle *parent_style;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-11-24 22:37:52 +00:00
|
|
|
gint insert;
|
|
|
|
gint i;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_STYLE)
|
|
|
|
return TOKEN_STYLE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
insert = FALSE;
|
1997-12-23 02:12:10 +00:00
|
|
|
rc_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (!rc_style)
|
|
|
|
{
|
|
|
|
insert = TRUE;
|
|
|
|
rc_style = g_new (GtkRcStyle, 1);
|
1997-12-23 02:12:10 +00:00
|
|
|
rc_style->name = g_strdup (scanner->value.v_string);
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_style->font_name = NULL;
|
|
|
|
rc_style->fontset_name = NULL;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
rc_style->bg_pixmap_name[i] = NULL;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
rc_style->proto_style = gtk_style_new();
|
|
|
|
rc_style->styles = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_peek_next_token (scanner);
|
|
|
|
if (token == G_TOKEN_EQUAL_SIGN)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1997-12-23 02:12:10 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
if (insert)
|
|
|
|
{
|
1998-03-08 21:47:14 +00:00
|
|
|
gtk_style_unref (rc_style->proto_style);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_style);
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
parent_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
|
1997-11-24 22:37:52 +00:00
|
|
|
if (parent_style)
|
|
|
|
{
|
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
{
|
1998-03-08 21:47:14 +00:00
|
|
|
rc_style->proto_style->fg[i] = parent_style->proto_style->fg[i];
|
|
|
|
rc_style->proto_style->bg[i] = parent_style->proto_style->bg[i];
|
|
|
|
rc_style->proto_style->light[i] = parent_style->proto_style->light[i];
|
|
|
|
rc_style->proto_style->dark[i] = parent_style->proto_style->dark[i];
|
|
|
|
rc_style->proto_style->mid[i] = parent_style->proto_style->mid[i];
|
|
|
|
rc_style->proto_style->text[i] = parent_style->proto_style->text[i];
|
|
|
|
rc_style->proto_style->base[i] = parent_style->proto_style->base[i];
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
rc_style->proto_style->black = parent_style->proto_style->black;
|
|
|
|
rc_style->proto_style->white = parent_style->proto_style->white;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (rc_style->fontset_name)
|
|
|
|
{
|
|
|
|
g_free (rc_style->fontset_name);
|
|
|
|
rc_style->fontset_name = g_strdup (parent_style->fontset_name);
|
|
|
|
}
|
|
|
|
else if (rc_style->font_name)
|
|
|
|
{
|
|
|
|
g_free (rc_style->font_name);
|
|
|
|
rc_style->font_name = g_strdup (parent_style->font_name);
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
{
|
|
|
|
if (rc_style->bg_pixmap_name[i])
|
|
|
|
g_free (rc_style->bg_pixmap_name[i]);
|
|
|
|
rc_style->bg_pixmap_name[i] = g_strdup (parent_style->bg_pixmap_name[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_LEFT_CURLY)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
if (insert)
|
|
|
|
{
|
1998-03-08 21:47:14 +00:00
|
|
|
gtk_style_unref (rc_style->proto_style);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_style);
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_LEFT_CURLY;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = g_scanner_peek_next_token (scanner);
|
|
|
|
while (token != G_TOKEN_RIGHT_CURLY)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
switch (token)
|
|
|
|
{
|
|
|
|
case TOKEN_BASE:
|
|
|
|
token = gtk_rc_parse_base (scanner, rc_style->proto_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_BG:
|
|
|
|
token = gtk_rc_parse_bg (scanner, rc_style->proto_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_FG:
|
|
|
|
token = gtk_rc_parse_fg (scanner, rc_style->proto_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_TEXT:
|
|
|
|
token = gtk_rc_parse_text (scanner, rc_style->proto_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_BG_PIXMAP:
|
|
|
|
token = gtk_rc_parse_bg_pixmap (scanner, rc_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_FONT:
|
|
|
|
token = gtk_rc_parse_font (scanner, rc_style);
|
|
|
|
break;
|
|
|
|
case TOKEN_FONTSET:
|
|
|
|
token = gtk_rc_parse_fontset (scanner, rc_style);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_scanner_get_next_token (scanner);
|
|
|
|
token = G_TOKEN_RIGHT_CURLY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (token != G_TOKEN_NONE)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
if (insert)
|
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
if (rc_style->fontset_name)
|
|
|
|
g_free (rc_style->fontset_name);
|
|
|
|
if (rc_style->font_name)
|
|
|
|
g_free (rc_style->font_name);
|
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
if (rc_style->bg_pixmap_name[i])
|
|
|
|
g_free (rc_style->bg_pixmap_name[i]);
|
1998-03-08 21:47:14 +00:00
|
|
|
gtk_style_unref (rc_style->proto_style);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_style);
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
return token;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
token = g_scanner_peek_next_token (scanner);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_RIGHT_CURLY)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
if (insert)
|
|
|
|
{
|
|
|
|
if (rc_style->fontset_name)
|
|
|
|
g_free (rc_style->fontset_name);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (rc_style->font_name)
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_style->font_name);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
if (rc_style->bg_pixmap_name[i])
|
|
|
|
g_free (rc_style->bg_pixmap_name[i]);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-03-08 21:47:14 +00:00
|
|
|
gtk_style_unref (rc_style->proto_style);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_style);
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_RIGHT_CURLY;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (insert)
|
|
|
|
g_hash_table_insert (rc_style_ht, rc_style->name, rc_style);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_base (GScanner *scanner,
|
|
|
|
GtkStyle *style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkStateType state;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_BASE)
|
|
|
|
return TOKEN_BASE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_state (scanner, &state);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
return token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_color (scanner, &style->base[state]);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_bg (GScanner *scanner,
|
|
|
|
GtkStyle *style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkStateType state;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_BG)
|
|
|
|
return TOKEN_BG;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_state (scanner, &state);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
return token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_color (scanner, &style->bg[state]);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_fg (GScanner *scanner,
|
|
|
|
GtkStyle *style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkStateType state;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_FG)
|
|
|
|
return TOKEN_FG;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_state (scanner, &state);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
return token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_color (scanner, &style->fg[state]);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1998-03-08 21:47:14 +00:00
|
|
|
gtk_rc_parse_text (GScanner *scanner,
|
|
|
|
GtkStyle *style)
|
|
|
|
{
|
|
|
|
GtkStateType state;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_TEXT)
|
|
|
|
return TOKEN_TEXT;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_state (scanner, &state);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
return token;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_color (scanner, &style->text[state]);
|
1998-03-08 21:47:14 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_bg_pixmap (GScanner *scanner,
|
|
|
|
GtkRcStyle *rc_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkStateType state;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-11-24 22:37:52 +00:00
|
|
|
gchar *pixmap_file;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_BG_PIXMAP)
|
|
|
|
return TOKEN_BG_PIXMAP;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_state (scanner, &state);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
return token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
if (strcmp (scanner->value.v_string, "<parent>"))
|
|
|
|
pixmap_file = gtk_rc_find_pixmap_in_path (scanner, scanner->value.v_string);
|
1997-11-24 22:37:52 +00:00
|
|
|
else
|
1997-12-23 02:12:10 +00:00
|
|
|
pixmap_file = g_strdup (scanner->value.v_string);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (pixmap_file)
|
|
|
|
{
|
|
|
|
if (rc_style->bg_pixmap_name[state])
|
|
|
|
g_free (rc_style->bg_pixmap_name[state]);
|
|
|
|
rc_style->bg_pixmap_name[state] = pixmap_file;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static gchar*
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_find_pixmap_in_path (GScanner *scanner,
|
|
|
|
gchar *pixmap_file)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
gint i;
|
1997-12-23 02:12:10 +00:00
|
|
|
gint fd;
|
1997-11-24 22:37:52 +00:00
|
|
|
gchar *buf;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (pixmap_path[i] != NULL); i++)
|
|
|
|
{
|
|
|
|
buf = g_malloc (strlen (pixmap_path[i]) + strlen (pixmap_file) + 2);
|
|
|
|
sprintf (buf, "%s%c%s", pixmap_path[i], '/', pixmap_file);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
fd = open (buf, O_RDONLY);
|
|
|
|
if (fd >= 0)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1997-12-23 02:12:10 +00:00
|
|
|
close (fd);
|
1997-11-24 22:37:52 +00:00
|
|
|
return buf;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (buf);
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_warning ("Unable to locate image file in pixmap_path: \"%s\" line %d",
|
1997-12-23 02:12:10 +00:00
|
|
|
pixmap_file, scanner->line);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_font (GScanner *scanner,
|
|
|
|
GtkRcStyle *rc_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_FONT)
|
|
|
|
return TOKEN_FONT;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (rc_style->font_name)
|
|
|
|
g_free (rc_style->font_name);
|
1997-12-23 02:12:10 +00:00
|
|
|
rc_style->font_name = g_strdup (scanner->value.v_string);
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_fontset (GScanner *scanner,
|
|
|
|
GtkRcStyle *rc_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_FONTSET)
|
|
|
|
return TOKEN_FONTSET;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_EQUAL_SIGN)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_EQUAL_SIGN;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (rc_style->fontset_name)
|
|
|
|
g_free (rc_style->fontset_name);
|
1997-12-23 02:12:10 +00:00
|
|
|
rc_style->fontset_name = g_strdup (scanner->value.v_string);
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_state (GScanner *scanner,
|
|
|
|
GtkStateType *state)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != G_TOKEN_LEFT_BRACE)
|
|
|
|
return G_TOKEN_LEFT_BRACE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
switch (token)
|
|
|
|
{
|
|
|
|
case TOKEN_ACTIVE:
|
|
|
|
*state = GTK_STATE_ACTIVE;
|
|
|
|
break;
|
|
|
|
case TOKEN_INSENSITIVE:
|
|
|
|
*state = GTK_STATE_INSENSITIVE;
|
|
|
|
break;
|
|
|
|
case TOKEN_NORMAL:
|
|
|
|
*state = GTK_STATE_NORMAL;
|
|
|
|
break;
|
|
|
|
case TOKEN_PRELIGHT:
|
|
|
|
*state = GTK_STATE_PRELIGHT;
|
|
|
|
break;
|
|
|
|
case TOKEN_SELECTED:
|
|
|
|
*state = GTK_STATE_SELECTED;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return /* G_TOKEN_SYMBOL */ TOKEN_NORMAL;
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_RIGHT_BRACE)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_RIGHT_BRACE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_color (GScanner *scanner,
|
|
|
|
GdkColor *color)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
1997-11-24 22:37:52 +00:00
|
|
|
switch (token)
|
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
gint token_int;
|
|
|
|
gint length;
|
|
|
|
gint temp;
|
|
|
|
gchar buf[9];
|
|
|
|
gint i, j;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
case G_TOKEN_LEFT_CURLY:
|
1997-12-23 02:12:10 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token == G_TOKEN_INT)
|
|
|
|
token_int = scanner->value.v_int;
|
|
|
|
else if (token == G_TOKEN_FLOAT)
|
|
|
|
token_int = scanner->value.v_float * 65535.0;
|
|
|
|
else
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_FLOAT;
|
1997-12-23 02:12:10 +00:00
|
|
|
color->red = CLAMP (token_int, 0, 65535);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_COMMA)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_COMMA;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token == G_TOKEN_INT)
|
|
|
|
token_int = scanner->value.v_int;
|
|
|
|
else if (token == G_TOKEN_FLOAT)
|
|
|
|
token_int = scanner->value.v_float * 65535.0;
|
|
|
|
else
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_FLOAT;
|
1997-12-23 02:12:10 +00:00
|
|
|
color->green = CLAMP (token_int, 0, 65535);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_COMMA)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_COMMA;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token == G_TOKEN_INT)
|
|
|
|
token_int = scanner->value.v_int;
|
|
|
|
else if (token == G_TOKEN_FLOAT)
|
|
|
|
token_int = scanner->value.v_float * 65535.0;
|
|
|
|
else
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_FLOAT;
|
1997-12-23 02:12:10 +00:00
|
|
|
color->blue = CLAMP (token_int, 0, 65535);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_RIGHT_CURLY)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_RIGHT_CURLY;
|
|
|
|
return G_TOKEN_NONE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
case G_TOKEN_STRING:
|
|
|
|
if (scanner->value.v_string[0] != '#')
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
length = strlen (scanner->value.v_string) - 1;
|
1997-11-24 22:37:52 +00:00
|
|
|
if (((length % 3) != 0) || (length > 12))
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
length /= 3;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0, j = 1; i < length; i++, j++)
|
1997-12-23 02:12:10 +00:00
|
|
|
buf[i] = scanner->value.v_string[j];
|
1997-11-24 22:37:52 +00:00
|
|
|
buf[i] = '\0';
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
sscanf (buf, "%x", &temp);
|
|
|
|
color->red = temp;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < length; i++, j++)
|
1997-12-23 02:12:10 +00:00
|
|
|
buf[i] = scanner->value.v_string[j];
|
1997-11-24 22:37:52 +00:00
|
|
|
buf[i] = '\0';
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
sscanf (buf, "%x", &temp);
|
|
|
|
color->green = temp;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < length; i++, j++)
|
1997-12-23 02:12:10 +00:00
|
|
|
buf[i] = scanner->value.v_string[j];
|
1997-11-24 22:37:52 +00:00
|
|
|
buf[i] = '\0';
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
sscanf (buf, "%x", &temp);
|
|
|
|
color->blue = temp;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (length == 1)
|
|
|
|
{
|
|
|
|
color->red *= 4369;
|
|
|
|
color->green *= 4369;
|
|
|
|
color->blue *= 4369;
|
|
|
|
}
|
|
|
|
else if (length == 2)
|
|
|
|
{
|
|
|
|
color->red *= 257;
|
|
|
|
color->green *= 257;
|
|
|
|
color->blue *= 257;
|
|
|
|
}
|
|
|
|
else if (length == 3)
|
|
|
|
{
|
|
|
|
color->red *= 16;
|
|
|
|
color->green *= 16;
|
|
|
|
color->blue *= 16;
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
default:
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_pixmap_path (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_PIXMAP_PATH)
|
|
|
|
return TOKEN_PIXMAP_PATH;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
gtk_rc_parse_pixmap_path_string (scanner->value.v_string);
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1997-12-07 02:34:38 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_parse_pixmap_path_string (gchar *pix_path)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
gchar *buf;
|
|
|
|
gint end_offset;
|
|
|
|
gint start_offset = 0;
|
|
|
|
gint path_len;
|
|
|
|
gint path_num;
|
1997-12-07 02:34:38 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
/* free the old one, or just add to the old one ? */
|
|
|
|
for (path_num=0; pixmap_path[path_num]; path_num++)
|
|
|
|
{
|
1997-12-07 02:34:38 +00:00
|
|
|
g_free (pixmap_path[path_num]);
|
1997-11-24 22:37:52 +00:00
|
|
|
pixmap_path[path_num] = NULL;
|
|
|
|
}
|
1997-12-07 02:34:38 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
path_num = 0;
|
1997-12-07 02:34:38 +00:00
|
|
|
|
|
|
|
path_len = strlen (pix_path);
|
|
|
|
|
|
|
|
buf = g_strdup (pix_path);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-12-07 02:34:38 +00:00
|
|
|
for (end_offset = 0; end_offset <= path_len; end_offset++)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1997-12-07 02:34:38 +00:00
|
|
|
if ((buf[end_offset] == ':') ||
|
|
|
|
(end_offset == path_len))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
buf[end_offset] = '\0';
|
1997-12-07 02:34:38 +00:00
|
|
|
pixmap_path[path_num] = g_strdup (buf + start_offset);
|
1997-11-24 22:37:52 +00:00
|
|
|
path_num++;
|
|
|
|
pixmap_path[path_num] = NULL;
|
|
|
|
start_offset = end_offset + 1;
|
|
|
|
}
|
|
|
|
}
|
1997-12-07 02:34:38 +00:00
|
|
|
g_free (buf);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_widget_style (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkRcSet *rc_set;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_WIDGET)
|
|
|
|
return TOKEN_WIDGET;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
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
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set = g_new (GtkRcSet, 1);
|
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_pattern_spec_init (&rc_set->pspec, scanner->value.v_string);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != TOKEN_STYLE)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return TOKEN_STYLE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
rc_set->rc_style = gtk_rc_style_find (scanner->value.v_string);
|
1997-11-24 22:37:52 +00:00
|
|
|
if (!rc_set->rc_style)
|
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 12:34:36 +00:00
|
|
|
gtk_rc_sets_widget = g_slist_prepend (gtk_rc_sets_widget, rc_set);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_parse_widget_class_style (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkRcSet *rc_set;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
if (token != TOKEN_WIDGET_CLASS)
|
|
|
|
return TOKEN_WIDGET_CLASS;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_set = g_new (GtkRcSet, 1);
|
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_pattern_spec_init (&rc_set->pspec, scanner->value.v_string);
|
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != TOKEN_STYLE)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
rc_set->rc_style = gtk_rc_style_find (scanner->value.v_string);
|
1997-11-24 22:37:52 +00:00
|
|
|
if (!rc_set->rc_style)
|
|
|
|
{
|
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_pattern_spec_free_segs (&rc_set->pspec);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (rc_set);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 12:34:36 +00:00
|
|
|
gtk_rc_sets_widget_class = g_slist_prepend (gtk_rc_sets_widget_class, rc_set);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-05-21 19:24:01 +00:00
|
|
|
/*
|
|
|
|
typedef GdkPixmap * (*GtkImageLoader) (GdkWindow *window,
|
|
|
|
GdkColormap *colormap,
|
|
|
|
GdkBitmap **mask,
|
|
|
|
GdkColor *transparent_color,
|
|
|
|
const gchar *filename);
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
1998-05-21 19:26:19 +00:00
|
|
|
gtk_rc_set_image_loader(GtkImageLoader loader)
|
1998-05-21 19:24:01 +00:00
|
|
|
{
|
|
|
|
image_loader = loader;
|
|
|
|
}
|
|
|
|
|