From fac76f942636905932240a4327cd8d76c6360017 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 9 Dec 2002 02:02:27 +0000 Subject: [PATCH] More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) Sun Dec 8 20:32:23 2002 Owen Taylor More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) * gdk/x11/gdkcolor-x11.c (gdk_colors_free) (gdk_colormap_free_colors): Don't call XFreeColors() for private colorsmaps. * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): Fix return values to return number remaining not number allocated. * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, gdk_colormap_alloc_colors_private): Clean up some a stray initializations. --- ChangeLog | 17 +++++++++++++++++ ChangeLog.pre-2-10 | 17 +++++++++++++++++ ChangeLog.pre-2-2 | 17 +++++++++++++++++ ChangeLog.pre-2-4 | 17 +++++++++++++++++ ChangeLog.pre-2-6 | 17 +++++++++++++++++ ChangeLog.pre-2-8 | 17 +++++++++++++++++ gdk/x11/gdkcolor-x11.c | 14 ++++++-------- 7 files changed, 108 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 66fa3f7b86..0afdaeb2ea 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,20 @@ +Sun Dec 8 20:32:23 2002 Owen Taylor + + More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) + + * gdk/x11/gdkcolor-x11.c (gdk_colors_free) + (gdk_colormap_free_colors): Don't call XFreeColors() for + private colorsmaps. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable, + gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared): + Fix return values to return number remaining not number + allocated. + + * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared, + gdk_colormap_alloc_colors_private): Clean up some a stray + initializations. + Sun Dec 8 20:19:22 2002 Owen Taylor Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku) diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index 7282d6a329..5cc43e136a 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -658,7 +658,7 @@ gdk_colors_free (GdkColormap *colormap, } } - if (npixels_to_free && !private->screen->closed) + if (npixels_to_free && !private->private_val && !private->screen->closed) XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap, pixels_to_free, npixels_to_free, planes); g_free (pixels_to_free); @@ -715,7 +715,7 @@ gdk_colormap_free_colors (GdkColormap *colormap, } } - if (npixels && !private->screen->closed) + if (npixels_to_free && !private->private_val && !private->screen->closed) XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap, pixels, npixels, 0); @@ -811,7 +811,7 @@ gdk_colormap_alloc_colors_writeable (GdkColormap *colormap, else break; } - return i; + return ncolors - i; } else { @@ -832,7 +832,7 @@ gdk_colormap_alloc_colors_writeable (GdkColormap *colormap, g_free (pixels); - return status ? ncolors : 0; + return status ? 0 : ncolors; } } @@ -851,7 +851,6 @@ gdk_colormap_alloc_colors_private (GdkColormap *colormap, gint nremaining = 0; private = GDK_COLORMAP_PRIVATE_DATA (colormap); - index = -1; /* First, store the colors we have room for */ @@ -913,7 +912,7 @@ gdk_colormap_alloc_colors_private (GdkColormap *colormap, g_free (available); } - return (ncolors - nremaining); + return nremaining; } static gint @@ -930,7 +929,6 @@ gdk_colormap_alloc_colors_shared (GdkColormap *colormap, gint nfailed = 0; private = GDK_COLORMAP_PRIVATE_DATA (colormap); - index = -1; for (i=0; i