mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 19:00:08 +00:00
95b3f3e460
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>
844 lines
19 KiB
C
844 lines
19 KiB
C
/* 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.
|
|
*/
|
|
|
|
/*
|
|
* 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/.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
/* Needed for SEEK_END in SunOS */
|
|
#include <unistd.h>
|
|
#include <X11/Xlib.h>
|
|
|
|
#include "gdk.h"
|
|
#include "gdkprivate.h"
|
|
|
|
typedef struct
|
|
{
|
|
gchar *color_string;
|
|
GdkColor color;
|
|
gint transparent;
|
|
} _GdkPixmapColor;
|
|
|
|
typedef struct
|
|
{
|
|
guint ncolors;
|
|
GdkColormap *colormap;
|
|
gulong pixels[1];
|
|
} _GdkPixmapInfo;
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_new (GdkWindow *window,
|
|
gint width,
|
|
gint height,
|
|
gint depth)
|
|
{
|
|
GdkPixmap *pixmap;
|
|
GdkWindowPrivate *private;
|
|
GdkWindowPrivate *window_private;
|
|
|
|
g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
|
|
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
|
|
|
|
if (!window)
|
|
window = (GdkWindow*) &gdk_root_parent;
|
|
|
|
window_private = (GdkWindowPrivate*) window;
|
|
if (window_private->destroyed)
|
|
return NULL;
|
|
|
|
if (depth == -1)
|
|
depth = gdk_window_get_visual (window)->depth;
|
|
|
|
private = g_new0 (GdkWindowPrivate, 1);
|
|
pixmap = (GdkPixmap*) private;
|
|
|
|
private->xdisplay = window_private->xdisplay;
|
|
private->window_type = GDK_WINDOW_PIXMAP;
|
|
private->xwindow = XCreatePixmap (private->xdisplay, window_private->xwindow,
|
|
width, height, depth);
|
|
private->colormap = NULL;
|
|
private->parent = NULL;
|
|
private->x = 0;
|
|
private->y = 0;
|
|
private->width = width;
|
|
private->height = height;
|
|
private->resize_count = 0;
|
|
private->ref_count = 1;
|
|
private->destroyed = 0;
|
|
|
|
gdk_xid_table_insert (&private->xwindow, pixmap);
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
GdkPixmap *
|
|
gdk_bitmap_create_from_data (GdkWindow *window,
|
|
const gchar *data,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkPixmap *pixmap;
|
|
GdkWindowPrivate *private;
|
|
GdkWindowPrivate *window_private;
|
|
|
|
g_return_val_if_fail (data != NULL, NULL);
|
|
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
|
|
|
|
if (!window)
|
|
window = (GdkWindow*) &gdk_root_parent;
|
|
|
|
window_private = (GdkWindowPrivate*) window;
|
|
if (window_private->destroyed)
|
|
return NULL;
|
|
|
|
private = g_new0 (GdkWindowPrivate, 1);
|
|
pixmap = (GdkPixmap*) private;
|
|
|
|
private->parent = NULL;
|
|
private->xdisplay = window_private->xdisplay;
|
|
private->window_type = GDK_WINDOW_PIXMAP;
|
|
private->x = 0;
|
|
private->y = 0;
|
|
private->width = width;
|
|
private->height = height;
|
|
private->resize_count = 0;
|
|
private->ref_count = 1;
|
|
private->destroyed = FALSE;
|
|
|
|
private->xwindow = XCreateBitmapFromData (private->xdisplay,
|
|
window_private->xwindow,
|
|
(char *)data, width, height);
|
|
|
|
gdk_xid_table_insert (&private->xwindow, pixmap);
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_create_from_data (GdkWindow *window,
|
|
const gchar *data,
|
|
gint width,
|
|
gint height,
|
|
gint depth,
|
|
GdkColor *fg,
|
|
GdkColor *bg)
|
|
{
|
|
GdkPixmap *pixmap;
|
|
GdkWindowPrivate *private;
|
|
GdkWindowPrivate *window_private;
|
|
|
|
g_return_val_if_fail (data != NULL, NULL);
|
|
g_return_val_if_fail (fg != NULL, NULL);
|
|
g_return_val_if_fail (bg != NULL, NULL);
|
|
g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
|
|
g_return_val_if_fail ((width != 0) && (height != 0), NULL);
|
|
|
|
if (!window)
|
|
window = (GdkWindow*) &gdk_root_parent;
|
|
|
|
window_private = (GdkWindowPrivate*) window;
|
|
if (window_private->destroyed)
|
|
return NULL;
|
|
|
|
if (depth == -1)
|
|
depth = gdk_window_get_visual (window)->depth;
|
|
|
|
private = g_new0 (GdkWindowPrivate, 1);
|
|
pixmap = (GdkPixmap*) private;
|
|
|
|
private->parent = NULL;
|
|
private->xdisplay = window_private->xdisplay;
|
|
private->window_type = GDK_WINDOW_PIXMAP;
|
|
private->x = 0;
|
|
private->y = 0;
|
|
private->width = width;
|
|
private->height = height;
|
|
private->resize_count = 0;
|
|
private->ref_count = 1;
|
|
private->destroyed = FALSE;
|
|
|
|
private->xwindow = XCreatePixmapFromBitmapData (private->xdisplay,
|
|
window_private->xwindow,
|
|
(char *)data, width, height,
|
|
fg->pixel, bg->pixel, depth);
|
|
|
|
gdk_xid_table_insert (&private->xwindow, pixmap);
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
static gint
|
|
gdk_pixmap_seek_string (FILE *infile,
|
|
const gchar *str,
|
|
gint skip_comments)
|
|
{
|
|
char instr[1024];
|
|
|
|
while (!feof (infile))
|
|
{
|
|
fscanf (infile, "%1023s", instr);
|
|
if (skip_comments == TRUE && strcmp (instr, "/*") == 0)
|
|
{
|
|
fscanf (infile, "%1023s", instr);
|
|
while (!feof (infile) && strcmp (instr, "*/") != 0)
|
|
fscanf (infile, "%1023s", instr);
|
|
fscanf(infile, "%1023s", instr);
|
|
}
|
|
if (strcmp (instr, str)==0)
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static gint
|
|
gdk_pixmap_seek_char (FILE *infile,
|
|
gchar c)
|
|
{
|
|
gint b, oldb;
|
|
|
|
while ((b = getc(infile)) != EOF)
|
|
{
|
|
if (c != b && b == '/')
|
|
{
|
|
b = getc (infile);
|
|
if (b == EOF)
|
|
return FALSE;
|
|
else if (b == '*') /* we have a comment */
|
|
{
|
|
b = -1;
|
|
do
|
|
{
|
|
oldb = b;
|
|
b = getc (infile);
|
|
if (b == EOF)
|
|
return FALSE;
|
|
}
|
|
while (!(oldb == '*' && b == '/'));
|
|
}
|
|
}
|
|
else if (c == b)
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
static gint
|
|
gdk_pixmap_read_string (FILE *infile,
|
|
gchar **buffer,
|
|
guint *buffer_size)
|
|
{
|
|
gint c;
|
|
guint cnt = 0, bufsiz, ret = FALSE;
|
|
gchar *buf;
|
|
|
|
buf = *buffer;
|
|
bufsiz = *buffer_size;
|
|
if (buf == NULL)
|
|
{
|
|
bufsiz = 10 * sizeof (gchar);
|
|
buf = g_new(gchar, bufsiz);
|
|
}
|
|
|
|
do
|
|
c = getc (infile);
|
|
while (c != EOF && c != '"');
|
|
|
|
if (c != '"')
|
|
goto out;
|
|
|
|
while ((c = getc(infile)) != EOF)
|
|
{
|
|
if (cnt == bufsiz)
|
|
{
|
|
guint new_size = bufsiz * 2;
|
|
if (new_size > bufsiz)
|
|
bufsiz = new_size;
|
|
else
|
|
goto out;
|
|
|
|
buf = (gchar *) g_realloc (buf, bufsiz);
|
|
buf[bufsiz-1] = '\0';
|
|
}
|
|
|
|
if (c != '"')
|
|
buf[cnt++] = c;
|
|
else
|
|
{
|
|
buf[cnt] = 0;
|
|
ret = TRUE;
|
|
break;
|
|
}
|
|
}
|
|
|
|
out:
|
|
buf[bufsiz-1] = '\0'; /* ensure null termination for errors */
|
|
*buffer = buf;
|
|
*buffer_size = bufsiz;
|
|
return ret;
|
|
}
|
|
|
|
static gchar*
|
|
gdk_pixmap_skip_whitespaces (gchar *buffer)
|
|
{
|
|
gint32 index = 0;
|
|
|
|
while (buffer[index] != 0 && (buffer[index] == 0x20 || buffer[index] == 0x09))
|
|
index++;
|
|
|
|
return &buffer[index];
|
|
}
|
|
|
|
static gchar*
|
|
gdk_pixmap_skip_string (gchar *buffer)
|
|
{
|
|
gint32 index = 0;
|
|
|
|
while (buffer[index] != 0 && buffer[index] != 0x20 && buffer[index] != 0x09)
|
|
index++;
|
|
|
|
return &buffer[index];
|
|
}
|
|
|
|
/* Xlib crashed ince at a color name lengths around 125 */
|
|
#define MAX_COLOR_LEN 120
|
|
|
|
static gchar*
|
|
gdk_pixmap_extract_color (gchar *buffer)
|
|
{
|
|
gint counter, numnames;
|
|
gchar *ptr = NULL, ch, temp[128];
|
|
gchar color[MAX_COLOR_LEN], *retcol;
|
|
gint space;
|
|
|
|
counter = 0;
|
|
while (ptr == NULL)
|
|
{
|
|
if (buffer[counter] == 'c')
|
|
{
|
|
ch = buffer[counter + 1];
|
|
if (ch == 0x20 || ch == 0x09)
|
|
ptr = &buffer[counter + 1];
|
|
}
|
|
else if (buffer[counter] == 0)
|
|
return NULL;
|
|
|
|
counter++;
|
|
}
|
|
|
|
ptr = gdk_pixmap_skip_whitespaces (ptr);
|
|
|
|
if (ptr[0] == 0)
|
|
return NULL;
|
|
else if (ptr[0] == '#')
|
|
{
|
|
counter = 1;
|
|
while (ptr[counter] != 0 &&
|
|
((ptr[counter] >= '0' && ptr[counter] <= '9') ||
|
|
(ptr[counter] >= 'a' && ptr[counter] <= 'f') ||
|
|
(ptr[counter] >= 'A' && ptr[counter] <= 'F')))
|
|
counter++;
|
|
|
|
retcol = g_new (gchar, counter+1);
|
|
strncpy (retcol, ptr, counter);
|
|
|
|
retcol[counter] = 0;
|
|
|
|
return retcol;
|
|
}
|
|
|
|
color[0] = 0;
|
|
numnames = 0;
|
|
|
|
space = MAX_COLOR_LEN - 1;
|
|
while (space > 0)
|
|
{
|
|
sscanf (ptr, "%127s", temp);
|
|
|
|
if (((gint)ptr[0] == 0) ||
|
|
(strcmp ("s", temp) == 0) || (strcmp ("m", temp) == 0) ||
|
|
(strcmp ("g", temp) == 0) || (strcmp ("g4", temp) == 0))
|
|
{
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
if (numnames > 0)
|
|
{
|
|
space -= 1;
|
|
strcat (color, " ");
|
|
}
|
|
strncat (color, temp, space);
|
|
space -= MIN (space, strlen (temp));
|
|
ptr = gdk_pixmap_skip_string (ptr);
|
|
ptr = gdk_pixmap_skip_whitespaces (ptr);
|
|
numnames++;
|
|
}
|
|
}
|
|
|
|
retcol = g_strdup (color);
|
|
return retcol;
|
|
}
|
|
|
|
|
|
enum buffer_op
|
|
{
|
|
op_header,
|
|
op_cmap,
|
|
op_body
|
|
};
|
|
|
|
|
|
static void
|
|
gdk_xpm_destroy_notify (gpointer data)
|
|
{
|
|
_GdkPixmapInfo *info = (_GdkPixmapInfo *)data;
|
|
GdkColor color;
|
|
int i;
|
|
|
|
for (i=0; i<info->ncolors; i++)
|
|
{
|
|
color.pixel = info->pixels[i];
|
|
gdk_colormap_free_colors (info->colormap, &color, 1);
|
|
}
|
|
|
|
gdk_colormap_unref (info->colormap);
|
|
g_free (info);
|
|
}
|
|
|
|
static GdkPixmap *
|
|
_gdk_pixmap_create_from_xpm (GdkWindow *window,
|
|
GdkColormap *colormap,
|
|
GdkBitmap **mask,
|
|
GdkColor *transparent_color,
|
|
gchar * (*get_buf) (enum buffer_op op,
|
|
gpointer handle),
|
|
gpointer handle)
|
|
{
|
|
GdkPixmap *pixmap = NULL;
|
|
GdkImage *image = NULL;
|
|
GdkVisual *visual;
|
|
GdkGC *gc = NULL;
|
|
GdkColor tmp_color;
|
|
gint width, height, num_cols, cpp, n, ns, cnt, xcnt, ycnt, wbytes;
|
|
gchar *buffer, pixel_str[32];
|
|
gchar *name_buf;
|
|
_GdkPixmapColor *color = NULL, *fallbackcolor = NULL;
|
|
_GdkPixmapColor *colors = NULL;
|
|
gulong index;
|
|
GHashTable *color_hash = NULL;
|
|
_GdkPixmapInfo *color_info = NULL;
|
|
|
|
if ((window == NULL) && (colormap == NULL))
|
|
g_warning ("Creating pixmap from xpm with NULL window and colormap");
|
|
|
|
if (window == NULL)
|
|
window = (GdkWindow *)&gdk_root_parent;
|
|
|
|
if (colormap == NULL)
|
|
{
|
|
colormap = gdk_window_get_colormap (window);
|
|
visual = gdk_window_get_visual (window);
|
|
}
|
|
else
|
|
visual = ((GdkColormapPrivate *)colormap)->visual;
|
|
|
|
buffer = (*get_buf) (op_header, handle);
|
|
if (buffer == NULL)
|
|
return NULL;
|
|
|
|
sscanf (buffer,"%d %d %d %d", &width, &height, &num_cols, &cpp);
|
|
if (cpp >= 32)
|
|
{
|
|
g_warning ("Pixmap has more than 31 characters per color\n");
|
|
return NULL;
|
|
}
|
|
|
|
color_hash = g_hash_table_new (g_str_hash, g_str_equal);
|
|
|
|
if (transparent_color == NULL)
|
|
{
|
|
gdk_color_white (colormap, &tmp_color);
|
|
transparent_color = &tmp_color;
|
|
}
|
|
|
|
/* For pseudo-color and grayscale visuals, we have to remember
|
|
* the colors we allocated, so we can free them later.
|
|
*/
|
|
if ((visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
|
|
(visual->type == GDK_VISUAL_GRAYSCALE))
|
|
{
|
|
color_info = g_malloc (sizeof (_GdkPixmapInfo) +
|
|
sizeof(gulong) * (num_cols - 1));
|
|
color_info->ncolors = num_cols;
|
|
color_info->colormap = colormap;
|
|
gdk_colormap_ref (colormap);
|
|
}
|
|
|
|
name_buf = g_new (gchar, num_cols * (cpp+1));
|
|
colors = g_new (_GdkPixmapColor, num_cols);
|
|
|
|
for (cnt = 0; cnt < num_cols; cnt++)
|
|
{
|
|
gchar *color_name;
|
|
|
|
buffer = (*get_buf) (op_cmap, handle);
|
|
if (buffer == NULL)
|
|
goto error;
|
|
|
|
color = &colors[cnt];
|
|
color->color_string = &name_buf [cnt * (cpp + 1)];
|
|
strncpy (color->color_string, buffer, cpp);
|
|
color->color_string[cpp] = 0;
|
|
buffer += strlen (color->color_string);
|
|
color->transparent = FALSE;
|
|
|
|
color_name = gdk_pixmap_extract_color (buffer);
|
|
|
|
if (color_name == NULL || g_strcasecmp (color_name, "None") == 0 ||
|
|
gdk_color_parse (color_name, &color->color) == FALSE)
|
|
{
|
|
color->color = *transparent_color;
|
|
color->transparent = TRUE;
|
|
}
|
|
|
|
g_free (color_name);
|
|
|
|
/* FIXME: The remaining slowness appears to happen in this
|
|
function. */
|
|
gdk_color_alloc (colormap, &color->color);
|
|
|
|
if (color_info)
|
|
color_info->pixels[cnt] = color->color.pixel;
|
|
|
|
g_hash_table_insert (color_hash, color->color_string, color);
|
|
if (cnt == 0)
|
|
fallbackcolor = color;
|
|
}
|
|
|
|
index = 0;
|
|
image = gdk_image_new (GDK_IMAGE_FASTEST, visual, width, height);
|
|
|
|
if (mask)
|
|
{
|
|
/* The pixmap mask is just a bits pattern.
|
|
* Color 0 is used for background and 1 for foreground.
|
|
* We don't care about the colormap, we just need 0 and 1.
|
|
*/
|
|
GdkColor mask_pattern;
|
|
|
|
*mask = gdk_pixmap_new (window, width, height, 1);
|
|
gc = gdk_gc_new (*mask);
|
|
|
|
mask_pattern.pixel = 0;
|
|
gdk_gc_set_foreground (gc, &mask_pattern);
|
|
gdk_draw_rectangle (*mask, gc, TRUE, 0, 0, -1, -1);
|
|
|
|
mask_pattern.pixel = 1;
|
|
gdk_gc_set_foreground (gc, &mask_pattern);
|
|
}
|
|
|
|
wbytes = width * cpp;
|
|
for (ycnt = 0; ycnt < height; ycnt++)
|
|
{
|
|
buffer = (*get_buf) (op_body, handle);
|
|
|
|
/* FIXME: this slows things down a little - it could be
|
|
* integrated into the strncpy below, perhaps. OTOH, strlen
|
|
* is fast.
|
|
*/
|
|
if ((buffer == NULL) || strlen (buffer) < wbytes)
|
|
continue;
|
|
|
|
for (n = 0, cnt = 0, xcnt = 0; n < wbytes; n += cpp, xcnt++)
|
|
{
|
|
strncpy (pixel_str, &buffer[n], cpp);
|
|
pixel_str[cpp] = 0;
|
|
ns = 0;
|
|
|
|
color = g_hash_table_lookup (color_hash, pixel_str);
|
|
|
|
if (!color) /* screwed up XPM file */
|
|
color = fallbackcolor;
|
|
|
|
gdk_image_put_pixel (image, xcnt, ycnt, color->color.pixel);
|
|
|
|
if (mask && color->transparent)
|
|
{
|
|
if (cnt < xcnt)
|
|
gdk_draw_line (*mask, gc, cnt, ycnt, xcnt - 1, ycnt);
|
|
cnt = xcnt + 1;
|
|
}
|
|
}
|
|
|
|
if (mask && (cnt < xcnt))
|
|
gdk_draw_line (*mask, gc, cnt, ycnt, xcnt - 1, ycnt);
|
|
}
|
|
|
|
error:
|
|
|
|
if (mask)
|
|
gdk_gc_destroy (gc);
|
|
|
|
if (image != NULL)
|
|
{
|
|
pixmap = gdk_pixmap_new (window, width, height, visual->depth);
|
|
|
|
if (color_info)
|
|
gdk_drawable_set_data (pixmap, "gdk-xpm", color_info,
|
|
gdk_xpm_destroy_notify);
|
|
|
|
gc = gdk_gc_new (pixmap);
|
|
gdk_gc_set_foreground (gc, transparent_color);
|
|
gdk_draw_image (pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
|
|
gdk_gc_destroy (gc);
|
|
gdk_image_destroy (image);
|
|
}
|
|
else if (color_info)
|
|
gdk_xpm_destroy_notify (color_info);
|
|
|
|
if (color_hash != NULL)
|
|
g_hash_table_destroy (color_hash);
|
|
|
|
if (colors != NULL)
|
|
g_free (colors);
|
|
|
|
if (name_buf != NULL)
|
|
g_free (name_buf);
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
|
|
struct file_handle
|
|
{
|
|
FILE *infile;
|
|
gchar *buffer;
|
|
guint buffer_size;
|
|
};
|
|
|
|
|
|
static gchar *
|
|
file_buffer (enum buffer_op op, gpointer handle)
|
|
{
|
|
struct file_handle *h = handle;
|
|
|
|
switch (op)
|
|
{
|
|
case op_header:
|
|
if (gdk_pixmap_seek_string (h->infile, "XPM", FALSE) != TRUE)
|
|
break;
|
|
|
|
if (gdk_pixmap_seek_char (h->infile,'{') != TRUE)
|
|
break;
|
|
/* Fall through to the next gdk_pixmap_seek_char. */
|
|
|
|
case op_cmap:
|
|
gdk_pixmap_seek_char (h->infile, '"');
|
|
fseek (h->infile, -1, SEEK_CUR);
|
|
/* Fall through to the gdk_pixmap_read_string. */
|
|
|
|
case op_body:
|
|
gdk_pixmap_read_string (h->infile, &h->buffer, &h->buffer_size);
|
|
return h->buffer;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_colormap_create_from_xpm (GdkWindow *window,
|
|
GdkColormap *colormap,
|
|
GdkBitmap **mask,
|
|
GdkColor *transparent_color,
|
|
const gchar *filename)
|
|
{
|
|
struct file_handle h;
|
|
GdkPixmap *pixmap = NULL;
|
|
|
|
memset (&h, 0, sizeof (h));
|
|
h.infile = fopen (filename, "rb");
|
|
if (h.infile != NULL)
|
|
{
|
|
pixmap = _gdk_pixmap_create_from_xpm (window, colormap, mask,
|
|
transparent_color,
|
|
file_buffer, &h);
|
|
fclose (h.infile);
|
|
g_free (h.buffer);
|
|
}
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_create_from_xpm (GdkWindow *window,
|
|
GdkBitmap **mask,
|
|
GdkColor *transparent_color,
|
|
const gchar *filename)
|
|
{
|
|
return gdk_pixmap_colormap_create_from_xpm (window, NULL, mask,
|
|
transparent_color, filename);
|
|
}
|
|
|
|
|
|
struct mem_handle
|
|
{
|
|
gchar **data;
|
|
int offset;
|
|
};
|
|
|
|
|
|
static gchar *
|
|
mem_buffer (enum buffer_op op, gpointer handle)
|
|
{
|
|
struct mem_handle *h = handle;
|
|
switch (op)
|
|
{
|
|
case op_header:
|
|
case op_cmap:
|
|
case op_body:
|
|
if (h->data[h->offset])
|
|
return h->data[h->offset ++];
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window,
|
|
GdkColormap *colormap,
|
|
GdkBitmap **mask,
|
|
GdkColor *transparent_color,
|
|
gchar **data)
|
|
{
|
|
struct mem_handle h;
|
|
GdkPixmap *pixmap = NULL;
|
|
|
|
memset (&h, 0, sizeof (h));
|
|
h.data = data;
|
|
pixmap = _gdk_pixmap_create_from_xpm (window, colormap, mask,
|
|
transparent_color,
|
|
mem_buffer, &h);
|
|
return pixmap;
|
|
}
|
|
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_create_from_xpm_d (GdkWindow *window,
|
|
GdkBitmap **mask,
|
|
GdkColor *transparent_color,
|
|
gchar **data)
|
|
{
|
|
return gdk_pixmap_colormap_create_from_xpm_d (window, NULL, mask,
|
|
transparent_color, data);
|
|
}
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_foreign_new (guint32 anid)
|
|
{
|
|
GdkPixmap *pixmap;
|
|
GdkWindowPrivate *window_private;
|
|
GdkWindowPrivate *private;
|
|
Pixmap xpixmap;
|
|
Window root_return;
|
|
unsigned int x_ret, y_ret, w_ret, h_ret, bw_ret, depth_ret;
|
|
|
|
/* check to make sure we were passed something at
|
|
least a little sane */
|
|
g_return_val_if_fail((anid != 0), NULL);
|
|
|
|
/* set the pixmap to the passed in value */
|
|
xpixmap = anid;
|
|
/* get the root window */
|
|
window_private = &gdk_root_parent;
|
|
|
|
/* get information about the Pixmap to fill in the structure for
|
|
the gdk window */
|
|
if (!XGetGeometry(window_private->xdisplay, xpixmap, &root_return,
|
|
&x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
|
|
return NULL;
|
|
|
|
/* allocate a new gdk pixmap */
|
|
private = g_new(GdkWindowPrivate, 1);
|
|
pixmap = (GdkPixmap *)private;
|
|
|
|
private->xdisplay = window_private->xdisplay;
|
|
private->window_type = GDK_WINDOW_PIXMAP;
|
|
private->xwindow = xpixmap;
|
|
private->colormap = NULL;
|
|
private->parent = NULL;
|
|
private->x = 0;
|
|
private->y = 0;
|
|
private->width = w_ret;
|
|
private->height = h_ret;
|
|
private->resize_count = 0;
|
|
private->ref_count = 1;
|
|
private->destroyed = 0;
|
|
|
|
gdk_xid_table_insert(&private->xwindow, pixmap);
|
|
|
|
return pixmap;
|
|
}
|
|
|
|
GdkPixmap*
|
|
gdk_pixmap_ref (GdkPixmap *pixmap)
|
|
{
|
|
GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
|
|
g_return_val_if_fail (pixmap != NULL, NULL);
|
|
|
|
private->ref_count += 1;
|
|
return pixmap;
|
|
}
|
|
|
|
void
|
|
gdk_pixmap_unref (GdkPixmap *pixmap)
|
|
{
|
|
GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
|
|
g_return_if_fail (pixmap != NULL);
|
|
g_return_if_fail (private->ref_count > 0);
|
|
|
|
private->ref_count -= 1;
|
|
if (private->ref_count == 0)
|
|
{
|
|
XFreePixmap (private->xdisplay, private->xwindow);
|
|
gdk_xid_table_remove (private->xwindow);
|
|
g_dataset_destroy (private);
|
|
g_free (private);
|
|
}
|
|
}
|
|
|
|
GdkBitmap *
|
|
gdk_bitmap_ref (GdkBitmap *bitmap)
|
|
{
|
|
return (GdkBitmap *)gdk_pixmap_ref ((GdkPixmap *)bitmap);
|
|
}
|
|
|
|
void
|
|
gdk_bitmap_unref (GdkBitmap *bitmap)
|
|
{
|
|
gdk_pixmap_unref ((GdkPixmap *)bitmap);
|
|
}
|