Move spi-stateset.c and spi-stateset.h into spi-common

3 files changed, 0 insertions, 225 deletions

diff --git a/cspi/Makefile.am b/cspi/Makefile.am
index 1b2275c..58a184c 100644
--- a/cspi/Makefile.am
+++ b/cspi/Makefile.am
@@ -28,7 +28,6 @@ libcspi_la_SOURCES =		\
 	spi-main.c		\
 	spi-registry.c \
 	spi-selection.c \
-	spi-stateset.c \
 	spi-streamablecontent.c \
 	spi-table.c \
 	spi-text.c \
diff --git a/cspi/spi-stateset.c b/cspi/spi-stateset.c
deleted file mode 100644
index 56eded2..0000000
--- a/cspi/spi-stateset.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * AT-SPI - Assistive Technology Service Provider Interface
- * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
- *
- * 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
- * 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.
- */
-
-/* stateset.c : implements the StateSet interface */
-
-#include <config.h>
-#include <stdio.h>
-#include "spi-stateset.h"
-
-
-static Accessibility_StateType *accessible_state_types = NULL;
-static AtkStateType *atk_state_types = NULL;
-
-
-static gboolean
-spi_init_state_type_tables (void)
-{
-  gint i;
-
-  if (accessible_state_types || atk_state_types)
-    return FALSE;
-  if (!accessible_state_types)
-    accessible_state_types = g_new (Accessibility_StateType, ATK_STATE_LAST_DEFINED);
-  if (!atk_state_types)
-    atk_state_types = g_new (AtkStateType, Accessibility_STATE_LAST_DEFINED);
-  g_return_val_if_fail (accessible_state_types, FALSE);
-  g_return_val_if_fail (atk_state_types, FALSE);
-  
-  for (i = 0; i < Accessibility_STATE_LAST_DEFINED; i++)
-    {
-      atk_state_types[i] = ATK_STATE_INVALID;
-    }
-
-  for (i=0; i < ATK_STATE_LAST_DEFINED; i++)
-    {
-      accessible_state_types[i] = Accessibility_STATE_INVALID;	
-    }
-
-  accessible_state_types[ATK_STATE_ACTIVE] = Accessibility_STATE_ACTIVE;
-  atk_state_types[Accessibility_STATE_ACTIVE] = ATK_STATE_ACTIVE;
-  accessible_state_types[ATK_STATE_ARMED] = Accessibility_STATE_ARMED;
-  atk_state_types[Accessibility_STATE_ARMED] = ATK_STATE_ARMED;
-  accessible_state_types[ATK_STATE_BUSY] = Accessibility_STATE_BUSY;
-  atk_state_types[Accessibility_STATE_BUSY] = ATK_STATE_BUSY;
-  accessible_state_types[ATK_STATE_CHECKED] = Accessibility_STATE_CHECKED;
-  atk_state_types[Accessibility_STATE_CHECKED] = ATK_STATE_CHECKED;
-  accessible_state_types[ATK_STATE_DEFUNCT] = Accessibility_STATE_DEFUNCT;
-  atk_state_types[Accessibility_STATE_DEFUNCT] = ATK_STATE_DEFUNCT;
-  accessible_state_types[ATK_STATE_EDITABLE] = Accessibility_STATE_EDITABLE;
-  atk_state_types[Accessibility_STATE_EDITABLE] = ATK_STATE_EDITABLE;  
-  accessible_state_types[ATK_STATE_ENABLED] = Accessibility_STATE_ENABLED;
-  atk_state_types[Accessibility_STATE_ENABLED] = ATK_STATE_ENABLED;  
-  accessible_state_types[ATK_STATE_EXPANDABLE] = Accessibility_STATE_EXPANDABLE;
-  atk_state_types[Accessibility_STATE_EXPANDABLE] = ATK_STATE_EXPANDABLE;
-  accessible_state_types[ATK_STATE_EXPANDED] = Accessibility_STATE_EXPANDED;
-  atk_state_types[Accessibility_STATE_EXPANDED] = ATK_STATE_EXPANDED;
-  accessible_state_types[ATK_STATE_FOCUSABLE] = Accessibility_STATE_FOCUSABLE;
-  atk_state_types[Accessibility_STATE_FOCUSABLE] = ATK_STATE_FOCUSABLE;
-  accessible_state_types[ATK_STATE_FOCUSED] = Accessibility_STATE_FOCUSED;
-  atk_state_types[Accessibility_STATE_FOCUSED] = ATK_STATE_FOCUSED;
-  accessible_state_types[ATK_STATE_HORIZONTAL] = Accessibility_STATE_HORIZONTAL;
-  atk_state_types[Accessibility_STATE_HORIZONTAL] = ATK_STATE_HORIZONTAL;
-  accessible_state_types[ATK_STATE_ICONIFIED] = Accessibility_STATE_ICONIFIED;
-  atk_state_types[Accessibility_STATE_ICONIFIED] = ATK_STATE_ICONIFIED;
-  accessible_state_types[ATK_STATE_MODAL] = Accessibility_STATE_MODAL;
-  atk_state_types[Accessibility_STATE_MODAL] = ATK_STATE_MODAL;
-  accessible_state_types[ATK_STATE_MULTI_LINE] = Accessibility_STATE_MULTI_LINE;
-  atk_state_types[Accessibility_STATE_MULTI_LINE] = ATK_STATE_MULTI_LINE;
-  accessible_state_types[ATK_STATE_MULTISELECTABLE] = Accessibility_STATE_MULTISELECTABLE;
-  atk_state_types[Accessibility_STATE_MULTISELECTABLE] = ATK_STATE_MULTISELECTABLE;
-  accessible_state_types[ATK_STATE_OPAQUE] = Accessibility_STATE_OPAQUE;
-  atk_state_types[Accessibility_STATE_OPAQUE] = ATK_STATE_OPAQUE;
-  accessible_state_types[ATK_STATE_PRESSED] = Accessibility_STATE_PRESSED;
-  atk_state_types[Accessibility_STATE_PRESSED] = ATK_STATE_PRESSED;
-  accessible_state_types[ATK_STATE_RESIZABLE] = Accessibility_STATE_RESIZABLE;
-  atk_state_types[Accessibility_STATE_RESIZABLE] = ATK_STATE_RESIZABLE;
-  accessible_state_types[ATK_STATE_SELECTABLE] = Accessibility_STATE_SELECTABLE;
-  atk_state_types[Accessibility_STATE_SELECTABLE] = ATK_STATE_SELECTABLE;
-  accessible_state_types[ATK_STATE_SELECTED] = Accessibility_STATE_SELECTED;
-  atk_state_types[Accessibility_STATE_SELECTED] = ATK_STATE_SELECTED;
-  accessible_state_types[ATK_STATE_SENSITIVE] = Accessibility_STATE_SENSITIVE;
-  atk_state_types[Accessibility_STATE_SENSITIVE] = ATK_STATE_SENSITIVE;
-  accessible_state_types[ATK_STATE_SHOWING] = Accessibility_STATE_SHOWING;
-  atk_state_types[Accessibility_STATE_SHOWING] = ATK_STATE_SHOWING;
-  accessible_state_types[ATK_STATE_SINGLE_LINE] = Accessibility_STATE_SINGLE_LINE;
-  atk_state_types[Accessibility_STATE_SINGLE_LINE] = ATK_STATE_SINGLE_LINE;
-  accessible_state_types[ATK_STATE_STALE] = Accessibility_STATE_STALE;
-  atk_state_types[Accessibility_STATE_STALE] = ATK_STATE_STALE;
-  accessible_state_types[ATK_STATE_TRANSIENT] = Accessibility_STATE_TRANSIENT;
-  atk_state_types[Accessibility_STATE_TRANSIENT] = ATK_STATE_TRANSIENT;
-  accessible_state_types[ATK_STATE_VERTICAL] = Accessibility_STATE_VERTICAL;
-  atk_state_types[Accessibility_STATE_VERTICAL] = ATK_STATE_VERTICAL;
-  accessible_state_types[ATK_STATE_VISIBLE] = Accessibility_STATE_VISIBLE;
-  atk_state_types[Accessibility_STATE_VISIBLE] = ATK_STATE_VISIBLE;
-  accessible_state_types[ATK_STATE_MANAGES_DESCENDANTS] = Accessibility_STATE_MANAGES_DESCENDANTS;
-  atk_state_types[Accessibility_STATE_MANAGES_DESCENDANTS] = ATK_STATE_MANAGES_DESCENDANTS;
-  accessible_state_types[ATK_STATE_INDETERMINATE] = Accessibility_STATE_INDETERMINATE;
-  atk_state_types[Accessibility_STATE_INDETERMINATE] = ATK_STATE_INDETERMINATE;
-  accessible_state_types[ATK_STATE_TRUNCATED] = Accessibility_STATE_TRUNCATED;
-  atk_state_types[Accessibility_STATE_TRUNCATED] = ATK_STATE_TRUNCATED;
-  accessible_state_types[ATK_STATE_REQUIRED] = Accessibility_STATE_REQUIRED;
-  atk_state_types[Accessibility_STATE_REQUIRED] = ATK_STATE_REQUIRED;
-  accessible_state_types[ATK_STATE_INVALID_ENTRY] = Accessibility_STATE_INVALID_ENTRY;
-  atk_state_types[Accessibility_STATE_INVALID_ENTRY] = ATK_STATE_INVALID_ENTRY;
-  accessible_state_types[ATK_STATE_SUPPORTS_AUTOCOMPLETION] = Accessibility_STATE_SUPPORTS_AUTOCOMPLETION;
-  atk_state_types[Accessibility_STATE_SUPPORTS_AUTOCOMPLETION] = ATK_STATE_SUPPORTS_AUTOCOMPLETION;
-  accessible_state_types[ATK_STATE_SELECTABLE_TEXT] = Accessibility_STATE_SELECTABLE_TEXT;
-  atk_state_types[Accessibility_STATE_SELECTABLE_TEXT] = ATK_STATE_SELECTABLE_TEXT;
-  accessible_state_types[ATK_STATE_DEFAULT] = Accessibility_STATE_IS_DEFAULT;
-  atk_state_types[Accessibility_STATE_IS_DEFAULT] = ATK_STATE_DEFAULT;
-  accessible_state_types[ATK_STATE_VISITED] = Accessibility_STATE_VISITED;
-  atk_state_types[Accessibility_STATE_VISITED] = ATK_STATE_VISITED;
-
-
-  return TRUE;
-}
-
-static inline AtkState
-state_spi_to_atk (Accessibility_StateType state)
-{
-  guint idx = state;
-  if (idx < Accessibility_STATE_LAST_DEFINED)
-    return atk_state_types [idx];
-  else
-    return ATK_STATE_INVALID;
-}
-
-AtkState
-spi_atk_state_from_spi_state (Accessibility_StateType state)
-{
-  spi_init_state_type_tables ();
-  return state_spi_to_atk (state);
-}
-
-AtkStateSet *
-spi_state_set_cache_from_sequence (const GArray *seq)
-{
-  int i;
-  AtkStateSet *set;
-  AtkStateType *states;
-
-  spi_init_state_type_tables ();
-  
-  states = g_newa (AtkStateType, seq->len);
-  for (i = 0; i < seq->len; i++)
-    states [i] = state_spi_to_atk (g_array_index (seq, dbus_int32_t, i));
-
-  set = atk_state_set_new ();
-  atk_state_set_add_states (set, states, seq->len);
-
-  g_free (states);
-  g_array_free (seq, TRUE);
-  return set;
-}
-
diff --git a/cspi/spi-stateset.h b/cspi/spi-stateset.h
deleted file mode 100644
index 99c4e9f..0000000
--- a/cspi/spi-stateset.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * AT-SPI - Assistive Technology Service Provider Interface
- * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
- *
- * 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
- * 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 SPI_STATE_SET_H_
-#define SPI_STATE_SET_H_
-
-#include "spi-private.h"
-#include <atk/atkstateset.h>
-
-G_BEGIN_DECLS
-
-/* private - internal API to abstract away atk API */
-AtkStateSet *spi_state_set_cache_from_sequence(const GArray *seq);
-AtkState     spi_atk_state_from_spi_state     (Accessibility_StateType state);
-#define      spi_state_set_cache_ref(s)        g_object_ref (s)
-#define      spi_state_set_cache_unref(s)      g_object_unref (s)
-#define      spi_state_set_cache_new(seq)      spi_state_set_cache_from_sequence (seq)
-#define      spi_state_set_cache_contains(s,a) atk_state_set_contains_state (ATK_STATE_SET (s), \
-									     spi_atk_state_from_spi_state (a))
-#define      spi_state_set_cache_add(s,a)      atk_state_set_add_state (ATK_STATE_SET (s), \
-									     spi_atk_state_from_spi_state (a))
-#define      spi_state_set_cache_remove(s,a)   atk_state_set_remove_state (ATK_STATE_SET (s), \
-									     spi_atk_state_from_spi_state (a))
-#define      spi_state_set_cache_xor(a,b)      atk_state_set_xor_sets (ATK_STATE_SET (a), ATK_STATE_SET (b))
-#define      spi_state_set_cache_is_empty(a)   atk_state_set_is_empty (ATK_STATE_SET (a))
-
-G_END_DECLS
-
-#endif /* SPI_STATE_SET_H_ */