diff --git a/ChangeLog b/ChangeLog index f9fe442c10..8508039a85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f9fe442c10..8508039a85 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-06-14 Alexander Larsson + + * docs/README.linux-fb: + Add some example config files that can be used with the URW fonts. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Set up the color ramps for DirectColor mode. + 2001-06-11 Havoc Pennington * Release 1.3.6 diff --git a/docs/README.linux-fb b/docs/README.linux-fb index 049e11ff0e..b704b03644 100644 --- a/docs/README.linux-fb +++ b/docs/README.linux-fb @@ -44,7 +44,7 @@ it looks in $prefix/lib/ft2fonts, and if you want to change this you must add something like: [PangoFT2] -FontPath = /usr/share/fonts/default/TrueType +FontPath = /usr/share/fonts/default/Type1:/usr/share/fonts/default/TrueType To your $prefix/etc/pango/pangorc or ~/.pangorc. @@ -53,7 +53,12 @@ This is done by creating a $prefix/etc/pango/pangoft2.aliases or ~/.pangoft2_aliases file. You can also set the name of this file using the key AliasFiles in the PangoFT2 section in pangorc. -An example of a font alias file is: +An example of a font alias file for the urw fontset is: +sans normal normal normal normal "urw gothic l" +serif normal normal normal normal "urw palladio l" +monospace normal normal normal normal "nimbus mono l" + +And one using the Windows truetype fonts is: sans normal normal normal normal "arial" serif normal normal normal normal "times new roman" monospace normal normal normal normal "courier new" diff --git a/gdk/linux-fb/gdkvisual-fb.c b/gdk/linux-fb/gdkvisual-fb.c index 4ac5d3c82d..d593d21f51 100644 --- a/gdk/linux-fb/gdkvisual-fb.c +++ b/gdk/linux-fb/gdkvisual-fb.c @@ -27,6 +27,7 @@ #include "gdkvisual.h" #include "gdkprivate-fb.h" #include "gdkinternals.h" +#include static GdkVisual *system_visual = NULL; @@ -46,10 +47,6 @@ gdk_visual_init (void) system_visual->type = GDK_VISUAL_PSEUDO_COLOR; break; case FB_VISUAL_DIRECTCOLOR: - /* TODO: Should load the colormap to ramps here, as they might be initialized to - some other garbage */ - - /* Fall through */ case FB_VISUAL_TRUECOLOR: system_visual->type = GDK_VISUAL_TRUE_COLOR; @@ -64,6 +61,35 @@ gdk_visual_init (void) system_visual->blue_prec = gdk_display->modeinfo.blue.length; system_visual->blue_shift = gdk_display->modeinfo.blue.offset; system_visual->blue_mask = ((1 << (system_visual->blue_prec)) - 1) << system_visual->blue_shift; + + if (gdk_display->sinfo.visual == FB_VISUAL_DIRECTCOLOR) + { + guint16 red[256], green[256], blue[256]; + struct fb_cmap fbc = {0,0}; + int size, i; + /* Load the colormap to ramps here, as they might be initialized to + some other garbage */ + + g_warning ("Directcolor visual, not very well tested\n"); + fbc.red = red; + fbc.green = green; + fbc.blue = blue; + + size = 1 << system_visual->red_prec; + for (i = 0; i < size; i++) + red[i] = i * 65535 / (size - 1); + + size = 1 << system_visual->green_prec; + fbc.len = size; + for (i = 0; i < size; i++) + green[i] = i * 65535 / (size - 1); + + size = 1 << system_visual->blue_prec; + for (i = 0; i < size; i++) + blue[i] = i * 65535 / (size - 1); + + ioctl (gdk_display->fb_fd, FBIOPUTCMAP, &fbc); + } break; case FB_VISUAL_STATIC_PSEUDOCOLOR: system_visual->type = GDK_VISUAL_STATIC_COLOR;