gtk2/gtk/gtkpixmap.c
Owen Taylor 4851efe296 configure.in acheader.h gdk/gdkwindow.c Check for Shape extension both on
Sun May  3 13:38:22 1998  Owen Taylor  <otaylor@gtk.org>

	* configure.in acheader.h gdk/gdkwindow.c
	Check for Shape extension both on the client and server
	side. (And, more importantly, check for the shape extension
	so we may include -lXext even when compiling with --disable-xshm)

	Don't set override_redirect on all shaped windows. It isn't
	necessary.

	* gdk/gdkwindow.c: Set ->colormap to NULL for root
	and foreign windows. Use this to check if we
	need to get the colormap from X.

Fri May  1 22:32:47 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkbutton.c (gtk_button_paint): Draw the areas
	between the default and the button always in GTK_STATE_NORMAL.

	* gtk/gtkrange.c (gtk_range_style_set): Added a style_set
	callback.

Fri May  1 16:40:57 1998  Owen Taylor  <otaylor@gtk.org>

	* gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpmp[_d]):
	  Fix a buffer overflow on pixmaps that claim to have
	  more than 31 characters per pixel.

	  (gdk_pixmap_read_string): Don't wrap around strings longer
 	  than half of address space ;-)

	* gtk/gtk[vh]ruler.c gtk/gtkinputdialog.c: Expand some buffers
	that were used for printing integers.

	* */* (almost):

	Style: All
	  int foo () { ... }
	changed to
	  int foo (void) { ... }

^^^^^^^ This is why some many files changed

	Even where there were proper prototypes elsewhere.

	* gdk/gxid.c (handle_claim_device): Some extra checks.
	It isn't safe against being fed bad X id's, but at
	least it should be safe against deleting all your
	files.
1998-05-03 22:41:32 +00:00

215 lines
5.3 KiB
C

/* GTK - The GIMP Toolkit
* 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.
*/
#include "gtkcontainer.h"
#include "gtkpixmap.h"
static void gtk_pixmap_class_init (GtkPixmapClass *klass);
static void gtk_pixmap_init (GtkPixmap *pixmap);
static gint gtk_pixmap_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_pixmap_finalize (GtkObject *object);
static GtkWidgetClass *parent_class;
guint
gtk_pixmap_get_type (void)
{
static guint pixmap_type = 0;
if (!pixmap_type)
{
GtkTypeInfo pixmap_info =
{
"GtkPixmap",
sizeof (GtkPixmap),
sizeof (GtkPixmapClass),
(GtkClassInitFunc) gtk_pixmap_class_init,
(GtkObjectInitFunc) gtk_pixmap_init,
(GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL,
};
pixmap_type = gtk_type_unique (gtk_misc_get_type (), &pixmap_info);
}
return pixmap_type;
}
static void
gtk_pixmap_class_init (GtkPixmapClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
parent_class = gtk_type_class (gtk_widget_get_type ());
object_class->finalize = gtk_pixmap_finalize;
widget_class->expose_event = gtk_pixmap_expose;
}
static void
gtk_pixmap_init (GtkPixmap *pixmap)
{
GTK_WIDGET_SET_FLAGS (pixmap, GTK_NO_WINDOW);
pixmap->pixmap = NULL;
pixmap->mask = NULL;
}
GtkWidget*
gtk_pixmap_new (GdkPixmap *val,
GdkBitmap *mask)
{
GtkPixmap *pixmap;
g_return_val_if_fail (val != NULL, NULL);
pixmap = gtk_type_new (gtk_pixmap_get_type ());
gtk_pixmap_set (pixmap, val, mask);
return GTK_WIDGET (pixmap);
}
static void
gtk_pixmap_finalize (GtkObject *object)
{
gtk_pixmap_set (GTK_PIXMAP (object), NULL, NULL);
(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
}
void
gtk_pixmap_set (GtkPixmap *pixmap,
GdkPixmap *val,
GdkBitmap *mask)
{
gint width;
gint height;
gint oldwidth;
gint oldheight;
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
if (pixmap->pixmap != val)
{
oldwidth = GTK_WIDGET (pixmap)->requisition.width;
oldheight = GTK_WIDGET (pixmap)->requisition.height;
if (pixmap->pixmap)
gdk_pixmap_unref (pixmap->pixmap);
pixmap->pixmap = val;
if (pixmap->pixmap)
{
gdk_pixmap_ref (pixmap->pixmap);
gdk_window_get_size (pixmap->pixmap, &width, &height);
GTK_WIDGET (pixmap)->requisition.width =
width + GTK_MISC (pixmap)->xpad * 2;
GTK_WIDGET (pixmap)->requisition.height =
height + GTK_MISC (pixmap)->ypad * 2;
}
else
{
GTK_WIDGET (pixmap)->requisition.width = 0;
GTK_WIDGET (pixmap)->requisition.height = 0;
}
if (GTK_WIDGET_VISIBLE (pixmap))
{
if ((GTK_WIDGET (pixmap)->requisition.width != oldwidth) ||
(GTK_WIDGET (pixmap)->requisition.height != oldheight))
gtk_widget_queue_resize (GTK_WIDGET (pixmap));
else
gtk_widget_queue_draw (GTK_WIDGET (pixmap));
}
}
if (pixmap->mask != mask)
{
if (pixmap->mask)
gdk_bitmap_unref (pixmap->mask);
pixmap->mask = mask;
if (pixmap->mask)
gdk_bitmap_ref (pixmap->mask);
}
}
void
gtk_pixmap_get (GtkPixmap *pixmap,
GdkPixmap **val,
GdkBitmap **mask)
{
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
if (val)
*val = pixmap->pixmap;
if (mask)
*mask = pixmap->mask;
}
static gint
gtk_pixmap_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkPixmap *pixmap;
GtkMisc *misc;
gint x, y;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIXMAP (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_DRAWABLE (widget))
{
pixmap = GTK_PIXMAP (widget);
misc = GTK_MISC (widget);
x = (widget->allocation.x * (1.0 - misc->xalign) +
(widget->allocation.x + widget->allocation.width
- (widget->requisition.width - misc->xpad * 2)) *
misc->xalign) + 0.5;
y = (widget->allocation.y * (1.0 - misc->yalign) +
(widget->allocation.y + widget->allocation.height
- (widget->requisition.height - misc->ypad * 2)) *
misc->yalign) + 0.5;
if (pixmap->mask)
{
gdk_gc_set_clip_mask (widget->style->black_gc, pixmap->mask);
gdk_gc_set_clip_origin (widget->style->black_gc, x, y);
}
gdk_draw_pixmap (widget->window,
widget->style->black_gc,
pixmap->pixmap,
0, 0, x, y, -1, -1);
if (pixmap->mask)
{
gdk_gc_set_clip_mask (widget->style->black_gc, NULL);
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
}
}
return FALSE;
}