AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Drop remaining uses of gail_misc api

Browse Source 
Fold them into their last remaining user, in gailtextcell.c
This commit is contained in:
Matthias Clasen 2011-07-08 22:03:13 -04:00
parent 64d3314a64
commit 9979e2a443
5 changed files with 71 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/a11y/Makefile.am
View File

@ -22,7 +22,6 @@ gail_c_sources = \
gailimagecell.c \
gtklabelaccessible.c \
gtklinkbuttonaccessible.c \
gailmisc.c \
gtkmenuaccessible.c \
gtkmenushellaccessible.c \
gtkmenuitemaccessible.c \
@ -74,7 +73,6 @@ gail_private_h_sources = \
gailimagecell.h \
gtklabelaccessible.h \
gtklinkbuttonaccessible.h \
gailmisc.h \
gtkmenuaccessible.h \
gtkmenushellaccessible.h \
gtkmenuitemaccessible.h \

187
gtk/a11y/gailmisc.c
View File

@ -1,187 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* Copyright 2001 Sun Microsystems Inc.
*
* 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 "config.h"
#include <math.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include "gailmisc.h"
/* IMPORTANT!!! This source file does NOT contain the implementation
* code for AtkUtil - for that code, please see gail/gail.c.
*/
/**
* SECTION:gailmisc
* @Short_description: GailMisc is a set of utility functions which may be
* useful to implementors of Atk interfaces for custom widgets.
* @Title: GailMisc
*
* GailMisc is a set of utility function which are used in the implemementation
* of Atk interfaces for GTK+ widgets. They may be useful to implementors of
* Atk interfaces for custom widgets.
*/
/**
* gail_misc_get_extents_from_pango_rectangle:
* @widget: The widget that contains the PangoLayout, that contains
* the PangoRectangle
* @char_rect: The #PangoRectangle from which to calculate extents
* @x_layout: The x-offset at which the widget displays the
* PangoLayout that contains the PangoRectangle, relative to @widget
* @y_layout: The y-offset at which the widget displays the
* PangoLayout that contains the PangoRectangle, relative to @widget
* @x: The x-position of the #PangoRectangle relative to @coords
* @y: The y-position of the #PangoRectangle relative to @coords
* @width: The width of the #PangoRectangle
* @height: The height of the #PangoRectangle
* @coords: An #AtkCoordType enumeration
*
* Gets the extents of @char_rect in device coordinates,
* relative to either top-level window or screen coordinates as
* specified by @coords.
**/
void
gail_misc_get_extents_from_pango_rectangle (GtkWidget *widget,
PangoRectangle *char_rect,
gint x_layout,
gint y_layout,
gint *x,
gint *y,
gint *width,
gint *height,
AtkCoordType coords)
{
gint x_window, y_window, x_toplevel, y_toplevel;
gail_misc_get_origins (widget, &x_window, &y_window,
&x_toplevel, &y_toplevel);
*x = (char_rect->x / PANGO_SCALE) + x_layout + x_window;
*y = (char_rect->y / PANGO_SCALE) + y_layout + y_window;
if (coords == ATK_XY_WINDOW)
{
*x -= x_toplevel;
*y -= y_toplevel;
}
else if (coords != ATK_XY_SCREEN)
{
*x = 0;
*y = 0;
*height = 0;
*width = 0;
return;
}
*height = char_rect->height / PANGO_SCALE;
*width = char_rect->width / PANGO_SCALE;
return;
}
/**
* gail_misc_get_index_at_point_in_layout:
* @widget: A #GtkWidget
* @layout: The #PangoLayout from which to get the index at the
* specified point.
* @x_layout: The x-offset at which the widget displays the
* #PangoLayout, relative to @widget
* @y_layout: The y-offset at which the widget displays the
* #PangoLayout, relative to @widget
* @x: The x-coordinate relative to @coords at which to
* calculate the index
* @y: The y-coordinate relative to @coords at which to
* calculate the index
* @coords: An #AtkCoordType enumeration
*
* Gets the byte offset at the specified @x and @y in a #PangoLayout.
*
* Returns: the byte offset at the specified @x and @y in a
* #PangoLayout
**/
gint
gail_misc_get_index_at_point_in_layout (GtkWidget *widget,
PangoLayout *layout,
gint x_layout,
gint y_layout,
gint x,
gint y,
AtkCoordType coords)
{
gint index, x_window, y_window, x_toplevel, y_toplevel;
gint x_temp, y_temp;
gboolean ret;
gail_misc_get_origins (widget, &x_window, &y_window,
&x_toplevel, &y_toplevel);
x_temp = x - x_layout - x_window;
y_temp = y - y_layout - y_window;
if (coords == ATK_XY_WINDOW)
{
x_temp += x_toplevel;
y_temp += y_toplevel;
}
else if (coords != ATK_XY_SCREEN)
return -1;
ret = pango_layout_xy_to_index (layout,
x_temp * PANGO_SCALE,
y_temp * PANGO_SCALE,
&index, NULL);
if (!ret)
{
if (x_temp < 0 || y_temp < 0)
index = 0;
else
index = -1;
}
return index;
}
/**
* gail_misc_get_origins:
* @widget: a #GtkWidget
* @x_window: the x-origin of the widget->window
* @y_window: the y-origin of the widget->window
* @x_toplevel: the x-origin of the toplevel window for widget->window
* @y_toplevel: the y-origin of the toplevel window for widget->window
*
* Gets the origin of the widget window, and the origin of the
* widgets top-level window.
**/
void
gail_misc_get_origins (GtkWidget *widget,
gint *x_window,
gint *y_window,
gint *x_toplevel,
gint *y_toplevel)
{
GdkWindow *window;
if (GTK_IS_TREE_VIEW (widget))
window = gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget));
else
window = gtk_widget_get_window (widget);
gdk_window_get_origin (window, x_window, y_window);
window = gdk_window_get_toplevel (gtk_widget_get_window (widget));
gdk_window_get_origin (window, x_toplevel, y_toplevel);
}

