mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-30 15:31:34 +00:00
Clean up gailutil.c a bit
This commit is contained in:
Matthias Clasen
parent
4c76d9fe31
commit
d7ded58f51
@ -26,22 +26,7 @@
|
||||
#include "gtktoplevelaccessible.h"
|
||||
#include "gtkwindowaccessible.h"
|
||||
|
||||
static void gail_util_class_init (GailUtilClass *klass);
|
||||
static void gail_util_init (GailUtil *utils);
|
||||
/* atkutil.h */
|
||||
|
||||
static guint gail_util_add_global_event_listener (GSignalEmissionHook listener,
|
||||
const gchar* event_type);
|
||||
static void gail_util_remove_global_event_listener (guint remove_listener);
|
||||
static guint gail_util_add_key_event_listener (AtkKeySnoopFunc listener,
|
||||
gpointer data);
|
||||
static void gail_util_remove_key_event_listener (guint remove_listener);
|
||||
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);
|
||||
|
||||
|
||||
static void _listener_info_destroy (gpointer data);
|
||||
static guint add_listener (GSignalEmissionHook listener,
|
||||
const gchar *object_type,
|
||||
const gchar *signal,
|
||||
@ -89,28 +74,6 @@ struct _GailKeyEventInfo
|
||||
|
||||
G_DEFINE_TYPE (GailUtil, gail_util, ATK_TYPE_UTIL)
|
||||
|
||||
static void
|
||||
gail_util_class_init (GailUtilClass *klass)
|
||||
{
|
||||
AtkUtilClass *atk_class = ATK_UTIL_CLASS (klass);
|
||||
|
||||
atk_class->add_global_event_listener = gail_util_add_global_event_listener;
|
||||
atk_class->remove_global_event_listener = gail_util_remove_global_event_listener;
|
||||
atk_class->add_key_event_listener = gail_util_add_key_event_listener;
|
||||
atk_class->remove_key_event_listener = gail_util_remove_key_event_listener;
|
||||
atk_class->get_root = gail_util_get_root;
|
||||
atk_class->get_toolkit_name = gail_util_get_toolkit_name;
|
||||
atk_class->get_toolkit_version = gail_util_get_toolkit_version;
|
||||
|
||||
listener_list = g_hash_table_new_full (g_int_hash, g_int_equal,
|
||||
NULL, _listener_info_destroy);
|
||||
}
|
||||
|
||||
static void
|
||||
gail_util_init (GailUtil *utils)
|
||||
{
|
||||
}
|
||||
|
||||
static guint
|
||||
gail_util_add_global_event_listener (GSignalEmissionHook listener,
|
||||
const gchar *event_type)
|
||||
@ -185,9 +148,7 @@ gail_util_remove_global_event_listener (guint remove_listener)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static
|
||||
AtkKeyEventStruct *
|
||||
static AtkKeyEventStruct *
|
||||
atk_key_event_from_gdk_event_key (GdkEventKey *key)
|
||||
{
|
||||
AtkKeyEventStruct *event = g_new0 (AtkKeyEventStruct, 1);
|
||||
@ -236,7 +197,9 @@ typedef struct {
|
||||
} KeyEventListener;
|
||||
|
||||
static gint
|
||||
gail_key_snooper (GtkWidget *the_widget, GdkEventKey *event, gpointer data)
|
||||
gail_key_snooper (GtkWidget *the_widget,
|
||||
GdkEventKey *event,
|
||||
gpointer data)
|
||||
{
|
||||
GSList *l;
|
||||
AtkKeyEventStruct *atk_event;
|
||||
@ -325,19 +288,9 @@ gail_util_get_toolkit_name (void)
|
||||
static const gchar *
|
||||
gail_util_get_toolkit_version (void)
|
||||
{
|
||||
/*
|
||||
* Version is passed in as a -D flag when this file is
|
||||
* compiled.
|
||||
*/
|
||||
return GTK_VERSION;
|
||||
}
|
||||
|
||||
static void
|
||||
_listener_info_destroy (gpointer data)
|
||||
{
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
static guint
|
||||
add_listener (GSignalEmissionHook listener,
|
||||
const gchar *object_type,
|
||||
@ -358,7 +311,7 @@ add_listener (GSignalEmissionHook listener,
|
||||
|
||||
rc = listener_idx;
|
||||
|
||||
listener_info = g_malloc(sizeof(GailUtilListenerInfo));
|
||||
listener_info = g_new (GailUtilListenerInfo, 1);
|
||||
listener_info->key = listener_idx;
|
||||
listener_info->hook_id =
|
||||
g_signal_add_emission_hook (signal_id, 0, listener,
|
||||
@ -386,9 +339,6 @@ do_window_event_initialization (void)
|
||||
{
|
||||
AtkObject *root;
|
||||
|
||||
/*
|
||||
* Ensure that GtkWindowAccessibleClass exists.
|
||||
*/
|
||||
g_type_class_ref (GTK_TYPE_WINDOW_ACCESSIBLE);
|
||||
g_signal_add_emission_hook (g_signal_lookup ("window-state-event", GTK_TYPE_WIDGET),
|
||||
0, state_event_watcher, NULL, (GDestroyNotify) NULL);
|
||||
@ -414,12 +364,8 @@ state_event_watcher (GSignalInvocationHint *hint,
|
||||
AtkObject *parent;
|
||||
GdkEventWindowState *event;
|
||||
gchar *signal_name;
|
||||
guint signal_id;
|
||||
|
||||
object = g_value_get_object (param_values + 0);
|
||||
/*
|
||||
* The object can be a GtkMenu when it is popped up; we ignore this
|
||||
*/
|
||||
if (!GTK_IS_WINDOW (object))
|
||||
return FALSE;
|
||||
|
||||
@ -429,38 +375,26 @@ state_event_watcher (GSignalInvocationHint *hint,
|
||||
widget = GTK_WIDGET (object);
|
||||
|
||||
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
|
||||
{
|
||||
signal_name = "maximize";
|
||||
}
|
||||
else if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED)
|
||||
{
|
||||
signal_name = "minimize";
|
||||
}
|
||||
else if (event->new_window_state == 0)
|
||||
{
|
||||
signal_name = "restore";
|
||||
}
|
||||
else
|
||||
return TRUE;
|
||||
|
||||
atk_obj = gtk_widget_get_accessible (widget);
|
||||
|
||||
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
|
||||
{
|
||||
parent = atk_object_get_parent (atk_obj);
|
||||
if (parent == atk_get_root ())
|
||||
{
|
||||
signal_id = g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE);
|
||||
g_signal_emit (atk_obj, signal_id, 0);
|
||||
}
|
||||
g_signal_emit_by_name (atk_obj, signal_name);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
window_added (AtkObject *atk_obj,
|
||||
@ -469,7 +403,8 @@ window_added (AtkObject *atk_obj,
|
||||
{
|
||||
GtkWidget *widget;
|
||||
|
||||
if (!GTK_IS_WINDOW_ACCESSIBLE (child)) return;
|
||||
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
|
||||
return;
|
||||
|
||||
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
|
||||
if (!widget)
|
||||
@ -477,7 +412,7 @@ window_added (AtkObject *atk_obj,
|
||||
|
||||
g_signal_connect (widget, "focus-in-event", (GCallback) window_focus, NULL);
|
||||
g_signal_connect (widget, "focus-out-event", (GCallback) window_focus, NULL);
|
||||
g_signal_emit (child, g_signal_lookup ("create", GTK_TYPE_WINDOW_ACCESSIBLE), 0);
|
||||
g_signal_emit_by_name (child, "create");
|
||||
}
|
||||
|
||||
|
||||
@ -489,7 +424,8 @@ window_removed (AtkObject *atk_obj,
|
||||
GtkWidget *widget;
|
||||
GtkWindow *window;
|
||||
|
||||
if (!GTK_IS_WINDOW_ACCESSIBLE (child)) return;
|
||||
if (!GTK_IS_WINDOW_ACCESSIBLE (child))
|
||||
return;
|
||||
|
||||
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (child));
|
||||
if (!widget)
|
||||
@ -503,30 +439,26 @@ window_removed (AtkObject *atk_obj,
|
||||
if (gtk_window_is_active (window) &&
|
||||
gtk_window_has_toplevel_focus (window))
|
||||
{
|
||||
gchar *signal_name;
|
||||
AtkObject *atk_obj;
|
||||
|
||||
atk_obj = gtk_widget_get_accessible (widget);
|
||||
signal_name = "deactivate";
|
||||
g_signal_emit (atk_obj, g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE), 0);
|
||||
g_signal_emit_by_name (atk_obj, "deactivate");
|
||||
}
|
||||
|
||||
g_signal_handlers_disconnect_by_func (widget, (gpointer) window_focus, NULL);
|
||||
g_signal_emit (child, g_signal_lookup ("destroy", GTK_TYPE_WINDOW_ACCESSIBLE), 0);
|
||||
g_signal_emit_by_name (child, "destroy");
|
||||
}
|
||||
|
||||
static gboolean
|
||||
window_focus (GtkWidget *widget,
|
||||
GdkEventFocus *event)
|
||||
{
|
||||
gchar *signal_name;
|
||||
AtkObject *atk_obj;
|
||||
|
||||
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
|
||||
|
||||
atk_obj = gtk_widget_get_accessible (widget);
|
||||
signal_name = (event->in) ? "activate" : "deactivate";
|
||||
g_signal_emit (atk_obj, g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE), 0);
|
||||
g_signal_emit_by_name (atk_obj, event->in ? "activate" : "deactivate");
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@ -544,13 +476,9 @@ configure_event_watcher (GSignalInvocationHint *hint,
|
||||
AtkObject *parent;
|
||||
GdkEvent *event;
|
||||
gchar *signal_name;
|
||||
guint signal_id;
|
||||
|
||||
object = g_value_get_object (param_values + 0);
|
||||
if (!GTK_IS_WINDOW (object))
|
||||
/*
|
||||
* GtkDrawingArea can send a GDK_CONFIGURE event but we ignore here
|
||||
*/
|
||||
return FALSE;
|
||||
|
||||
event = g_value_get_boxed (param_values + 1);
|
||||
@ -566,28 +494,40 @@ configure_event_watcher (GSignalInvocationHint *hint,
|
||||
|
||||
if (allocation.width != ((GdkEventConfigure *)event)->width ||
|
||||
allocation.height != ((GdkEventConfigure *)event)->height)
|
||||
{
|
||||
signal_name = "resize";
|
||||
}
|
||||
else
|
||||
{
|
||||
signal_name = "move";
|
||||
}
|
||||
|
||||
atk_obj = gtk_widget_get_accessible (widget);
|
||||
if (GTK_IS_WINDOW_ACCESSIBLE (atk_obj))
|
||||
{
|
||||
parent = atk_object_get_parent (atk_obj);
|
||||
if (parent == atk_get_root ())
|
||||
{
|
||||
signal_id = g_signal_lookup (signal_name, GTK_TYPE_WINDOW_ACCESSIBLE);
|
||||
g_signal_emit (atk_obj, signal_id, 0);
|
||||
}
|
||||
g_signal_emit_by_name (atk_obj, signal_name);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
gail_util_class_init (GailUtilClass *klass)
|
||||
{
|
||||
AtkUtilClass *atk_class = ATK_UTIL_CLASS (klass);
|
||||
|
||||
atk_class->add_global_event_listener = gail_util_add_global_event_listener;
|
||||
atk_class->remove_global_event_listener = gail_util_remove_global_event_listener;
|
||||
atk_class->add_key_event_listener = gail_util_add_key_event_listener;
|
||||
atk_class->remove_key_event_listener = gail_util_remove_key_event_listener;
|
||||
atk_class->get_root = gail_util_get_root;
|
||||
atk_class->get_toolkit_name = gail_util_get_toolkit_name;
|
||||
atk_class->get_toolkit_version = gail_util_get_toolkit_version;
|
||||
|
||||
listener_list = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
|
||||
}
|
||||
|
||||
static void
|
||||
gail_util_init (GailUtil *utils)
|
||||
{
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user