2005-03-15 Matthias Clasen <mclasen@redhat.com> Make PLT-reduction work with gcc4, and don't include everything in gdkalias.h: * gdk/gdk.symbols: Group symbols by header and source file. * gdk/makegdkalias.pl: Protect definitions by the same preprocessor symbols used to guard the headers. Move the alias declarations to a separate file which is produced when calling makegdkalias.pl -def * gdk/Makefile.am (gdkaliasdef.c): Add a rule to generate this file. * gdk/*.c, gdk/x11/*.c: Include gdkalias.h after the other headers, include gdkaliasdef.c at the bottom.
		
			
				
	
	
		
			111 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			111 lines
		
	
	
		
			2.9 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 Lesser 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
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser 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-2000.  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 <config.h>
 | 
						|
#include <gdk/gdk.h>
 | 
						|
#include "gdkalias.h"
 | 
						|
 | 
						|
void
 | 
						|
gdk_rectangle_union (GdkRectangle *src1,
 | 
						|
		     GdkRectangle *src2,
 | 
						|
		     GdkRectangle *dest)
 | 
						|
{
 | 
						|
  gint dest_x, dest_y;
 | 
						|
  
 | 
						|
  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;
 | 
						|
  dest->x = dest_x;
 | 
						|
  dest->y = dest_y;
 | 
						|
}
 | 
						|
 | 
						|
gboolean
 | 
						|
gdk_rectangle_intersect (GdkRectangle *src1,
 | 
						|
			 GdkRectangle *src2,
 | 
						|
			 GdkRectangle *dest)
 | 
						|
{
 | 
						|
  gint dest_x, dest_y;
 | 
						|
  gint dest_w, dest_h;
 | 
						|
  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;
 | 
						|
 | 
						|
  dest_x = MAX (src1->x, src2->x);
 | 
						|
  dest_y = MAX (src1->y, src2->y);
 | 
						|
  dest_w = MIN (src1->x + src1->width, src2->x + src2->width) - dest_x;
 | 
						|
  dest_h = MIN (src1->y + src1->height, src2->y + src2->height) - dest_y;
 | 
						|
 | 
						|
  if (dest_w > 0 && dest_h > 0)
 | 
						|
    {
 | 
						|
      dest->x = dest_x;
 | 
						|
      dest->y = dest_y;
 | 
						|
      dest->width = dest_w;
 | 
						|
      dest->height = dest_h;
 | 
						|
      return_val = TRUE;
 | 
						|
    }
 | 
						|
  else
 | 
						|
    {
 | 
						|
      dest->width = 0;
 | 
						|
      dest->height = 0;
 | 
						|
    }
 | 
						|
 | 
						|
  return return_val;
 | 
						|
}
 | 
						|
 | 
						|
static GdkRectangle *
 | 
						|
gdk_rectangle_copy (const GdkRectangle *rectangle)
 | 
						|
{
 | 
						|
  GdkRectangle *result = g_new (GdkRectangle, 1);
 | 
						|
  *result = *rectangle;
 | 
						|
 | 
						|
  return result;
 | 
						|
}
 | 
						|
 | 
						|
GType
 | 
						|
gdk_rectangle_get_type (void)
 | 
						|
{
 | 
						|
  static GType our_type = 0;
 | 
						|
  
 | 
						|
  if (our_type == 0)
 | 
						|
    our_type = g_boxed_type_register_static ("GdkRectangle",
 | 
						|
					     (GBoxedCopyFunc)gdk_rectangle_copy,
 | 
						|
					     (GBoxedFreeFunc)g_free);
 | 
						|
  return our_type;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
#define __GDK_RECTANGLE_C__
 | 
						|
#include "gdkaliasdef.c"
 |