forked from AuroraMiddleware/gtk
913831b26f
Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
236 lines
5.9 KiB
C
236 lines
5.9 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;
|
|
|
|
GtkType
|
|
gtk_pixmap_get_type (void)
|
|
{
|
|
static GtkType 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_TYPE_MISC, &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;
|
|
pixmap->needs_clear = FALSE;
|
|
}
|
|
|
|
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 we aren't drawing the entire area, clear first */
|
|
if (GTK_WIDGET_DRAWABLE (pixmap) &&
|
|
((mask != NULL) ||
|
|
(GTK_WIDGET (pixmap)->requisition.width != oldwidth) ||
|
|
(GTK_WIDGET (pixmap)->requisition.height != oldheight)))
|
|
{
|
|
pixmap->needs_clear = TRUE;
|
|
}
|
|
|
|
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);
|
|
|
|
if (pixmap->needs_clear)
|
|
{
|
|
gdk_window_clear_area (GTK_WIDGET (pixmap)->window,
|
|
GTK_WIDGET (pixmap)->allocation.x,
|
|
GTK_WIDGET (pixmap)->allocation.y,
|
|
GTK_WIDGET (pixmap)->allocation.width,
|
|
GTK_WIDGET (pixmap)->allocation.height);
|
|
|
|
pixmap->needs_clear = FALSE;
|
|
}
|
|
|
|
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;
|
|
}
|