mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-16 07:04:29 +00:00
atspi: Break out the Text implementations
Move the implementation of the Text interface to its own source file, and split it up along widget lines, to avoid it becoming too messy.
This commit is contained in:
Matthias Clasen
parent
f22edccb2a
commit
d38182bb5d
@ -26,16 +26,13 @@
|
|||||||
#include "gtkatspirootprivate.h"
|
#include "gtkatspirootprivate.h"
|
||||||
#include "gtkatspiprivate.h"
|
#include "gtkatspiprivate.h"
|
||||||
#include "gtkatspiutilsprivate.h"
|
#include "gtkatspiutilsprivate.h"
|
||||||
#include "gtkatspipangoprivate.h"
|
#include "gtkatspitextprivate.h"
|
||||||
#include "gtkatspitextbufferprivate.h"
|
|
||||||
|
|
||||||
#include "a11y/atspi/atspi-accessible.h"
|
#include "a11y/atspi/atspi-accessible.h"
|
||||||
#include "a11y/atspi/atspi-text.h"
|
#include "a11y/atspi/atspi-text.h"
|
||||||
#include "a11y/atspi/atspi-value.h"
|
#include "a11y/atspi/atspi-value.h"
|
||||||
|
|
||||||
#include "gtkdebug.h"
|
#include "gtkdebug.h"
|
||||||
#include "gtkeditable.h"
|
|
||||||
#include "gtklabelprivate.h"
|
|
||||||
#include "gtklevelbar.h"
|
#include "gtklevelbar.h"
|
||||||
#include "gtkpaned.h"
|
#include "gtkpaned.h"
|
||||||
#include "gtkprogressbar.h"
|
#include "gtkprogressbar.h"
|
||||||
@ -43,8 +40,6 @@
|
|||||||
#include "gtkroot.h"
|
#include "gtkroot.h"
|
||||||
#include "gtkscalebutton.h"
|
#include "gtkscalebutton.h"
|
||||||
#include "gtkspinbutton.h"
|
#include "gtkspinbutton.h"
|
||||||
#include "gtktextprivate.h"
|
|
||||||
#include "gtktextview.h"
|
|
||||||
#include "gtkwindow.h"
|
#include "gtkwindow.h"
|
||||||
|
|
||||||
#include <gio/gio.h>
|
#include <gio/gio.h>
|
||||||
@ -519,673 +514,6 @@ static const GDBusInterfaceVTable accessible_vtable = {
|
|||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
|
||||||
handle_text_method (GDBusConnection *connection,
|
|
||||||
const gchar *sender,
|
|
||||||
const gchar *object_path,
|
|
||||||
const gchar *interface_name,
|
|
||||||
const gchar *method_name,
|
|
||||||
GVariant *parameters,
|
|
||||||
GDBusMethodInvocation *invocation,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
GtkAtSpiContext *self = user_data;
|
|
||||||
GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
|
|
||||||
GtkWidget *widget = GTK_WIDGET (accessible);
|
|
||||||
|
|
||||||
if (g_strcmp0 (method_name, "GetCaretOffset") == 0)
|
|
||||||
{
|
|
||||||
int offset;
|
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
offset = _gtk_label_get_cursor_position (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextMark *insert = gtk_text_buffer_get_insert (buffer);
|
|
||||||
GtkTextIter iter;
|
|
||||||
|
|
||||||
gtk_text_buffer_get_iter_at_mark (buffer, &iter, insert);
|
|
||||||
offset = gtk_text_iter_get_offset (&iter);
|
|
||||||
}
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
offset = gtk_editable_get_position (GTK_EDITABLE (widget));
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(i)", offset));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "SetCaretOffset") == 0)
|
|
||||||
{
|
|
||||||
int offset;
|
|
||||||
gboolean ret;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i)", &offset);
|
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
{
|
|
||||||
if (gtk_label_get_selectable (GTK_LABEL (widget)))
|
|
||||||
{
|
|
||||||
gtk_label_select_region (GTK_LABEL (widget), offset, offset);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter iter;
|
|
||||||
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &iter, offset);
|
|
||||||
gtk_text_buffer_place_cursor (buffer, &iter);
|
|
||||||
gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (widget), &iter, 0, FALSE, 0, 0);
|
|
||||||
}
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
{
|
|
||||||
gtk_editable_set_position (GTK_EDITABLE (widget), offset);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_boolean (ret));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetText") == 0)
|
|
||||||
{
|
|
||||||
int start, end;
|
|
||||||
const char *text;
|
|
||||||
int len;
|
|
||||||
char *string;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(ii)", &start, &end);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter start_iter, end_iter;
|
|
||||||
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start);
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end);
|
|
||||||
|
|
||||||
string = gtk_text_buffer_get_text (buffer, &start_iter, &end_iter, FALSE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
text = gtk_label_get_text (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
text = gtk_editable_get_text (GTK_EDITABLE (widget));
|
|
||||||
|
|
||||||
len = g_utf8_strlen (text, -1);
|
|
||||||
|
|
||||||
start = CLAMP (start, 0, len);
|
|
||||||
end = CLAMP (end, 0, len);
|
|
||||||
|
|
||||||
if (end <= start)
|
|
||||||
string = g_strdup ("");
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const char *p, *q;
|
|
||||||
p = g_utf8_offset_to_pointer (text, start);
|
|
||||||
q = g_utf8_offset_to_pointer (text, end);
|
|
||||||
string = g_strndup (p, q - p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", string));
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetTextBeforeOffset") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
int offset;
|
|
||||||
AtspiTextBoundaryType boundary_type;
|
|
||||||
char *string;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(iu)", &offset, &boundary_type);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
string = gtk_text_view_get_text_before (GTK_TEXT_VIEW (widget), offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
string = gtk_pango_get_text_before (layout, offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(sii)", string, start, end));
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetTextAtOffset") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
int offset;
|
|
||||||
AtspiTextBoundaryType boundary_type;
|
|
||||||
char *string;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(iu)", &offset, &boundary_type);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
string = gtk_text_view_get_text_at (GTK_TEXT_VIEW (widget), offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
string = gtk_pango_get_text_at (layout, offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(sii)", string, start, end));
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetTextAfterOffset") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
int offset;
|
|
||||||
AtspiTextBoundaryType boundary_type;
|
|
||||||
char *string;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(iu)", &offset, &boundary_type);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
string = gtk_text_view_get_text_after (GTK_TEXT_VIEW (widget), offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
string = gtk_pango_get_text_after (layout, offset, boundary_type, &start, &end);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(sii)", string, start, end));
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetCharacterAtOffset") == 0)
|
|
||||||
{
|
|
||||||
int offset;
|
|
||||||
const char *text;
|
|
||||||
gunichar ch = 0;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i)", &offset);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
|
|
||||||
if (offset >= 0 && offset < gtk_text_buffer_get_char_count (buffer))
|
|
||||||
{
|
|
||||||
GtkTextIter start, end;
|
|
||||||
char *string;
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
|
|
||||||
end = start;
|
|
||||||
gtk_text_iter_forward_char (&end);
|
|
||||||
string = gtk_text_buffer_get_slice (buffer, &start, &end, FALSE);
|
|
||||||
ch = g_utf8_get_char (string);
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
text = gtk_label_get_text (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
text = gtk_editable_get_text (GTK_EDITABLE (widget));
|
|
||||||
|
|
||||||
if (0 <= offset && offset < g_utf8_strlen (text, -1))
|
|
||||||
ch = g_utf8_get_char (g_utf8_offset_to_pointer (text, offset));
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_int32 (ch));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetStringAtOffset") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
int offset;
|
|
||||||
AtspiTextGranularity granularity;
|
|
||||||
char *string;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(iu)", &offset, &granularity);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
string = gtk_text_view_get_string_at (GTK_TEXT_VIEW (widget), offset, granularity, &start, &end);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
string = gtk_pango_get_string_at (layout, offset, granularity, &start, &end);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(sii)", string, start, end));
|
|
||||||
g_free (string);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetAttributes") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a{ss}"));
|
|
||||||
int offset;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i)", &offset);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
gtk_text_buffer_get_run_attributes (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)),
|
|
||||||
&builder, offset, &start, &end);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
gtk_pango_get_run_attributes (layout, &builder, offset, &start, &end);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a{ss}ii)", &builder, start, end));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetAttributeValue") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a{ss}"));
|
|
||||||
int offset;
|
|
||||||
const char *name;
|
|
||||||
int start, end;
|
|
||||||
GVariant *attrs;
|
|
||||||
const char *val;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i&s)", &offset, &name);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
gtk_text_buffer_get_run_attributes (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)),
|
|
||||||
&builder, offset, &start, &end);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
gtk_pango_get_run_attributes (layout, &builder, offset, &start, &end);
|
|
||||||
}
|
|
||||||
attrs = g_variant_builder_end (&builder);
|
|
||||||
if (!g_variant_lookup (attrs, name, "&s", &val))
|
|
||||||
val = "";
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", val));
|
|
||||||
g_variant_unref (attrs);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetAttributeRun") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a{ss}"));
|
|
||||||
int offset;
|
|
||||||
gboolean include_defaults;
|
|
||||||
int start, end;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(ib)", &offset, &include_defaults);
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
if (include_defaults)
|
|
||||||
gtk_text_view_add_default_attributes (GTK_TEXT_VIEW (widget), &builder);
|
|
||||||
|
|
||||||
gtk_text_buffer_get_run_attributes (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)),
|
|
||||||
&builder, offset, &start, &end);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
if (include_defaults)
|
|
||||||
gtk_pango_get_default_attributes (layout, &builder);
|
|
||||||
|
|
||||||
gtk_pango_get_run_attributes (layout, &builder, offset, &start, &end);
|
|
||||||
}
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a{ss}ii)", &builder, start, end));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetDefaultAttributes") == 0 ||
|
|
||||||
g_strcmp0 (method_name, "GetDefaultAttributeSet") == 0)
|
|
||||||
{
|
|
||||||
PangoLayout *layout;
|
|
||||||
GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a{ss}"));
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
gtk_text_view_add_default_attributes (GTK_TEXT_VIEW (widget), &builder);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
layout = gtk_label_get_layout (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_TEXT (widget))
|
|
||||||
layout = gtk_text_get_layout (GTK_TEXT (widget));
|
|
||||||
|
|
||||||
gtk_pango_get_default_attributes (layout, &builder);
|
|
||||||
}
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a{ss})", &builder));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetNSelections") == 0)
|
|
||||||
{
|
|
||||||
int n = 0;
|
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget) &&
|
|
||||||
gtk_label_get_selection_bounds (GTK_LABEL (widget), NULL, NULL))
|
|
||||||
n = 1;
|
|
||||||
else if (GTK_IS_EDITABLE (widget) &&
|
|
||||||
gtk_editable_get_selection_bounds (GTK_EDITABLE (widget), NULL, NULL))
|
|
||||||
n = 1;
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget) &&
|
|
||||||
gtk_text_buffer_get_selection_bounds (gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), NULL, NULL))
|
|
||||||
n = 1;
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_int32 (n));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetSelection") == 0)
|
|
||||||
{
|
|
||||||
int num;
|
|
||||||
int start, end;
|
|
||||||
gboolean ret = TRUE;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i)", &num);
|
|
||||||
|
|
||||||
if (num != 0)
|
|
||||||
ret = FALSE;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget) &&
|
|
||||||
!gtk_label_get_selection_bounds (GTK_LABEL (widget), &start, &end))
|
|
||||||
ret = FALSE;
|
|
||||||
else if (GTK_IS_EDITABLE (widget) &&
|
|
||||||
!gtk_editable_get_selection_bounds (GTK_EDITABLE (widget), &start, &end))
|
|
||||||
ret = FALSE;
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter start_iter, end_iter;
|
|
||||||
|
|
||||||
if (!gtk_text_buffer_get_selection_bounds (buffer, &start_iter, &end_iter))
|
|
||||||
ret = FALSE;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
start = gtk_text_iter_get_offset (&start_iter);
|
|
||||||
end = gtk_text_iter_get_offset (&end_iter);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "Not a valid selection: %d", num);
|
|
||||||
else
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(ii)", start, end));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "AddSelection") == 0)
|
|
||||||
{
|
|
||||||
int start, end;
|
|
||||||
gboolean ret;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(ii)", &start, &end);
|
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
{
|
|
||||||
if (!gtk_label_get_selectable (GTK_LABEL (widget)) ||
|
|
||||||
gtk_label_get_selection_bounds (GTK_LABEL (widget), NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_label_select_region (GTK_LABEL (widget), start, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
{
|
|
||||||
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (widget), NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_editable_select_region (GTK_EDITABLE (widget), start, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter start_iter, end_iter;
|
|
||||||
if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start);
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end);
|
|
||||||
gtk_text_buffer_select_range (buffer, &start_iter, &end_iter);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_boolean (ret));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "RemoveSelection") == 0)
|
|
||||||
{
|
|
||||||
int num;
|
|
||||||
int start, end;
|
|
||||||
gboolean ret;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(i)", &num);
|
|
||||||
|
|
||||||
if (num != 0)
|
|
||||||
ret = FALSE;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
{
|
|
||||||
if (!gtk_label_get_selectable (GTK_LABEL (widget)) ||
|
|
||||||
!gtk_label_get_selection_bounds (GTK_LABEL (widget), &start, &end))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_label_select_region (GTK_LABEL (widget), end, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
{
|
|
||||||
if (!gtk_editable_get_selection_bounds (GTK_EDITABLE (widget), &start, &end))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_editable_select_region (GTK_EDITABLE (widget), end, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter start_iter, end_iter;
|
|
||||||
if (!gtk_text_buffer_get_selection_bounds (buffer, &start_iter, &end_iter))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_text_buffer_select_range (buffer, &end_iter, &end_iter);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_boolean (ret));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "SetSelection") == 0)
|
|
||||||
{
|
|
||||||
int num;
|
|
||||||
int start, end;
|
|
||||||
gboolean ret;
|
|
||||||
|
|
||||||
g_variant_get (parameters, "(iii)", &num, &start, &end);
|
|
||||||
|
|
||||||
if (num != 0)
|
|
||||||
ret = FALSE;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
{
|
|
||||||
if (!gtk_label_get_selectable (GTK_LABEL (widget)) ||
|
|
||||||
!gtk_label_get_selection_bounds (GTK_LABEL (widget), NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_label_select_region (GTK_LABEL (widget), start, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
{
|
|
||||||
if (!gtk_editable_get_selection_bounds (GTK_EDITABLE (widget), NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_editable_select_region (GTK_EDITABLE (widget), start, end);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextIter start_iter, end_iter;
|
|
||||||
if (!gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL))
|
|
||||||
{
|
|
||||||
ret = FALSE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start);
|
|
||||||
gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end);
|
|
||||||
gtk_text_buffer_select_range (buffer, &end_iter, &end_iter);
|
|
||||||
ret = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
g_dbus_method_invocation_return_value (invocation, g_variant_new_boolean (ret));
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetCharacterExtents") == 0)
|
|
||||||
{
|
|
||||||
g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "");
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetRangeExtents") == 0)
|
|
||||||
{
|
|
||||||
g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "");
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "GetBoundedRanges") == 0)
|
|
||||||
{
|
|
||||||
g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "");
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "ScrollSubstringTo") == 0)
|
|
||||||
{
|
|
||||||
g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "");
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (method_name, "ScrollSubstringToPoint") == 0)
|
|
||||||
{
|
|
||||||
g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static GVariant *
|
|
||||||
handle_text_get_property (GDBusConnection *connection,
|
|
||||||
const gchar *sender,
|
|
||||||
const gchar *object_path,
|
|
||||||
const gchar *interface_name,
|
|
||||||
const gchar *property_name,
|
|
||||||
GError **error,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
GtkAtSpiContext *self = user_data;
|
|
||||||
GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
|
|
||||||
GtkWidget *widget = GTK_WIDGET (accessible);
|
|
||||||
|
|
||||||
if (g_strcmp0 (property_name, "CharacterCount") == 0)
|
|
||||||
{
|
|
||||||
const char *text;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
len = gtk_text_buffer_get_char_count (buffer);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
text = gtk_label_get_text (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
text = gtk_editable_get_text (GTK_EDITABLE (widget));
|
|
||||||
|
|
||||||
len = g_utf8_strlen (text, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return g_variant_new_int32 (len);
|
|
||||||
}
|
|
||||||
else if (g_strcmp0 (property_name, "CaretOffset") == 0)
|
|
||||||
{
|
|
||||||
int offset;
|
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget))
|
|
||||||
offset = _gtk_label_get_cursor_position (GTK_LABEL (widget));
|
|
||||||
else if (GTK_IS_EDITABLE (widget))
|
|
||||||
offset = gtk_editable_get_position (GTK_EDITABLE (widget));
|
|
||||||
else if (GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
|
|
||||||
GtkTextMark *insert = gtk_text_buffer_get_insert (buffer);
|
|
||||||
GtkTextIter iter;
|
|
||||||
|
|
||||||
gtk_text_buffer_get_iter_at_mark (buffer, &iter, insert);
|
|
||||||
offset = gtk_text_iter_get_offset (&iter);
|
|
||||||
}
|
|
||||||
|
|
||||||
return g_variant_new_int32 (offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const GDBusInterfaceVTable text_vtable = {
|
|
||||||
handle_text_method,
|
|
||||||
handle_text_get_property,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static GVariant *
|
static GVariant *
|
||||||
handle_value_get_property (GDBusConnection *connection,
|
handle_value_get_property (GDBusConnection *connection,
|
||||||
const gchar *sender,
|
const gchar *sender,
|
||||||
@ -1269,6 +597,7 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
|||||||
{
|
{
|
||||||
GtkWidget *widget = GTK_WIDGET (gtk_at_context_get_accessible (GTK_AT_CONTEXT (self)));
|
GtkWidget *widget = GTK_WIDGET (gtk_at_context_get_accessible (GTK_AT_CONTEXT (self)));
|
||||||
GVariantBuilder interfaces = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_STRING_ARRAY);
|
GVariantBuilder interfaces = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_STRING_ARRAY);
|
||||||
|
const GDBusInterfaceVTable *vtable;
|
||||||
|
|
||||||
g_variant_builder_add (&interfaces, "s", "org.a11y.atspi.Accessible");
|
g_variant_builder_add (&interfaces, "s", "org.a11y.atspi.Accessible");
|
||||||
g_dbus_connection_register_object (self->connection,
|
g_dbus_connection_register_object (self->connection,
|
||||||
@ -1279,15 +608,14 @@ gtk_at_spi_context_register_object (GtkAtSpiContext *self)
|
|||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
if (GTK_IS_LABEL (widget) ||
|
vtable = gtk_atspi_get_text_vtable (widget);
|
||||||
GTK_IS_TEXT (widget) ||
|
if (vtable)
|
||||||
GTK_IS_TEXT_VIEW (widget))
|
|
||||||
{
|
{
|
||||||
g_variant_builder_add (&interfaces, "s", "org.a11y.atspi.Text");
|
g_variant_builder_add (&interfaces, "s", "org.a11y.atspi.Text");
|
||||||
g_dbus_connection_register_object (self->connection,
|
g_dbus_connection_register_object (self->connection,
|
||||||
self->context_path,
|
self->context_path,
|
||||||
(GDBusInterfaceInfo *) &atspi_text_interface,
|
(GDBusInterfaceInfo *) &atspi_text_interface,
|
||||||
&text_vtable,
|
vtable,
|
||||||
self,
|
self,
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
|
|||||||
1151
gtk/a11y/gtkatspitext.c
Normal file
1151
gtk/a11y/gtkatspitext.c
Normal file
File diff suppressed because it is too large
Load Diff
30
gtk/a11y/gtkatspitextprivate.h
Normal file
30
gtk/a11y/gtkatspitextprivate.h
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
/* gtkatspitextprivate.h: AT-SPI Text implementation
|
||||||
|
*
|
||||||
|
* Copyright 2020 Red Hat, Inc.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
*
|
||||||
|
* 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.1 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <gio/gio.h>
|
||||||
|
#include "gtkwidget.h"
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
const GDBusInterfaceVTable *gtk_atspi_get_text_vtable (GtkWidget *widget);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
@ -15,5 +15,6 @@ if gtk_a11y_backends.contains('atspi')
|
|||||||
'gtkatspiutils.c',
|
'gtkatspiutils.c',
|
||||||
'gtkatspipango.c',
|
'gtkatspipango.c',
|
||||||
'gtkatspitextbuffer.c',
|
'gtkatspitextbuffer.c',
|
||||||
|
'gtkatspitext.c'
|
||||||
])
|
])
|
||||||
endif
|
endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user