projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix return value of spi_check_ev and have it call spi_throw_exception if an exception...
[platform/core/uifw/at-spi2-atk.git]
/
cspi
/
spi-private.h
diff --git
a/cspi/spi-private.h
b/cspi/spi-private.h
index
2f2bf4d
..
43f61d2
100644
(file)
--- a/
cspi/spi-private.h
+++ b/
cspi/spi-private.h
@@
-27,16
+27,35
@@
/* Private internal implementation details of at-spi. */
/* Private internal implementation details of at-spi. */
-#include <
libspi/Accessibility
.h>
+#include <
spi-common/spi-dbus
.h>
#include <cspi/spi.h>
#include <cspi/spi.h>
+#include <string.h>
#include "cspi/cspi-lowlevel.h"
#include "cspi/spi-listener.h"
#include "cspi/cspi-lowlevel.h"
#include "cspi/spi-listener.h"
+#include "dbind/dbind.h"
+#include <glib-object.h>
+
+typedef struct _CSpiApplication CSpiApplication;
+struct _CSpiApplication
+{
+ GHashTable *hash;
+ char *bus_name;
+};
struct _Accessible {
struct _Accessible {
- CORBA_Object objref;
- /* And some other bits */
- guint on_loan : 1;
- guint ref_count : 30;
+ gint ref_count;
+ Accessible *parent;
+ GList *children;
+ CSpiApplication *app;
+ union
+ {
+ gint id;
+ char *path;
+ } v;
+ gint role : 8;
+ gint interfaces : 24;
+ char *name;
+ char *description;
};
struct _AccessibleStateSet {
};
struct _AccessibleStateSet {
@@
-54,32
+73,29
@@
typedef struct {
guchar magic;
guchar type;
guint16 ref_count;
guchar magic;
guchar type;
guint16 ref_count;
- void *data;
} InternalEvent;
struct _SPIException {
SPIExceptionType type;
} InternalEvent;
struct _SPIException {
SPIExceptionType type;
-
CORBA_Object
source;
-
CORBA_Environment *ev
;
+
Accessible *
source;
+
DBusError *error
;
SPIExceptionCode code;
char * desc;
};
SPIExceptionCode code;
char * desc;
};
-#define CSPI_OBJREF(a) (((Accessible *)(a))->objref)
-
-CORBA_Environment *cspi_ev (void);
+DBusConnection *spi_bus (void);
SPIBoolean cspi_exception (void);
SPIBoolean cspi_exception (void);
-Accessibility_Registry cspi_registry (void);
-Accessible *cspi_object_add (CORBA_Object corba_object);
+Accessible *cspi_object_add (Accessible *accessible);
void cspi_object_ref (Accessible *accessible);
void cspi_object_unref (Accessible *accessible);
void cspi_object_ref (Accessible *accessible);
void cspi_object_unref (Accessible *accessible);
-Accessible *cspi_object_borrow (CORBA_Object corba_object);
-Accessible *cspi_object_take (CORBA_Object corba_object);
-void cspi_object_return (Accessible *accessible);
SPIBoolean cspi_accessible_is_a (Accessible *accessible,
const char *interface_name);
SPIBoolean cspi_accessible_is_a (Accessible *accessible,
const char *interface_name);
+AccessibleRole cspi_role_from_spi_role (Accessibility_Role role);
void cspi_streams_close_all (void);
void cspi_streams_close_all (void);
+gboolean cspi_exception_throw (DBusError *error, const char *desc_prefix);
+AccessibleAttributeSet
+ *_cspi_attribute_set_from_sequence (const GArray *seq);
#define cspi_return_if_fail(val) \
if (!(val)) \
return
#define cspi_return_if_fail(val) \
if (!(val)) \
return
@@
-88,10
+104,19
@@
void cspi_streams_close_all (void);
return (ret)
#define cspi_return_if_ev(err) \
return (ret)
#define cspi_return_if_ev(err) \
- if (
!cspi_check_ev (err))
\
+ if (
cspi_exception ())
\
return;
#define cspi_return_val_if_ev(err, ret) \
return;
#define cspi_return_val_if_ev(err, ret) \
- if (
!cspi_check_ev (err))
\
+ if (
cspi_exception ())
\
return (ret);
return (ret);
+typedef struct _Accessibility_BoundingBox Accessibility_BoundingBox;
+struct _Accessibility_BoundingBox
+{
+ dbus_uint32_t x;
+ dbus_uint32_t y;
+ dbus_uint32_t width;
+ dbus_uint32_t height;
+};
+
#endif /* _SPI_PRIVATE_H_ */
#endif /* _SPI_PRIVATE_H_ */