 d69496c060
			
		
	
	d69496c060
	
	
	
		
			
			Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org> * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that, couldn't they at least give it a non-standard name? * gtk/gtktextlayout.c: arg! yet another implementation of gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy? * gtk/gtktextbuffer.c: gotcha! captured a vagabonding gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back home. now i know this _is_ a conspiracy. * gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for ::state-changed. * gtk/gtkaccelgroup.c (gtk_accel_group_create_remove): (gtk_accel_group_create_add): marshaller signature fixups. * gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups, pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM. * gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid anymore. Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org> * docs/reference/Makefile.am: disabled SUBDIRS for the moment, since due to the signal system changes, it wouldn't build currently. to be fixed soon. * docs/Changes-2.0.txt: GtkSignal/GSignal updates. * gtk/gtkwidget.c: ::direction_changed takes an enum as argument, so it needs gtk_marshal_VOID__ENUM() instead of gtk_marshal_NONE__UINT(). * gdk/gdk*.c: adapted type registration functions. * gtk/gtkbindings.c: * gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is gone. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType. * gtk/gtkobject.c: (gtk_object_destroy): (gtk_object_shutdown): fixed recursion guards. basically we have to catch the case where any of GObject.shutdown() or gtk_object_destroy() is called during ::destroy, and avoid recursion there. * gtk/gtktypeutils.c: * gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with boxed_copy/boxed_free. this needs a more general solution based on a publically installed code-generator utility. * gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED, glib's gobject has support for that now. define GtkSignalMarshaller in terms of GSignalCMarshaller. Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: * gtk/gtkmarshal.[hc]: * gtk/Makefile.am: generate marshallers with glib-genmarshal and don't compile gtkmarshal.c on its own anymore, just include it in gtksignal.c. removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes care of that. * *.c: marshaller name fixups. * gtk/gtkmarshal.list: added a comment briefing the format. Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: nuked old implementation. we mostly have compatibility macros here now. more specifically, most of the API is preserved (yes, _most_, nonwithstanding the following exceptions listed, the API is stil lHUGE ;) things that got removed completely: GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(), gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(), gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(), gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(), gtk_signal_remove_emission_hook(). non-functional functions variants: gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook(). the GtkCallbackMarshal argument to gtk_signal_connect_full() is not supported anymore. (gtk_signal_compat_matched): new internal function to aid implementation of the compatibility macros, it provides functionality to block/unblock/disconnect handlers based on func/data. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType, * *.c: adaptions to new type registration API signatures. Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
		
			
				
	
	
		
			326 lines
		
	
	
		
			9.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			326 lines
		
	
	
		
			9.4 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 Lesser 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
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser 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-2000.  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/gdkpixmap.h>
 | |
| #include "gdkpixmap-x11.h"
 | |
| #include "gdkprivate-x11.h"
 | |
| 
 | |
| typedef struct
 | |
| {
 | |
|   gchar *color_string;
 | |
|   GdkColor color;
 | |
|   gint transparent;
 | |
| } _GdkPixmapColor;
 | |
| 
 | |
| typedef struct
 | |
| {
 | |
|   guint ncolors;
 | |
|   GdkColormap *colormap;
 | |
|   gulong pixels[1];
 | |
| } _GdkPixmapInfo;
 | |
| 
 | |
| static void gdk_pixmap_impl_x11_get_size   (GdkDrawable        *drawable,
 | |
|                                         gint               *width,
 | |
|                                         gint               *height);
 | |
| 
 | |
| static void gdk_pixmap_impl_x11_init       (GdkPixmapImplX11      *pixmap);
 | |
| static void gdk_pixmap_impl_x11_class_init (GdkPixmapImplX11Class *klass);
 | |
| static void gdk_pixmap_impl_x11_finalize   (GObject            *object);
 | |
| 
 | |
| static gpointer parent_class = NULL;
 | |
| 
 | |
| GType
 | |
| gdk_pixmap_impl_x11_get_type (void)
 | |
| {
 | |
|   static GType object_type = 0;
 | |
| 
 | |
|   if (!object_type)
 | |
|     {
 | |
|       static const GTypeInfo object_info =
 | |
|       {
 | |
|         sizeof (GdkPixmapImplX11Class),
 | |
|         (GBaseInitFunc) NULL,
 | |
|         (GBaseFinalizeFunc) NULL,
 | |
|         (GClassInitFunc) gdk_pixmap_impl_x11_class_init,
 | |
|         NULL,           /* class_finalize */
 | |
|         NULL,           /* class_data */
 | |
|         sizeof (GdkPixmapImplX11),
 | |
|         0,              /* n_preallocs */
 | |
|         (GInstanceInitFunc) gdk_pixmap_impl_x11_init,
 | |
|       };
 | |
|       
 | |
|       object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_X11,
 | |
|                                             "GdkPixmapImplX11",
 | |
|                                             &object_info, 0);
 | |
|     }
 | |
