From dfda82acd4ef8e174047cc26c9bb842c87d9ceba Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 24 Feb 2012 13:21:35 -0500
Subject: [PATCH] gdk: Drop gdk_event_get_touch_area for now

It has no users, and the implementation probably has to be moved
to be xi2-specific anyway.
---
 docs/reference/gdk/gdk3-sections.txt |  1 -
 gdk/gdk.symbols                      |  1 -
 gdk/gdkevents.c                      | 95 ----------------------------
 gdk/gdkevents.h                      |  1 -
 4 files changed, 98 deletions(-)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index edcd409228..3e25d8373f 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -783,7 +783,6 @@ gdk_event_get_scroll_direction
 gdk_event_get_state
 gdk_event_get_time
 gdk_event_get_touch_sequence
-gdk_event_get_touch_area
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index c461d0558d..cf62d85885 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -169,7 +169,6 @@ gdk_event_get_source_device
 gdk_event_get_state
 gdk_event_get_time
 gdk_event_get_touch_sequence
-gdk_event_get_touch_area
 gdk_event_get_type
 gdk_event_handler_set
 gdk_event_mask_get_type
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 47cff7fc19..ae0d1ac30f 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1817,101 +1817,6 @@ gdk_event_get_touch_sequence (const GdkEvent *event)
     return NULL;
 }
 
-/**
- * gdk_event_get_touch_area:
- * @event: a #GdkEvent
- *
- * This function takes a #GdkEvent coming from a touch device
- * (eg. gdk_event_get_source_device() returns a device of type
- * %GDK_SOURCE_TOUCH), and returns the area covered by the touch
- * as a #cairo_region_t. or %NULL if the device doesn't provide
- * this information, or the touch area information couldn't be
- * extracted from the event.
- *
- * <note><warning>Not all touch capable devices provide this
- * information, so provide fallbacks to this function returning
- * %NULL, even if the window receiving events is only meant
- * to react to touch events.</warning></note>
- *
- * Returns: (transfer full): the touch region, or %NULL if unavailable
- *
- * Since: 3.4
- */
-cairo_region_t *
-gdk_event_get_touch_area (GdkEvent *event)
-{
-  gdouble *axes, minor_axis, major_axis, orientation_axis;
-  GdkAtom major, minor, orientation;
-  GdkDevice *device;
-
-  g_return_val_if_fail (event != NULL, NULL);
-
-  device = gdk_event_get_source_device (event);
-
-  if (!device)
-    return NULL;
-
-  if (event->type == GDK_TOUCH_BEGIN ||
-      event->type == GDK_TOUCH_UPDATE ||
-      event->type == GDK_TOUCH_END ||
-      event->type == GDK_TOUCH_CANCEL)
-    axes = event->touch.axes;
-  else if (event->type == GDK_MOTION_NOTIFY)
-    axes = event->motion.axes;
-  else if (event->type == GDK_BUTTON_PRESS ||
-           event->type == GDK_2BUTTON_PRESS ||
-           event->type == GDK_3BUTTON_PRESS ||
-           event->type == GDK_BUTTON_RELEASE)
-    axes = event->button.axes;
-  else
-    return NULL;
-
-  major = gdk_atom_intern_static_string ("Abs MT Touch Major");
-  minor = gdk_atom_intern_static_string ("Abs MT Touch Minor");
-  orientation = gdk_atom_intern_static_string ("Abs MT Orientation");
-
-  if (gdk_device_get_axis_value (device, axes, major, &major_axis) &&
-      gdk_device_get_axis_value (device, axes, minor, &minor_axis) &&
-      gdk_device_get_axis_value (device, axes, orientation, &orientation_axis))
-    {
-      cairo_rectangle_int_t rect;
-      GdkScreen *screen;
-      gdouble x, y;
-
-      /* FIXME: We're assuming the device is mapped to a single screen,
-       * could lead to stretched/shrinked shapes in multimonitor, although
-       * that'd be an unusual setup for touchscreens.
-       */
-      screen = gdk_window_get_screen (event->any.window);
-      gdk_event_get_coords (event, &x, &y);
-
-      if (orientation_axis == 0)
-        {
-          /* Orientation is horizontal */
-          rect.width = (gint) gdk_screen_get_width (screen) * major_axis;
-          rect.height = (gint) gdk_screen_get_height (screen) * minor_axis;
-        }
-      else
-        {
-          /* Orientation is vertical */
-          rect.height = (gint) gdk_screen_get_height (screen) * major_axis;
-          rect.width = (gint) gdk_screen_get_width (screen) * minor_axis;
-        }
-
-      /* Something is wrong here */
-      if (rect.width == 0 ||
-          rect.height == 0)
-        return NULL;
-
-      rect.x = x - rect.width / 2;
-      rect.y = y - rect.height / 2;
-
-      return cairo_region_create_rectangle (&rect);
-    }
-
-  return NULL;
-}
-
 /**
  * gdk_set_show_events:
  * @show_events:  %TRUE to output event debugging information.
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 529a96ce90..79597ef886 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -1224,7 +1224,6 @@ void       gdk_event_set_screen         (GdkEvent        *event,
 GdkScreen *gdk_event_get_screen         (const GdkEvent  *event);
 
 GdkTouchSequence *gdk_event_get_touch_sequence (const GdkEvent *event);
-cairo_region_t * gdk_event_get_touch_area (GdkEvent      *event);
 
 void	  gdk_set_show_events		(gboolean	 show_events);
 gboolean  gdk_get_show_events		(void);