forked from AuroraMiddleware/gtk
df4fc36721
2000-06-20 Havoc Pennington <hp@redhat.com> * modules/linux-fb/Makefile.am: Make this compile without framebuffer enabled * gdk/linux-fb/Makefile.am: Add conditional to not build framebuffer unless specified in configure * gdk/gdkdraw.c (gdk_draw_drawable): Fix bug where I was getting the size of the target instead of source if -1 was passed for width/height * gdk/x11/gdkgeometry-x11.c (gdk_window_compute_position): Fix width/height confusion. 2000-06-19 Havoc Pennington <hp@redhat.com> * gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be GDK_DRAWABLE_XID. In the future, we probably want to make it faster with G_DISABLE_CHECKS turned on. 2000-06-14 Havoc Pennington <hp@redhat.com> * gdk/Makefile.am: add gdkpixmap.c * gdk/gdk.c: s/gdk_window_init/_gdk_windowing_window_init/ s/gdk_image_init/_gdk_windowing_image_init * gdk/gdkcolor.c: make ref/unref compat wrappers for GObject ref/unref * gdk/gdkcolor.h: make GdkColormap a GObject subclass * gdk/gdkcompat.h: remove GdkWindowType compat, since GdkWindowType is now non-deprecated; change gdk_window_get_type() compat to be gdk_window_get_window_type(). * gdk/gdkdnd.h: make GdkDragContext a GObject. * gdk/gdkdraw.c, gdk/gdkdraw.h: Convert GdkDrawable to a pure virtual GObject. Make all functions call into the vtable. Move gdk_image_put() guts in here. Remove GdkDrawableType and gdk_drawable_get_type(), these are now GdkWindow-specific. draw_image, get_depth, get_size, set_colormap, get_colormap, get_visual added to the vtable. * gdk/gdkgc.h, gdk/gdkgc.c: Convert GdkGC to a pure virtual GObject. Virtualize everything. (gdk_gc_new_with_values): remove check for destroyed window, because now GdkWindow::create_gc will check this. (gdk_gc_set_values): New function to set GC values, this was already implemented but wasn't in the header * gdk/gdkimage.h, gdk/gdkimage.c: Convert GdkImage to a GObject. * gdk/gdkinternals.h: Remove _gdk_window_alloc(), remove _gdk_window_draw_image(), remove _gdk_windowing_window_class, remove _gdk_window_class; add _gdk_window_impl_get_type() and _gdk_pixmap_impl_get_type(). Rename gdk_window_init to _gdk_windowing_window_init, rename gdk_image_init to _gdk_windowing_image_init. * gdk/gdkpango.c: Reflect GObject-ification of PangoContext. (gdk_draw_layout): Remove check for destroyed window, because all the drawable methods already check it. * gdk/gdkpixmap.h, gdk/gdkpixmap.c: Convert GdkPixmap to GObject. Add gdkpixmap.c which contains implementation of GdkDrawable virtual table (by chaining to a platform-specific implementation object). * gdk/gdkprivate.h: Remove GDK_IS_WINDOW, GDK_IS_PIXMAP, GDK_DRAWABLE_DESTROYED. Add GDK_WINDOW_DESTROYED. Replace GDK_DRAWABLE_TYPE with GDK_WINDOW_TYPE. Remove GdkDrawablePrivate, GdkWindowPrivate, GdkImageClass, GdkImagePrivate, GdkGCPrivate, GdkColormapPrivate. * gdk/gdktypes.h: #include <glib-object.h> * gdk/gdkwindow.h, gdk/gdkwindow.c: Convert GdkWindow to GObject. Move most functionality to platform-specific implementation object. GdkWindow itself now handles the backing store, then chains to the platform-specific implementation. (gdk_window_get_window_type): return GdkWindowType of the window. (gdk_window_peek_children): New routine, returns the children of a GdkWindow (gdk_window_get_children): Was in X11-specific code and did XQueryTree. Changed to simply return a copy of window->children; so it can go in cross-platform code. * gdk/x11/Makefile.am: fix broken MKINSTALLDIRS path * gdk/x11/gdkcolor-x11.c: implement X-specific parts of GdkColormap; just changed to use the new private data instead of casting to GdkColormapPrivate. * gdk/x11/gdkcursor-x11.c: added a couple typechecks to gdk_cursor_new(). * gdk/x11/gdkdnd-x11.c: Change the way we access private fields (private data member in the GObject). (xdnd_manager_source_filter): Function had broken error handling, fix it (use gdk_error_trap_push). * gdk/x11/gdkdrawable-x11.c: This file now implements a base class for GdkWindowImplX11/GdkPixmapImplX11. This base class is purely for the convenience of the X port, and not part of the interface to cross-platform GDK. * gdk/x11/gdkevents-x11.c: Reflect various renamings. * gdk/x11/gdkgc-x11.c: Implement a subclass of GdkGC that's specific to X, and returned by the create_gc virtual method of GdkDrawableImplX11. (gdk_x11_gc_set_dashes): Change this to take an array of gint8 rather than gchar, this was also changed in the GdkGC vtable. (gdk_x11_gc_values_to_xvalues): If GdkGCValues is NULL, or the mask is 0, return immediately, instead of checking every flag. This is faster, and keeps us from segfaulting if values is NULL and the mask contains some nonzero flags. * gdk/x11/gdkgeometry-x11.c: deal with all the rearranging of GdkWindow. * gdk/x11/gdkglobals-x11.c: change type of grab window, since GdkWindowPrivate is gone. * gdk/x11/gdkim-x11.c: rename things that got renamed. * gdk/x11/gdkimage-x11.c: implement in terms of GObject, and remove the image_put stuff that got transferred to GdkDrawable. * gdk/x11/gdkinput.c: renamings * gdk/x11/gdkmain-x11.c: #include <pango/pangox.h> * gdk/x11/gdkpixmap-x11.c: GObject conversion * gdk/x11/gdkprivate-x11.h: indentation fixes * gdk/x11/gdkproperty-x11.c: renamings * gdk/x11/gdkselection-x11.c: renamings * gdk/x11/gdkwindow-x11.c: Restructuring and renaming; this now implements the platform-specific "impl" object. Moved gdk_window_get_children to gdk/gdkwindow.c * gdk/x11/gdkx.h: Remove all the private structs and private datas that no longer exist. Add declaration of GdkGCX11 object here. Fix all the macros to still work. * gtk/gtk-boxed.defs: Remove GtkStyle, GdkColormap, GdkWindow, GdkDragContext from the boxed types since they are now GObjects. * gtk/gtkstyle.h, gtk/gtkstyle.c: Converted GtkStyle to a GObject, moved xthickness/ythickness into the instance. GtkStyleClass functions are now in the standard vtable for GtkStyle, so you have to create a GObject subclass to write a theme engine. (gtk_style_copy): fixed a leaked PangoFontDescription (gtk_style_init): renamed gtk_style_realize, so gtk_style_init can be the standard GObject function. * Throughout GTK: s/style->klass->[xy]thickness/style->[xy]thickness s/pango_layout_unref/g_object_unref/ * gtk/gtkrc.h, gtk/gtkrc.c: Converted GtkRcStyle to a GObject. * gtk/gtksocket.c: Use gdk_window_get_user_data() instead of accessing GDK internals. * gtk/gtkwidget.c: Use gdk_window_peek_children() instead of accessing GDK internals.
492 lines
12 KiB
C
492 lines
12 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>
|
|
|
|
/* gcc -ansi -pedantic on GNU/Linux causes warnings and errors
|
|
* unless this is defined:
|
|
* warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE"
|
|
*/
|
|
#ifndef _XOPEN_SOURCE
|
|
# define _XOPEN_SOURCE 1
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
|
|
#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
|
|
#define USE_SHM
|
|
#endif
|
|
|
|
#ifdef USE_SHM
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
#endif /* USE_SHM */
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
#ifdef USE_SHM
|
|
#include <X11/extensions/XShm.h>
|
|
#endif /* USE_SHM */
|
|
|
|
#include "gdk.h" /* For gdk_error_trap_* / gdk_flush_* */
|
|
#include "gdkimage.h"
|
|
#include "gdkprivate.h"
|
|
#include "gdkprivate-x11.h"
|
|
|
|
static GList *image_list = NULL;
|
|
static gpointer parent_class = NULL;
|
|
|
|
static void gdk_x11_image_destroy (GdkImage *image);
|
|
static void gdk_image_init (GdkImage *image);
|
|
static void gdk_image_class_init (GdkImageClass *klass);
|
|
static void gdk_image_finalize (GObject *object);
|
|
|
|
#define PRIVATE_DATA(image) ((GdkImagePrivateX11 *) GDK_IMAGE (image)->windowing_data)
|
|
|
|
GType
|
|
gdk_image_get_type (void)
|
|
{
|
|
static GType object_type = 0;
|
|
|
|
if (!object_type)
|
|
{
|
|
static const GTypeInfo object_info =
|
|
{
|
|
sizeof (GdkImageClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gdk_image_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GdkImage),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gdk_image_init,
|
|
};
|
|
|
|
object_type = g_type_register_static (G_TYPE_OBJECT,
|
|
"GdkImage",
|
|
&object_info);
|
|
}
|
|
|
|
return object_type;
|
|
}
|
|
|
|
static void
|
|
gdk_image_init (GdkImage *image)
|
|
{
|
|
image->windowing_data = g_new0 (GdkImagePrivateX11, 1);
|
|
|
|
}
|
|
|
|
static void
|
|
gdk_image_class_init (GdkImageClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->finalize = gdk_image_finalize;
|
|
}
|
|
|
|
static void
|
|
gdk_image_finalize (GObject *object)
|
|
{
|
|
GdkImage *image = GDK_IMAGE (object);
|
|
|
|
gdk_x11_image_destroy (image);
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
}
|
|
|
|
|
|
void
|
|
gdk_image_exit (void)
|
|
{
|
|
GdkImage *image;
|
|
|
|
while (image_list)
|
|
{
|
|
image = image_list->data;
|
|
gdk_x11_image_destroy (image);
|
|
}
|
|
}
|
|
|
|
GdkImage *
|
|
gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
|
|
/*
|
|
* Desc: create a new bitmap image
|
|
*/
|
|
{
|
|
Visual *xvisual;
|
|
GdkImage *image;
|
|
GdkImagePrivateX11 *private;
|
|
image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
|
|
private = PRIVATE_DATA (image);
|
|
private->xdisplay = gdk_display;
|
|
image->type = GDK_IMAGE_NORMAL;
|
|
image->visual = visual;
|
|
image->width = w;
|
|
image->height = h;
|
|
image->depth = 1;
|
|
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
|
|
private->ximage = XCreateImage(private->xdisplay, xvisual, 1, XYBitmap,
|
|
0, 0, w ,h, 8, 0);
|
|
private->ximage->data = data;
|
|
private->ximage->bitmap_bit_order = MSBFirst;
|
|
private->ximage->byte_order = MSBFirst;
|
|
image->byte_order = MSBFirst;
|
|
image->mem = private->ximage->data;
|
|
image->bpl = private->ximage->bytes_per_line;
|
|
image->bpp = 1;
|
|
return(image);
|
|
} /* gdk_image_new_bitmap() */
|
|
|
|
static int
|
|
gdk_image_check_xshm(Display *display)
|
|
/*
|
|
* Desc: query the server for support for the MIT_SHM extension
|
|
* Return: 0 = not available
|
|
* 1 = shared XImage support available
|
|
* 2 = shared Pixmap support available also
|
|
*/
|
|
{
|
|
#ifdef USE_SHM
|
|
int major, minor, ignore;
|
|
Bool pixmaps;
|
|
|
|
if (XQueryExtension(display, "MIT-SHM", &ignore, &ignore, &ignore))
|
|
{
|
|
if (XShmQueryVersion(display, &major, &minor, &pixmaps )==True)
|
|
{
|
|
return (pixmaps==True) ? 2 : 1;
|
|
}
|
|
}
|
|
#endif /* USE_SHM */
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
_gdk_windowing_image_init (void)
|
|
{
|
|
if (gdk_use_xshm)
|
|
{
|
|
if (!gdk_image_check_xshm (gdk_display))
|
|
{
|
|
gdk_use_xshm = False;
|
|
}
|
|
}
|
|
}
|
|
|
|
GdkImage*
|
|
gdk_image_new (GdkImageType type,
|
|
GdkVisual *visual,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkImage *image;
|
|
GdkImagePrivateX11 *private;
|
|
#ifdef USE_SHM
|
|
XShmSegmentInfo *x_shm_info;
|
|
#endif /* USE_SHM */
|
|
Visual *xvisual;
|
|
|
|
switch (type)
|
|
{
|
|
case GDK_IMAGE_FASTEST:
|
|
image = gdk_image_new (GDK_IMAGE_SHARED, visual, width, height);
|
|
|
|
if (!image)
|
|
image = gdk_image_new (GDK_IMAGE_NORMAL, visual, width, height);
|
|
break;
|
|
|
|
default:
|
|
image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
|
|
|
|
private = PRIVATE_DATA (image);
|
|
|
|
private->xdisplay = gdk_display;
|
|
|
|
image->type = type;
|
|
image->visual = visual;
|
|
image->width = width;
|
|
image->height = height;
|
|
image->depth = visual->depth;
|
|
|
|
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
|
|
|
|
switch (type)
|
|
{
|
|
case GDK_IMAGE_SHARED:
|
|
#ifdef USE_SHM
|
|
if (gdk_use_xshm)
|
|
{
|
|
private->x_shm_info = g_new (XShmSegmentInfo, 1);
|
|
x_shm_info = private->x_shm_info;
|
|
|
|
private->ximage = XShmCreateImage (private->xdisplay, xvisual, visual->depth,
|
|
ZPixmap, NULL, x_shm_info, width, height);
|
|
if (private->ximage == NULL)
|
|
{
|
|
g_warning ("XShmCreateImage failed");
|
|
|
|
g_free (image);
|
|
gdk_use_xshm = False;
|
|
return NULL;
|
|
}
|
|
|
|
x_shm_info->shmid = shmget (IPC_PRIVATE,
|
|
private->ximage->bytes_per_line * private->ximage->height,
|
|
IPC_CREAT | 0777);
|
|
|
|
if (x_shm_info->shmid == -1)
|
|
{
|
|
g_warning ("shmget failed!");
|
|
|
|
XDestroyImage (private->ximage);
|
|
g_free (private->x_shm_info);
|
|
g_free (image);
|
|
|
|
gdk_use_xshm = False;
|
|
return NULL;
|
|
}
|
|
|
|
x_shm_info->readOnly = False;
|
|
x_shm_info->shmaddr = shmat (x_shm_info->shmid, 0, 0);
|
|
private->ximage->data = x_shm_info->shmaddr;
|
|
|
|
if (x_shm_info->shmaddr == (char*) -1)
|
|
{
|
|
g_warning ("shmat failed!");
|
|
|
|
XDestroyImage (private->ximage);
|
|
shmctl (x_shm_info->shmid, IPC_RMID, 0);
|
|
|
|
g_free (private->x_shm_info);
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
gdk_error_trap_push ();
|
|
|
|
XShmAttach (private->xdisplay, x_shm_info);
|
|
XSync (private->xdisplay, False);
|
|
|
|
if (gdk_error_trap_pop ())
|
|
{
|
|
/* this is the common failure case so omit warning */
|
|
XDestroyImage (private->ximage);
|
|
shmdt (x_shm_info->shmaddr);
|
|
shmctl (x_shm_info->shmid, IPC_RMID, 0);
|
|
|
|
g_free (private->x_shm_info);
|
|
g_free (image);
|
|
|
|
gdk_use_xshm = False;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* We mark the segment as destroyed so that when
|
|
* the last process detaches, it will be deleted.
|
|
* There is a small possibility of leaking if
|
|
* we die in XShmAttach. In theory, a signal handler
|
|
* could be set up.
|
|
*/
|
|
shmctl (x_shm_info->shmid, IPC_RMID, 0);
|
|
|
|
if (image)
|
|
image_list = g_list_prepend (image_list, image);
|
|
}
|
|
else
|
|
{
|
|
g_free (image);
|
|
return NULL;
|
|
}
|
|
break;
|
|
#else /* USE_SHM */
|
|
g_free (image);
|
|
return NULL;
|
|
#endif /* USE_SHM */
|
|
case GDK_IMAGE_NORMAL:
|
|
private->ximage = XCreateImage (private->xdisplay, xvisual, visual->depth,
|
|
ZPixmap, 0, 0, width, height, 32, 0);
|
|
|
|
/* Use malloc, not g_malloc here, because X will call free()
|
|
* on this data
|
|
*/
|
|
private->ximage->data = malloc (private->ximage->bytes_per_line *
|
|
private->ximage->height);
|
|
break;
|
|
|
|
case GDK_IMAGE_FASTEST:
|
|
case GDK_IMAGE_SHARED_PIXMAP:
|
|
g_assert_not_reached ();
|
|
}
|
|
|
|
if (image)
|
|
{
|
|
image->byte_order = private->ximage->byte_order;
|
|
image->mem = private->ximage->data;
|
|
image->bpl = private->ximage->bytes_per_line;
|
|
image->bpp = (private->ximage->bits_per_pixel + 7) / 8;
|
|
}
|
|
}
|
|
|
|
return image;
|
|
}
|
|
|
|
GdkImage*
|
|
gdk_image_get (GdkWindow *window,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkImage *image;
|
|
GdkImagePrivateX11 *private;
|
|
|
|
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
|
|
|
|
if (GDK_WINDOW_DESTROYED (window))
|
|
return NULL;
|
|
|
|
image = GDK_IMAGE (g_type_create_instance (gdk_image_get_type ()));
|
|
private = PRIVATE_DATA (image);
|
|
|
|
private->xdisplay = gdk_display;
|
|
private->ximage = XGetImage (private->xdisplay,
|
|
GDK_DRAWABLE_XID (window),
|
|
x, y, width, height,
|
|
AllPlanes, ZPixmap);
|
|
|
|
image->type = GDK_IMAGE_NORMAL;
|
|
image->visual = gdk_window_get_visual (window);
|
|
image->width = width;
|
|
image->height = height;
|
|
image->depth = private->ximage->depth;
|
|
|
|
image->mem = private->ximage->data;
|
|
image->bpl = private->ximage->bytes_per_line;
|
|
if (private->ximage->bits_per_pixel <= 8)
|
|
image->bpp = 1;
|
|
else if (private->ximage->bits_per_pixel <= 16)
|
|
image->bpp = 2;
|
|
else if (private->ximage->bits_per_pixel <= 24)
|
|
image->bpp = 3;
|
|
else
|
|
image->bpp = 4;
|
|
image->byte_order = private->ximage->byte_order;
|
|
|
|
return image;
|
|
}
|
|
|
|
guint32
|
|
gdk_image_get_pixel (GdkImage *image,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
guint32 pixel;
|
|
GdkImagePrivateX11 *private;
|
|
|
|
g_return_val_if_fail (GDK_IS_IMAGE (image), 0);
|
|
|
|
private = PRIVATE_DATA (image);
|
|
|
|
pixel = XGetPixel (private->ximage, x, y);
|
|
|
|
return pixel;
|
|
}
|
|
|
|
void
|
|
gdk_image_put_pixel (GdkImage *image,
|
|
gint x,
|
|
gint y,
|
|
guint32 pixel)
|
|
{
|
|
GdkImagePrivateX11 *private;
|
|
|
|
g_return_if_fail (GDK_IS_IMAGE (image));
|
|
|
|
private = PRIVATE_DATA (image);
|
|
|
|
pixel = XPutPixel (private->ximage, x, y, pixel);
|
|
}
|
|
|
|
static void
|
|
gdk_x11_image_destroy (GdkImage *image)
|
|
{
|
|
GdkImagePrivateX11 *private;
|
|
#ifdef USE_SHM
|
|
XShmSegmentInfo *x_shm_info;
|
|
#endif /* USE_SHM */
|
|
|
|
g_return_if_fail (GDK_IS_IMAGE (image));
|
|
|
|
private = PRIVATE_DATA (image);
|
|
|
|
if (private == NULL) /* This means that gdk_image_exit() destroyed the
|
|
* image already, and now we're called a second
|
|
* time from _finalize()
|
|
*/
|
|
return;
|
|
|
|
switch (image->type)
|
|
{
|
|
case GDK_IMAGE_NORMAL:
|
|
XDestroyImage (private->ximage);
|
|
break;
|
|
|
|
case GDK_IMAGE_SHARED:
|
|
#ifdef USE_SHM
|
|
gdk_flush();
|
|
|
|
XShmDetach (private->xdisplay, private->x_shm_info);
|
|
XDestroyImage (private->ximage);
|
|
|
|
x_shm_info = private->x_shm_info;
|
|
shmdt (x_shm_info->shmaddr);
|
|
|
|
g_free (private->x_shm_info);
|
|
private->x_shm_info = NULL;
|
|
|
|
image_list = g_list_remove (image_list, image);
|
|
#else /* USE_SHM */
|
|
g_error ("trying to destroy shared memory image when gdk was compiled without shared memory support");
|
|
#endif /* USE_SHM */
|
|
break;
|
|
|
|
case GDK_IMAGE_FASTEST:
|
|
case GDK_IMAGE_SHARED_PIXMAP:
|
|
g_assert_not_reached ();
|
|
}
|
|
|
|
g_free (private);
|
|
image->windowing_data = NULL;
|
|
}
|