1998-11-24 16:15:46 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
1998-11-24 04:45:29 +00:00
|
|
|
*
|
1998-11-24 16:15:46 +00:00
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* GtkLayout: Widget for scrolling of arbitrary-sized areas.
|
|
|
|
*
|
|
|
|
* Copyright Owen Taylor, 1998
|
1998-11-24 04:45:29 +00:00
|
|
|
*/
|
|
|
|
|
1999-02-24 07:37:18 +00:00
|
|
|
/*
|
|
|
|
* 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/.
|
|
|
|
*/
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#include "gdk/gdkx.h"
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
#include "gtklayout.h"
|
|
|
|
#include "gtksignal.h"
|
1999-01-27 18:21:20 +00:00
|
|
|
#include "gtkprivate.h"
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
typedef struct _GtkLayoutAdjData GtkLayoutAdjData;
|
|
|
|
typedef struct _GtkLayoutChild GtkLayoutChild;
|
|
|
|
|
|
|
|
struct _GtkLayoutAdjData {
|
|
|
|
gint dx;
|
|
|
|
gint dy;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkLayoutChild {
|
|
|
|
GtkWidget *widget;
|
|
|
|
gint x;
|
|
|
|
gint y;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
|
|
|
|
(y >= G_MINSHORT) && (y <= G_MAXSHORT))
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
static void gtk_layout_class_init (GtkLayoutClass *class);
|
|
|
|
static void gtk_layout_init (GtkLayout *layout);
|
|
|
|
|
|
|
|
static void gtk_layout_realize (GtkWidget *widget);
|
|
|
|
static void gtk_layout_unrealize (GtkWidget *widget);
|
|
|
|
static void gtk_layout_map (GtkWidget *widget);
|
|
|
|
static void gtk_layout_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition);
|
|
|
|
static void gtk_layout_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
|
|
|
static void gtk_layout_draw (GtkWidget *widget,
|
|
|
|
GdkRectangle *area);
|
|
|
|
static gint gtk_layout_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event);
|
|
|
|
|
|
|
|
static void gtk_layout_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
|
|
|
static void gtk_layout_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data);
|
|
|
|
static void gtk_layout_set_adjustments (GtkLayout *layout,
|
|
|
|
GtkAdjustment *hadj,
|
|
|
|
GtkAdjustment *vadj);
|
|
|
|
|
|
|
|
static void gtk_layout_position_child (GtkLayout *layout,
|
1999-01-27 18:21:20 +00:00
|
|
|
GtkLayoutChild *child);
|
|
|
|
static void gtk_layout_allocate_child (GtkLayout *layout,
|
|
|
|
GtkLayoutChild *child);
|
1998-11-24 04:45:29 +00:00
|
|
|
static void gtk_layout_position_children (GtkLayout *layout);
|
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
static void gtk_layout_adjust_allocations_recurse (GtkWidget *widget,
|
|
|
|
gpointer cb_data);
|
|
|
|
static void gtk_layout_adjust_allocations (GtkLayout *layout,
|
|
|
|
gint dx,
|
|
|
|
gint dy);
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static void gtk_layout_expose_area (GtkLayout *layout,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
gint width,
|
|
|
|
gint height);
|
|
|
|
static void gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
|
|
|
|
GtkLayout *layout);
|
|
|
|
static GdkFilterReturn gtk_layout_filter (GdkXEvent *gdk_xevent,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data);
|
|
|
|
static GdkFilterReturn gtk_layout_main_filter (GdkXEvent *gdk_xevent,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data);
|
|
|
|
|
|
|
|
static GtkWidgetClass *parent_class = NULL;
|
1999-01-28 04:12:58 +00:00
|
|
|
static gboolean gravity_works;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
/* Public interface
|
|
|
|
*/
|
|
|
|
|
|
|
|
GtkWidget*
|
|
|
|
gtk_layout_new (GtkAdjustment *hadjustment,
|
|
|
|
GtkAdjustment *vadjustment)
|
|
|
|
{
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
layout = gtk_type_new (GTK_TYPE_LAYOUT);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1998-11-24 19:33:01 +00:00
|
|
|
gtk_layout_set_adjustments (layout, hadjustment, vadjustment);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return GTK_WIDGET (layout);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkAdjustment*
|
|
|
|
gtk_layout_get_hadjustment (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (layout != NULL, NULL);
|
|
|
|
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
|
|
|
|
|
|
|
|
return layout->hadjustment;
|
|
|
|
}
|
|
|
|
GtkAdjustment*
|
|
|
|
gtk_layout_get_vadjustment (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (layout != NULL, NULL);
|
|
|
|
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
|
|
|
|
|
|
|
|
return layout->vadjustment;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_set_adjustments (GtkLayout *layout,
|
|
|
|
GtkAdjustment *hadj,
|
|
|
|
GtkAdjustment *vadj)
|
|
|
|
{
|
1998-11-24 19:33:01 +00:00
|
|
|
gboolean need_adjust = FALSE;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
|
|
|
if (hadj)
|
|
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
|
|
|
|
else
|
|
|
|
hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
|
|
|
|
if (vadj)
|
|
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
|
|
|
|
else
|
|
|
|
vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
|
|
|
|
|
|
|
|
if (layout->hadjustment && (layout->hadjustment != hadj))
|
|
|
|
{
|
|
|
|
gtk_signal_disconnect_by_data (GTK_OBJECT (layout->hadjustment), layout);
|
|
|
|
gtk_object_unref (GTK_OBJECT (layout->hadjustment));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (layout->vadjustment && (layout->vadjustment != vadj))
|
|
|
|
{
|
|
|
|
gtk_signal_disconnect_by_data (GTK_OBJECT (layout->vadjustment), layout);
|
|
|
|
gtk_object_unref (GTK_OBJECT (layout->vadjustment));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (layout->hadjustment != hadj)
|
|
|
|
{
|
|
|
|
layout->hadjustment = hadj;
|
|
|
|
gtk_object_ref (GTK_OBJECT (layout->hadjustment));
|
|
|
|
gtk_object_sink (GTK_OBJECT (layout->hadjustment));
|
|
|
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (layout->hadjustment), "value_changed",
|
|
|
|
(GtkSignalFunc) gtk_layout_adjustment_changed,
|
|
|
|
layout);
|
1998-11-24 19:33:01 +00:00
|
|
|
need_adjust = TRUE;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (layout->vadjustment != vadj)
|
|
|
|
{
|
|
|
|
layout->vadjustment = vadj;
|
|
|
|
gtk_object_ref (GTK_OBJECT (layout->vadjustment));
|
|
|
|
gtk_object_sink (GTK_OBJECT (layout->vadjustment));
|
|
|
|
|
|
|
|
gtk_signal_connect (GTK_OBJECT (layout->vadjustment), "value_changed",
|
|
|
|
(GtkSignalFunc) gtk_layout_adjustment_changed,
|
|
|
|
layout);
|
1998-11-24 19:33:01 +00:00
|
|
|
need_adjust = TRUE;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
1998-11-24 19:33:01 +00:00
|
|
|
|
|
|
|
if (need_adjust)
|
|
|
|
gtk_layout_adjustment_changed (NULL, layout);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_set_hadjustment (GtkLayout *layout,
|
|
|
|
GtkAdjustment *adjustment)
|
|
|
|
{
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
1998-11-24 19:33:01 +00:00
|
|
|
gtk_layout_set_adjustments (layout, adjustment, layout->vadjustment);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_set_vadjustment (GtkLayout *layout,
|
|
|
|
GtkAdjustment *adjustment)
|
|
|
|
{
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
1998-11-24 19:33:01 +00:00
|
|
|
gtk_layout_set_adjustments (layout, layout->hadjustment, adjustment);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_put (GtkLayout *layout,
|
|
|
|
GtkWidget *child_widget,
|
|
|
|
gint x,
|
|
|
|
gint y)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child;
|
|
|
|
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
1999-01-16 19:04:06 +00:00
|
|
|
g_return_if_fail (child_widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child_widget));
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
child = g_new (GtkLayoutChild, 1);
|
|
|
|
|
|
|
|
child->widget = child_widget;
|
|
|
|
child->x = x;
|
|
|
|
child->y = y;
|
|
|
|
|
|
|
|
layout->children = g_list_append (layout->children, child);
|
|
|
|
|
|
|
|
gtk_widget_set_parent (child_widget, GTK_WIDGET (layout));
|
1999-01-27 18:21:20 +00:00
|
|
|
if (GTK_WIDGET_REALIZED (layout))
|
|
|
|
gtk_widget_set_parent_window (child->widget, layout->bin_window);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
if (!IS_ONSCREEN (x, y))
|
|
|
|
GTK_PRIVATE_SET_FLAG (child_widget, GTK_IS_OFFSCREEN);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
if (GTK_WIDGET_VISIBLE (layout))
|
|
|
|
{
|
|
|
|
if (GTK_WIDGET_REALIZED (layout) &&
|
|
|
|
!GTK_WIDGET_REALIZED (child_widget))
|
|
|
|
gtk_widget_realize (child_widget);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_MAPPED (layout) &&
|
|
|
|
!GTK_WIDGET_MAPPED (child_widget))
|
|
|
|
gtk_widget_map (child_widget);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child_widget) && GTK_WIDGET_VISIBLE (layout))
|
|
|
|
gtk_widget_queue_resize (child_widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_move (GtkLayout *layout,
|
|
|
|
GtkWidget *child_widget,
|
|
|
|
gint x,
|
|
|
|
gint y)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayoutChild *child;
|
|
|
|
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
child = tmp_list->data;
|
1999-01-27 18:21:20 +00:00
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
if (child->widget == child_widget)
|
|
|
|
{
|
|
|
|
child->x = x;
|
|
|
|
child->y = y;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child_widget) && GTK_WIDGET_VISIBLE (layout))
|
|
|
|
gtk_widget_queue_resize (child_widget);
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_set_size (GtkLayout *layout,
|
|
|
|
guint width,
|
|
|
|
guint height)
|
|
|
|
{
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
|
|
|
layout->width = width;
|
|
|
|
layout->height = height;
|
|
|
|
|
|
|
|
layout->hadjustment->upper = layout->width;
|
|
|
|
gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
|
|
|
|
|
|
|
|
layout->vadjustment->upper = layout->height;
|
|
|
|
gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_freeze (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
layout->freeze_count++;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_layout_thaw (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
g_return_if_fail (layout != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (layout));
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
if (layout->freeze_count)
|
|
|
|
if (!(--layout->freeze_count))
|
|
|
|
{
|
|
|
|
gtk_layout_position_children (layout);
|
|
|
|
gtk_widget_draw (GTK_WIDGET (layout), NULL);
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Basic Object handling procedures
|
|
|
|
*/
|
1998-11-28 01:56:09 +00:00
|
|
|
GtkType
|
1998-11-24 04:45:29 +00:00
|
|
|
gtk_layout_get_type (void)
|
|
|
|
{
|
1998-11-28 01:56:09 +00:00
|
|
|
static GtkType layout_type = 0;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
if (!layout_type)
|
|
|
|
{
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GtkTypeInfo layout_info =
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
"GtkLayout",
|
|
|
|
sizeof (GtkLayout),
|
|
|
|
sizeof (GtkLayoutClass),
|
|
|
|
(GtkClassInitFunc) gtk_layout_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_layout_init,
|
|
|
|
(GtkArgSetFunc) NULL,
|
|
|
|
(GtkArgGetFunc) NULL,
|
|
|
|
};
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
layout_type = gtk_type_unique (GTK_TYPE_CONTAINER, &layout_info);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return layout_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_class_init (GtkLayoutClass *class)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkContainerClass *container_class;
|
|
|
|
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
widget_class->realize = gtk_layout_realize;
|
|
|
|
widget_class->unrealize = gtk_layout_unrealize;
|
|
|
|
widget_class->map = gtk_layout_map;
|
|
|
|
widget_class->size_request = gtk_layout_size_request;
|
|
|
|
widget_class->size_allocate = gtk_layout_size_allocate;
|
|
|
|
widget_class->draw = gtk_layout_draw;
|
|
|
|
widget_class->expose_event = gtk_layout_expose;
|
|
|
|
|
1998-12-02 03:40:03 +00:00
|
|
|
widget_class->set_scroll_adjustments_signal =
|
|
|
|
gtk_signal_new ("set_scroll_adjustments",
|
1998-11-24 04:45:29 +00:00
|
|
|
GTK_RUN_LAST,
|
|
|
|
object_class->type,
|
1998-12-02 03:40:03 +00:00
|
|
|
GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
|
1998-11-24 04:45:29 +00:00
|
|
|
gtk_marshal_NONE__POINTER_POINTER,
|
|
|
|
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
|
|
|
|
|
|
|
|
container_class->remove = gtk_layout_remove;
|
|
|
|
container_class->forall = gtk_layout_forall;
|
|
|
|
|
1998-12-02 03:40:03 +00:00
|
|
|
class->set_scroll_adjustments = gtk_layout_set_adjustments;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_init (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
layout->children = NULL;
|
|
|
|
|
|
|
|
layout->width = 100;
|
|
|
|
layout->height = 100;
|
|
|
|
|
|
|
|
layout->hadjustment = NULL;
|
|
|
|
layout->vadjustment = NULL;
|
|
|
|
|
|
|
|
layout->bin_window = NULL;
|
|
|
|
|
|
|
|
layout->configure_serial = 0;
|
|
|
|
layout->scroll_x = 0;
|
|
|
|
layout->scroll_y = 0;
|
|
|
|
layout->visibility = GDK_VISIBILITY_PARTIAL;
|
1998-11-28 01:56:09 +00:00
|
|
|
|
|
|
|
layout->freeze_count = 0;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Widget methods
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_realize (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
|
|
|
GdkWindowAttr attributes;
|
|
|
|
gint attributes_mask;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
|
|
|
|
|
|
|
|
attributes.window_type = GDK_WINDOW_CHILD;
|
|
|
|
attributes.x = widget->allocation.x;
|
|
|
|
attributes.y = widget->allocation.y;
|
|
|
|
attributes.width = widget->allocation.width;
|
|
|
|
attributes.height = widget->allocation.height;
|
|
|
|
attributes.wclass = GDK_INPUT_OUTPUT;
|
|
|
|
attributes.visual = gtk_widget_get_visual (widget);
|
|
|
|
attributes.colormap = gtk_widget_get_colormap (widget);
|
|
|
|
attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
|
|
|
|
|
|
|
|
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
|
|
|
|
|
|
|
|
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
|
|
&attributes, attributes_mask);
|
|
|
|
gdk_window_set_user_data (widget->window, widget);
|
|
|
|
|
|
|
|
attributes.x = 0;
|
|
|
|
attributes.y = 0;
|
1999-01-27 18:21:20 +00:00
|
|
|
attributes.event_mask = GDK_EXPOSURE_MASK |
|
|
|
|
gtk_widget_get_events (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
layout->bin_window = gdk_window_new (widget->window,
|
|
|
|
&attributes, attributes_mask);
|
|
|
|
gdk_window_set_user_data (layout->bin_window, widget);
|
|
|
|
|
|
|
|
widget->style = gtk_style_attach (widget->style, widget->window);
|
|
|
|
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
|
|
|
|
gtk_style_set_background (widget->style, layout->bin_window, GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
gdk_window_add_filter (widget->window, gtk_layout_main_filter, layout);
|
|
|
|
gdk_window_add_filter (layout->bin_window, gtk_layout_filter, layout);
|
|
|
|
|
1999-01-28 04:12:58 +00:00
|
|
|
/* XXX: If we ever get multiple displays for GTK+, then gravity_works
|
|
|
|
* will have to become a widget member. Right now we just
|
|
|
|
* keep it as a global
|
|
|
|
*/
|
|
|
|
gravity_works = gdk_window_set_static_gravities (layout->bin_window, TRUE);
|
1999-01-27 18:21:20 +00:00
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
gtk_widget_set_parent_window (child->widget, layout->bin_window);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_map (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
1999-01-27 18:21:20 +00:00
|
|
|
tmp_list = tmp_list->next;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget))
|
1998-11-24 19:33:01 +00:00
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
if (!GTK_WIDGET_MAPPED (child->widget) &&
|
|
|
|
!GTK_WIDGET_IS_OFFSCREEN (child->widget))
|
1998-11-24 19:33:01 +00:00
|
|
|
gtk_widget_map (child->widget);
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
1999-01-15 16:00:39 +00:00
|
|
|
|
|
|
|
gdk_window_show (layout->bin_window);
|
|
|
|
gdk_window_show (widget->window);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_unrealize (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
|
|
|
gdk_window_set_user_data (layout->bin_window, NULL);
|
|
|
|
gdk_window_destroy (layout->bin_window);
|
|
|
|
layout->bin_window = NULL;
|
|
|
|
|
1998-12-16 20:09:30 +00:00
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
|
|
|
|
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
1998-12-02 03:40:03 +00:00
|
|
|
requisition->width = 0;
|
|
|
|
requisition->height = 0;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
tmp_list = layout->children;
|
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
1999-02-10 02:35:09 +00:00
|
|
|
GtkRequisition child_requisition;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
tmp_list = tmp_list->next;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
1999-02-10 02:35:09 +00:00
|
|
|
gtk_widget_size_request (child->widget, &child_requisition);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
widget->allocation = *allocation;
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
gtk_layout_position_child (layout, child);
|
|
|
|
gtk_layout_allocate_child (layout, child);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_REALIZED (widget))
|
|
|
|
{
|
|
|
|
gdk_window_move_resize (widget->window,
|
|
|
|
allocation->x, allocation->y,
|
|
|
|
allocation->width, allocation->height);
|
|
|
|
gdk_window_move_resize (GTK_LAYOUT(widget)->bin_window,
|
|
|
|
0, 0,
|
|
|
|
allocation->width, allocation->height);
|
|
|
|
}
|
|
|
|
|
|
|
|
layout->hadjustment->page_size = allocation->width;
|
|
|
|
layout->hadjustment->page_increment = allocation->width / 2;
|
1999-01-27 18:21:20 +00:00
|
|
|
layout->hadjustment->lower = 0;
|
|
|
|
layout->hadjustment->upper = layout->width;
|
1998-11-24 04:45:29 +00:00
|
|
|
gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
|
|
|
|
|
|
|
|
layout->vadjustment->page_size = allocation->height;
|
|
|
|
layout->vadjustment->page_increment = allocation->height / 2;
|
1999-01-27 18:21:20 +00:00
|
|
|
layout->vadjustment->lower = 0;
|
|
|
|
layout->vadjustment->upper = layout->height;
|
1998-11-24 04:45:29 +00:00
|
|
|
gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
|
|
|
|
}
|
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
static void
|
|
|
|
gtk_layout_draw (GtkWidget *widget, GdkRectangle *area)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
|
|
|
GdkRectangle child_area;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (widget));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
|
|
|
/* We don't have any way of telling themes about this properly,
|
|
|
|
* so we just assume a background pixmap
|
|
|
|
*/
|
|
|
|
if (!GTK_WIDGET_APP_PAINTABLE (widget))
|
|
|
|
gdk_window_clear_area (layout->bin_window,
|
|
|
|
area->x, area->y, area->width, area->height);
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
if (gtk_widget_intersect (child->widget, area, &child_area))
|
|
|
|
gtk_widget_draw (child->widget, &child_area);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static gint
|
|
|
|
gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
1999-01-27 18:21:20 +00:00
|
|
|
GdkEventExpose child_event;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (widget != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (widget);
|
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
if (event->window != layout->bin_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
child_event = *event;
|
|
|
|
if (GTK_WIDGET_DRAWABLE (child->widget) &&
|
|
|
|
GTK_WIDGET_NO_WINDOW (child->widget) &&
|
|
|
|
gtk_widget_intersect (child->widget, &event->area, &child_event.area))
|
|
|
|
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Container method
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
gtk_layout_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayout *layout;
|
1999-01-21 22:29:58 +00:00
|
|
|
GtkLayoutChild *child = NULL;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
g_return_if_fail (container != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (container));
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (container);
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
child = tmp_list->data;
|
|
|
|
if (child->widget == widget)
|
|
|
|
break;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tmp_list)
|
|
|
|
{
|
|
|
|
gtk_widget_unparent (widget);
|
|
|
|
|
|
|
|
layout->children = g_list_remove_link (layout->children, tmp_list);
|
|
|
|
g_list_free_1 (tmp_list);
|
|
|
|
g_free (child);
|
|
|
|
}
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data)
|
|
|
|
{
|
|
|
|
GtkLayout *layout;
|
|
|
|
GtkLayoutChild *child;
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
g_return_if_fail (container != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_LAYOUT (container));
|
|
|
|
g_return_if_fail (callback != NULL);
|
|
|
|
|
|
|
|
layout = GTK_LAYOUT (container);
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
(* callback) (child->widget, callback_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Operations on children
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_position_child (GtkLayout *layout,
|
1999-01-27 18:21:20 +00:00
|
|
|
GtkLayoutChild *child)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
gint x;
|
|
|
|
gint y;
|
|
|
|
|
|
|
|
x = child->x - layout->xoffset;
|
|
|
|
y = child->y - layout->yoffset;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
if (IS_ONSCREEN (x,y))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
if (GTK_WIDGET_MAPPED (layout) &&
|
|
|
|
GTK_WIDGET_VISIBLE (child->widget))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
if (!GTK_WIDGET_MAPPED (child->widget))
|
|
|
|
gtk_widget_map (child->widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
|
|
|
|
GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
|
|
|
|
GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_MAPPED (child->widget))
|
|
|
|
gtk_widget_unmap (child->widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
static void
|
|
|
|
gtk_layout_allocate_child (GtkLayout *layout,
|
|
|
|
GtkLayoutChild *child)
|
|
|
|
{
|
|
|
|
GtkAllocation allocation;
|
1999-02-10 02:35:09 +00:00
|
|
|
GtkRequisition requisition;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
allocation.x = child->x - layout->xoffset;
|
|
|
|
allocation.y = child->y - layout->yoffset;
|
1999-02-10 02:35:09 +00:00
|
|
|
gtk_widget_get_child_requisition (child->widget, &requisition);
|
|
|
|
allocation.width = requisition.width;
|
|
|
|
allocation.height = requisition.height;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
gtk_widget_size_allocate (child->widget, &allocation);
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static void
|
|
|
|
gtk_layout_position_children (GtkLayout *layout)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
|
|
|
|
gtk_layout_position_child (layout, child);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_adjust_allocations_recurse (GtkWidget *widget,
|
|
|
|
gpointer cb_data)
|
|
|
|
{
|
|
|
|
GtkLayoutAdjData *data = cb_data;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
widget->allocation.x += data->dx;
|
|
|
|
widget->allocation.y += data->dy;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget) &&
|
|
|
|
GTK_IS_CONTAINER (widget))
|
|
|
|
gtk_container_forall (GTK_CONTAINER (widget),
|
|
|
|
gtk_layout_adjust_allocations_recurse,
|
|
|
|
cb_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_adjust_allocations (GtkLayout *layout,
|
|
|
|
gint dx,
|
|
|
|
gint dy)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
GtkLayoutAdjData data;
|
|
|
|
|
|
|
|
data.dx = dx;
|
|
|
|
data.dy = dy;
|
|
|
|
|
|
|
|
tmp_list = layout->children;
|
|
|
|
while (tmp_list)
|
|
|
|
{
|
|
|
|
GtkLayoutChild *child = tmp_list->data;
|
1998-11-24 04:45:29 +00:00
|
|
|
tmp_list = tmp_list->next;
|
1999-01-27 18:21:20 +00:00
|
|
|
|
|
|
|
child->widget->allocation.x += dx;
|
|
|
|
child->widget->allocation.y += dy;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_NO_WINDOW (child->widget) &&
|
|
|
|
GTK_IS_CONTAINER (child->widget))
|
|
|
|
gtk_container_forall (GTK_CONTAINER (child->widget),
|
|
|
|
gtk_layout_adjust_allocations_recurse,
|
|
|
|
&data);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Callbacks */
|
|
|
|
|
|
|
|
/* Send a synthetic expose event to the widget
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
gtk_layout_expose_area (GtkLayout *layout,
|
|
|
|
gint x, gint y, gint width, gint height)
|
|
|
|
{
|
|
|
|
if (layout->visibility == GDK_VISIBILITY_UNOBSCURED)
|
|
|
|
{
|
|
|
|
GdkEventExpose event;
|
|
|
|
|
|
|
|
event.type = GDK_EXPOSE;
|
|
|
|
event.send_event = TRUE;
|
|
|
|
event.window = layout->bin_window;
|
|
|
|
event.count = 0;
|
|
|
|
|
|
|
|
event.area.x = x;
|
|
|
|
event.area.y = y;
|
|
|
|
event.area.width = width;
|
|
|
|
event.area.height = height;
|
|
|
|
|
|
|
|
gdk_window_ref (event.window);
|
|
|
|
gtk_widget_event (GTK_WIDGET (layout), (GdkEvent *)&event);
|
|
|
|
gdk_window_unref (event.window);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#if GDK_WINDOWING == GDK_WINDOWING_X11
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
/* This function is used to find events to process while scrolling
|
|
|
|
*/
|
|
|
|
|
|
|
|
static Bool
|
|
|
|
gtk_layout_expose_predicate (Display *display,
|
|
|
|
XEvent *xevent,
|
|
|
|
XPointer arg)
|
|
|
|
{
|
1999-01-27 18:21:20 +00:00
|
|
|
if ((xevent->type == Expose) ||
|
1998-11-24 04:45:29 +00:00
|
|
|
((xevent->xany.window == *(Window *)arg) &&
|
|
|
|
(xevent->type == ConfigureNotify)))
|
|
|
|
return True;
|
|
|
|
else
|
|
|
|
return False;
|
|
|
|
}
|
|
|
|
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#endif /* X11 */
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
/* This is the main routine to do the scrolling. Scrolling is
|
|
|
|
* done by "Guffaw" scrolling, as in the Mozilla XFE, with
|
|
|
|
* a few modifications.
|
|
|
|
*
|
|
|
|
* The main improvement is that we keep track of whether we
|
|
|
|
* are obscured or not. If not, we ignore the generated expose
|
|
|
|
* events and instead do the exposes ourself, without having
|
|
|
|
* to wait for a roundtrip to the server. This also provides
|
|
|
|
* a limited form of expose-event compression, since we do
|
|
|
|
* the affected area as one big chunk.
|
|
|
|
*
|
|
|
|
* Real expose event compression, as in the XFE, could be added
|
|
|
|
* here. It would help opaque drags over the region, and the
|
|
|
|
* obscured case.
|
|
|
|
*
|
|
|
|
* Code needs to be added here to do the scrolling on machines
|
|
|
|
* that don't have working WindowGravity. That could be done
|
|
|
|
*
|
|
|
|
* - XCopyArea and move the windows, and accept trailing the
|
|
|
|
* background color. (Since it is only a fallback method)
|
|
|
|
* - XmHTML style. As above, but turn off expose events when
|
|
|
|
* not obscured and do the exposures ourself.
|
|
|
|
* - gzilla-style. Move the window continuously, and reset
|
|
|
|
* every 32768 pixels
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
|
|
|
|
GtkLayout *layout)
|
|
|
|
{
|
|
|
|
GtkWidget *widget;
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#if GDK_WINDOWING == GDK_WINDOWING_X11
|
1998-11-24 04:45:29 +00:00
|
|
|
XEvent xevent;
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#endif
|
1998-11-24 04:45:29 +00:00
|
|
|
gint dx, dy;
|
|
|
|
|
|
|
|
widget = GTK_WIDGET (layout);
|
|
|
|
|
|
|
|
dx = (gint)layout->hadjustment->value - layout->xoffset;
|
|
|
|
dy = (gint)layout->vadjustment->value - layout->yoffset;
|
|
|
|
|
|
|
|
layout->xoffset = (gint)layout->hadjustment->value;
|
|
|
|
layout->yoffset = (gint)layout->vadjustment->value;
|
|
|
|
|
1998-11-28 01:56:09 +00:00
|
|
|
if (layout->freeze_count)
|
1998-11-24 04:45:29 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (!GTK_WIDGET_MAPPED (layout))
|
1998-11-24 19:33:01 +00:00
|
|
|
{
|
|
|
|
gtk_layout_position_children (layout);
|
|
|
|
return;
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
|
1999-01-27 18:21:20 +00:00
|
|
|
gtk_layout_adjust_allocations (layout, -dx, -dy);
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
if (dx > 0)
|
|
|
|
{
|
1999-01-28 04:12:58 +00:00
|
|
|
if (gravity_works)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
gdk_window_resize (layout->bin_window,
|
|
|
|
widget->allocation.width + dx,
|
|
|
|
widget->allocation.height);
|
|
|
|
gdk_window_move (layout->bin_window, -dx, 0);
|
|
|
|
gdk_window_move_resize (layout->bin_window,
|
|
|
|
0, 0,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME */
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_layout_expose_area (layout,
|
1999-01-27 18:21:20 +00:00
|
|
|
MAX ((gint)widget->allocation.width - dx, 0),
|
1998-11-24 04:45:29 +00:00
|
|
|
0,
|
1999-01-27 18:21:20 +00:00
|
|
|
MIN (dx, widget->allocation.width),
|
1998-11-24 04:45:29 +00:00
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
else if (dx < 0)
|
|
|
|
{
|
1999-01-28 04:12:58 +00:00
|
|
|
if (gravity_works)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
gdk_window_move_resize (layout->bin_window,
|
|
|
|
dx, 0,
|
|
|
|
widget->allocation.width - dx,
|
|
|
|
widget->allocation.height);
|
|
|
|
gdk_window_move (layout->bin_window, 0, 0);
|
|
|
|
gdk_window_resize (layout->bin_window,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME */
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_layout_expose_area (layout,
|
|
|
|
0,
|
|
|
|
0,
|
1999-01-27 18:21:20 +00:00
|
|
|
MIN (-dx, widget->allocation.width),
|
1998-11-24 04:45:29 +00:00
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dy > 0)
|
|
|
|
{
|
1999-01-28 04:12:58 +00:00
|
|
|
if (gravity_works)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
gdk_window_resize (layout->bin_window,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height + dy);
|
|
|
|
gdk_window_move (layout->bin_window, 0, -dy);
|
|
|
|
gdk_window_move_resize (layout->bin_window,
|
|
|
|
0, 0,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME */
|
|
|
|
}
|
|
|
|
|
|
|
|
gtk_layout_expose_area (layout,
|
|
|
|
0,
|
1999-01-27 18:21:20 +00:00
|
|
|
MAX ((gint)widget->allocation.height - dy, 0),
|
1998-11-24 04:45:29 +00:00
|
|
|
widget->allocation.width,
|
Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the
item factory class has been created.
(gtk_item_factory_parse_rc): likewise.
* gtk/gtkmenu.c:
keep proper references for old_active_menu_item.
(gtk_menu_reparent): unset the usize of the new parent,
so the menu can sanely be size requested and we don't get nasty screen
artefacts upon next reparentation.
(gtk_menu_motion_notify): set send_event to TRUE if we synthesize an
enter notify. only synthesize enter notifies if the pointer really is
inside the event window.
(gtk_menu_popdown): use gtk_menu_shell_deselect().
(gtk_menu_popup): move the background setting stuff into
gtk_menu_tearoff_bg_copy() so it can be called from other places as well.
* gtk/gtkmenushell.c (gtk_menu_shell_button_press): use
gtk_menu_shell_select_item() to select the new item.
(gtk_menu_shell_deselect): export this function, so gtkmenu.c can
do the right thing for deselection as well.
Sat Mar 15 20:10:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.[hc]:
(gtk_widget_accelerators_locked): return whether a widget's accelerators
are locked.
* gtk/gtkmenu.c (gtk_menu_key_press): don't remove or install new or
existing accelerators if the widget's accelerators are locked.
Sat Mar 14 19:44:05 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.[hc]: allow managing of foreign menu items.
* gtk/gtkmenu.c: truely forward key press and key release events to
the menu widget from the toplevel or tearoff window. we can't simply
connect to that, we need to stop further processing of the events as
well.
Sat Mar 13 13:14:17 1999 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.c:
(gtk_menu_key_press): pass event->keyval, event->state to
gtk_accelerator_valid, instead of event->keyval twice.
refuse to install single letter accelerators for menus that use
single letter shortcuts.
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): use
gtk_menu_ensure_uline_accel_group().
* gtk/gtkmenu.[hc]: added gtk_menu_ensure_uline_accel_group()
which will always return an uline accel group, made
gtk_menu_get_uline_accel_group() return NULL if the group isn't
yet created.
Mon Mar 15 01:03:27 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.h (struct _GtkCListColumn): added button_passive flag.
* gtk/gtkclist.c (gtk_clist_column_title_passive):
Leave button sensitive, trap button_press, button_release,
motion_notify, enter_notify and leave_notify events instead.
(gtk_clist_column_title_active): disconnect event handler.
(gtk_clist_drag_data_get): fixed memory leak. Reported by
Guillaume Laurent <glaurent@worldnet.fr>
Wed Mar 10 23:49:55 1999 Lars Hamann <lars@gtk.org>
* gtk/gtklayout.c (gtk_layout_adjustment_changed): fixed a few
width/height mixups.
* gtk/gtkctree.c (tree_delete): emit an tree_unselect_row signal
if needed.
Wed Mar 10 00:11:32 1999 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_item_factory): unref the item factory after
window's destruction.
* gtk/gtkmenushell.c (gtk_menu_shell_activate_item): keep a reference
count on the menu shell around the menu item's activation, since the
signal emission may cause menu shell destruction.
* gtk/gtkitemfactory.c:
the previous code leaked one accel group per menu. we use
gtk_menu_get_uline_accel_group() now to fix that, and with that
also create the underline accelerator group of the menus only if
required (i.e. an underline accelerator has been specified).
(gtk_item_factory_construct):
(gtk_item_factory_create_item): removed code that would create an
extra accel group for the menu (and leak references).
(gtk_item_factory_create_item): adapted the underline accelerator
installation code to properly feature gtk_menu_get_uline_accel_group().
* gtk/gtkmenu.[hc]: added gtk_menu_get_accel_group() to retrive
menu->accel_group, this may return NULL if the accelerator group
hasn't been set yet.
added gtk_menu_get_uline_accel_group() to retrive the underline
accelerator group of the menu, this will be created on demand
and proper care is taken about its reference count.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c:
dumped the approach of keeping a widgets by action list on the
factory since the factory<->widget destroy negotiation didn't work
and would be hard to get going at all. instead we keep a list of
GtkItemFactoryItem items on the factory (GtkItemFactoryItems are
persistant throughout a program's life time).
also, i removed the static const gchar *key_* variables, and made
them inline strings (they weren't actually used anyways).
(gtk_item_factory_add_item): update ifactory->items.
(gtk_item_factory_destroy): destroy ifactory->items (and remove
the item factory pointer from the remaining ifactory widgets).
(gtk_item_factory_get_widget_by_action): walk the GtkItemFactoryItem
list to find the widget.
(gtk_item_factory_get_item): new function that works around
gtk_item_factory_get_widget() limitations, this function will only
return menu items, even for <Branch> entries.
Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org>
* gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our
font hash table, if we have a GdkFontPrivate entry for this font
already, simply increment its reference count, provided by Olaf Dietsche
<olaf.dietsche+list.gtk@netcologne.de>.
* gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix
provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>.
Sun Mar 7 06:13:29 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:
(gtk_container_add_with_args):
(gtk_container_addv):
(gtk_container_add): before adding a child to a conatiner, make sure
it is (default) constructed, this is neccessary because under certain
circumstances the child will get relized and mapped immediatedly, in
which case it has to be constructed already.
Mon Mar 1 17:58:21 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_connect_by_type): count object_signal
values > 1 as TRUE also.
1999-03-17 01:39:42 +00:00
|
|
|
MIN (dy, widget->allocation.height));
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
else if (dy < 0)
|
|
|
|
{
|
1999-01-28 04:12:58 +00:00
|
|
|
if (gravity_works)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
gdk_window_move_resize (layout->bin_window,
|
|
|
|
0, dy,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height - dy);
|
|
|
|
gdk_window_move (layout->bin_window, 0, 0);
|
|
|
|
gdk_window_resize (layout->bin_window,
|
|
|
|
widget->allocation.width,
|
|
|
|
widget->allocation.height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME */
|
|
|
|
}
|
|
|
|
gtk_layout_expose_area (layout,
|
|
|
|
0,
|
|
|
|
0,
|
Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org>
* merges from gtk-1-2:
Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the
item factory class has been created.
(gtk_item_factory_parse_rc): likewise.
* gtk/gtkmenu.c:
keep proper references for old_active_menu_item.
(gtk_menu_reparent): unset the usize of the new parent,
so the menu can sanely be size requested and we don't get nasty screen
artefacts upon next reparentation.
(gtk_menu_motion_notify): set send_event to TRUE if we synthesize an
enter notify. only synthesize enter notifies if the pointer really is
inside the event window.
(gtk_menu_popdown): use gtk_menu_shell_deselect().
(gtk_menu_popup): move the background setting stuff into
gtk_menu_tearoff_bg_copy() so it can be called from other places as well.
* gtk/gtkmenushell.c (gtk_menu_shell_button_press): use
gtk_menu_shell_select_item() to select the new item.
(gtk_menu_shell_deselect): export this function, so gtkmenu.c can
do the right thing for deselection as well.
Sat Mar 15 20:10:33 1999 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.[hc]:
(gtk_widget_accelerators_locked): return whether a widget's accelerators
are locked.
* gtk/gtkmenu.c (gtk_menu_key_press): don't remove or install new or
existing accelerators if the widget's accelerators are locked.
Sat Mar 14 19:44:05 1999 Tim Janik <timj@gtk.org>
* gtk/gtkitemfactory.[hc]: allow managing of foreign menu items.
* gtk/gtkmenu.c: truely forward key press and key release events to
the menu widget from the toplevel or tearoff window. we can't simply
connect to that, we need to stop further processing of the events as
well.
Sat Mar 13 13:14:17 1999 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.c:
(gtk_menu_key_press): pass event->keyval, event->state to
gtk_accelerator_valid, instead of event->keyval twice.
refuse to install single letter accelerators for menus that use
single letter shortcuts.
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): use
gtk_menu_ensure_uline_accel_group().
* gtk/gtkmenu.[hc]: added gtk_menu_ensure_uline_accel_group()
which will always return an uline accel group, made
gtk_menu_get_uline_accel_group() return NULL if the group isn't
yet created.
Mon Mar 15 01:03:27 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.h (struct _GtkCListColumn): added button_passive flag.
* gtk/gtkclist.c (gtk_clist_column_title_passive):
Leave button sensitive, trap button_press, button_release,
motion_notify, enter_notify and leave_notify events instead.
(gtk_clist_column_title_active): disconnect event handler.
(gtk_clist_drag_data_get): fixed memory leak. Reported by
Guillaume Laurent <glaurent@worldnet.fr>
Wed Mar 10 23:49:55 1999 Lars Hamann <lars@gtk.org>
* gtk/gtklayout.c (gtk_layout_adjustment_changed): fixed a few
width/height mixups.
* gtk/gtkctree.c (tree_delete): emit an tree_unselect_row signal
if needed.
Wed Mar 10 00:11:32 1999 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_item_factory): unref the item factory after
window's destruction.
* gtk/gtkmenushell.c (gtk_menu_shell_activate_item): keep a reference
count on the menu shell around the menu item's activation, since the
signal emission may cause menu shell destruction.
* gtk/gtkitemfactory.c:
the previous code leaked one accel group per menu. we use
gtk_menu_get_uline_accel_group() now to fix that, and with that
also create the underline accelerator group of the menus only if
required (i.e. an underline accelerator has been specified).
(gtk_item_factory_construct):
(gtk_item_factory_create_item): removed code that would create an
extra accel group for the menu (and leak references).
(gtk_item_factory_create_item): adapted the underline accelerator
installation code to properly feature gtk_menu_get_uline_accel_group().
* gtk/gtkmenu.[hc]: added gtk_menu_get_accel_group() to retrive
menu->accel_group, this may return NULL if the accelerator group
hasn't been set yet.
added gtk_menu_get_uline_accel_group() to retrive the underline
accelerator group of the menu, this will be created on demand
and proper care is taken about its reference count.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c:
dumped the approach of keeping a widgets by action list on the
factory since the factory<->widget destroy negotiation didn't work
and would be hard to get going at all. instead we keep a list of
GtkItemFactoryItem items on the factory (GtkItemFactoryItems are
persistant throughout a program's life time).
also, i removed the static const gchar *key_* variables, and made
them inline strings (they weren't actually used anyways).
(gtk_item_factory_add_item): update ifactory->items.
(gtk_item_factory_destroy): destroy ifactory->items (and remove
the item factory pointer from the remaining ifactory widgets).
(gtk_item_factory_get_widget_by_action): walk the GtkItemFactoryItem
list to find the widget.
(gtk_item_factory_get_item): new function that works around
gtk_item_factory_get_widget() limitations, this function will only
return menu items, even for <Branch> entries.
Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org>
* gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our
font hash table, if we have a GdkFontPrivate entry for this font
already, simply increment its reference count, provided by Olaf Dietsche
<olaf.dietsche+list.gtk@netcologne.de>.
* gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix
provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>.
Sun Mar 7 06:13:29 1999 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:
(gtk_container_add_with_args):
(gtk_container_addv):
(gtk_container_add): before adding a child to a conatiner, make sure
it is (default) constructed, this is neccessary because under certain
circumstances the child will get relized and mapped immediatedly, in
which case it has to be constructed already.
Mon Mar 1 17:58:21 1999 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_connect_by_type): count object_signal
values > 1 as TRUE also.
1999-03-17 01:39:42 +00:00
|
|
|
widget->allocation.width,
|
|
|
|
MIN (-dy, (gint)widget->allocation.height));
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
1998-11-24 19:33:01 +00:00
|
|
|
gtk_layout_position_children (layout);
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
/* We have to make sure that all exposes from this scroll get
|
|
|
|
* processed before we scroll again, or the expose events will
|
|
|
|
* have invalid coordinates.
|
|
|
|
*
|
|
|
|
* We also do expose events for other windows, since otherwise
|
|
|
|
* their updating will fall behind the scrolling
|
|
|
|
*
|
|
|
|
* This also avoids a problem in pre-1.0 GTK where filters don't
|
|
|
|
* have access to configure events that were compressed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
gdk_flush();
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
|
|
|
|
#if GDK_WINDOWING == GDK_WINDOWING_X11
|
1998-11-24 04:45:29 +00:00
|
|
|
while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (layout->bin_window),
|
|
|
|
&xevent,
|
|
|
|
gtk_layout_expose_predicate,
|
|
|
|
(XPointer)&GDK_WINDOW_XWINDOW (layout->bin_window)))
|
|
|
|
{
|
|
|
|
GdkEvent event;
|
|
|
|
GtkWidget *event_widget;
|
|
|
|
|
|
|
|
if ((xevent.xany.window == GDK_WINDOW_XWINDOW (layout->bin_window)) &&
|
|
|
|
(gtk_layout_filter (&xevent, &event, layout) == GDK_FILTER_REMOVE))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (xevent.type == Expose)
|
|
|
|
{
|
|
|
|
event.expose.window = gdk_window_lookup (xevent.xany.window);
|
|
|
|
gdk_window_get_user_data (event.expose.window,
|
|
|
|
(gpointer *)&event_widget);
|
|
|
|
|
|
|
|
if (event_widget)
|
|
|
|
{
|
|
|
|
event.expose.type = GDK_EXPOSE;
|
|
|
|
event.expose.area.x = xevent.xexpose.x;
|
|
|
|
event.expose.area.y = xevent.xexpose.y;
|
|
|
|
event.expose.area.width = xevent.xexpose.width;
|
|
|
|
event.expose.area.height = xevent.xexpose.height;
|
|
|
|
event.expose.count = xevent.xexpose.count;
|
|
|
|
|
|
|
|
gdk_window_ref (event.expose.window);
|
|
|
|
gtk_widget_event (event_widget, &event);
|
|
|
|
gdk_window_unref (event.expose.window);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
|
|
|
|
/* XXX Not implemented */
|
|
|
|
#endif
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The main event filter. Actually, we probably don't really need
|
|
|
|
* to install this as a filter at all, since we are calling it
|
|
|
|
* directly above in the expose-handling hack. But in case scrollbars
|
|
|
|
* are fixed up in some manner...
|
|
|
|
*
|
|
|
|
* This routine identifies expose events that are generated when
|
|
|
|
* we've temporarily moved the bin_window_origin, and translates
|
|
|
|
* them or discards them, depending on whether we are obscured
|
|
|
|
* or not.
|
|
|
|
*/
|
|
|
|
static GdkFilterReturn
|
|
|
|
gtk_layout_filter (GdkXEvent *gdk_xevent,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#if GDK_WINDOWING == GDK_WINDOWING_X11
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
XEvent *xevent;
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
xevent = (XEvent *)gdk_xevent;
|
|
|
|
layout = GTK_LAYOUT (data);
|
|
|
|
|
|
|
|
switch (xevent->type)
|
|
|
|
{
|
|
|
|
case Expose:
|
|
|
|
if (xevent->xexpose.serial == layout->configure_serial)
|
|
|
|
{
|
|
|
|
if (layout->visibility == GDK_VISIBILITY_UNOBSCURED)
|
|
|
|
return GDK_FILTER_REMOVE;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
xevent->xexpose.x += layout->scroll_x;
|
|
|
|
xevent->xexpose.y += layout->scroll_y;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ConfigureNotify:
|
1999-01-27 18:21:20 +00:00
|
|
|
if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
layout->configure_serial = xevent->xconfigure.serial;
|
|
|
|
layout->scroll_x = xevent->xconfigure.x;
|
|
|
|
layout->scroll_y = xevent->xconfigure.y;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
|
|
|
|
/* XXX Not implemented */
|
|
|
|
#endif
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return GDK_FILTER_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Although GDK does have a GDK_VISIBILITY_NOTIFY event,
|
|
|
|
* there is no corresponding event in GTK, so we have
|
|
|
|
* to get the events from a filter
|
|
|
|
*/
|
|
|
|
static GdkFilterReturn
|
|
|
|
gtk_layout_main_filter (GdkXEvent *gdk_xevent,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data)
|
|
|
|
{
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#if GDK_WINDOWING == GDK_WINDOWING_X11
|
1998-11-24 04:45:29 +00:00
|
|
|
XEvent *xevent;
|
|
|
|
GtkLayout *layout;
|
|
|
|
|
|
|
|
xevent = (XEvent *)gdk_xevent;
|
|
|
|
layout = GTK_LAYOUT (data);
|
|
|
|
|
|
|
|
if (xevent->type == VisibilityNotify)
|
|
|
|
{
|
|
|
|
switch (xevent->xvisibility.state)
|
|
|
|
{
|
|
|
|
case VisibilityFullyObscured:
|
|
|
|
layout->visibility = GDK_VISIBILITY_FULLY_OBSCURED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VisibilityPartiallyObscured:
|
|
|
|
layout->visibility = GDK_VISIBILITY_PARTIAL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VisibilityUnobscured:
|
|
|
|
layout->visibility = GDK_VISIBILITY_UNOBSCURED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return GDK_FILTER_REMOVE;
|
|
|
|
}
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
|
|
|
|
/* XXX Not implemented */
|
|
|
|
#endif
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return GDK_FILTER_CONTINUE;
|
|
|
|
}
|
|
|
|
|