gtk2/gtk/gtkfontsel.c

3816 lines
119 KiB
C
Raw Normal View History

1998-06-15 23:29:27 +00:00
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* GtkFontSelection widget for Gtk+, by Damon Chaplin, May 1998.
* Based on the GnomeFontSelector widget, by Elliot Lee, but major changes.
* The GnomeFontSelector was derived from app/text_tool.c in the GIMP.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* 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/.
*/
1998-06-15 23:29:27 +00:00
/*
* Limits:
*
* Fontnames - A maximum of MAX_FONTS (32767) fontnames will be retrieved
* from X Windows with XListFonts(). Any more are ignored.
* I think this limit may have been set because of a limit in
* GtkList. It could possibly be increased since we are using
* GtkClists now, but I'd be surprised if it was reached.
* Field length - XLFD_MAX_FIELD_LEN is the maximum length that any field of a
* fontname can be for it to be considered valid. Others are
* ignored.
* Properties - Maximum of 65535 choices for each font property - guint16's
* are used as indices, e.g. in the FontInfo struct.
* Combinations - Maximum of 65535 combinations of properties for each font
* family - a guint16 is used in the FontInfo struct.
* Font size - Minimum font size of 2 pixels/points, since trying to load
* some fonts with a size of 1 can cause X to hang.
* (e.g. the Misc Fixed fonts).
*/
/*
* Possible Improvements:
*
* Font Styles - could sort the styles into a reasonable order - regular
* first, then bold, bold italic etc.
1998-06-15 23:29:27 +00:00
*
* I18N - the default preview text is not useful for international
* fonts. Maybe the first few characters of the font could be
* displayed instead.
* - fontsets? should these be handled by the font dialog?
*/
/*
* Debugging: compile with -DFONTSEL_DEBUG for lots of debugging output.
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "gdk/gdk.h"
1998-06-15 23:29:27 +00:00
#include "gdk/gdkx.h"
#include "gdk/gdkkeysyms.h"
#include "gtkbutton.h"
#include "gtkcheckbutton.h"
1998-06-15 23:29:27 +00:00
#include "gtkclist.h"
#include "gtkentry.h"
#include "gtkfontsel.h"
#include "gtkframe.h"
#include "gtkhbbox.h"
#include "gtkhbox.h"
#include "gtklabel.h"
#include "gtknotebook.h"
#include "gtkradiobutton.h"
#include "gtksignal.h"
#include "gtktable.h"
#include "gtkvbox.h"
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
#include "gtkscrolledwindow.h"
#include "gtkintl.h"
1998-06-15 23:29:27 +00:00
/* The maximum number of fontnames requested with XListFonts(). */
#define MAX_FONTS 32767
/* This is the largest field length we will accept. If a fontname has a field
larger than this we will skip it. */
#define XLFD_MAX_FIELD_LEN 64
/* These are what we use as the standard font sizes, for the size clist.
Note that when using points we still show these integer point values but
we work internally in decipoints (and decipoint values can be typed in). */
static const guint16 font_sizes[] = {
1998-06-15 23:29:27 +00:00
8, 9, 10, 11, 12, 13, 14, 16, 18, 20, 22, 24, 26, 28,
32, 36, 40, 48, 56, 64, 72
};
/* Initial font metric & size (Remember point sizes are in decipoints).
The font size should match one of those in the font_sizes array. */
#define INITIAL_METRIC GTK_FONT_METRIC_POINTS
1998-06-15 23:29:27 +00:00
#define INITIAL_FONT_SIZE 140
/* This is the default text shown in the preview entry, though the user
can set it. Remember that some fonts only have capital letters. */
#define PREVIEW_TEXT "abcdefghijk ABCDEFGHIJK"
/* This is the initial and maximum height of the preview entry (it expands
when large font sizes are selected). Initial height is also the minimum. */
#define INITIAL_PREVIEW_HEIGHT 44
#define MAX_PREVIEW_HEIGHT 300
/* These are the sizes of the font, style & size clists. */
#define FONT_LIST_HEIGHT 136
1998-12-07 20:56:46 +00:00
#define FONT_LIST_WIDTH 190
#define FONT_STYLE_LIST_WIDTH 170
1998-06-15 23:29:27 +00:00
#define FONT_SIZE_LIST_WIDTH 60
/* This is the number of fields in an X Logical Font Description font name.
Note that we count the registry & encoding as 1. */
#define GTK_XLFD_NUM_FIELDS 13
typedef struct _GtkFontSelInfo GtkFontSelInfo;
typedef struct _FontInfo FontInfo;
typedef struct _FontStyle FontStyle;
/* This struct represents one family of fonts (with one foundry), e.g. adobe
courier or sony fixed. It stores the family name, the index of the foundry
name, and the index of and number of available styles. */
struct _FontInfo
{
gchar *family;
guint16 foundry;
gint style_index;
guint16 nstyles;
};
/* This represents one style, as displayed in the Font Style clist. It can
have a number of available pixel sizes and point sizes. The indexes point
into the two big fontsel_info->pixel_sizes & fontsel_info->point_sizes
arrays. The displayed flag is used when displaying styles to remember which
styles have already been displayed. Note that it is combined with the
GtkFontType in the flags field. */
#define GTK_FONT_DISPLAYED (1 << 7)
struct _FontStyle
{
guint16 properties[GTK_NUM_STYLE_PROPERTIES];
gint pixel_sizes_index;
guint16 npixel_sizes;
gint point_sizes_index;
guint16 npoint_sizes;
guint8 flags;
};
struct _GtkFontSelInfo {
/* This is a table with each FontInfo representing one font family+foundry */
FontInfo *font_info;
gint nfonts;
/* This stores all the valid combinations of properties for every family.
Each FontInfo holds an index into its own space in this one big array. */
FontStyle *font_styles;
gint nstyles;
/* This stores all the font sizes available for every style.
Each style holds an index into these arrays. */
guint16 *pixel_sizes;
guint16 *point_sizes;
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
/* These are the arrays of strings of all possible weights, slants,
set widths, spacings, charsets & foundries, and the amount of space
allocated for each array. */
gchar **properties[GTK_NUM_FONT_PROPERTIES];
guint16 nproperties[GTK_NUM_FONT_PROPERTIES];
guint16 space_allocated[GTK_NUM_FONT_PROPERTIES];
};
1998-06-15 23:29:27 +00:00
/* These are the field numbers in the X Logical Font Description fontnames,
e.g. -adobe-courier-bold-o-normal--25-180-100-100-m-150-iso8859-1 */
typedef enum
{
XLFD_FOUNDRY = 0,
XLFD_FAMILY = 1,
XLFD_WEIGHT = 2,
XLFD_SLANT = 3,
XLFD_SET_WIDTH = 4,
XLFD_ADD_STYLE = 5,
XLFD_PIXELS = 6,
XLFD_POINTS = 7,
XLFD_RESOLUTION_X = 8,
XLFD_RESOLUTION_Y = 9,
XLFD_SPACING = 10,
XLFD_AVERAGE_WIDTH = 11,
XLFD_CHARSET = 12
} FontField;
/* These are the names of the fields, used on the info & filter page. */
static const gchar* xlfd_field_names[GTK_XLFD_NUM_FIELDS] = {
N_("Foundry:"),
N_("Family:"),
N_("Weight:"),
N_("Slant:"),
N_("Set Width:"),
N_("Add Style:"),
N_("Pixel Size:"),
N_("Point Size:"),
N_("Resolution X:"),
N_("Resolution Y:"),
N_("Spacing:"),
N_("Average Width:"),
N_("Charset:"),
1998-06-15 23:29:27 +00:00
};
/* These are the array indices of the font properties used in several arrays,
and should match the xlfd_index array below. */
typedef enum
{
WEIGHT = 0,
SLANT = 1,
SET_WIDTH = 2,
SPACING = 3,
CHARSET = 4,
FOUNDRY = 5
} PropertyIndexType;
/* This is used to look up a field in a fontname given one of the above
property indices. */
static const FontField xlfd_index[GTK_NUM_FONT_PROPERTIES] = {
1998-06-15 23:29:27 +00:00
XLFD_WEIGHT,
XLFD_SLANT,
XLFD_SET_WIDTH,
XLFD_SPACING,
XLFD_CHARSET,
XLFD_FOUNDRY
};
/* These are the positions of the properties in the filter table - x, y. */
static const gint filter_positions[GTK_NUM_FONT_PROPERTIES][2] = {
1998-06-15 23:29:27 +00:00
{ 1, 0 }, { 0, 2 }, { 1, 2 }, { 2, 2 }, { 2, 0 }, { 0, 0 }
};
static const gint filter_heights[GTK_NUM_FONT_PROPERTIES] = {
100, 70, 70, 40, 100, 100
1998-06-15 23:29:27 +00:00
};
/* This is returned by gtk_font_selection_filter_state to describe if a
property value is filtered. e.g. if 'bold' has been selected on the filter
page, then that will return 'FILTERED' and 'black' will be 'NOT_FILTERED'.
If none of the weight values are selected, they all return 'NOT_SET'. */
typedef enum
{
FILTERED,
NOT_FILTERED,
NOT_SET
} GtkFontPropertyFilterState;
static GtkFontSelInfo *fontsel_info = NULL;
1998-06-15 23:29:27 +00:00
/* The initial size and increment of each of the arrays of property values. */
#define PROPERTY_ARRAY_INCREMENT 16
static void gtk_font_selection_class_init (GtkFontSelectionClass *klass);
static void gtk_font_selection_init (GtkFontSelection *fontsel);
static void gtk_font_selection_destroy (GtkObject *object);
/* These are all used for class initialization - loading in the fonts etc. */
static void gtk_font_selection_get_fonts (void);
static void gtk_font_selection_insert_font (GSList *fontnames[],
1998-06-15 23:29:27 +00:00
gint *ntable,
gchar *fontname);
static gint gtk_font_selection_insert_field (gchar *fontname,
1998-06-15 23:29:27 +00:00
gint prop);
/* These are the callbacks & related functions. */
static void gtk_font_selection_select_font (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data);
static gint gtk_font_selection_on_clist_key_press (GtkWidget *clist,
GdkEventKey *event,
GtkFontSelection *fs);
static gboolean gtk_font_selection_select_next (GtkFontSelection *fs,
GtkWidget *clist,
gint step);
static void gtk_font_selection_show_available_styles
(GtkFontSelection *fs);
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
static void gtk_font_selection_select_best_style (GtkFontSelection *fs,
gboolean use_first);
1998-06-15 23:29:27 +00:00
static void gtk_font_selection_select_style (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data);
static void gtk_font_selection_show_available_sizes
(GtkFontSelection *fs);
1998-06-15 23:29:27 +00:00
static gint gtk_font_selection_size_key_press (GtkWidget *w,
GdkEventKey *event,
gpointer data);
static void gtk_font_selection_select_best_size (GtkFontSelection *fs);
static void gtk_font_selection_select_size (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data);
static void gtk_font_selection_metric_callback (GtkWidget *w,
gpointer data);
static void gtk_font_selection_expose_list (GtkWidget *w,
GdkEventExpose *event,
gpointer data);
1998-12-07 20:56:46 +00:00
static void gtk_font_selection_realize_list (GtkWidget *widget,
gpointer data);
1998-06-15 23:29:27 +00:00
static void gtk_font_selection_switch_page (GtkWidget *w,
GtkNotebookPage *page,
gint page_num,
gpointer data);
static void gtk_font_selection_show_font_info (GtkFontSelection *fs);
static void gtk_font_selection_select_filter (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
GtkFontSelection *fs);
1998-06-15 23:29:27 +00:00
static void gtk_font_selection_unselect_filter (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
GtkFontSelection *fs);
static void gtk_font_selection_update_filter (GtkFontSelection *fs);
1998-06-15 23:29:27 +00:00
static gboolean gtk_font_selection_style_visible (GtkFontSelection *fs,
FontInfo *font,
gint style);
static void gtk_font_selection_reset_filter (GtkWidget *w,
GtkFontSelection *fs);
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
static void gtk_font_selection_on_clear_filter (GtkWidget *w,
GtkFontSelection *fs);
static void gtk_font_selection_show_available_fonts
(GtkFontSelection *fs);
1998-06-15 23:29:27 +00:00
static void gtk_font_selection_clear_filter (GtkFontSelection *fs);
static void gtk_font_selection_update_filter_lists(GtkFontSelection *fs);
static GtkFontPropertyFilterState gtk_font_selection_filter_state
(GtkFontSelection *fs,
GtkFontFilterType filter_type,
gint property,
gint index);
1998-06-15 23:29:27 +00:00
/* Misc. utility functions. */
static gboolean gtk_font_selection_load_font (GtkFontSelection *fs);
static void gtk_font_selection_update_preview (GtkFontSelection *fs);
static gint gtk_font_selection_find_font (GtkFontSelection *fs,
gchar *family,
guint16 foundry);
static guint16 gtk_font_selection_field_to_index (gchar **table,
gint ntable,
gchar *field);
static gchar* gtk_font_selection_expand_slant_code (gchar *slant);
static gchar* gtk_font_selection_expand_spacing_code(gchar *spacing);
/* Functions for handling X Logical Font Description fontnames. */
static gboolean gtk_font_selection_is_xlfd_font_name (const gchar *fontname);
static char* gtk_font_selection_get_xlfd_field (const gchar *fontname,
FontField field_num,
gchar *buffer);
static gchar * gtk_font_selection_create_xlfd (gint size,
GtkFontMetricType metric,
gchar *foundry,
gchar *family,
gchar *weight,
gchar *slant,
gchar *set_width,
gchar *spacing,
gchar *charset);
/* FontSelectionDialog */
static void gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass);
static void gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag);
static gint gtk_font_selection_dialog_on_configure(GtkWidget *widget,
GdkEventConfigure *event,
GtkFontSelectionDialog *fsd);
#if GDK_WINDOWING == GDK_WINDOWING_WIN32
static char *logfont_to_xlfd (const LOGFONT *lfp,
int size,
int res,
int avg_width);
#endif
1998-06-15 23:29:27 +00:00
static GtkWindowClass *font_selection_parent_class = NULL;
static GtkNotebookClass *font_selection_dialog_parent_class = NULL;
GtkType
1998-06-15 23:29:27 +00:00
gtk_font_selection_get_type()
{
static GtkType font_selection_type = 0;
1998-06-15 23:29:27 +00:00
if(!font_selection_type)
{
static const GtkTypeInfo fontsel_type_info =
1998-06-15 23:29:27 +00:00
{
"GtkFontSelection",
sizeof (GtkFontSelection),
sizeof (GtkFontSelectionClass),
1998-06-15 23:29:27 +00:00
(GtkClassInitFunc) gtk_font_selection_class_init,
(GtkObjectInitFunc) gtk_font_selection_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
call the base class init fucntions from all parent types upon class Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
1998-06-28 07:46:10 +00:00
(GtkClassInitFunc) NULL,
1998-06-15 23:29:27 +00:00
};
font_selection_type = gtk_type_unique (GTK_TYPE_NOTEBOOK,
&fontsel_type_info);
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
return font_selection_type;
}
static void
gtk_font_selection_class_init(GtkFontSelectionClass *klass)
{
GtkObjectClass *object_class;
1998-06-15 23:29:27 +00:00
object_class = (GtkObjectClass *) klass;
font_selection_parent_class = gtk_type_class (GTK_TYPE_NOTEBOOK);
1998-06-15 23:29:27 +00:00
object_class->destroy = gtk_font_selection_destroy;
gtk_font_selection_get_fonts ();
1998-06-15 23:29:27 +00:00
}
static void
gtk_font_selection_init(GtkFontSelection *fontsel)
{
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
GtkWidget *scrolled_win;
1998-06-15 23:29:27 +00:00
GtkWidget *text_frame;
GtkWidget *text_box, *frame;
1998-06-15 23:29:27 +00:00
GtkWidget *table, *label, *hbox, *hbox2, *clist, *button, *vbox, *alignment;
gint i, prop, row;
gchar *titles[] = { NULL, NULL, NULL };
1998-06-15 23:29:27 +00:00
gchar buffer[128];
gchar *size;
gint size_to_match;
gchar *row_text[3];
1998-06-15 23:29:27 +00:00
gchar *property, *text;
gboolean inserted;
/* Number of internationalized titles here must match number
of NULL initializers above */
titles[0] = _("Font Property");
titles[1] = _("Requested Value");
titles[2] = _("Actual Value");
1998-06-15 23:29:27 +00:00
/* Initialize the GtkFontSelection struct. We do this here in case any
callbacks are triggered while creating the interface. */
fontsel->font = NULL;
fontsel->font_index = -1;
fontsel->style = -1;
fontsel->metric = INITIAL_METRIC;
fontsel->size = INITIAL_FONT_SIZE;
fontsel->selected_size = INITIAL_FONT_SIZE;
fontsel->filters[GTK_FONT_FILTER_BASE].font_type = GTK_FONT_ALL;
fontsel->filters[GTK_FONT_FILTER_USER].font_type = GTK_FONT_BITMAP
| GTK_FONT_SCALABLE;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
fontsel->filters[GTK_FONT_FILTER_BASE].property_filters[prop] = NULL;
fontsel->filters[GTK_FONT_FILTER_BASE].property_nfilters[prop] = 0;
fontsel->filters[GTK_FONT_FILTER_USER].property_filters[prop] = NULL;
fontsel->filters[GTK_FONT_FILTER_USER].property_nfilters[prop] = 0;
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
fontsel->property_values[prop] = 0;
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
/* Create the main notebook page. */
1998-12-07 20:56:46 +00:00
gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (fontsel), TRUE);
gtk_notebook_set_tab_hborder (GTK_NOTEBOOK (fontsel), 8);
1998-06-15 23:29:27 +00:00
fontsel->main_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->main_vbox);
changed scrolled window inheritance, it inherits from GtkBin now. Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled window inheritance, it inherits from GtkBin now. * gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for visibility of child. (gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE(). added check so a child gets only drawn if it's visible. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed gtk_widget_draw_children(). * gtk/gtkstyle.h: * gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child(). added internal function gtk_widget_reset_shapes() from gtkstyle.c. * gtk/gtkrc.h: * gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner argument, changed callers. * gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time, it will issue a warning now. * gtk/gtkcompat.h: new file to #define aliases for historic function names. * changed 8 function names for consistency and provided aliases to keep source compatibility in gtkcompat.h: (gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width (gtk_container_set_border_width): renamed from gtk_container_border_width (gtk_notebook_get_current_page): renamed from gtk_notebook_current_page (gtk_packer_configure): renamed from gtk_packer_set_child_packing (gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size (gtk_paned_set_handle_size): renamed from gtk_paned_handle_size (gtk_scale_get_value_width): renamed from gtk_scale_value_width (gtk_window_set_position): renamed from gtk_window_position * renamed a few recently added funtions for consistency: (gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label. (gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label. (gtk_progress_configure): renamed from gtk_progress_reconfigure.
1998-11-28 07:42:37 +00:00
gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6);
label = gtk_label_new(_("Font"));
1998-06-15 23:29:27 +00:00
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->main_vbox, label);
1998-06-15 23:29:27 +00:00
/* Create the table of font, style & size. */
table = gtk_table_new (3, 3, FALSE);
gtk_widget_show (table);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), table, TRUE, TRUE, 0);
fontsel->font_label = gtk_label_new(_("Font:"));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (fontsel->font_label), 0.0, 0.5);
gtk_widget_show (fontsel->font_label);
gtk_table_attach (GTK_TABLE (table), fontsel->font_label, 0, 1, 0, 1,
GTK_FILL, 0, 0, 0);
label = gtk_label_new(_("Font Style:"));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
GTK_FILL, 0, 0, 0);
label = gtk_label_new(_("Size:"));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1,
GTK_FILL, 0, 0, 0);
fontsel->font_entry = gtk_entry_new();
gtk_entry_set_editable(GTK_ENTRY(fontsel->font_entry), FALSE);
gtk_widget_set_usize (fontsel->font_entry, 20, -1);
gtk_widget_show (fontsel->font_entry);
gtk_table_attach (GTK_TABLE (table), fontsel->font_entry, 0, 1, 1, 2,
GTK_FILL, 0, 0, 0);
fontsel->font_style_entry = gtk_entry_new();
gtk_entry_set_editable(GTK_ENTRY(fontsel->font_style_entry), FALSE);
gtk_widget_set_usize (fontsel->font_style_entry, 20, -1);
gtk_widget_show (fontsel->font_style_entry);
gtk_table_attach (GTK_TABLE (table), fontsel->font_style_entry, 1, 2, 1, 2,
GTK_FILL, 0, 0, 0);
fontsel->size_entry = gtk_entry_new();
gtk_widget_set_usize (fontsel->size_entry, 20, -1);
gtk_widget_show (fontsel->size_entry);
gtk_table_attach (GTK_TABLE (table), fontsel->size_entry, 2, 3, 1, 2,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (fontsel->size_entry), "key_press_event",
(GtkSignalFunc) gtk_font_selection_size_key_press,
fontsel);
1998-06-15 23:29:27 +00:00
/* Create the clists */
fontsel->font_clist = gtk_clist_new(1);
gtk_clist_column_titles_hide (GTK_CLIST(fontsel->font_clist));
1998-12-07 20:56:46 +00:00
gtk_clist_set_column_auto_resize (GTK_CLIST (fontsel->font_clist), 0, TRUE);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
1998-12-07 20:56:46 +00:00
gtk_widget_set_usize (scrolled_win, FONT_LIST_WIDTH, FONT_LIST_HEIGHT);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->font_clist);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
1998-06-15 23:29:27 +00:00
gtk_widget_show(fontsel->font_clist);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_widget_show(scrolled_win);
gtk_table_attach (GTK_TABLE (table), scrolled_win, 0, 1, 2, 3,
1998-06-15 23:29:27 +00:00
GTK_EXPAND | GTK_FILL,
GTK_EXPAND | GTK_FILL, 0, 0);
1998-06-15 23:29:27 +00:00
fontsel->font_style_clist = gtk_clist_new(1);
gtk_clist_column_titles_hide (GTK_CLIST(fontsel->font_style_clist));
1998-12-07 20:56:46 +00:00
gtk_clist_set_column_auto_resize (GTK_CLIST (fontsel->font_style_clist),
0, TRUE);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
1998-12-07 20:56:46 +00:00
gtk_widget_set_usize (scrolled_win, FONT_STYLE_LIST_WIDTH, -1);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->font_style_clist);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
1998-06-15 23:29:27 +00:00
gtk_widget_show(fontsel->font_style_clist);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_widget_show(scrolled_win);
gtk_table_attach (GTK_TABLE (table), scrolled_win, 1, 2, 2, 3,
1998-06-15 23:29:27 +00:00
GTK_EXPAND | GTK_FILL,
GTK_EXPAND | GTK_FILL, 0, 0);
1998-06-15 23:29:27 +00:00
fontsel->size_clist = gtk_clist_new(1);
gtk_clist_column_titles_hide (GTK_CLIST(fontsel->size_clist));
1998-12-07 20:56:46 +00:00
gtk_clist_set_column_width (GTK_CLIST(fontsel->size_clist), 0, 20);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
1998-12-07 20:56:46 +00:00
gtk_widget_set_usize (scrolled_win, FONT_SIZE_LIST_WIDTH, -1);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->size_clist);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
1998-06-15 23:29:27 +00:00
gtk_widget_show(fontsel->size_clist);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_widget_show(scrolled_win);
gtk_table_attach (GTK_TABLE (table), scrolled_win, 2, 3, 2, 3,
1998-06-15 23:29:27 +00:00
GTK_FILL, GTK_FILL, 0, 0);
1998-06-15 23:29:27 +00:00
/* Insert the fonts. If there exist fonts with the same family but
different foundries, then the foundry name is appended in brackets. */
gtk_font_selection_show_available_fonts(fontsel);
1998-06-15 23:29:27 +00:00
gtk_signal_connect (GTK_OBJECT (fontsel->font_clist), "select_row",
GTK_SIGNAL_FUNC(gtk_font_selection_select_font),
fontsel);
GTK_WIDGET_SET_FLAGS (fontsel->font_clist, GTK_CAN_FOCUS);
gtk_signal_connect (GTK_OBJECT (fontsel->font_clist), "key_press_event",
GTK_SIGNAL_FUNC(gtk_font_selection_on_clist_key_press),
fontsel);
gtk_signal_connect_after (GTK_OBJECT (fontsel->font_clist), "expose_event",
GTK_SIGNAL_FUNC(gtk_font_selection_expose_list),
fontsel);
1998-06-15 23:29:27 +00:00
gtk_signal_connect (GTK_OBJECT (fontsel->font_style_clist), "select_row",
GTK_SIGNAL_FUNC(gtk_font_selection_select_style),
fontsel);
GTK_WIDGET_SET_FLAGS (fontsel->font_style_clist, GTK_CAN_FOCUS);
gtk_signal_connect (GTK_OBJECT (fontsel->font_style_clist),
"key_press_event",
GTK_SIGNAL_FUNC(gtk_font_selection_on_clist_key_press),
fontsel);
1998-12-07 20:56:46 +00:00
gtk_signal_connect_after (GTK_OBJECT (fontsel->font_style_clist),
"realize",
GTK_SIGNAL_FUNC(gtk_font_selection_realize_list),
fontsel);
1998-06-15 23:29:27 +00:00
/* Insert the standard font sizes */
gtk_clist_freeze (GTK_CLIST(fontsel->size_clist));
size_to_match = INITIAL_FONT_SIZE;
if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
size_to_match = size_to_match / 10;
for (i = 0; i < sizeof(font_sizes) / sizeof(font_sizes[0]); i++)
{
sprintf(buffer, "%i", font_sizes[i]);
size = buffer;
gtk_clist_append(GTK_CLIST(fontsel->size_clist), &size);
if (font_sizes[i] == size_to_match)
{
gtk_clist_select_row(GTK_CLIST(fontsel->size_clist), i, 0);
gtk_entry_set_text(GTK_ENTRY(fontsel->size_entry), buffer);
}
}
gtk_clist_thaw (GTK_CLIST(fontsel->size_clist));
1998-06-15 23:29:27 +00:00
gtk_signal_connect (GTK_OBJECT (fontsel->size_clist), "select_row",
GTK_SIGNAL_FUNC(gtk_font_selection_select_size),
fontsel);
GTK_WIDGET_SET_FLAGS (fontsel->size_clist, GTK_CAN_FOCUS);
gtk_signal_connect (GTK_OBJECT (fontsel->size_clist), "key_press_event",
GTK_SIGNAL_FUNC(gtk_font_selection_on_clist_key_press),
fontsel);
/* create the Reset Filter & Metric buttons */
1998-06-15 23:29:27 +00:00
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), hbox, FALSE, TRUE, 0);
fontsel->filter_button = gtk_button_new_with_label(_("Reset Filter"));
1998-12-07 20:56:46 +00:00
gtk_misc_set_padding (GTK_MISC (GTK_BIN (fontsel->filter_button)->child),
16, 0);
1998-06-15 23:29:27 +00:00
gtk_widget_show(fontsel->filter_button);
gtk_box_pack_start (GTK_BOX (hbox), fontsel->filter_button, FALSE, FALSE, 0);
gtk_widget_set_sensitive (fontsel->filter_button, FALSE);
gtk_signal_connect (GTK_OBJECT (fontsel->filter_button), "clicked",
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
GTK_SIGNAL_FUNC(gtk_font_selection_on_clear_filter),
1998-06-15 23:29:27 +00:00
fontsel);
1998-06-15 23:29:27 +00:00
hbox2 = gtk_hbox_new(FALSE, 0);
gtk_widget_show (hbox2);
gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
label = gtk_label_new(_("Metric:"));
1998-06-15 23:29:27 +00:00
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 8);
fontsel->points_button = gtk_radio_button_new_with_label(NULL, _("Points"));
1998-06-15 23:29:27 +00:00
gtk_widget_show (fontsel->points_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->points_button, FALSE, TRUE, 0);
if (INITIAL_METRIC == GTK_FONT_METRIC_POINTS)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fontsel->points_button),
1998-06-15 23:29:27 +00:00
TRUE);
fontsel->pixels_button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(fontsel->points_button), _("Pixels"));
1998-06-15 23:29:27 +00:00
gtk_widget_show (fontsel->pixels_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->pixels_button, FALSE, TRUE, 0);
if (INITIAL_METRIC == GTK_FONT_METRIC_PIXELS)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fontsel->pixels_button),
1998-06-15 23:29:27 +00:00
TRUE);
1998-06-15 23:29:27 +00:00
gtk_signal_connect(GTK_OBJECT(fontsel->points_button), "toggled",
(GtkSignalFunc) gtk_font_selection_metric_callback,
fontsel);
gtk_signal_connect(GTK_OBJECT(fontsel->pixels_button), "toggled",
(GtkSignalFunc) gtk_font_selection_metric_callback,
fontsel);
1998-06-15 23:29:27 +00:00
/* create the text entry widget */
text_frame = gtk_frame_new (_("Preview:"));
1998-06-15 23:29:27 +00:00
gtk_widget_show (text_frame);
gtk_frame_set_shadow_type(GTK_FRAME(text_frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), text_frame,
FALSE, TRUE, 0);
1998-06-15 23:29:27 +00:00
/* This is just used to get a 4-pixel space around the preview entry. */
text_box = gtk_hbox_new (FALSE, 0);
gtk_widget_show (text_box);
gtk_container_add (GTK_CONTAINER (text_frame), text_box);
changed scrolled window inheritance, it inherits from GtkBin now. Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled window inheritance, it inherits from GtkBin now. * gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for visibility of child. (gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE(). added check so a child gets only drawn if it's visible. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed gtk_widget_draw_children(). * gtk/gtkstyle.h: * gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child(). added internal function gtk_widget_reset_shapes() from gtkstyle.c. * gtk/gtkrc.h: * gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner argument, changed callers. * gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time, it will issue a warning now. * gtk/gtkcompat.h: new file to #define aliases for historic function names. * changed 8 function names for consistency and provided aliases to keep source compatibility in gtkcompat.h: (gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width (gtk_container_set_border_width): renamed from gtk_container_border_width (gtk_notebook_get_current_page): renamed from gtk_notebook_current_page (gtk_packer_configure): renamed from gtk_packer_set_child_packing (gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size (gtk_paned_set_handle_size): renamed from gtk_paned_handle_size (gtk_scale_get_value_width): renamed from gtk_scale_value_width (gtk_window_set_position): renamed from gtk_window_position * renamed a few recently added funtions for consistency: (gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label. (gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label. (gtk_progress_configure): renamed from gtk_progress_reconfigure.
1998-11-28 07:42:37 +00:00
gtk_container_set_border_width (GTK_CONTAINER (text_box), 4);
1998-06-15 23:29:27 +00:00
fontsel->preview_entry = gtk_entry_new ();
gtk_widget_show (fontsel->preview_entry);
gtk_widget_set_usize (fontsel->preview_entry, -1, INITIAL_PREVIEW_HEIGHT);
gtk_box_pack_start (GTK_BOX (text_box), fontsel->preview_entry,
TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
/* Create the message area */
fontsel->message_label = gtk_label_new("");
gtk_widget_show (fontsel->message_label);
gtk_box_pack_start (GTK_BOX (fontsel->main_vbox), fontsel->message_label,
FALSE, FALSE, 0);
1998-06-15 23:29:27 +00:00
/* Create the font info page */
fontsel->info_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->info_vbox);
changed scrolled window inheritance, it inherits from GtkBin now. Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled window inheritance, it inherits from GtkBin now. * gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for visibility of child. (gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE(). added check so a child gets only drawn if it's visible. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed gtk_widget_draw_children(). * gtk/gtkstyle.h: * gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child(). added internal function gtk_widget_reset_shapes() from gtkstyle.c. * gtk/gtkrc.h: * gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner argument, changed callers. * gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time, it will issue a warning now. * gtk/gtkcompat.h: new file to #define aliases for historic function names. * changed 8 function names for consistency and provided aliases to keep source compatibility in gtkcompat.h: (gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width (gtk_container_set_border_width): renamed from gtk_container_border_width (gtk_notebook_get_current_page): renamed from gtk_notebook_current_page (gtk_packer_configure): renamed from gtk_packer_set_child_packing (gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size (gtk_paned_set_handle_size): renamed from gtk_paned_handle_size (gtk_scale_get_value_width): renamed from gtk_scale_value_width (gtk_window_set_position): renamed from gtk_window_position * renamed a few recently added funtions for consistency: (gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label. (gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label. (gtk_progress_configure): renamed from gtk_progress_reconfigure.
1998-11-28 07:42:37 +00:00
gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2);
label = gtk_label_new(_("Font Information"));
1998-06-15 23:29:27 +00:00
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->info_vbox, label);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
fontsel->info_clist = gtk_clist_new_with_titles (3, titles);
1998-06-15 23:29:27 +00:00
gtk_widget_set_usize (fontsel->info_clist, 390, 150);
gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 0, 130);
gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 1, 130);
gtk_clist_set_column_width(GTK_CLIST(fontsel->info_clist), 2, 130);
gtk_clist_column_titles_passive(GTK_CLIST(fontsel->info_clist));
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scrolled_win), fontsel->info_clist);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
1998-06-15 23:29:27 +00:00
gtk_widget_show(fontsel->info_clist);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_widget_show(scrolled_win);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), scrolled_win,
1998-06-15 23:29:27 +00:00
TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
/* Insert the property names */
gtk_clist_freeze (GTK_CLIST(fontsel->info_clist));
row_text[1] = "";
row_text[2] = "";
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{
row_text[0] = _(xlfd_field_names[i]);
1998-06-15 23:29:27 +00:00
gtk_clist_append(GTK_CLIST(fontsel->info_clist), row_text);
gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 0, 0, 4);
gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4);
gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 2, 0, 4);
}
gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
label = gtk_label_new(_("Requested Font Name:"));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
1998-06-15 23:29:27 +00:00
fontsel->requested_font_name = gtk_entry_new();
gtk_entry_set_editable(GTK_ENTRY(fontsel->requested_font_name), FALSE);
gtk_widget_show (fontsel->requested_font_name);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
fontsel->requested_font_name, FALSE, TRUE, 0);
label = gtk_label_new(_("Actual Font Name:"));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, TRUE, 0);
fontsel->actual_font_name = gtk_entry_new();
gtk_entry_set_editable(GTK_ENTRY(fontsel->actual_font_name), FALSE);
gtk_widget_show (fontsel->actual_font_name);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox),
fontsel->actual_font_name, FALSE, TRUE, 0);
sprintf(buffer, _("%i fonts available with a total of %i styles."),
fontsel_info->nfonts, fontsel_info->nstyles);
1998-06-15 23:29:27 +00:00
label = gtk_label_new(buffer);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (fontsel->info_vbox), label, FALSE, FALSE, 0);
1998-06-15 23:29:27 +00:00
gtk_signal_connect (GTK_OBJECT (fontsel), "switch_page",
GTK_SIGNAL_FUNC(gtk_font_selection_switch_page),
fontsel);
1998-06-15 23:29:27 +00:00
/* Create the Filter page. */
fontsel->filter_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontsel->filter_vbox);
changed scrolled window inheritance, it inherits from GtkBin now. Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled window inheritance, it inherits from GtkBin now. * gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for visibility of child. (gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE(). added check so a child gets only drawn if it's visible. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed gtk_widget_draw_children(). * gtk/gtkstyle.h: * gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child(). added internal function gtk_widget_reset_shapes() from gtkstyle.c. * gtk/gtkrc.h: * gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner argument, changed callers. * gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time, it will issue a warning now. * gtk/gtkcompat.h: new file to #define aliases for historic function names. * changed 8 function names for consistency and provided aliases to keep source compatibility in gtkcompat.h: (gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width (gtk_container_set_border_width): renamed from gtk_container_border_width (gtk_notebook_get_current_page): renamed from gtk_notebook_current_page (gtk_packer_configure): renamed from gtk_packer_set_child_packing (gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size (gtk_paned_set_handle_size): renamed from gtk_paned_handle_size (gtk_scale_get_value_width): renamed from gtk_scale_value_width (gtk_window_set_position): renamed from gtk_window_position * renamed a few recently added funtions for consistency: (gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label. (gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label. (gtk_progress_configure): renamed from gtk_progress_reconfigure.
1998-11-28 07:42:37 +00:00
gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2);
label = gtk_label_new(_("Filter"));
1998-06-15 23:29:27 +00:00
gtk_notebook_append_page (GTK_NOTEBOOK (fontsel),
fontsel->filter_vbox, label);
/* Create the font type checkbuttons. */
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
gtk_box_pack_start (GTK_BOX (fontsel->filter_vbox), frame, FALSE, TRUE, 0);
hbox = gtk_hbox_new (FALSE, 20);
gtk_widget_show (hbox);
gtk_container_add (GTK_CONTAINER (frame), hbox);
label = gtk_label_new(_("Font Types:"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 10);
hbox2 = gtk_hbox_new (TRUE, 0);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, TRUE, 0);
fontsel->type_bitmaps_button = gtk_check_button_new_with_label (_("Bitmap"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), TRUE);
gtk_widget_show (fontsel->type_bitmaps_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_bitmaps_button,
FALSE, TRUE, 0);
fontsel->type_scalable_button = gtk_check_button_new_with_label (_("Scalable"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), TRUE);
gtk_widget_show (fontsel->type_scalable_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scalable_button,
FALSE, TRUE, 0);
fontsel->type_scaled_bitmaps_button = gtk_check_button_new_with_label (_("Scaled Bitmap"));
gtk_widget_show (fontsel->type_scaled_bitmaps_button);
gtk_box_pack_start (GTK_BOX (hbox2), fontsel->type_scaled_bitmaps_button,
FALSE, TRUE, 0);
1998-06-15 23:29:27 +00:00
table = gtk_table_new (4, 3, FALSE);
gtk_table_set_col_spacings(GTK_TABLE(table), 2);
gtk_widget_show (table);
gtk_box_pack_start (GTK_BOX (fontsel->filter_vbox), table, TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
gint left = filter_positions[prop][0];
gint top = filter_positions[prop][1];
label = gtk_label_new(_(xlfd_field_names[xlfd_index[prop]]));
1998-06-15 23:29:27 +00:00
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_misc_set_padding (GTK_MISC (label), 0, 2);
gtk_widget_show(label);
gtk_table_attach (GTK_TABLE (table), label, left, left + 1,
top, top + 1, GTK_FILL, GTK_FILL, 0, 0);
1998-06-15 23:29:27 +00:00
clist = gtk_clist_new(1);
gtk_widget_set_usize (clist, 100, filter_heights[prop]);
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_MULTIPLE);
gtk_clist_column_titles_hide(GTK_CLIST(clist));
1998-12-07 20:56:46 +00:00
gtk_clist_set_column_auto_resize (GTK_CLIST (clist), 0, TRUE);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_container_add (GTK_CONTAINER (scrolled_win), clist);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
1998-06-15 23:29:27 +00:00
gtk_widget_show(clist);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_widget_show(scrolled_win);
/* For the bottom-right cell we add the 'Reset Filter' button. */
1998-06-15 23:29:27 +00:00
if (top == 2 && left == 2)
{
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
gtk_table_attach (GTK_TABLE (table), vbox, left, left + 1,
top + 1, top + 2, GTK_FILL, GTK_FILL, 0, 0);
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
alignment = gtk_alignment_new(0.5, 0.0, 0.8, 0.0);
gtk_widget_show(alignment);
gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 4);
button = gtk_button_new_with_label(_("Reset Filter"));
1998-06-15 23:29:27 +00:00
gtk_widget_show(button);
gtk_container_add(GTK_CONTAINER(alignment), button);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC(gtk_font_selection_reset_filter),
fontsel);
}
else
removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. Thu Nov 5 16:00:32 1998 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCList): removed vscrollbar, hscrollbar, vscrollbar_policy, hscrollbar_policy. added h/vadjustment. * gtk/gtkclist.c (gtk_clist_class_init): added new args types "hadjustment" & "vadjustment" (gtk_clist_set_arg) (gtk_clist_get_arg): new object class set/get_arg functions (gtk_clist_construct): don't create/adjust scrollbars. (gtk_clist_set_hadjustment) (gtk_clist_set_vadjustment): new functions to set h/vadjustments (gtk_clist_get_vadjustment) (gtk_clist_get_hadjustment): new functions to query h/vadjustments (create_scrollbars): removed. (create_adjustments): replacement for create_scrollbars (gtk_clist_new): call gtk_clist_new_with_titles (gtk_clist_new_with_titles): don't warn on titles == NULL (move_horizontal): use CLAMP instead (gtk_clist_set_policy): deprecated method. use gtk_scrolled_window_set_policy instead. (vadjustment_value_changed): use clist->vadj. (adjust_scrollbars): renamed to adjust_adjustments (adjust_adjustments): former adjust_scrollbars (gtk_clist_destroy): unref adjustments (gtk_clist_size_allocate) (gtk_clist_map) (title_focus) (gtk_clist_unmap) (gtk_clist_size_request) (gtk_clist_focus) (gtk_clist_size_allocate) (gtk_clist_forall): don't use scrollbars (gtk_clist_thaw) (real_insert_row) (real_remove_row) (gtk_clist_set_row_height) (real_resize_column): call adjust_adjustments (gtk_clist_moveto): return if clist has no adjustments yet. (gtk_clist_parent_set): new GtkWidget::parent_set function. Autogenerate h/vadjustments if needed. (move_horizontal) (move_vertical): some cleanups * gtk/gtkviewport.c (gtk_viewport_set_arg) (gtk_viewport_new): call only gtk_viewport_set_h/vadjustment and let these functions do the work. (gtk_viewport_set_hadjustment) (gtk_viewport_set_vadjustment): generate a new adjustment if needed * gtk/gtkscrolledwindow.h ((struct _GtkScrolledWindow): use a guint bitfield for h/vscrollbar_policy and h/vscrollbar_visible * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): queue_resize if visibility of scrollbars changes (gtk_scrolled_window_remove): only call container_remove with scrolled_window->viewport automatically if viewport was autogenerated (gtk_scrolled_window_add): add widget as scrolled_window->viewport. auto create a viewport only if widget does not take h/vadjustments. (gtk_scrolled_window_construct): don't generate a viewport automatically. (gtk_scrolled_window_forall): call callback with viewport in any case (gtk_scrolled_window_set_arg): call gtk_container_add in case of ARG_VIEWPORT (gtk_scrolled_window_size_allocate) (gtk_scrolled_window_size_request) (gtk_scrolled_window_map) (gtk_scrolled_window_unmap): check viewport != NULL * gtk/testgtk.c (create_ctree) (export_ctree) (create_clist): use a scrolled_window in conjunction with clists/ctrees * gtk/gtkfilesel.c (gtk_file_selection_init): use a scrolled_window in conjunction with clists * gtk/gtkfontsel.c (gtk_font_selection_init): use a scrolled_window in conjunction with clists
1998-11-05 15:44:22 +00:00
gtk_table_attach (GTK_TABLE (table), scrolled_win,
1998-06-15 23:29:27 +00:00
left, left + 1, top + 1, top + 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
1998-06-15 23:29:27 +00:00
gtk_signal_connect (GTK_OBJECT (clist), "select_row",
GTK_SIGNAL_FUNC(gtk_font_selection_select_filter),
fontsel);
gtk_signal_connect (GTK_OBJECT (clist), "unselect_row",
GTK_SIGNAL_FUNC(gtk_font_selection_unselect_filter),
fontsel);
1998-06-15 23:29:27 +00:00
/* Insert the property names, expanded, and in sorted order.
But we make sure that the wildcard '*' is first. */
gtk_clist_freeze (GTK_CLIST(clist));
property = "*";
gtk_clist_append(GTK_CLIST(clist), &property);
for (i = 1; i < fontsel_info->nproperties[prop]; i++) {
property = fontsel_info->properties[prop][i];
1998-06-15 23:29:27 +00:00
if (prop == SLANT)
property = gtk_font_selection_expand_slant_code(property);
else if (prop == SPACING)
property = gtk_font_selection_expand_spacing_code(property);
1998-06-15 23:29:27 +00:00
inserted = FALSE;
for (row = 1; row < GTK_CLIST(clist)->rows; row++)
{
gtk_clist_get_text(GTK_CLIST(clist), row, 0, &text);
if (strcmp(property, text) < 0)
{
inserted = TRUE;
gtk_clist_insert(GTK_CLIST(clist), row, &property);
break;
}
}
if (!inserted)
row = gtk_clist_append(GTK_CLIST(clist), &property);
gtk_clist_set_row_data(GTK_CLIST(clist), row, GINT_TO_POINTER (i));
1998-06-15 23:29:27 +00:00
}
gtk_clist_select_row(GTK_CLIST(clist), 0, 0);
gtk_clist_thaw (GTK_CLIST(clist));
fontsel->filter_clists[prop] = clist;
}
}
GtkWidget *
gtk_font_selection_new()
{
GtkFontSelection *fontsel;
fontsel = gtk_type_new (GTK_TYPE_FONT_SELECTION);
1998-06-15 23:29:27 +00:00
return GTK_WIDGET (fontsel);
}
static void
gtk_font_selection_destroy (GtkObject *object)
{
GtkFontSelection *fontsel;
1998-06-15 23:29:27 +00:00
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_FONT_SELECTION (object));
1998-06-15 23:29:27 +00:00
fontsel = GTK_FONT_SELECTION (object);
1998-06-15 23:29:27 +00:00
/* All we have to do is unref the font, if we have one. */
if (fontsel->font)
gdk_font_unref (fontsel->font);
1998-06-15 23:29:27 +00:00
if (GTK_OBJECT_CLASS (font_selection_parent_class)->destroy)
(* GTK_OBJECT_CLASS (font_selection_parent_class)->destroy) (object);
}
/* This is called when the clist is exposed. Here we scroll to the current
font if necessary. */
static void
gtk_font_selection_expose_list (GtkWidget *widget,
GdkEventExpose *event,
gpointer data)
{
GtkFontSelection *fontsel;
FontInfo *font_info;
GList *selection;
gint index;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In expose_list\n");
1998-06-15 23:29:27 +00:00
#endif
fontsel = GTK_FONT_SELECTION(data);
font_info = fontsel_info->font_info;
/* Try to scroll the font family clist to the selected item */
selection = GTK_CLIST(fontsel->font_clist)->selection;
if (selection)
{
index = GPOINTER_TO_INT (selection->data);
if (gtk_clist_row_is_visible(GTK_CLIST(fontsel->font_clist), index)
!= GTK_VISIBILITY_FULL)
gtk_clist_moveto(GTK_CLIST(fontsel->font_clist), index, -1, 0.5, 0);
}
/* Try to scroll the font style clist to the selected item */
selection = GTK_CLIST(fontsel->font_style_clist)->selection;
if (selection)
{
index = GPOINTER_TO_INT (selection->data);
if (gtk_clist_row_is_visible(GTK_CLIST(fontsel->font_style_clist), index)
!= GTK_VISIBILITY_FULL)
gtk_clist_moveto(GTK_CLIST(fontsel->font_style_clist), index, -1,
0.5, 0);
}
/* Try to scroll the font size clist to the selected item */
selection = GTK_CLIST(fontsel->size_clist)->selection;
if (selection)
{
index = GPOINTER_TO_INT (selection->data);
if (gtk_clist_row_is_visible(GTK_CLIST(fontsel->size_clist), index)
!= GTK_VISIBILITY_FULL)
gtk_clist_moveto(GTK_CLIST(fontsel->size_clist), index, -1, 0.5, 0);
1998-06-15 23:29:27 +00:00
}
}
1998-12-07 20:56:46 +00:00
/* This is called when the style clist is realized. We need to set any
charset rows to insensitive colours. */
static void
gtk_font_selection_realize_list (GtkWidget *widget,
gpointer data)
{
GtkFontSelection *fontsel;
gint row;
GdkColor *inactive_fg, *inactive_bg;
#ifdef FONTSEL_DEBUG
g_message("In realize_list\n");
#endif
fontsel = GTK_FONT_SELECTION (data);
/* Set the colours for any charset rows to insensitive. */
inactive_fg = &fontsel->font_style_clist->style->fg[GTK_STATE_INSENSITIVE];
inactive_bg = &fontsel->font_style_clist->style->bg[GTK_STATE_INSENSITIVE];
for (row = 0; row < GTK_CLIST (fontsel->font_style_clist)->rows; row++)
{
if (GPOINTER_TO_INT (gtk_clist_get_row_data (GTK_CLIST (fontsel->font_style_clist), row)) == -1)
{
gtk_clist_set_foreground (GTK_CLIST (fontsel->font_style_clist),
row, inactive_fg);
gtk_clist_set_background (GTK_CLIST (fontsel->font_style_clist),
row, inactive_bg);
}
}
}
1998-06-15 23:29:27 +00:00
/* This is called when a family is selected in the list. */
static void
gtk_font_selection_select_font (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
GtkFontSelection *fontsel;
FontInfo *font_info;
FontInfo *font;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In select_font\n");
1998-06-15 23:29:27 +00:00
#endif
fontsel = GTK_FONT_SELECTION(data);
font_info = fontsel_info->font_info;
1998-06-15 23:29:27 +00:00
if (bevent && !GTK_WIDGET_HAS_FOCUS (w))
gtk_widget_grab_focus (w);
row = GPOINTER_TO_INT (gtk_clist_get_row_data (GTK_CLIST (fontsel->font_clist), row));
1998-06-15 23:29:27 +00:00
font = &font_info[row];
gtk_entry_set_text(GTK_ENTRY(fontsel->font_entry), font->family);
1998-06-15 23:29:27 +00:00
/* If it is already the current font, just return. */
if (fontsel->font_index == row)
return;
1998-06-15 23:29:27 +00:00
fontsel->font_index = row;
gtk_font_selection_show_available_styles (fontsel);
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
gtk_font_selection_select_best_style (fontsel, TRUE);
1998-06-15 23:29:27 +00:00
}
static gint
gtk_font_selection_on_clist_key_press (GtkWidget *clist,
GdkEventKey *event,
GtkFontSelection *fontsel)
{
#ifdef FONTSEL_DEBUG
g_message("In on_clist_key_press\n");
1998-06-15 23:29:27 +00:00
#endif
if (event->keyval == GDK_Up)
return gtk_font_selection_select_next (fontsel, clist, -1);
else if (event->keyval == GDK_Down)
return gtk_font_selection_select_next (fontsel, clist, 1);
else
return FALSE;
}
static gboolean
gtk_font_selection_select_next (GtkFontSelection *fontsel,
GtkWidget *clist,
gint step)
{
GList *selection;
gint current_row, row;
1998-06-15 23:29:27 +00:00
selection = GTK_CLIST(clist)->selection;
if (!selection)
return FALSE;
current_row = GPOINTER_TO_INT (selection->data);
/* Stop the normal clist key handler from being run. */
gtk_signal_emit_stop_by_name (GTK_OBJECT (clist), "key_press_event");
1998-06-15 23:29:27 +00:00
for (row = current_row + step;
row >= 0 && row < GTK_CLIST(clist)->rows;
row += step)
{
/* If this is the style clist, make sure that the item is not a charset
entry. */
if (clist == fontsel->font_style_clist)
if (GPOINTER_TO_INT (gtk_clist_get_row_data(GTK_CLIST(clist), row)) == -1)
1998-06-15 23:29:27 +00:00
continue;
1998-06-15 23:29:27 +00:00
/* Now we've found the row to select. */
if (gtk_clist_row_is_visible(GTK_CLIST(clist), row)
!= GTK_VISIBILITY_FULL)
gtk_clist_moveto(GTK_CLIST(clist), row, -1, (step < 0) ? 0 : 1, 0);
gtk_clist_select_row(GTK_CLIST(clist), row, 0);
break;
1998-06-15 23:29:27 +00:00
}
return TRUE;
1998-06-15 23:29:27 +00:00
}
/* This fills the font style clist with all the possible style combinations
for the current font family. */
static void
gtk_font_selection_show_available_styles (GtkFontSelection *fontsel)
{
FontInfo *font;
FontStyle *styles;
gint style, tmpstyle, row;
gint weight_index, slant_index, set_width_index, spacing_index;
gint charset_index;
gchar *weight, *slant, *set_width, *spacing;
gchar *charset = NULL;
gchar *new_item;
gchar buffer[XLFD_MAX_FIELD_LEN * 6 + 2];
GdkColor *inactive_fg, *inactive_bg;
gboolean show_charset;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In show_available_styles\n");
1998-06-15 23:29:27 +00:00
#endif
font = &fontsel_info->font_info[fontsel->font_index];
styles = &fontsel_info->font_styles[font->style_index];
1998-06-15 23:29:27 +00:00
gtk_clist_freeze (GTK_CLIST(fontsel->font_style_clist));
gtk_clist_clear (GTK_CLIST(fontsel->font_style_clist));
1998-06-15 23:29:27 +00:00
/* First we mark all visible styles as not having been displayed yet,
and check if every style has the same charset. If not then we will
display the charset in the list before the styles. */
show_charset = FALSE;
charset_index = -1;
for (style = 0; style < font->nstyles; style++)
{
if (gtk_font_selection_style_visible(fontsel, font, style))
{
styles[style].flags &= ~GTK_FONT_DISPLAYED;
1998-06-15 23:29:27 +00:00
if (charset_index == -1)
charset_index = styles[style].properties[CHARSET];
else if (charset_index != styles[style].properties[CHARSET])
show_charset = TRUE;
}
else
styles[style].flags |= GTK_FONT_DISPLAYED;
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
/* Step through the undisplayed styles, finding the next charset which
hasn't been displayed yet. Then display the charset on one line, if
necessary, and the visible styles indented beneath it. */
inactive_fg = &fontsel->font_style_clist->style->fg[GTK_STATE_INSENSITIVE];
inactive_bg = &fontsel->font_style_clist->style->bg[GTK_STATE_INSENSITIVE];
1998-06-15 23:29:27 +00:00
for (style = 0; style < font->nstyles; style++)
{
if (styles[style].flags & GTK_FONT_DISPLAYED)
continue;
1998-06-15 23:29:27 +00:00
if (show_charset)
{
charset_index = styles[style].properties[CHARSET];
charset = fontsel_info->properties[CHARSET] [charset_index];
1998-06-15 23:29:27 +00:00
row = gtk_clist_append(GTK_CLIST(fontsel->font_style_clist),
&charset);
gtk_clist_set_row_data(GTK_CLIST(fontsel->font_style_clist), row,
(gpointer) -1);
1998-12-07 20:56:46 +00:00
if (GTK_WIDGET_REALIZED (fontsel->font_style_clist))
{
gtk_clist_set_foreground(GTK_CLIST(fontsel->font_style_clist),
row, inactive_fg);
gtk_clist_set_background(GTK_CLIST(fontsel->font_style_clist),
row, inactive_bg);
}
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
for (tmpstyle = style; tmpstyle < font->nstyles; tmpstyle++)
{
if (styles[tmpstyle].flags & GTK_FONT_DISPLAYED
1998-06-15 23:29:27 +00:00
|| charset_index != styles[tmpstyle].properties[CHARSET])
continue;
styles[tmpstyle].flags |= GTK_FONT_DISPLAYED;
1998-06-15 23:29:27 +00:00
weight_index = styles[tmpstyle].properties[WEIGHT];
slant_index = styles[tmpstyle].properties[SLANT];
set_width_index = styles[tmpstyle].properties[SET_WIDTH];
spacing_index = styles[tmpstyle].properties[SPACING];
weight = fontsel_info->properties[WEIGHT] [weight_index];
slant = fontsel_info->properties[SLANT] [slant_index];
set_width = fontsel_info->properties[SET_WIDTH][set_width_index];
spacing = fontsel_info->properties[SPACING] [spacing_index];
1998-06-15 23:29:27 +00:00
/* Convert '(nil)' weights to 'regular', since it looks nicer. */
if (!g_strcasecmp(weight, "(nil)")) weight = _("regular");
1998-06-15 23:29:27 +00:00
/* We don't show default values or (nil) in the other properties. */
if (!g_strcasecmp(slant, "r")) slant = NULL;
else if (!g_strcasecmp(slant, "(nil)")) slant = NULL;
else if (!g_strcasecmp(slant, "i")) slant = _("italic");
else if (!g_strcasecmp(slant, "o")) slant = _("oblique");
else if (!g_strcasecmp(slant, "ri")) slant = _("reverse italic");
else if (!g_strcasecmp(slant, "ro")) slant = _("reverse oblique");
else if (!g_strcasecmp(slant, "ot")) slant = _("other");
1998-06-15 23:29:27 +00:00
if (!g_strcasecmp(set_width, "normal")) set_width = NULL;
else if (!g_strcasecmp(set_width, "(nil)")) set_width = NULL;
1998-06-15 23:29:27 +00:00
if (!g_strcasecmp(spacing, "p")) spacing = NULL;
else if (!g_strcasecmp(spacing, "(nil)")) spacing = NULL;
else if (!g_strcasecmp(spacing, "m")) spacing = _("[M]");
else if (!g_strcasecmp(spacing, "c")) spacing = _("[C]");
1998-06-15 23:29:27 +00:00
/* Add the strings together, making sure there is 1 space between
them */
strcpy(buffer, weight);
if (slant)
{
strcat(buffer, " ");
strcat(buffer, slant);
}
if (set_width)
{
strcat(buffer, " ");
strcat(buffer, set_width);
}
if (spacing)
{
strcat(buffer, " ");
strcat(buffer, spacing);
}
1998-06-15 23:29:27 +00:00
new_item = buffer;
row = gtk_clist_append(GTK_CLIST(fontsel->font_style_clist),
&new_item);
if (show_charset)
gtk_clist_set_shift(GTK_CLIST(fontsel->font_style_clist), row, 0,
0, 4);
gtk_clist_set_row_data(GTK_CLIST(fontsel->font_style_clist), row,
GINT_TO_POINTER (tmpstyle));
1998-06-15 23:29:27 +00:00
}
}
1998-06-15 23:29:27 +00:00
gtk_clist_thaw (GTK_CLIST(fontsel->font_style_clist));
}
/* This selects a style when the user selects a font. It just uses the first
available style at present. I was thinking of trying to maintain the
selected style, e.g. bold italic, when the user selects different fonts.
However, the interface is so easy to use now I'm not sure it's worth it.
Note: This will load a font. */
static void
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
gtk_font_selection_select_best_style(GtkFontSelection *fontsel,
gboolean use_first)
1998-06-15 23:29:27 +00:00
{
FontInfo *font;
FontStyle *styles;
1998-12-07 20:56:46 +00:00
gint row, prop, style, matched;
gint best_matched = -1, best_style = -1, best_row = -1;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In select_best_style\n");
1998-06-15 23:29:27 +00:00
#endif
font = &fontsel_info->font_info[fontsel->font_index];
styles = &fontsel_info->font_styles[font->style_index];
1998-06-15 23:29:27 +00:00
for (row = 0; row < GTK_CLIST(fontsel->font_style_clist)->rows; row++)
{
style = GPOINTER_TO_INT (gtk_clist_get_row_data (GTK_CLIST (fontsel->font_style_clist), row));
1998-12-07 20:56:46 +00:00
/* Skip charset rows. */
if (style == -1)
continue;
/* If we just want the first style, we've got it. */
if (use_first)
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
{
1998-12-07 20:56:46 +00:00
best_style = style;
best_row = row;
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
break;
}
1998-12-07 20:56:46 +00:00
matched = 0;
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
if (fontsel->property_values[prop] == styles[style].properties[prop])
matched++;
}
if (matched > best_matched)
{
best_matched = matched;
best_style = style;
best_row = row;
}
1998-06-15 23:29:27 +00:00
}
1998-12-07 20:56:46 +00:00
g_return_if_fail (best_style != -1);
g_return_if_fail (best_row != -1);
1998-12-07 20:56:46 +00:00
fontsel->style = best_style;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
fontsel->property_values[prop] = styles[fontsel->style].properties[prop];
1998-12-07 20:56:46 +00:00
gtk_clist_select_row(GTK_CLIST(fontsel->font_style_clist), best_row, 0);
if (gtk_clist_row_is_visible(GTK_CLIST(fontsel->font_style_clist), best_row)
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
!= GTK_VISIBILITY_FULL)
1998-12-07 20:56:46 +00:00
gtk_clist_moveto(GTK_CLIST(fontsel->font_style_clist), best_row, -1,
0.5, 0);
1998-06-15 23:29:27 +00:00
gtk_font_selection_show_available_sizes (fontsel);
gtk_font_selection_select_best_size (fontsel);
}
/* This is called when a style is selected in the list. */
static void
gtk_font_selection_select_style (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
GtkFontSelection *fontsel;
FontInfo *font_info;
FontInfo *font;
FontStyle *styles;
gint style, prop;
gchar *text;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In select_style\n");
1998-06-15 23:29:27 +00:00
#endif
fontsel = GTK_FONT_SELECTION(data);
font_info = fontsel_info->font_info;
1998-06-15 23:29:27 +00:00
font = &font_info[fontsel->font_index];
styles = &fontsel_info->font_styles[font->style_index];
1998-06-15 23:29:27 +00:00
if (bevent && !GTK_WIDGET_HAS_FOCUS (w))
gtk_widget_grab_focus (w);
1998-06-15 23:29:27 +00:00
/* The style index is stored in the row data, so we just need to copy
the style values into the fontsel and reload the font. */
style = GPOINTER_TO_INT (gtk_clist_get_row_data(GTK_CLIST(fontsel->font_style_clist), row));
1998-06-15 23:29:27 +00:00
/* Don't allow selection of charset rows. */
if (style == -1)
{
gtk_clist_unselect_row(GTK_CLIST(fontsel->font_style_clist), row, 0);
return;
}
1998-06-15 23:29:27 +00:00
gtk_clist_get_text(GTK_CLIST(fontsel->font_style_clist), row, 0, &text);
gtk_entry_set_text(GTK_ENTRY(fontsel->font_style_entry), text);
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
fontsel->property_values[prop] = styles[style].properties[prop];
1998-06-15 23:29:27 +00:00
if (fontsel->style == style)
return;
1998-06-15 23:29:27 +00:00
fontsel->style = style;
gtk_font_selection_show_available_sizes (fontsel);
gtk_font_selection_select_best_size (fontsel);
}
/* This shows all the available sizes in the size clist, according to the
current metric and the current font & style. */
static void
gtk_font_selection_show_available_sizes (GtkFontSelection *fontsel)
{
FontInfo *font;
FontStyle *styles, *style;
const guint16 *standard_sizes;
guint16 *bitmapped_sizes;
1998-06-15 23:29:27 +00:00
gint nstandard_sizes, nbitmapped_sizes;
gchar buffer[16], *size;
gfloat bitmap_size_float = 0.;
guint16 bitmap_size = 0;
1998-06-15 23:29:27 +00:00
gboolean can_match;
gint type_filter;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In show_available_sizes\n");
1998-06-15 23:29:27 +00:00
#endif
font = &fontsel_info->font_info[fontsel->font_index];
styles = &fontsel_info->font_styles[font->style_index];
1998-06-15 23:29:27 +00:00
style = &styles[fontsel->style];
1998-06-15 23:29:27 +00:00
standard_sizes = font_sizes;
nstandard_sizes = sizeof(font_sizes) / sizeof(font_sizes[0]);
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
{
bitmapped_sizes = &fontsel_info->point_sizes[style->point_sizes_index];
1998-06-15 23:29:27 +00:00
nbitmapped_sizes = style->npoint_sizes;
}
else
{
bitmapped_sizes = &fontsel_info->pixel_sizes[style->pixel_sizes_index];
1998-06-15 23:29:27 +00:00
nbitmapped_sizes = style->npixel_sizes;
}
/* Only show the standard sizes if a scalable font is available. */
type_filter = fontsel->filters[GTK_FONT_FILTER_BASE].font_type
& fontsel->filters[GTK_FONT_FILTER_USER].font_type;
if (!((style->flags & GTK_FONT_SCALABLE_BITMAP
&& type_filter & GTK_FONT_SCALABLE_BITMAP)
|| (style->flags & GTK_FONT_SCALABLE
&& type_filter & GTK_FONT_SCALABLE)))
1998-06-15 23:29:27 +00:00
nstandard_sizes = 0;
1998-06-15 23:29:27 +00:00
gtk_clist_freeze (GTK_CLIST(fontsel->size_clist));
gtk_clist_clear (GTK_CLIST(fontsel->size_clist));
1998-06-15 23:29:27 +00:00
/* Interleave the standard sizes with the bitmapped sizes so we get a list
of ascending sizes. If the metric is points, we have to convert the
decipoints to points. */
while (nstandard_sizes || nbitmapped_sizes)
{
can_match = TRUE;
if (nbitmapped_sizes)
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
{
if (*bitmapped_sizes % 10 != 0)
can_match = FALSE;
bitmap_size = *bitmapped_sizes / 10;
bitmap_size_float = *bitmapped_sizes / 10;
}
else
{
bitmap_size = *bitmapped_sizes;
bitmap_size_float = *bitmapped_sizes;
}
1998-06-15 23:29:27 +00:00
if (can_match && nstandard_sizes && nbitmapped_sizes
&& *standard_sizes == bitmap_size)
{
sprintf(buffer, "%i *", *standard_sizes);
standard_sizes++;
nstandard_sizes--;
bitmapped_sizes++;
nbitmapped_sizes--;
}
else if (nstandard_sizes
&& (!nbitmapped_sizes
|| (gfloat)*standard_sizes < bitmap_size_float))
{
sprintf(buffer, "%i", *standard_sizes);
standard_sizes++;
nstandard_sizes--;
}
else
{
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
{
if (*bitmapped_sizes % 10 == 0)
sprintf(buffer, "%i *", *bitmapped_sizes / 10);
else
sprintf(buffer, "%i.%i *", *bitmapped_sizes / 10,
*bitmapped_sizes % 10);
}
else
{
sprintf(buffer, "%i *", *bitmapped_sizes);
}
bitmapped_sizes++;
nbitmapped_sizes--;
}
size = buffer;
gtk_clist_append(GTK_CLIST(fontsel->size_clist), &size);
}
gtk_clist_thaw (GTK_CLIST(fontsel->size_clist));
}
/* If the user hits return in the font size entry, we change to the new font
size. */
static gint
gtk_font_selection_size_key_press (GtkWidget *w,
GdkEventKey *event,
gpointer data)
{
GtkFontSelection *fontsel;
gint new_size;
gfloat new_size_float;
gchar *text;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In size_key_press\n");
1998-06-15 23:29:27 +00:00
#endif
fontsel = GTK_FONT_SELECTION(data);
1998-06-15 23:29:27 +00:00
if (event->keyval == GDK_Return)
{
text = gtk_entry_get_text (GTK_ENTRY (fontsel->size_entry));
if (fontsel->metric == GTK_FONT_METRIC_PIXELS)
1998-06-15 23:29:27 +00:00
{
new_size = atoi (text);
if (new_size < 2)
new_size = 2;
}
else
{
new_size_float = atof (text) * 10;
new_size = (gint) new_size_float;
if (new_size < 20)
new_size = 20;
}
1998-06-15 23:29:27 +00:00
/* Remember that this size was set explicitly. */
fontsel->selected_size = new_size;
1998-06-15 23:29:27 +00:00
/* Check if the font size has changed, and return if it hasn't. */
if (fontsel->size == new_size)
return TRUE;
1998-06-15 23:29:27 +00:00
fontsel->size = new_size;
gtk_font_selection_select_best_size (fontsel);
return TRUE;
}
1998-06-15 23:29:27 +00:00
return FALSE;
}
/* This tries to select the closest size to the current size, though it
may have to change the size if only unscaled bitmaps are available.
Note: this will load a font. */
static void
gtk_font_selection_select_best_size(GtkFontSelection *fontsel)
{
FontInfo *font;
FontStyle *styles, *style;
gchar *text;
gint row, best_row = 0, size, size_fraction, best_size = 0, nmatched;
gboolean found = FALSE;
gchar buffer[32];
GList *selection;
gint type_filter;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In select_best_size\n");
1998-06-15 23:29:27 +00:00
#endif
font = &fontsel_info->font_info[fontsel->font_index];
styles = &fontsel_info->font_styles[font->style_index];
1998-06-15 23:29:27 +00:00
style = &styles[fontsel->style];
1998-06-15 23:29:27 +00:00
/* Find the closest size available in the size clist. If the exact size is
in the list set found to TRUE. */
for (row = 0; row < GTK_CLIST(fontsel->size_clist)->rows; row++)
{
gtk_clist_get_text(GTK_CLIST(fontsel->size_clist), row, 0, &text);
nmatched = sscanf(text, "%i.%i", &size, &size_fraction);
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
{
size *= 10;
if (nmatched == 2)
size += size_fraction;
}
1998-06-15 23:29:27 +00:00
if (size == fontsel->selected_size)
{
found = TRUE;
best_size = size;
best_row = row;
break;
}
else if (best_size == 0
|| abs(size - fontsel->selected_size)
< (abs(best_size - fontsel->selected_size)))
{
best_size = size;
best_row = row;
}
}
1998-06-15 23:29:27 +00:00
/* If we aren't scaling bitmapped fonts and this is a bitmapped font, we
need to use the closest size found. */
type_filter = fontsel->filters[GTK_FONT_FILTER_BASE].font_type
& fontsel->filters[GTK_FONT_FILTER_USER].font_type;
if (!((style->flags & GTK_FONT_SCALABLE_BITMAP
&& type_filter & GTK_FONT_SCALABLE_BITMAP)
|| (style->flags & GTK_FONT_SCALABLE
&& type_filter & GTK_FONT_SCALABLE)))
1998-06-15 23:29:27 +00:00
found = TRUE;
1998-06-15 23:29:27 +00:00
if (found)
{
fontsel->size = best_size;
gtk_clist_moveto(GTK_CLIST(fontsel->size_clist), best_row, -1, 0.5, 0);
gtk_clist_select_row(GTK_CLIST(fontsel->size_clist), best_row, 0);
}
else
{
fontsel->size = fontsel->selected_size;
selection = GTK_CLIST(fontsel->size_clist)->selection;
if (selection)
gtk_clist_unselect_row(GTK_CLIST(fontsel->size_clist),
GPOINTER_TO_INT (selection->data), 0);
1998-06-15 23:29:27 +00:00
gtk_clist_moveto(GTK_CLIST(fontsel->size_clist), best_row, -1, 0.5, 0);
1998-06-15 23:29:27 +00:00
/* Show the size in the size entry. */
if (fontsel->metric == GTK_FONT_METRIC_PIXELS)
1998-06-15 23:29:27 +00:00
sprintf(buffer, "%i", fontsel->size);
else
{
if (fontsel->size % 10 == 0)
sprintf(buffer, "%i", fontsel->size / 10);
else
sprintf(buffer, "%i.%i", fontsel->size / 10, fontsel->size % 10);
}
gtk_entry_set_text (GTK_ENTRY (fontsel->size_entry), buffer);
}
gtk_font_selection_load_font (fontsel);
}
/* This is called when a size is selected in the list. */
static void
gtk_font_selection_select_size (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
gpointer data)
{
GtkFontSelection *fontsel;
gint new_size;
gchar *text;
gchar buffer[16];
gint i;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In select_size\n");
1998-06-15 23:29:27 +00:00
#endif
fontsel = GTK_FONT_SELECTION(data);
1998-06-15 23:29:27 +00:00
if (bevent && !GTK_WIDGET_HAS_FOCUS (w))
gtk_widget_grab_focus (w);
1998-06-15 23:29:27 +00:00
/* Copy the size from the clist to the size entry, but without the bitmapped
marker ('*'). */
gtk_clist_get_text(GTK_CLIST(fontsel->size_clist), row, 0, &text);
i = 0;
while (i < 15 && (text[i] == '.' || (text[i] >= '0' && text[i] <= '9')))
{
buffer[i] = text[i];
i++;
}
buffer[i] = '\0';
gtk_entry_set_text(GTK_ENTRY(fontsel->size_entry), buffer);
1998-06-15 23:29:27 +00:00
/* Check if the font size has changed, and return if it hasn't. */
new_size = atoi(text);
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
new_size *= 10;
1998-06-15 23:29:27 +00:00
if (fontsel->size == new_size)
return;
1998-06-15 23:29:27 +00:00
/* If the size was selected by the user we set the selected_size. */
fontsel->selected_size = new_size;
1998-06-15 23:29:27 +00:00
fontsel->size = new_size;
gtk_font_selection_load_font (fontsel);
}
/* This is called when the pixels or points radio buttons are pressed. */
static void
gtk_font_selection_metric_callback (GtkWidget *w,
gpointer data)
{
GtkFontSelection *fontsel = GTK_FONT_SELECTION(data);
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In metric_callback\n");
1998-06-15 23:29:27 +00:00
#endif
if (GTK_TOGGLE_BUTTON(fontsel->pixels_button)->active)
{
if (fontsel->metric == GTK_FONT_METRIC_PIXELS)
1998-06-15 23:29:27 +00:00
return;
fontsel->metric = GTK_FONT_METRIC_PIXELS;
1998-06-15 23:29:27 +00:00
fontsel->size = (fontsel->size + 5) / 10;
fontsel->selected_size = (fontsel->selected_size + 5) / 10;
}
else
{
if (fontsel->metric == GTK_FONT_METRIC_POINTS)
1998-06-15 23:29:27 +00:00
return;
fontsel->metric = GTK_FONT_METRIC_POINTS;
1998-06-15 23:29:27 +00:00
fontsel->size *= 10;
fontsel->selected_size *= 10;
}
if (fontsel->font_index != -1)
{
gtk_font_selection_show_available_sizes (fontsel);
gtk_font_selection_select_best_size (fontsel);
}
}
/* This searches the given property table and returns the index of the given
string, or 0, which is the wildcard '*' index, if it's not found. */
static guint16
gtk_font_selection_field_to_index (gchar **table,
gint ntable,
gchar *field)
{
gint i;
1998-06-15 23:29:27 +00:00
for (i = 0; i < ntable; i++)
if (strcmp (field, table[i]) == 0)
return i;
1998-06-15 23:29:27 +00:00
return 0;
}
/* This attempts to load the current font, and returns TRUE if it succeeds. */
static gboolean
gtk_font_selection_load_font (GtkFontSelection *fontsel)
{
GdkFont *font;
gchar *fontname, *label_text;
1998-06-15 23:29:27 +00:00
if (fontsel->font)
gdk_font_unref (fontsel->font);
fontsel->font = NULL;
1998-06-15 23:29:27 +00:00
/* If no family has been selected yet, just return FALSE. */
if (fontsel->font_index == -1)
return FALSE;
1998-06-15 23:29:27 +00:00
fontname = gtk_font_selection_get_font_name (fontsel);
if (fontname)
{
#ifdef FONTSEL_DEBUG
g_message("Loading: %s\n", fontname);
1998-06-15 23:29:27 +00:00
#endif
font = gdk_font_load (fontname);
g_free(fontname);
1998-06-15 23:29:27 +00:00
if (font)
{
fontsel->font = font;
/* Make sure the message label is empty, but don't change it unless
it's necessary as it results in a resize of the whole window! */
gtk_label_get(GTK_LABEL(fontsel->message_label), &label_text);
if (strcmp(label_text, ""))
gtk_label_set_text(GTK_LABEL(fontsel->message_label), "");
1998-06-15 23:29:27 +00:00
gtk_font_selection_update_preview (fontsel);
return TRUE;
}
else
{
gtk_label_set_text(GTK_LABEL(fontsel->message_label),
_("The selected font is not available."));
1998-06-15 23:29:27 +00:00
}
}
else
{
gtk_label_set_text(GTK_LABEL(fontsel->message_label),
_("The selected font is not a valid font."));
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
return FALSE;
}
/* This sets the font in the preview entry to the selected font, and tries to
make sure that the preview entry is a reasonable size, i.e. so that the
text can be seen with a bit of space to spare. But it tries to avoid
resizing the entry every time the font changes.
This also used to shrink the preview if the font size was decreased, but
that made it awkward if the user wanted to resize the window themself. */
static void
gtk_font_selection_update_preview (GtkFontSelection *fontsel)
{
GtkWidget *preview_entry;
GtkStyle *style;
gint text_height, new_height;
gchar *text;
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
XFontStruct *xfs;
#endif
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In update_preview\n");
1998-06-15 23:29:27 +00:00
#endif
style = gtk_style_new ();
gdk_font_unref (style->font);
style->font = fontsel->font;
gdk_font_ref (style->font);
1998-06-15 23:29:27 +00:00
preview_entry = fontsel->preview_entry;
gtk_widget_set_style (preview_entry, style);
gtk_style_unref(style);
1998-06-15 23:29:27 +00:00
text_height = preview_entry->style->font->ascent
+ preview_entry->style->font->descent;
/* We don't ever want to be over MAX_PREVIEW_HEIGHT pixels high. */
new_height = text_height + 20;
if (new_height < INITIAL_PREVIEW_HEIGHT)
new_height = INITIAL_PREVIEW_HEIGHT;
if (new_height > MAX_PREVIEW_HEIGHT)
new_height = MAX_PREVIEW_HEIGHT;
1998-06-15 23:29:27 +00:00
if ((preview_entry->requisition.height < text_height + 10)
|| (preview_entry->requisition.height > text_height + 40))
gtk_widget_set_usize(preview_entry, -1, new_height);
1998-06-15 23:29:27 +00:00
/* This sets the preview text, if it hasn't been set already. */
text = gtk_entry_get_text(GTK_ENTRY(fontsel->preview_entry));
if (strlen(text) == 0)
gtk_entry_set_text(GTK_ENTRY(fontsel->preview_entry), PREVIEW_TEXT);
gtk_entry_set_position(GTK_ENTRY(fontsel->preview_entry), 0);
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
/* If this is a 2-byte font display a message to say it may not be
displayed properly. */
xfs = GDK_FONT_XFONT(fontsel->font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0)
gtk_label_set_text(GTK_LABEL(fontsel->message_label),
_("This is a 2-byte font and may not be displayed correctly."));
#endif
1998-06-15 23:29:27 +00:00
}
static void
gtk_font_selection_switch_page (GtkWidget *w,
GtkNotebookPage *page,
gint page_num,
gpointer data)
{
GtkFontSelection *fontsel = GTK_FONT_SELECTION(data);
1998-06-15 23:29:27 +00:00
/* This function strangely gets called when the window is destroyed,
so we check here to see if the notebook is visible. */
if (!GTK_WIDGET_VISIBLE(w))
return;
1998-06-15 23:29:27 +00:00
if (page_num == 0)
gtk_font_selection_update_filter(fontsel);
1998-06-15 23:29:27 +00:00
else if (page_num == 1)
gtk_font_selection_show_font_info(fontsel);
}
1998-06-15 23:29:27 +00:00
static void
gtk_font_selection_show_font_info (GtkFontSelection *fontsel)
{
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
Atom font_atom, atom;
Bool status;
#endif
1998-06-15 23:29:27 +00:00
char *name;
gchar *fontname;
gchar field_buffer[XLFD_MAX_FIELD_LEN];
gchar *field;
gint i;
gboolean shown_actual_fields = FALSE;
1998-06-15 23:29:27 +00:00
fontname = gtk_font_selection_get_font_name(fontsel);
gtk_entry_set_text(GTK_ENTRY(fontsel->requested_font_name),
fontname ? fontname : "");
1998-06-15 23:29:27 +00:00
gtk_clist_freeze (GTK_CLIST(fontsel->info_clist));
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{
if (fontname)
field = gtk_font_selection_get_xlfd_field (fontname, i, field_buffer);
else
field = NULL;
if (field)
{
if (i == XLFD_SLANT)
field = gtk_font_selection_expand_slant_code(field);
else if (i == XLFD_SPACING)
field = gtk_font_selection_expand_spacing_code(field);
}
gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 1,
field ? field : "");
}
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
if (fontsel->font)
{
font_atom = XInternAtom(GDK_DISPLAY(), "FONT", True);
if (font_atom != None)
{
status = XGetFontProperty(GDK_FONT_XFONT(fontsel->font), font_atom,
&atom);
if (status == True)
{
name = XGetAtomName(GDK_DISPLAY(), atom);
gtk_entry_set_text(GTK_ENTRY(fontsel->actual_font_name), name);
1998-06-15 23:29:27 +00:00
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{
field = gtk_font_selection_get_xlfd_field (name, i,
field_buffer);
if (i == XLFD_SLANT)
field = gtk_font_selection_expand_slant_code(field);
else if (i == XLFD_SPACING)
field = gtk_font_selection_expand_spacing_code(field);
gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
field ? field : "");
}
shown_actual_fields = TRUE;
XFree(name);
}
}
}
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
if (fontsel->font)
{
LOGFONT logfont;
if (GetObject (GDK_FONT_XFONT (fontsel->font),
sizeof (LOGFONT), &logfont) > 0)
{
name = logfont_to_xlfd (&logfont, logfont.lfHeight, -1, 0);
gtk_entry_set_text (GTK_ENTRY(fontsel->actual_font_name),name);
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{
field = gtk_font_selection_get_xlfd_field (name, i,
field_buffer);
if (i == XLFD_SLANT)
field = gtk_font_selection_expand_slant_code(field);
else if (i == XLFD_SPACING)
field = gtk_font_selection_expand_spacing_code(field);
gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
field ? field : "");
}
shown_actual_fields = TRUE;
g_free (name);
}
}
#endif
1998-06-15 23:29:27 +00:00
if (!shown_actual_fields)
{
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
gtk_entry_set_text(GTK_ENTRY(fontsel->actual_font_name), "");
1998-06-15 23:29:27 +00:00
for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
{
gtk_clist_set_text(GTK_CLIST(fontsel->info_clist), i, 2,
fontname ? _("(unknown)") : "");
1998-06-15 23:29:27 +00:00
}
}
gtk_clist_thaw (GTK_CLIST(fontsel->info_clist));
g_free(fontname);
}
static gchar*
gtk_font_selection_expand_slant_code(gchar *slant)
{
if (!g_strcasecmp(slant, "r")) return(_("roman"));
else if (!g_strcasecmp(slant, "i")) return(_("italic"));
else if (!g_strcasecmp(slant, "o")) return(_("oblique"));
else if (!g_strcasecmp(slant, "ri")) return(_("reverse italic"));
else if (!g_strcasecmp(slant, "ro")) return(_("reverse oblique"));
else if (!g_strcasecmp(slant, "ot")) return(_("other"));
1998-06-15 23:29:27 +00:00
return slant;
}
static gchar*
gtk_font_selection_expand_spacing_code(gchar *spacing)
{
if (!g_strcasecmp(spacing, "p")) return(_("proportional"));
else if (!g_strcasecmp(spacing, "m")) return(_("monospaced"));
else if (!g_strcasecmp(spacing, "c")) return(_("char cell"));
1998-06-15 23:29:27 +00:00
return spacing;
}
/*****************************************************************************
* These functions all deal with the Filter page and filtering the fonts.
1998-06-15 23:29:27 +00:00
*****************************************************************************/
/* This is called when an item is selected in one of the filter clists.
We make sure that the first row of the clist, i.e. the wildcard '*', is
selected if and only if none of the other items are selected.
Also doesn't allow selections of values filtered out by base filter.
1998-06-15 23:29:27 +00:00
We may need to be careful about triggering other signals. */
static void
gtk_font_selection_select_filter (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
gint i, prop, index;
1998-06-15 23:29:27 +00:00
if (row == 0)
{
for (i = 1; i < GTK_CLIST(w)->rows; i++)
gtk_clist_unselect_row(GTK_CLIST(w), i, 0);
}
1998-06-15 23:29:27 +00:00
else
{
/* Find out which property this is. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
if (fontsel->filter_clists[prop] == w)
break;
index = GPOINTER_TO_INT (gtk_clist_get_row_data(GTK_CLIST(w), row));
if (gtk_font_selection_filter_state (fontsel, GTK_FONT_FILTER_BASE,
prop, index) == NOT_FILTERED)
gtk_clist_unselect_row(GTK_CLIST(w), row, 0);
else
gtk_clist_unselect_row(GTK_CLIST(w), 0, 0);
}
1998-06-15 23:29:27 +00:00
}
/* Here a filter item is being deselected. If there are now no items selected
we select the first '*' item, unless that it is the item being deselected,
in which case we select all of the other items. This makes it easy to
select all items in the list except one or two. */
static void
gtk_font_selection_unselect_filter (GtkWidget *w,
gint row,
gint column,
GdkEventButton *bevent,
GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
gint i, prop, index;
1998-06-15 23:29:27 +00:00
if (!GTK_CLIST(w)->selection)
{
if (row == 0)
{
/* Find out which property this is. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
if (fontsel->filter_clists[prop] == w)
break;
for (i = 1; i < GTK_CLIST(w)->rows; i++)
{
index = GPOINTER_TO_INT (gtk_clist_get_row_data(GTK_CLIST(w),
i));
if (gtk_font_selection_filter_state (fontsel,
GTK_FONT_FILTER_BASE,
prop, index)
!= NOT_FILTERED)
gtk_clist_select_row(GTK_CLIST(w), i, 0);
}
}
1998-06-15 23:29:27 +00:00
else
{
gtk_clist_select_row(GTK_CLIST(w), 0, 0);
}
1998-06-15 23:29:27 +00:00
}
}
/* This is called when the main notebook page is selected. It checks if the
filter has changed, an if so it creates the filter settings, and filters the
fonts shown. If an empty filter (all '*'s) is applied, then filtering is
turned off. */
static void
gtk_font_selection_update_filter (GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
GtkWidget *clist;
GList *selection;
gboolean default_filter = TRUE, filter_changed = FALSE;
1998-06-15 23:29:27 +00:00
gint prop, nselected, i, row, index;
GtkFontFilter *filter = &fontsel->filters[GTK_FONT_FILTER_USER];
gint base_font_type, user_font_type, new_font_type;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In update_filter\n");
1998-06-15 23:29:27 +00:00
#endif
/* Check if the user filter has changed, and also if it is the default
filter, i.e. bitmap & scalable fonts and all '*'s selected.
We only look at the bits which are not already filtered out by the base
filter, since that overrides the user filter. */
base_font_type = fontsel->filters[GTK_FONT_FILTER_BASE].font_type
& GTK_FONT_ALL;
user_font_type = fontsel->filters[GTK_FONT_FILTER_USER].font_type
& GTK_FONT_ALL;
new_font_type = GTK_TOGGLE_BUTTON(fontsel->type_bitmaps_button)->active
? GTK_FONT_BITMAP : 0;
new_font_type |= (GTK_TOGGLE_BUTTON(fontsel->type_scalable_button)->active
? GTK_FONT_SCALABLE : 0);
new_font_type |= (GTK_TOGGLE_BUTTON(fontsel->type_scaled_bitmaps_button)->active ? GTK_FONT_SCALABLE_BITMAP : 0);
new_font_type &= base_font_type;
new_font_type |= (~base_font_type & user_font_type);
if (new_font_type != (GTK_FONT_BITMAP | GTK_FONT_SCALABLE))
default_filter = FALSE;
if (new_font_type != user_font_type)
filter_changed = TRUE;
fontsel->filters[GTK_FONT_FILTER_USER].font_type = new_font_type;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
clist = fontsel->filter_clists[prop];
selection = GTK_CLIST(clist)->selection;
nselected = g_list_length(selection);
if (nselected != 1 || GPOINTER_TO_INT (selection->data) != 0)
1998-06-15 23:29:27 +00:00
{
default_filter = FALSE;
if (filter->property_nfilters[prop] != nselected)
1998-06-15 23:29:27 +00:00
filter_changed = TRUE;
else
{
for (i = 0; i < nselected; i++)
{
row = GPOINTER_TO_INT (selection->data);
index = GPOINTER_TO_INT (gtk_clist_get_row_data (GTK_CLIST (clist), row));
if (filter->property_filters[prop][i] != index)
1998-06-15 23:29:27 +00:00
filter_changed = TRUE;
selection = selection->next;
}
}
}
else
{
if (filter->property_nfilters[prop] != 0)
1998-06-15 23:29:27 +00:00
filter_changed = TRUE;
}
}
1998-06-15 23:29:27 +00:00
/* If the filter hasn't changed we just return. */
if (!filter_changed)
return;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message(" update_fonts: filter has changed\n");
1998-06-15 23:29:27 +00:00
#endif
/* Free the old filter data and create the new arrays. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
g_free(filter->property_filters[prop]);
clist = fontsel->filter_clists[prop];
selection = GTK_CLIST(clist)->selection;
nselected = g_list_length(selection);
if (nselected == 1 && GPOINTER_TO_INT (selection->data) == 0)
{
filter->property_filters[prop] = NULL;
filter->property_nfilters[prop] = 0;
}
else
{
filter->property_filters[prop] = g_new(guint16, nselected);
filter->property_nfilters[prop] = nselected;
for (i = 0; i < nselected; i++)
{
row = GPOINTER_TO_INT (selection->data);
index = GPOINTER_TO_INT (gtk_clist_get_row_data (GTK_CLIST (clist), row));
filter->property_filters[prop][i] = index;
selection = selection->next;
}
}
}
/* Set the 'Reset Filter' button sensitive if a filter is in effect, and
also set the label above the font list to show this as well. */
if (default_filter)
1998-06-15 23:29:27 +00:00
{
gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font:"));
1998-06-15 23:29:27 +00:00
}
else
{
gtk_widget_set_sensitive(fontsel->filter_button, TRUE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font: (Filter Applied)"));
1998-06-15 23:29:27 +00:00
}
gtk_font_selection_show_available_fonts(fontsel);
1998-06-15 23:29:27 +00:00
}
/* This shows all the available fonts in the font clist. */
1998-06-15 23:29:27 +00:00
static void
gtk_font_selection_show_available_fonts (GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
FontInfo *font_info, *font;
GtkFontFilter *filter;
gint nfonts, i, j, k, row, style, font_row = -1;
1998-06-15 23:29:27 +00:00
gchar font_buffer[XLFD_MAX_FIELD_LEN * 2 + 4];
gchar *font_item;
gboolean matched, matched_style;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In show_available_fonts\n");
1998-06-15 23:29:27 +00:00
#endif
font_info = fontsel_info->font_info;
nfonts = fontsel_info->nfonts;
1998-06-15 23:29:27 +00:00
/* Filter the list of fonts. */
gtk_clist_freeze (GTK_CLIST(fontsel->font_clist));
gtk_clist_clear (GTK_CLIST(fontsel->font_clist));
for (i = 0; i < nfonts; i++)
{
font = &font_info[i];
/* Check if the foundry passes through all filters. */
matched = TRUE;
for (k = 0; k < GTK_NUM_FONT_FILTERS; k++)
1998-06-15 23:29:27 +00:00
{
filter = &fontsel->filters[k];
if (filter->property_nfilters[FOUNDRY] != 0)
1998-06-15 23:29:27 +00:00
{
matched = FALSE;
for (j = 0; j < filter->property_nfilters[FOUNDRY]; j++)
1998-06-15 23:29:27 +00:00
{
if (font->foundry == filter->property_filters[FOUNDRY][j])
{
matched = TRUE;
break;
}
1998-06-15 23:29:27 +00:00
}
1998-12-07 20:56:46 +00:00
if (!matched)
break;
1998-06-15 23:29:27 +00:00
}
}
if (!matched)
continue;
1998-06-15 23:29:27 +00:00
/* Now check if the other properties are matched in at least one style.*/
matched_style = FALSE;
for (style = 0; style < font->nstyles; style++)
{
if (gtk_font_selection_style_visible(fontsel, font, style))
{
matched_style = TRUE;
break;
}
}
if (!matched_style)
continue;
1998-06-15 23:29:27 +00:00
/* Insert the font in the clist. */
if ((i > 0 && font->family == font_info[i-1].family)
|| (i < nfonts - 1 && font->family == font_info[i+1].family))
{
sprintf(font_buffer, "%s (%s)", font->family,
fontsel_info->properties[FOUNDRY][font->foundry]);
1998-06-15 23:29:27 +00:00
font_item = font_buffer;
row = gtk_clist_append(GTK_CLIST(fontsel->font_clist), &font_item);
}
else
{
row = gtk_clist_append(GTK_CLIST(fontsel->font_clist),
&font->family);
}
gtk_clist_set_row_data(GTK_CLIST(fontsel->font_clist), row,
GINT_TO_POINTER (i));
if (fontsel->font_index == i)
font_row = row;
1998-06-15 23:29:27 +00:00
}
gtk_clist_thaw (GTK_CLIST(fontsel->font_clist));
/* If the currently-selected font isn't in the new list, reset the
selection. */
if (font_row == -1)
{
fontsel->font_index = -1;
if (fontsel->font)
gdk_font_unref(fontsel->font);
fontsel->font = NULL;
gtk_entry_set_text(GTK_ENTRY(fontsel->font_entry), "");
gtk_clist_clear (GTK_CLIST(fontsel->font_style_clist));
gtk_entry_set_text(GTK_ENTRY(fontsel->font_style_entry), "");
return;
}
gtk_clist_select_row(GTK_CLIST(fontsel->font_clist), font_row, 0);
if (gtk_clist_row_is_visible(GTK_CLIST(fontsel->font_clist), font_row)
!= GTK_VISIBILITY_FULL)
gtk_clist_moveto(GTK_CLIST(fontsel->font_clist), font_row, -1, 0.5, 0);
gtk_font_selection_show_available_styles (fontsel);
gtk_font_selection_select_best_style (fontsel, FALSE);
1998-06-15 23:29:27 +00:00
}
/* Returns TRUE if the style is not currently filtered out. */
static gboolean
gtk_font_selection_style_visible(GtkFontSelection *fontsel,
FontInfo *font,
gint style_index)
1998-06-15 23:29:27 +00:00
{
FontStyle *styles, *style;
GtkFontFilter *filter;
1998-06-15 23:29:27 +00:00
guint16 value;
gint prop, i, j;
1998-06-15 23:29:27 +00:00
gboolean matched;
gint type_filter;
styles = &fontsel_info->font_styles[font->style_index];
style = &styles[style_index];
/* Check if font_type of style is filtered. */
type_filter = fontsel->filters[GTK_FONT_FILTER_BASE].font_type
& fontsel->filters[GTK_FONT_FILTER_USER].font_type;
if (!(style->flags & type_filter))
return FALSE;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
value = style->properties[prop];
/* Check each filter. */
for (i = 0; i < GTK_NUM_FONT_FILTERS; i++)
1998-06-15 23:29:27 +00:00
{
filter = &fontsel->filters[i];
if (filter->property_nfilters[prop] != 0)
1998-06-15 23:29:27 +00:00
{
matched = FALSE;
for (j = 0; j < filter->property_nfilters[prop]; j++)
1998-06-15 23:29:27 +00:00
{
if (value == filter->property_filters[prop][j])
{
matched = TRUE;
break;
}
1998-06-15 23:29:27 +00:00
}
if (!matched)
return FALSE;
1998-06-15 23:29:27 +00:00
}
}
}
return TRUE;
}
/* This resets the font type to bitmap or scalable, and sets all the filter
clists to the wildcard '*' options. */
1998-06-15 23:29:27 +00:00
static void
gtk_font_selection_reset_filter (GtkWidget *w,
GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
gint prop, base_font_type;
fontsel->filters[GTK_FONT_FILTER_USER].font_type = GTK_FONT_BITMAP
| GTK_FONT_SCALABLE;
base_font_type = fontsel->filters[GTK_FONT_FILTER_BASE].font_type;
if (base_font_type & GTK_FONT_BITMAP)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), TRUE);
if (base_font_type & GTK_FONT_SCALABLE)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), TRUE);
if (base_font_type & GTK_FONT_SCALABLE_BITMAP)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scaled_bitmaps_button), FALSE);
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
gtk_clist_select_row(GTK_CLIST(fontsel->filter_clists[prop]), 0, 0);
}
/* This clears the filter, showing all fonts and styles again. */
static void
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
gtk_font_selection_on_clear_filter (GtkWidget *w,
GtkFontSelection *fontsel)
1998-06-15 23:29:27 +00:00
{
gtk_font_selection_clear_filter(fontsel);
}
/* This resets the user filter, showing all fonts and styles which pass the
base filter again. Note that the font type is set to bitmaps and scalable
fonts - scaled bitmaps are not shown. */
1998-06-15 23:29:27 +00:00
static void
gtk_font_selection_clear_filter (GtkFontSelection *fontsel)
{
GtkFontFilter *filter;
gint prop;
1998-06-15 23:29:27 +00:00
#ifdef FONTSEL_DEBUG
g_message("In clear_filter\n");
1998-06-15 23:29:27 +00:00
#endif
/* Clear the filter data. */
filter = &fontsel->filters[GTK_FONT_FILTER_USER];
filter->font_type = GTK_FONT_BITMAP | GTK_FONT_SCALABLE;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
g_free(filter->property_filters[prop]);
filter->property_filters[prop] = NULL;
filter->property_nfilters[prop] = 0;
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
/* Select all the '*'s on the filter page. */
gtk_font_selection_reset_filter(NULL, fontsel);
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
/* Update the main notebook page. */
gtk_widget_set_sensitive(fontsel->filter_button, FALSE);
gtk_label_set_text(GTK_LABEL(fontsel->font_label), _("Font:"));
gtk_font_selection_show_available_fonts(fontsel);
}
void
gtk_font_selection_set_filter (GtkFontSelection *fontsel,
GtkFontFilterType filter_type,
GtkFontType font_type,
gchar **foundries,
gchar **weights,
gchar **slants,
gchar **setwidths,
gchar **spacings,
gchar **charsets)
{
GtkFontFilter *filter;
gchar **filter_strings [GTK_NUM_FONT_PROPERTIES];
gchar *filter_string;
gchar *property, *property_alt;
gint prop, nfilters, i, j, num_found;
gint base_font_type, user_font_type;
gboolean filter_set;
/* Put them into an array so we can use a simple loop. */
filter_strings[FOUNDRY] = foundries;
filter_strings[WEIGHT] = weights;
filter_strings[SLANT] = slants;
filter_strings[SET_WIDTH] = setwidths;
filter_strings[SPACING] = spacings;
filter_strings[CHARSET] = charsets;
filter = &fontsel->filters[filter_type];
filter->font_type = font_type;
/* Free the old filter data, and insert the new. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
1998-06-15 23:29:27 +00:00
{
g_free(filter->property_filters[prop]);
filter->property_filters[prop] = NULL;
filter->property_nfilters[prop] = 0;
if (filter_strings[prop])
1998-06-15 23:29:27 +00:00
{
/* Count how many items in the new array. */
nfilters = 0;
while (filter_strings[prop][nfilters])
nfilters++;
filter->property_filters[prop] = g_new(guint16, nfilters);
filter->property_nfilters[prop] = 0;
/* Now convert the strings to property indices. */
num_found = 0;
for (i = 0; i < nfilters; i++)
1998-06-15 23:29:27 +00:00
{
filter_string = filter_strings[prop][i];
for (j = 0; j < fontsel_info->nproperties[prop]; j++)
{
property = fontsel_info->properties[prop][j];
property_alt = NULL;
if (prop == SLANT)
property_alt = gtk_font_selection_expand_slant_code(property);
else if (prop == SPACING)
property_alt = gtk_font_selection_expand_spacing_code(property);
if (!strcmp (filter_string, property)
|| (property_alt && !strcmp (filter_string, property_alt)))
{
filter->property_filters[prop][num_found] = j;
num_found++;
break;
}
}
1998-06-15 23:29:27 +00:00
}
filter->property_nfilters[prop] = num_found;
}
}
/* Now set the clists on the filter page according to the new filter. */
gtk_font_selection_update_filter_lists (fontsel);
if (filter_type == GTK_FONT_FILTER_BASE)
{
user_font_type = fontsel->filters[GTK_FONT_FILTER_USER].font_type;
if (font_type & GTK_FONT_BITMAP)
{
gtk_widget_set_sensitive (fontsel->type_bitmaps_button, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), user_font_type & GTK_FONT_BITMAP);
}
else
{
gtk_widget_set_sensitive (fontsel->type_bitmaps_button, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), FALSE);
1998-06-15 23:29:27 +00:00
}
if (font_type & GTK_FONT_SCALABLE)
{
gtk_widget_set_sensitive (fontsel->type_scalable_button, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), user_font_type & GTK_FONT_SCALABLE);
}
else
{
gtk_widget_set_sensitive (fontsel->type_scalable_button, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), FALSE);
}
if (font_type & GTK_FONT_SCALABLE_BITMAP)
{
gtk_widget_set_sensitive (fontsel->type_scaled_bitmaps_button, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scaled_bitmaps_button), user_font_type & GTK_FONT_SCALABLE_BITMAP);
}
else
1998-06-15 23:29:27 +00:00
{
gtk_widget_set_sensitive (fontsel->type_scaled_bitmaps_button, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scaled_bitmaps_button), FALSE);
1998-06-15 23:29:27 +00:00
}
}
else
{
base_font_type = fontsel->filters[GTK_FONT_FILTER_BASE].font_type;
if (base_font_type & GTK_FONT_BITMAP)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_bitmaps_button), font_type & GTK_FONT_BITMAP);
if (base_font_type & GTK_FONT_SCALABLE)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scalable_button), font_type & GTK_FONT_SCALABLE);
if (base_font_type & GTK_FONT_SCALABLE_BITMAP)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fontsel->type_scaled_bitmaps_button), font_type & GTK_FONT_SCALABLE_BITMAP);
/* If the user filter is not the default, make the 'Reset Filter' button
sensitive. */
filter_set = FALSE;
if (font_type != (GTK_FONT_BITMAP | GTK_FONT_SCALABLE))
filter_set = TRUE;
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
if (filter->property_nfilters[prop] != 0)
filter_set = TRUE;
}
if (filter_set)
gtk_widget_set_sensitive (fontsel->filter_button, TRUE);
}
gtk_font_selection_show_available_fonts (fontsel);
}
/* This sets the colour of each property in the filter clists according to
the base filter. i.e. Filtered properties are shown as insensitive. */
static void
gtk_font_selection_update_filter_lists (GtkFontSelection *fontsel)
{
GtkWidget *clist;
GdkColor *inactive_fg, *inactive_bg, *fg, *bg;
gint prop, row, index;
/* We have to make sure the clist is realized to use the colours. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
clist = fontsel->filter_clists[prop];
gtk_widget_realize (clist);
inactive_fg = &clist->style->fg[GTK_STATE_INSENSITIVE];
inactive_bg = &clist->style->bg[GTK_STATE_INSENSITIVE];
for (row = 1; row < GTK_CLIST(clist)->rows; row++)
{
index = GPOINTER_TO_INT (gtk_clist_get_row_data(GTK_CLIST(clist),
row));
/* Set the colour according to the base filter. */
if (gtk_font_selection_filter_state (fontsel, GTK_FONT_FILTER_BASE,
prop, index) == NOT_FILTERED)
{
fg = inactive_fg;
bg = inactive_bg;
}
else
{
fg = NULL;
bg = NULL;
}
gtk_clist_set_foreground(GTK_CLIST(clist), row, fg);
gtk_clist_set_background(GTK_CLIST(clist), row, bg);
/* Set the selection state according to the user filter. */
if (gtk_font_selection_filter_state (fontsel, GTK_FONT_FILTER_USER,
prop, index) == FILTERED
&& fg == NULL)
gtk_clist_select_row (GTK_CLIST (clist), row, 0);
else
gtk_clist_unselect_row (GTK_CLIST (clist), row, 0);
}
}
}
/* Returns whether a property value is in the filter or not, or if the
property has no filter set. */
static GtkFontPropertyFilterState
gtk_font_selection_filter_state (GtkFontSelection *fontsel,
GtkFontFilterType filter_type,
gint property,
gint index)
{
GtkFontFilter *filter;
gint i;
filter = &fontsel->filters[filter_type];
if (filter->property_nfilters[property] == 0)
return NOT_SET;
for (i = 0; i < filter->property_nfilters[property]; i++)
{
if (filter->property_filters[property][i] == index)
return FILTERED;
}
return NOT_FILTERED;
1998-06-15 23:29:27 +00:00
}
#if GDK_WINDOWING == GDK_WINDOWING_WIN32
static gint num_fonts;
static gint font_names_size;
static gchar **xfontnames;
static HDC hdc;
static char *
logfont_to_xlfd (const LOGFONT *lfp,
int size,
int res,
int avg_width)
{
const gchar *weight;
const gchar *registry, *encoding;
int point_size;
static int logpixelsy = 0;
gchar facename[LF_FACESIZE*3];
gchar *p, *q;
if (logpixelsy == 0)
{
HDC hdc = GetDC (NULL);
logpixelsy = GetDeviceCaps (hdc, LOGPIXELSY);
ReleaseDC (NULL, hdc);
}
if (lfp->lfWeight >= FW_HEAVY)
weight = "heavy";
else if (lfp->lfWeight >= FW_EXTRABOLD)
weight = "extrabold";
else if (lfp->lfWeight >= FW_BOLD)
weight = "bold";
else if (lfp->lfWeight >= FW_DEMIBOLD)
weight = "demibold";
else if (lfp->lfWeight >= FW_MEDIUM)
weight = "medium";
else if (lfp->lfWeight >= FW_NORMAL)
weight = "normal";
else if (lfp->lfWeight >= FW_LIGHT)
weight = "light";
else if (lfp->lfWeight >= FW_EXTRALIGHT)
weight = "extralight";
else if (lfp->lfWeight >= FW_THIN)
weight = "thin";
else
weight = "regular";
if (lfp->lfCharSet == ANSI_CHARSET)
{
registry = "iso8859";
encoding = "1";
}
else
{
registry = "windows";
if (lfp->lfCharSet == DEFAULT_CHARSET)
encoding = "default";
else if (lfp->lfCharSet == SYMBOL_CHARSET)
encoding = "symbol";
else if (lfp->lfCharSet == SHIFTJIS_CHARSET)
encoding = "shiftjis";
else if (lfp->lfCharSet == GB2312_CHARSET)
encoding = "gb2312";
else if (lfp->lfCharSet == HANGEUL_CHARSET)
encoding = "hangeul";
else if (lfp->lfCharSet == CHINESEBIG5_CHARSET)
encoding = "chinesebig5";
else if (lfp->lfCharSet == OEM_CHARSET)
encoding = "oem";
else if (lfp->lfCharSet == JOHAB_CHARSET)
encoding = "johab";
else if (lfp->lfCharSet == HEBREW_CHARSET)
encoding = "hebrew";
else if (lfp->lfCharSet == ARABIC_CHARSET)
encoding = "arabic";
else if (lfp->lfCharSet == GREEK_CHARSET)
encoding = "greek";
else if (lfp->lfCharSet == TURKISH_CHARSET)
encoding = "turkish";
else if (lfp->lfCharSet == THAI_CHARSET)
encoding = "thai";
else if (lfp->lfCharSet == EASTEUROPE_CHARSET)
encoding = "easteurope";
else if (lfp->lfCharSet == RUSSIAN_CHARSET)
encoding = "russian";
else if (lfp->lfCharSet == MAC_CHARSET)
encoding = "mac";
else if (lfp->lfCharSet == BALTIC_CHARSET)
encoding = "baltic";
else
encoding = "unknown";
}
point_size = (int) (((double) size/logpixelsy) * 720.);
if (res == -1)
res = logpixelsy;
/* Replace illegal characters with hex escapes. */
p = facename;
q = lfp->lfFaceName;
while (*q)
{
if (*q == '-' || *q == '*' || *q == '?' || *q == '%')
p += sprintf (p, "%%%.02x", *q);
else
*p++ = *q;
q++;
}
*p = '\0';
return g_strdup_printf
("-%s-%s-%s-%s-%s-%s-%d-%d-%d-%d-%s-%d-%s-%s",
"unknown",
facename,
weight,
(lfp->lfItalic ?
((lfp->lfPitchAndFamily & 0xF0) == FF_ROMAN
|| (lfp->lfPitchAndFamily & 0xF0) == FF_SCRIPT ?
"i" : "o") : "r"),
"normal",
"",
size,
point_size,
res,
res,
((lfp->lfPitchAndFamily & 0x03) == FIXED_PITCH ? "m" : "p"),
avg_width,
registry, encoding);
}
int CALLBACK
InnerEnumFontFamExProc (const LOGFONT *lfp,
const TEXTMETRIC *metrics,
DWORD fontType,
LPARAM lParam)
{
int size;
if (fontType == TRUETYPE_FONTTYPE)
{
size = 0;
}
else
{
size = lfp->lfHeight;
}
num_fonts++;
if (num_fonts == font_names_size)
{
font_names_size *= 2;
xfontnames = g_realloc (xfontnames, font_names_size * sizeof (gchar *));
}
xfontnames[num_fonts-1] =
logfont_to_xlfd (lfp, size, 0, 0);
return 1;
}
int CALLBACK
EnumFontFamExProc (const LOGFONT *lfp,
const TEXTMETRIC *metrics,
DWORD fontType,
LPARAM lParam)
{
if (fontType == TRUETYPE_FONTTYPE)
{
LOGFONT lf = *lfp;
lf.lfPitchAndFamily = 0;
EnumFontFamiliesEx (hdc, &lf, InnerEnumFontFamExProc, 0, 0);
}
else
InnerEnumFontFamExProc (lfp, metrics, fontType, lParam);
return 1;
}
#endif
1998-06-15 23:29:27 +00:00
/*****************************************************************************
* These functions all deal with creating the main class arrays containing
* the data about all available fonts.
*****************************************************************************/
static void
gtk_font_selection_get_fonts (void)
1998-06-15 23:29:27 +00:00
{
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
gchar **xfontnames;
gint num_fonts;
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
LOGFONT logfont;
#endif
1998-06-15 23:29:27 +00:00
GSList **fontnames;
gchar *fontname;
GSList * temp_list;
gint i, prop, style, size;
gint npixel_sizes = 0, npoint_sizes = 0;
FontInfo *font;
FontStyle *current_style, *prev_style, *tmp_style;
gboolean matched_style, found_size;
gint pixels, points, res_x, res_y;
gchar field_buffer[XLFD_MAX_FIELD_LEN];
gchar *field;
guint8 flags;
guint16 *pixel_sizes, *point_sizes, *tmp_sizes;
fontsel_info = g_new (GtkFontSelInfo, 1);
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
/* Get a maximum of MAX_FONTS fontnames from the X server.
Use "-*" as the pattern rather than "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" since
the latter may result in fonts being returned which don't actually exist.
xlsfonts also uses "*" so I think it's OK. "-*" gets rid of aliases. */
xfontnames = XListFonts (GDK_DISPLAY(), "-*", MAX_FONTS, &num_fonts);
/* Output a warning if we actually get MAX_FONTS fonts. */
if (num_fonts == MAX_FONTS)
g_warning(_("MAX_FONTS exceeded. Some fonts may be missing."));
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
num_fonts = 0;
hdc = GetDC (NULL);
font_names_size = 100;
xfontnames = g_new (gchar *, font_names_size);
logfont.lfCharSet = DEFAULT_CHARSET;
logfont.lfFaceName[0] = '\0';
logfont.lfPitchAndFamily = 0;
EnumFontFamiliesEx (hdc, &logfont, EnumFontFamExProc, 0, 0);
ReleaseDC (NULL, hdc);
#endif
1998-06-15 23:29:27 +00:00
/* The maximum size of all these tables is the number of font names
returned. We realloc them later when we know exactly how many
unique entries there are. */
fontsel_info->font_info = g_new (FontInfo, num_fonts);
fontsel_info->font_styles = g_new (FontStyle, num_fonts);
fontsel_info->pixel_sizes = g_new (guint16, num_fonts);
fontsel_info->point_sizes = g_new (guint16, num_fonts);
1998-06-15 23:29:27 +00:00
fontnames = g_new (GSList*, num_fonts);
1998-06-15 23:29:27 +00:00
/* Create the initial arrays for the property value strings, though they
may be realloc'ed later. Put the wildcard '*' in the first elements. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
fontsel_info->properties[prop] = g_new(gchar*, PROPERTY_ARRAY_INCREMENT);
fontsel_info->space_allocated[prop] = PROPERTY_ARRAY_INCREMENT;
fontsel_info->nproperties[prop] = 1;
fontsel_info->properties[prop][0] = "*";
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
/* Insert the font families into the main table, sorted by family and
foundry (fonts with different foundries are placed in seaparate FontInfos.
All fontnames in each family + foundry are placed into the fontnames
array of lists. */
fontsel_info->nfonts = 0;
1998-06-15 23:29:27 +00:00
for (i = 0; i < num_fonts; i++)
{
#ifdef FONTSEL_DEBUG
g_message("%s\n", xfontnames[i]);
1998-06-15 23:29:27 +00:00
#endif
if (gtk_font_selection_is_xlfd_font_name (xfontnames[i]))
gtk_font_selection_insert_font (fontnames, &fontsel_info->nfonts, xfontnames[i]);
1998-06-15 23:29:27 +00:00
else
{
#ifdef FONTSEL_DEBUG
g_warning("Skipping invalid font: %s", xfontnames[i]);
#endif
}
}
1998-06-15 23:29:27 +00:00
/* Since many font names will be in the same FontInfo not all of the
allocated FontInfo table will be used, so we will now reallocate it
with the real size. */
fontsel_info->font_info = g_realloc(fontsel_info->font_info,
sizeof(FontInfo) * fontsel_info->nfonts);
1998-06-15 23:29:27 +00:00
/* Now we work out which choices of weight/slant etc. are valid for each
font. */
fontsel_info->nstyles = 0;
current_style = fontsel_info->font_styles;
for (i = 0; i < fontsel_info->nfonts; i++)
1998-06-15 23:29:27 +00:00
{
font = &fontsel_info->font_info[i];
1998-06-15 23:29:27 +00:00
/* Use the next free position in the styles array. */
font->style_index = fontsel_info->nstyles;
1998-06-15 23:29:27 +00:00
/* Now step through each of the fontnames with this family, and create
a style for each fontname. Each style contains the index into the
weights/slants etc. arrays, and a number of pixel/point sizes. */
style = 0;
temp_list = fontnames[i];
while (temp_list)
{
fontname = temp_list->data;
temp_list = temp_list->next;
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
current_style->properties[prop]
= gtk_font_selection_insert_field (fontname, prop);
1998-06-15 23:29:27 +00:00
}
current_style->pixel_sizes_index = npixel_sizes;
current_style->npixel_sizes = 0;
1998-06-15 23:29:27 +00:00
current_style->point_sizes_index = npoint_sizes;
current_style->npoint_sizes = 0;
1998-06-15 23:29:27 +00:00
current_style->flags = 0;
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname, XLFD_PIXELS,
field_buffer);
pixels = atoi(field);
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname, XLFD_POINTS,
field_buffer);
points = atoi(field);
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname,
XLFD_RESOLUTION_X,
field_buffer);
res_x = atoi(field);
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname,
XLFD_RESOLUTION_Y,
field_buffer);
res_y = atoi(field);
1998-06-15 23:29:27 +00:00
if (pixels == 0 && points == 0)
call the base class init fucntions from all parent types upon class Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
1998-06-28 07:46:10 +00:00
{
if (res_x == 0 && res_y == 0)
flags = GTK_FONT_SCALABLE;
call the base class init fucntions from all parent types upon class Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
1998-06-28 07:46:10 +00:00
else
flags = GTK_FONT_SCALABLE_BITMAP;
call the base class init fucntions from all parent types upon class Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
1998-06-28 07:46:10 +00:00
}
1998-06-15 23:29:27 +00:00
else
flags = GTK_FONT_BITMAP;
1998-06-15 23:29:27 +00:00
/* Now we check to make sure that the style is unique. If it isn't
we forget it. */
prev_style = fontsel_info->font_styles + font->style_index;
1998-06-15 23:29:27 +00:00
matched_style = FALSE;
while (prev_style < current_style)
{
matched_style = TRUE;
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
if (prev_style->properties[prop]
!= current_style->properties[prop])
{
matched_style = FALSE;
break;
}
}
if (matched_style)
break;
prev_style++;
}
1998-06-15 23:29:27 +00:00
/* If we matched an existing style, we need to add the pixels &
point sizes to the style. If not, we insert the pixel & point
sizes into our new style. Note that we don't add sizes for
scalable fonts. */
if (matched_style)
{
prev_style->flags |= flags;
if (flags == GTK_FONT_BITMAP)
1998-06-15 23:29:27 +00:00
{
pixel_sizes = fontsel_info->pixel_sizes
1998-06-15 23:29:27 +00:00
+ prev_style->pixel_sizes_index;
found_size = FALSE;
for (size = 0; size < prev_style->npixel_sizes; size++)
{
if (pixels == *pixel_sizes)
{
found_size = TRUE;
break;
}
else if (pixels < *pixel_sizes)
break;
pixel_sizes++;
}
/* We need to move all the following pixel sizes up, and also
update the indexes of any following styles. */
if (!found_size)
{
for (tmp_sizes = fontsel_info->pixel_sizes + npixel_sizes;
1998-06-15 23:29:27 +00:00
tmp_sizes > pixel_sizes; tmp_sizes--)
*tmp_sizes = *(tmp_sizes - 1);
1998-06-15 23:29:27 +00:00
*pixel_sizes = pixels;
npixel_sizes++;
prev_style->npixel_sizes++;
1998-06-15 23:29:27 +00:00
tmp_style = prev_style + 1;
while (tmp_style < current_style)
{
tmp_style->pixel_sizes_index++;
tmp_style++;
}
}
point_sizes = fontsel_info->point_sizes
1998-06-15 23:29:27 +00:00
+ prev_style->point_sizes_index;
found_size = FALSE;
for (size = 0; size < prev_style->npoint_sizes; size++)
{
if (points == *point_sizes)
{
found_size = TRUE;
break;
}
else if (points < *point_sizes)
break;
point_sizes++;
}
/* We need to move all the following point sizes up, and also
update the indexes of any following styles. */
if (!found_size)
{
for (tmp_sizes = fontsel_info->point_sizes + npoint_sizes;
1998-06-15 23:29:27 +00:00
tmp_sizes > point_sizes; tmp_sizes--)
*tmp_sizes = *(tmp_sizes - 1);
1998-06-15 23:29:27 +00:00
*point_sizes = points;
npoint_sizes++;
prev_style->npoint_sizes++;
1998-06-15 23:29:27 +00:00
tmp_style = prev_style + 1;
while (tmp_style < current_style)
{
tmp_style->point_sizes_index++;
tmp_style++;
}
}
}
}
else
{
current_style->flags = flags;
if (flags == GTK_FONT_BITMAP)
1998-06-15 23:29:27 +00:00
{
fontsel_info->pixel_sizes[npixel_sizes++] = pixels;
1998-06-15 23:29:27 +00:00
current_style->npixel_sizes = 1;
fontsel_info->point_sizes[npoint_sizes++] = points;
1998-06-15 23:29:27 +00:00
current_style->npoint_sizes = 1;
}
style++;
fontsel_info->nstyles++;
1998-06-15 23:29:27 +00:00
current_style++;
}
}
g_slist_free(fontnames[i]);
1998-06-15 23:29:27 +00:00
/* Set nstyles to the real value, minus duplicated fontnames.
Note that we aren't using all the allocated memory if fontnames are
duplicated. */
font->nstyles = style;
}
1998-06-15 23:29:27 +00:00
/* Since some repeated styles may be skipped we won't have used all the
allocated space, so we will now reallocate it with the real size. */
fontsel_info->font_styles = g_realloc(fontsel_info->font_styles,
sizeof(FontStyle) * fontsel_info->nstyles);
fontsel_info->pixel_sizes = g_realloc(fontsel_info->pixel_sizes,
sizeof(guint16) * npixel_sizes);
fontsel_info->point_sizes = g_realloc(fontsel_info->point_sizes,
sizeof(guint16) * npoint_sizes);
1998-06-15 23:29:27 +00:00
g_free(fontnames);
#if GDK_WINDOWING == GDK_WINDOWING_X11
1998-06-15 23:29:27 +00:00
XFreeFontNames (xfontnames);
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
for (i = 0; i < num_fonts; i++)
g_free (xfontnames[i]);
g_free (xfontnames);
#endif
1998-06-15 23:29:27 +00:00
/* Debugging Output */
/* This outputs all FontInfos. */
#ifdef FONTSEL_DEBUG
g_message("\n\n Font Family Weight Slant Set Width Spacing Charset\n\n");
for (i = 0; i < fontsel_info->nfonts; i++)
1998-06-15 23:29:27 +00:00
{
FontInfo *font = &fontsel_info->font_info[i];
FontStyle *styles = fontsel_info->font_styles + font->style_index;
1998-06-15 23:29:27 +00:00
for (style = 0; style < font->nstyles; style++)
{
g_message("%5i %-16.16s ", i, font->family);
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
g_message("%-9.9s ",
fontsel_info->properties[prop][styles->properties[prop]]);
g_message("\n ");
if (styles->flags & GTK_FONT_BITMAP)
g_message("Bitmapped font ");
if (styles->flags & GTK_FONT_SCALABLE)
g_message("Scalable font ");
if (styles->flags & GTK_FONT_SCALABLE_BITMAP)
g_message("Scalable-Bitmapped font ");
g_message("\n");
1998-06-15 23:29:27 +00:00
if (styles->npixel_sizes)
{
g_message(" Pixel sizes: ");
tmp_sizes = fontsel_info->pixel_sizes + styles->pixel_sizes_index;
1998-06-15 23:29:27 +00:00
for (size = 0; size < styles->npixel_sizes; size++)
g_message("%i ", *tmp_sizes++);
g_message("\n");
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
if (styles->npoint_sizes)
{
g_message(" Point sizes: ");
tmp_sizes = fontsel_info->point_sizes + styles->point_sizes_index;
1998-06-15 23:29:27 +00:00
for (size = 0; size < styles->npoint_sizes; size++)
g_message("%i ", *tmp_sizes++);
g_message("\n");
1998-06-15 23:29:27 +00:00
}
g_message("\n");
1998-06-15 23:29:27 +00:00
styles++;
}
}
/* This outputs all available properties. */
for (prop = 0; prop < GTK_NUM_FONT_PROPERTIES; prop++)
{
g_message("Property: %s\n", xlfd_field_names[xlfd_index[prop]]);
for (i = 0; i < fontsel_info->nproperties[prop]; i++)
g_message(" %s\n", fontsel_info->properties[prop][i]);
1998-06-15 23:29:27 +00:00
}
#endif
}
/* This inserts the given fontname into the FontInfo table.
If a FontInfo already exists with the same family and foundry, then the
fontname is added to the FontInfos list of fontnames, else a new FontInfo
is created and inserted in alphabetical order in the table. */
static void
gtk_font_selection_insert_font (GSList *fontnames[],
1998-06-15 23:29:27 +00:00
gint *ntable,
gchar *fontname)
{
FontInfo *table;
FontInfo temp_info;
GSList *temp_fontname;
gchar *family;
gboolean family_exists = FALSE;
gint foundry;
gint lower, upper;
gint middle, cmp;
gchar family_buffer[XLFD_MAX_FIELD_LEN];
table = fontsel_info->font_info;
1998-06-15 23:29:27 +00:00
/* insert a fontname into a table */
family = gtk_font_selection_get_xlfd_field (fontname, XLFD_FAMILY,
family_buffer);
if (!family)
return;
foundry = gtk_font_selection_insert_field (fontname, FOUNDRY);
1998-06-15 23:29:27 +00:00
lower = 0;
if (*ntable > 0)
{
/* Do a binary search to determine if we have already encountered
* a font with this family & foundry. */
upper = *ntable;
while (lower < upper)
{
middle = (lower + upper) >> 1;
1998-06-15 23:29:27 +00:00
cmp = strcmp (family, table[middle].family);
/* If the family matches we sort by the foundry. */
if (cmp == 0)
{
family_exists = TRUE;
family = table[middle].family;
cmp = strcmp(fontsel_info->properties[FOUNDRY][foundry],
fontsel_info->properties[FOUNDRY][table[middle].foundry]);
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
if (cmp == 0)
{
fontnames[middle] = g_slist_prepend (fontnames[middle],
fontname);
return;
}
else if (cmp < 0)
upper = middle;
else
lower = middle+1;
}
}
1998-06-15 23:29:27 +00:00
/* Add another entry to the table for this new font family */
temp_info.family = family_exists ? family : g_strdup(family);
temp_info.foundry = foundry;
temp_fontname = g_slist_prepend (NULL, fontname);
1998-06-15 23:29:27 +00:00
(*ntable)++;
1998-06-15 23:29:27 +00:00
/* Quickly insert the entry into the table in sorted order
* using a modification of insertion sort and the knowledge
* that the entries proper position in the table was determined
* above in the binary search and is contained in the "lower"
* variable. */
if (*ntable > 1)
{
upper = *ntable - 1;
while (lower != upper)
{
table[upper] = table[upper-1];
fontnames[upper] = fontnames[upper-1];
upper--;
}
}
table[lower] = temp_info;
fontnames[lower] = temp_fontname;
}
/* This checks that the specified field of the given fontname is in the
appropriate properties array. If not it is added. Thus eventually we get
arrays of all possible weights/slants etc. It returns the array index. */
static gint
gtk_font_selection_insert_field (gchar *fontname,
1998-06-15 23:29:27 +00:00
gint prop)
{
gchar field_buffer[XLFD_MAX_FIELD_LEN];
gchar *field;
guint16 index;
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname, xlfd_index[prop],
field_buffer);
if (!field)
return 0;
1998-06-15 23:29:27 +00:00
/* If the field is already in the array just return its index. */
for (index = 0; index < fontsel_info->nproperties[prop]; index++)
if (!strcmp(field, fontsel_info->properties[prop][index]))
1998-06-15 23:29:27 +00:00
return index;
1998-06-15 23:29:27 +00:00
/* Make sure we have enough space to add the field. */
if (fontsel_info->nproperties[prop] == fontsel_info->space_allocated[prop])
1998-06-15 23:29:27 +00:00
{
fontsel_info->space_allocated[prop] += PROPERTY_ARRAY_INCREMENT;
fontsel_info->properties[prop] = g_realloc(fontsel_info->properties[prop],
sizeof(gchar*)
* fontsel_info->space_allocated[prop]);
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
/* Add the new field. */
index = fontsel_info->nproperties[prop];
fontsel_info->properties[prop][index] = g_strdup(field);
fontsel_info->nproperties[prop]++;
1998-06-15 23:29:27 +00:00
return index;
}
/*****************************************************************************
* These functions are the main public interface for getting/setting the font.
*****************************************************************************/
GdkFont*
gtk_font_selection_get_font (GtkFontSelection *fontsel)
{
g_return_val_if_fail (fontsel != NULL, NULL);
return fontsel->font;
}
gchar *
gtk_font_selection_get_font_name (GtkFontSelection *fontsel)
{
FontInfo *font;
gchar *family_str, *foundry_str;
gchar *property_str[GTK_NUM_STYLE_PROPERTIES];
gint prop;
1998-06-15 23:29:27 +00:00
g_return_val_if_fail (fontsel != NULL, NULL);
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
1998-06-15 23:29:27 +00:00
/* If no family has been selected return NULL. */
if (fontsel->font_index == -1)
return NULL;
font = &fontsel_info->font_info[fontsel->font_index];
1998-06-15 23:29:27 +00:00
family_str = font->family;
foundry_str = fontsel_info->properties[FOUNDRY][font->foundry];
1998-06-15 23:29:27 +00:00
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
property_str[prop]
= fontsel_info->properties[prop][fontsel->property_values[prop]];
1998-06-15 23:29:27 +00:00
if (strcmp (property_str[prop], "(nil)") == 0)
property_str[prop] = "";
}
1998-06-15 23:29:27 +00:00
return gtk_font_selection_create_xlfd (fontsel->size,
fontsel->metric,
foundry_str,
family_str,
property_str[WEIGHT],
property_str[SLANT],
property_str[SET_WIDTH],
property_str[SPACING],
property_str[CHARSET]);
}
/* This sets the current font, selecting the appropriate clist rows.
First we check the fontname is valid and try to find the font family
- i.e. the name in the main list. If we can't find that, then just return.
Next we try to set each of the properties according to the fontname.
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
Finally we select the font family & style in the clists. */
1998-06-15 23:29:27 +00:00
gboolean
gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
const gchar *fontname)
{
gchar *family, *field;
gint index, prop, size;
guint16 foundry, value;
gchar family_buffer[XLFD_MAX_FIELD_LEN];
gchar field_buffer[XLFD_MAX_FIELD_LEN];
gchar buffer[16];
1998-06-15 23:29:27 +00:00
g_return_val_if_fail (fontsel != NULL, FALSE);
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE);
g_return_val_if_fail (fontname != NULL, FALSE);
1998-06-15 23:29:27 +00:00
/* Check it is a valid fontname. */
if (!gtk_font_selection_is_xlfd_font_name(fontname))
return FALSE;
1998-06-15 23:29:27 +00:00
family = gtk_font_selection_get_xlfd_field (fontname, XLFD_FAMILY,
family_buffer);
if (!family)
return FALSE;
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname, XLFD_FOUNDRY,
field_buffer);
foundry = gtk_font_selection_field_to_index (fontsel_info->properties[FOUNDRY],
fontsel_info->nproperties[FOUNDRY],
1998-06-15 23:29:27 +00:00
field);
1998-06-15 23:29:27 +00:00
index = gtk_font_selection_find_font(fontsel, family, foundry);
if (index == -1)
return FALSE;
1998-06-15 23:29:27 +00:00
/* Convert the property fields into indices and set them. */
for (prop = 0; prop < GTK_NUM_STYLE_PROPERTIES; prop++)
{
field = gtk_font_selection_get_xlfd_field (fontname, xlfd_index[prop],
field_buffer);
value = gtk_font_selection_field_to_index (fontsel_info->properties[prop],
fontsel_info->nproperties[prop],
1998-06-15 23:29:27 +00:00
field);
fontsel->property_values[prop] = value;
}
1998-06-15 23:29:27 +00:00
field = gtk_font_selection_get_xlfd_field (fontname, XLFD_POINTS,
field_buffer);
size = atoi(field);
if (size > 0)
{
if (size < 20)
size = 20;
fontsel->size = fontsel->selected_size = size;
fontsel->metric = GTK_FONT_METRIC_POINTS;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fontsel->points_button),
1998-06-15 23:29:27 +00:00
TRUE);
if (size % 10 == 0)
sprintf (buffer, "%i", size / 10);
else
sprintf (buffer, "%i.%i", size / 10, size % 10);
}
else
{
field = gtk_font_selection_get_xlfd_field (fontname, XLFD_PIXELS,
field_buffer);
size = atoi(field);
if (size < 2)
size = 2;
fontsel->size = fontsel->selected_size = size;
fontsel->metric = GTK_FONT_METRIC_PIXELS;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fontsel->pixels_button),
1998-06-15 23:29:27 +00:00
TRUE);
sprintf (buffer, "%i", size);
}
gtk_entry_set_text (GTK_ENTRY (fontsel->size_entry), buffer);
1998-06-15 23:29:27 +00:00
/* Clear any current filter. */
gtk_font_selection_clear_filter(fontsel);
1998-06-15 23:29:27 +00:00
/* Now find the best style match. */
fontsel->font_index = index;
gtk_clist_select_row(GTK_CLIST(fontsel->font_clist), index, 0);
if (GTK_WIDGET_MAPPED (fontsel->font_clist))
gtk_clist_moveto(GTK_CLIST(fontsel->font_clist), index, -1, 0.5, 0);
1998-06-15 23:29:27 +00:00
gtk_font_selection_show_available_styles (fontsel);
/* This will load the font. */
Remove --g-fatal-warnings flag from argv. Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
1998-06-19 01:26:24 +00:00
gtk_font_selection_select_best_style (fontsel, FALSE);
1998-06-15 23:29:27 +00:00
return TRUE;
}
/* Returns the index of the given family, or -1 if not found */
static gint
gtk_font_selection_find_font (GtkFontSelection *fontsel,
gchar *family,
guint16 foundry)
{
FontInfo *font_info;
gint lower, upper, middle = -1, cmp, nfonts;
1998-12-07 20:56:46 +00:00
gint found_family = -1;
font_info = fontsel_info->font_info;
nfonts = fontsel_info->nfonts;
1998-06-15 23:29:27 +00:00
if (nfonts == 0)
return -1;
1998-06-15 23:29:27 +00:00
/* Do a binary search to find the font family. */
lower = 0;
upper = nfonts;
while (lower < upper)
{
middle = (lower + upper) >> 1;
cmp = strcmp (family, font_info[middle].family);
if (cmp == 0)
1998-12-07 20:56:46 +00:00
{
found_family = middle;
cmp = strcmp(fontsel_info->properties[FOUNDRY][foundry],
fontsel_info->properties[FOUNDRY][font_info[middle].foundry]);
}
1998-06-15 23:29:27 +00:00
if (cmp == 0)
return middle;
else if (cmp < 0)
upper = middle;
else if (cmp > 0)
lower = middle+1;
}
1998-12-07 20:56:46 +00:00
/* We couldn't find the family and foundry, but we may have just found the
family, so we return that. */
return found_family;
1998-06-15 23:29:27 +00:00
}
/* This returns the text in the preview entry. You should copy the returned
text if you need it. */
gchar*
gtk_font_selection_get_preview_text (GtkFontSelection *fontsel)
{
return gtk_entry_get_text(GTK_ENTRY(fontsel->preview_entry));
}
/* This sets the text in the preview entry. */
void
gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
const gchar *text)
{
gtk_entry_set_text(GTK_ENTRY(fontsel->preview_entry), text);
}
/*****************************************************************************
* These functions all deal with X Logical Font Description (XLFD) fontnames.
* See the freely available documentation about this.
*****************************************************************************/
/*
* Returns TRUE if the fontname is a valid XLFD.
* (It just checks if the number of dashes is 14, and that each
* field < XLFD_MAX_FIELD_LEN characters long - that's not in the XLFD but it
* makes it easier for me).
*/
static gboolean
gtk_font_selection_is_xlfd_font_name (const gchar *fontname)
{
gint i = 0;
gint field_len = 0;
1998-06-15 23:29:27 +00:00
while (*fontname)
{
if (*fontname++ == '-')
{
if (field_len > XLFD_MAX_FIELD_LEN) return FALSE;
field_len = 0;
i++;
}
else
field_len++;
}
1998-06-15 23:29:27 +00:00
return (i == 14) ? TRUE : FALSE;
}
/*
* This fills the buffer with the specified field from the X Logical Font
* Description name, and returns it. If fontname is NULL or the field is
* longer than XFLD_MAX_FIELD_LEN it returns NULL.
* Note: For the charset field, we also return the encoding, e.g. 'iso8859-1'.
*/
static gchar*
gtk_font_selection_get_xlfd_field (const gchar *fontname,
FontField field_num,
gchar *buffer)
{
const gchar *t1, *t2;
gint countdown, len, num_dashes;
1998-06-15 23:29:27 +00:00
if (!fontname)
return NULL;
1998-06-15 23:29:27 +00:00
/* we assume this is a valid fontname...that is, it has 14 fields */
1998-06-15 23:29:27 +00:00
countdown = field_num;
t1 = fontname;
while (*t1 && (countdown >= 0))
if (*t1++ == '-')
countdown--;
1998-06-15 23:29:27 +00:00
num_dashes = (field_num == XLFD_CHARSET) ? 2 : 1;
for (t2 = t1; *t2; t2++)
{
if (*t2 == '-' && --num_dashes == 0)
break;
}
1998-06-15 23:29:27 +00:00
if (t1 != t2)
{
/* Check we don't overflow the buffer */
len = (long) t2 - (long) t1;
if (len > XLFD_MAX_FIELD_LEN - 1)
return NULL;
strncpy (buffer, t1, len);
buffer[len] = 0;
/* Convert to lower case. */
g_strdown (buffer);
1998-06-15 23:29:27 +00:00
}
else
strcpy(buffer, "(nil)");
1998-06-15 23:29:27 +00:00
return buffer;
}
/*
* This returns a X Logical Font Description font name, given all the pieces.
* Note: this retval must be freed by the caller.
*/
static gchar *
gtk_font_selection_create_xlfd (gint size,
GtkFontMetricType metric,
gchar *foundry,
gchar *family,
gchar *weight,
gchar *slant,
gchar *set_width,
gchar *spacing,
gchar *charset)
{
gchar buffer[16];
gchar *pixel_size = "*", *point_size = "*", *fontname;
1998-06-15 23:29:27 +00:00
if (size <= 0)
return NULL;
1998-06-15 23:29:27 +00:00
sprintf (buffer, "%d", (int) size);
if (metric == GTK_FONT_METRIC_PIXELS)
1998-06-15 23:29:27 +00:00
pixel_size = buffer;
else
point_size = buffer;
fontname = g_strdup_printf ("-%s-%s-%s-%s-%s-*-%s-%s-*-*-%s-*-%s",
foundry, family, weight, slant,
set_width, pixel_size, point_size,
spacing, charset);
1998-06-15 23:29:27 +00:00
return fontname;
}
/*****************************************************************************
* GtkFontSelectionDialog
*****************************************************************************/
guint
gtk_font_selection_dialog_get_type (void)
1998-06-15 23:29:27 +00:00
{
static guint font_selection_dialog_type = 0;
1998-06-15 23:29:27 +00:00
if (!font_selection_dialog_type)
{
GtkTypeInfo fontsel_diag_info =
{
"GtkFontSelectionDialog",
sizeof (GtkFontSelectionDialog),
sizeof (GtkFontSelectionDialogClass),
(GtkClassInitFunc) gtk_font_selection_dialog_class_init,
(GtkObjectInitFunc) gtk_font_selection_dialog_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
call the base class init fucntions from all parent types upon class Sun Jun 28 04:29:10 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.c (gtk_type_class_init): call the base class init fucntions from all parent types upon class initialization. * gtk/gtkcontainer.c: (gtk_container_get_type): announce gtk_container_base_class_init to the type system. (gtk_container_base_class_init): new function to feature base class initialization. (gtk_container_get_child_arg): (gtk_container_set_child_arg): call the GtkContainerClass get_child_arg and set_child_arg methods of the class indicated through the argument name. * gtk/gtkobject.c: (gtk_object_base_class_init): new function to feature base class initialization. (gtk_object_init_type): announce gtk_object_base_class_init to the type system. (gtk_object_class_init): setup the get_arg and set_arg pointers for GtkObjectClass. (gtk_object_setv): (gtk_object_getv): call the GtkObjectClass get_arg and set_arg methods, instead of bothering the type system with this. * gtk/gtkaccellabel.c: * gtk/gtkbutton.c: * gtk/gtkradiobutton.c: * gtk/gtktable.c: * gtk/gtktogglebutton.c: * gtk/gtktipsquery.c: * gtk/gtkbox.c: * gtk/gtkpacker.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: * gtk/gtkframe.c: * gtk/gtkmisc.c: * gtk/gtklabel.c: set the object_class->{g|s}et_arg pointers to the corresponding gtk_*_{g|s]et_arg functions and updated the gtk_*_get_type functions wrt GtkTypeInfo initialization. changed a lot of the set/get arg functions to take a GtkObject argument. gtk/gtkadjustment.c: gtk/gtkalignment.c: gtk/gtkarrow.c: gtk/gtkaspectframe.c: gtk/gtkbbox.c: gtk/gtkbin.c: gtk/gtkcheckbutton.c: gtk/gtkcheckmenuitem.c: gtk/gtkclist.c: gtk/gtkcolorsel.c: gtk/gtkcombo.c: gtk/gtkctree.c: gtk/gtkcurve.c: gtk/gtkdata.c: gtk/gtkdialog.c: gtk/gtkdrawingarea.c: gtk/gtkeditable.c: gtk/gtkentry.c: gtk/gtkeventbox.c: gtk/gtkfilesel.c: gtk/gtkfixed.c: gtk/gtkfontsel.c: gtk/gtkgamma.c: gtk/gtkhandlebox.c: gtk/gtkhbbox.c: gtk/gtkhbox.c: gtk/gtkhpaned.c: gtk/gtkhruler.c: gtk/gtkhscale.c: gtk/gtkhscrollbar.c: gtk/gtkhseparator.c: gtk/gtkimage.c: gtk/gtkinputdialog.c: gtk/gtkitem.c: gtk/gtkitemfactory.c: gtk/gtklist.c: gtk/gtklistitem.c: gtk/gtkmenu.c: gtk/gtkmenubar.c: gtk/gtkmenuitem.c: gtk/gtkmenushell.c: gtk/gtknotebook.c: gtk/gtkoptionmenu.c: gtk/gtkpaned.c: gtk/gtkpixmap.c: gtk/gtkpreview.c: gtk/gtkprogressbar.c: gtk/gtkradiomenuitem.c: gtk/gtkrange.c: gtk/gtkruler.c: gtk/gtkscale.c: gtk/gtkscrollbar.c: gtk/gtkscrolledwindow.c: gtk/gtkseparator.c: gtk/gtkspinbutton.c: gtk/gtkstatusbar.c: gtk/gtktext.c: gtk/gtktoolbar.c: gtk/gtktooltips.c: gtk/gtktree.c: gtk/gtktreeitem.c: gtk/gtkvbbox.c: gtk/gtkvbox.c: gtk/gtkviewport.c: gtk/gtkvpaned.c: gtk/gtkvruler.c: gtk/gtkvscale.c: gtk/gtkvscrollbar.c: gtk/gtkvseparator.c: updated the GtkTypeInfo initialization code to match the modified GtkTypeInfo structure.
1998-06-28 07:46:10 +00:00
(GtkClassInitFunc) NULL,
1998-06-15 23:29:27 +00:00
};
font_selection_dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &fontsel_diag_info);
1998-06-15 23:29:27 +00:00
}
1998-06-15 23:29:27 +00:00
return font_selection_dialog_type;
}
static void
gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass)
{
GtkObjectClass *object_class;
1998-06-15 23:29:27 +00:00
object_class = (GtkObjectClass*) klass;
font_selection_dialog_parent_class = gtk_type_class (GTK_TYPE_WINDOW);
1998-06-15 23:29:27 +00:00
}
static void
gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
{
fontseldiag->dialog_width = -1;
fontseldiag->auto_resize = TRUE;
1998-06-15 23:29:27 +00:00
gtk_widget_set_events(GTK_WIDGET(fontseldiag), GDK_STRUCTURE_MASK);
gtk_signal_connect (GTK_OBJECT (fontseldiag), "configure_event",
(GtkSignalFunc) gtk_font_selection_dialog_on_configure,
fontseldiag);
changed scrolled window inheritance, it inherits from GtkBin now. Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled window inheritance, it inherits from GtkBin now. * gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for visibility of child. (gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE(). added check so a child gets only drawn if it's visible. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed gtk_widget_draw_children(). * gtk/gtkstyle.h: * gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child(). added internal function gtk_widget_reset_shapes() from gtkstyle.c. * gtk/gtkrc.h: * gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner argument, changed callers. * gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time, it will issue a warning now. * gtk/gtkcompat.h: new file to #define aliases for historic function names. * changed 8 function names for consistency and provided aliases to keep source compatibility in gtkcompat.h: (gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width (gtk_container_set_border_width): renamed from gtk_container_border_width (gtk_notebook_get_current_page): renamed from gtk_notebook_current_page (gtk_packer_configure): renamed from gtk_packer_set_child_packing (gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size (gtk_paned_set_handle_size): renamed from gtk_paned_handle_size (gtk_scale_get_value_width): renamed from gtk_scale_value_width (gtk_window_set_position): renamed from gtk_window_position * renamed a few recently added funtions for consistency: (gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label. (gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label. (gtk_progress_configure): renamed from gtk_progress_reconfigure.
1998-11-28 07:42:37 +00:00
gtk_container_set_border_width (GTK_CONTAINER (fontseldiag), 4);
1998-06-15 23:29:27 +00:00
gtk_window_set_policy(GTK_WINDOW(fontseldiag), FALSE, TRUE, TRUE);
1998-06-15 23:29:27 +00:00
fontseldiag->main_vbox = gtk_vbox_new (FALSE, 4);
gtk_widget_show (fontseldiag->main_vbox);
gtk_container_add (GTK_CONTAINER (fontseldiag), fontseldiag->main_vbox);
1998-06-15 23:29:27 +00:00
fontseldiag->fontsel = gtk_font_selection_new();
gtk_widget_show (fontseldiag->fontsel);
gtk_box_pack_start (GTK_BOX (fontseldiag->main_vbox),
fontseldiag->fontsel, TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
/* Create the action area */
fontseldiag->action_area = gtk_hbutton_box_new ();
gtk_button_box_set_layout(GTK_BUTTON_BOX(fontseldiag->action_area),
GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(fontseldiag->action_area), 5);
gtk_box_pack_start (GTK_BOX (fontseldiag->main_vbox),
fontseldiag->action_area, FALSE, FALSE, 0);
gtk_widget_show (fontseldiag->action_area);
fontseldiag->ok_button = gtk_button_new_with_label(_("OK"));
1998-06-15 23:29:27 +00:00
GTK_WIDGET_SET_FLAGS (fontseldiag->ok_button, GTK_CAN_DEFAULT);
gtk_widget_show(fontseldiag->ok_button);
gtk_box_pack_start (GTK_BOX (fontseldiag->action_area),
fontseldiag->ok_button, TRUE, TRUE, 0);
gtk_widget_grab_default (fontseldiag->ok_button);
fontseldiag->apply_button = gtk_button_new_with_label(_("Apply"));
1998-06-15 23:29:27 +00:00
GTK_WIDGET_SET_FLAGS (fontseldiag->apply_button, GTK_CAN_DEFAULT);
/*gtk_widget_show(fontseldiag->apply_button);*/
gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
fontseldiag->apply_button, TRUE, TRUE, 0);
fontseldiag->cancel_button = gtk_button_new_with_label(_("Cancel"));
1998-06-15 23:29:27 +00:00
GTK_WIDGET_SET_FLAGS (fontseldiag->cancel_button, GTK_CAN_DEFAULT);
gtk_widget_show(fontseldiag->cancel_button);
gtk_box_pack_start (GTK_BOX(fontseldiag->action_area),
fontseldiag->cancel_button, TRUE, TRUE, 0);
1998-06-15 23:29:27 +00:00
}
GtkWidget*
gtk_font_selection_dialog_new (const gchar *title)
{
GtkFontSelectionDialog *fontseldiag;
fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG);
1998-06-15 23:29:27 +00:00
gtk_window_set_title (GTK_WINDOW (fontseldiag),
title ? title : _("Font Selection"));
1998-06-15 23:29:27 +00:00
return GTK_WIDGET (fontseldiag);
}
gchar*
gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd)
{
return gtk_font_selection_get_font_name(GTK_FONT_SELECTION(fsd->fontsel));
}
GdkFont*
gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd)
{
return gtk_font_selection_get_font(GTK_FONT_SELECTION(fsd->fontsel));
}
gboolean
gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
const gchar *fontname)
{
return gtk_font_selection_set_font_name(GTK_FONT_SELECTION(fsd->fontsel),
fontname);
}
void
gtk_font_selection_dialog_set_filter (GtkFontSelectionDialog *fsd,
GtkFontFilterType filter_type,
GtkFontType font_type,
gchar **foundries,
gchar **weights,
gchar **slants,
gchar **setwidths,
gchar **spacings,
gchar **charsets)
{
gtk_font_selection_set_filter (GTK_FONT_SELECTION (fsd->fontsel),
filter_type, font_type,
foundries, weights, slants, setwidths,
spacings, charsets);
1998-06-15 23:29:27 +00:00
}
gchar*
gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd)
{
return gtk_font_selection_get_preview_text(GTK_FONT_SELECTION(fsd->fontsel));
}
void
gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text)
{
gtk_font_selection_set_preview_text(GTK_FONT_SELECTION(fsd->fontsel), text);
}
/* This turns auto-shrink off if the user resizes the width of the dialog.
It also turns it back on again if the user resizes it back to its normal
width. */
static gint
gtk_font_selection_dialog_on_configure (GtkWidget *widget,
GdkEventConfigure *event,
GtkFontSelectionDialog *fsd)
{
/* This sets the initial width. */
if (fsd->dialog_width == -1)
fsd->dialog_width = event->width;
else if (fsd->auto_resize && fsd->dialog_width != event->width)
{
fsd->auto_resize = FALSE;
gtk_window_set_policy(GTK_WINDOW(fsd), FALSE, TRUE, FALSE);
}
else if (!fsd->auto_resize && fsd->dialog_width == event->width)
{
fsd->auto_resize = TRUE;
gtk_window_set_policy(GTK_WINDOW(fsd), FALSE, TRUE, TRUE);
}
1998-06-15 23:29:27 +00:00
return FALSE;
}