From b7118c80947350be5221122102273834c290943b Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 5 Dec 2000 09:47:13 +0000 Subject: [PATCH] Use italic instead of oblique in font aliases. 2000-12-05 Alexander Larsson * gdk/linux-fb/gdkpango-fb.c: Use italic instead of oblique in font aliases. * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for other unsupported functions. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/linux-fb/gdkpango-fb.c | 34 +++++++++++++++++----------------- gdk/linux-fb/gdkrender-fb.c | 11 ++++++++++- 9 files changed, 90 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e10b99ce7..787eedb340 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2000-12-05 Alexander Larsson + + * gdk/linux-fb/gdkpango-fb.c: + Use italic instead of oblique in font aliases. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic, + _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for + other unsupported functions. + 2000-12-04 Havoc Pennington * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c index 1d8689d187..850d6608bb 100644 --- a/gdk/linux-fb/gdkpango-fb.c +++ b/gdk/linux-fb/gdkpango-fb.c @@ -64,10 +64,10 @@ static PangoFBAlias alias_table[] = } }, { - {"Sans", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Sans", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, { - {"Arial", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, - {"URW Gothic L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Arial", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"URW Gothic L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, } }, { @@ -78,9 +78,9 @@ static PangoFBAlias alias_table[] = } }, { - {"Sans", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Sans", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, { - {"Arial", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Arial", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, {"URW Gothic L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, } }, @@ -94,10 +94,10 @@ static PangoFBAlias alias_table[] = } }, { - {"Serif", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Serif", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, { - {"Times New Roman", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, - {"URW Bookman L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Times New Roman", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"URW Bookman L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, } }, { @@ -108,10 +108,10 @@ static PangoFBAlias alias_table[] = } }, { - {"Serif", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Serif", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, { - {"Times New Roman", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, - {"URW Bookman L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Times New Roman", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"URW Bookman L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, } }, @@ -124,10 +124,10 @@ static PangoFBAlias alias_table[] = } }, { - {"Monospace", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Monospace", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, { - {"Courier New", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, - {"Courier", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Courier New", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, + {"Courier", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL}, } }, { @@ -138,10 +138,10 @@ static PangoFBAlias alias_table[] = } }, { - {"Monospace", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Monospace", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, { - {"Courier New", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, - {"Courier", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Courier New", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, + {"Courier", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL}, } }, }; diff --git a/gdk/linux-fb/gdkrender-fb.c b/gdk/linux-fb/gdkrender-fb.c index ab6610e542..b431c7d2fa 100644 --- a/gdk/linux-fb/gdkrender-fb.c +++ b/gdk/linux-fb/gdkrender-fb.c @@ -443,6 +443,15 @@ gdk_fb_fill_span_generic (GdkDrawable *drawable, spot.green = ~spot.green; spot.blue = ~spot.blue; } + else if (func == GDK_XOR) + { + (gc_private->get_color) (drawable, gc, curx, y, &spot); + spot.pixel ^= gc_private->values.foreground.pixel; + } + else if (func != GDK_COPY) + { + g_warning ("Unsupported GdkFunction %d\n", func); + } else if (ts) { int wid, hih; @@ -1165,7 +1174,7 @@ _gdk_fb_gc_calc_state (GdkGC *gc, if (!gc_private->values.clip_mask && !gc_private->values.tile && !gc_private->values.stipple && - gc_private->values.function != GDK_INVERT) + gc_private->values.function == GDK_COPY) { switch (gc_private->depth) {