* AT-SPI - Assistive Technology Service Provider Interface
* (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
*
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
#include <config.h>
#include <stdio.h>
+#include <atk/atkeditabletext.h>
#include <libspi/editabletext.h>
/* Static function declarations */
spi_editable_text_class_init (SpiEditableTextClass *klass);
static void
spi_editable_text_init (SpiEditableText *editable);
-static void
-spi_editable_text_finalize (GObject *obj);
static CORBA_boolean
-impl_setAttributes (PortableServer_Servant _servant,
+impl_setAttributes (PortableServer_Servant servant,
const CORBA_char * attributes,
const CORBA_long startPos,
const CORBA_long endPos,
- CORBA_Environment * ev);
-static void
-impl_setTextContents (PortableServer_Servant _servant,
+ CORBA_Environment *ev);
+static CORBA_boolean
+impl_setTextContents (PortableServer_Servant servant,
const CORBA_char * newContents,
- CORBA_Environment * ev);
-static void
-impl_insertText (PortableServer_Servant _servant,
+ CORBA_Environment *ev);
+static CORBA_boolean
+impl_insertText (PortableServer_Servant servant,
const CORBA_long position,
const CORBA_char * text,
const CORBA_long length,
- CORBA_Environment * ev);
+ CORBA_Environment *ev);
static void
-impl_copyText (PortableServer_Servant _servant,
+impl_copyText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev);
-static void
-impl_cutText (PortableServer_Servant _servant,
+ CORBA_Environment *ev);
+static CORBA_boolean
+impl_cutText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev);
-static void
-impl_deleteText (PortableServer_Servant _servant,
+ CORBA_Environment *ev);
+static CORBA_boolean
+impl_deleteText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev);
-static void
-impl_pasteText (PortableServer_Servant _servant,
- const CORBA_long position, CORBA_Environment * ev);
-
-static GObjectClass *parent_class;
-
+ CORBA_Environment *ev);
+static CORBA_boolean
+impl_pasteText (PortableServer_Servant servant,
+ const CORBA_long position, CORBA_Environment *ev);
BONOBO_TYPE_FUNC_FULL (SpiEditableText,
Accessibility_EditableText,
SPI_TEXT_TYPE,
- spi_editable_text);
+ spi_editable_text)
static void
spi_editable_text_class_init (SpiEditableTextClass *klass)
{
- GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_EditableText__epv *epv = &klass->epv;
- parent_class = g_type_interface_peek_parent (klass);
- object_class->finalize = spi_editable_text_finalize;
-
/* Initialize epv table */
epv->setAttributes = impl_setAttributes;
epv->pasteText = impl_pasteText;
}
+
static void
spi_editable_text_init (SpiEditableText *editable)
{
}
-static void
-spi_editable_text_finalize (GObject *obj)
-{
- parent_class->finalize (obj);
-}
SpiEditableText *
spi_editable_text_interface_new (AtkObject *obj)
{
SpiEditableText *new_editable = g_object_new (
SPI_EDITABLE_TEXT_TYPE, NULL);
- (SPI_TEXT (new_editable))->atko = obj;
- g_object_ref (obj);
+
+ spi_text_construct (SPI_TEXT (new_editable), obj);
+
return new_editable;
}
+
+static AtkEditableText *
+get_editable_text_from_servant (PortableServer_Servant servant)
+{
+ SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+
+ g_return_val_if_fail (object, NULL);
+ g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+ return ATK_EDITABLE_TEXT (object->gobj);
+}
+
+
static CORBA_boolean
-impl_setAttributes (PortableServer_Servant _servant,
- const CORBA_char * attributes,
- const CORBA_long startPos,
- const CORBA_long endPos,
- CORBA_Environment * ev)
+impl_setAttributes (PortableServer_Servant servant,
+ const CORBA_char * attributes,
+ const CORBA_long startPos,
+ const CORBA_long endPos,
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_val_if_fail (IS_SPI_EDITABLE_TEXT (obj), FALSE);
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_val_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko), FALSE);
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+
+ g_return_val_if_fail (editable != NULL, FALSE);
g_print ("setRunAttributes not implemented.\n");
return FALSE;
}
-static void
-impl_setTextContents (PortableServer_Servant _servant,
- const CORBA_char * newContents,
- CORBA_Environment * ev)
+
+static CORBA_boolean
+impl_setTextContents (PortableServer_Servant servant,
+ const CORBA_char *newContents,
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+
+ g_return_val_if_fail (editable != NULL, FALSE);
- atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko),
- (gchar *) newContents);
-}
+ atk_editable_text_set_text_contents (editable, newContents);
+ return TRUE;
+}
-static void
-impl_insertText (PortableServer_Servant _servant,
- const CORBA_long position,
- const CORBA_char * text,
- const CORBA_long length,
- CORBA_Environment * ev)
+static CORBA_boolean
+impl_insertText (PortableServer_Servant servant,
+ const CORBA_long position,
+ const CORBA_char *text,
+ const CORBA_long length,
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
-
- atk_editable_text_insert_text (ATK_EDITABLE_TEXT( SPI_TEXT (editable)->atko),
- (gchar *) text,
- (gint) length,
- (gint *) &position);
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+ gint ip;
+
+ g_return_val_if_fail (editable != NULL, FALSE);
+
+ ip = position;
+ atk_editable_text_insert_text (editable,
+ text,
+ length,
+ &ip);
+ return TRUE;
}
static void
-impl_copyText (PortableServer_Servant _servant,
+impl_copyText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev)
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
-
- atk_editable_text_copy_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko),
- (gint) startPos, (gint) endPos);
-}
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+ g_return_if_fail (editable != NULL);
+ atk_editable_text_copy_text (editable, startPos, endPos);
+
+}
-static void
-impl_cutText (PortableServer_Servant _servant,
+
+static CORBA_boolean
+impl_cutText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev)
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
-
- atk_editable_text_cut_text (ATK_EDITABLE_TEXT(SPI_TEXT (editable)->atko),
- (gint) startPos, (gint) endPos);
-}
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+ g_return_val_if_fail (editable != NULL, FALSE);
+ atk_editable_text_cut_text (editable, startPos, endPos);
+ return TRUE;
+}
-static void
-impl_deleteText (PortableServer_Servant _servant,
+
+static CORBA_boolean
+impl_deleteText (PortableServer_Servant servant,
const CORBA_long startPos, const CORBA_long endPos,
- CORBA_Environment * ev)
+ CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
-
- atk_editable_text_delete_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko),
- (gint) startPos, (gint) endPos);
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+
+ g_return_val_if_fail (editable != NULL, FALSE);
+
+ atk_editable_text_delete_text (editable, startPos, endPos);
+
+ return TRUE;
}
-static void
-impl_pasteText (PortableServer_Servant _servant,
- const CORBA_long position, CORBA_Environment * ev)
+static CORBA_boolean
+impl_pasteText (PortableServer_Servant servant,
+ const CORBA_long position, CORBA_Environment *ev)
{
- SpiEditableText *editable;
- BonoboObject *obj;
- obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
- editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
-
- atk_editable_text_paste_text (ATK_EDITABLE_TEXT( SPI_TEXT(editable)->atko), position);
-}
+ AtkEditableText *editable = get_editable_text_from_servant (servant);
+ g_return_val_if_fail (editable != NULL, FALSE);
+
+ atk_editable_text_paste_text (editable, position);
+
+ return TRUE;
+}