|   
 | |
|   return object_type;
 | |
| }
 | |
| 
 | |
| 
 | |
| GType
 | |
| _gdk_pixmap_impl_get_type (void)
 | |
| {
 | |
|   return gdk_pixmap_impl_x11_get_type ();
 | |
| }
 | |
| 
 | |
| static void
 | |
| gdk_pixmap_impl_x11_init (GdkPixmapImplX11 *impl)
 | |
| {
 | |
|   impl->width = 1;
 | |
|   impl->height = 1;
 | |
| }
 | |
| 
 | |
| static void
 | |
| gdk_pixmap_impl_x11_class_init (GdkPixmapImplX11Class *klass)
 | |
| {
 | |
|   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 | |
|   GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
 | |
|   
 | |
|   parent_class = g_type_class_peek_parent (klass);
 | |
| 
 | |
|   object_class->finalize = gdk_pixmap_impl_x11_finalize;
 | |
| 
 | |
|   drawable_class->get_size = gdk_pixmap_impl_x11_get_size;
 | |
| }
 | |
| 
 | |
| static void
 | |
| gdk_pixmap_impl_x11_finalize (GObject *object)
 | |
| {
 | |
|   GdkPixmapImplX11 *impl = GDK_PIXMAP_IMPL_X11 (object);
 | |
|   GdkPixmap *wrapper = GDK_PIXMAP (GDK_DRAWABLE_IMPL_X11 (impl)->wrapper);
 | |
| 
 | |
|   if (!impl->is_foreign)
 | |
|     XFreePixmap (GDK_PIXMAP_XDISPLAY (wrapper), GDK_PIXMAP_XID (wrapper));
 | |
|   
 | |
|   gdk_xid_table_remove (GDK_PIXMAP_XID (wrapper));
 | |
|   
 | |
|   G_OBJECT_CLASS (parent_class)->finalize (object);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gdk_pixmap_impl_x11_get_size   (GdkDrawable *drawable,
 | |
|                                 gint        *width,
 | |
|                                 gint        *height)
 | |
| {
 | |
|   if (width)
 | |
|     *width = GDK_PIXMAP_IMPL_X11 (drawable)->width;
 | |
|   if (height)
 | |
|     *height = GDK_PIXMAP_IMPL_X11 (drawable)->height;
 | |
| }
 | |
| 
 | |
| GdkPixmap*
 | |
| gdk_pixmap_new (GdkWindow *window,
 | |
| 		gint       width,
 | |
| 		gint       height,
 | |
| 		gint       depth)
 | |
| {
 | |
|   GdkPixmap *pixmap;
 | |
|   GdkDrawableImplX11 *draw_impl;
 | |
|   GdkPixmapImplX11 *pix_impl;
 | |
|   GdkColormap *cmap;
 | |
|   
 | |
|   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
 | |
|   g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
 | |
|   g_return_val_if_fail ((width != 0) && (height != 0), NULL);
 | |
|   
 | |
|   if (!window)
 | |
|     window = gdk_parent_root;
 | |
| 
 | |
|   if (GDK_WINDOW_DESTROYED (window))
 | |
|     return NULL;
 | |
| 
 | |
|   if (depth == -1)
 | |
|     depth = gdk_drawable_get_depth (GDK_DRAWABLE (window));
 | |
| 
 | |
|   pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
 | |
|   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
 | |
|   
 | |
|   draw_impl->xdisplay = GDK_WINDOW_XDISPLAY (window);
 | |
|   draw_impl->xid = XCreatePixmap (GDK_PIXMAP_XDISPLAY (pixmap),
 | |
|                                   GDK_WINDOW_XID (window),
 | |
|                                   width, height, depth);
 | |
|   
 | |
|   pix_impl->is_foreign = FALSE;
 | |
|   pix_impl->width = width;
 | |
|   pix_impl->height = height;
 | |
|   GDK_PIXMAP_OBJECT (pixmap)->depth = depth;
 | |
| 
 | |
|   if (window)
 | |
|     {
 | |
|       cmap = gdk_drawable_get_colormap (window);
 | |
|       if (cmap)
 | |
|         gdk_drawable_set_colormap (pixmap, cmap);
 | |
|     }
 | |
|   
 | |
|   gdk_xid_table_insert (&GDK_PIXMAP_XID (pixmap), pixmap);
 | |
|   
 | |
|   return pixmap;
 | |
| }
 | |
| 
 | |
| GdkPixmap *
 | |
| gdk_bitmap_create_from_data (GdkWindow   *window,
 | |
| 			     const gchar *data,
 | |
| 			     gint         width,
 | |
| 			     gint         height)
 | |
| {
 | |
|   GdkPixmap *pixmap;
 | |
|   GdkDrawableImplX11 *draw_impl;
 | |
|   GdkPixmapImplX11 *pix_impl;
 | |
|   
 | |
|   g_return_val_if_fail (data != NULL, NULL);
 | |
|   g_return_val_if_fail ((width != 0) && (height != 0), NULL);
 | |
|   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
 | |
| 
 | |
|   if (!window)
 | |
|     window = gdk_parent_root;
 | |
| 
 | |
|   if (GDK_WINDOW_DESTROYED (window))
 | |
|     return NULL;
 | |
| 
 | |
|   pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
 | |
|   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
 | |
| 
 | |
|   pix_impl->is_foreign = FALSE;
 | |
|   pix_impl->width = width;
 | |
|   pix_impl->height = height;
 | |
|   GDK_PIXMAP_OBJECT (pixmap)->depth = 1;
 | |
| 
 | |
|   draw_impl->xdisplay = GDK_WINDOW_XDISPLAY (window);
 | |
|   draw_impl->xid = XCreateBitmapFromData (GDK_WINDOW_XDISPLAY (window),
 | |
|                                           GDK_WINDOW_XID (window),
 | |
|                                           (char *)data, width, height);
 | |
| 
 | |
|   gdk_xid_table_insert (&GDK_PIXMAP_XID (pixmap), 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;
 | |
|   GdkDrawableImplX11 *draw_impl;
 | |
|   GdkPixmapImplX11 *pix_impl;
 | |
| 
 | |
|   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
 | |
|   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 = gdk_parent_root;
 | |
| 
 | |
|   if (GDK_WINDOW_DESTROYED (window))
 | |
|     return NULL;
 | |
| 
 | |
|   if (depth == -1)
 | |
|     depth = gdk_drawable_get_visual (window)->depth;
 | |
| 
 | |
|   pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
 | |
|   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
 | |
|   
 | |
|   pix_impl->is_foreign = FALSE;
 | |
|   pix_impl->width = width;
 | |
|   pix_impl->height = height;
 | |
|   GDK_PIXMAP_OBJECT (pixmap)->depth = depth;
 | |
| 
 | |
|   draw_impl->xdisplay = GDK_DRAWABLE_XDISPLAY (window);
 | |
|   draw_impl->xid = XCreatePixmapFromBitmapData (GDK_WINDOW_XDISPLAY (window),
 | |
|                                                 GDK_WINDOW_XID (window),
 | |
|                                                 (char *)data, width, height,
 | |
|                                                 fg->pixel, bg->pixel, depth);
 | |
| 
 | |
|   gdk_xid_table_insert (&GDK_PIXMAP_XID (pixmap), pixmap);
 | |
| 
 | |
|   return pixmap;
 | |
| }
 | |
| 
 | |
| GdkPixmap*
 | |
| gdk_pixmap_foreign_new (GdkNativeWindow anid)
 | |
| {
 | |
|   GdkPixmap *pixmap;
 | |
|   GdkDrawableImplX11 *draw_impl;
 | |
|   GdkPixmapImplX11 *pix_impl;
 | |
|   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 information about the Pixmap to fill in the structure for
 | |
|      the gdk window */
 | |
|   if (!XGetGeometry(GDK_DISPLAY(),
 | |
| 		    xpixmap, &root_return,
 | |
| 		    &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
 | |
|       return NULL;
 | |
| 
 | |
|   pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
 | |
|   draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
 | |
|   draw_impl->wrapper = GDK_DRAWABLE (pixmap);
 | |
|   
 | |
| 
 | |
|   draw_impl->xdisplay = GDK_DISPLAY ();
 | |
|   draw_impl->xid = xpixmap;
 | |
| 
 | |
|   pix_impl->is_foreign = TRUE;
 | |
|   pix_impl->width = w_ret;
 | |
|   pix_impl->height = h_ret;
 | |
|   GDK_PIXMAP_OBJECT (pixmap)->depth = depth_ret;
 | |
|   
 | |
|   gdk_xid_table_insert(&GDK_PIXMAP_XID (pixmap), pixmap);
 | |
| 
 | |
|   return pixmap;
 | |
| }
 |