forked from AuroraMiddleware/gtk
2e99e7713d
Fri Jan 15 10:22:21 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_class_init): nparams for selection_get should be 3, not 2. [ From Damon Chaplin <damon@karuna.freeserve.co.uk> ] * gtk/gtkeventbox.c (gtk_event_box_paint): Add a paint routine so queued redraws work inside event boxes. Thu Jan 14 17:47:37 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): Only redraw character under cursor when not displaying highlighted selection. * gdk/gdkrgb.c (gdk_rgb_init): Add in a cast to gpointer to make IRIX cc happy. Thu Jan 14 12:29:50 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkcheckbutton.c (gtk_check_button_draw): Restructure the drawing code to remove a bit of duplication - and to remove a call to gtk_widget_draw_focus() that queues a redraw when an expose occurs. * gtk/gtklabel.c (gtk_label_expose): Fix up handling of ypadding. * gtk/gtknotebook.c (gtk_notebook_draw): If we redraw the whole widget, also redraw the corresponding areas of the child widget. (have_visible_child still has some problems) * gdk/gdkpixmap.c: Change some g_new's to g_new0 so that fields unused for pixmaps get initialzized sanely. * gdk/gdk.h gdk/gdkwindow.c gdk/gdkprivate.h: Add new calls gdk_window_is_visible() and gdk_window_is_viewable() and a mapped flag to the window private structure. * gtk/gtkbin.c gtk/gtkclist.c gtk/gtkfixed.c gtk/gtkitem.c gtk/gtklayout.c gtk/gtklist.c gtk/gtkmenushell.c gtk/gtknotebook.c gtk/gtkpaned.c gtk/gtktree.c gtk/gtktreeitem.c gtk/gtkviewport.c: Map windows after mapping children. * gtk/gtkwidget.c (gtk_widget_clip_rect): Handle rectangles completely clipped away correctly. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't call gtk_widget_draw if width or height is 0. * gtk/gtkwidget.c (gtk_widget_idle_draw): Don't rely on GTK_REDRAW_PENDING after we've cleared it. (This was causing draw-combining to not happen at all). * gtk/gtkbin.c gtk/gtkscale.c: Remove uneccessary calls to gtk_widget_queue_draw() when mapping.
403 lines
12 KiB
C
403 lines
12 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 "gtkcheckbutton.h"
|
|
#include "gtklabel.h"
|
|
|
|
|
|
#define INDICATOR_SIZE 10
|
|
#define INDICATOR_SPACING 2
|
|
|
|
#define CHECK_BUTTON_CLASS(w) GTK_CHECK_BUTTON_CLASS (GTK_OBJECT (w)->klass)
|
|
|
|
|
|
static void gtk_check_button_class_init (GtkCheckButtonClass *klass);
|
|
static void gtk_check_button_init (GtkCheckButton *check_button);
|
|
static void gtk_check_button_draw (GtkWidget *widget,
|
|
GdkRectangle *area);
|
|
static void gtk_check_button_draw_focus (GtkWidget *widget);
|
|
static void gtk_check_button_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition);
|
|
static void gtk_check_button_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation);
|
|
static gint gtk_check_button_expose (GtkWidget *widget,
|
|
GdkEventExpose *event);
|
|
static void gtk_check_button_paint (GtkWidget *widget,
|
|
GdkRectangle *area);
|
|
static void gtk_check_button_draw_indicator (GtkCheckButton *check_button,
|
|
GdkRectangle *area);
|
|
static void gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
|
|
GdkRectangle *area);
|
|
|
|
static GtkToggleButtonClass *parent_class = NULL;
|
|
|
|
|
|
GtkType
|
|
gtk_check_button_get_type (void)
|
|
{
|
|
static GtkType check_button_type = 0;
|
|
|
|
if (!check_button_type)
|
|
{
|
|
static const GtkTypeInfo check_button_info =
|
|
{
|
|
"GtkCheckButton",
|
|
sizeof (GtkCheckButton),
|
|
sizeof (GtkCheckButtonClass),
|
|
(GtkClassInitFunc) gtk_check_button_class_init,
|
|
(GtkObjectInitFunc) gtk_check_button_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
check_button_type = gtk_type_unique (GTK_TYPE_TOGGLE_BUTTON, &check_button_info);
|
|
}
|
|
|
|
return check_button_type;
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_class_init (GtkCheckButtonClass *class)
|
|
{
|
|
GtkWidgetClass *widget_class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
parent_class = gtk_type_class (gtk_toggle_button_get_type ());
|
|
|
|
widget_class->draw = gtk_check_button_draw;
|
|
widget_class->draw_focus = gtk_check_button_draw_focus;
|
|
widget_class->size_request = gtk_check_button_size_request;
|
|
widget_class->size_allocate = gtk_check_button_size_allocate;
|
|
widget_class->expose_event = gtk_check_button_expose;
|
|
|
|
class->indicator_size = INDICATOR_SIZE;
|
|
class->indicator_spacing = INDICATOR_SPACING;
|
|
class->draw_indicator = gtk_real_check_button_draw_indicator;
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_init (GtkCheckButton *check_button)
|
|
{
|
|
GTK_WIDGET_SET_FLAGS (check_button, GTK_NO_WINDOW);
|
|
GTK_TOGGLE_BUTTON (check_button)->draw_indicator = TRUE;
|
|
}
|
|
|
|
GtkWidget*
|
|
gtk_check_button_new (void)
|
|
{
|
|
return gtk_widget_new (GTK_TYPE_CHECK_BUTTON, NULL);
|
|
}
|
|
|
|
|
|
GtkWidget*
|
|
gtk_check_button_new_with_label (const gchar *label)
|
|
{
|
|
GtkWidget *check_button;
|
|
GtkWidget *label_widget;
|
|
|
|
check_button = gtk_check_button_new ();
|
|
label_widget = gtk_label_new (label);
|
|
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
|
|
|
|
gtk_container_add (GTK_CONTAINER (check_button), label_widget);
|
|
gtk_widget_show (label_widget);
|
|
|
|
return check_button;
|
|
}
|
|
|
|
/* This should only be called when toggle_button->draw_indicator
|
|
* is true.
|
|
*/
|
|
static void
|
|
gtk_check_button_paint (GtkWidget *widget,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkCheckButton *check_button;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
|
|
|
|
check_button = GTK_CHECK_BUTTON (widget);
|
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
{
|
|
gint border_width;
|
|
|
|
gtk_check_button_draw_indicator (check_button, area);
|
|
|
|
border_width = GTK_CONTAINER (widget)->border_width;
|
|
if (GTK_WIDGET_HAS_FOCUS (widget))
|
|
gtk_paint_focus (widget->style, widget->window,
|
|
NULL, widget, "checkbutton",
|
|
border_width + widget->allocation.x,
|
|
border_width + widget->allocation.y,
|
|
widget->allocation.width - 2 * border_width - 1,
|
|
widget->allocation.height - 2 * border_width - 1);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_draw (GtkWidget *widget,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkCheckButton *check_button;
|
|
GtkToggleButton *toggle_button;
|
|
GtkBin *bin;
|
|
GdkRectangle child_area;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
|
|
g_return_if_fail (area != NULL);
|
|
|
|
check_button = GTK_CHECK_BUTTON (widget);
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
{
|
|
if (toggle_button->draw_indicator)
|
|
{
|
|
gtk_check_button_paint (widget, area);
|
|
|
|
if (bin->child && gtk_widget_intersect (bin->child, area, &child_area))
|
|
gtk_widget_draw (bin->child, &child_area);
|
|
}
|
|
else
|
|
{
|
|
if (GTK_WIDGET_CLASS (parent_class)->draw)
|
|
(* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_draw_focus (GtkWidget *widget)
|
|
{
|
|
gint border_width;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
|
|
|
|
border_width = GTK_CONTAINER (widget)->border_width;
|
|
gtk_widget_queue_clear_area (widget->parent,
|
|
border_width + widget->allocation.x,
|
|
border_width + widget->allocation.y,
|
|
widget->allocation.width - 2 * border_width,
|
|
widget->allocation.height - 2 * border_width);
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_size_request (GtkWidget *widget,
|
|
GtkRequisition *requisition)
|
|
{
|
|
GtkToggleButton *toggle_button;
|
|
gint temp;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
|
|
g_return_if_fail (requisition != NULL);
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->size_request)
|
|
(* GTK_WIDGET_CLASS (parent_class)->size_request) (widget, requisition);
|
|
|
|
if (toggle_button->draw_indicator)
|
|
{
|
|
requisition->width += (CHECK_BUTTON_CLASS (widget)->indicator_size +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 2);
|
|
|
|
temp = (CHECK_BUTTON_CLASS (widget)->indicator_size +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_spacing * 2);
|
|
requisition->height = MAX (requisition->height, temp) + 2;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gtk_check_button_size_allocate (GtkWidget *widget,
|
|
GtkAllocation *allocation)
|
|
{
|
|
GtkCheckButton *check_button;
|
|
GtkToggleButton *toggle_button;
|
|
GtkButton *button;
|
|
GtkAllocation child_allocation;
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
|
|
g_return_if_fail (allocation != NULL);
|
|
|
|
check_button = GTK_CHECK_BUTTON (widget);
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
|
|
if (toggle_button->draw_indicator)
|
|
{
|
|
widget->allocation = *allocation;
|
|
if (GTK_WIDGET_REALIZED (widget))
|
|
gdk_window_move_resize (toggle_button->event_window,
|
|
allocation->x, allocation->y,
|
|
allocation->width, allocation->height);
|
|
|
|
button = GTK_BUTTON (widget);
|
|
|
|
if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child))
|
|
{
|
|
child_allocation.x = (GTK_CONTAINER (widget)->border_width +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_size +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 1 +
|
|
widget->allocation.x);
|
|
child_allocation.y = GTK_CONTAINER (widget)->border_width + 1 +
|
|
widget->allocation.y;
|
|
child_allocation.width = MAX (1, allocation->width -
|
|
(GTK_CONTAINER (widget)->border_width +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_size +
|
|
CHECK_BUTTON_CLASS (widget)->indicator_spacing * 3 + 1) -
|
|
GTK_CONTAINER (widget)->border_width - 1);
|
|
child_allocation.height = MAX (1, allocation->height - (GTK_CONTAINER (widget)->border_width + 1) * 2);
|
|
|
|
gtk_widget_size_allocate (GTK_BIN (button)->child, &child_allocation);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
|
|
(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
|
|
}
|
|
}
|
|
|
|
static gint
|
|
gtk_check_button_expose (GtkWidget *widget,
|
|
GdkEventExpose *event)
|
|
{
|
|
GtkCheckButton *check_button;
|
|
GtkToggleButton *toggle_button;
|
|
GtkBin *bin;
|
|
GdkEventExpose child_event;
|
|
|
|
g_return_val_if_fail (widget != NULL, FALSE);
|
|
g_return_val_if_fail (GTK_IS_CHECK_BUTTON (widget), FALSE);
|
|
g_return_val_if_fail (event != NULL, FALSE);
|
|
|
|
check_button = GTK_CHECK_BUTTON (widget);
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
bin = GTK_BIN (widget);
|
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
{
|
|
if (toggle_button->draw_indicator)
|
|
{
|
|
gtk_check_button_paint (widget, &event->area);
|
|
|
|
child_event = *event;
|
|
if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child) &&
|
|
gtk_widget_intersect (bin->child, &event->area, &child_event.area))
|
|
gtk_widget_event (bin->child, (GdkEvent*) &child_event);
|
|
}
|
|
else
|
|
{
|
|
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
|
|
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
|
|
}
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
static void
|
|
gtk_check_button_draw_indicator (GtkCheckButton *check_button,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkCheckButtonClass *class;
|
|
|
|
g_return_if_fail (check_button != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
|
|
|
|
class = CHECK_BUTTON_CLASS (check_button);
|
|
|
|
if (class->draw_indicator)
|
|
(* class->draw_indicator) (check_button, area);
|
|
}
|
|
|
|
static void
|
|
gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkWidget *widget;
|
|
GtkToggleButton *toggle_button;
|
|
GtkStateType state_type;
|
|
GtkShadowType shadow_type;
|
|
GdkRectangle restrict_area;
|
|
GdkRectangle new_area;
|
|
gint width, height;
|
|
gint x, y;
|
|
GdkWindow *window;
|
|
|
|
g_return_if_fail (check_button != NULL);
|
|
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
|
|
|
|
widget = GTK_WIDGET (check_button);
|
|
toggle_button = GTK_TOGGLE_BUTTON (check_button);
|
|
|
|
if (GTK_WIDGET_DRAWABLE (check_button))
|
|
{
|
|
window = widget->window;
|
|
|
|
state_type = GTK_WIDGET_STATE (widget);
|
|
if (state_type != GTK_STATE_NORMAL &&
|
|
state_type != GTK_STATE_PRELIGHT)
|
|
state_type = GTK_STATE_NORMAL;
|
|
|
|
restrict_area.x = widget->allocation.x + GTK_CONTAINER (widget)->border_width;
|
|
restrict_area.y = widget->allocation.y + GTK_CONTAINER (widget)->border_width;
|
|
restrict_area.width = widget->allocation.width - ( 2 * GTK_CONTAINER (widget)->border_width);
|
|
restrict_area.height = widget->allocation.height - ( 2 * GTK_CONTAINER (widget)->border_width);
|
|
|
|
if (gdk_rectangle_intersect (area, &restrict_area, &new_area))
|
|
{
|
|
if (state_type != GTK_STATE_NORMAL)
|
|
gtk_paint_flat_box (widget->style, window, state_type,
|
|
GTK_SHADOW_ETCHED_OUT,
|
|
area, widget, "checkbutton",
|
|
new_area.x, new_area.y,
|
|
new_area.width, new_area.height);
|
|
}
|
|
|
|
x = widget->allocation.x + CHECK_BUTTON_CLASS (widget)->indicator_spacing + GTK_CONTAINER (widget)->border_width;
|
|
y = widget->allocation.y + (widget->allocation.height - CHECK_BUTTON_CLASS (widget)->indicator_size) / 2;
|
|
width = CHECK_BUTTON_CLASS (widget)->indicator_size;
|
|
height = CHECK_BUTTON_CLASS (widget)->indicator_size;
|
|
|
|
if (GTK_TOGGLE_BUTTON (widget)->active)
|
|
{
|
|
state_type = GTK_STATE_ACTIVE;
|
|
shadow_type = GTK_SHADOW_IN;
|
|
}
|
|
else
|
|
{
|
|
shadow_type = GTK_SHADOW_OUT;
|
|
state_type = GTK_WIDGET_STATE (widget);
|
|
}
|
|
|
|
gtk_paint_check (widget->style, window,
|
|
state_type, shadow_type,
|
|
area, widget, "checkbutton",
|
|
x + 1, y + 1, width, height);
|
|
}
|
|
}
|