AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
74d88d870a
gtk2/gdk/gdkrgb.c

3209 lines
135 KiB
C
Raw Normal View History

Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/* For more information on GdkRgb, see http://www.levien.com/gdkrgb/
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
Raph Levien <raph@acm.org>
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
*/
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
Added notice to look in AUTHORS and ChangeLog files for a list of changes. Wed Feb 24 01:22:39 CST 1999 Shawn T. Amundson <amundson@gtk.org> * *.[ch]: Added notice to look in AUTHORS and ChangeLog files for a list of changes.
1999-02-24 07:37:18 +00:00
/*
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#include <math.h>
x Pull in string.h for various mem*() and str*() functions, in an x Pull in string.h for various mem*() and str*() functions, in an autoconf-friendly way. x
1998-12-24 19:39:00 +00:00
#if HAVE_CONFIG_H
# include <config.h>
# if STDC_HEADERS
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
# endif
#else
# include <stdio.h>
# include <stdlib.h>
#endif
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define ENABLE_GRAYSCALE
Made some config changes to make it work better both as a standalone module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized with the separate GdkRgb release.
1998-08-02 05:39:47 +00:00
#ifdef GDK_RGB_STANDALONE
/* Compiling as a standalone module (i.e. with Gtk 1.0) */
/* gtk/gtk.h is already included in gdkrgbstub.c */
#include "config.h"
#include <gdk/gdkprivate.h>
#else
/* Compiling as a part of Gtk 1.1 or later */
Merge in Win32 version: Define macro GDKVAR for declaring gdk variables * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables exported/imported from the DLL. New image type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and GDK_DRAG_PROTO_OLE2. * gdk/gdk.h: Merge in Win32 version: Two new functions, gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far declared only for the Win32 version, but could be in the X11 version as well. (Needed for a Xlib-less gdk_imlib.) gdk_color_hash should have only one parameter. Declare gdk_threads_mutex with GDKVAR. * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have just one parameter. * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes per pixel, not bits. * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): Fetch bpp (which means bits-per-pixel here) from another place on Win32. Accept also depth==32 (which we might get on Win32) with bpp==32. * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be in the backend-dependent directory, not in the common gdk directory. * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk headers.
1999-03-17 23:02:10 +00:00
#include "config.h"
#include <gdk/gdk.h>
Made some config changes to make it work better both as a standalone module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized with the separate GdkRgb release.
1998-08-02 05:39:47 +00:00
#include "gdkprivate.h"
#endif
Merge in Win32 version: Define macro GDKVAR for declaring gdk variables * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables exported/imported from the DLL. New image type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and GDK_DRAG_PROTO_OLE2. * gdk/gdk.h: Merge in Win32 version: Two new functions, gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far declared only for the Win32 version, but could be in the X11 version as well. (Needed for a Xlib-less gdk_imlib.) gdk_color_hash should have only one parameter. Declare gdk_threads_mutex with GDKVAR. * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have just one parameter. * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes per pixel, not bits. * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): Fetch bpp (which means bits-per-pixel here) from another place on Win32. Accept also depth==32 (which we might get on Win32) with bpp==32. * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be in the backend-dependent directory, not in the common gdk directory. * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk headers.
1999-03-17 23:02:10 +00:00
#include <gdk/gdkrgb.h>
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
typedef struct _GdkRgbInfo GdkRgbInfo;
typedef void (*GdkRgbConvFunc) (GdkImage *image,
gint x0, gint y0,
gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap);
/* Some of these fields should go, as they're not being used at all.
Globals should generally migrate into here - it's very likely that
we'll want to run more than one GdkRgbInfo context at the same time
(i.e. some but not all windows have privately installed
colormaps). */
struct _GdkRgbInfo
{
GdkVisual *visual;
GdkColormap *cmap;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gulong *color_pixels;
gulong *gray_pixels;
gulong *reserved_pixels;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
guint nred_shades;
guint ngreen_shades;
guint nblue_shades;
guint ngray_shades;
guint nreserved;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
guint bpp;
gint cmap_alloced;
gdouble gamma;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* Generally, the stage buffer is used to convert 32bit RGB, gray,
and indexed images into 24 bit packed RGB. */
guchar *stage_buf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
GdkRgbCmap *gray_cmap;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gboolean dith_default;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
gboolean bitmap; /* set true if in 1 bit per pixel mode */
GdkGC *own_gc;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* Convert functions */
GdkRgbConvFunc conv;
GdkRgbConvFunc conv_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
GdkRgbConvFunc conv_32;
GdkRgbConvFunc conv_32_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
GdkRgbConvFunc conv_gray;
GdkRgbConvFunc conv_gray_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
GdkRgbConvFunc conv_indexed;
GdkRgbConvFunc conv_indexed_d;
};
static gboolean gdk_rgb_install_cmap = FALSE;
static gint gdk_rgb_min_colors = 5 * 5 * 5;
static gboolean gdk_rgb_verbose = FALSE;
#define IMAGE_WIDTH 256
#define STAGE_ROWSTRIDE (IMAGE_WIDTH * 3)
#define IMAGE_HEIGHT 64
#define N_IMAGES 6
static GdkRgbInfo *image_info = NULL;
static GdkImage *static_image[N_IMAGES];
static gint static_image_idx;
static guchar *colorcube;
static guchar *colorcube_d;
static gint
gdk_rgb_cmap_fail (const char *msg, GdkColormap *cmap, gulong *pixels)
{
gulong free_pixels[256];
gint n_free;
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("%s", msg);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
n_free = 0;
for (i = 0; i < 256; i++)
if (pixels[i] < 256)
free_pixels[n_free++] = pixels[i];
if (n_free)
gdk_colors_free (cmap, free_pixels, n_free, 0);
return 0;
}
static void
gdk_rgb_make_colorcube (gulong *pixels, gint nr, gint ng, gint nb)
{
guchar rt[16], gt[16], bt[16];
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
colorcube = g_new (guchar, 4096);
for (i = 0; i < 16; i++)
{
rt[i] = ng * nb * ((i * 17 * (nr - 1) + 128) >> 8);
gt[i] = nb * ((i * 17 * (ng - 1) + 128) >> 8);
bt[i] = ((i * 17 * (nb - 1) + 128) >> 8);
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < 4096; i++)
{
colorcube[i] = pixels[rt[i >> 8] + gt[(i >> 4) & 0x0f] + bt[i & 0x0f]];
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("%03x %02x %x %x %x\n", i, colorcube[i], rt[i >> 8], gt[(i >> 4) & 0x0f], bt[i & 0x0f]);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
}
}
/* this is the colorcube suitable for dithering */
static void
gdk_rgb_make_colorcube_d (gulong *pixels, gint nr, gint ng, gint nb)
{
gint r, g, b;
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
colorcube_d = g_new (guchar, 512);
for (i = 0; i < 512; i++)
{
r = MIN (nr - 1, i >> 6);
g = MIN (ng - 1, (i >> 3) & 7);
b = MIN (nb - 1, i & 7);
colorcube_d[i] = pixels[(r * ng + g) * nb + b];
}
}
/* Try installing a color cube of the specified size.
Make the colorcube and return TRUE on success */
static gint
gdk_rgb_try_colormap (gint nr, gint ng, gint nb)
{
gint r, g, b;
gint ri, gi, bi;
gint r0, g0, b0;
GdkColormap *cmap;
GdkColor color;
gulong pixels[256];
gulong junk[256];
gint i;
gint d2;
gint colors_needed;
gint idx;
gint best[256];
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (nr * ng * nb < gdk_rgb_min_colors)
return FALSE;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (image_info->cmap_alloced)
cmap = image_info->cmap;
else
cmap = gdk_colormap_get_system ();
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
colors_needed = nr * ng * nb;
for (i = 0; i < 256; i++)
{
best[i] = 192;
pixels[i] = 256;
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifndef GAMMA
if (!gdk_rgb_install_cmap)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
/* find color cube colors that are already present */
for (i = 0; i < MIN (256, cmap->size); i++)
{
r = cmap->colors[i].red >> 8;
g = cmap->colors[i].green >> 8;
b = cmap->colors[i].blue >> 8;
ri = (r * (nr - 1) + 128) >> 8;
gi = (g * (ng - 1) + 128) >> 8;
bi = (b * (nb - 1) + 128) >> 8;
r0 = ri * 255 / (nr - 1);
g0 = gi * 255 / (ng - 1);
b0 = bi * 255 / (nb - 1);
idx = ((ri * nr) + gi) * nb + bi;
d2 = (r - r0) * (r - r0) + (g - g0) * (g - g0) + (b - b0) * (b - b0);
if (d2 < best[idx]) {
if (pixels[idx] < 256)
gdk_colors_free (cmap, pixels + idx, 1, 0);
else
colors_needed--;
color = cmap->colors[i];
if (!gdk_color_alloc (cmap, &color))
return gdk_rgb_cmap_fail ("error allocating system color\n",
cmap, pixels);
pixels[idx] = color.pixel; /* which is almost certainly i */
best[idx] = d2;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (colors_needed)
{
if (!gdk_colors_alloc (cmap, 0, NULL, 0, junk, colors_needed))
{
char tmp_str[80];
sprintf (tmp_str,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
"%d %d %d colormap failed (in gdk_colors_alloc)\n",
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
nr, ng, nb);
return gdk_rgb_cmap_fail (tmp_str, cmap, pixels);
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gdk_colors_free (cmap, junk, colors_needed, 0);
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (r = 0, i = 0; r < nr; r++)
for (g = 0; g < ng; g++)
for (b = 0; b < nb; b++, i++)
{
if (pixels[i] == 256)
{
color.red = r * 65535 / (nr - 1);
color.green = g * 65535 / (ng - 1);
color.blue = b * 65535 / (nb - 1);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef GAMMA
color.red = 65535 * pow (color.red / 65535.0, 0.5);
color.green = 65535 * pow (color.green / 65535.0, 0.5);
color.blue = 65535 * pow (color.blue / 65535.0, 0.5);
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
/* This should be a raw XAllocColor call */
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (!gdk_color_alloc (cmap, &color))
{
char tmp_str[80];
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
sprintf (tmp_str, "%d %d %d colormap failed\n",
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
nr, ng, nb);
return gdk_rgb_cmap_fail (tmp_str,
cmap, pixels);
}
pixels[i] = color.pixel;
}
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("%d: %lx\n", i, pixels[i]);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->nred_shades = nr;
image_info->ngreen_shades = ng;
image_info->nblue_shades = nb;
gdk_rgb_make_colorcube (pixels, nr, ng, nb);
gdk_rgb_make_colorcube_d (pixels, nr, ng, nb);
return TRUE;
}
/* Return TRUE on success. */
static gboolean
gdk_rgb_do_colormaps (void)
{
I submitted this patch twice to gtk-devel-list, and received no comments, I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
1998-11-30 19:07:15 +00:00
static const gint sizes[][3] = {
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
/* { 6, 7, 6 }, */
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 6, 6, 6 },
{ 6, 6, 5 },
{ 6, 6, 4 },
{ 5, 5, 5 },
{ 5, 5, 4 },
{ 4, 4, 4 },
{ 4, 4, 3 },
{ 3, 3, 3 },
{ 2, 2, 2 }
};
I submitted this patch twice to gtk-devel-list, and received no comments, I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
1998-11-30 19:07:15 +00:00
static const gint n_sizes = sizeof(sizes) / (3 * sizeof(gint));
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < n_sizes; i++)
if (gdk_rgb_try_colormap (sizes[i][0], sizes[i][1], sizes[i][2]))
return TRUE;
return FALSE;
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
/* Make a 2 x 2 x 2 colorcube */
static void
gdk_rgb_colorcube_222 (void)
{
int i;
GdkColor color;
GdkColormap *cmap;
if (image_info->cmap_alloced)
cmap = image_info->cmap;
else
cmap = gdk_colormap_get_system ();
colorcube_d = g_new (guchar, 512);
for (i = 0; i < 8; i++)
{
color.red = ((i & 4) >> 2) * 65535;
color.green = ((i & 2) >> 1) * 65535;
color.blue = (i & 1) * 65535;
gdk_color_alloc (cmap, &color);
colorcube_d[((i & 4) << 4) | ((i & 2) << 2) | (i & 1)] = color.pixel;
}
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
void
gdk_rgb_set_verbose (gboolean verbose)
{
gdk_rgb_verbose = verbose;
}
void
gdk_rgb_set_install (gboolean install)
{
gdk_rgb_install_cmap = install;
}
void
gdk_rgb_set_min_colors (gint min_colors)
{
gdk_rgb_min_colors = min_colors;
}
/* Return a "score" based on the following criteria (in hex):
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
x000 is the quality - 1 is 1bpp, 2 is 4bpp,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
4 is 8bpp,
7 is 15bpp truecolor, 8 is 16bpp truecolor,
9 is 24bpp truecolor.
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
0x00 is the speed - 1 is the normal case,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
2 means faster than normal
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
00x0 gets a point for being the system visual
000x gets a point for being pseudocolor
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
A caveat: in the 8bpp modes, being the system visual seems to be
quite important. Thus, all of the 8bpp modes should be ranked at
the same speed.
*/
static guint32
gdk_rgb_score_visual (GdkVisual *visual)
{
guint32 quality, speed, sys, pseudo;
I submitted this patch twice to gtk-devel-list, and received no comments, I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
1998-11-30 19:07:15 +00:00
static const gchar* visual_names[] =
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
"static gray",
"grayscale",
"static color",
"pseudo color",
"true color",
"direct color",
};
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
quality = 0;
speed = 1;
sys = 0;
if (visual->type == GDK_VISUAL_TRUE_COLOR ||
visual->type == GDK_VISUAL_DIRECT_COLOR)
{
if (visual->depth == 24)
{
quality = 9;
/* Should test for MSB visual here, and set speed if so. */
}
else if (visual->depth == 16)
quality = 8;
else if (visual->depth == 15)
quality = 7;
else if (visual->depth == 8)
quality = 4;
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
else if (visual->type == GDK_VISUAL_PSEUDO_COLOR ||
visual->type == GDK_VISUAL_STATIC_COLOR)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
if (visual->depth == 8)
quality = 4;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
else if (visual->depth == 4)
quality = 2;
else if (visual->depth == 1)
quality = 1;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
else if (visual->type == GDK_VISUAL_STATIC_GRAY
#ifdef ENABLE_GRAYSCALE
|| visual->type == GDK_VISUAL_GRAYSCALE
#endif
)
{
if (visual->depth == 8)
quality = 4;
else if (visual->depth == 4)
quality = 2;
else if (visual->depth == 1)
quality = 1;
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (quality == 0)
return 0;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
sys = (visual == gdk_visual_get_system ());
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
silly visual fixes * gdk/gdkrgb.c: silly visual fixes * gtk/testgtk.c: call gdk_rgb_init so color preview test actually works -Yosh
1998-08-20 20:10:52 +00:00
pseudo = (visual->type == GDK_VISUAL_PSEUDO_COLOR || visual->type == GDK_VISUAL_TRUE_COLOR);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (gdk_rgb_verbose)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("Visual 0x%x, type = %s, depth = %d, %x:%x:%x%s; score=%x\n",
(gint)(((GdkVisualPrivate *)visual)->xvisual->visualid),
visual_names[visual->type],
visual->depth,
visual->red_mask,
visual->green_mask,
visual->blue_mask,
sys ? " (system)" : "",
(quality << 12) | (speed << 8) | (sys << 4) | pseudo);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
return (quality << 12) | (speed << 8) | (sys << 4) | pseudo;
}
static void
gdk_rgb_choose_visual (void)
{
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
GList *visuals, *tmp_list;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
guint32 score, best_score;
GdkVisual *visual, *best_visual;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
visuals = gdk_list_visuals ();
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
tmp_list = visuals;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
best_visual = tmp_list->data;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
best_score = gdk_rgb_score_visual (best_visual);
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
tmp_list = tmp_list->next;
while (tmp_list)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
visual = tmp_list->data;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
score = gdk_rgb_score_visual (visual);
if (score > best_score)
{
best_score = score;
best_visual = visual;
}
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
tmp_list = tmp_list->next;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
[ Merges from gtk-1-2 ] Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version 3.77.95. Fri Sep 3 16:04:41 1999 Tim Janik <timj@gtk.org> * gtk-config.in (--version): don't echo @GTK_VERSION@, but @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@, so the AM_PATH_GTK() macros don't get confused by the -pre1. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * configure.in (REBUILD): Change check for perl5 to check explicitely for v >= 5.002. (5.001 does not work with our scripts.) Wed Aug 25 15:45:46 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $PERL for the perl version check. added --disable-rebuilds to give the user an option to completely disable any source autogeneration rules. Mon Aug 23 23:16:14 1999 Tim Janik <timj@gtk.org> * configure.in: evaluate $ac_make when checking for GNU Make. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * configure.in: figure whether we have GNU Make * docs/generation.txt: minor additions/corrections. Wed Aug 11 13:38:26 BST 1999 Tony Gale <gale@gtk.org> * docs/gtkfaq.sgml: FAQ Update July 30, 1999 Elliot Lee <sopwith@redhat.com> * configure.in: Fix autoconf warnings about cross compilation by trying to provide sane defaults for AC_TRY_RUN. Fri Jul 16 22:20:21 PDT 1999 Manish Singh <yosh@gimp.org> * ltconfig * ltmain.sh: upgrade to libtool 1.3.3 Thu Jul 8 11:30:18 1999 Owen Taylor <otaylor@redhat.com> * INSTALL: Indicate that the --with-glib= configure time flag is unsupported. Mon Jul 5 20:36:03 1999 Owen Taylor <otaylor@redhat.com> * docs/generation.txt: Added a file that gives documenation about the autogeneration process for various autogenerated files. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Jun 17 13:57:31 1999 Owen Taylor <otaylor@redhat.com> * docs/gtk_tut.sgml: Removed references to code examples in my directory on gtk.org as they should all be in the tutorial now. * docs/gtk_tut.sgml: Added sources for dial-test and scribble-xinput programs that were previously missing. Fri Jun 4 00:08:59 1999 Owen Taylor <otaylor@redhat.com> * TODO: Added entry about menu keyboard navigation, removed some finished items. Mon May 31 00:11:24 1999 Owen Taylor <otaylor@redhat.com> * acinclude.m4: Standardize on func_dgettext not func_gettext, so that the checks for dgettext actually are paid attention to. Wed May 5 10:47:54 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Add $INTLLIBS into $LIBS directly, rather than repeating the checks for gettext. * INSTALL: Added information about gettext and NLS support. * acinclude.m4 (LIBM): Check for dgettext, not just gettext. This should hopefully fix things wrt systems with old versions of GNU gettext installed. Tue Jun 29 15:59:25 1999 Owen Taylor <otaylor@redhat.com> * configure.in (LIBS): Look for libgmodule in the right location. Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * autogen.sh: add --enable-maintainer-mode * configure.in: set ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" Wed Mar 24 23:03:49 CST 1999 Shawn T. Amundson <amundson@gtk.org> * docs/gtk-config.1.in: docs/Makefile.am: configure.in: gtk-config is now generated. * docs/gtk-config.1: Removed, now generated. Thu Sep 23 17:59:59 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): grr, even if Gdk doesn't handle CreateNotify itself, still put out a debuging message for --gdk-debug=events. made the ReparentNotify debugging message more verbose. wrap xcoords translation for ConfigureEvents into an error trap, a destroy event may already be pending, and in that case, the actuall coordinate values are not at all critical. Sat Sep 18 22:24:15 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcc.c: Stop leaking the color_hash all over the place. Simplify and improve the logic. Fri Sep 17 09:57:15 1999 Tim Janik <timj@gtk.org> * gdk/gdk.h, gdk/gdkcolor.c: make return types (gint or gboolean) for prototypes and function implementations consistent (reported by Tomas Ogren). Tue Sep 14 18:23:01 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): tell if expose events have send_event set in debugging output. (gdk_compress_exposures): default initialize the event so we don't operate on bogus values (namely send_event). Thu Sep 2 16:33:59 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: When we receive an unexpected destroy notify on one of our windows, don't just warn about it, also mark our windows as destroyed. Sun Sep 5 08:10:53 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_font_hash_insert): Add name => font and name => fontset hashes. The name => fontset hash is a _big_ win since we weren't previously caching fontsets at all and loading fontsets is expensive. The name => font hash is less of a win, but it does save us from doing repeated XQueryFont calls on the same font. * gdk/gdkprivate.h (struct _GdkFontPrivate): Add a names list so we can remove font/fontset from hash. Thu Sep 2 19:02:37 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Remove useless and slightly confusing test. [ XInternAtom (,,TRUE) will never return None ]. Sat Sep 4 08:39:26 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints) gdk/gdkwindow.c (gdk_window_set_hints): Don't omit setting the properties if flags == 0 - there may be an existing set of properties there already. (Very old bug. Would it be better to delete the property instead?) * gdk/gdkselection.c (gdk_selection_property_get): Fix spelling error in comment. Wed Sep 1 14:05:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Use gdk_error_trap_push() to avoid stomping over gdk_error_warnings. * gdk/gdkimage.c (gdk_image_new): compute image->bpp as (bits_per_pixel + 7) / 8. This gives the same result as before for multiples of 8, but actually a "reasonable" value for 1bit or 4bit displays. Mon Aug 23 19:11:17 1999 Tim Janik <timj@gtk.org> * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. Tue Aug 17 07:43:04 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): give a debugging note when discarding configure events. 1999-08-18 Federico Mena Quintero <federico@redhat.com> * gdk/gdkpixmap.c (gdk_pixmap_unref): g_return_if_fail() the refcount is greater than zero. * gdk/gdkwindow.c (gdk_window_unref): Likewise. * gdk/gdkfont.c (gdk_font_unref): Likewise. * gdk/gdkgc.c (gdk_gc_unref): Likewise. * gdk/gdkdnd.c (gdk_drag_context_unref): Likewise. Wed Aug 11 01:04:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_property_get): Fix assumption that format 32 => sizeof(item) == 4. It really is sizeof(long). Tue Jun 29 23:02:42 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_x_error / gdk_x_io_error): Don't core dump at all on X IO errors, only core dump if --enable-debug for X errors. Thu Jun 24 17:06:23 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): removed old ""Got event for unknown window:" message. disabled ConfigureNotify discarding code, because it led to events being processed out of order. Thu Jun 24 12:22:02 1999 Tim Janik <timj@gtk.org> * gdk/gdkglobals.c: preinitialize gdk_error_code to 0. * gdk/gdkevents.c (gdk_event_send_client_message_to_all_recurse): since we export this function, supress error warnings and don't reset the error code in the first half of this function. * gdk/gdk.c (gdk_x_error): set gdk_error_code to the actuall X error code (instead of just -1) so gdk_error_trap_pop() reveals something actually informative about the error that happened. * gdk/*.c: don't rely on gdk_error_code being -1 if an error occoured, but just gdk_error_code != 0. Thu Jun 24 11:50:07 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_apply_filters): advance the filter list pointer *before* invoking the filter function, so we at least don't crash if a filter is removed that is currently executed. window filters *really* need to be made truely reentrant at some point. Mon Jun 14 11:10:15 1999 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_translate): print the atom name in the PropertyNotify debug messages. Wed May 5 22:51:06 1999 Owen Taylor <otaylor@redhat.com> Patch from Sung-Hyun Nam <namsh@lgic.co.kr> * gdk/gdkim.c: Fix cut-and-paste errors for x/y and PreeditAttributes/StatusAttributes. Wed May 5 22:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Change G_MAXINT to 2^16 to alleviate overflow problems in various window managers. Wed Apr 21 00:42:08 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkfont.c (gdk_text_measure): Fix the return value for fontsets. Wed May 5 12:42:01 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_set_geometry_hints): Initialize size_hints.x and size_hints.y because kwm brokenly pays attention to them. (Bug #1181 - Lars Heete <hel@admin.de>) Wed May 5 11:38:56 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkrgb.c (gdk_rgb_choose_visual): Free the return value of gdk_list_visuals(). (Bug #1193 - Morten Welinder <terra@diku.dk>) Tue May 4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkim.c (gdk_im_real_open): cast the return value of XSetIMValues to (void *) when comparing to NULL, to workaround the problem of some compilers barfing since older X headers don't have the prototype for it. Mon Apr 19 10:11:12 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_colormap_new): Fix memory leak for pseudocolor where colormap->colors was double allocated. * gdk/gdkcolor.c (gdk_colormap_alloc1): Store the color value in the hash table with the pixel filled in so when we do later hash table lookups, the color value is correct. Sun May 2 15:29:45 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdkdraw.c (gdk_draw_lines): check private->destroyed before making the call Tue Apr 27 11:17:35 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (xdnd_set_{targets,actions}): Fix leak pointed out by Morten Welinder <terra@diku.dk>. Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com> * gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the default filter from the list Fri Apr 16 20:41:43 PDT 1999 Manish Singh <yosh@gimp.org> * gdk/gdk.c: #include "gdkkeysyms.h" for gdk_XConvertCase #defines * gtk/gtkfontsel.c (gtk_font_selection_create_xlfd): use g_strdup_printf instead of calcing the length separately Tue Apr 13 02:49:33 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c: removed some silly #ifdef HAVE_CONFIG that we don't do in many other places. (Fixing duplicate #include of config.h) * gdk/gdkevents.c: include gdkinput.h _after_ config.h. Otherwise, #ifndef XINPUT_NONE check in the latter doesn't work. (Bug #546) Sun Apr 11 14:38:03 1999 Tim Janik <timj@gtk.org> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): check for color "None" case insensitive. Tue Apr 6 16:38:51 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkselection.c: Add error traps so if the other end of the connection dies, we survive. Tue Apr 6 12:24:21 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (gdk_drag_motion): Separate out the dest_xid field into two fields - one for the window to send in messages, one to indicate the last looked up window for caching purposes. This is needed, so that Leave messages get the correct window. Mon Apr 5 13:21:30 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_event_check, gdk_event_prepare): Fix warning created by people mucking around with the gsource API. * gdk/gdkevents.c (gdk_io_invoke, gdk_input_add_full): Change mapping between GIOCondition and GdkInputCondition to match the way the Linux kernel does it. This should fix problems where closed pipes were no longer signalling GDK_INPUT_READ on systems with a native poll(). Mon Apr 5 17:11:57 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkpixmap.c (_gdk_pixmap_create_from_xpm): Check explicitly for the string "None" - it is in the XPM spec and some servers treat unknown colors in odd ways (like asking the user!) Thu Apr 1 16:58:10 PST 1999 Manish Singh <yosh@gimp.org> * gdk/gdkevents.c: made "->" into a "." of previous change so it compiles Thu Apr 1 18:41:25 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkevents.c (gdk_compress_exposures): Set the window field of the event structure before calling user filters. 1999-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> * gdk/gdk.c (gdk_init_check): Use False as the last argument to XInternAtom() here. This is a particularly Old And Nasty(tm) bug. Mon Mar 29 17:31:52 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_mbstowcs): Free the value of the intermediate text property - prevents major memory leak when gdk_use_mb. gtk-d3august-990311-0: Bj|rn Augustsson <d3august@dtek.chalmers.se> Mon Mar 29 17:02:58 1999 Owen Taylor <otaylor@redhat.com> Patches from Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp> gtk-a-higuti-990322-[0-3] * gdk/gdkfont.c (gdk_text_extents_wc): Make work when sizeof(wchar_t) != sizeof (GdkWChar) * configure.in: Fix confusion between GTK_LOCALE_[C]FLAGS that was causing -DX_LOCALE not to work. * gtk/gtkrc.c (gtk_rc_init): X_LOCALE will never have LC_MESSAGES defined * gdk/gdk.c (gdk_init_check): Remove --xim-preedit and --xim-status from argv properly. * gdk/gdkim.c (gdk_ic_real_new): Add a gdk_flush() so that the client window is present on the X server before we pass it to the input method. Tue Mar 9 10:46:49 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkdnd.c (motif_find_drag_window): Fix bug where if --display is specified on the command line, than the drag window will not be created on that display. Tue Mar 9 10:38:24 1999 Owen Taylor <otaylor@redhat.com> * gdk/gdkproperty.c (gdk_atom_intern): Fixed bug where lookups with only_if_exists == TRUE were inserting bogus values into the atom cache. Wed Mar 17 09:00:00 1999 Tim Janik <timj@gtk.org> * gdk/gdkselection.c (gdk_selection_property_get): first XFree(t), then reset it to NULL. * gdk/gdkcolor.c: (gdk_colors_free): (gdk_colormap_free_colors): use colormap->colors[in_pixels[i]] as the key for g_hash_table_remove() in both functions, this prevents us from accessing possibly uninitialized portions of a GdkColor structure where we are only interested in its pixel value. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. 1999-09-21 Tor Lillqvist <tml@iki.fi>
1999-09-28 20:19:13 +00:00
g_list_free (visuals);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->visual = best_visual;
}
static void gdk_rgb_select_conv (GdkImage *image);
static void
gdk_rgb_set_gray_cmap (GdkColormap *cmap)
{
gint i;
GdkColor color;
gint status;
gulong pixels[256];
gint r, g, b, gray;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < 256; i++)
{
color.pixel = i;
color.red = i * 257;
color.green = i * 257;
color.blue = i * 257;
status = gdk_color_alloc (cmap, &color);
pixels[i] = color.pixel;
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("allocating pixel %d, %x %x %x, result %d\n",
color.pixel, color.red, color.green, color.blue, status);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* Now, we make fake colorcubes - we ultimately just use the pseudocolor
methods. */
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
colorcube = g_new (guchar, 4096);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < 4096; i++)
{
r = (i >> 4) & 0xf0;
r = r | r >> 4;
g = i & 0xf0;
g = g | g >> 4;
b = (i << 4 & 0xf0);
b = b | b >> 4;
gray = (g + ((r + b) >> 1)) >> 1;
colorcube[i] = pixels[gray];
}
}
void
gdk_rgb_init (void)
{
gint i;
I submitted this patch twice to gtk-devel-list, and received no comments, I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
1998-11-30 19:07:15 +00:00
static const gint byte_order[1] = { 1 };
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* check endian sanity */
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_BIG_ENDIAN
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (((char *)byte_order)[0] == 1)
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
g_error ("gdk_rgb_init: compiled for big endian, but this is a little endian machine.\n\n");
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#else
if (((char *)byte_order)[0] != 1)
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
g_error ("gdk_rgb_init: compiled for little endian, but this is a big endian machine.\n\n");
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (image_info == NULL)
{
image_info = g_new0 (GdkRgbInfo, 1);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->visual = NULL;
image_info->cmap = NULL;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->color_pixels = NULL;
image_info->gray_pixels = NULL;
image_info->reserved_pixels = NULL;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->nred_shades = 6;
image_info->ngreen_shades = 6;
image_info->nblue_shades = 4;
image_info->ngray_shades = 24;
image_info->nreserved = 0;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->bpp = 0;
image_info->cmap_alloced = FALSE;
image_info->gamma = 1.0;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->stage_buf = NULL;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->own_gc = NULL;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gdk_rgb_choose_visual ();
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
if ((image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
image_info->visual->type == GDK_VISUAL_STATIC_COLOR) &&
image_info->visual->depth < 8 &&
image_info->visual->depth >= 3)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->cmap = gdk_colormap_get_system ();
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
gdk_rgb_colorcube_222 ();
}
else if (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
if (gdk_rgb_install_cmap ||
image_info->visual != gdk_visual_get_system ())
{
image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
image_info->cmap_alloced = TRUE;
}
if (!gdk_rgb_do_colormaps ())
{
image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
image_info->cmap_alloced = TRUE;
gdk_rgb_do_colormaps ();
}
if (gdk_rgb_verbose)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("color cube: %d x %d x %d\n",
image_info->nred_shades,
image_info->ngreen_shades,
image_info->nblue_shades);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (!image_info->cmap_alloced)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
image_info->cmap = gdk_colormap_get_system ();
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
#ifdef ENABLE_GRAYSCALE
else if (image_info->visual->type == GDK_VISUAL_GRAYSCALE)
{
image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
gdk_rgb_set_gray_cmap (image_info->cmap);
image_info->cmap_alloced = TRUE;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
else
{
/* Always install colormap in direct color. */
if (image_info->visual->type != GDK_VISUAL_DIRECT_COLOR &&
image_info->visual == gdk_visual_get_system ())
image_info->cmap = gdk_colormap_get_system ();
else
{
image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
image_info->cmap_alloced = TRUE;
}
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->bitmap = (image_info->visual->depth == 1);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < N_IMAGES; i++)
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
if (image_info->bitmap)
Reverted global changes of g_new to malloc(), added back in the one place Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdkimage.c (gdk_image_new): Reverted global changes of g_new to malloc(), added back in the one place where it actually mattered. #include <stdlib.h>. * gdk/gdkrgb.c: g_malloc() to malloc() as above.
1998-09-15 17:08:38 +00:00
/* Use malloc() instead of g_malloc since X will free() this mem */
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
static_image[i] = gdk_image_new_bitmap (image_info->visual,
nparams for selection_get should be 3, not 2. [ From Damon Chaplin Fri Jan 15 10:22:21 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_class_init): nparams for selection_get should be 3, not 2. [ From Damon Chaplin <damon@karuna.freeserve.co.uk> ] * gtk/gtkeventbox.c (gtk_event_box_paint): Add a paint routine so queued redraws work inside event boxes. Thu Jan 14 17:47:37 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): Only redraw character under cursor when not displaying highlighted selection. * gdk/gdkrgb.c (gdk_rgb_init): Add in a cast to gpointer to make IRIX cc happy. Thu Jan 14 12:29:50 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkcheckbutton.c (gtk_check_button_draw): Restructure the drawing code to remove a bit of duplication - and to remove a call to gtk_widget_draw_focus() that queues a redraw when an expose occurs. * gtk/gtklabel.c (gtk_label_expose): Fix up handling of ypadding. * gtk/gtknotebook.c (gtk_notebook_draw): If we redraw the whole widget, also redraw the corresponding areas of the child widget. (have_visible_child still has some problems) * gdk/gdkpixmap.c: Change some g_new's to g_new0 so that fields unused for pixmaps get initialzized sanely. * gdk/gdk.h gdk/gdkwindow.c gdk/gdkprivate.h: Add new calls gdk_window_is_visible() and gdk_window_is_viewable() and a mapped flag to the window private structure. * gtk/gtkbin.c gtk/gtkclist.c gtk/gtkfixed.c gtk/gtkitem.c gtk/gtklayout.c gtk/gtklist.c gtk/gtkmenushell.c gtk/gtknotebook.c gtk/gtkpaned.c gtk/gtktree.c gtk/gtktreeitem.c gtk/gtkviewport.c: Map windows after mapping children. * gtk/gtkwidget.c (gtk_widget_clip_rect): Handle rectangles completely clipped away correctly. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't call gtk_widget_draw if width or height is 0. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't rely on GTK_REDRAW_PENDING after we've cleared it. (This was causing draw-combining to not happen at all). * gtk/gtkbin.c gtk/gtkscale.c: Remove uneccessary calls to gtk_widget_queue_draw() when mapping.
1999-01-15 16:00:39 +00:00
(gpointer) malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
IMAGE_WIDTH, IMAGE_HEIGHT);
else
static_image[i] = gdk_image_new (GDK_IMAGE_FASTEST,
image_info->visual,
IMAGE_WIDTH, IMAGE_HEIGHT);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->bpp = static_image[0]->bpp;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gdk_rgb_select_conv (static_image[0]);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
}
/* convert an rgb value into an X pixel code */
gulong
gdk_rgb_xpixel_from_rgb (guint32 rgb)
{
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
gulong pixel = 0;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Checking in minor changes. Now synced with 0.9.0.
1998-09-11 00:11:05 +00:00
if (image_info->bitmap)
{
return ((rgb & 0xff0000) >> 16) +
((rgb & 0xff00) >> 7) +
(rgb & 0xff) > 510;
}
else if (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
pixel = colorcube[((rgb & 0xf00000) >> 12) |
((rgb & 0xf000) >> 8) |
((rgb & 0xf0) >> 4)];
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
else if (image_info->visual->depth < 8 &&
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
image_info->visual->type == GDK_VISUAL_STATIC_COLOR)
{
pixel = colorcube_d[((rgb & 0x800000) >> 17) |
((rgb & 0x8000) >> 12) |
((rgb & 0x80) >> 7)];
}
Checking in minor changes. Now synced with 0.9.0.
1998-09-11 00:11:05 +00:00
else if (image_info->visual->type == GDK_VISUAL_TRUE_COLOR ||
image_info->visual->type == GDK_VISUAL_DIRECT_COLOR)
use g_get_current_dir() instead of getcwd(). Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of getcwd(). * gdk/gdkprivate.h: * gdk/gdkglobals.c: * gdk/gdkwindow.c: * gdk/gdk.c: * gtk/gtkwindow.c: * gtk/gtkitemfactory.c: dropped gdk_progname, use g_get_prgname()/g_set_prgname() instead. * gtk/gtkselection.c: * gtk/gtkpreview.c: * gtk/gtkobject.c: * gtk/gtkmain.c: * gtk/gtktypeutils.c: indentation fixes due to g_message() use. * gdk/gdkrgb.c: exchanged occourances of g_print with g_message.
1998-08-18 16:58:09 +00:00
{
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("shift, prec: r %d %d g %d %d b %d %d\n",
image_info->visual->red_shift,
image_info->visual->red_prec,
image_info->visual->green_shift,
image_info->visual->green_prec,
image_info->visual->blue_shift,
image_info->visual->blue_prec);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
use g_get_current_dir() instead of getcwd(). Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of getcwd(). * gdk/gdkprivate.h: * gdk/gdkglobals.c: * gdk/gdkwindow.c: * gdk/gdk.c: * gtk/gtkwindow.c: * gtk/gtkitemfactory.c: dropped gdk_progname, use g_get_prgname()/g_set_prgname() instead. * gtk/gtkselection.c: * gtk/gtkpreview.c: * gtk/gtkobject.c: * gtk/gtkmain.c: * gtk/gtktypeutils.c: indentation fixes due to g_message() use. * gdk/gdkrgb.c: exchanged occourances of g_print with g_message.
1998-08-18 16:58:09 +00:00
pixel = (((((rgb & 0xff0000) >> 16) >>
(8 - image_info->visual->red_prec)) <<
image_info->visual->red_shift) +
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
((((rgb & 0xff00) >> 8) >>
use g_get_current_dir() instead of getcwd(). Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of getcwd(). * gdk/gdkprivate.h: * gdk/gdkglobals.c: * gdk/gdkwindow.c: * gdk/gdk.c: * gtk/gtkwindow.c: * gtk/gtkitemfactory.c: dropped gdk_progname, use g_get_prgname()/g_set_prgname() instead. * gtk/gtkselection.c: * gtk/gtkpreview.c: * gtk/gtkobject.c: * gtk/gtkmain.c: * gtk/gtktypeutils.c: indentation fixes due to g_message() use. * gdk/gdkrgb.c: exchanged occourances of g_print with g_message.
1998-08-18 16:58:09 +00:00
(8 - image_info->visual->green_prec)) <<
image_info->visual->green_shift) +
(((rgb & 0xff) >>
(8 - image_info->visual->blue_prec)) <<
image_info->visual->blue_shift));
}
Checking in minor changes. Now synced with 0.9.0.
1998-09-11 00:11:05 +00:00
else if (image_info->visual->type == GDK_VISUAL_STATIC_GRAY ||
image_info->visual->type == GDK_VISUAL_GRAYSCALE)
{
int gray = ((rgb & 0xff0000) >> 16) +
((rgb & 0xff00) >> 7) +
(rgb & 0xff);
return gray >> (10 - image_info->visual->depth);
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
return pixel;
}
void
gdk_rgb_gc_set_foreground (GdkGC *gc, guint32 rgb)
{
GdkColor color;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
color.pixel = gdk_rgb_xpixel_from_rgb (rgb);
gdk_gc_set_foreground (gc, &color);
}
void
gdk_rgb_gc_set_background (GdkGC *gc, guint32 rgb)
{
GdkColor color;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
color.pixel = gdk_rgb_xpixel_from_rgb (rgb);
gdk_gc_set_background (gc, &color);
}
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define HAIRY_CONVERT_8
#endif
#ifdef HAIRY_CONVERT_8
static void
gdk_rgb_convert_8 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
if (((unsigned long)obuf | (unsigned long) bp2) & 3)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
obptr[0] = colorcube[((r & 0xf0) << 4) |
(g & 0xf0) |
(b >> 4)];
obptr++;
}
}
else
{
for (x = 0; x < width - 3; x += 4)
{
guint32 r1b0g0r0;
guint32 g2r2b1g1;
guint32 b3g3r3b2;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r1b0g0r0 = ((guint32 *)bp2)[0];
g2r2b1g1 = ((guint32 *)bp2)[1];
b3g3r3b2 = ((guint32 *)bp2)[2];
((guint32 *)obptr)[0] =
colorcube[((r1b0g0r0 & 0xf0) << 4) |
((r1b0g0r0 & 0xf000) >> 8) |
((r1b0g0r0 & 0xf00000) >> 20)] |
(colorcube[((r1b0g0r0 & 0xf0000000) >> 20) |
(g2r2b1g1 & 0xf0) |
((g2r2b1g1 & 0xf000) >> 12)] << 8) |
(colorcube[((g2r2b1g1 & 0xf00000) >> 12) |
((g2r2b1g1 & 0xf0000000) >> 24) |
((b3g3r3b2 & 0xf0) >> 4)] << 16) |
(colorcube[((b3g3r3b2 & 0xf000) >> 4) |
((b3g3r3b2 & 0xf00000) >> 16) |
(b3g3r3b2 >> 28)] << 24);
bp2 += 12;
obptr += 4;
}
for (; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
obptr[0] = colorcube[((r & 0xf0) << 4) |
(g & 0xf0) |
(b >> 4)];
obptr++;
}
}
bptr += rowstride;
obuf += bpl;
}
}
#else
static void
gdk_rgb_convert_8 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
obptr[0] = colorcube[((r & 0xf0) << 4) |
(g & 0xf0) |
(b >> 4)];
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
#endif
#if 1
/* This dither table was generated by Raph Levien using patented
technology (US Patent 5,276,535). The dither table itself is in the
public domain. */
#define DM_WIDTH 128
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
#define DM_WIDTH_SHIFT 7
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define DM_HEIGHT 128
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
static const guchar DM[128][128] =
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
{ 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 },
{ 30, 57, 36, 54, 47, 34, 52, 27, 43, 4, 28, 7, 17, 36, 62, 13, 44, 7, 18, 48, 33, 21, 44, 14, 30, 47, 12, 33, 5, 55, 31, 58, 13, 30, 4, 17, 52, 10, 60, 26, 46, 0, 39, 27, 42, 22, 47, 25, 60, 32, 9, 38, 48, 17, 59, 30, 49, 18, 34, 25, 51, 19, 5, 48, 21, 8, 28, 46, 1, 32, 41, 19, 54, 47, 37, 18, 28, 11, 44, 30, 39, 56, 2, 33, 8, 42, 61, 28, 58, 8, 46, 9, 41, 4, 58, 7, 21, 48, 59, 10, 52, 14, 42, 57, 12, 25, 7, 53, 42, 24, 11, 50, 17, 59, 42, 2, 36, 60, 32, 17, 63, 29, 21, 7, 59, 32, 24, 39 },
{ 22, 8, 16, 32, 3, 25, 13, 57, 18, 45, 58, 39, 55, 20, 5, 42, 23, 34, 63, 1, 51, 10, 58, 4, 60, 23, 53, 27, 44, 21, 3, 48, 8, 50, 43, 54, 27, 32, 5, 55, 21, 58, 12, 53, 6, 36, 14, 50, 17, 29, 53, 15, 24, 52, 7, 36, 13, 42, 4, 53, 9, 35, 61, 26, 56, 32, 49, 15, 62, 23, 6, 60, 2, 31, 4, 48, 58, 38, 15, 61, 5, 25, 47, 28, 50, 15, 7, 40, 3, 32, 33, 52, 25, 50, 35, 42, 61, 3, 28, 36, 23, 63, 4, 33, 46, 62, 36, 23, 60, 6, 54, 28, 4, 37, 23, 55, 25, 8, 42, 54, 14, 6, 56, 38, 19, 52, 4, 46 },
{ 48, 53, 43, 12, 45, 63, 30, 37, 9, 34, 21, 1, 25, 47, 29, 58, 3, 54, 15, 39, 29, 17, 38, 35, 20, 43, 1, 49, 15, 59, 29, 39, 22, 35, 16, 23, 1, 47, 39, 18, 8, 44, 25, 31, 57, 19, 63, 4, 45, 3, 42, 61, 1, 31, 45, 20, 57, 29, 62, 21, 32, 41, 14, 44, 3, 39, 5, 34, 10, 43, 51, 35, 23, 52, 40, 10, 21, 1, 53, 18, 51, 43, 12, 62, 18, 54, 26, 51, 20, 57, 14, 1, 62, 16, 11, 18, 32, 39, 17, 44, 1, 48, 26, 37, 18, 2, 51, 14, 28, 45, 35, 18, 57, 13, 47, 11, 51, 20, 2, 39, 31, 47, 25, 1, 50, 11, 60, 7 },
{ 18, 28, 1, 56, 21, 10, 51, 2, 46, 54, 14, 61, 11, 50, 13, 38, 19, 31, 45, 9, 55, 24, 47, 5, 54, 9, 62, 11, 35, 8, 51, 14, 57, 6, 63, 40, 58, 14, 51, 28, 62, 34, 15, 48, 1, 41, 30, 35, 55, 21, 34, 11, 49, 37, 8, 52, 4, 23, 15, 43, 1, 58, 11, 23, 53, 16, 55, 26, 58, 18, 27, 12, 45, 14, 25, 63, 42, 33, 27, 35, 9, 31, 21, 38, 1, 44, 34, 12, 48, 38, 21, 44, 29, 47, 26, 53, 1, 46, 54, 8, 59, 29, 11, 55, 22, 41, 33, 20, 39, 1, 48, 9, 44, 32, 5, 62, 29, 44, 57, 23, 10, 58, 34, 43, 15, 37, 26, 33 },
{ 51, 38, 59, 24, 35, 42, 19, 60, 5, 32, 41, 26, 43, 33, 7, 53, 48, 11, 59, 23, 42, 2, 61, 30, 16, 40, 32, 24, 56, 41, 19, 33, 37, 26, 47, 9, 31, 22, 2, 45, 9, 54, 4, 37, 21, 52, 11, 23, 7, 57, 16, 25, 55, 18, 63, 27, 46, 39, 56, 10, 50, 37, 29, 47, 19, 63, 24, 9, 46, 2, 39, 60, 9, 57, 30, 7, 49, 11, 59, 3, 45, 57, 5, 60, 29, 22, 5, 60, 30, 9, 59, 18, 40, 6, 57, 36, 30, 12, 24, 34, 15, 40, 52, 6, 49, 9, 58, 4, 63, 12, 26, 61, 22, 53, 38, 16, 35, 14, 28, 50, 42, 17, 5, 28, 62, 20, 54, 12 },
{ 26, 6, 31, 15, 49, 6, 38, 27, 22, 49, 16, 56, 2, 62, 30, 21, 0, 36, 28, 6, 49, 32, 13, 52, 26, 50, 19, 46, 3, 26, 62, 0, 53, 12, 29, 3, 53, 41, 60, 24, 38, 13, 58, 16, 43, 9, 59, 39, 46, 28, 44, 40, 2, 33, 13, 41, 16, 6, 47, 31, 26, 17, 57, 6, 38, 0, 42, 36, 29, 52, 20, 31, 48, 0, 34, 56, 20, 36, 23, 54, 14, 41, 24, 37, 10, 55, 46, 25, 16, 45, 36, 4, 55, 23, 15, 8, 50, 62, 5, 56, 44, 20, 13, 28, 59, 31, 24, 47, 31, 52, 37, 17, 40, 0, 26, 49, 3, 60, 7, 33, 0, 61, 53, 40, 8, 45, 2, 41 },
{ 16, 63, 43, 4, 61, 24, 56, 13, 53, 8, 36, 12, 24, 41, 16, 46, 60, 26, 52, 39, 14, 57, 21, 37, 0, 45, 7, 59, 38, 17, 43, 10, 45, 20, 61, 43, 19, 11, 33, 17, 50, 32, 23, 61, 28, 49, 26, 0, 18, 51, 5, 60, 22, 58, 29, 0, 59, 34, 19, 62, 3, 52, 7, 44, 30, 59, 13, 50, 15, 62, 7, 17, 38, 22, 44, 15, 40, 4, 47, 28, 33, 17, 49, 16, 51, 40, 10, 56, 0, 53, 13, 49, 28, 38, 60, 21, 43, 19, 37, 27, 3, 51, 34, 39, 0, 45, 15, 43, 10, 21, 3, 55, 8, 33, 59, 10, 41, 18, 52, 24, 46, 20, 30, 13, 58, 22, 36, 57 },
{ 50, 34, 11, 47, 29, 17, 44, 0, 33, 63, 28, 46, 52, 5, 57, 10, 42, 18, 4, 63, 20, 8, 44, 10, 56, 34, 14, 29, 5, 54, 23, 59, 32, 49, 7, 34, 49, 27, 56, 0, 42, 7, 46, 3, 40, 6, 54, 32, 62, 13, 36, 10, 47, 8, 35, 49, 24, 51, 12, 40, 22, 35, 60, 12, 22, 51, 33, 4, 40, 25, 43, 55, 5, 54, 12, 61, 26, 51, 8, 62, 0, 53, 7, 63, 2, 32, 19, 34, 42, 24, 31, 63, 2, 10, 45, 33, 0, 48, 9, 61, 22, 47, 8, 62, 18, 56, 7, 54, 27, 57, 46, 30, 50, 19, 45, 30, 56, 36, 22, 47, 11, 38, 3, 51, 32, 48, 18, 9 },
{ 0, 21, 40, 19, 52, 9, 37, 48, 20, 40, 3, 18, 27, 38, 35, 22, 31, 56, 13, 35, 46, 28, 60, 40, 27, 18, 61, 50, 41, 30, 7, 36, 2, 25, 16, 57, 5, 15, 47, 29, 55, 19, 30, 52, 15, 34, 20, 12, 43, 30, 20, 54, 25, 44, 53, 12, 38, 5, 55, 27, 48, 15, 33, 27, 45, 8, 19, 28, 56, 11, 33, 49, 18, 36, 29, 2, 45, 16, 39, 19, 31, 43, 27, 35, 20, 52, 26, 6, 61, 11, 41, 17, 29, 51, 20, 56, 25, 32, 41, 17, 53, 31, 25, 14, 42, 23, 35, 16, 38, 6, 34, 12, 15, 62, 6, 21, 13, 1, 63, 9, 55, 27, 43, 25, 14, 4, 31, 55 },
{ 44, 29, 61, 2, 35, 58, 26, 15, 60, 10, 51, 59, 14, 55, 8, 50, 2, 44, 25, 51, 1, 33, 16, 4, 48, 36, 2, 21, 12, 57, 48, 13, 51, 55, 40, 28, 37, 62, 8, 39, 12, 63, 36, 10, 59, 24, 56, 47, 9, 50, 41, 1, 32, 17, 6, 21, 61, 30, 9, 43, 1, 54, 41, 2, 54, 37, 48, 61, 1, 46, 21, 3, 58, 24, 50, 32, 60, 10, 57, 25, 46, 12, 59, 4, 45, 13, 57, 47, 27, 39, 5, 58, 47, 14, 35, 4, 52, 13, 60, 6, 36, 10, 45, 55, 4, 50, 29, 2, 61, 50, 25, 58, 44, 24, 36, 42, 54, 28, 40, 32, 16, 56, 6, 62, 46, 39, 60, 23 },
{ 7, 48, 14, 54, 23, 40, 4, 45, 30, 22, 42, 32, 1, 44, 20, 29, 58, 8, 37, 19, 41, 54, 24, 58, 9, 53, 25, 46, 34, 16, 23, 38, 27, 11, 18, 1, 52, 21, 35, 22, 48, 5, 25, 45, 18, 38, 2, 27, 35, 4, 57, 15, 62, 39, 57, 28, 42, 16, 36, 60, 24, 18, 10, 63, 20, 5, 16, 23, 37, 14, 59, 27, 41, 8, 13, 42, 21, 35, 6, 50, 3, 38, 15, 48, 30, 39, 17, 3, 49, 14, 53, 33, 24, 7, 61, 44, 11, 39, 23, 49, 19, 58, 1, 32, 36, 12, 60, 41, 20, 13, 41, 4, 39, 1, 48, 8, 18, 51, 14, 44, 5, 37, 21, 34, 1, 26, 10, 37 },
{ 53, 36, 27, 9, 50, 12, 32, 55, 2, 57, 7, 17, 48, 34, 63, 15, 40, 26, 62, 11, 49, 6, 31, 39, 22, 42, 6, 63, 1, 39, 60, 4, 42, 61, 32, 45, 24, 44, 2, 60, 16, 41, 53, 1, 33, 61, 49, 17, 63, 23, 45, 26, 33, 3, 23, 46, 2, 50, 20, 4, 45, 34, 49, 30, 39, 58, 44, 31, 53, 34, 6, 52, 30, 47, 63, 1, 53, 22, 42, 31, 58, 23, 54, 22, 61, 8, 36, 59, 22, 35, 21, 1, 55, 40, 27, 16, 30, 54, 2, 29, 43, 16, 39, 63, 21, 46, 26, 10, 48, 32, 19, 53, 30, 56, 26, 60, 33, 4, 61, 23, 49, 59, 15, 53, 19, 58, 42, 16 },
{ 20, 5, 59, 46, 25, 62, 7, 19, 43, 25, 37, 61, 11, 24, 4, 54, 12, 52, 3, 32, 17, 61, 12, 47, 15, 55, 18, 31, 53, 28, 9, 50, 21, 6, 55, 9, 58, 14, 54, 26, 33, 7, 31, 58, 13, 21, 8, 42, 29, 6, 37, 11, 48, 52, 14, 60, 11, 39, 56, 32, 14, 58, 7, 26, 17, 4, 42, 8, 11, 47, 19, 38, 10, 17, 26, 37, 9, 55, 28, 13, 18, 40, 6, 33, 1, 43, 25, 11, 51, 7, 62, 43, 18, 37, 3, 57, 45, 9, 38, 58, 5, 52, 27, 7, 17, 53, 5, 57, 37, 2, 63, 9, 22, 15, 11, 38, 25, 45, 35, 0, 28, 10, 41, 30, 50, 8, 31, 57 },
{ 49, 33, 16, 38, 1, 42, 51, 34, 53, 14, 28, 49, 30, 56, 36, 23, 43, 20, 38, 56, 22, 45, 28, 0, 62, 35, 26, 44, 11, 19, 52, 35, 44, 15, 30, 38, 10, 31, 40, 4, 46, 50, 20, 40, 27, 44, 51, 14, 56, 53, 19, 59, 7, 29, 41, 19, 35, 25, 8, 52, 22, 44, 13, 53, 50, 32, 61, 24, 56, 25, 63, 0, 45, 57, 33, 59, 16, 46, 4, 62, 50, 11, 60, 37, 52, 19, 55, 29, 37, 46, 13, 26, 48, 10, 50, 34, 21, 63, 26, 13, 42, 33, 22, 55, 35, 28, 43, 15, 24, 51, 27, 34, 46, 49, 58, 3, 52, 9, 57, 19, 48, 55, 3, 35, 12, 45, 24, 3 },
{ 41, 11, 56, 28, 18, 31, 22, 10, 37, 6, 47, 13, 3, 41, 9, 46, 0, 48, 29, 6, 34, 10, 55, 37, 20, 8, 49, 3, 41, 59, 14, 25, 0, 63, 19, 47, 27, 51, 17, 57, 23, 10, 61, 6, 54, 3, 38, 31, 0, 22, 34, 43, 20, 55, 31, 0, 49, 63, 29, 38, 3, 62, 28, 40, 0, 22, 14, 35, 2, 48, 15, 43, 23, 14, 3, 29, 49, 20, 39, 34, 0, 44, 29, 9, 15, 47, 5, 42, 0, 31, 58, 5, 31, 61, 23, 15, 0, 47, 19, 50, 24, 3, 59, 11, 44, 0, 31, 59, 6, 42, 17, 60, 0, 39, 20, 31, 43, 17, 29, 40, 12, 25, 60, 22, 52, 15, 63, 29 },
{ 20, 52, 8, 44, 62, 4, 59, 49, 17, 63, 21, 39, 60, 18, 52, 27, 33, 59, 14, 51, 59, 43, 24, 5, 51, 30, 57, 17, 32, 5, 37, 56, 48, 34, 42, 3, 60, 5, 36, 13, 43, 37, 18, 34, 25, 12, 59, 24, 47, 36, 11, 50, 3, 38, 9, 58, 16, 5, 43, 18, 47, 10, 37, 18, 59, 46, 29, 52, 40, 12, 34, 28, 56, 36, 53, 7, 43, 8, 24, 52, 26, 17, 56, 43, 24, 32, 63, 20, 57, 16, 22, 52, 36, 8, 41, 56, 29, 32, 54, 7, 35, 57, 14, 48, 20, 62, 13, 39, 53, 29, 8, 45, 13, 29, 7, 61, 14, 54, 6, 63, 38, 32, 18, 43, 2, 39, 6, 47 },
{ 0, 58, 23, 35, 13, 46, 12, 39, 0, 31, 55, 24, 5, 35, 15, 61, 17, 5, 39, 25, 18, 2, 50, 33, 41, 13, 39, 23, 62, 46, 29, 12, 22, 8, 56, 25, 20, 49, 32, 62, 0, 56, 11, 46, 63, 42, 9, 16, 55, 5, 60, 15, 62, 26, 45, 21, 36, 51, 13, 57, 31, 24, 55, 6, 35, 9, 57, 5, 20, 60, 7, 51, 5, 19, 40, 25, 61, 32, 56, 12, 36, 48, 21, 2, 58, 12, 39, 28, 9, 50, 40, 12, 44, 18, 25, 49, 6, 38, 11, 62, 18, 46, 30, 9, 40, 25, 49, 19, 10, 36, 55, 22, 33, 52, 41, 18, 37, 27, 49, 21, 2, 46, 7, 53, 33, 61, 27, 35 },
{ 41, 31, 5, 39, 51, 26, 33, 57, 27, 41, 9, 44, 54, 29, 48, 7, 44, 36, 57, 10, 31, 63, 16, 45, 11, 60, 1, 47, 7, 20, 43, 3, 58, 36, 13, 52, 39, 7, 15, 28, 22, 48, 30, 21, 1, 29, 49, 44, 27, 17, 40, 30, 24, 42, 12, 53, 33, 7, 47, 20, 1, 42, 11, 49, 25, 43, 17, 32, 45, 27, 41, 21, 31, 62, 11, 49, 2, 15, 42, 5, 63, 7, 41, 27, 49, 6, 54, 23, 46, 34, 2, 28, 54, 3, 59, 12, 46, 17, 42, 28, 40, 1, 37, 51, 5, 55, 2, 34, 47, 16, 3, 62, 47, 5, 23, 56, 1, 44, 12, 34, 51, 16, 57, 11, 25, 17, 54, 13 },
{ 60, 26, 55, 18, 3, 60, 20, 6, 52, 15, 50, 19, 32, 11, 23, 53, 26, 21, 1, 47, 42, 27, 8, 58, 21, 27, 53, 36, 26, 54, 31, 50, 17, 30, 45, 1, 29, 59, 44, 53, 41, 4, 35, 58, 51, 19, 32, 4, 52, 34, 48, 8, 51, 5, 56, 2, 25, 61, 27, 38, 54, 27, 62, 21, 51, 1, 39, 62, 10, 50, 1, 58, 13, 47, 38, 18, 35, 54, 22, 51, 30, 19, 59, 34, 14, 32, 44, 4, 60, 15, 52, 62, 20, 43, 30, 35, 21, 60, 4, 52, 12, 24, 61, 18, 30, 42, 23, 61, 25, 50, 27, 38, 11, 59, 12, 35, 50, 30, 59, 24, 8, 42, 28, 37, 48, 9, 44, 21 },
{ 10, 47, 15, 50, 30, 43, 8, 45, 29, 2, 36, 59, 1, 58, 41, 3, 63, 31, 54, 20, 13, 55, 35, 38, 4, 44, 15, 9, 61, 2, 14, 38, 61, 10, 23, 54, 18, 12, 24, 2, 14, 55, 16, 8, 38, 14, 41, 60, 10, 23, 1, 58, 32, 17, 28, 37, 41, 15, 3, 60, 15, 33, 4, 36, 16, 59, 28, 14, 23, 55, 37, 18, 44, 28, 2, 57, 30, 10, 27, 46, 14, 38, 3, 53, 21, 61, 17, 35, 10, 41, 26, 7, 33, 9, 57, 1, 53, 37, 26, 20, 56, 48, 9, 33, 58, 16, 37, 7, 45, 1, 57, 15, 32, 26, 42, 23, 7, 20, 4, 54, 31, 62, 22, 1, 59, 30, 4, 51 },
{ 36, 2, 38, 11, 24, 36, 54, 22, 62, 47, 25, 8, 28, 45, 16, 38, 12, 43, 9, 37, 49, 3, 23, 52, 18, 30, 50, 33, 19, 42, 49, 26, 6, 40, 47, 35, 63, 38, 50, 33, 60, 26, 36, 47, 24, 57, 6, 26, 39, 63, 19, 44, 14, 46, 61, 9, 50, 30, 45, 23, 10, 50, 44, 8, 31, 54, 6, 46, 36, 4, 30, 54, 8, 52, 22, 41, 4, 60, 40, 0, 58, 24, 45, 10, 37, 1, 48, 30, 56, 17, 38, 48, 24, 47, 19, 39, 14, 8, 45, 32, 2, 34, 27, 44, 4, 52, 11, 56, 31, 21, 40, 19, 44, 51, 2, 63, 46, 58, 36, 43, 14, 5, 50, 38, 14, 56, 40, 23 },
{ 61, 46, 32, 63, 54, 1, 14, 34, 12, 40, 18, 49, 37, 10, 61, 30, 51, 24, 60, 7, 29, 40, 62, 11, 46, 58, 6, 56, 24, 10, 34, 52, 21, 59, 16, 3, 27, 5, 20, 46, 9, 40, 7, 62, 2, 30, 53, 15, 48, 10, 28, 35, 54, 6, 21, 34, 18, 55, 7, 40, 57, 19, 26, 60, 41, 13, 24, 51, 19, 61, 9, 25, 34, 15, 63, 11, 45, 17, 20, 47, 33, 8, 31, 62, 43, 26, 53, 7, 24, 59, 0, 13, 55, 4, 62, 27, 51, 31, 63, 15, 58, 7, 54, 14, 46, 22, 28, 43, 12, 63, 8, 54, 5, 17, 39, 33, 15, 10, 27, 17, 47, 34, 19, 45, 27, 12, 33, 17 },
{ 5, 28, 21, 7, 17, 48, 42, 58, 23, 4, 63, 14, 55, 21, 34, 5, 19, 0, 45, 17, 52, 15, 25, 32, 0, 22, 40, 13, 45, 62, 18, 0, 43, 11, 33, 55, 30, 42, 57, 19, 51, 31, 22, 43, 18, 45, 34, 0, 43, 31, 56, 3, 23, 40, 59, 0, 44, 13, 48, 35, 2, 32, 46, 0, 21, 48, 35, 3, 40, 32, 43, 59, 0, 48, 33, 26, 53, 36, 55, 12, 51, 16, 55, 5, 18, 29, 11, 39, 51, 19, 45, 31, 42, 21, 35, 6, 22, 47, 10, 38, 23, 50, 20, 36, 0, 60, 38, 4, 50, 35, 48, 34, 24, 57, 9, 53, 28, 48, 61, 0, 56, 24, 53, 3, 63, 6, 42, 57 },
{ 13, 53, 45, 40, 58, 27, 6, 16, 38, 51, 33, 30, 43, 2, 47, 56, 40, 50, 33, 57, 27, 5, 47, 42, 60, 36, 16, 54, 28, 4, 37, 57, 28, 51, 22, 8, 45, 14, 6, 39, 0, 54, 11, 59, 28, 12, 50, 21, 61, 13, 19, 38, 49, 11, 25, 37, 58, 29, 22, 63, 14, 56, 12, 53, 30, 63, 9, 57, 26, 12, 47, 16, 23, 39, 50, 6, 31, 2, 25, 6, 28, 41, 36, 22, 50, 57, 42, 3, 34, 8, 28, 61, 11, 50, 16, 54, 41, 0, 55, 43, 5, 29, 41, 63, 25, 16, 53, 18, 26, 10, 21, 0, 61, 30, 41, 22, 3, 38, 20, 39, 29, 8, 41, 16, 36, 52, 22, 19 },
{ 55, 34, 0, 25, 10, 32, 56, 44, 28, 0, 57, 7, 26, 53, 23, 8, 13, 35, 22, 12, 36, 60, 20, 8, 14, 29, 48, 2, 41, 49, 23, 13, 39, 7, 48, 58, 25, 53, 34, 62, 28, 16, 48, 4, 37, 56, 27, 5, 36, 52, 46, 7, 62, 33, 52, 11, 17, 53, 5, 28, 41, 24, 38, 17, 5, 39, 20, 45, 15, 56, 5, 38, 60, 8, 14, 57, 21, 48, 62, 39, 59, 13, 1, 60, 9, 32, 16, 63, 44, 25, 52, 15, 36, 2, 60, 29, 12, 33, 25, 17, 59, 45, 13, 8, 49, 32, 6, 40, 59, 29, 45, 37, 13, 47, 6, 55, 30, 45, 9, 52, 13, 59, 25, 47, 32, 1, 49, 30 },
{ 9, 39, 14, 61, 49, 37, 3, 20, 50, 13, 41, 19, 46, 17, 38, 59, 28, 62, 4, 44, 54, 1, 34, 51, 55, 7, 63, 32, 21, 8, 56, 31, 62, 19, 36, 1, 41, 17, 24, 12, 42, 35, 25, 52, 20, 8, 44, 59, 25, 2, 22, 42, 16, 29, 4, 46, 20, 36, 43, 9, 51, 8, 49, 26, 58, 33, 54, 1, 37, 29, 52, 20, 27, 45, 19, 35, 42, 16, 10, 32, 20, 49, 46, 27, 40, 4, 47, 22, 13, 55, 4, 47, 26, 44, 23, 40, 58, 19, 48, 13, 31, 2, 57, 34, 42, 19, 61, 32, 14, 55, 5, 51, 26, 19, 58, 16, 49, 14, 62, 5, 33, 44, 21, 7, 60, 26, 11, 41 },
{ 62, 24, 47, 29, 8, 19, 53, 11, 60, 24, 32, 61, 4, 55, 31, 2, 49, 16, 39, 9, 31, 24, 43, 17, 26, 38, 11, 25, 58, 43, 12, 35, 3, 46, 15, 32, 63, 4, 49, 56, 2, 60, 10, 32, 63, 17, 39, 12, 55, 30, 57, 9, 48, 55, 39, 24, 60, 2, 58, 31, 19, 61, 34, 3, 42, 11, 22, 46, 7, 61, 10, 42, 3, 55, 32, 1, 58, 28, 44, 54, 4, 34, 23, 15, 56, 20, 37, 58, 6, 30, 38, 18, 63, 9, 32, 5, 51, 3, 62, 37, 52, 18, 39, 23, 3, 51, 9, 47, 1, 23, 43, 15, 60, 35, 11, 40, 1, 36, 31, 26, 57, 2, 37, 54, 18, 44, 58, 16 },
{ 5, 51, 3, 33, 43, 62, 21, 42, 35, 9, 48, 15, 36, 10, 22, 42, 20, 46, 26, 56, 50, 12, 59, 3, 48, 19, 45, 53, 1, 27, 47, 17, 52, 24, 56, 11, 51, 21, 37, 30, 20, 46, 14, 41, 1, 47, 33, 7, 41, 17, 35, 27, 20, 1, 14, 54, 26, 33, 18, 47, 1, 44, 14, 59, 16, 52, 28, 18, 49, 31, 25, 34, 63, 13, 51, 24, 9, 50, 3, 23, 38, 63, 7, 52, 29, 46, 11, 33, 50, 22, 57, 36, 1, 57, 49, 17, 39, 28, 9, 35, 6, 27, 53, 15, 55, 30, 24, 58, 36, 41, 11, 52, 32, 3, 44, 25, 62, 23, 51, 15, 42, 22, 50, 10, 39, 4, 31, 35 },
{ 46, 22, 57, 17, 12, 39, 26, 5, 31, 59, 1, 45, 27, 62, 52, 7, 58, 33, 6, 18, 39, 22, 33, 41, 57, 5, 35, 18, 40, 16, 60, 5, 29, 42, 7, 39, 27, 44, 9, 47, 8, 26, 54, 22, 51, 29, 24, 49, 15, 61, 4, 51, 31, 63, 43, 6, 50, 8, 39, 12, 53, 37, 23, 30, 40, 6, 62, 43, 14, 53, 2, 49, 7, 36, 17, 41, 61, 37, 18, 56, 11, 18, 44, 35, 2, 19, 61, 0, 41, 14, 8, 30, 43, 12, 24, 46, 14, 54, 42, 21, 44, 61, 10, 46, 37, 11, 44, 7, 18, 63, 20, 29, 7, 49, 28, 54, 8, 43, 4, 48, 18, 63, 12, 29, 48, 24, 59, 20 },
{ 13, 36, 28, 54, 35, 2, 56, 46, 16, 49, 22, 40, 11, 34, 14, 43, 29, 12, 63, 48, 2, 61, 7, 15, 28, 30, 50, 9, 61, 33, 38, 23, 54, 13, 61, 33, 3, 59, 16, 35, 58, 40, 5, 38, 13, 57, 3, 58, 37, 21, 45, 12, 39, 7, 35, 30, 13, 56, 22, 62, 27, 6, 55, 10, 48, 21, 33, 2, 38, 23, 40, 20, 44, 29, 59, 4, 26, 12, 33, 47, 28, 53, 31, 13, 59, 41, 27, 49, 26, 54, 45, 16, 53, 21, 35, 7, 59, 26, 11, 56, 1, 24, 33, 4, 28, 62, 21, 49, 31, 2, 56, 39, 24, 58, 13, 17, 37, 21, 56, 10, 38, 0, 34, 55, 15, 43, 1, 52 },
{ 42, 9, 50, 6, 25, 60, 14, 38, 10, 29, 53, 18, 57, 3, 25, 51, 0, 53, 25, 17, 29, 37, 52, 46, 0, 62, 14, 37, 4, 50, 10, 44, 0, 46, 20, 25, 50, 19, 55, 0, 23, 31, 62, 34, 11, 45, 19, 32, 0, 53, 10, 59, 23, 47, 18, 60, 42, 28, 37, 3, 50, 15, 35, 44, 0, 51, 27, 60, 9, 57, 16, 58, 11, 22, 46, 15, 53, 48, 7, 42, 0, 60, 5, 49, 24, 54, 9, 17, 39, 5, 34, 62, 3, 40, 60, 31, 0, 47, 29, 16, 49, 39, 59, 17, 50, 0, 40, 13, 53, 38, 16, 46, 0, 42, 34, 60, 2, 53, 29, 31, 58, 46, 27, 6, 61, 8, 37, 28 },
{ 0, 63, 21, 40, 45, 18, 51, 23, 63, 34, 6, 43, 28, 38, 55, 19, 40, 35, 8, 41, 54, 10, 21, 32, 39, 23, 53, 26, 55, 28, 22, 63, 30, 34, 9, 48, 6, 38, 29, 43, 49, 6, 18, 52, 27, 61, 9, 43, 28, 42, 33, 26, 56, 3, 51, 23, 0, 48, 16, 45, 32, 25, 63, 20, 57, 17, 42, 12, 35, 47, 5, 31, 39, 56, 6, 30, 34, 21, 61, 25, 14, 40, 22, 38, 15, 6, 36, 56, 20, 60, 25, 12, 51, 27, 10, 56, 42, 20, 36, 63, 32, 6, 21, 41, 12, 34, 60, 26, 5, 48, 27, 10, 62, 19, 6, 47, 39, 14, 45, 7, 24, 17, 41, 32, 23, 51, 19, 56 },
{ 45, 31, 15, 59, 4, 33, 7, 47, 0, 41, 13, 61, 4, 47, 9, 23, 60, 14, 57, 31, 4, 45, 59, 6, 58, 10, 44, 20, 8, 42, 15, 6, 55, 17, 58, 31, 53, 12, 61, 10, 15, 57, 43, 2, 23, 35, 48, 14, 54, 6, 18, 49, 15, 38, 11, 34, 62, 9, 21, 58, 11, 41, 4, 31, 38, 8, 29, 55, 19, 36, 27, 52, 0, 25, 50, 43, 1, 39, 8, 55, 35, 51, 10, 30, 45, 62, 29, 2, 46, 10, 32, 48, 18, 38, 5, 22, 33, 8, 51, 3, 14, 44, 54, 25, 57, 30, 18, 52, 33, 22, 59, 28, 36, 52, 32, 21, 26, 50, 5, 55, 35, 60, 14, 54, 4, 40, 16, 33 },
{ 27, 3, 49, 10, 30, 40, 55, 27, 57, 24, 52, 21, 32, 17, 60, 30, 5, 44, 27, 49, 19, 34, 13, 24, 43, 36, 3, 49, 31, 59, 37, 48, 26, 41, 2, 41, 14, 36, 21, 32, 40, 26, 13, 49, 55, 5, 16, 40, 25, 60, 36, 1, 63, 29, 17, 44, 25, 40, 52, 5, 29, 47, 54, 13, 46, 24, 60, 4, 51, 22, 63, 14, 45, 18, 12, 62, 17, 57, 19, 42, 3, 26, 58, 48, 1, 21, 40, 52, 23, 37, 44, 1, 29, 58, 43, 50, 15, 61, 19, 45, 58, 28, 7, 48, 2, 46, 8, 42, 3, 55, 8, 50, 12, 4, 55, 10, 63, 33, 20, 40, 11, 3, 46, 20, 48, 26, 61, 11 },
{ 44, 56, 24, 36, 53, 19, 12, 37, 16, 44, 7, 36, 49, 54, 11, 37, 48, 21, 15, 1, 62, 25, 47, 56, 16, 18, 51, 12, 40, 1, 24, 11, 52, 16, 23, 59, 28, 1, 45, 53, 4, 60, 37, 21, 39, 30, 63, 20, 52, 10, 30, 45, 8, 41, 54, 4, 57, 7, 34, 55, 36, 18, 23, 59, 2, 48, 11, 32, 44, 1, 41, 8, 33, 54, 38, 23, 30, 46, 6, 29, 62, 18, 32, 16, 55, 34, 14, 11, 61, 7, 55, 16, 53, 13, 23, 2, 55, 37, 26, 10, 33, 23, 36, 16, 38, 22, 56, 15, 24, 43, 35, 17, 44, 40, 25, 46, 16, 1, 57, 25, 49, 36, 28, 62, 9, 35, 7, 53 },
{ 17, 38, 8, 61, 1, 50, 26, 62, 3, 31, 56, 15, 1, 26, 40, 2, 34, 51, 56, 36, 42, 9, 38, 2, 29, 60, 32, 57, 19, 62, 34, 47, 4, 57, 39, 7, 44, 63, 24, 18, 46, 28, 8, 54, 1, 34, 7, 46, 3, 37, 50, 23, 57, 21, 13, 46, 31, 20, 43, 15, 1, 61, 8, 33, 37, 17, 56, 26, 15, 49, 24, 59, 28, 3, 56, 9, 52, 32, 13, 49, 10, 43, 5, 45, 8, 25, 59, 42, 28, 33, 19, 40, 8, 63, 35, 47, 25, 4, 40, 52, 1, 60, 12, 53, 63, 9, 29, 60, 37, 19, 1, 62, 31, 20, 58, 12, 41, 30, 43, 9, 18, 52, 22, 1, 39, 30, 58, 21 },
{ 13, 47, 29, 18, 43, 34, 5, 48, 20, 42, 10, 45, 30, 58, 20, 63, 24, 11, 6, 28, 54, 14, 22, 52, 41, 7, 26, 5, 45, 15, 53, 13, 35, 27, 18, 50, 12, 33, 5, 56, 10, 17, 45, 24, 59, 15, 50, 26, 56, 13, 19, 5, 32, 52, 27, 36, 2, 61, 12, 26, 49, 40, 27, 52, 13, 50, 6, 39, 61, 34, 10, 37, 48, 20, 41, 27, 2, 36, 59, 24, 54, 33, 63, 20, 38, 50, 3, 17, 52, 4, 58, 27, 45, 21, 32, 11, 48, 17, 57, 20, 46, 38, 25, 43, 4, 34, 51, 6, 13, 45, 57, 26, 6, 48, 2, 35, 53, 23, 61, 34, 59, 6, 42, 56, 13, 51, 2, 41 },
{ 32, 5, 55, 23, 58, 14, 22, 52, 29, 15, 61, 25, 51, 8, 43, 13, 53, 41, 46, 20, 3, 33, 63, 11, 48, 21, 54, 38, 28, 3, 30, 43, 21, 62, 9, 31, 55, 22, 51, 29, 37, 62, 32, 12, 42, 29, 41, 9, 33, 44, 62, 28, 43, 1, 59, 19, 48, 30, 51, 39, 24, 4, 58, 19, 42, 29, 22, 43, 3, 18, 53, 5, 13, 50, 16, 60, 45, 21, 7, 40, 15, 0, 26, 53, 13, 31, 43, 24, 47, 31, 15, 49, 2, 41, 6, 59, 29, 42, 9, 30, 14, 7, 49, 18, 31, 47, 20, 39, 49, 32, 11, 41, 54, 15, 61, 18, 7, 38, 4, 13, 44, 28, 15, 32, 45, 19, 27, 49 },
{ 63, 34, 11, 39, 2, 45, 37, 8, 59, 39, 33, 4, 36, 17, 48, 5, 29, 18, 32, 61, 39, 50, 5, 27, 35, 0, 46, 12, 22, 49, 60, 6, 54, 0, 38, 49, 2, 42, 15, 40, 0, 47, 20, 51, 3, 57, 18, 61, 22, 0, 39, 16, 55, 12, 35, 8, 41, 22, 6, 59, 16, 45, 10, 36, 0, 62, 9, 54, 30, 58, 21, 43, 63, 31, 7, 35, 12, 48, 58, 28, 47, 37, 41, 9, 57, 20, 61, 0, 36, 11, 57, 35, 23, 52, 37, 18, 0, 62, 22, 55, 35, 62, 27, 54, 0, 15, 61, 28, 2, 59, 22, 9, 37, 27, 33, 51, 29, 48, 19, 50, 25, 37, 10, 57, 5, 37, 60, 8 },
{ 20, 25, 46, 52, 31, 60, 12, 55, 0, 19, 11, 46, 62, 35, 23, 38, 57, 0, 55, 10, 16, 30, 58, 44, 17, 59, 29, 63, 42, 8, 36, 20, 33, 46, 16, 61, 25, 35, 8, 54, 26, 7, 58, 22, 34, 6, 47, 14, 53, 31, 48, 9, 37, 25, 49, 63, 16, 55, 45, 14, 34, 63, 21, 53, 25, 33, 46, 16, 35, 7, 46, 29, 0, 39, 25, 55, 22, 34, 18, 4, 56, 11, 23, 51, 28, 6, 39, 14, 62, 44, 19, 8, 60, 12, 56, 28, 50, 34, 39, 5, 51, 3, 41, 12, 57, 35, 10, 53, 25, 17, 52, 30, 47, 0, 43, 14, 5, 57, 31, 55, 0, 63, 47, 23, 54, 24, 14, 43 },
{ 0, 57, 16, 6, 26, 19, 35, 28, 49, 42, 54, 26, 21, 1, 59, 27, 9, 47, 26, 44, 50, 22, 13, 40, 8, 37, 10, 34, 17, 56, 25, 58, 13, 27, 44, 9, 20, 58, 31, 17, 60, 36, 10, 41, 53, 25, 36, 39, 4, 24, 58, 17, 60, 4, 22, 38, 10, 32, 0, 50, 31, 7, 28, 47, 12, 57, 5, 26, 52, 23, 14, 40, 57, 17, 47, 5, 53, 1, 44, 31, 19, 60, 46, 2, 35, 48, 30, 54, 22, 5, 51, 39, 25, 31, 4, 43, 14, 9, 45, 16, 24, 44, 19, 29, 40, 23, 44, 7, 38, 42, 4, 63, 12, 54, 23, 59, 22, 42, 8, 15, 40, 21, 8, 34, 3, 41, 30, 50 },
{ 39, 10, 48, 33, 41, 54, 5, 47, 23, 13, 32, 7, 52, 44, 14, 39, 58, 18, 35, 6, 37, 2, 60, 24, 55, 19, 53, 2, 51, 32, 1, 41, 51, 4, 40, 29, 47, 3, 52, 44, 13, 49, 28, 16, 1, 62, 11, 27, 52, 35, 5, 42, 29, 47, 14, 56, 28, 53, 26, 38, 9, 56, 40, 3, 38, 15, 41, 60, 1, 37, 50, 25, 11, 28, 61, 19, 42, 62, 10, 52, 39, 6, 32, 14, 58, 17, 7, 26, 42, 34, 27, 10, 54, 40, 20, 63, 26, 53, 21, 61, 32, 7, 59, 48, 3, 56, 18, 31, 58, 14, 49, 21, 36, 16, 45, 9, 36, 24, 62, 45, 27, 31, 53, 17, 49, 12, 62, 18 },
{ 28, 59, 21, 58, 2, 16, 38, 9, 62, 3, 56, 41, 10, 31, 50, 4, 32, 52, 12, 63, 23, 46, 33, 31, 4, 48, 25, 43, 14, 23, 47, 11, 22, 55, 14, 60, 23, 37, 11, 39, 23, 2, 45, 56, 31, 43, 19, 55, 16, 46, 21, 51, 11, 33, 44, 2, 41, 18, 5, 52, 23, 44, 17, 60, 27, 49, 11, 32, 44, 10, 54, 2, 56, 33, 8, 38, 13, 29, 36, 16, 24, 63, 27, 51, 21, 43, 56, 12, 49, 3, 59, 48, 1, 15, 46, 7, 36, 2, 47, 11, 50, 27, 37, 13, 33, 8, 51, 46, 1, 34, 28, 40, 3, 33, 60, 29, 47, 1, 35, 11, 59, 42, 2, 60, 26, 46, 6, 35 },
{ 4, 43, 9, 29, 36, 63, 24, 44, 20, 50, 30, 17, 60, 22, 16, 43, 25, 3, 42, 19, 51, 15, 8, 54, 42, 15, 61, 5, 39, 57, 18, 61, 31, 48, 34, 2, 50, 19, 57, 5, 63, 33, 19, 38, 13, 27, 48, 7, 32, 61, 2, 26, 58, 6, 24, 50, 13, 61, 42, 20, 62, 2, 35, 20, 51, 4, 62, 18, 23, 58, 20, 31, 43, 15, 51, 45, 26, 50, 4, 55, 45, 3, 35, 9, 38, 1, 32, 61, 20, 45, 17, 33, 24, 57, 29, 51, 22, 58, 38, 30, 15, 1, 54, 21, 63, 43, 26, 12, 24, 56, 8, 60, 50, 19, 5, 52, 13, 54, 17, 50, 4, 16, 36, 12, 32, 56, 22, 54 },
{ 51, 25, 40, 53, 12, 49, 15, 57, 34, 7, 38, 47, 2, 36, 55, 8, 61, 30, 56, 7, 28, 59, 48, 11, 27, 35, 21, 45, 28, 36, 9, 38, 6, 16, 24, 63, 10, 32, 28, 43, 21, 53, 5, 60, 8, 57, 3, 45, 11, 37, 15, 54, 40, 20, 62, 36, 27, 34, 11, 48, 30, 15, 54, 8, 30, 42, 22, 34, 48, 13, 35, 63, 4, 37, 22, 2, 59, 9, 41, 23, 13, 41, 49, 18, 59, 24, 40, 5, 37, 30, 9, 61, 44, 6, 37, 11, 33, 17, 5, 55, 41, 60, 23, 39, 17, 5, 30, 62, 41, 16, 46, 25, 11, 56, 39, 26, 20, 38, 29, 39, 22, 52, 44, 20, 48, 1, 38, 14 },
{ 15, 33, 2, 18, 44, 6, 27, 0, 32, 61, 25, 12, 58, 28, 40, 20, 47, 13, 34, 43, 38, 1, 23, 62, 40, 0, 51, 10, 63, 3, 52, 26, 44, 30, 45, 6, 41, 54, 0, 51, 12, 30, 46, 24, 49, 22, 40, 33, 63, 23, 43, 30, 9, 47, 0, 17, 54, 7, 57, 3, 37, 47, 24, 46, 13, 55, 7, 52, 2, 42, 6, 26, 49, 18, 60, 34, 16, 57, 33, 20, 61, 30, 8, 54, 14, 46, 12, 53, 16, 55, 38, 13, 22, 53, 18, 59, 46, 27, 43, 19, 32, 10, 45, 6, 49, 36, 52, 2, 20, 55, 6, 39, 32, 15, 44, 3, 58, 10, 63, 6, 56, 30, 7, 58, 9, 40, 19, 63 },
{ 10, 47, 61, 23, 55, 31, 52, 42, 17, 45, 4, 51, 27, 6, 15, 53, 0, 49, 26, 10, 56, 18, 36, 6, 20, 58, 32, 30, 13, 49, 19, 56, 0, 59, 12, 53, 27, 17, 38, 25, 48, 9, 15, 36, 14, 30, 59, 17, 0, 50, 8, 58, 18, 56, 31, 45, 21, 41, 29, 19, 60, 6, 32, 59, 0, 36, 29, 39, 19, 59, 46, 12, 55, 30, 10, 47, 24, 3, 28, 48, 0, 55, 44, 27, 33, 4, 63, 29, 49, 0, 26, 50, 34, 2, 42, 14, 0, 62, 9, 56, 3, 52, 28, 34, 58, 9, 20, 48, 37, 32, 22, 53, 0, 62, 27, 49, 34, 46, 21, 33, 41, 14, 25, 37, 53, 29, 31, 45 },
{ 56, 28, 7, 37, 11, 36, 20, 9, 54, 14, 39, 19, 34, 63, 45, 37, 24, 17, 60, 31, 21, 45, 53, 29, 47, 15, 7, 55, 40, 23, 34, 14, 42, 20, 37, 35, 15, 59, 7, 62, 34, 40, 59, 1, 51, 42, 10, 28, 54, 21, 35, 5, 38, 13, 36, 4, 59, 12, 39, 53, 15, 43, 9, 21, 39, 62, 16, 56, 25, 9, 32, 38, 0, 41, 14, 51, 40, 53, 43, 11, 37, 17, 5, 22, 57, 39, 19, 7, 42, 21, 60, 10, 31, 63, 25, 52, 30, 49, 36, 25, 48, 17, 61, 14, 22, 42, 29, 13, 60, 11, 47, 18, 35, 41, 7, 23, 4, 16, 51, 11, 0, 48, 61, 3, 17, 50, 5, 24 },
{ 0, 42, 21, 49, 60, 3, 57, 40, 29, 48, 23, 56, 42, 11, 22, 5, 59, 39, 4, 50, 3, 41, 12, 57, 25, 50, 44, 18, 4, 46, 7, 62, 33, 50, 4, 56, 21, 32, 43, 18, 3, 23, 55, 34, 20, 4, 53, 38, 12, 46, 29, 52, 25, 61, 23, 51, 26, 46, 1, 34, 25, 57, 28, 51, 26, 11, 50, 3, 44, 28, 53, 21, 57, 27, 62, 6, 31, 19, 8, 63, 26, 59, 36, 47, 15, 29, 50, 25, 35, 47, 18, 41, 4, 48, 8, 40, 12, 23, 6, 44, 13, 40, 1, 31, 55, 0, 61, 43, 4, 50, 26, 58, 9, 53, 24, 61, 42, 55, 31, 43, 57, 20, 34, 27, 43, 8, 59, 39 },
{ 18, 51, 30, 13, 26, 16, 46, 22, 2, 59, 8, 30, 1, 48, 33, 51, 29, 9, 46, 16, 62, 14, 33, 2, 38, 9, 27, 60, 37, 26, 53, 17, 28, 10, 24, 46, 2, 49, 8, 57, 29, 45, 6, 26, 62, 44, 18, 25, 61, 3, 42, 14, 49, 10, 43, 6, 17, 32, 63, 10, 49, 4, 40, 14, 45, 33, 22, 37, 12, 61, 5, 17, 43, 7, 23, 37, 15, 58, 49, 13, 39, 21, 10, 52, 1, 62, 9, 56, 12, 2, 58, 28, 36, 16, 56, 28, 56, 35, 20, 63, 24, 37, 51, 8, 45, 25, 16, 33, 27, 38, 2, 44, 13, 30, 17, 36, 12, 26, 5, 18, 28, 47, 13, 60, 23, 45, 13, 33 },
{ 55, 4, 62, 34, 52, 38, 7, 63, 32, 37, 13, 53, 25, 62, 18, 12, 55, 41, 27, 35, 24, 49, 31, 52, 17, 63, 34, 1, 56, 12, 41, 2, 48, 58, 39, 16, 61, 27, 41, 52, 13, 19, 50, 39, 11, 31, 57, 6, 32, 40, 20, 55, 1, 28, 33, 57, 48, 8, 37, 22, 44, 18, 53, 1, 61, 5, 54, 16, 47, 36, 50, 24, 55, 34, 48, 45, 1, 30, 33, 46, 2, 50, 32, 42, 25, 34, 43, 21, 38, 52, 23, 45, 14, 54, 21, 4, 44, 16, 53, 29, 10, 47, 19, 57, 12, 54, 39, 10, 51, 15, 63, 21, 57, 40, 51, 1, 48, 57, 37, 62, 2, 38, 9, 52, 1, 35, 58, 22 },
{ 36, 46, 10, 42, 1, 27, 43, 15, 50, 21, 45, 16, 41, 3, 35, 44, 20, 1, 57, 11, 55, 7, 43, 8, 22, 42, 13, 46, 21, 39, 31, 60, 22, 5, 29, 44, 11, 35, 20, 4, 36, 58, 32, 15, 47, 2, 36, 48, 16, 60, 8, 35, 44, 63, 16, 2, 40, 26, 55, 14, 58, 35, 24, 31, 19, 42, 31, 58, 1, 29, 10, 40, 2, 19, 12, 54, 22, 61, 7, 24, 56, 5, 28, 16, 54, 3, 15, 58, 6, 30, 8, 62, 1, 43, 31, 47, 7, 59, 1, 38, 58, 4, 34, 27, 38, 5, 31, 59, 7, 46, 30, 3, 34, 6, 28, 59, 20, 8, 32, 15, 53, 24, 55, 31, 19, 49, 11, 26 },
{ 2, 24, 16, 58, 19, 55, 5, 35, 10, 61, 4, 28, 57, 24, 58, 7, 31, 47, 22, 38, 19, 28, 61, 36, 54, 5, 59, 29, 6, 52, 15, 11, 43, 36, 8, 54, 52, 1, 62, 25, 47, 9, 1, 60, 28, 53, 24, 14, 46, 27, 51, 22, 12, 24, 38, 53, 20, 11, 51, 3, 29, 7, 48, 63, 8, 49, 9, 21, 52, 14, 63, 32, 46, 60, 35, 4, 41, 16, 52, 35, 18, 42, 59, 7, 36, 61, 45, 27, 33, 51, 19, 39, 34, 11, 61, 18, 33, 41, 28, 15, 54, 22, 42, 3, 49, 21, 47, 18, 36, 23, 55, 19, 48, 24, 45, 10, 33, 44, 50, 40, 7, 35, 15, 41, 63, 6, 40, 54 },
{ 62, 41, 32, 8, 47, 28, 60, 24, 44, 30, 38, 49, 9, 33, 14, 40, 50, 14, 60, 2, 54, 40, 0, 20, 25, 39, 16, 49, 24, 35, 57, 47, 19, 61, 33, 18, 23, 37, 13, 55, 31, 43, 22, 41, 17, 8, 42, 58, 0, 37, 5, 56, 31, 54, 7, 30, 60, 33, 42, 17, 59, 39, 12, 27, 38, 17, 35, 41, 27, 45, 20, 7, 25, 15, 29, 58, 27, 47, 11, 40, 14, 54, 23, 46, 19, 31, 11, 40, 13, 49, 5, 58, 24, 51, 26, 6, 50, 20, 49, 9, 32, 46, 17, 60, 14, 63, 24, 1, 57, 41, 9, 43, 14, 62, 16, 52, 3, 27, 14, 22, 61, 45, 4, 28, 9, 47, 29, 17 },
{ 5, 50, 12, 53, 38, 18, 11, 51, 0, 55, 17, 6, 47, 54, 19, 63, 5, 26, 34, 45, 13, 30, 47, 58, 10, 48, 32, 3, 62, 9, 26, 0, 25, 14, 50, 3, 47, 30, 42, 16, 6, 63, 12, 49, 33, 55, 21, 10, 34, 63, 18, 41, 3, 47, 19, 43, 0, 49, 8, 28, 46, 20, 52, 0, 56, 24, 60, 3, 59, 5, 39, 57, 48, 52, 9, 38, 3, 21, 26, 60, 0, 32, 12, 38, 4, 48, 53, 0, 60, 15, 29, 44, 18, 10, 38, 57, 13, 60, 2, 26, 62, 7, 50, 29, 35, 8, 40, 53, 28, 12, 60, 33, 38, 5, 37, 29, 60, 39, 56, 0, 30, 18, 50, 34, 59, 25, 14, 44 },
{ 20, 31, 60, 22, 3, 49, 33, 25, 40, 13, 34, 59, 22, 36, 0, 28, 37, 56, 8, 18, 51, 16, 4, 45, 27, 12, 53, 42, 18, 44, 51, 31, 55, 40, 28, 58, 7, 60, 10, 51, 27, 37, 24, 56, 5, 26, 44, 29, 50, 23, 45, 11, 34, 15, 59, 27, 13, 23, 62, 37, 4, 57, 15, 32, 42, 6, 47, 11, 30, 43, 23, 13, 0, 36, 18, 44, 63, 51, 37, 29, 49, 20, 57, 27, 62, 9, 24, 35, 23, 53, 37, 3, 42, 55, 0, 36, 23, 39, 31, 43, 17, 37, 24, 11, 52, 43, 19, 32, 5, 50, 26, 0, 56, 21, 54, 11, 19, 6, 47, 25, 59, 42, 12, 54, 21, 3, 38, 57 },
{ 48, 0, 35, 27, 44, 14, 59, 7, 57, 46, 26, 2, 42, 12, 52, 43, 10, 27, 53, 42, 32, 62, 37, 21, 34, 61, 7, 23, 36, 4, 38, 12, 41, 5, 17, 45, 22, 27, 39, 21, 59, 0, 45, 18, 39, 62, 3, 38, 14, 7, 54, 26, 61, 39, 9, 52, 45, 36, 18, 50, 10, 34, 44, 22, 50, 14, 36, 55, 17, 34, 53, 62, 33, 26, 56, 6, 31, 12, 6, 53, 9, 44, 2, 50, 20, 40, 55, 17, 47, 7, 26, 63, 22, 32, 48, 16, 46, 8, 52, 12, 57, 41, 0, 56, 25, 3, 61, 14, 45, 35, 18, 44, 12, 46, 23, 42, 32, 51, 35, 10, 17, 36, 23, 1, 45, 52, 32, 10 },
{ 37, 15, 43, 8, 63, 39, 21, 31, 16, 37, 19, 62, 30, 46, 17, 60, 21, 48, 1, 23, 6, 25, 11, 56, 1, 40, 30, 58, 15, 54, 21, 59, 9, 63, 35, 56, 11, 51, 2, 46, 34, 14, 53, 7, 30, 11, 51, 19, 60, 40, 30, 1, 24, 50, 20, 32, 3, 56, 5, 25, 31, 13, 61, 2, 29, 60, 25, 20, 51, 2, 27, 8, 18, 42, 10, 45, 21, 34, 43, 17, 62, 29, 41, 14, 34, 6, 30, 43, 2, 57, 33, 13, 45, 12, 27, 62, 4, 55, 21, 35, 5, 27, 45, 33, 16, 47, 30, 54, 22, 10, 51, 27, 63, 7, 49, 1, 58, 22, 15, 43, 53, 7, 57, 39, 27, 12, 61, 24 },
{ 56, 51, 26, 56, 19, 2, 41, 54, 5, 52, 9, 48, 6, 23, 39, 4, 32, 15, 63, 35, 59, 49, 43, 15, 52, 19, 50, 9, 46, 33, 1, 29, 48, 20, 32, 1, 38, 33, 19, 54, 9, 32, 24, 48, 58, 35, 16, 48, 4, 52, 13, 57, 33, 5, 45, 59, 15, 29, 41, 55, 47, 39, 23, 53, 9, 40, 4, 57, 10, 44, 48, 40, 50, 14, 61, 24, 55, 1, 59, 22, 33, 8, 51, 25, 58, 46, 11, 59, 20, 41, 17, 51, 6, 56, 35, 25, 42, 30, 15, 58, 48, 18, 61, 9, 58, 39, 13, 2, 37, 59, 40, 2, 31, 16, 34, 41, 8, 30, 62, 3, 29, 48, 33, 5, 63, 16, 41, 7 },
{ 22, 4, 46, 11, 33, 51, 29, 10, 62, 24, 43, 27, 15, 58, 50, 25, 54, 44, 9, 38, 18, 3, 29, 57, 32, 5, 26, 43, 17, 61, 24, 52, 8, 42, 23, 53, 15, 61, 7, 28, 57, 43, 4, 40, 20, 2, 43, 25, 32, 35, 21, 43, 17, 48, 10, 22, 38, 54, 11, 21, 1, 58, 16, 30, 48, 18, 46, 32, 38, 13, 22, 4, 59, 35, 2, 51, 30, 39, 15, 47, 4, 56, 13, 37, 1, 28, 16, 52, 32, 9, 61, 29, 38, 19, 3, 52, 10, 48, 1, 32, 11, 40, 20, 36, 6, 22, 49, 29, 55, 6, 20, 56, 36, 52, 19, 60, 26, 46, 18, 54, 40, 13, 20, 46, 35, 19, 49, 29 },
{ 61, 17, 34, 53, 23, 6, 48, 35, 20, 40, 1, 56, 36, 29, 11, 34, 7, 41, 14, 30, 55, 20, 46, 8, 24, 38, 63, 2, 37, 10, 45, 14, 34, 49, 6, 13, 44, 25, 49, 41, 21, 12, 61, 15, 54, 29, 63, 12, 56, 8, 49, 2, 62, 36, 28, 61, 0, 25, 41, 63, 35, 8, 44, 6, 37, 62, 7, 21, 63, 28, 55, 31, 16, 24, 41, 19, 9, 57, 27, 36, 18, 42, 31, 62, 22, 55, 38, 4, 27, 47, 1, 40, 14, 54, 43, 20, 60, 23, 38, 63, 25, 51, 2, 53, 26, 63, 10, 42, 17, 34, 47, 25, 13, 5, 44, 11, 55, 2, 38, 27, 6, 60, 52, 25, 9, 55, 1, 40 },
{ 8, 30, 58, 3, 42, 61, 17, 38, 13, 59, 32, 10, 54, 3, 51, 20, 61, 26, 57, 2, 46, 33, 12, 60, 41, 13, 48, 29, 55, 20, 39, 27, 57, 18, 62, 29, 55, 2, 31, 16, 37, 50, 26, 36, 6, 46, 9, 41, 27, 57, 23, 39, 26, 6, 51, 12, 31, 46, 7, 16, 27, 52, 19, 56, 26, 12, 33, 53, 1, 41, 8, 57, 46, 7, 54, 32, 47, 5, 49, 11, 60, 23, 5, 48, 10, 43, 19, 63, 35, 24, 49, 21, 59, 5, 31, 37, 14, 44, 7, 42, 6, 30, 46, 13, 44, 32, 19, 50, 4, 58, 8, 30, 62, 38, 28, 53, 21, 36, 13, 50, 21, 33, 15, 2, 44, 31, 14, 47 },
{ 37, 13, 39, 16, 28, 9, 57, 0, 25, 49, 21, 45, 18, 47, 12, 42, 0, 49, 22, 39, 16, 53, 25, 36, 0, 52, 22, 16, 6, 60, 4, 51, 0, 26, 37, 47, 10, 36, 63, 5, 57, 0, 18, 59, 23, 33, 51, 19, 0, 44, 15, 11, 54, 17, 42, 35, 53, 18, 58, 33, 49, 4, 34, 42, 0, 50, 43, 25, 16, 49, 34, 20, 37, 28, 12, 63, 16, 38, 25, 44, 0, 40, 52, 17, 35, 3, 50, 14, 8, 53, 11, 36, 25, 45, 9, 62, 0, 54, 28, 17, 50, 55, 15, 24, 57, 0, 53, 34, 23, 41, 15, 45, 0, 49, 16, 4, 48, 9, 63, 45, 0, 42, 58, 37, 61, 22, 54, 26 },
{ 0, 50, 21, 47, 54, 36, 27, 45, 52, 4, 34, 15, 63, 29, 37, 59, 17, 31, 6, 61, 28, 5, 48, 18, 59, 27, 34, 56, 44, 31, 35, 12, 41, 59, 16, 3, 40, 20, 50, 22, 30, 40, 52, 10, 45, 3, 59, 22, 37, 61, 29, 46, 31, 58, 2, 22, 9, 43, 3, 39, 14, 61, 24, 54, 15, 29, 11, 60, 39, 17, 5, 61, 0, 44, 50, 3, 31, 14, 58, 21, 54, 28, 15, 45, 60, 26, 33, 58, 44, 22, 60, 2, 57, 34, 49, 27, 18, 34, 21, 59, 29, 4, 36, 41, 8, 39, 28, 11, 62, 26, 53, 20, 35, 24, 59, 32, 29, 39, 24, 31, 57, 23, 11, 28, 5, 36, 11, 59 },
{ 44, 32, 63, 5, 20, 12, 41, 7, 30, 61, 42, 8, 39, 5, 33, 8, 24, 53, 45, 11, 37, 58, 7, 44, 10, 50, 3, 40, 8, 22, 53, 19, 46, 9, 33, 52, 24, 58, 8, 44, 13, 47, 8, 34, 38, 30, 14, 47, 7, 34, 4, 55, 9, 19, 40, 49, 56, 26, 60, 21, 30, 45, 10, 19, 40, 58, 23, 36, 3, 52, 45, 23, 54, 13, 22, 42, 53, 45, 7, 33, 10, 36, 57, 6, 29, 12, 41, 0, 30, 15, 41, 30, 17, 7, 16, 53, 40, 56, 2, 39, 12, 61, 10, 52, 31, 60, 16, 45, 1, 37, 7, 61, 40, 10, 43, 17, 58, 7, 54, 14, 4, 51, 39, 49, 18, 56, 42, 20 },
{ 14, 6, 24, 36, 56, 49, 22, 60, 18, 14, 23, 51, 26, 57, 21, 52, 41, 14, 35, 50, 19, 31, 40, 23, 33, 14, 63, 17, 32, 47, 7, 62, 23, 30, 56, 11, 42, 27, 14, 60, 35, 19, 28, 61, 17, 55, 25, 39, 53, 17, 42, 21, 38, 63, 25, 5, 14, 36, 12, 50, 1, 37, 59, 32, 2, 51, 6, 56, 27, 32, 11, 30, 38, 26, 60, 8, 26, 19, 62, 39, 50, 2, 21, 39, 53, 23, 56, 19, 49, 39, 5, 46, 55, 23, 42, 4, 31, 11, 47, 26, 45, 22, 48, 18, 21, 5, 48, 25, 57, 14, 47, 30, 3, 56, 12, 50, 1, 42, 19, 47, 35, 17, 8, 30, 45, 25, 4, 51 },
{ 28, 58, 43, 1, 31, 8, 33, 2, 44, 55, 32, 1, 60, 12, 46, 27, 4, 62, 23, 1, 56, 13, 62, 2, 54, 36, 25, 51, 1, 57, 26, 42, 3, 49, 17, 38, 1, 48, 31, 4, 54, 3, 50, 24, 1, 49, 5, 63, 13, 27, 52, 1, 48, 13, 45, 33, 52, 30, 46, 20, 55, 28, 6, 48, 24, 38, 20, 47, 14, 62, 48, 9, 58, 4, 36, 30, 56, 1, 34, 12, 18, 63, 25, 48, 4, 16, 37, 7, 62, 10, 52, 28, 13, 50, 36, 63, 24, 51, 15, 58, 8, 33, 1, 38, 56, 35, 42, 9, 33, 51, 22, 18, 48, 32, 27, 37, 23, 61, 33, 11, 59, 29, 62, 1, 53, 10, 60, 33 },
{ 12, 39, 17, 52, 26, 46, 53, 38, 25, 11, 48, 36, 16, 43, 2, 35, 55, 17, 39, 29, 43, 9, 28, 45, 20, 5, 46, 12, 42, 28, 13, 52, 36, 6, 60, 22, 54, 17, 62, 39, 25, 42, 15, 55, 44, 20, 31, 10, 35, 57, 24, 32, 29, 6, 59, 18, 7, 62, 3, 41, 10, 44, 16, 54, 13, 62, 31, 9, 41, 1, 21, 43, 18, 47, 15, 40, 11, 49, 28, 55, 46, 30, 8, 43, 32, 61, 28, 47, 25, 34, 21, 61, 32, 1, 20, 9, 46, 6, 35, 19, 41, 54, 27, 63, 14, 3, 51, 20, 62, 2, 38, 55, 8, 21, 63, 6, 46, 9, 26, 51, 3, 24, 43, 34, 16, 41, 18, 48 },
{ 62, 23, 55, 9, 15, 62, 19, 13, 58, 40, 6, 30, 54, 19, 50, 31, 10, 44, 6, 59, 21, 47, 51, 15, 60, 39, 30, 54, 21, 61, 19, 33, 14, 29, 43, 11, 34, 45, 7, 21, 10, 56, 36, 6, 38, 11, 58, 42, 2, 47, 11, 60, 50, 16, 41, 28, 38, 23, 47, 17, 35, 63, 22, 33, 42, 5, 45, 17, 53, 35, 25, 56, 33, 6, 51, 19, 60, 23, 43, 15, 5, 40, 58, 13, 51, 1, 45, 11, 54, 3, 43, 8, 37, 48, 59, 29, 39, 21, 61, 43, 3, 31, 10, 44, 24, 29, 60, 12, 28, 40, 11, 25, 43, 52, 14, 41, 16, 57, 44, 20, 40, 55, 12, 21, 57, 27, 35, 2 },
{ 37, 6, 31, 42, 40, 4, 29, 50, 0, 20, 63, 28, 9, 58, 14, 24, 63, 26, 48, 16, 34, 4, 32, 38, 23, 11, 58, 4, 37, 9, 45, 5, 63, 48, 26, 57, 2, 28, 32, 51, 46, 29, 13, 62, 27, 46, 28, 18, 50, 15, 40, 4, 19, 34, 54, 0, 53, 9, 26, 58, 28, 5, 49, 0, 57, 27, 19, 60, 29, 8, 59, 12, 37, 63, 24, 46, 3, 37, 6, 52, 26, 32, 20, 36, 9, 22, 59, 18, 35, 51, 14, 57, 17, 24, 12, 44, 56, 0, 30, 13, 59, 20, 49, 17, 54, 43, 6, 34, 46, 17, 58, 36, 0, 34, 29, 54, 25, 2, 36, 15, 60, 6, 37, 46, 4, 50, 9, 45 },
{ 19, 59, 48, 3, 24, 60, 44, 22, 34, 51, 15, 45, 41, 5, 33, 47, 0, 37, 12, 55, 25, 54, 8, 57, 0, 47, 18, 34, 49, 15, 55, 24, 40, 20, 8, 35, 53, 13, 41, 18, 0, 59, 22, 33, 4, 52, 8, 60, 24, 36, 31, 56, 45, 26, 10, 43, 15, 56, 36, 4, 51, 14, 39, 30, 12, 55, 36, 2, 39, 49, 4, 44, 17, 0, 32, 13, 53, 35, 59, 17, 62, 0, 55, 24, 52, 38, 31, 6, 42, 19, 29, 40, 4, 54, 33, 5, 16, 27, 52, 37, 23, 55, 7, 37, 0, 39, 23, 49, 4, 53, 31, 15, 59, 10, 50, 4, 60, 34, 48, 7, 31, 49, 27, 14, 62, 22, 53, 29 },
{ 46, 21, 14, 51, 36, 17, 7, 57, 10, 32, 3, 37, 22, 60, 39, 18, 56, 20, 42, 3, 36, 10, 44, 26, 41, 29, 53, 27, 2, 39, 30, 52, 0, 59, 15, 48, 23, 61, 6, 58, 37, 12, 40, 49, 16, 39, 20, 44, 0, 62, 8, 21, 3, 59, 23, 32, 49, 31, 12, 44, 22, 59, 18, 50, 24, 7, 43, 52, 15, 23, 41, 26, 51, 28, 55, 39, 21, 27, 10, 42, 12, 45, 27, 47, 3, 15, 63, 26, 55, 0, 60, 26, 45, 18, 62, 38, 58, 49, 8, 47, 4, 33, 46, 29, 57, 13, 56, 16, 59, 21, 5, 47, 23, 39, 18, 44, 13, 22, 28, 53, 19, 0, 58, 32, 41, 7, 26, 13 },
{ 0, 56, 34, 28, 11, 55, 31, 47, 26, 41, 56, 13, 53, 28, 11, 49, 7, 52, 32, 61, 50, 22, 63, 17, 13, 56, 7, 19, 43, 62, 10, 21, 37, 32, 43, 4, 38, 19, 44, 25, 31, 54, 5, 23, 61, 30, 53, 12, 35, 22, 43, 53, 37, 48, 7, 62, 20, 2, 61, 41, 8, 34, 47, 9, 63, 34, 28, 10, 55, 33, 14, 57, 7, 47, 9, 61, 4, 49, 31, 50, 21, 38, 8, 16, 57, 44, 33, 5, 49, 36, 12, 50, 7, 34, 10, 25, 2, 22, 36, 15, 26, 61, 18, 9, 22, 46, 32, 8, 27, 37, 44, 30, 55, 3, 62, 24, 38, 56, 5, 45, 38, 24, 43, 10, 19, 54, 39, 61 },
{ 41, 30, 8, 63, 43, 23, 38, 3, 62, 19, 8, 49, 25, 1, 58, 30, 23, 40, 9, 28, 18, 40, 6, 38, 49, 22, 35, 59, 8, 27, 50, 5, 56, 17, 11, 50, 30, 9, 55, 2, 51, 19, 34, 47, 9, 41, 6, 26, 48, 57, 14, 28, 17, 12, 39, 13, 37, 46, 25, 19, 54, 27, 1, 37, 16, 45, 20, 60, 1, 48, 20, 38, 31, 22, 42, 15, 19, 44, 1, 61, 6, 34, 56, 40, 29, 10, 20, 46, 13, 22, 41, 23, 59, 42, 30, 51, 45, 13, 63, 53, 42, 12, 51, 38, 62, 2, 26, 41, 50, 1, 61, 10, 19, 42, 31, 8, 49, 32, 12, 63, 9, 52, 16, 56, 36, 2, 31, 16 },
{ 52, 5, 47, 20, 1, 53, 12, 50, 16, 35, 43, 21, 33, 43, 16, 44, 3, 59, 14, 46, 1, 30, 60, 33, 2, 45, 12, 42, 31, 47, 14, 33, 46, 25, 55, 27, 60, 36, 16, 42, 14, 46, 26, 1, 55, 15, 63, 32, 2, 38, 5, 47, 33, 61, 30, 52, 4, 57, 6, 38, 11, 43, 61, 24, 52, 3, 31, 22, 42, 10, 62, 3, 59, 11, 35, 57, 33, 54, 24, 14, 29, 48, 18, 2, 60, 41, 53, 24, 32, 62, 3, 53, 15, 1, 55, 17, 32, 40, 6, 31, 1, 40, 28, 5, 35, 52, 19, 63, 13, 33, 17, 41, 52, 26, 15, 57, 1, 20, 42, 17, 35, 27, 48, 5, 25, 50, 44, 11 },
{ 35, 25, 38, 57, 33, 17, 40, 6, 59, 27, 54, 5, 61, 10, 52, 26, 36, 19, 51, 35, 57, 48, 11, 20, 54, 25, 61, 16, 1, 58, 24, 61, 3, 39, 7, 47, 1, 22, 49, 28, 63, 10, 58, 32, 17, 36, 45, 19, 51, 29, 59, 10, 50, 1, 23, 42, 18, 29, 51, 21, 56, 32, 14, 5, 40, 58, 47, 13, 54, 35, 29, 45, 18, 52, 26, 2, 38, 8, 46, 36, 58, 11, 52, 35, 17, 28, 1, 58, 9, 39, 17, 28, 37, 48, 20, 9, 57, 24, 50, 19, 58, 16, 48, 25, 43, 11, 35, 6, 45, 24, 56, 4, 36, 7, 47, 35, 52, 28, 59, 30, 2, 61, 21, 33, 63, 12, 18, 59 },
{ 3, 49, 15, 10, 27, 61, 25, 45, 30, 0, 14, 47, 31, 38, 17, 62, 7, 55, 27, 4, 15, 24, 42, 52, 10, 34, 5, 51, 36, 18, 41, 11, 35, 21, 62, 13, 33, 57, 8, 35, 5, 40, 21, 43, 52, 3, 24, 56, 11, 16, 33, 25, 41, 20, 55, 8, 60, 35, 15, 48, 2, 57, 30, 49, 18, 25, 6, 39, 17, 57, 7, 25, 43, 5, 49, 16, 62, 22, 55, 4, 25, 43, 23, 7, 50, 11, 37, 48, 14, 51, 33, 57, 7, 27, 39, 46, 4, 29, 11, 43, 34, 56, 7, 60, 20, 54, 30, 57, 22, 49, 9, 33, 54, 14, 63, 23, 6, 43, 10, 40, 50, 13, 44, 8, 38, 33, 46, 23 },
{ 55, 39, 22, 50, 44, 4, 36, 9, 52, 23, 37, 59, 21, 2, 46, 13, 31, 41, 11, 45, 62, 29, 6, 37, 19, 48, 30, 23, 44, 7, 53, 28, 54, 16, 41, 29, 44, 18, 52, 24, 60, 15, 48, 7, 27, 59, 9, 34, 42, 54, 7, 63, 4, 46, 31, 27, 45, 0, 40, 26, 34, 17, 37, 10, 53, 29, 36, 50, 2, 27, 51, 11, 61, 37, 23, 41, 30, 7, 18, 50, 39, 14, 63, 32, 45, 61, 19, 30, 25, 44, 2, 47, 23, 63, 11, 34, 59, 37, 60, 3, 22, 14, 44, 30, 15, 0, 47, 15, 3, 38, 61, 20, 27, 45, 11, 39, 51, 16, 55, 3, 22, 54, 29, 58, 1, 57, 6, 29 },
{ 9, 17, 60, 2, 34, 56, 20, 62, 39, 12, 49, 6, 29, 56, 34, 48, 0, 58, 22, 38, 18, 43, 56, 0, 63, 14, 55, 3, 59, 31, 15, 45, 0, 49, 6, 58, 3, 38, 12, 45, 0, 37, 29, 57, 13, 39, 30, 49, 0, 23, 44, 36, 16, 57, 13, 54, 11, 24, 63, 9, 53, 7, 62, 42, 0, 59, 15, 23, 63, 34, 40, 16, 32, 0, 53, 12, 48, 28, 59, 33, 0, 53, 9, 27, 3, 22, 54, 5, 56, 9, 61, 13, 42, 14, 52, 19, 0, 21, 47, 27, 53, 36, 3, 50, 39, 58, 25, 40, 53, 28, 12, 50, 0, 59, 32, 2, 21, 34, 26, 46, 37, 7, 18, 47, 24, 14, 53, 42 },
{ 61, 32, 13, 54, 29, 7, 46, 13, 28, 57, 18, 41, 53, 15, 9, 39, 24, 49, 33, 3, 53, 9, 26, 32, 40, 28, 46, 39, 25, 9, 56, 21, 63, 37, 26, 22, 51, 27, 17, 56, 31, 53, 4, 43, 22, 46, 12, 18, 60, 40, 20, 26, 50, 21, 39, 5, 49, 33, 16, 44, 22, 46, 20, 32, 24, 45, 8, 43, 12, 46, 4, 48, 56, 20, 29, 58, 3, 40, 10, 42, 31, 21, 47, 41, 56, 38, 15, 42, 36, 27, 20, 33, 55, 3, 26, 44, 31, 54, 12, 35, 9, 63, 28, 10, 21, 32, 9, 60, 17, 8, 43, 29, 40, 16, 36, 48, 60, 7, 57, 14, 62, 31, 42, 15, 36, 40, 20, 26 },
{ 0, 37, 47, 23, 41, 18, 32, 48, 1, 35, 8, 25, 4, 26, 63, 20, 54, 8, 16, 61, 35, 23, 51, 15, 58, 7, 12, 20, 50, 34, 42, 4, 38, 10, 32, 47, 8, 60, 41, 20, 9, 25, 50, 19, 62, 1, 37, 56, 28, 8, 53, 11, 3, 58, 34, 43, 19, 60, 38, 4, 58, 31, 3, 51, 11, 55, 38, 30, 21, 58, 19, 26, 9, 44, 36, 13, 46, 20, 62, 24, 13, 60, 5, 28, 12, 34, 7, 59, 0, 53, 45, 6, 38, 30, 50, 7, 62, 16, 41, 5, 46, 18, 55, 42, 51, 5, 45, 23, 34, 48, 19, 58, 5, 25, 54, 19, 13, 41, 28, 21, 0, 49, 10, 60, 4, 51, 9, 45 },
{ 19, 28, 6, 58, 10, 51, 4, 22, 55, 42, 60, 45, 34, 51, 42, 5, 30, 45, 27, 40, 13, 47, 4, 49, 21, 38, 60, 29, 2, 57, 17, 27, 52, 19, 61, 14, 30, 34, 2, 44, 63, 33, 11, 35, 16, 51, 25, 6, 14, 47, 31, 61, 37, 29, 18, 8, 52, 2, 28, 54, 13, 41, 15, 62, 35, 18, 2, 60, 6, 33, 41, 61, 31, 6, 56, 17, 34, 50, 6, 52, 44, 35, 16, 51, 59, 24, 48, 18, 31, 40, 16, 49, 21, 60, 17, 39, 10, 49, 32, 57, 24, 39, 1, 25, 18, 62, 37, 12, 56, 1, 37, 11, 52, 44, 9, 30, 47, 4, 51, 40, 55, 25, 34, 27, 56, 30, 32, 54 },
{ 63, 40, 49, 15, 43, 26, 63, 38, 16, 20, 30, 12, 57, 14, 19, 60, 36, 12, 59, 2, 57, 17, 42, 31, 1, 44, 16, 35, 47, 11, 32, 48, 13, 43, 1, 39, 51, 12, 57, 23, 6, 40, 53, 3, 55, 31, 39, 60, 35, 44, 5, 15, 45, 1, 62, 41, 26, 14, 47, 22, 36, 27, 50, 9, 26, 47, 52, 28, 54, 16, 1, 13, 51, 39, 23, 63, 1, 30, 15, 26, 2, 57, 19, 37, 1, 44, 21, 50, 13, 63, 8, 24, 56, 1, 35, 25, 58, 20, 2, 28, 14, 51, 33, 59, 13, 30, 4, 49, 31, 24, 63, 26, 33, 3, 58, 38, 62, 24, 32, 8, 17, 45, 5, 48, 18, 3, 43, 11 },
{ 21, 4, 24, 34, 59, 1, 37, 11, 53, 5, 47, 2, 22, 40, 32, 1, 24, 50, 21, 29, 38, 25, 63, 8, 55, 24, 53, 6, 62, 23, 59, 3, 54, 20, 58, 24, 5, 46, 15, 38, 48, 14, 27, 42, 23, 7, 46, 10, 17, 58, 25, 52, 23, 32, 49, 12, 55, 30, 40, 7, 59, 1, 56, 21, 39, 4, 23, 15, 37, 46, 55, 42, 21, 4, 48, 8, 45, 54, 37, 55, 32, 8, 46, 10, 30, 54, 4, 41, 25, 29, 36, 48, 11, 43, 14, 47, 5, 43, 53, 36, 61, 10, 45, 6, 41, 54, 27, 43, 16, 55, 6, 46, 18, 42, 23, 15, 1, 45, 12, 60, 37, 22, 62, 12, 39, 59, 16, 52 },
{ 47, 35, 56, 7, 19, 46, 31, 50, 33, 24, 61, 35, 50, 7, 53, 44, 55, 6, 46, 10, 52, 5, 21, 43, 36, 10, 18, 41, 26, 37, 8, 29, 40, 36, 9, 49, 34, 26, 61, 21, 7, 59, 18, 62, 29, 54, 20, 32, 51, 0, 40, 10, 55, 6, 20, 36, 9, 61, 5, 51, 44, 19, 33, 43, 13, 57, 40, 63, 8, 24, 29, 10, 60, 34, 27, 40, 25, 18, 10, 42, 21, 49, 26, 62, 38, 12, 33, 61, 5, 57, 2, 19, 54, 28, 62, 22, 38, 31, 16, 7, 22, 47, 29, 17, 35, 8, 20, 51, 2, 40, 22, 50, 13, 61, 28, 53, 35, 20, 56, 30, 2, 53, 14, 41, 23, 34, 8, 31 },
{ 12, 2, 42, 29, 52, 13, 21, 8, 55, 14, 41, 17, 28, 58, 23, 11, 17, 36, 31, 62, 17, 34, 50, 14, 28, 61, 33, 52, 2, 51, 17, 45, 7, 25, 62, 30, 18, 55, 0, 42, 30, 35, 45, 1, 12, 48, 3, 63, 21, 36, 30, 48, 19, 59, 43, 27, 46, 17, 34, 25, 12, 29, 53, 6, 48, 31, 11, 34, 49, 3, 36, 50, 19, 47, 14, 61, 11, 36, 58, 4, 60, 14, 39, 22, 6, 52, 15, 35, 17, 46, 31, 42, 9, 34, 3, 52, 12, 60, 26, 56, 40, 2, 53, 23, 57, 38, 62, 14, 36, 59, 10, 31, 39, 6, 49, 9, 41, 26, 5, 48, 43, 27, 33, 58, 1, 50, 25, 57 },
{ 61, 37, 15, 61, 3, 39, 58, 43, 26, 0, 44, 10, 47, 3, 37, 63, 28, 43, 13, 39, 3, 57, 30, 59, 0, 48, 5, 43, 13, 22, 60, 33, 55, 15, 42, 4, 52, 10, 45, 13, 54, 4, 24, 49, 37, 26, 41, 14, 42, 9, 61, 13, 38, 23, 3, 53, 0, 58, 21, 42, 63, 10, 17, 61, 25, 0, 58, 28, 17, 44, 57, 12, 27, 0, 55, 5, 52, 28, 23, 47, 29, 0, 43, 17, 58, 28, 47, 23, 55, 10, 58, 23, 51, 40, 18, 33, 45, 0, 49, 8, 32, 61, 19, 48, 0, 26, 7, 47, 29, 18, 44, 0, 56, 34, 20, 59, 15, 51, 37, 18, 10, 52, 7, 20, 46, 9, 38, 17 },
{ 6, 27, 48, 23, 45, 29, 5, 18, 38, 62, 27, 56, 20, 32, 15, 9, 48, 0, 54, 22, 45, 20, 7, 41, 23, 39, 19, 27, 58, 31, 44, 0, 12, 50, 23, 56, 20, 39, 32, 59, 16, 52, 33, 9, 57, 22, 6, 58, 28, 50, 24, 2, 56, 35, 16, 45, 32, 38, 15, 54, 2, 38, 46, 22, 35, 45, 20, 5, 52, 25, 7, 35, 59, 32, 22, 43, 38, 3, 51, 16, 34, 53, 32, 50, 3, 40, 8, 43, 0, 39, 27, 4, 14, 61, 8, 55, 15, 41, 20, 44, 27, 13, 39, 11, 46, 42, 54, 33, 4, 52, 23, 61, 14, 25, 43, 2, 33, 11, 63, 29, 61, 17, 40, 55, 22, 62, 28, 44 },
{ 20, 54, 8, 56, 35, 10, 63, 31, 52, 12, 48, 6, 59, 41, 52, 33, 19, 58, 25, 49, 11, 37, 47, 12, 54, 15, 56, 35, 7, 47, 16, 53, 28, 34, 5, 37, 28, 8, 48, 3, 28, 38, 18, 61, 16, 43, 53, 32, 4, 17, 47, 27, 44, 8, 63, 10, 25, 49, 6, 37, 24, 52, 32, 3, 50, 12, 41, 56, 38, 14, 62, 20, 40, 16, 53, 31, 18, 63, 41, 9, 59, 7, 13, 25, 57, 20, 63, 26, 53, 18, 48, 62, 30, 46, 21, 25, 58, 29, 36, 4, 55, 34, 6, 60, 31, 16, 21, 12, 58, 38, 9, 29, 47, 7, 52, 30, 57, 44, 22, 0, 35, 45, 3, 31, 14, 36, 0, 51 },
{ 42, 14, 33, 24, 16, 49, 40, 2, 22, 33, 16, 36, 25, 1, 21, 61, 38, 8, 33, 4, 62, 26, 29, 60, 6, 46, 30, 11, 63, 4, 36, 40, 19, 57, 46, 11, 41, 63, 22, 25, 58, 10, 46, 2, 34, 27, 11, 38, 56, 34, 12, 53, 18, 33, 41, 51, 13, 28, 60, 20, 47, 14, 29, 59, 16, 62, 8, 22, 32, 47, 9, 49, 2, 44, 7, 12, 45, 6, 20, 27, 45, 24, 62, 42, 36, 11, 33, 15, 37, 7, 32, 10, 37, 1, 35, 50, 6, 11, 63, 24, 52, 15, 50, 24, 3, 37, 56, 27, 34, 22, 49, 16, 36, 62, 17, 39, 4, 15, 54, 24, 50, 8, 58, 26, 49, 54, 11, 30 },
{ 4, 59, 41, 1, 53, 12, 25, 45, 59, 7, 51, 39, 54, 14, 46, 4, 27, 53, 16, 44, 18, 51, 1, 32, 25, 2, 50, 40, 20, 54, 24, 9, 62, 2, 27, 60, 1, 17, 36, 50, 6, 40, 30, 55, 41, 19, 49, 1, 21, 60, 40, 5, 62, 1, 22, 30, 57, 4, 43, 31, 1, 55, 40, 7, 27, 37, 30, 54, 1, 19, 42, 30, 56, 26, 62, 49, 24, 57, 37, 56, 2, 39, 16, 5, 30, 55, 3, 49, 60, 23, 56, 44, 17, 52, 13, 42, 28, 48, 18, 45, 9, 37, 21, 41, 58, 10, 48, 1, 63, 5, 41, 57, 2, 24, 12, 48, 27, 42, 32, 46, 13, 38, 19, 34, 5, 41, 25, 60 },
{ 39, 28, 21, 46, 32, 57, 36, 9, 19, 42, 4, 29, 11, 43, 30, 49, 13, 42, 35, 56, 9, 39, 15, 52, 36, 61, 18, 26, 45, 14, 31, 48, 21, 43, 14, 33, 49, 54, 14, 44, 21, 62, 13, 23, 8, 62, 15, 51, 44, 7, 30, 37, 20, 42, 56, 7, 39, 18, 50, 11, 61, 9, 19, 43, 57, 2, 48, 11, 39, 60, 28, 4, 37, 17, 35, 1, 33, 11, 31, 14, 48, 19, 35, 51, 46, 21, 44, 29, 12, 41, 2, 22, 58, 26, 54, 4, 59, 38, 2, 33, 57, 1, 63, 13, 28, 51, 15, 40, 18, 45, 8, 30, 43, 37, 54, 19, 8, 59, 21, 6, 60, 29, 55, 10, 63, 15, 47, 17 },
{ 3, 50, 10, 62, 18, 5, 27, 49, 60, 23, 55, 18, 62, 24, 56, 10, 59, 28, 2, 23, 34, 59, 43, 20, 10, 42, 8, 49, 1, 37, 57, 6, 51, 29, 53, 7, 23, 31, 5, 32, 51, 0, 35, 54, 45, 31, 5, 26, 36, 24, 55, 15, 48, 29, 14, 48, 26, 60, 21, 41, 36, 26, 50, 33, 14, 44, 17, 24, 52, 15, 46, 23, 54, 6, 47, 21, 60, 50, 4, 53, 29, 61, 8, 23, 1, 60, 19, 6, 53, 16, 47, 34, 6, 39, 16, 31, 12, 20, 53, 22, 30, 43, 25, 46, 35, 6, 44, 32, 53, 26, 55, 19, 11, 59, 5, 33, 51, 1, 35, 53, 25, 3, 42, 23, 44, 32, 7, 53 },
{ 22, 44, 37, 6, 26, 51, 38, 0, 34, 13, 31, 46, 3, 37, 6, 19, 40, 21, 47, 63, 12, 5, 29, 55, 22, 58, 34, 28, 60, 22, 11, 41, 17, 38, 9, 44, 59, 39, 56, 19, 11, 47, 25, 15, 3, 39, 57, 17, 61, 11, 46, 3, 58, 9, 54, 35, 2, 34, 8, 45, 15, 56, 5, 23, 53, 33, 63, 35, 4, 59, 10, 51, 13, 61, 29, 41, 15, 25, 43, 19, 40, 10, 54, 33, 41, 12, 38, 51, 31, 26, 61, 9, 30, 45, 24, 62, 49, 40, 10, 61, 14, 49, 5, 17, 54, 20, 60, 23, 3, 13, 35, 50, 32, 23, 46, 27, 38, 63, 16, 12, 39, 48, 18, 51, 1, 27, 56, 35 },
{ 63, 15, 30, 55, 43, 14, 57, 17, 53, 44, 7, 48, 26, 50, 32, 60, 0, 53, 14, 31, 50, 24, 46, 0, 38, 13, 4, 52, 16, 45, 30, 59, 0, 25, 55, 35, 16, 10, 26, 42, 58, 29, 60, 38, 50, 22, 28, 47, 0, 50, 28, 19, 33, 39, 11, 44, 16, 52, 24, 59, 3, 38, 27, 51, 0, 21, 7, 42, 26, 34, 21, 40, 33, 18, 39, 3, 54, 38, 8, 59, 0, 44, 27, 15, 58, 28, 57, 9, 43, 0, 36, 50, 20, 59, 8, 34, 0, 27, 47, 7, 36, 19, 56, 32, 0, 38, 11, 29, 62, 47, 6, 61, 0, 41, 14, 56, 10, 23, 45, 31, 57, 8, 36, 13, 58, 38, 11, 19 },
{ 0, 34, 12, 47, 21, 2, 40, 30, 11, 25, 61, 20, 40, 15, 35, 22, 45, 36, 7, 41, 17, 57, 9, 48, 32, 62, 44, 24, 35, 3, 54, 13, 33, 63, 19, 4, 48, 22, 62, 2, 37, 8, 33, 6, 20, 52, 9, 32, 43, 13, 39, 63, 25, 4, 49, 23, 62, 32, 9, 30, 48, 18, 63, 12, 46, 29, 58, 13, 48, 8, 57, 31, 0, 51, 9, 58, 12, 22, 47, 29, 35, 22, 49, 5, 46, 4, 34, 20, 63, 24, 56, 11, 41, 3, 51, 19, 56, 35, 17, 58, 28, 42, 9, 45, 59, 26, 51, 42, 17, 36, 25, 15, 53, 21, 44, 3, 30, 55, 5, 50, 21, 28, 61, 32, 6, 49, 28, 46 },
{ 58, 42, 60, 4, 31, 59, 22, 63, 35, 38, 9, 54, 1, 57, 8, 51, 16, 58, 27, 53, 3, 38, 30, 15, 27, 6, 19, 56, 10, 50, 21, 36, 47, 5, 43, 28, 51, 32, 13, 46, 18, 54, 16, 43, 63, 12, 36, 59, 22, 34, 5, 52, 17, 59, 27, 41, 0, 19, 55, 37, 13, 43, 6, 34, 41, 10, 36, 55, 19, 44, 3, 16, 58, 27, 49, 25, 32, 62, 17, 55, 13, 63, 18, 52, 25, 37, 17, 48, 13, 32, 5, 46, 28, 37, 14, 43, 25, 5, 51, 39, 3, 52, 33, 22, 8, 40, 12, 4, 57, 9, 46, 39, 28, 58, 13, 62, 17, 42, 19, 36, 0, 47, 16, 43, 24, 21, 54, 13 },
{ 25, 9, 23, 50, 36, 8, 45, 14, 3, 51, 16, 28, 44, 12, 42, 29, 4, 26, 10, 47, 22, 61, 18, 54, 51, 39, 46, 13, 41, 26, 58, 7, 18, 39, 12, 57, 15, 1, 52, 27, 41, 23, 48, 1, 27, 45, 18, 2, 57, 26, 55, 8, 43, 31, 6, 58, 14, 51, 40, 5, 61, 31, 24, 54, 17, 60, 22, 1, 39, 30, 53, 45, 36, 13, 43, 5, 45, 2, 37, 6, 34, 42, 2, 39, 10, 62, 7, 54, 40, 18, 60, 15, 52, 21, 63, 8, 55, 46, 15, 30, 23, 13, 62, 16, 50, 24, 58, 31, 48, 21, 34, 2, 49, 7, 31, 37, 26, 48, 9, 61, 40, 11, 52, 2, 60, 40, 4, 37 },
{ 52, 28, 39, 16, 54, 19, 29, 55, 42, 20, 58, 33, 24, 63, 18, 55, 39, 62, 43, 34, 12, 40, 6, 35, 2, 25, 8, 62, 34, 1, 31, 42, 61, 27, 53, 24, 40, 61, 34, 8, 59, 4, 30, 56, 40, 6, 53, 42, 10, 48, 16, 37, 12, 46, 21, 36, 47, 11, 28, 45, 22, 10, 57, 2, 49, 31, 14, 44, 61, 11, 25, 6, 23, 63, 18, 36, 28, 56, 20, 51, 11, 48, 27, 56, 32, 22, 45, 30, 2, 42, 27, 39, 1, 44, 23, 31, 38, 22, 11, 61, 43, 54, 4, 47, 35, 2, 44, 16, 28, 54, 12, 62, 18, 43, 10, 52, 1, 58, 33, 15, 29, 56, 20, 34, 9, 30, 48, 17 },
{ 46, 2, 56, 11, 41, 1, 49, 6, 27, 47, 2, 48, 5, 32, 37, 3, 13, 19, 32, 1, 55, 28, 60, 17, 43, 59, 32, 20, 49, 16, 55, 23, 14, 46, 2, 36, 6, 30, 20, 49, 12, 47, 35, 14, 21, 60, 29, 14, 35, 24, 46, 1, 56, 29, 53, 8, 33, 23, 56, 1, 35, 46, 20, 39, 26, 4, 53, 28, 17, 38, 60, 34, 48, 9, 55, 15, 46, 7, 41, 31, 60, 24, 16, 36, 1, 59, 19, 52, 35, 6, 55, 11, 59, 33, 7, 57, 4, 29, 48, 1, 19, 26, 37, 30, 18, 63, 37, 6, 59, 1, 40, 24, 56, 33, 46, 22, 35, 7, 24, 53, 39, 5, 26, 45, 55, 18, 62, 7 },
{ 20, 60, 29, 34, 20, 62, 33, 52, 10, 36, 13, 60, 41, 21, 50, 27, 56, 49, 8, 51, 21, 45, 11, 48, 8, 23, 53, 3, 29, 44, 5, 52, 9, 32, 50, 17, 43, 56, 3, 38, 24, 10, 62, 25, 51, 9, 33, 49, 61, 7, 30, 62, 22, 19, 2, 42, 63, 5, 49, 18, 60, 15, 52, 7, 43, 56, 23, 50, 5, 50, 2, 20, 41, 30, 1, 52, 22, 61, 14, 26, 3, 43, 53, 7, 47, 28, 11, 14, 23, 58, 33, 25, 47, 13, 50, 17, 40, 54, 34, 60, 41, 6, 59, 14, 50, 7, 25, 55, 20, 42, 51, 8, 27, 4, 16, 60, 28, 50, 44, 3, 22, 49, 63, 12, 33, 1, 43, 31 },
{ 36, 5, 46, 8, 44, 24, 13, 39, 25, 57, 31, 18, 8, 52, 10, 45, 6, 30, 36, 24, 63, 4, 33, 26, 57, 40, 15, 56, 37, 12, 40, 25, 37, 58, 11, 63, 21, 45, 16, 60, 31, 53, 18, 33, 3, 45, 23, 0, 20, 54, 40, 15, 50, 38, 60, 16, 25, 42, 29, 38, 7, 41, 25, 62, 18, 33, 8, 35, 42, 16, 32, 56, 12, 39, 59, 19, 34, 9, 49, 38, 57, 12, 21, 50, 14, 40, 61, 44, 50, 9, 49, 19, 3, 29, 35, 62, 12, 24, 7, 18, 52, 32, 10, 46, 21, 41, 32, 11, 36, 29, 14, 34, 60, 38, 54, 11, 41, 14, 19, 57, 32, 16, 7, 41, 51, 25, 14, 57 },
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{ 53, 18, 26, 50, 15, 58, 4, 63, 17, 43, 7, 40, 61, 35, 15, 41, 23, 60, 16, 38, 14, 42, 19, 50, 0, 31, 10, 46, 27, 63, 18, 60, 0, 20, 29, 39, 8, 26, 37, 5, 42, 0, 44, 39, 57, 17, 58, 41, 28, 37, 4, 32, 9, 44, 12, 31, 54, 10, 59, 14, 27, 53, 12, 36, 0, 47, 13, 63, 21, 58, 10, 24, 50, 27, 4, 26, 44, 53, 31, 0, 18, 42, 29, 33, 57, 4, 32, 26, 0, 38, 16, 61, 41, 53, 20, 0, 42, 44, 49, 27, 10, 56, 39, 0, 57, 15, 53, 49, 3, 61, 22, 47, 17, 5, 49, 26, 2, 63, 39, 10, 47, 27, 37, 23, 4, 59, 38, 10 },
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 23, 39, 61, 3, 37, 28, 48, 31, 0, 34, 51, 23, 2, 26, 58, 0, 53, 11, 46, 1, 57, 29, 52, 14, 37, 61, 21, 35, 2, 49, 7, 34, 47, 55, 4, 33, 54, 13, 58, 52, 19, 50, 22, 7, 13, 29, 36, 11, 51, 17, 60, 25, 55, 4, 34, 51, 0, 35, 20, 48, 32, 3, 51, 30, 59, 28, 40, 3, 46, 29, 54, 43, 7, 62, 47, 11, 39, 4, 23, 46, 55, 8, 63, 5, 25, 37, 18, 46, 21, 56, 31, 5, 36, 8, 45, 58, 26, 15, 2, 36, 47, 21, 29, 44, 25, 34, 3, 27, 43, 10, 52, 0, 45, 30, 24, 36, 43, 18, 34, 59, 0, 52, 61, 15, 44, 19, 30, 49 },
{ 0, 27, 12, 43, 54, 9, 22, 53, 21, 46, 15, 55, 29, 47, 20, 33, 39, 28, 59, 35, 9, 44, 5, 24, 47, 7, 52, 17, 56, 22, 30, 42, 14, 26, 45, 18, 49, 1, 24, 34, 11, 27, 55, 32, 61, 47, 2, 56, 6, 44, 13, 47, 36, 27, 58, 22, 16, 47, 40, 4, 57, 38, 21, 45, 16, 9, 56, 26, 11, 38, 0, 22, 36, 17, 33, 57, 16, 30, 62, 15, 35, 40, 20, 45, 59, 10, 54, 8, 63, 13, 52, 27, 22, 57, 28, 12, 32, 51, 55, 22, 63, 4, 16, 54, 12, 62, 45, 19, 58, 13, 32, 40, 20, 56, 7, 57, 9, 54, 6, 29, 42, 21, 8, 55, 35, 47, 6, 41 },
{ 56, 33, 58, 32, 19, 35, 42, 6, 59, 11, 38, 5, 49, 12, 62, 7, 52, 17, 5, 25, 54, 20, 61, 31, 54, 27, 41, 11, 44, 5, 59, 12, 36, 51, 10, 61, 28, 41, 48, 9, 43, 63, 5, 40, 20, 8, 49, 26, 34, 21, 58, 1, 18, 45, 7, 39, 61, 26, 8, 50, 23, 10, 63, 5, 55, 37, 19, 49, 52, 15, 59, 47, 13, 54, 1, 25, 42, 58, 10, 48, 3, 27, 50, 1, 17, 48, 34, 41, 16, 40, 2, 45, 10, 39, 17, 61, 5, 38, 19, 9, 41, 31, 60, 38, 5, 23, 36, 8, 30, 55, 24, 63, 12, 48, 14, 51, 31, 20, 45, 25, 12, 50, 32, 2, 28, 11, 62, 14 },
{ 44, 16, 7, 48, 1, 62, 16, 50, 27, 33, 61, 25, 17, 44, 31, 14, 22, 43, 32, 48, 18, 40, 8, 36, 3, 16, 33, 62, 23, 38, 25, 53, 2, 21, 41, 6, 22, 15, 59, 29, 16, 37, 26, 15, 52, 42, 23, 15, 54, 39, 10, 30, 53, 11, 49, 24, 2, 43, 55, 17, 34, 44, 15, 31, 24, 44, 2, 32, 7, 35, 25, 5, 40, 45, 29, 51, 6, 21, 37, 52, 24, 60, 13, 31, 53, 23, 2, 28, 49, 24, 31, 60, 20, 51, 1, 34, 48, 14, 59, 33, 50, 1, 18, 33, 48, 60, 17, 51, 39, 6, 38, 2, 35, 29, 40, 23, 1, 62, 15, 53, 37, 17, 46, 57, 40, 51, 24, 22 },
{ 5, 37, 52, 24, 45, 13, 40, 3, 45, 9, 19, 42, 56, 4, 37, 46, 56, 2, 63, 11, 51, 1, 49, 13, 59, 45, 39, 1, 48, 15, 58, 9, 46, 31, 54, 35, 57, 38, 3, 46, 56, 4, 47, 57, 1, 30, 38, 63, 3, 46, 28, 63, 41, 14, 33, 62, 19, 32, 13, 28, 61, 1, 53, 42, 11, 60, 22, 62, 27, 42, 61, 31, 19, 8, 61, 12, 32, 55, 2, 18, 33, 12, 43, 36, 9, 62, 30, 55, 6, 58, 35, 7, 43, 29, 54, 23, 43, 30, 3, 25, 11, 45, 52, 28, 7, 14, 42, 1, 22, 50, 16, 53, 19, 59, 4, 46, 33, 41, 4, 35, 58, 5, 26, 13, 20, 2, 34, 54 },
{ 30, 63, 21, 10, 26, 55, 29, 59, 23, 39, 53, 1, 36, 24, 59, 27, 10, 34, 23, 38, 30, 60, 22, 42, 28, 19, 9, 57, 30, 19, 43, 33, 13, 63, 3, 19, 11, 50, 31, 20, 14, 34, 10, 35, 17, 59, 7, 31, 19, 25, 50, 5, 20, 57, 29, 6, 52, 41, 4, 46, 20, 37, 26, 17, 49, 6, 39, 18, 53, 14, 3, 49, 57, 23, 34, 48, 14, 41, 28, 38, 56, 6, 58, 25, 39, 19, 43, 15, 37, 11, 47, 18, 53, 4, 37, 9, 62, 21, 53, 40, 57, 24, 13, 40, 56, 26, 47, 31, 59, 25, 45, 27, 10, 43, 21, 61, 13, 27, 48, 9, 23, 43, 31, 62, 38, 59, 9, 47 },
{ 25, 4, 40, 60, 34, 6, 18, 36, 8, 57, 12, 30, 49, 14, 6, 54, 41, 16, 50, 6, 43, 15, 34, 4, 53, 24, 50, 35, 4, 51, 7, 55, 28, 24, 39, 44, 60, 7, 25, 62, 42, 53, 24, 61, 28, 45, 52, 12, 48, 37, 9, 35, 43, 3, 37, 48, 12, 58, 30, 52, 9, 59, 6, 57, 33, 29, 48, 4, 37, 45, 20, 34, 10, 39, 0, 60, 22, 45, 8, 63, 21, 42, 14, 49, 3, 56, 11, 46, 21, 61, 0, 42, 25, 13, 63, 17, 36, 8, 46, 16, 6, 35, 63, 0, 21, 37, 4, 57, 9, 34, 5, 61, 48, 32, 8, 37, 54, 17, 56, 30, 60, 0, 50, 16, 7, 29, 42, 17 },
{ 32, 50, 15, 48, 2, 43, 52, 25, 47, 16, 32, 63, 21, 52, 40, 19, 0, 61, 29, 58, 20, 56, 26, 46, 12, 55, 6, 22, 62, 32, 17, 40, 0, 49, 34, 8, 27, 32, 48, 0, 21, 39, 5, 44, 12, 6, 22, 40, 0, 57, 16, 60, 23, 17, 54, 22, 36, 15, 24, 39, 19, 34, 47, 23, 0, 54, 13, 51, 24, 9, 55, 16, 52, 27, 44, 20, 4, 54, 26, 49, 0, 30, 46, 16, 29, 51, 34, 4, 52, 28, 33, 15, 57, 39, 26, 49, 0, 56, 27, 31, 48, 20, 43, 29, 53, 11, 46, 19, 41, 13, 55, 18, 0, 57, 26, 51, 2, 44, 6, 38, 14, 40, 22, 45, 36, 53, 3, 57 },
{ 44, 12, 37, 28, 22, 57, 11, 38, 0, 51, 9, 41, 4, 29, 11, 47, 33, 45, 12, 26, 3, 36, 9, 63, 31, 16, 38, 44, 14, 47, 25, 61, 20, 58, 15, 47, 17, 57, 13, 36, 9, 51, 18, 29, 50, 36, 54, 20, 61, 27, 32, 13, 53, 44, 9, 27, 0, 63, 45, 2, 56, 10, 14, 43, 41, 28, 58, 11, 35, 60, 30, 41, 6, 63, 11, 51, 37, 32, 15, 10, 35, 53, 5, 61, 22, 7, 26, 59, 23, 9, 44, 48, 21, 3, 51, 32, 24, 41, 12, 61, 2, 55, 9, 15, 35, 58, 28, 15, 62, 30, 37, 23, 42, 29, 11, 17, 35, 24, 63, 20, 52, 28, 8, 55, 11, 23, 47, 19 },
{ 0, 56, 8, 53, 14, 31, 61, 20, 55, 28, 62, 18, 35, 60, 25, 57, 7, 23, 39, 54, 47, 17, 43, 0, 40, 59, 29, 2, 56, 10, 37, 5, 43, 11, 29, 52, 1, 23, 54, 41, 59, 30, 55, 1, 62, 15, 33, 4, 43, 10, 47, 39, 1, 31, 40, 60, 49, 33, 7, 55, 26, 50, 31, 61, 8, 18, 21, 32, 44, 1, 25, 47, 18, 36, 30, 23, 59, 7, 40, 59, 27, 19, 38, 32, 44, 54, 40, 17, 38, 60, 27, 6, 35, 55, 10, 14, 44, 5, 50, 17, 38, 26, 42, 50, 18, 3, 44, 52, 2, 49, 7, 52, 15, 46, 62, 39, 55, 10, 31, 48, 3, 58, 33, 18, 61, 34, 13, 59 },
{ 39, 27, 63, 20, 35, 41, 4, 45, 26, 5, 38, 13, 44, 2, 50, 17, 37, 52, 2, 13, 28, 58, 24, 51, 21, 8, 34, 48, 27, 42, 18, 51, 31, 56, 5, 36, 38, 44, 4, 17, 26, 11, 38, 23, 42, 8, 56, 39, 24, 51, 5, 56, 21, 59, 14, 6, 18, 42, 22, 35, 16, 37, 3, 25, 39, 46, 63, 5, 50, 17, 58, 8, 55, 3, 50, 12, 43, 17, 47, 2, 51, 9, 62, 12, 1, 35, 13, 50, 1, 37, 12, 51, 19, 29, 46, 59, 22, 58, 33, 45, 22, 60, 10, 32, 61, 39, 8, 33, 25, 36, 20, 60, 38, 4, 21, 5, 28, 45, 12, 18, 42, 11, 49, 1, 27, 40, 6, 30 },
{ 24, 16, 42, 1, 50, 10, 48, 17, 33, 43, 24, 48, 21, 55, 31, 42, 10, 21, 63, 35, 49, 6, 33, 13, 41, 53, 10, 20, 60, 6, 53, 26, 12, 41, 22, 60, 14, 28, 63, 33, 49, 3, 45, 16, 48, 26, 14, 46, 18, 30, 35, 26, 8, 50, 29, 51, 25, 57, 12, 47, 53, 9, 62, 20, 54, 2, 36, 15, 40, 28, 33, 13, 38, 24, 46, 1, 29, 56, 33, 20, 44, 24, 41, 26, 57, 20, 63, 8, 30, 55, 5, 41, 62, 8, 34, 2, 37, 10, 19, 6, 37, 1, 53, 23, 5, 27, 58, 22, 43, 12, 50, 26, 9, 34, 54, 32, 49, 1, 59, 37, 22, 46, 25, 36, 51, 15, 54, 46 },
{ 52, 7, 45, 33, 26, 58, 14, 60, 7, 54, 3, 58, 8, 34, 14, 5, 59, 30, 18, 44, 8, 22, 48, 62, 3, 26, 55, 38, 23, 16, 39, 1, 62, 24, 49, 9, 53, 19, 46, 7, 19, 60, 31, 58, 2, 34, 53, 7, 59, 2, 62, 42, 46, 19, 36, 11, 44, 4, 38, 28, 1, 43, 32, 51, 12, 29, 56, 22, 52, 2, 62, 49, 22, 60, 14, 35, 63, 5, 25, 57, 14, 53, 4, 46, 18, 31, 42, 22, 47, 20, 58, 31, 16, 43, 23, 54, 30, 42, 52, 57, 29, 49, 30, 13, 45, 48, 16, 55, 6, 63, 1, 44, 14, 58, 19, 47, 15, 24, 51, 34, 6, 55, 5, 63, 20, 41, 21, 9 },
{ 30, 62, 18, 55, 5, 23, 39, 29, 49, 30, 15, 36, 28, 46, 60, 25, 39, 46, 4, 32, 61, 40, 15, 30, 36, 45, 14, 2, 49, 33, 57, 45, 18, 32, 3, 45, 30, 2, 35, 52, 40, 27, 13, 21, 38, 63, 20, 28, 37, 23, 16, 10, 13, 55, 2, 62, 21, 32, 60, 17, 58, 23, 5, 40, 16, 48, 7, 45, 10, 26, 43, 19, 6, 31, 52, 21, 39, 16, 48, 9, 37, 28, 36, 55, 7, 48, 3, 59, 15, 45, 25, 1, 53, 13, 47, 7, 62, 15, 4, 25, 12, 41, 18, 60, 38, 11, 34, 19, 39, 31, 29, 56, 23, 42, 3, 27, 60, 41, 8, 16, 61, 29, 43, 9, 32, 2, 60, 34 },
{ 3, 38, 13, 37, 52, 44, 2, 19, 12, 42, 63, 19, 40, 1, 20, 50, 12, 55, 15, 56, 27, 1, 54, 11, 57, 18, 32, 63, 44, 4, 29, 13, 37, 61, 35, 16, 42, 57, 12, 22, 6, 55, 43, 10, 50, 5, 44, 11, 48, 52, 34, 58, 28, 41, 38, 30, 7, 52, 11, 49, 30, 14, 45, 27, 59, 34, 21, 38, 32, 58, 11, 36, 56, 42, 9, 41, 3, 54, 31, 42, 0, 60, 16, 11, 39, 24, 52, 33, 6, 36, 10, 40, 32, 60, 26, 20, 39, 28, 47, 34, 63, 8, 54, 3, 24, 56, 0, 51, 13, 47, 16, 40, 7, 35, 52, 11, 36, 4, 57, 30, 39, 13, 18, 50, 58, 28, 12, 48 },
{ 57, 24, 49, 21, 10, 31, 61, 36, 56, 0, 22, 53, 11, 56, 32, 7, 36, 27, 41, 9, 46, 19, 34, 42, 25, 7, 50, 9, 28, 21, 54, 8, 50, 7, 27, 59, 10, 25, 48, 62, 37, 0, 33, 58, 25, 18, 32, 61, 0, 15, 45, 5, 50, 3, 23, 55, 47, 17, 40, 6, 60, 34, 53, 8, 41, 0, 61, 13, 54, 4, 46, 28, 0, 17, 48, 27, 58, 13, 23, 61, 33, 21, 50, 30, 62, 8, 14, 29, 56, 27, 61, 49, 17, 2, 44, 11, 51, 0, 59, 17, 40, 20, 32, 47, 36, 21, 42, 28, 60, 4, 54, 10, 59, 17, 30, 62, 21, 43, 26, 48, 0, 56, 36, 25, 8, 44, 39, 17 },
{ 10, 42, 4, 59, 27, 47, 8, 23, 51, 32, 45, 6, 37, 26, 48, 43, 62, 0, 21, 53, 38, 12, 51, 5, 60, 47, 24, 37, 59, 15, 35, 47, 22, 55, 0, 50, 21, 40, 6, 29, 15, 52, 24, 8, 41, 55, 13, 29, 40, 56, 24, 31, 19, 33, 61, 15, 0, 35, 24, 42, 21, 2, 19, 57, 24, 15, 30, 50, 20, 25, 40, 16, 57, 34, 61, 8, 29, 45, 6, 49, 11, 47, 2, 44, 19, 57, 38, 50, 12, 42, 21, 4, 35, 52, 28, 56, 23, 36, 13, 45, 4, 52, 27, 14, 6, 62, 9, 45, 21, 37, 25, 46, 33, 49, 0, 44, 7, 53, 13, 19, 53, 31, 3, 47, 15, 56, 22, 51 },
{ 35, 28, 53, 32, 1, 16, 54, 40, 9, 17, 25, 58, 14, 59, 3, 22, 16, 51, 31, 5, 23, 58, 28, 17, 35, 20, 0, 42, 11, 52, 3, 31, 41, 17, 43, 13, 32, 54, 18, 60, 32, 45, 17, 49, 2, 36, 51, 22, 7, 36, 9, 63, 48, 12, 46, 26, 43, 28, 63, 13, 48, 37, 51, 33, 5, 47, 55, 9, 42, 63, 7, 51, 24, 12, 37, 19, 55, 34, 18, 38, 15, 28, 54, 34, 5, 43, 22, 0, 48, 14, 54, 24, 58, 9, 38, 5, 32, 55, 21, 30, 49, 9, 59, 43, 30, 51, 35, 26, 7, 53, 2, 22, 14, 27, 57, 18, 38, 24, 33, 45, 10, 41, 20, 60, 37, 5, 32, 0 },
{ 63, 19, 15, 40, 62, 35, 14, 28, 46, 61, 4, 49, 35, 10, 29, 54, 33, 8, 45, 62, 37, 1, 43, 55, 10, 52, 61, 30, 19, 40, 25, 62, 11, 38, 27, 58, 36, 3, 46, 8, 39, 4, 62, 28, 47, 20, 4, 54, 47, 27, 43, 1, 21, 38, 8, 58, 10, 54, 4, 56, 9, 26, 12, 39, 60, 27, 18, 37, 1, 31, 35, 5, 45, 50, 2, 43, 26, 1, 59, 23, 56, 40, 7, 26, 58, 17, 32, 63, 25, 39, 7, 31, 45, 19, 63, 15, 48, 8, 37, 61, 16, 34, 1, 56, 18, 3, 15, 58, 49, 32, 63, 41, 55, 5, 40, 22, 50, 6, 59, 2, 63, 23, 52, 11, 26, 61, 44, 23 },
{ 11, 56, 46, 6, 22, 43, 58, 3, 34, 21, 38, 30, 18, 44, 52, 13, 41, 57, 17, 28, 14, 49, 25, 7, 33, 39, 26, 6, 56, 48, 1, 20, 56, 5, 46, 9, 19, 51, 30, 25, 56, 21, 35, 14, 57, 42, 16, 33, 10, 57, 17, 59, 41, 25, 53, 37, 20, 40, 30, 18, 31, 62, 44, 22, 3, 44, 11, 48, 23, 53, 18, 60, 29, 22, 62, 15, 53, 47, 10, 41, 3, 19, 52, 36, 13, 46, 10, 35, 3, 61, 41, 16, 1, 50, 26, 42, 18, 46, 2, 25, 54, 20, 39, 23, 47, 31, 41, 12, 38, 17, 8, 19, 31, 48, 12, 61, 9, 54, 29, 35, 15, 38, 6, 43, 34, 14, 7, 47 },
{ 39, 2, 33, 26, 53, 8, 18, 50, 41, 12, 53, 1, 63, 24, 19, 39, 2, 24, 47, 10, 60, 38, 19, 63, 48, 4, 15, 45, 32, 14, 60, 36, 29, 53, 23, 63, 34, 12, 61, 1, 43, 11, 53, 30, 1, 26, 60, 45, 23, 39, 3, 29, 12, 50, 4, 16, 51, 3, 45, 36, 50, 1, 16, 54, 35, 14, 57, 30, 58, 9, 46, 14, 41, 10, 32, 38, 4, 30, 21, 51, 32, 63, 25, 1, 60, 27, 53, 18, 51, 22, 28, 55, 34, 12, 40, 3, 60, 29, 57, 41, 6, 44, 11, 53, 8, 61, 24, 57, 1, 28, 44, 59, 36, 3, 34, 25, 41, 31, 16, 44, 22, 47, 28, 58, 1, 49, 54, 29 },
{ 58, 25, 50, 13, 38, 30, 60, 24, 6, 57, 27, 42, 9, 45, 6, 61, 30, 50, 4, 34, 29, 3, 46, 13, 22, 42, 58, 28, 9, 39, 23, 44, 7, 15, 44, 2, 40, 15, 47, 41, 23, 37, 7, 59, 38, 11, 34, 6, 62, 14, 52, 35, 55, 19, 32, 61, 33, 24, 57, 6, 22, 59, 29, 7, 49, 25, 40, 3, 17, 39, 27, 52, 0, 55, 16, 57, 24, 61, 36, 6, 29, 12, 48, 39, 20, 44, 6, 40, 33, 5, 48, 10, 57, 36, 22, 51, 33, 9, 24, 12, 62, 29, 50, 35, 14, 43, 5, 33, 47, 52, 13, 23, 10, 51, 56, 16, 46, 1, 49, 4, 61, 9, 52, 18, 31, 21, 36, 17 },
{ 19, 42, 9, 48, 2, 44, 11, 37, 48, 20, 33, 16, 55, 35, 49, 15, 37, 20, 59, 16, 53, 22, 56, 31, 50, 11, 34, 54, 16, 51, 4, 49, 33, 53, 21, 28, 56, 24, 31, 9, 52, 16, 48, 24, 44, 13, 51, 20, 31, 49, 18, 6, 34, 2, 44, 14, 47, 8, 15, 43, 13, 41, 33, 52, 20, 61, 7, 51, 34, 62, 4, 20, 36, 33, 43, 8, 46, 13, 53, 17, 45, 42, 9, 31, 52, 11, 30, 56, 13, 59, 17, 44, 27, 6, 62, 11, 43, 17, 49, 38, 26, 2, 16, 27, 58, 21, 54, 18, 26, 5, 35, 61, 43, 27, 7, 39, 14, 58, 37, 55, 20, 33, 13, 40, 62, 10, 55, 5 },
{ 51, 14, 61, 29, 59, 20, 55, 31, 0, 49, 11, 60, 3, 26, 22, 56, 0, 40, 12, 43, 41, 8, 36, 0, 17, 57, 24, 2, 46, 26, 61, 18, 0, 38, 12, 59, 6, 49, 3, 57, 19, 63, 5, 33, 18, 54, 28, 56, 0, 43, 26, 46, 63, 27, 56, 22, 27, 54, 38, 28, 63, 24, 10, 45, 0, 31, 42, 21, 12, 25, 44, 49, 59, 6, 26, 50, 3, 34, 27, 59, 0, 35, 62, 16, 4, 58, 47, 0, 43, 24, 37, 2, 54, 20, 46, 31, 0, 56, 34, 5, 55, 45, 60, 37, 0, 40, 10, 38, 63, 46, 15, 20, 0, 53, 21, 62, 30, 11, 24, 27, 40, 0, 57, 26, 3, 45, 27, 35 },
};
#else
#define DM_WIDTH 8
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
#define DM_WIDTH_SHIFT 3
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define DM_HEIGHT 8
I submitted this patch twice to gtk-devel-list, and received no comments, I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
1998-11-30 19:07:15 +00:00
static const guchar DM[8][8] =
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{ 0, 32, 8, 40, 2, 34, 10, 42 },
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 48, 16, 56, 24, 50, 18, 58, 26 },
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{ 12, 44, 4, 36, 14, 46, 6, 38 },
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 60, 28, 52, 20, 62, 30, 54, 22 },
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{ 3, 35, 11, 43, 1, 33, 9, 41 },
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 51, 19, 59, 27, 49, 17, 57, 25 },
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{ 15, 47, 7, 39, 13, 45, 5, 37 },
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{ 63, 31, 55, 23, 61, 29, 53, 21 }
};
#endif
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
static guint32 *DM_565 = NULL;
static void
gdk_rgb_preprocess_dm_565 (void)
{
int i;
guint32 dith;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
if (DM_565 == NULL)
{
DM_565 = g_new (guint32, DM_WIDTH * DM_HEIGHT);
for (i = 0; i < DM_WIDTH * DM_HEIGHT; i++)
{
dith = DM[0][i] >> 3;
DM_565[i] = (dith << 20) | dith | (((7 - dith) >> 1) << 10);
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("%i %x %x\n", i, dith, DM_565[i]);
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
#endif
}
}
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
static void
gdk_rgb_convert_8_d666 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gint dith;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 7;
r = ((r * 5) + dith) >> 8;
g = ((g * 5) + (262 - dith)) >> 8;
b = ((b * 5) + dith) >> 8;
obptr[0] = colorcube_d[(r << 6) | (g << 3) | b];
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_8_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gint dith;
gint rs, gs, bs;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
rs = image_info->nred_shades - 1;
gs = image_info->ngreen_shades - 1;
bs = image_info->nblue_shades - 1;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 7;
r = ((r * rs) + dith) >> 8;
g = ((g * gs) + (262 - dith)) >> 8;
b = ((b * bs) + dith) >> 8;
obptr[0] = colorcube_d[(r << 6) | (g << 3) | b];
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_8_indexed (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
guchar c;
guchar *lut;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
lut = cmap->lut;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
c = *bp2++;
obptr[0] = lut[c];
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_gray8 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
obptr[0] = (g + ((b + r) >> 1)) >> 1;
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_gray8_gray (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int y;
gint bpl;
guchar *obuf;
guchar *bptr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
memcpy (obuf, bptr, width);
bptr += rowstride;
obuf += bpl;
}
}
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define HAIRY_CONVERT_565
#endif
#ifdef HAIRY_CONVERT_565
/* Render a 24-bit RGB image in buf into the GdkImage, without dithering.
This assumes native byte ordering - what should really be done is to
check whether static_image->byte_order is consistent with the _ENDIAN
config flag, and if not, use a different function.
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
This one is even faster than the one below - its inner loop loads 3
words (i.e. 4 24-bit pixels), does a lot of shifting and masking,
then writes 2 words. */
static void
gdk_rgb_convert_565 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
guchar r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
if (((unsigned long)obuf | (unsigned long) bp2) & 3)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
((guint16 *)obptr)[0] = ((r & 0xf8) << 8) |
((g & 0xfc) << 3) |
(b >> 3);
obptr += 2;
}
}
else
{
for (x = 0; x < width - 3; x += 4)
{
guint32 r1b0g0r0;
guint32 g2r2b1g1;
guint32 b3g3r3b2;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r1b0g0r0 = ((guint32 *)bp2)[0];
g2r2b1g1 = ((guint32 *)bp2)[1];
b3g3r3b2 = ((guint32 *)bp2)[2];
((guint32 *)obptr)[0] =
((r1b0g0r0 & 0xf8) << 8) |
((r1b0g0r0 & 0xfc00) >> 5) |
((r1b0g0r0 & 0xf80000) >> 19) |
(r1b0g0r0 & 0xf8000000) |
((g2r2b1g1 & 0xfc) << 19) |
((g2r2b1g1 & 0xf800) << 5);
((guint32 *)obptr)[1] =
((g2r2b1g1 & 0xf80000) >> 8) |
((g2r2b1g1 & 0xfc000000) >> 21) |
((b3g3r3b2 & 0xf8) >> 3) |
((b3g3r3b2 & 0xf800) << 16) |
((b3g3r3b2 & 0xfc0000) << 3) |
((b3g3r3b2 & 0xf8000000) >> 11);
bp2 += 12;
obptr += 8;
}
for (; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
((guint16 *)obptr)[0] = ((r & 0xf8) << 8) |
((g & 0xfc) << 3) |
(b >> 3);
obptr += 2;
}
}
bptr += rowstride;
obuf += bpl;
}
}
#else
/* Render a 24-bit RGB image in buf into the GdkImage, without dithering.
This assumes native byte ordering - what should really be done is to
check whether static_image->byte_order is consistent with the _ENDIAN
config flag, and if not, use a different function.
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
This routine is faster than the one included with Gtk 1.0 for a number
of reasons:
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
1. Shifting instead of lookup tables (less memory traffic).
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
2. Much less register pressure, especially because shifts are
in the code.
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
3. A memcpy is avoided (i.e. the transfer function).
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
4. On big-endian architectures, byte swapping is avoided.
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
That said, it wouldn't be hard to make it even faster - just make an
inner loop that reads 3 words (i.e. 4 24-bit pixels), does a lot of
shifting and masking, then writes 2 words.
*/
static void
gdk_rgb_convert_565 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
guchar r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
((unsigned short *)obuf)[x] = ((r & 0xf8) << 8) |
((g & 0xfc) << 3) |
(b >> 3);
}
bptr += rowstride;
obuf += bpl;
}
}
#endif
#ifdef HAIRY_CONVERT_565
static void
gdk_rgb_convert_565_gray (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
guchar g;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
if (((unsigned long)obuf | (unsigned long) bp2) & 3)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
for (x = 0; x < width; x++)
{
g = *bp2++;
((guint16 *)obptr)[0] = ((g & 0xf8) << 8) |
((g & 0xfc) << 3) |
(g >> 3);
obptr += 2;
}
}
else
{
for (x = 0; x < width - 3; x += 4)
{
guint32 g3g2g1g0;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
g3g2g1g0 = ((guint32 *)bp2)[0];
((guint32 *)obptr)[0] =
((g3g2g1g0 & 0xf8) << 8) |
((g3g2g1g0 & 0xfc) << 3) |
((g3g2g1g0 & 0xf8) >> 3) |
(g3g2g1g0 & 0xf800) << 16 |
((g3g2g1g0 & 0xfc00) << 11) |
((g3g2g1g0 & 0xf800) << 5);
((guint32 *)obptr)[1] =
((g3g2g1g0 & 0xf80000) >> 8) |
((g3g2g1g0 & 0xfc0000) >> 13) |
((g3g2g1g0 & 0xf80000) >> 19) |
(g3g2g1g0 & 0xf8000000) |
((g3g2g1g0 & 0xfc000000) >> 5) |
((g3g2g1g0 & 0xf8000000) >> 11);
bp2 += 4;
obptr += 8;
}
for (; x < width; x++)
{
g = *bp2++;
((guint16 *)obptr)[0] = ((g & 0xf8) << 8) |
((g & 0xfc) << 3) |
(g >> 3);
obptr += 2;
}
}
bptr += rowstride;
obuf += bpl;
}
}
#else
static void
gdk_rgb_convert_565_gray (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
guchar g;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
g = *bp2++;
actually builds and runs properly on big endian machines now, because we * gdk/gdkrgb.c: actually builds and runs properly on big endian machines now, because we #include config.h. Also fixed up a compile error in the WORDS_BIGENDIAN case in gdk_rgb_convert_565_gray. I made the fix by looking at patterns in the other code; Raph can you verify this? * gdk/gdkthreads.c: #include <unistd.h> to quell compiler warnings -Yosh
1998-07-22 22:22:05 +00:00
((guint16 *)obuf)[x] = ((g & 0xf8) << 8) |
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
((g & 0xfc) << 3) |
(g >> 3);
}
bptr += rowstride;
obuf += bpl;
}
}
#endif
static void
gdk_rgb_convert_565_br (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
guchar r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
/* final word is:
g4 g3 g2 b7 b6 b5 b4 b3 r7 r6 r5 r4 r3 g7 g6 g5
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
*/
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
((unsigned short *)obuf)[x] = (r & 0xf8) |
((g & 0xe0) >> 5) |
((g & 0x1c) << 11) |
((b & 0xf8) << 5);
}
bptr += rowstride;
obuf += bpl;
}
}
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
/* Thanks to Ray Lehtiniemi for a patch that resulted in a ~25% speedup
in this mode. */
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
#ifdef HAIRY_CONVERT_565
static void
gdk_rgb_convert_565_d (GdkImage *image,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
{
/* Now this is what I'd call some highly tuned code! */
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
width += x_align;
height += y_align;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = y_align; y < height; y++)
{
guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
bp2 = bptr;
obptr = obuf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
if (((unsigned long)obuf | (unsigned long) bp2) & 3)
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
{
for (x = x_align; x < width; x++)
{
gint32 rgb = *bp2++ << 20;
rgb += *bp2++ << 10;
rgb += *bp2++;
rgb += dmp[x & (DM_WIDTH - 1)];
rgb += 0x10040100
- ((rgb & 0x1e0001e0) >> 5)
- ((rgb & 0x00070000) >> 6);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
((unsigned short *)obptr)[0] =
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
((rgb & 0x0f800000) >> 12) |
((rgb & 0x0003f000) >> 7) |
((rgb & 0x000000f8) >> 3);
obptr += 2;
}
}
else
{
for (x = x_align; x < width - 3; x += 4)
{
guint32 r1b0g0r0;
guint32 g2r2b1g1;
guint32 b3g3r3b2;
guint32 rgb02, rgb13;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
r1b0g0r0 = ((guint32 *)bp2)[0];
g2r2b1g1 = ((guint32 *)bp2)[1];
b3g3r3b2 = ((guint32 *)bp2)[2];
rgb02 =
((r1b0g0r0 & 0xff) << 20) +
((r1b0g0r0 & 0xff00) << 2) +
((r1b0g0r0 & 0xff0000) >> 16) +
dmp[x & (DM_WIDTH - 1)];
rgb02 += 0x10040100
- ((rgb02 & 0x1e0001e0) >> 5)
- ((rgb02 & 0x00070000) >> 6);
rgb13 =
((r1b0g0r0 & 0xff000000) >> 4) +
((g2r2b1g1 & 0xff) << 10) +
((g2r2b1g1 & 0xff00) >> 8) +
dmp[(x + 1) & (DM_WIDTH - 1)];
rgb13 += 0x10040100
- ((rgb13 & 0x1e0001e0) >> 5)
- ((rgb13 & 0x00070000) >> 6);
((guint32 *)obptr)[0] =
((rgb02 & 0x0f800000) >> 12) |
((rgb02 & 0x0003f000) >> 7) |
((rgb02 & 0x000000f8) >> 3) |
((rgb13 & 0x0f800000) << 4) |
((rgb13 & 0x0003f000) << 9) |
((rgb13 & 0x000000f8) << 13);
rgb02 =
((g2r2b1g1 & 0xff0000) << 4) +
((g2r2b1g1 & 0xff000000) >> 14) +
(b3g3r3b2 & 0xff) +
dmp[(x + 2) & (DM_WIDTH - 1)];
rgb02 += 0x10040100
- ((rgb02 & 0x1e0001e0) >> 5)
- ((rgb02 & 0x00070000) >> 6);
rgb13 =
((b3g3r3b2 & 0xff00) << 12) +
((b3g3r3b2 & 0xff0000) >> 6) +
((b3g3r3b2 & 0xff000000) >> 24) +
dmp[(x + 3) & (DM_WIDTH - 1)];
rgb13 += 0x10040100
- ((rgb13 & 0x1e0001e0) >> 5)
- ((rgb13 & 0x00070000) >> 6);
((guint32 *)obptr)[1] =
((rgb02 & 0x0f800000) >> 12) |
((rgb02 & 0x0003f000) >> 7) |
((rgb02 & 0x000000f8) >> 3) |
((rgb13 & 0x0f800000) << 4) |
((rgb13 & 0x0003f000) << 9) |
((rgb13 & 0x000000f8) << 13);
bp2 += 12;
obptr += 8;
}
for (; x < width; x++)
{
gint32 rgb = *bp2++ << 20;
rgb += *bp2++ << 10;
rgb += *bp2++;
rgb += dmp[x & (DM_WIDTH - 1)];
rgb += 0x10040100
- ((rgb & 0x1e0001e0) >> 5)
- ((rgb & 0x00070000) >> 6);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
((unsigned short *)obptr)[0] =
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
((rgb & 0x0f800000) >> 12) |
((rgb & 0x0003f000) >> 7) |
((rgb & 0x000000f8) >> 3);
obptr += 2;
}
}
bptr += rowstride;
obuf += bpl;
}
}
#else
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
static void
gdk_rgb_convert_565_d (GdkImage *image,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
int x, y;
guchar *obuf;
gint bpl;
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
guchar *bptr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
width += x_align;
height += y_align;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
obuf = ((guchar *)image->mem) + y0 * bpl + (x0 - x_align) * 2;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
for (y = y_align; y < height; y++)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
guchar *bp2 = bptr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Committing a patch by Ray Lehtiniemi to speed up 565_d by 25%.
1998-08-14 04:06:42 +00:00
for (x = x_align; x < width; x++)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{
gint32 rgb = *bp2++ << 20;
rgb += *bp2++ << 10;
rgb += *bp2++;
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
rgb += dmp[x & (DM_WIDTH - 1)];
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
rgb += 0x10040100
- ((rgb & 0x1e0001e0) >> 5)
- ((rgb & 0x00070000) >> 6);
((unsigned short *)obuf)[x] =
((rgb & 0x0f800000) >> 12) |
((rgb & 0x0003f000) >> 7) |
((rgb & 0x000000f8) >> 3);
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr += rowstride;
obuf += bpl;
}
}
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
#endif
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
static void
gdk_rgb_convert_555 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
guchar r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
((unsigned short *)obuf)[x] = ((r & 0xf8) << 7) |
((g & 0xf8) << 2) |
(b >> 3);
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_555_br (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
guchar r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
/* final word is:
g5 g4 g3 b7 b6 b5 b4 b3 0 r7 r6 r5 r4 r3 g7 g6
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
*/
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
((unsigned short *)obuf)[x] = ((r & 0xf8) >> 1) |
((g & 0xc0) >> 6) |
((g & 0x18) << 10) |
((b & 0xf8) << 5);
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_888_msb (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int y;
guchar *obuf;
gint bpl;
guchar *bptr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
for (y = 0; y < height; y++)
{
memcpy (obuf, bptr, width + width + width);
bptr += rowstride;
obuf += bpl;
}
}
/* todo: optimize this */
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#define HAIRY_CONVERT_888
#endif
#ifdef HAIRY_CONVERT_888
static void
gdk_rgb_convert_888_lsb (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
int r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
if (((unsigned long)obuf | (unsigned long) bp2) & 3)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
*obptr++ = b;
*obptr++ = g;
*obptr++ = r;
bp2 += 3;
}
}
else
{
for (x = 0; x < width - 3; x += 4)
{
guint32 r1b0g0r0;
guint32 g2r2b1g1;
guint32 b3g3r3b2;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r1b0g0r0 = ((guint32 *)bp2)[0];
g2r2b1g1 = ((guint32 *)bp2)[1];
b3g3r3b2 = ((guint32 *)bp2)[2];
((guint32 *)obptr)[0] =
(r1b0g0r0 & 0xff00) |
((r1b0g0r0 & 0xff0000) >> 16) |
(((g2r2b1g1 & 0xff00) | (r1b0g0r0 & 0xff)) << 16);
((guint32 *)obptr)[1] =
(g2r2b1g1 & 0xff0000ff) |
((r1b0g0r0 & 0xff000000) >> 16) |
((b3g3r3b2 & 0xff) << 16);
((guint32 *)obptr)[2] =
(((g2r2b1g1 & 0xff0000) | (b3g3r3b2 & 0xff000000)) >> 16) |
((b3g3r3b2 & 0xff00) << 16) |
((b3g3r3b2 & 0xff0000));
bp2 += 12;
obptr += 12;
}
for (; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
*obptr++ = b;
*obptr++ = g;
*obptr++ = r;
bp2 += 3;
}
}
bptr += rowstride;
obuf += bpl;
}
}
#else
static void
gdk_rgb_convert_888_lsb (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
int r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
obuf[x * 3] = b;
obuf[x * 3 + 1] = g;
obuf[x * 3 + 2] = r;
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
#endif
/* convert 24-bit packed to 32-bit unpacked */
/* todo: optimize this */
static void
gdk_rgb_convert_0888 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
int r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
Fixed an alpha bug.
1998-10-05 22:30:08 +00:00
((guint32 *)obuf)[x] = (r << 16) | (g << 8) | b;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_0888_br (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
int r, g, b;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
Fixed an alpha bug.
1998-10-05 22:30:08 +00:00
((guint32 *)obuf)[x] = (b << 24) | (g << 16) | (r << 8);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
static void
gdk_rgb_convert_8880_br (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf;
gint bpl;
guchar *bptr, *bp2;
int r, g, b;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
for (y = 0; y < height; y++)
{
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
Fixed an alpha bug.
1998-10-05 22:30:08 +00:00
((guint32 *)obuf)[x] = (b << 16) | (g << 8) | r;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* Generic truecolor/directcolor conversion function. Slow, but these
are oddball modes. */
static void
gdk_rgb_convert_truecolor_lsb (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
gint r, g, b;
gint r_right, r_left;
gint g_right, g_left;
gint b_right, b_left;
gint bpp;
guint32 pixel;
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
g_right = 8 - image_info->visual->green_prec;
g_left = image_info->visual->green_shift;
b_right = 8 - image_info->visual->blue_prec;
b_left = image_info->visual->blue_shift;
bpp = image_info->bpp;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
for (y = 0; y < height; y++)
{
obptr = obuf;
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
pixel = ((r >> r_right) << r_left) |
((g >> g_right) << g_left) |
((b >> b_right) << b_left);
for (i = 0; i < bpp; i++)
{
*obptr++ = pixel & 0xff;
pixel >>= 8;
}
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_truecolor_lsb_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
gint r, g, b;
gint r_right, r_left, r_prec;
gint g_right, g_left, g_prec;
gint b_right, b_left, b_prec;
gint bpp;
guint32 pixel;
gint i;
gint dith;
gint r1, g1, b1;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
r_prec = image_info->visual->red_prec;
g_right = 8 - image_info->visual->green_prec;
g_left = image_info->visual->green_shift;
g_prec = image_info->visual->green_prec;
b_right = 8 - image_info->visual->blue_prec;
b_left = image_info->visual->blue_shift;
b_prec = image_info->visual->blue_prec;
bpp = image_info->bpp;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
obptr = obuf;
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
dith = dmp[(x_align + x) & (DM_WIDTH - 1)] << 2;
r1 = r + (dith >> r_prec);
g1 = g + ((252 - dith) >> g_prec);
b1 = b + (dith >> b_prec);
pixel = (((r1 - (r1 >> r_prec)) >> r_right) << r_left) |
(((g1 - (g1 >> g_prec)) >> g_right) << g_left) |
(((b1 - (b1 >> b_prec)) >> b_right) << b_left);
for (i = 0; i < bpp; i++)
{
*obptr++ = pixel & 0xff;
pixel >>= 8;
}
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_truecolor_msb (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
gint r, g, b;
gint r_right, r_left;
gint g_right, g_left;
gint b_right, b_left;
gint bpp;
guint32 pixel;
gint shift, shift_init;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
g_right = 8 - image_info->visual->green_prec;
g_left = image_info->visual->green_shift;
b_right = 8 - image_info->visual->blue_prec;
b_left = image_info->visual->blue_shift;
bpp = image_info->bpp;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
shift_init = (bpp - 1) << 3;
for (y = 0; y < height; y++)
{
obptr = obuf;
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
pixel = ((r >> r_right) << r_left) |
((g >> g_right) << g_left) |
((b >> b_right) << b_left);
for (shift = shift_init; shift >= 0; shift -= 8)
{
*obptr++ = (pixel >> shift) & 0xff;
}
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
static void
gdk_rgb_convert_truecolor_msb_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
guchar *obuf, *obptr;
gint bpl;
guchar *bptr, *bp2;
gint r, g, b;
gint r_right, r_left, r_prec;
gint g_right, g_left, g_prec;
gint b_right, b_left, b_prec;
gint bpp;
guint32 pixel;
gint shift, shift_init;
gint dith;
gint r1, g1, b1;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
r_prec = image_info->visual->red_prec;
g_right = 8 - image_info->visual->green_prec;
g_left = image_info->visual->green_shift;
g_prec = image_info->visual->green_prec;
b_right = 8 - image_info->visual->blue_prec;
b_left = image_info->visual->blue_shift;
b_prec = image_info->visual->blue_prec;
bpp = image_info->bpp;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
shift_init = (bpp - 1) << 3;
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
obptr = obuf;
bp2 = bptr;
for (x = 0; x < width; x++)
{
r = bp2[0];
g = bp2[1];
b = bp2[2];
dith = dmp[(x_align + x) & (DM_WIDTH - 1)] << 2;
r1 = r + (dith >> r_prec);
g1 = g + ((252 - dith) >> g_prec);
b1 = b + (dith >> b_prec);
pixel = (((r1 - (r1 >> r_prec)) >> r_right) << r_left) |
(((g1 - (g1 >> g_prec)) >> g_right) << g_left) |
(((b1 - (b1 >> b_prec)) >> b_right) << b_left);
for (shift = shift_init; shift >= 0; shift -= 8)
{
*obptr++ = (pixel >> shift) & 0xff;
}
bp2 += 3;
}
bptr += rowstride;
obuf += bpl;
}
}
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
/* This actually works for depths from 3 to 7 */
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
static void
gdk_rgb_convert_4 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
gint dith;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x += 1)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 3;
obptr[0] = colorcube_d[(((r + dith) & 0x100) >> 2) |
(((g + 258 - dith) & 0x100) >> 5) |
(((b + dith) & 0x100) >> 8)];
obptr++;
}
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
bptr += rowstride;
obuf += bpl;
}
}
/* This actually works for depths from 3 to 7 */
static void
gdk_rgb_convert_gray4 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
gint shift;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
shift = 9 - image_info->visual->depth;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
obptr[0] = (g + ((b + r) >> 1)) >> shift;
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
static void
gdk_rgb_convert_gray4_pack (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
gint shift;
guchar pix0, pix1;
/* todo: this is hardcoded to big-endian. Make endian-agile. */
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 1);
shift = 9 - image_info->visual->depth;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x += 2)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
pix0 = (g + ((b + r) >> 1)) >> shift;
r = *bp2++;
g = *bp2++;
b = *bp2++;
pix1 = (g + ((b + r) >> 1)) >> shift;
obptr[0] = (pix0 << 4) | pix1;
obptr++;
}
Checking in minor changes. Now synced with 0.9.0.
1998-09-11 00:11:05 +00:00
if (width & 1)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
pix0 = (g + ((b + r) >> 1)) >> shift;
obptr[0] = (pix0 << 4);
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
bptr += rowstride;
obuf += bpl;
}
}
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
/* This actually works for depths from 3 to 7 */
static void
gdk_rgb_convert_gray4_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
gint prec, right;
gint gray;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + x0;
prec = image_info->visual->depth;
right = 8 - prec;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
for (x = 0; x < width; x++)
{
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
r = *bp2++;
g = *bp2++;
b = *bp2++;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
gray = (g + ((b + r) >> 1)) >> 1;
gray += (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) >> prec;
obptr[0] = (gray - (gray >> prec)) >> right;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
obptr++;
}
bptr += rowstride;
obuf += bpl;
}
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
static void
gdk_rgb_convert_gray4_d_pack (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
gint prec, right;
gint gray;
guchar pix0, pix1;
/* todo: this is hardcoded to big-endian. Make endian-agile. */
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 1);
prec = image_info->visual->depth;
right = 8 - prec;
for (y = 0; y < height; y++)
{
bp2 = bptr;
obptr = obuf;
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
for (x = 0; x < width; x += 2)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
gray = (g + ((b + r) >> 1)) >> 1;
gray += (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) >> prec;
pix0 = (gray - (gray >> prec)) >> right;
r = *bp2++;
g = *bp2++;
b = *bp2++;
gray = (g + ((b + r) >> 1)) >> 1;
gray += (dmp[(x_align + x + 1) & (DM_WIDTH - 1)] << 2) >> prec;
pix1 = (gray - (gray >> prec)) >> right;
obptr[0] = (pix0 << 4) | pix1;
obptr++;
}
Checking in minor changes. Now synced with 0.9.0.
1998-09-11 00:11:05 +00:00
if (width & 1)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
gray = (g + ((b + r) >> 1)) >> 1;
gray += (dmp[(x_align + x + 1) & (DM_WIDTH - 1)] << 2) >> prec;
pix0 = (gray - (gray >> prec)) >> right;
obptr[0] = (pix0 << 4);
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
bptr += rowstride;
obuf += bpl;
}
}
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
static void
gdk_rgb_convert_1 (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, int rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
int x, y;
gint bpl;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
Fixed up copyright message. Tue Nov 24 11:11:05 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklayout.[ch]: Fixed up copyright message. * gdk/gdkrgb.c (DM): Make the dither matrix constant so it can be shared. * gtk/gtkdnd.c: Make cursor bitmaps const. * gdk/gdk.h gdk/gdkpixmap.c: Added const to gdk_pixmap/bitmap_create_from_data.
1998-11-24 16:15:46 +00:00
const guchar *dmp;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
gint dith;
guchar byte;
bptr = buf;
bpl = image->bpl;
obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 3);
byte = 0; /* unnecessary, but it keeps gcc from complaining */
for (y = 0; y < height; y++)
{
dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
bp2 = bptr;
obptr = obuf;
for (x = 0; x < width; x++)
{
r = *bp2++;
g = *bp2++;
b = *bp2++;
dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 4) | 4;
byte += byte + (r + g + g + b + dith > 1020);
if ((x & 7) == 7)
{
obptr[0] = byte;
obptr++;
}
}
if (x & 7)
obptr[0] = byte << (8 - (x & 7));
bptr += rowstride;
obuf += bpl;
}
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
/* Returns a pointer to the stage buffer. */
static guchar *
gdk_rgb_ensure_stage (void)
{
if (image_info->stage_buf == NULL)
image_info->stage_buf = g_malloc (IMAGE_HEIGHT * STAGE_ROWSTRIDE);
return image_info->stage_buf;
}
/* This is slow. Speed me up, please. */
static void
gdk_rgb_32_to_stage (guchar *buf, gint rowstride, gint width, gint height)
{
gint x, y;
guchar *pi_start, *po_start;
guchar *pi, *po;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
pi_start = buf;
po_start = gdk_rgb_ensure_stage ();
for (y = 0; y < height; y++)
{
pi = pi_start;
po = po_start;
for (x = 0; x < width; x++)
{
*po++ = *pi++;
*po++ = *pi++;
*po++ = *pi++;
pi++;
}
pi_start += rowstride;
po_start += STAGE_ROWSTRIDE;
}
}
/* Generic 32bit RGB conversion function - convert to 24bit packed, then
go from there. */
static void
gdk_rgb_convert_32_generic (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
gdk_rgb_32_to_stage (buf, rowstride, width, height);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
/* Generic 32bit RGB conversion function - convert to 24bit packed, then
go from there. */
static void
gdk_rgb_convert_32_generic_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
gdk_rgb_32_to_stage (buf, rowstride, width, height);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv_d) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
/* This is slow. Speed me up, please. */
static void
gdk_rgb_gray_to_stage (guchar *buf, gint rowstride, gint width, gint height)
{
gint x, y;
guchar *pi_start, *po_start;
guchar *pi, *po;
guchar gray;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
pi_start = buf;
po_start = gdk_rgb_ensure_stage ();
for (y = 0; y < height; y++)
{
pi = pi_start;
po = po_start;
for (x = 0; x < width; x++)
{
gray = *pi++;
*po++ = gray;
*po++ = gray;
*po++ = gray;
}
pi_start += rowstride;
po_start += STAGE_ROWSTRIDE;
}
}
/* Generic gray conversion function - convert to 24bit packed, then go
from there. */
static void
gdk_rgb_convert_gray_generic (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
gdk_rgb_gray_to_stage (buf, rowstride, width, height);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
static void
gdk_rgb_convert_gray_generic_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
gdk_rgb_gray_to_stage (buf, rowstride, width, height);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv_d) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
/* Render grayscale using indexed method. */
static void
gdk_rgb_convert_gray_cmap (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
(*image_info->conv_indexed) (image, x0, y0, width, height,
buf, rowstride,
x_align, y_align, image_info->gray_cmap);
}
#if 0
static void
gdk_rgb_convert_gray_cmap_d (GdkImage *image,
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
(*image_info->conv_indexed_d) (image, x0, y0, width, height,
buf, rowstride,
x_align, y_align, image_info->gray_cmap);
}
#endif
/* This is slow. Speed me up, please. */
static void
gdk_rgb_indexed_to_stage (guchar *buf, gint rowstride, gint width, gint height,
GdkRgbCmap *cmap)
{
gint x, y;
guchar *pi_start, *po_start;
guchar *pi, *po;
gint rgb;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
pi_start = buf;
po_start = gdk_rgb_ensure_stage ();
for (y = 0; y < height; y++)
{
pi = pi_start;
po = po_start;
for (x = 0; x < width; x++)
{
rgb = cmap->colors[*pi++];
*po++ = rgb >> 16;
*po++ = (rgb >> 8) & 0xff;
*po++ = rgb & 0xff;
}
pi_start += rowstride;
po_start += STAGE_ROWSTRIDE;
}
}
/* Generic gray conversion function - convert to 24bit packed, then go
from there. */
static void
gdk_rgb_convert_indexed_generic (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align, GdkRgbCmap *cmap)
{
gdk_rgb_indexed_to_stage (buf, rowstride, width, height, cmap);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
static void
gdk_rgb_convert_indexed_generic_d (GdkImage *image,
gint x0, gint y0, gint width, gint height,
guchar *buf, gint rowstride,
gint x_align, gint y_align,
GdkRgbCmap *cmap)
{
gdk_rgb_indexed_to_stage (buf, rowstride, width, height, cmap);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
(*image_info->conv_d) (image, x0, y0, width, height,
image_info->stage_buf, STAGE_ROWSTRIDE,
x_align, y_align, cmap);
}
/* Select a conversion function based on the visual and a
representative image. */
static void
gdk_rgb_select_conv (GdkImage *image)
{
GdkByteOrder byte_order;
gint depth, bpp, byterev;
GdkVisualType vtype;
guint32 red_mask, green_mask, blue_mask;
GdkRgbConvFunc conv, conv_d;
GdkRgbConvFunc conv_32, conv_32_d;
GdkRgbConvFunc conv_gray, conv_gray_d;
GdkRgbConvFunc conv_indexed, conv_indexed_d;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
gboolean mask_rgb, mask_bgr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
depth = image_info->visual->depth;
Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11 to #ifdef Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com> * */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11 to #ifdef GDK_WINDOWING_X11.
1999-09-29 23:47:22 +00:00
#if defined (GDK_RGB_STANDALONE) || defined (GDK_WINDOWING_X11)
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
bpp = ((GdkImagePrivate *)image)->ximage->bits_per_pixel;
Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11 to #ifdef Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com> * */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11 to #ifdef GDK_WINDOWING_X11.
1999-09-29 23:47:22 +00:00
#elif defined (GDK_WINDOWING_WIN32)
Merge in Win32 version: Define macro GDKVAR for declaring gdk variables * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables exported/imported from the DLL. New image type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and GDK_DRAG_PROTO_OLE2. * gdk/gdk.h: Merge in Win32 version: Two new functions, gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far declared only for the Win32 version, but could be in the X11 version as well. (Needed for a Xlib-less gdk_imlib.) gdk_color_hash should have only one parameter. Declare gdk_threads_mutex with GDKVAR. * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have just one parameter. * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes per pixel, not bits. * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): Fetch bpp (which means bits-per-pixel here) from another place on Win32. Accept also depth==32 (which we might get on Win32) with bpp==32. * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be in the backend-dependent directory, not in the common gdk directory. * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk headers.
1999-03-17 23:02:10 +00:00
bpp = ((GdkVisualPrivate *) gdk_visual_get_system())->xvisual->bitspixel;
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
byte_order = image->byte_order;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
if (gdk_rgb_verbose)
g_print ("Chose visual 0x%x, image bpp=%d, %s first\n",
(gint)(((GdkVisualPrivate *)image_info->visual)->xvisual->visualid),
bpp, byte_order == GDK_LSB_FIRST ? "lsb" : "msb");
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_BIG_ENDIAN
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
byterev = (byte_order == GDK_LSB_FIRST);
#else
byterev = (byte_order == GDK_MSB_FIRST);
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
vtype = image_info->visual->type;
if (vtype == GDK_VISUAL_DIRECT_COLOR)
vtype = GDK_VISUAL_TRUE_COLOR;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
red_mask = image_info->visual->red_mask;
green_mask = image_info->visual->green_mask;
blue_mask = image_info->visual->blue_mask;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
mask_rgb = red_mask == 0xff0000 && green_mask == 0xff00 && blue_mask == 0xff;
mask_bgr = red_mask == 0xff && green_mask == 0xff00 && blue_mask == 0xff0000;
Minor improvements to gdkrgb, added testrgb to the gtk directory.
1998-09-01 05:29:45 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = NULL;
conv_d = NULL;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv_32 = gdk_rgb_convert_32_generic;
conv_32_d = gdk_rgb_convert_32_generic_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv_gray = gdk_rgb_convert_gray_generic;
conv_gray_d = gdk_rgb_convert_gray_generic_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv_indexed = gdk_rgb_convert_indexed_generic;
conv_indexed_d = gdk_rgb_convert_indexed_generic_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->dith_default = FALSE;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
if (image_info->bitmap)
conv = gdk_rgb_convert_1;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 16 && depth == 16 && !byterev &&
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
red_mask == 0xf800 && green_mask == 0x7e0 && blue_mask == 0x1f)
{
conv = gdk_rgb_convert_565;
conv_d = gdk_rgb_convert_565_d;
conv_gray = gdk_rgb_convert_565_gray;
It works better when I actually check the file in :) (I.e. this is the speedup I was trying to check in a minute ago).
1998-08-18 00:34:43 +00:00
gdk_rgb_preprocess_dm_565 ();
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 16 && depth == 16 &&
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
vtype == GDK_VISUAL_TRUE_COLOR && byterev &&
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
red_mask == 0xf800 && green_mask == 0x7e0 && blue_mask == 0x1f)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_565_br;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 16 && depth == 15 &&
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
vtype == GDK_VISUAL_TRUE_COLOR && !byterev &&
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
red_mask == 0x7c00 && green_mask == 0x3e0 && blue_mask == 0x1f)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_555;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 16 && depth == 15 &&
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
vtype == GDK_VISUAL_TRUE_COLOR && byterev &&
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
red_mask == 0x7c00 && green_mask == 0x3e0 && blue_mask == 0x1f)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_555_br;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Minor improvements to gdkrgb, added testrgb to the gtk directory.
1998-09-01 05:29:45 +00:00
/* I'm not 100% sure about the 24bpp tests - but testing will show*/
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 24 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
((mask_rgb && byte_order == GDK_LSB_FIRST) ||
(mask_bgr && byte_order == GDK_MSB_FIRST)))
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_888_lsb;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 24 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
((mask_rgb && byte_order == GDK_MSB_FIRST) ||
(mask_bgr && byte_order == GDK_LSB_FIRST)))
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_888_msb;
Merge from themes-2. See the ChangeLog for a somewhat detailed history of the evolution of the changes involved. Most of this is actually minor painting tweaks.
1998-11-06 22:05:02 +00:00
#if G_BYTE_ORDER == G_BIG_ENDIAN
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_rgb && byte_order == GDK_LSB_FIRST))
Minor improvements to gdkrgb, added testrgb to the gtk directory.
1998-09-01 05:29:45 +00:00
conv = gdk_rgb_convert_0888_br;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_rgb && byte_order == GDK_MSB_FIRST))
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_0888;
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_bgr && byte_order == GDK_MSB_FIRST))
conv = gdk_rgb_convert_8880_br;
Minor improvements to gdkrgb, added testrgb to the gtk directory.
1998-09-01 05:29:45 +00:00
#else
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_rgb && byte_order == GDK_MSB_FIRST))
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv = gdk_rgb_convert_0888_br;
Merge in Win32 version: Define macro GDKVAR for declaring gdk variables * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables exported/imported from the DLL. New image type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and GDK_DRAG_PROTO_OLE2. * gdk/gdk.h: Merge in Win32 version: Two new functions, gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far declared only for the Win32 version, but could be in the X11 version as well. (Needed for a Xlib-less gdk_imlib.) gdk_color_hash should have only one parameter. Declare gdk_threads_mutex with GDKVAR. * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have just one parameter. * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes per pixel, not bits. * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): Fetch bpp (which means bits-per-pixel here) from another place on Win32. Accept also depth==32 (which we might get on Win32) with bpp==32. * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be in the backend-dependent directory, not in the common gdk directory. * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk headers.
1999-03-17 23:02:10 +00:00
else if (bpp == 32 && (depth == 32 || depth == 24) && vtype == GDK_VISUAL_TRUE_COLOR &&
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
(mask_rgb && byte_order == GDK_LSB_FIRST))
conv = gdk_rgb_convert_0888;
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_bgr && byte_order == GDK_LSB_FIRST))
conv = gdk_rgb_convert_8880_br;
Minor improvements to gdkrgb, added testrgb to the gtk directory.
1998-09-01 05:29:45 +00:00
#endif
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
else if (vtype == GDK_VISUAL_TRUE_COLOR && byte_order == GDK_LSB_FIRST)
{
conv = gdk_rgb_convert_truecolor_lsb;
conv_d = gdk_rgb_convert_truecolor_lsb_d;
}
else if (vtype == GDK_VISUAL_TRUE_COLOR && byte_order == GDK_MSB_FIRST)
{
conv = gdk_rgb_convert_truecolor_msb;
silly visual fixes * gdk/gdkrgb.c: silly visual fixes * gtk/testgtk.c: call gdk_rgb_init so color preview test actually works -Yosh
1998-08-20 20:10:52 +00:00
conv_d = gdk_rgb_convert_truecolor_msb_d;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 8 && depth == 8 && (vtype == GDK_VISUAL_PSEUDO_COLOR
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef ENABLE_GRAYSCALE
|| vtype == GDK_VISUAL_GRAYSCALE
#endif
))
{
image_info->dith_default = TRUE;
conv = gdk_rgb_convert_8;
if (vtype != GDK_VISUAL_GRAYSCALE)
{
if (image_info->nred_shades == 6 &&
image_info->ngreen_shades == 6 &&
image_info->nblue_shades == 6)
conv_d = gdk_rgb_convert_8_d666;
else
conv_d = gdk_rgb_convert_8_d;
}
conv_indexed = gdk_rgb_convert_8_indexed;
conv_gray = gdk_rgb_convert_gray_cmap;
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 8 && depth == 8 && (vtype == GDK_VISUAL_STATIC_GRAY
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef not_ENABLE_GRAYSCALE
|| vtype == GDK_VISUAL_GRAYSCALE
#endif
))
{
conv = gdk_rgb_convert_gray8;
conv_gray = gdk_rgb_convert_gray8_gray;
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 8 && depth < 8 && depth >= 2 &&
(vtype == GDK_VISUAL_STATIC_GRAY
|| vtype == GDK_VISUAL_GRAYSCALE))
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
{
conv = gdk_rgb_convert_gray4;
conv_d = gdk_rgb_convert_gray4_d;
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 8 && depth < 8 && depth >= 3)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
{
conv = gdk_rgb_convert_4;
}
Fixed up some of the bigendian 32bpp modes.
1998-09-03 05:47:08 +00:00
else if (bpp == 4 && depth <= 4 && depth >= 2 &&
(vtype == GDK_VISUAL_STATIC_GRAY
|| vtype == GDK_VISUAL_GRAYSCALE))
{
conv = gdk_rgb_convert_gray4_pack;
conv_d = gdk_rgb_convert_gray4_d_pack;
}
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (conv_d == NULL)
conv_d = conv;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->conv = conv;
image_info->conv_d = conv_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->conv_32 = conv_32;
image_info->conv_32_d = conv_32_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->conv_gray = conv_gray;
image_info->conv_gray_d = conv_gray_d;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image_info->conv_indexed = conv_indexed;
image_info->conv_indexed_d = conv_indexed_d;
}
static gint horiz_idx;
static gint horiz_y = IMAGE_HEIGHT;
static gint vert_idx;
static gint vert_x = IMAGE_WIDTH;
static gint tile_idx;
static gint tile_x = IMAGE_WIDTH;
static gint tile_y1 = IMAGE_HEIGHT;
static gint tile_y2 = IMAGE_HEIGHT;
#ifdef VERBOSE
static gint sincelast;
#endif
/* Defining NO_FLUSH can cause inconsistent screen updates, but is useful
for performance evaluation. */
#undef NO_FLUSH
static gint
gdk_rgb_alloc_scratch_image (void)
{
if (static_image_idx == N_IMAGES)
{
#ifndef NO_FLUSH
gdk_flush ();
#endif
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("flush, %d puts since last flush\n", sincelast);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
sincelast = 0;
#endif
static_image_idx = 0;
horiz_y = IMAGE_HEIGHT;
vert_x = IMAGE_WIDTH;
tile_x = IMAGE_WIDTH;
tile_y1 = tile_y2 = IMAGE_HEIGHT;
}
return static_image_idx++;
}
static GdkImage *
gdk_rgb_alloc_scratch (gint width, gint height, gint *x0, gint *y0)
{
GdkImage *image;
gint idx;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
if (width >= (IMAGE_WIDTH >> 1))
{
if (height >= (IMAGE_HEIGHT >> 1))
{
idx = gdk_rgb_alloc_scratch_image ();
*x0 = 0;
*y0 = 0;
}
else
{
if (height + horiz_y > IMAGE_HEIGHT)
{
horiz_idx = gdk_rgb_alloc_scratch_image ();
horiz_y = 0;
}
idx = horiz_idx;
*x0 = 0;
*y0 = horiz_y;
horiz_y += height;
}
}
else
{
if (height >= (IMAGE_HEIGHT >> 1))
{
if (width + vert_x > IMAGE_WIDTH)
{
vert_idx = gdk_rgb_alloc_scratch_image ();
vert_x = 0;
}
idx = vert_idx;
*x0 = vert_x;
*y0 = 0;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
/* using 3 and -4 would be slightly more efficient on 32-bit machines
with > 1bpp displays */
vert_x += (width + 7) & -8;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
else
{
if (width + tile_x > IMAGE_WIDTH)
{
tile_y1 = tile_y2;
tile_x = 0;
}
if (height + tile_y1 > IMAGE_HEIGHT)
{
tile_idx = gdk_rgb_alloc_scratch_image ();
tile_x = 0;
tile_y1 = 0;
tile_y2 = 0;
}
if (height + tile_y1 > tile_y2)
tile_y2 = height + tile_y1;
idx = tile_idx;
*x0 = tile_x;
*y0 = tile_y1;
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
tile_x += (width + 7) & -8;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
}
image = static_image[idx];
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("index %d, x %d, y %d (%d x %d)\n", idx, *x0, *y0, width, height);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
sincelast++;
#endif
return image;
}
static void
gdk_draw_rgb_image_core (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
guchar *buf,
gint pixstride,
gint rowstride,
GdkRgbConvFunc conv,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
GdkRgbCmap *cmap,
gint xdith,
gint ydith)
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
{
gint y0, x0;
gint xs0, ys0;
GdkImage *image;
gint width1, height1;
guchar *buf_ptr;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
if (image_info->bitmap)
{
if (image_info->own_gc == NULL)
{
GdkColor color;
image_info->own_gc = gdk_gc_new (drawable);
gdk_color_white (image_info->cmap, &color);
gdk_gc_set_foreground (image_info->own_gc, &color);
gdk_color_black (image_info->cmap, &color);
gdk_gc_set_background (image_info->own_gc, &color);
}
gc = image_info->own_gc;
}
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (y0 = 0; y0 < height; y0 += IMAGE_HEIGHT)
{
height1 = MIN (height - y0, IMAGE_HEIGHT);
for (x0 = 0; x0 < width; x0 += IMAGE_WIDTH)
{
width1 = MIN (width - x0, IMAGE_WIDTH);
buf_ptr = buf + y0 * rowstride + x0 * pixstride;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
image = gdk_rgb_alloc_scratch (width1, height1, &xs0, &ys0);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
conv (image, xs0, ys0, width1, height1, buf_ptr, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
x + x0 + xdith, y + y0 + ydith, cmap);
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Made some config changes to make it work better both as a standalone module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized with the separate GdkRgb release.
1998-08-02 05:39:47 +00:00
#ifndef DONT_ACTUALLY_DRAW
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
gdk_draw_image (drawable, gc,
image, xs0, ys0, x + x0, y + y0, width1, height1);
Made some config changes to make it work better both as a standalone module (i.e. with Gtk 1.0) and as a module under Gtk 1.1+, i.e. harmonized with the separate GdkRgb release.
1998-08-02 05:39:47 +00:00
#endif
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
}
}
void
gdk_draw_rgb_image (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
GdkRgbDither dith,
guchar *rgb_buf,
gint rowstride)
{
if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
!image_info->dith_default))
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
rgb_buf, 3, rowstride, image_info->conv, NULL,
0, 0);
else
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
rgb_buf, 3, rowstride, image_info->conv_d, NULL,
0, 0);
}
void
gdk_draw_rgb_image_dithalign (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
GdkRgbDither dith,
guchar *rgb_buf,
gint rowstride,
gint xdith,
gint ydith)
{
if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
!image_info->dith_default))
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
rgb_buf, 3, rowstride, image_info->conv, NULL,
xdith, ydith);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
else
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
rgb_buf, 3, rowstride, image_info->conv_d, NULL,
xdith, ydith);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
void
gdk_draw_rgb_32_image (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
GdkRgbDither dith,
guchar *buf,
gint rowstride)
{
if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
!image_info->dith_default))
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 4, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_32, NULL, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
else
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 4, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_32_d, NULL, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
static void
gdk_rgb_make_gray_cmap (GdkRgbInfo *info)
{
guint32 rgb[256];
gint i;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
for (i = 0; i < 256; i++)
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
rgb[i] = (i << 16) | (i << 8) | i;
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
info->gray_cmap = gdk_rgb_cmap_new (rgb, 256);
}
void
gdk_draw_gray_image (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
GdkRgbDither dith,
guchar *buf,
gint rowstride)
{
if (image_info->bpp == 1 &&
image_info->gray_cmap == NULL &&
(image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
image_info->visual->type == GDK_VISUAL_GRAYSCALE))
gdk_rgb_make_gray_cmap (image_info);
if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
!image_info->dith_default))
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 1, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_gray, NULL, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
else
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 1, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_gray_d, NULL, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
GdkRgbCmap *
gdk_rgb_cmap_new (guint32 *colors, gint n_colors)
{
GdkRgbCmap *cmap;
int i, j;
guint32 rgb;
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
g_return_val_if_fail (n_colors >= 0, NULL);
g_return_val_if_fail (n_colors <= 256, NULL);
cmap = g_new (GdkRgbCmap, 1);
memcpy (cmap->colors, colors, n_colors * sizeof(guint32));
if (image_info->bpp == 1 &&
(image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
image_info->visual->type == GDK_VISUAL_GRAYSCALE))
for (i = 0; i < n_colors; i++)
{
rgb = colors[i];
j = ((rgb & 0xf00000) >> 12) |
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
((rgb & 0xf000) >> 8) |
((rgb & 0xf0) >> 4);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#ifdef VERBOSE
Minor fixes that were needed for the Gimp/GdkRgb integration.
1998-08-20 06:52:52 +00:00
g_print ("%d %x %x %d\n", i, j, colorcube[j]);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
#endif
cmap->lut[i] = colorcube[j];
}
return cmap;
}
void
gdk_rgb_cmap_free (GdkRgbCmap *cmap)
{
g_free (cmap);
}
void
gdk_draw_indexed_image (GdkDrawable *drawable,
GdkGC *gc,
gint x,
gint y,
gint width,
gint height,
GdkRgbDither dith,
guchar *buf,
gint rowstride,
GdkRgbCmap *cmap)
{
if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
!image_info->dith_default))
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 1, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_indexed, cmap, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
else
gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
buf, 1, rowstride,
Added a gdk_draw_rgb_image_dithalign function.
1998-08-31 22:18:18 +00:00
image_info->conv_indexed_d, cmap, 0, 0);
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
}
gboolean
gdk_rgb_ditherable (void)
{
return (image_info->conv != image_info->conv_d);
}
GdkColormap *
gdk_rgb_get_cmap (void)
{
Added some calls to gdk_rgb_init, so it's much more likely to correctly initialize now.
1998-08-22 05:41:32 +00:00
gdk_rgb_init ();
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
return image_info->cmap;
}
GdkVisual *
gdk_rgb_get_visual (void)
{
Added some calls to gdk_rgb_init, so it's much more likely to correctly initialize now.
1998-08-22 05:41:32 +00:00
gdk_rgb_init ();
Integrating GdkRgb 0.0.3 into the Gtk+ source tree. Integrating GdkRgb 0.0.3 into the Gtk+ source tree.
1998-07-15 20:25:52 +00:00
return image_info->visual;
}
Reference in New Issue Copy Permalink