Better error messages.

2001-05-04  Alex Larsson  <alla@lysator.liu.se>

	* gdk/linux-fb/gdkcolor-fb.c:
	Better error messages.

	* gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
	Initialize abs_x and abs_y.

	* gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
	Correct handling of stipple offset.

	* gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
	Treat directcolor framebuffers as truecolor.

diff --git a/ChangeLog b/ChangeLog
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 28cd6d631a0e6bae2796cac752961d0996166f51..e74f7a362943530212c652c2dd0f07927daeb4c4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2001-05-04  Alex Larsson  <alla@lysator.liu.se>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Better error messages.
+
+       * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new):
+       Initialize abs_x and abs_y.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic):
+       Correct handling of stipple offset.
+
+       * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init):
+       Treat directcolor framebuffers as truecolor.
+       
 Thu May  3 14:13:49 2001  Owen Taylor  <otaylor@redhat.com>
 
         * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add

diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c
index 702c2d1e7cb771cf566acd1112d954000da22d56..e720058ca6e6ec8026d45fea3e7886a380b67c67 100644 (file)
--- a/gdk/linux-fb/gdkcolor-fb.c
+++ b/gdk/linux-fb/gdkcolor-fb.c
@@ -171,7 +171,7 @@ gdk_colormap_new (GdkVisual *visual,
       break;
 
     case GDK_VISUAL_DIRECT_COLOR:
-      g_error("NYI");
+      g_warning ("gdk_colormap_new () on a direct color visual not implemented");
 #if 0
       colormap->colors = g_new (GdkColor, colormap->size);
 
@@ -289,7 +289,7 @@ gdk_colormap_get_system (void)
            }
          break;
        case GDK_VISUAL_DIRECT_COLOR:
-         g_error("NYI");
+         g_warning ("gdk_colormap_get_system() on a direct color visual is not implemented");
          break;
        default:
          g_assert_not_reached ();

diff --git a/gdk/linux-fb/gdkpixmap-fb.c b/gdk/linux-fb/gdkpixmap-fb.c
index 4b9d3e4651a856df6dbd934a21f0f211005acbf3..a0dbcdb2f3d9570fa181deb03f9949b2899197db 100644 (file)
--- a/gdk/linux-fb/gdkpixmap-fb.c
+++ b/gdk/linux-fb/gdkpixmap-fb.c
@@ -134,6 +134,10 @@ gdk_pixmap_new (GdkWindow *window,
   private = GDK_DRAWABLE_IMPL_FBDATA (pixmap);
   private->rowstride = (width * depth + 7) / 8; /* Round up to nearest whole byte */
   private->mem = g_malloc (private->rowstride * height);
+  private->abs_x = 0;
+  private->abs_y = 0;
+  private->llim_x = 0;
+  private->llim_y = 0;
   private->lim_x = width;
   private->lim_y = height;
   private->width = width;

diff --git a/gdk/linux-fb/gdkrender-fb.c b/gdk/linux-fb/gdkrender-fb.c
index 2d4c1c68febcde0340ebd3d0259bfc5e86897a4f..20a4844f2deec9b7ed124bd514f60be931961ea9 100644 (file)
--- a/gdk/linux-fb/gdkrender-fb.c
+++ b/gdk/linux-fb/gdkrender-fb.c
@@ -420,8 +420,8 @@ gdk_fb_fill_span_generic (GdkDrawable *drawable,
           gc_private->values.stipple)
     {
       ts = gc_private->values.stipple;
-      tsxoff = GDK_DRAWABLE_FBDATA (ts)->abs_x - gc_private->values.ts_x_origin - private->abs_x;
-      tsyoff = GDK_DRAWABLE_FBDATA (ts)->abs_y - gc_private->values.ts_y_origin - private->abs_y;
+      tsxoff = - GDK_DRAWABLE_IMPL_FBDATA (ts)->abs_x - gc_private->values.ts_x_origin - private->abs_x;
+      tsyoff = - GDK_DRAWABLE_IMPL_FBDATA (ts)->abs_y - gc_private->values.ts_y_origin - private->abs_y;
       solid_stipple = (gc_private->values.fill == GDK_OPAQUE_STIPPLED);
     }
   

diff --git a/gdk/linux-fb/gdkvisual-fb.c b/gdk/linux-fb/gdkvisual-fb.c
index ea410e0358a3b0ccbfb36ee4093eff601f7a8d98..4ac5d3c82df3c292ab763ed1e0e32dddce7c5a3f 100644 (file)
--- a/gdk/linux-fb/gdkvisual-fb.c
+++ b/gdk/linux-fb/gdkvisual-fb.c
@@ -46,12 +46,12 @@ gdk_visual_init (void)
       system_visual->type = GDK_VISUAL_PSEUDO_COLOR;
       break;
     case FB_VISUAL_DIRECTCOLOR:
-      system_visual->colormap_size = 1 << gdk_display->modeinfo.bits_per_pixel;
-      system_visual->type = GDK_VISUAL_DIRECT_COLOR;
+      /* TODO: Should load the colormap to ramps here, as they might be initialized to
+        some other garbage */
+      
       /* Fall through */
     case FB_VISUAL_TRUECOLOR:
-      if (gdk_display->sinfo.visual == FB_VISUAL_TRUECOLOR)
-       system_visual->type = GDK_VISUAL_TRUE_COLOR;
+      system_visual->type = GDK_VISUAL_TRUE_COLOR;
 
       system_visual->red_prec = gdk_display->modeinfo.red.length;
       system_visual->red_shift = gdk_display->modeinfo.red.offset;