Start of redoing (vastly simplifying) for Pango. Still needs quite a bit
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of redoing (vastly simplifying) for Pango. Still needs quite a bit of work. (Size selection is currently poor. List of predefined sizes is not a good idea, since all of these sizes won't necessarily be distinct.)
This commit is contained in:
Owen Taylor
Owen Taylor
88
ChangeLog
88
ChangeLog
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -1,3 +1,89 @@
|
||||
Tue May 30 14:01:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfontsel.c (gtk_font_selection_dialog_init): Start of
|
||||
redoing (vastly simplifying) for Pango. Still needs quite
|
||||
a bit of work. (Size selection is currently poor. List of
|
||||
predefined sizes is not a good idea, since all of these
|
||||
sizes won't necessarily be distinct.)
|
||||
|
||||
Tue May 30 13:50:19 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Handle
|
||||
CODESET results for LANG=C.
|
||||
|
||||
Mon May 29 15:49:10 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkrc.[ch]: Add a 'font_name' declaration to RC
|
||||
which takes a stringized pango font description;
|
||||
ignore the older 'font' and 'fontset' declarations.
|
||||
|
||||
* gtk/gtkstyle.c gtk/gtkrc.c: Fill in the style->font
|
||||
field with a GdkFont derived via gdk_font_from_description(),
|
||||
for compatibility. (Should we just remove it entirely?
|
||||
Probably too much compatibility breakage, but people
|
||||
should be migrating to the new Pango stuff as quickly
|
||||
as possible.)
|
||||
|
||||
Mon May 29 15:47:41 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkentry.c gtk/gtkclist.c: s/pango_font_unref/g_object_unref/.
|
||||
|
||||
Mon May 29 15:44:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkcalender.c: Roughly pango-ized. Really needs
|
||||
redoing; there are some bugs in size allocation right
|
||||
now, the semi-existant distinction between header / day
|
||||
fonts was removed, but, with Pango, could actually
|
||||
be made functional in a nice way.
|
||||
|
||||
* gtk/testcalender: Move calender from examples into this
|
||||
directory as a test program. (We really need to restrcture
|
||||
testgtk into a whole directory full of tests for every
|
||||
widget or functionality group, separated into multiple .c
|
||||
files.)
|
||||
|
||||
Mon May 29 15:19:56 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (file_exists): Fix stupid typo that
|
||||
was keeping RC file from being loaded.
|
||||
|
||||
* gtk/testgtkrc gtk/testgtkrc2: Test new pango-ized
|
||||
RC file font code.
|
||||
|
||||
Mon May 29 14:31:27 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gdk/gdkfont.h gdk/x11/gdkfont-x11.c (gdk_font_from_description):
|
||||
Add function to load a GdkFont from a #PangoFontDescription.
|
||||
|
||||
Fri May 26 17:16:40 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/frame.[ch] gtkaspectframe.c: Make frame widgets able
|
||||
to have any widget for the label, use a GtkLabel widget
|
||||
to display the text. (Based partially on a patch from
|
||||
Anders Carlson.)
|
||||
|
||||
(Quite a bit of code reorganization - strip 90% of the
|
||||
guts out of gtkaspectframe and add a single virtual
|
||||
func to GtkFrameClass - compute_child_allocation.)
|
||||
|
||||
Fri May 26 13:59:03 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtklabel.[ch] (gtk_label_get_text): New function
|
||||
that returns strdup'ed string.
|
||||
|
||||
Fri May 26 12:00:02 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkctree.c gtk/gtkclist.[ch]: Pangoized.
|
||||
(Removed clist->row_center_offset field because caching
|
||||
it wasn't saving time or code, added private function
|
||||
_gtk_clist_create_cell_layout()).
|
||||
|
||||
Wed May 24 15:59:37 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkaccellabel.c: Pangoized.
|
||||
|
||||
* gtk/[hv]ruler.c: Pangoized
|
||||
|
||||
Mon May 22 19:23:59 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkfilesel.c (gtk_file_selection_init):
|
||||
@@ -24,6 +110,8 @@ Mon May 22 18:50:26 2000 Owen Taylor <otaylor@redhat.com>
|
||||
* gtk/gtktextbtree.c gtk/gtktextbuffer.c gtk/gtktextlayout.c
|
||||
gtk/gtktextview.c gtk/gtktextview.[ch]: Fix up includes.
|
||||
|
||||
* gtk/gtktextview.c: Fix structure inheritance.
|
||||
|
||||
* gtk/gtkprogressbar.c: Pangoize.
|
||||
|
||||
Mon May 22 15:47:30 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
@@ -27,4 +27,10 @@ Incompatible Changes from GTK+-1.2 to GTK+-1.4:
|
||||
position in the text instead of moving it to the location of
|
||||
the insertion/deletion.
|
||||
|
||||
|
||||
- The ->label field of GtkFrame widgets has been removed. (As part of
|
||||
a change to allow the arbitrary widgets in the title position.) The
|
||||
text can now be retrieved with the new function gtk_frame_get_text().
|
||||
|
||||
- The 'font' and 'font_set' declarations in RC files are now ignored. There
|
||||
is a new 'font_name' field that holds the string form of a Pango font
|
||||
description.
|
||||
3441
gtk/gtkfontsel.c
3441
gtk/gtkfontsel.c
File diff suppressed because it is too large
Load Diff
140
gtk/gtkfontsel.h
140
gtk/gtkfontsel.h
@@ -34,7 +34,7 @@
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtkwindow.h>
|
||||
#include <gtk/gtknotebook.h>
|
||||
#include <gtk/gtkvbox.h>
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -63,64 +63,10 @@ typedef struct _GtkFontSelectionClass GtkFontSelectionClass;
|
||||
typedef struct _GtkFontSelectionDialog GtkFontSelectionDialog;
|
||||
typedef struct _GtkFontSelectionDialogClass GtkFontSelectionDialogClass;
|
||||
|
||||
|
||||
|
||||
|
||||
/* This is the number of properties which we keep in the properties array,
|
||||
i.e. Weight, Slant, Set Width, Spacing, Charset & Foundry. */
|
||||
#define GTK_NUM_FONT_PROPERTIES 6
|
||||
|
||||
/* This is the number of properties each style has i.e. Weight, Slant,
|
||||
Set Width, Spacing & Charset. Note that Foundry is not included,
|
||||
since it is the same for all styles of the same FontInfo. */
|
||||
#define GTK_NUM_STYLE_PROPERTIES 5
|
||||
|
||||
|
||||
/* Used to determine whether we are using point or pixel sizes. */
|
||||
typedef enum
|
||||
{
|
||||
GTK_FONT_METRIC_PIXELS,
|
||||
GTK_FONT_METRIC_POINTS
|
||||
} GtkFontMetricType;
|
||||
|
||||
/* Used for determining the type of a font style, and also for setting filters.
|
||||
These can be combined if a style has bitmaps and scalable fonts available.*/
|
||||
typedef enum
|
||||
{
|
||||
GTK_FONT_BITMAP = 1 << 0,
|
||||
GTK_FONT_SCALABLE = 1 << 1,
|
||||
GTK_FONT_SCALABLE_BITMAP = 1 << 2,
|
||||
|
||||
GTK_FONT_ALL = 0x07
|
||||
} GtkFontType;
|
||||
|
||||
/* These are the two types of filter available - base and user. The base
|
||||
filter is set by the application and can't be changed by the user. */
|
||||
#define GTK_NUM_FONT_FILTERS 2
|
||||
typedef enum
|
||||
{
|
||||
GTK_FONT_FILTER_BASE,
|
||||
GTK_FONT_FILTER_USER
|
||||
} GtkFontFilterType;
|
||||
|
||||
/* These hold the arrays of current filter settings for each property.
|
||||
If nfilters is 0 then all values of the property are OK. If not the
|
||||
filters array contains the indexes of the valid property values. */
|
||||
typedef struct _GtkFontFilter GtkFontFilter;
|
||||
struct _GtkFontFilter
|
||||
{
|
||||
gint font_type;
|
||||
guint16 *property_filters[GTK_NUM_FONT_PROPERTIES];
|
||||
guint16 property_nfilters[GTK_NUM_FONT_PROPERTIES];
|
||||
};
|
||||
|
||||
|
||||
struct _GtkFontSelection
|
||||
{
|
||||
GtkNotebook notebook;
|
||||
GtkVBox parent_instance;
|
||||
|
||||
/* These are on the font page. */
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *font_label;
|
||||
GtkWidget *font_entry;
|
||||
GtkWidget *font_clist;
|
||||
@@ -132,44 +78,17 @@ struct _GtkFontSelection
|
||||
GtkWidget *points_button;
|
||||
GtkWidget *filter_button;
|
||||
GtkWidget *preview_entry;
|
||||
GtkWidget *message_label;
|
||||
|
||||
/* These are on the font info page. */
|
||||
GtkWidget *info_vbox;
|
||||
GtkWidget *info_clist;
|
||||
GtkWidget *requested_font_name;
|
||||
GtkWidget *actual_font_name;
|
||||
|
||||
/* These are on the filter page. */
|
||||
GtkWidget *filter_vbox;
|
||||
GtkWidget *type_bitmaps_button;
|
||||
GtkWidget *type_scalable_button;
|
||||
GtkWidget *type_scaled_bitmaps_button;
|
||||
GtkWidget *filter_clists[GTK_NUM_FONT_PROPERTIES];
|
||||
|
||||
GdkFont *font;
|
||||
gint font_index;
|
||||
gint style;
|
||||
GtkFontMetricType metric;
|
||||
/* The size is either in pixels or deci-points, depending on the metric. */
|
||||
gint size;
|
||||
|
||||
/* This is the last size explicitly selected. When the user selects different
|
||||
fonts we try to find the nearest size to this. */
|
||||
gint selected_size;
|
||||
|
||||
/* These are the current property settings. They are indexes into the
|
||||
strings in the GtkFontSelInfo properties array. */
|
||||
guint16 property_values[GTK_NUM_STYLE_PROPERTIES];
|
||||
|
||||
/* These are the base and user font filters. */
|
||||
GtkFontFilter filters[GTK_NUM_FONT_FILTERS];
|
||||
};
|
||||
|
||||
PangoContext *context;
|
||||
PangoFontDescription *font_desc;
|
||||
GdkFont *font; /* Cache for gdk_font_selection_get_font, so we can preserve
|
||||
* refcounting behavior
|
||||
*/
|
||||
};
|
||||
|
||||
struct _GtkFontSelectionClass
|
||||
{
|
||||
GtkNotebookClass parent_class;
|
||||
GtkVBoxClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
@@ -209,15 +128,6 @@ gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel);
|
||||
GdkFont* gtk_font_selection_get_font (GtkFontSelection *fontsel);
|
||||
gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
|
||||
const gchar *fontname);
|
||||
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);
|
||||
gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
|
||||
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
|
||||
const gchar *text);
|
||||
@@ -252,38 +162,6 @@ GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd);
|
||||
gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
|
||||
const gchar *fontname);
|
||||
|
||||
/* This sets one of the font filters, to limit the fonts shown. The filter_type
|
||||
is GTK_FONT_FILTER_BASE or GTK_FONT_FILTER_USER. The font type is a
|
||||
combination of the bit flags GTK_FONT_BITMAP, GTK_FONT_SCALABLE and
|
||||
GTK_FONT_SCALABLE_BITMAP (or GTK_FONT_ALL for all font types).
|
||||
The foundries, weights etc. are arrays of strings containing property
|
||||
values, e.g. 'bold', 'demibold', and *MUST* finish with a NULL.
|
||||
Standard long names are also accepted, e.g. 'italic' instead of 'i'.
|
||||
|
||||
e.g. to allow only fixed-width fonts ('char cell' or 'monospaced') to be
|
||||
selected use:
|
||||
|
||||
gchar *spacings[] = { "c", "m", NULL };
|
||||
gtk_font_selection_dialog_set_filter (GTK_FONT_SELECTION_DIALOG (fontsel),
|
||||
GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
|
||||
NULL, NULL, NULL, NULL, spacings, NULL);
|
||||
|
||||
to allow only true scalable fonts to be selected use:
|
||||
|
||||
gtk_font_selection_dialog_set_filter (GTK_FONT_SELECTION_DIALOG (fontsel),
|
||||
GTK_FONT_FILTER_BASE, GTK_FONT_SCALABLE,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
*/
|
||||
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);
|
||||
|
||||
/* This returns the text in the preview entry. You should copy the returned
|
||||
text if you need it. */
|
||||
gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
|
||||
|
||||
Reference in New Issue
Block a user