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
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
|
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
1999-09-29 23:47:22 +00:00
|
|
|
#ifdef GDK_WINDOWING_X11
|
1998-12-14 23:26:12 +00:00
|
|
|
#include <X11/Xlocale.h> /* so we get the right setlocale */
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#else
|
|
|
|
#include <locale.h>
|
|
|
|
#endif
|
1997-11-24 22:37:52 +00:00
|
|
|
#include <ctype.h>
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#ifdef HAVE_UNISTD_H
|
1997-12-23 02:12:10 +00:00
|
|
|
#include <unistd.h>
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#endif
|
1998-05-03 22:41:32 +00:00
|
|
|
#include <sys/stat.h>
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
1998-05-03 22:41:32 +00:00
|
|
|
#include <sys/param.h>
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#endif
|
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>
|
1998-12-09 01:05:41 +00:00
|
|
|
#include <stdlib.h>
|
1998-12-14 23:26:12 +00:00
|
|
|
|
1999-03-16 20:03:50 +00:00
|
|
|
#ifndef HAVE_LSTAT
|
|
|
|
#define lstat stat
|
|
|
|
#endif
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifdef G_OS_WIN32
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#include <io.h>
|
|
|
|
#endif
|
|
|
|
|
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"
|
1998-11-06 22:05:02 +00:00
|
|
|
#include "gtkthemes.h"
|
1998-12-18 01:32:33 +00:00
|
|
|
#include "gtkintl.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
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);
|
1998-11-06 22:05:02 +00:00
|
|
|
static guint gtk_rc_styles_hash (const GSList *rc_styles);
|
|
|
|
static gint gtk_rc_styles_compare (const GSList *a,
|
|
|
|
const GSList *b);
|
1997-12-23 02:12:10 +00:00
|
|
|
static GtkRcStyle* gtk_rc_style_find (const char *name);
|
1998-11-06 22:05:02 +00:00
|
|
|
static GSList * gtk_rc_styles_match (GSList *rc_styles,
|
|
|
|
GSList *sets,
|
|
|
|
guint path_length,
|
|
|
|
gchar *path,
|
|
|
|
gchar *path_reversed);
|
|
|
|
static GtkStyle * gtk_rc_style_to_style (GtkRcStyle *rc_style);
|
|
|
|
static GtkStyle* gtk_rc_style_init (GSList *rc_styles);
|
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,
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_bg (GScanner *scanner,
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_fg (GScanner *scanner,
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *style);
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint gtk_rc_parse_text (GScanner *scanner,
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *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-11-06 22:05:02 +00:00
|
|
|
static guint gtk_rc_parse_engine (GScanner *scanner,
|
|
|
|
GtkRcStyle *rc_style);
|
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);
|
1998-11-06 22:05:02 +00:00
|
|
|
static guint gtk_rc_parse_module_path (GScanner *scanner);
|
|
|
|
static void gtk_rc_parse_module_path_string (gchar *mod_path);
|
1998-07-01 01:35:13 +00:00
|
|
|
static guint gtk_rc_parse_path_pattern (GScanner *scanner);
|
1998-05-03 22:41:32 +00:00
|
|
|
static void gtk_rc_clear_hash_node (gpointer key,
|
|
|
|
gpointer data,
|
|
|
|
gpointer user_data);
|
1998-11-06 22:05:02 +00:00
|
|
|
static void gtk_rc_clear_styles (void);
|
|
|
|
static void gtk_rc_append_default_pixmap_path (void);
|
|
|
|
static void gtk_rc_append_default_module_path (void);
|
|
|
|
static void gtk_rc_append_pixmap_path (gchar *dir);
|
1998-12-09 01:05:41 +00:00
|
|
|
static void gtk_rc_add_initial_default_files (void);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GScannerConfig gtk_rc_scanner_config =
|
1997-12-23 02:12:10 +00:00
|
|
|
{
|
|
|
|
(
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
" \t\r\n"
|
1997-12-23 02:12:10 +00:00
|
|
|
) /* cset_skip_characters */,
|
|
|
|
(
|
|
|
|
G_CSET_a_2_z
|
|
|
|
"_"
|
|
|
|
G_CSET_A_2_Z
|
|
|
|
) /* cset_identifier_first */,
|
|
|
|
(
|
|
|
|
G_CSET_a_2_z
|
1998-07-22 22:29:10 +00:00
|
|
|
"_-0123456789"
|
1997-12-23 02:12:10 +00:00
|
|
|
G_CSET_A_2_Z
|
|
|
|
) /* 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 */,
|
1998-07-22 22:29:10 +00:00
|
|
|
FALSE /* identifier_2_string */,
|
1997-12-23 02:12:10 +00:00
|
|
|
TRUE /* char_2_token */,
|
|
|
|
TRUE /* symbol_2_token */,
|
1998-07-22 22:29:10 +00:00
|
|
|
FALSE /* scope_0_fallback */,
|
1998-07-01 01:35:13 +00:00
|
|
|
};
|
|
|
|
|
1998-11-30 19:07:15 +00:00
|
|
|
static const struct
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
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[] = {
|
1998-07-22 22:29:10 +00:00
|
|
|
{ "include", GTK_RC_TOKEN_INCLUDE },
|
|
|
|
{ "NORMAL", GTK_RC_TOKEN_NORMAL },
|
|
|
|
{ "ACTIVE", GTK_RC_TOKEN_ACTIVE },
|
|
|
|
{ "PRELIGHT", GTK_RC_TOKEN_PRELIGHT },
|
|
|
|
{ "SELECTED", GTK_RC_TOKEN_SELECTED },
|
|
|
|
{ "INSENSITIVE", GTK_RC_TOKEN_INSENSITIVE },
|
|
|
|
{ "fg", GTK_RC_TOKEN_FG },
|
|
|
|
{ "bg", GTK_RC_TOKEN_BG },
|
|
|
|
{ "base", GTK_RC_TOKEN_BASE },
|
|
|
|
{ "text", GTK_RC_TOKEN_TEXT },
|
|
|
|
{ "font", GTK_RC_TOKEN_FONT },
|
|
|
|
{ "fontset", GTK_RC_TOKEN_FONTSET },
|
|
|
|
{ "bg_pixmap", GTK_RC_TOKEN_BG_PIXMAP },
|
|
|
|
{ "pixmap_path", GTK_RC_TOKEN_PIXMAP_PATH },
|
|
|
|
{ "style", GTK_RC_TOKEN_STYLE },
|
|
|
|
{ "binding", GTK_RC_TOKEN_BINDING },
|
|
|
|
{ "bind", GTK_RC_TOKEN_BIND },
|
|
|
|
{ "widget", GTK_RC_TOKEN_WIDGET },
|
|
|
|
{ "widget_class", GTK_RC_TOKEN_WIDGET_CLASS },
|
|
|
|
{ "class", GTK_RC_TOKEN_CLASS },
|
|
|
|
{ "lowest", GTK_RC_TOKEN_LOWEST },
|
|
|
|
{ "gtk", GTK_RC_TOKEN_GTK },
|
|
|
|
{ "application", GTK_RC_TOKEN_APPLICATION },
|
|
|
|
{ "rc", GTK_RC_TOKEN_RC },
|
|
|
|
{ "highest", GTK_RC_TOKEN_HIGHEST },
|
1998-11-06 22:05:02 +00:00
|
|
|
{ "engine", GTK_RC_TOKEN_ENGINE },
|
|
|
|
{ "module_path", GTK_RC_TOKEN_MODULE_PATH },
|
1998-05-01 04:23:59 +00:00
|
|
|
};
|
1998-07-22 22:29:10 +00:00
|
|
|
|
1998-11-30 19:07:15 +00:00
|
|
|
static const guint n_symbols = sizeof (symbols) / sizeof (symbols[0]);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static GHashTable *rc_style_ht = NULL;
|
1998-11-06 22:05:02 +00:00
|
|
|
static GHashTable *realized_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;
|
1998-07-01 01:35:13 +00:00
|
|
|
static GSList *gtk_rc_sets_class = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-12-09 01:05:41 +00:00
|
|
|
#define GTK_RC_MAX_DEFAULT_FILES 128
|
|
|
|
static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES];
|
|
|
|
static gboolean gtk_rc_auto_parse = TRUE;
|
|
|
|
|
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-11-06 22:05:02 +00:00
|
|
|
#define GTK_RC_MAX_MODULE_PATHS 128
|
|
|
|
static gchar *module_path[GTK_RC_MAX_MODULE_PATHS];
|
1997-11-24 22:37:52 +00:00
|
|
|
|
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;
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
/* RC file handling */
|
|
|
|
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifdef G_OS_WIN32
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
|
1999-06-14 21:43:53 +00:00
|
|
|
gchar *
|
1999-10-04 19:03:05 +00:00
|
|
|
get_gtk_sysconf_directory (void)
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
{
|
|
|
|
static gchar gtk_sysconf_dir[200];
|
|
|
|
gchar win_dir[100];
|
|
|
|
|
|
|
|
GetWindowsDirectory (win_dir, sizeof (win_dir));
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir);
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
return gtk_sysconf_dir;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gchar *
|
1999-10-04 19:03:05 +00:00
|
|
|
get_themes_directory (void)
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
{
|
|
|
|
/* We really should fetch this from the Registry. The GIMP
|
|
|
|
* installation program stores the Themes installation
|
|
|
|
* directory in HKLM\Software\GNU\GTk+\Themes\InstallDirectory.
|
|
|
|
* Later.
|
|
|
|
*/
|
|
|
|
static gchar themes_dir[200];
|
|
|
|
|
|
|
|
sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ());
|
|
|
|
return themes_dir;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
gchar *
|
|
|
|
gtk_rc_get_theme_dir(void)
|
|
|
|
{
|
|
|
|
gchar *var, *path;
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
1998-11-06 22:05:02 +00:00
|
|
|
var = getenv("GTK_DATA_PREFIX");
|
|
|
|
if (var)
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", var, "/share/themes");
|
1998-11-06 22:05:02 +00:00
|
|
|
else
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#else
|
|
|
|
path = g_strdup (get_themes_directory ());
|
|
|
|
#endif
|
1999-01-02 03:16:07 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar *
|
|
|
|
gtk_rc_get_module_dir(void)
|
|
|
|
{
|
|
|
|
gchar *var, *path;
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
1998-11-06 22:05:02 +00:00
|
|
|
var = getenv("GTK_EXE_PREFIX");
|
|
|
|
if (var)
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
|
1998-11-06 22:05:02 +00:00
|
|
|
else
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#else
|
|
|
|
path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
|
|
|
|
#endif
|
1999-01-02 03:16:07 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_append_default_pixmap_path(void)
|
|
|
|
{
|
|
|
|
gchar *var, *path;
|
|
|
|
gint n;
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
1998-11-06 22:05:02 +00:00
|
|
|
var = getenv("GTK_DATA_PREFIX");
|
|
|
|
if (var)
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
|
1998-11-06 22:05:02 +00:00
|
|
|
else
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#else
|
|
|
|
path = g_strdup (get_themes_directory ());
|
|
|
|
#endif
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
for (n = 0; pixmap_path[n]; n++) ;
|
|
|
|
if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
{
|
|
|
|
g_free (path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pixmap_path[n++] = path;
|
1998-11-06 22:05:02 +00:00
|
|
|
pixmap_path[n] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_append_pixmap_path(gchar *dir)
|
|
|
|
{
|
|
|
|
gint n;
|
|
|
|
|
|
|
|
for (n = 0; pixmap_path[n]; n++) ;
|
|
|
|
if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
|
|
|
|
return;
|
|
|
|
pixmap_path[n++] = g_strdup(dir);
|
|
|
|
pixmap_path[n] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_append_default_module_path(void)
|
|
|
|
{
|
|
|
|
gchar *var, *path;
|
|
|
|
gint n;
|
|
|
|
|
|
|
|
for (n = 0; module_path[n]; n++) ;
|
|
|
|
if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
|
|
|
|
return;
|
|
|
|
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
1998-11-06 22:05:02 +00:00
|
|
|
var = getenv("GTK_EXE_PREFIX");
|
|
|
|
if (var)
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
|
1998-11-06 22:05:02 +00:00
|
|
|
else
|
1999-01-02 03:16:07 +00:00
|
|
|
path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#else
|
|
|
|
path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
|
|
|
|
#endif
|
|
|
|
module_path[n++] = path;
|
1999-01-02 03:16:07 +00:00
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
var = g_get_home_dir ();
|
1998-11-06 22:05:02 +00:00
|
|
|
if (var)
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
{
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
path = g_strdup_printf ("%s%s", var, "/.gtk/lib/themes/engines");
|
|
|
|
#else
|
|
|
|
path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines");
|
|
|
|
#endif
|
|
|
|
module_path[n++] = path;
|
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
module_path[n] = NULL;
|
|
|
|
}
|
|
|
|
|
1998-12-09 01:05:41 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_add_initial_default_files (void)
|
|
|
|
{
|
|
|
|
static gint init = FALSE;
|
|
|
|
gchar *var, *str;
|
|
|
|
gchar **files;
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
if (init)
|
|
|
|
return;
|
|
|
|
|
|
|
|
gtk_rc_default_files[0] = NULL;
|
|
|
|
init = TRUE;
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
var = g_getenv("GTK_RC_FILES");
|
1998-12-09 01:05:41 +00:00
|
|
|
if (var)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
|
1998-12-09 01:05:41 +00:00
|
|
|
i=0;
|
|
|
|
while (files[i])
|
|
|
|
{
|
|
|
|
gtk_rc_add_default_file (files[i]);
|
|
|
|
i++;
|
|
|
|
}
|
1998-12-14 23:26:12 +00:00
|
|
|
g_strfreev (files);
|
1998-12-09 01:05:41 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-10-04 19:03:05 +00:00
|
|
|
#ifndef G_OS_WIN32
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk" G_DIR_SEPARATOR_S "gtkrc");
|
|
|
|
#else
|
|
|
|
str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());
|
|
|
|
#endif
|
1998-12-09 01:05:41 +00:00
|
|
|
gtk_rc_add_default_file (str);
|
1999-01-02 03:16:07 +00:00
|
|
|
g_free (str);
|
1998-12-09 01:05:41 +00:00
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
var = g_get_home_dir ();
|
|
|
|
if (var)
|
|
|
|
{
|
|
|
|
str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc", var);
|
|
|
|
gtk_rc_add_default_file (str);
|
|
|
|
g_free (str);
|
|
|
|
}
|
1998-12-09 01:05:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_rc_add_default_file (const gchar *file)
|
|
|
|
{
|
|
|
|
guint n;
|
|
|
|
|
|
|
|
gtk_rc_add_initial_default_files ();
|
|
|
|
|
|
|
|
for (n = 0; gtk_rc_default_files[n]; n++) ;
|
|
|
|
if (n >= GTK_RC_MAX_DEFAULT_FILES - 1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
gtk_rc_default_files[n++] = g_strdup (file);
|
|
|
|
gtk_rc_default_files[n] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_rc_set_default_files (gchar **files)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
gtk_rc_add_initial_default_files ();
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
while (gtk_rc_default_files[i])
|
|
|
|
{
|
|
|
|
g_free (gtk_rc_default_files[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_rc_default_files[0] = NULL;
|
|
|
|
gtk_rc_auto_parse = FALSE;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
while (files[i] != NULL)
|
|
|
|
{
|
|
|
|
gtk_rc_add_default_file (files[i]);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar **
|
|
|
|
gtk_rc_get_default_files (void)
|
|
|
|
{
|
|
|
|
gtk_rc_add_initial_default_files ();
|
|
|
|
|
|
|
|
return gtk_rc_default_files;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
1998-12-14 23:26:12 +00:00
|
|
|
gchar *locale_suffixes[3];
|
|
|
|
gint n_locale_suffixes = 0;
|
|
|
|
gint i, j;
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
#ifdef G_OS_WIN32
|
1999-11-04 23:42:51 +00:00
|
|
|
char *locale = g_win32_getlocale ();
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
#else
|
1999-01-20 18:35:53 +00:00
|
|
|
#ifdef HAVE_LC_MESSAGES
|
1998-12-14 23:26:12 +00:00
|
|
|
char *locale = setlocale (LC_MESSAGES, NULL);
|
1999-01-20 18:35:53 +00:00
|
|
|
#else
|
1999-01-21 13:26:35 +00:00
|
|
|
char *locale = setlocale (LC_CTYPE, NULL);
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
#endif
|
1999-01-20 18:35:53 +00:00
|
|
|
#endif
|
1998-12-14 23:26:12 +00:00
|
|
|
guint length;
|
|
|
|
char *p;
|
1998-12-09 01:05:41 +00:00
|
|
|
|
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);
|
1998-11-06 22:05:02 +00:00
|
|
|
pixmap_path[0] = NULL;
|
|
|
|
module_path[0] = NULL;
|
|
|
|
gtk_rc_append_default_pixmap_path();
|
|
|
|
gtk_rc_append_default_module_path();
|
1998-12-09 01:05:41 +00:00
|
|
|
|
|
|
|
gtk_rc_add_initial_default_files ();
|
|
|
|
|
1998-12-14 23:26:12 +00:00
|
|
|
if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
|
|
|
|
{
|
|
|
|
/* Determine locale-specific suffixes for RC files
|
|
|
|
*/
|
|
|
|
p = strchr (locale, '@');
|
|
|
|
length = p ? (p -locale) : strlen (locale);
|
|
|
|
|
|
|
|
p = strchr (locale, '.');
|
|
|
|
if (p)
|
|
|
|
{
|
|
|
|
locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
|
|
|
|
length = p - locale;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = strchr (locale, '_');
|
|
|
|
if (p)
|
|
|
|
{
|
|
|
|
locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
|
|
|
|
length = p - locale;
|
|
|
|
}
|
|
|
|
|
|
|
|
locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
|
|
|
|
}
|
|
|
|
|
1998-12-09 01:05:41 +00:00
|
|
|
i = 0;
|
|
|
|
while (gtk_rc_default_files[i] != NULL)
|
|
|
|
{
|
1998-12-14 23:26:12 +00:00
|
|
|
/* Try to find a locale specific RC file corresponding to
|
|
|
|
* to parse before the default file.
|
|
|
|
*/
|
|
|
|
for (j=n_locale_suffixes-1; j>=0; j--)
|
|
|
|
{
|
|
|
|
gchar *name = g_strconcat (gtk_rc_default_files[i],
|
|
|
|
".",
|
|
|
|
locale_suffixes[j],
|
|
|
|
NULL);
|
|
|
|
gtk_rc_parse (name);
|
1998-12-15 14:23:46 +00:00
|
|
|
g_free (name);
|
1998-12-14 23:26:12 +00:00
|
|
|
}
|
|
|
|
|
1998-12-09 01:05:41 +00:00
|
|
|
gtk_rc_parse (gtk_rc_default_files[i]);
|
|
|
|
i++;
|
|
|
|
}
|
1998-12-14 23:26:12 +00:00
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
if (g_path_is_absolute (rc_file->name))
|
1998-05-03 22:41:32 +00:00
|
|
|
rc_file->canonical_name = rc_file->name;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GString *str;
|
1998-08-18 16:58:09 +00:00
|
|
|
gchar *cwd;
|
|
|
|
|
|
|
|
cwd = g_get_current_dir ();
|
|
|
|
|
|
|
|
str = g_string_new (cwd);
|
|
|
|
g_free (cwd);
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
g_string_append_c (str, G_DIR_SEPARATOR);
|
1998-05-03 22:41:32 +00:00
|
|
|
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-11-06 22:05:02 +00:00
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
gchar *dir;
|
|
|
|
|
|
|
|
dir = g_strdup(rc_file->canonical_name);
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
for (i = strlen(dir) - 1; (i >= 0) && (dir[i] != G_DIR_SEPARATOR); i--)
|
1998-11-06 22:05:02 +00:00
|
|
|
dir[i] = 0;
|
1999-07-10 00:26:54 +00:00
|
|
|
if (i >= 0 && dir[i] == G_DIR_SEPARATOR)
|
|
|
|
dir[i] = 0;
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_append_pixmap_path(dir);
|
|
|
|
g_free(dir);
|
|
|
|
}
|
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);
|
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
/* Handling of RC styles */
|
|
|
|
|
|
|
|
GtkRcStyle *
|
|
|
|
gtk_rc_style_new (void)
|
1998-05-01 16:15:39 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *new_style;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
new_style = g_new0 (GtkRcStyle, 1);
|
|
|
|
new_style->ref_count = 1;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
return new_style;
|
|
|
|
}
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
void
|
|
|
|
gtk_rc_style_ref (GtkRcStyle *rc_style)
|
|
|
|
{
|
|
|
|
g_return_if_fail (rc_style != NULL);
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
rc_style->ref_count++;
|
|
|
|
}
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
void
|
|
|
|
gtk_rc_style_unref (GtkRcStyle *rc_style)
|
|
|
|
{
|
|
|
|
gint i;
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
g_return_if_fail (rc_style != NULL);
|
1999-01-15 18:41:43 +00:00
|
|
|
g_return_if_fail (rc_style->ref_count > 0);
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
rc_style->ref_count--;
|
|
|
|
|
|
|
|
if (rc_style->ref_count == 0)
|
|
|
|
{
|
|
|
|
if (rc_style->engine)
|
|
|
|
{
|
|
|
|
rc_style->engine->destroy_rc_style (rc_style);
|
|
|
|
gtk_theme_engine_unref (rc_style->engine);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rc_style->name)
|
|
|
|
g_free (rc_style->name);
|
|
|
|
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]);
|
|
|
|
|
|
|
|
g_free (rc_style);
|
1998-05-01 16:15:39 +00:00
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
}
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
static void
|
|
|
|
gtk_rc_clear_realized_node (gpointer key,
|
|
|
|
gpointer data,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
gtk_style_unref (data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_clear_hash_node (gpointer key,
|
|
|
|
gpointer data,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
gtk_rc_style_unref (data);
|
1998-05-01 16:15:39 +00:00
|
|
|
}
|
|
|
|
|
1998-05-03 22:41:32 +00:00
|
|
|
static void
|
1998-07-01 01:35:13 +00:00
|
|
|
gtk_rc_free_rc_sets (GSList *slist)
|
1998-05-01 16:15:39 +00:00
|
|
|
{
|
1998-07-01 01:35:13 +00:00
|
|
|
while (slist)
|
|
|
|
{
|
|
|
|
GtkRcSet *rc_set;
|
|
|
|
|
|
|
|
rc_set = slist->data;
|
|
|
|
gtk_pattern_spec_free_segs (&rc_set->pspec);
|
|
|
|
g_free (rc_set);
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
slist = slist->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_clear_styles (void)
|
|
|
|
{
|
1998-05-01 16:15:39 +00:00
|
|
|
/* Clear out all old rc_styles */
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
if (rc_style_ht)
|
|
|
|
{
|
|
|
|
g_hash_table_foreach (rc_style_ht, gtk_rc_clear_hash_node, NULL);
|
|
|
|
g_hash_table_destroy (rc_style_ht);
|
|
|
|
rc_style_ht = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (realized_style_ht)
|
|
|
|
{
|
|
|
|
g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_node, NULL);
|
|
|
|
g_hash_table_destroy (realized_style_ht);
|
|
|
|
realized_style_ht = NULL;
|
|
|
|
}
|
1998-05-01 16:15:39 +00:00
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
gtk_rc_free_rc_sets (gtk_rc_sets_widget);
|
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-07-01 01:35:13 +00:00
|
|
|
gtk_rc_free_rc_sets (gtk_rc_sets_widget_class);
|
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
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
gtk_rc_free_rc_sets (gtk_rc_sets_class);
|
|
|
|
g_slist_free (gtk_rc_sets_class);
|
|
|
|
gtk_rc_sets_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
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
static GSList *
|
|
|
|
gtk_rc_styles_match (GSList *rc_styles,
|
|
|
|
GSList *sets,
|
1998-07-01 01:35:13 +00:00
|
|
|
guint path_length,
|
|
|
|
gchar *path,
|
|
|
|
gchar *path_reversed)
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
{
|
|
|
|
GtkRcSet *rc_set;
|
|
|
|
|
|
|
|
while (sets)
|
|
|
|
{
|
|
|
|
rc_set = sets->data;
|
|
|
|
sets = sets->next;
|
|
|
|
|
|
|
|
if (gtk_pattern_match (&rc_set->pspec, path_length, path, path_reversed))
|
1998-11-06 22:05:02 +00:00
|
|
|
rc_styles = g_slist_append (rc_styles, rc_set->rc_style);
|
1998-07-01 01:35:13 +00:00
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
return rc_styles;
|
1998-07-01 01:35:13 +00:00
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkStyle*
|
|
|
|
gtk_rc_get_style (GtkWidget *widget)
|
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *widget_rc_style;
|
|
|
|
GSList *rc_styles = NULL;
|
|
|
|
|
|
|
|
static guint rc_style_key_id = 0;
|
|
|
|
|
|
|
|
/* We allow the specification of a single rc style to be bound
|
|
|
|
* tightly to a widget, for application modifications
|
|
|
|
*/
|
|
|
|
if (!rc_style_key_id)
|
|
|
|
rc_style_key_id = g_quark_from_static_string ("gtk-rc-style");
|
|
|
|
|
|
|
|
widget_rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
|
|
|
|
rc_style_key_id);
|
|
|
|
|
|
|
|
if (widget_rc_style)
|
1998-11-08 05:58:41 +00:00
|
|
|
rc_styles = g_slist_prepend (rc_styles, widget_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-11-06 22:05:02 +00:00
|
|
|
rc_styles = gtk_rc_styles_match (rc_styles, 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);
|
|
|
|
|
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-11-06 22:05:02 +00:00
|
|
|
rc_styles = gtk_rc_styles_match (rc_styles, 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);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-07-01 01:35:13 +00:00
|
|
|
|
|
|
|
if (gtk_rc_sets_class)
|
|
|
|
{
|
|
|
|
GtkType type;
|
|
|
|
|
|
|
|
type = GTK_OBJECT_TYPE (widget);
|
|
|
|
while (type)
|
|
|
|
{
|
|
|
|
gchar *path, *path_reversed;
|
|
|
|
guint path_length;
|
|
|
|
|
|
|
|
path = gtk_type_name (type);
|
|
|
|
path_length = strlen (path);
|
|
|
|
path_reversed = g_strdup (path);
|
|
|
|
g_strreverse (path_reversed);
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_class, path_length, path, path_reversed);
|
1998-07-01 01:35:13 +00:00
|
|
|
g_free (path_reversed);
|
|
|
|
|
|
|
|
type = gtk_type_parent (type);
|
|
|
|
}
|
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
if (rc_styles)
|
|
|
|
return gtk_rc_style_init (rc_styles);
|
|
|
|
|
1998-02-27 16:31:06 +00:00
|
|
|
return NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
static GSList*
|
|
|
|
gtk_rc_add_rc_sets (GSList *slist,
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *rc_style,
|
1998-07-01 01:35:13 +00:00
|
|
|
const char *pattern)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *new_style;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkRcSet *rc_set;
|
1998-07-01 01:35:13 +00:00
|
|
|
guint i;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
new_style = gtk_rc_style_new ();
|
|
|
|
*new_style = *rc_style;
|
|
|
|
new_style->name = g_strdup (rc_style->name);
|
|
|
|
new_style->font_name = g_strdup (rc_style->font_name);
|
|
|
|
new_style->fontset_name = g_strdup (rc_style->fontset_name);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
1998-11-06 22:05:02 +00:00
|
|
|
new_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
|
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-07-01 01:35:13 +00:00
|
|
|
return g_slist_prepend (slist, rc_set);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_add_widget_name_style (GtkRcStyle *rc_style,
|
1998-07-01 01:35:13 +00:00
|
|
|
const gchar *pattern)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
g_return_if_fail (rc_style != NULL);
|
1998-07-01 01:35:13 +00:00
|
|
|
g_return_if_fail (pattern != NULL);
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_sets_widget = gtk_rc_add_rc_sets (gtk_rc_sets_widget, rc_style, pattern);
|
1998-07-01 01:35:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_add_widget_class_style (GtkRcStyle *rc_style,
|
1998-07-01 01:35:13 +00:00
|
|
|
const gchar *pattern)
|
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
g_return_if_fail (rc_style != NULL);
|
1998-07-01 01:35:13 +00:00
|
|
|
g_return_if_fail (pattern != NULL);
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_sets_widget_class = gtk_rc_add_rc_sets (gtk_rc_sets_widget_class, rc_style, pattern);
|
1998-07-01 01:35:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_add_class_style (GtkRcStyle *rc_style,
|
1998-07-01 01:35:13 +00:00
|
|
|
const gchar *pattern)
|
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
g_return_if_fail (rc_style != NULL);
|
1998-07-01 01:35:13 +00:00
|
|
|
g_return_if_fail (pattern != NULL);
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_sets_class = gtk_rc_add_rc_sets (gtk_rc_sets_class, rc_style, pattern);
|
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
|
|
|
|
1999-01-02 03:16:07 +00:00
|
|
|
scanner = g_scanner_new ((GScannerConfig *) >k_rc_scanner_config);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
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;
|
1998-07-22 22:29:10 +00:00
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
g_scanner_freeze_symbol_table (scanner);
|
1998-07-22 22:29:10 +00:00
|
|
|
for (i = 0; i < n_symbols; 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;
|
1998-07-22 22:29:10 +00:00
|
|
|
symbol_name = NULL;
|
|
|
|
if (scanner->scope_id == 0)
|
1998-06-30 11:05:20 +00:00
|
|
|
{
|
1998-07-22 22:29:10 +00:00
|
|
|
/* if we are in scope 0, we know the symbol names
|
|
|
|
* that are associated with certaintoken values.
|
|
|
|
* so we look them up to make the error messages
|
|
|
|
* more readable.
|
|
|
|
*/
|
|
|
|
if (expected_token > GTK_RC_TOKEN_INVALID &&
|
|
|
|
expected_token < GTK_RC_TOKEN_LAST)
|
|
|
|
{
|
|
|
|
for (i = 0; i < n_symbols; i++)
|
|
|
|
if (symbols[i].token == expected_token)
|
|
|
|
msg = symbols[i].name;
|
|
|
|
if (msg)
|
|
|
|
msg = g_strconcat ("e.g. `", msg, "'", NULL);
|
|
|
|
}
|
|
|
|
if (scanner->token > GTK_RC_TOKEN_INVALID &&
|
|
|
|
scanner->token < GTK_RC_TOKEN_LAST)
|
|
|
|
{
|
|
|
|
symbol_name = "???";
|
|
|
|
for (i = 0; i < n_symbols; i++)
|
|
|
|
if (symbols[i].token == scanner->token)
|
|
|
|
symbol_name = symbols[i].name;
|
|
|
|
}
|
1998-06-30 11:05:20 +00:00
|
|
|
}
|
|
|
|
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
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
static guint
|
|
|
|
gtk_rc_styles_hash (const GSList *rc_styles)
|
|
|
|
{
|
|
|
|
guint result;
|
|
|
|
|
|
|
|
result = 0;
|
|
|
|
while (rc_styles)
|
|
|
|
{
|
|
|
|
result += (result << 9) + GPOINTER_TO_UINT (rc_styles->data);
|
|
|
|
rc_styles = rc_styles->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_rc_styles_compare (const GSList *a,
|
|
|
|
const GSList *b)
|
|
|
|
{
|
|
|
|
while (a && b)
|
|
|
|
{
|
|
|
|
if (a->data != b->data)
|
|
|
|
return FALSE;
|
|
|
|
a = a->next;
|
|
|
|
b = b->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (a == b);
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
/* Assumes ownership of rc_style */
|
1998-03-08 21:47:14 +00:00
|
|
|
static GtkStyle *
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_style_to_style (GtkRcStyle *rc_style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkStyle *style;
|
1997-11-24 22:37:52 +00:00
|
|
|
GdkFont *old_font;
|
|
|
|
gint i;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
style = gtk_style_new ();
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
style->rc_style = rc_style;
|
|
|
|
|
|
|
|
if (rc_style->fontset_name)
|
|
|
|
{
|
|
|
|
old_font = style->font;
|
|
|
|
style->font = gdk_fontset_load (rc_style->fontset_name);
|
|
|
|
if (style->font)
|
|
|
|
gdk_font_unref (old_font);
|
|
|
|
else
|
|
|
|
style->font = old_font;
|
|
|
|
}
|
|
|
|
else if (rc_style->font_name)
|
|
|
|
{
|
|
|
|
old_font = style->font;
|
|
|
|
style->font = gdk_font_load (rc_style->font_name);
|
|
|
|
if (style->font)
|
|
|
|
gdk_font_unref (old_font);
|
|
|
|
else
|
|
|
|
style->font = old_font;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
{
|
|
|
|
if (rc_style->color_flags[i] & GTK_RC_FG)
|
|
|
|
style->fg[i] = rc_style->fg[i];
|
|
|
|
if (rc_style->color_flags[i] & GTK_RC_BG)
|
|
|
|
style->bg[i] = rc_style->bg[i];
|
|
|
|
if (rc_style->color_flags[i] & GTK_RC_TEXT)
|
|
|
|
style->text[i] = rc_style->text[i];
|
|
|
|
if (rc_style->color_flags[i] & GTK_RC_BASE)
|
|
|
|
style->base[i] = rc_style->base[i];
|
|
|
|
}
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
if (rc_style->engine)
|
1998-03-08 21:47:14 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
style->engine = rc_style->engine;
|
|
|
|
gtk_theme_engine_ref (style->engine);
|
|
|
|
rc_style->engine->rc_style_to_style (style, rc_style);
|
|
|
|
}
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
return style;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reuses or frees rc_styles */
|
|
|
|
static GtkStyle *
|
|
|
|
gtk_rc_style_init (GSList *rc_styles)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
GtkStyle *style = NULL;
|
|
|
|
GtkRcStyle *proto_style;
|
|
|
|
|
|
|
|
if (!realized_style_ht)
|
|
|
|
realized_style_ht = g_hash_table_new ((GHashFunc)gtk_rc_styles_hash,
|
|
|
|
(GCompareFunc)gtk_rc_styles_compare);
|
|
|
|
|
|
|
|
style = g_hash_table_lookup (realized_style_ht, rc_styles);
|
1998-03-08 21:47:14 +00:00
|
|
|
|
|
|
|
if (!style)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GSList *tmp_styles = rc_styles;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
proto_style = gtk_rc_style_new ();
|
|
|
|
|
|
|
|
while (tmp_styles)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
GtkRcStyle *rc_style = tmp_styles->data;
|
|
|
|
|
|
|
|
for (i=0; i<5; i++)
|
|
|
|
{
|
|
|
|
if (!proto_style->bg_pixmap_name[i] && rc_style->bg_pixmap_name[i])
|
|
|
|
proto_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
|
|
|
|
|
|
|
|
if (!(proto_style->color_flags[i] & GTK_RC_FG) &&
|
|
|
|
rc_style->color_flags[i] & GTK_RC_FG)
|
|
|
|
{
|
|
|
|
proto_style->fg[i] = rc_style->fg[i];
|
|
|
|
proto_style->color_flags[i] |= GTK_RC_FG;
|
|
|
|
}
|
|
|
|
if (!(proto_style->color_flags[i] & GTK_RC_BG) &&
|
|
|
|
rc_style->color_flags[i] & GTK_RC_BG)
|
|
|
|
{
|
|
|
|
proto_style->bg[i] = rc_style->bg[i];
|
|
|
|
proto_style->color_flags[i] |= GTK_RC_BG;
|
|
|
|
}
|
|
|
|
if (!(proto_style->color_flags[i] & GTK_RC_TEXT) &&
|
|
|
|
rc_style->color_flags[i] & GTK_RC_TEXT)
|
|
|
|
{
|
|
|
|
proto_style->text[i] = rc_style->text[i];
|
|
|
|
proto_style->color_flags[i] |= GTK_RC_TEXT;
|
|
|
|
}
|
|
|
|
if (!(proto_style->color_flags[i] & GTK_RC_BASE) &&
|
|
|
|
rc_style->color_flags[i] & GTK_RC_BASE)
|
|
|
|
{
|
|
|
|
proto_style->base[i] = rc_style->base[i];
|
|
|
|
proto_style->color_flags[i] |= GTK_RC_BASE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!proto_style->font_name && rc_style->font_name)
|
|
|
|
proto_style->font_name = g_strdup (rc_style->font_name);
|
|
|
|
if (!proto_style->fontset_name && rc_style->fontset_name)
|
|
|
|
proto_style->fontset_name = g_strdup (rc_style->fontset_name);
|
|
|
|
|
|
|
|
if (!proto_style->engine && rc_style->engine)
|
|
|
|
{
|
|
|
|
proto_style->engine = rc_style->engine;
|
|
|
|
gtk_theme_engine_ref (proto_style->engine);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (proto_style->engine &&
|
|
|
|
(proto_style->engine == rc_style->engine))
|
|
|
|
proto_style->engine->merge_rc_style (proto_style, rc_style);
|
|
|
|
|
|
|
|
tmp_styles = tmp_styles->next;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1999-01-17 22:38:05 +00:00
|
|
|
for (i=0; i<5; i++)
|
|
|
|
if (proto_style->bg_pixmap_name[i] &&
|
|
|
|
(strcmp (proto_style->bg_pixmap_name[i], "<none>") == 0))
|
|
|
|
{
|
|
|
|
g_free (proto_style->bg_pixmap_name[i]);
|
|
|
|
proto_style->bg_pixmap_name[i] = NULL;
|
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
style = gtk_rc_style_to_style (proto_style);
|
|
|
|
|
|
|
|
g_hash_table_insert (realized_style_ht, rc_styles, style);
|
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-11-06 22:05:02 +00:00
|
|
|
/*********************
|
|
|
|
* Parsing functions *
|
|
|
|
*********************/
|
|
|
|
|
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-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_INCLUDE:
|
1998-05-01 04:23:59 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_INCLUDE)
|
|
|
|
return GTK_RC_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;
|
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_STYLE:
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_style (scanner);
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_BINDING:
|
|
|
|
return gtk_binding_parse_binding (scanner);
|
|
|
|
|
|
|
|
case GTK_RC_TOKEN_PIXMAP_PATH:
|
1998-06-30 11:05:20 +00:00
|
|
|
return gtk_rc_parse_pixmap_path (scanner);
|
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_WIDGET:
|
1998-07-01 01:35:13 +00:00
|
|
|
return gtk_rc_parse_path_pattern (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_WIDGET_CLASS:
|
1998-07-01 01:35:13 +00:00
|
|
|
return gtk_rc_parse_path_pattern (scanner);
|
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_CLASS:
|
1998-07-01 01:35:13 +00:00
|
|
|
return gtk_rc_parse_path_pattern (scanner);
|
1998-06-30 11:05:20 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
case GTK_RC_TOKEN_MODULE_PATH:
|
|
|
|
return gtk_rc_parse_module_path (scanner);
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
default:
|
|
|
|
g_scanner_get_next_token (scanner);
|
1998-07-22 22:29:10 +00:00
|
|
|
return /* G_TOKEN_SYMBOL */ GTK_RC_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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_STYLE)
|
|
|
|
return GTK_RC_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;
|
1998-11-06 22:05:02 +00:00
|
|
|
rc_style = gtk_rc_style_new ();
|
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
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
rc_style->bg_pixmap_name[i] = NULL;
|
1998-03-08 21:47:14 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
for (i = 0; i < 5; i++)
|
|
|
|
rc_style->color_flags[i] = 0;
|
|
|
|
|
|
|
|
rc_style->engine = NULL;
|
|
|
|
rc_style->engine_data = 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-11-06 22:05:02 +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-11-06 22:05:02 +00:00
|
|
|
rc_style->color_flags[i] = parent_style->color_flags[i];
|
|
|
|
rc_style->fg[i] = parent_style->fg[i];
|
|
|
|
rc_style->bg[i] = parent_style->bg[i];
|
|
|
|
rc_style->text[i] = parent_style->text[i];
|
|
|
|
rc_style->base[i] = parent_style->base[i];
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-11-13 21:28:36 +00:00
|
|
|
if (parent_style->fontset_name)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-13 21:28:36 +00:00
|
|
|
if (rc_style->fontset_name)
|
|
|
|
g_free (rc_style->fontset_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
rc_style->fontset_name = g_strdup (parent_style->fontset_name);
|
|
|
|
}
|
1998-11-13 21:28:36 +00:00
|
|
|
else if (parent_style->font_name)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-11-13 21:28:36 +00:00
|
|
|
if (rc_style->font_name)
|
|
|
|
g_free (rc_style->font_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
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-11-06 22:05:02 +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)
|
|
|
|
{
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_BASE:
|
1998-11-06 22:05:02 +00:00
|
|
|
token = gtk_rc_parse_base (scanner, rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_BG:
|
1998-11-06 22:05:02 +00:00
|
|
|
token = gtk_rc_parse_bg (scanner, rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_FG:
|
1998-11-06 22:05:02 +00:00
|
|
|
token = gtk_rc_parse_fg (scanner, rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_TEXT:
|
1998-11-06 22:05:02 +00:00
|
|
|
token = gtk_rc_parse_text (scanner, rc_style);
|
1998-06-30 11:05:20 +00:00
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_BG_PIXMAP:
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_bg_pixmap (scanner, rc_style);
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_FONT:
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_font (scanner, rc_style);
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_FONTSET:
|
1998-06-30 11:05:20 +00:00
|
|
|
token = gtk_rc_parse_fontset (scanner, rc_style);
|
|
|
|
break;
|
1998-11-06 22:05:02 +00:00
|
|
|
case GTK_RC_TOKEN_ENGINE:
|
|
|
|
token = gtk_rc_parse_engine (scanner, rc_style);
|
|
|
|
break;
|
1998-06-30 11:05:20 +00:00
|
|
|
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]);
|
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
|
|
|
|
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
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_parse_base (GScanner *scanner,
|
|
|
|
GtkRcStyle *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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_BASE)
|
|
|
|
return GTK_RC_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;
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
style->color_flags[state] |= GTK_RC_BASE;
|
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
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_parse_bg (GScanner *scanner,
|
|
|
|
GtkRcStyle *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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_BG)
|
|
|
|
return GTK_RC_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;
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
style->color_flags[state] |= GTK_RC_BG;
|
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
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_parse_fg (GScanner *scanner,
|
|
|
|
GtkRcStyle *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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_FG)
|
|
|
|
return GTK_RC_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-11-06 22:05:02 +00:00
|
|
|
style->color_flags[state] |= GTK_RC_FG;
|
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-11-06 22:05:02 +00:00
|
|
|
gtk_rc_parse_text (GScanner *scanner,
|
|
|
|
GtkRcStyle *style)
|
1998-03-08 21:47:14 +00:00
|
|
|
{
|
|
|
|
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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_TEXT)
|
|
|
|
return GTK_RC_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-11-06 22:05:02 +00:00
|
|
|
style->color_flags[state] |= GTK_RC_TEXT;
|
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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_BG_PIXMAP)
|
|
|
|
return GTK_RC_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
|
|
|
|
1999-01-17 22:38:05 +00:00
|
|
|
if ((strcmp (scanner->value.v_string, "<parent>") == 0) ||
|
|
|
|
(strcmp (scanner->value.v_string, "<none>") == 0))
|
1997-12-23 02:12:10 +00:00
|
|
|
pixmap_file = g_strdup (scanner->value.v_string);
|
1999-01-11 18:49:54 +00:00
|
|
|
else
|
|
|
|
pixmap_file = gtk_rc_find_pixmap_in_path (scanner, scanner->value.v_string);
|
1997-12-23 02:12:10 +00:00
|
|
|
|
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-11-06 22:05:02 +00:00
|
|
|
gchar*
|
1997-12-23 02:12:10 +00:00
|
|
|
gtk_rc_find_pixmap_in_path (GScanner *scanner,
|
1998-11-23 13:53:25 +00:00
|
|
|
const 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++)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%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);
|
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
if (scanner)
|
1998-12-18 01:32:33 +00:00
|
|
|
g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
|
1998-11-06 22:05:02 +00:00
|
|
|
pixmap_file, scanner->line);
|
|
|
|
else
|
1998-12-18 01:32:33 +00:00
|
|
|
g_warning (_("Unable to locate image file in pixmap_path: \"%s\""),
|
1998-11-06 22:05:02 +00:00
|
|
|
pixmap_file);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar*
|
1998-11-28 07:42:37 +00:00
|
|
|
gtk_rc_find_module_in_path (const gchar *module_file)
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
gint fd;
|
|
|
|
gchar *buf;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
for (i = 0; (i < GTK_RC_MAX_MODULE_PATHS) && (module_path[i] != NULL); i++)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
|
|
|
|
module_path[i], module_file);
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
fd = open (buf, O_RDONLY);
|
|
|
|
if (fd >= 0)
|
|
|
|
{
|
|
|
|
close (fd);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (buf);
|
|
|
|
}
|
|
|
|
|
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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_FONT)
|
|
|
|
return GTK_RC_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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_FONTSET)
|
|
|
|
return GTK_RC_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-11-06 22:05:02 +00:00
|
|
|
static guint
|
|
|
|
gtk_rc_parse_engine (GScanner *scanner,
|
|
|
|
GtkRcStyle *rc_style)
|
|
|
|
{
|
|
|
|
guint token;
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != GTK_RC_TOKEN_ENGINE)
|
|
|
|
return GTK_RC_TOKEN_ENGINE;
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
|
|
|
return G_TOKEN_STRING;
|
|
|
|
|
|
|
|
rc_style->engine = gtk_theme_engine_get (scanner->value.v_string);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_LEFT_CURLY)
|
|
|
|
return G_TOKEN_LEFT_CURLY;
|
|
|
|
|
|
|
|
if (rc_style->engine)
|
|
|
|
return rc_style->engine->parse_rc_style (scanner, rc_style);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Skip over remainder, looking for nested {}'s */
|
|
|
|
guint count = 1;
|
|
|
|
|
|
|
|
while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF)
|
|
|
|
{
|
|
|
|
if (token == G_TOKEN_LEFT_CURLY)
|
|
|
|
count++;
|
|
|
|
else if (token == G_TOKEN_RIGHT_CURLY)
|
|
|
|
count--;
|
|
|
|
|
|
|
|
if (count == 0)
|
|
|
|
return G_TOKEN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return G_TOKEN_RIGHT_CURLY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
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-07-22 22:29:10 +00:00
|
|
|
guint old_scope;
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1998-07-22 22:29:10 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
|
|
|
|
g_return_val_if_fail (state != NULL, G_TOKEN_ERROR);
|
|
|
|
|
|
|
|
/* we don't know where we got called from, so we reset the scope here.
|
|
|
|
* if we bail out due to errors, we *don't* reset the scope, so the
|
|
|
|
* error messaging code can make sense of our tokens.
|
|
|
|
*/
|
|
|
|
old_scope = g_scanner_set_scope (scanner, 0);
|
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)
|
|
|
|
{
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_ACTIVE:
|
1998-06-30 11:05:20 +00:00
|
|
|
*state = GTK_STATE_ACTIVE;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_INSENSITIVE:
|
1998-06-30 11:05:20 +00:00
|
|
|
*state = GTK_STATE_INSENSITIVE;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_NORMAL:
|
1998-06-30 11:05:20 +00:00
|
|
|
*state = GTK_STATE_NORMAL;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_PRELIGHT:
|
1998-06-30 11:05:20 +00:00
|
|
|
*state = GTK_STATE_PRELIGHT;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_SELECTED:
|
1998-06-30 11:05:20 +00:00
|
|
|
*state = GTK_STATE_SELECTED;
|
|
|
|
break;
|
|
|
|
default:
|
1998-07-22 22:29:10 +00:00
|
|
|
return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_NORMAL;
|
1998-06-30 11:05:20 +00:00
|
|
|
}
|
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-07-22 22:29:10 +00:00
|
|
|
g_scanner_set_scope (scanner, old_scope);
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_NONE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-07-22 22:29:10 +00:00
|
|
|
guint
|
|
|
|
gtk_rc_parse_priority (GScanner *scanner,
|
|
|
|
GtkPathPriorityType *priority)
|
|
|
|
{
|
|
|
|
guint old_scope;
|
|
|
|
guint token;
|
|
|
|
|
|
|
|
g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
|
|
|
|
g_return_val_if_fail (priority != NULL, G_TOKEN_ERROR);
|
|
|
|
|
|
|
|
/* we don't know where we got called from, so we reset the scope here.
|
|
|
|
* if we bail out due to errors, we *don't* reset the scope, so the
|
|
|
|
* error messaging code can make sense of our tokens.
|
|
|
|
*/
|
|
|
|
old_scope = g_scanner_set_scope (scanner, 0);
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != ':')
|
|
|
|
return ':';
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
switch (token)
|
|
|
|
{
|
|
|
|
case GTK_RC_TOKEN_LOWEST:
|
|
|
|
*priority = GTK_PATH_PRIO_LOWEST;
|
|
|
|
break;
|
|
|
|
case GTK_RC_TOKEN_GTK:
|
|
|
|
*priority = GTK_PATH_PRIO_GTK;
|
|
|
|
break;
|
|
|
|
case GTK_RC_TOKEN_APPLICATION:
|
|
|
|
*priority = GTK_PATH_PRIO_APPLICATION;
|
|
|
|
break;
|
|
|
|
case GTK_RC_TOKEN_RC:
|
|
|
|
*priority = GTK_PATH_PRIO_RC;
|
|
|
|
break;
|
|
|
|
case GTK_RC_TOKEN_HIGHEST:
|
|
|
|
*priority = GTK_PATH_PRIO_HIGHEST;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_APPLICATION;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_scanner_set_scope (scanner, old_scope);
|
|
|
|
|
|
|
|
return G_TOKEN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
1998-07-22 22:29:10 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
|
|
|
|
|
|
|
|
/* we don't need to set our own scop here, because
|
|
|
|
* we don't need own symbols
|
|
|
|
*/
|
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-07-22 22:29:10 +00:00
|
|
|
if (token != GTK_RC_TOKEN_PIXMAP_PATH)
|
|
|
|
return GTK_RC_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
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
if ((buf[end_offset] == G_SEARCHPATH_SEPARATOR) ||
|
1997-12-07 02:34:38 +00:00
|
|
|
(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);
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_rc_append_default_pixmap_path();
|
|
|
|
}
|
|
|
|
|
|
|
|
static guint
|
|
|
|
gtk_rc_parse_module_path (GScanner *scanner)
|
|
|
|
{
|
|
|
|
guint token;
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != GTK_RC_TOKEN_MODULE_PATH)
|
|
|
|
return GTK_RC_TOKEN_MODULE_PATH;
|
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
|
|
|
if (token != G_TOKEN_STRING)
|
|
|
|
return G_TOKEN_STRING;
|
|
|
|
|
|
|
|
gtk_rc_parse_module_path_string (scanner->value.v_string);
|
|
|
|
|
|
|
|
return G_TOKEN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_rc_parse_module_path_string (gchar *mod_path)
|
|
|
|
{
|
|
|
|
gchar *buf;
|
|
|
|
gint end_offset;
|
|
|
|
gint start_offset = 0;
|
|
|
|
gint path_len;
|
|
|
|
gint path_num;
|
|
|
|
|
|
|
|
/* free the old one, or just add to the old one ? */
|
|
|
|
for (path_num=0; module_path[path_num]; path_num++)
|
|
|
|
{
|
|
|
|
g_free (module_path[path_num]);
|
|
|
|
module_path[path_num] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
path_num = 0;
|
|
|
|
|
|
|
|
path_len = strlen (mod_path);
|
|
|
|
|
|
|
|
buf = g_strdup (mod_path);
|
|
|
|
|
|
|
|
for (end_offset = 0; end_offset <= path_len; end_offset++)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
if ((buf[end_offset] == G_SEARCHPATH_SEPARATOR) ||
|
1998-11-06 22:05:02 +00:00
|
|
|
(end_offset == path_len))
|
|
|
|
{
|
|
|
|
buf[end_offset] = '\0';
|
|
|
|
module_path[path_num] = g_strdup (buf + start_offset);
|
|
|
|
path_num++;
|
|
|
|
module_path[path_num] = NULL;
|
|
|
|
start_offset = end_offset + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_free (buf);
|
|
|
|
gtk_rc_append_default_module_path();
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-06-30 11:05:20 +00:00
|
|
|
static guint
|
1998-07-01 01:35:13 +00:00
|
|
|
gtk_rc_parse_path_pattern (GScanner *scanner)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-30 11:05:20 +00:00
|
|
|
guint token;
|
1998-07-01 01:35:13 +00:00
|
|
|
GtkPathType path_type;
|
|
|
|
gchar *pattern;
|
|
|
|
gboolean is_binding;
|
1998-07-22 22:29:10 +00:00
|
|
|
GtkPathPriorityType priority = GTK_PATH_PRIO_RC;
|
1997-12-23 02:12:10 +00:00
|
|
|
|
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-07-01 01:35:13 +00:00
|
|
|
switch (token)
|
|
|
|
{
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_WIDGET:
|
1998-07-01 01:35:13 +00:00
|
|
|
path_type = GTK_PATH_WIDGET;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_WIDGET_CLASS:
|
1998-07-01 01:35:13 +00:00
|
|
|
path_type = GTK_PATH_WIDGET_CLASS;
|
|
|
|
break;
|
1998-07-22 22:29:10 +00:00
|
|
|
case GTK_RC_TOKEN_CLASS:
|
1998-07-01 01:35:13 +00:00
|
|
|
path_type = GTK_PATH_CLASS;
|
|
|
|
break;
|
|
|
|
default:
|
1998-07-22 22:29:10 +00:00
|
|
|
return GTK_RC_TOKEN_WIDGET_CLASS;
|
1998-07-01 01:35:13 +00:00
|
|
|
}
|
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
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
pattern = g_strdup (scanner->value.v_string);
|
|
|
|
|
1997-12-23 02:12:10 +00:00
|
|
|
token = g_scanner_get_next_token (scanner);
|
1998-07-22 22:29:10 +00:00
|
|
|
if (token == GTK_RC_TOKEN_STYLE)
|
1998-07-01 01:35:13 +00:00
|
|
|
is_binding = FALSE;
|
1998-07-22 22:29:10 +00:00
|
|
|
else if (token == GTK_RC_TOKEN_BINDING)
|
|
|
|
{
|
|
|
|
is_binding = TRUE;
|
|
|
|
if (g_scanner_peek_next_token (scanner) == ':')
|
|
|
|
{
|
|
|
|
token = gtk_rc_parse_priority (scanner, &priority);
|
|
|
|
if (token != G_TOKEN_NONE)
|
|
|
|
{
|
|
|
|
g_free (pattern);
|
|
|
|
return token;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-07-01 01:35:13 +00:00
|
|
|
else
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-07-01 01:35:13 +00:00
|
|
|
g_free (pattern);
|
1998-07-22 22:29:10 +00:00
|
|
|
return GTK_RC_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
|
|
|
{
|
1998-07-01 01:35:13 +00:00
|
|
|
g_free (pattern);
|
1998-06-30 11:05:20 +00:00
|
|
|
return G_TOKEN_STRING;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-07-01 01:35:13 +00:00
|
|
|
if (is_binding)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-07-01 01:35:13 +00:00
|
|
|
GtkBindingSet *binding;
|
|
|
|
|
|
|
|
binding = gtk_binding_set_find (scanner->value.v_string);
|
|
|
|
if (!binding)
|
|
|
|
{
|
|
|
|
g_free (pattern);
|
|
|
|
return G_TOKEN_STRING;
|
|
|
|
}
|
1998-07-22 22:29:10 +00:00
|
|
|
gtk_binding_set_add_path (binding, path_type, pattern, priority);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-07-01 01:35:13 +00:00
|
|
|
else
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-07-01 01:35:13 +00:00
|
|
|
GtkRcStyle *rc_style;
|
|
|
|
GtkRcSet *rc_set;
|
|
|
|
|
|
|
|
rc_style = gtk_rc_style_find (scanner->value.v_string);
|
|
|
|
|
|
|
|
if (!rc_style)
|
|
|
|
{
|
|
|
|
g_free (pattern);
|
|
|
|
return G_TOKEN_STRING;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc_set = g_new (GtkRcSet, 1);
|
|
|
|
gtk_pattern_spec_init (&rc_set->pspec, pattern);
|
|
|
|
rc_set->rc_style = rc_style;
|
|
|
|
|
|
|
|
if (path_type == GTK_PATH_WIDGET)
|
|
|
|
gtk_rc_sets_widget = g_slist_prepend (gtk_rc_sets_widget, rc_set);
|
|
|
|
else if (path_type == GTK_PATH_WIDGET_CLASS)
|
|
|
|
gtk_rc_sets_widget_class = g_slist_prepend (gtk_rc_sets_widget_class, rc_set);
|
|
|
|
else
|
|
|
|
gtk_rc_sets_class = g_slist_prepend (gtk_rc_sets_class, rc_set);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-07-01 01:35:13 +00:00
|
|
|
|
|
|
|
g_free (pattern);
|
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
|
|
|
{
|
1998-11-06 22:05:02 +00:00
|
|
|
image_loader = loader;
|
1998-05-21 19:24:01 +00:00
|
|
|
}
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
GdkPixmap *
|
|
|
|
gtk_rc_load_image (GdkColormap *colormap,
|
|
|
|
GdkColor *transparent_color,
|
|
|
|
const gchar *filename)
|
|
|
|
{
|
|
|
|
if (strcmp (filename, "<parent>") == 0)
|
|
|
|
return (GdkPixmap*) GDK_PARENT_RELATIVE;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(image_loader)
|
|
|
|
return image_loader(NULL, colormap, NULL,
|
|
|
|
transparent_color,
|
|
|
|
filename);
|
|
|
|
else
|
|
|
|
return gdk_pixmap_colormap_create_from_xpm (NULL, colormap, NULL,
|
|
|
|
transparent_color,
|
|
|
|
filename);
|
|
|
|
}
|
|
|
|
}
|