63
gtk/a11y/gailmisc.h
View File

@ -1,63 +0,0 @@
/* GAIL - The GNOME Accessibility Implementation Library
* Copyright 2001 Sun Microsystems Inc.
*
* 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.
*/
#ifndef __GAIL_MISC_H__
#define __GAIL_MISC_H__
#include <glib-object.h>
#include <gtk/gtk.h>
#include <pango/pango.h>
G_BEGIN_DECLS
void gail_misc_get_extents_from_pango_rectangle
(GtkWidget *widget,
PangoRectangle *char_rect,
gint x_layout,
gint y_layout,
gint *x,
gint *y,
gint *width,
gint *height,
AtkCoordType coords);
gint gail_misc_get_index_at_point_in_layout
(GtkWidget *widget,
PangoLayout *layout,
gint x_layout,
gint y_layout,
gint x,
gint y,
AtkCoordType coords);
void gail_misc_get_origins (GtkWidget *widget,
gint *x_window,
gint *y_window,
gint *x_toplevel,
gint *y_toplevel);
AtkAttributeSet* gail_misc_buffer_get_run_attributes
(GtkTextBuffer *buffer,
gint offset,
gint *start_offset,
gint *end_offset);
G_END_DECLS
#endif /*__GAIL_MISC_H__ */

83
gtk/a11y/gailtextcell.c
View File

