forked from AuroraMiddleware/gtk
1c84483f3e
gcc -mno-cygwin (egcs-1.1.2) on cygwin-b20.1. * gdk/win32/makefile.cygwin gtk/makefile.cygwin: New files. * config.h.win32: Changes for gcc. * gdk/gdkrectangle.c: Include gdk.h as <gdk/gdk.h>. * gdk/gdkcolor.c: config.h.win32 already defines strcasecmp. * gdk/win32/gdkconfig.h: Only the MS compiler has wctype.h. * gdk/win32/gdkdnd.c: Protect (unused) OLE2 stuff better. Protect shl stuff unavaiilable with mingw32 headers. * gdk/win32/gdkevents.c: Fix typo. * gdk/win32/gdkglobals.c: Use GDKVAR here also for gcc. * gdk/win32/gdkim.c: Use OEM code page for multibyte chars. (?) * gdk/win32/gdkinput.c: Use __try __except only with the MS compiler. * gdk/win32/gdkprivate.h: Make up for some stuff missing from the mingw32 headers. * gdk/win32/makefile.msc: Use latest Wintab kit and glib. * gtk/gtkfilesel.c: Include <glib.h> early, to get stat->_stat definition on Win32. Test for NATIVE_WIN32, not _MSC_VER. * gtk/gtkfontsel.c: Protect CHARSET redefinition on Win32. Test for NATIVE_WIN32, not _MSC_VER. * gtk/gtkmain.c: No use warning about developer version on Win32, there aren't any non-developer versions anyhow. * gtk/gtkrc.c: Test for NATIVE_WIN32, not _MSC_VER. * gtk/makefile.msc: Use pthread from another directory. Minor other changes.
109 lines
2.7 KiB
C
109 lines
2.7 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#include <gdk/gdk.h>
|
|
|
|
|
|
|
|
void
|
|
gdk_rectangle_union (GdkRectangle *src1,
|
|
GdkRectangle *src2,
|
|
GdkRectangle *dest)
|
|
{
|
|
g_return_if_fail (src1 != NULL);
|
|
g_return_if_fail (src2 != NULL);
|
|
g_return_if_fail (dest != NULL);
|
|
|
|
dest->x = MIN (src1->x, src2->x);
|
|
dest->y = MIN (src1->y, src2->y);
|
|
dest->width = MAX (src1->x + src1->width, src2->x + src2->width) - dest->x;
|
|
dest->height = MAX (src1->y + src1->height, src2->y + src2->height) - dest->y;
|
|
}
|
|
|
|
gint
|
|
gdk_rectangle_intersect (GdkRectangle *src1,
|
|
GdkRectangle *src2,
|
|
GdkRectangle *dest)
|
|
{
|
|
GdkRectangle *temp;
|
|
gint src1_x2, src1_y2;
|
|
gint src2_x2, src2_y2;
|
|
gint return_val;
|
|
|
|
g_return_val_if_fail (src1 != NULL, FALSE);
|
|
g_return_val_if_fail (src2 != NULL, FALSE);
|
|
g_return_val_if_fail (dest != NULL, FALSE);
|
|
|
|
return_val = FALSE;
|
|
|
|
if (src2->x < src1->x)
|
|
{
|
|
temp = src1;
|
|
src1 = src2;
|
|
src2 = temp;
|
|
}
|
|
dest->x = src2->x;
|
|
|
|
src1_x2 = src1->x + src1->width;
|
|
src2_x2 = src2->x + src2->width;
|
|
|
|
if (src2->x < src1_x2)
|
|
{
|
|
if (src1_x2 < src2_x2)
|
|
dest->width = src1_x2 - dest->x;
|
|
else
|
|
dest->width = src2_x2 - dest->x;
|
|
|
|
if (src2->y < src1->y)
|
|
{
|
|
temp = src1;
|
|
src1 = src2;
|
|
src2 = temp;
|
|
}
|
|
dest->y = src2->y;
|
|
|
|
src1_y2 = src1->y + src1->height;
|
|
src2_y2 = src2->y + src2->height;
|
|
|
|
if (src2->y < src1_y2)
|
|
{
|
|
return_val = TRUE;
|
|
|
|
if (src1_y2 < src2_y2)
|
|
dest->height = src1_y2 - dest->y;
|
|
else
|
|
dest->height = src2_y2 - dest->y;
|
|
|
|
if (dest->height == 0)
|
|
return_val = FALSE;
|
|
if (dest->width == 0)
|
|
return_val = FALSE;
|
|
}
|
|
}
|
|
|
|
return return_val;
|
|
}
|