@ -24,7 +24,6 @@
#include "gailtextcell.h"
#include "gailcontainercell.h"
#include "gailcellparent.h"
#include "gailmisc.h"
static void gail_text_cell_class_init (GailTextCellClass *klass);
static void gail_text_cell_init (GailTextCell *text_cell);
@ -92,7 +91,6 @@ static gboolean gail_text_cell_update_cache (GailRendererCell *cell,
gchar *gail_text_cell_property_list[] = {
/* Set font_desc first since it resets other values if it is NULL */
"font_desc",
"attributes",
"background-gdk",
"editable",
@ -576,6 +574,26 @@ add_attr (PangoAttrList *attr_list,
pango_attr_list_insert (attr_list, attr);
}
static void
get_origins (GtkWidget *widget,
gint *x_window,
gint *y_window,
gint *x_toplevel,
gint *y_toplevel)
{
GdkWindow *window;
if (GTK_IS_TREE_VIEW (widget))
window = gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget));
else
window = gtk_widget_get_window (widget);
gdk_window_get_origin (window, x_window, y_window);
window = gdk_window_get_toplevel (gtk_widget_get_window (widget));
gdk_window_get_origin (window, x_toplevel, y_toplevel);
}
static void
gail_text_cell_get_character_extents (AtkText *text,
gint offset,
@ -597,6 +615,7 @@ gail_text_cell_get_character_extents (AtkText *text,
gfloat xalign, yalign;
gint x_offset, y_offset, index;
gint xpad, ypad;
gint x_window, y_window, x_toplevel, y_toplevel;
if (!GAIL_TEXT_CELL (text)->cell_text)
{
@ -644,16 +663,29 @@ gail_text_cell_get_character_extents (AtkText *text,
pango_layout_index_to_pos (layout, index, &char_rect);
gtk_cell_renderer_get_padding (gail_renderer->renderer, &xpad, &ypad);
gail_misc_get_extents_from_pango_rectangle (widget,
&char_rect,
x_offset + rendered_rect.x + xpad,
y_offset + rendered_rect.y + ypad,
x, y, width, height, coords);
get_origins (widget, &x_window, &y_window, &x_toplevel, &y_toplevel);
*x = (char_rect.x / PANGO_SCALE) + x_offset + rendered_rect.x + xpad + x_window;
*y = (char_rect.y / PANGO_SCALE) + y_offset + rendered_rect.y + ypad + y_window;
if (coords == ATK_XY_WINDOW)
{
*x -= x_toplevel;
*y -= y_toplevel;
}
else if (coords != ATK_XY_SCREEN)
{
*x = 0;
*y = 0;
*height = 0;
*width = 0;
return;
}
*height = char_rect.height / PANGO_SCALE;
*width = char_rect.width / PANGO_SCALE;
g_free (renderer_text);
g_object_unref (layout);
return;
}
static gint
@ -673,6 +705,10 @@ gail_text_cell_get_offset_at_point (AtkText *text,
gfloat xalign, yalign;
gint x_offset, y_offset, index;
gint xpad, ypad;
gint x_window, y_window, x_toplevel, y_toplevel;
gint x_temp, y_temp;
gboolean ret;
if (!GAIL_TEXT_CELL (text)->cell_text)
return -1;
@ -709,10 +745,31 @@ gail_text_cell_get_offset_at_point (AtkText *text,
layout = create_pango_layout (GAIL_TEXT_CELL (text));
gtk_cell_renderer_get_padding (gail_renderer->renderer, &xpad, &ypad);
index = gail_misc_get_index_at_point_in_layout (widget, layout,
x_offset + rendered_rect.x + xpad,
y_offset + rendered_rect.y + ypad,
x, y, coords);
get_origins (widget, &x_window, &y_window, &x_toplevel, &y_toplevel);
x_temp = x - (x_offset + rendered_rect.x + xpad) - x_window;
y_temp = y - (y_offset + rendered_rect.y + ypad) - y_window;
if (coords == ATK_XY_WINDOW)
{
x_temp += x_toplevel;
y_temp += y_toplevel;
}
else if (coords != ATK_XY_SCREEN)
index = -1;
ret = pango_layout_xy_to_index (layout,
x_temp * PANGO_SCALE,
y_temp * PANGO_SCALE,
&index, NULL);
if (!ret)
{
if (x_temp < 0 || y_temp < 0)
index = 0;
else
index = -1;
}
g_object_unref (layout);
if (index == -1)
{

2
gtk/a11y/gailutil.c
View File

@ -40,7 +40,7 @@ static AtkObject* gail_util_get_root (void);
static const gchar *gail_util_get_toolkit_name (void);
static const gchar *gail_util_get_toolkit_version (void);
/* gailmisc/AtkMisc */
/* AtkMisc */
static void gail_misc_class_init (GailMiscClass *klass);
static void gail_misc_init (GailMisc *misc);