Revive Clutter support.
This commit is contained in:
Daiki Ueno
@ -20,107 +20,73 @@
|
||||
|
||||
/**
|
||||
* SECTION:eek-clutter-keyboard
|
||||
* @short_description: #EekKeyboard that can be converted into a #ClutterActor
|
||||
* @short_description: a #ClutterActor displaying #EekKeyboard
|
||||
*/
|
||||
#include <string.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
#include "eek-clutter-keyboard.h"
|
||||
#include "eek-clutter-drawing-context.h"
|
||||
#include "eek-clutter-section.h"
|
||||
#include "eek-clutter-renderer.h"
|
||||
#include "eek-keyboard.h"
|
||||
#include "eek-drawing.h"
|
||||
|
||||
G_DEFINE_TYPE (EekClutterKeyboard, eek_clutter_keyboard, EEK_TYPE_KEYBOARD);
|
||||
G_DEFINE_TYPE (EekClutterKeyboard, eek_clutter_keyboard, CLUTTER_TYPE_GROUP);
|
||||
|
||||
#define EEK_CLUTTER_KEYBOARD_GET_PRIVATE(obj) \
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CLUTTER_KEYBOARD, EekClutterKeyboardPrivate))
|
||||
|
||||
|
||||
struct _EekClutterKeyboardPrivate
|
||||
{
|
||||
EekClutterDrawingContext *context;
|
||||
ClutterActor *actor;
|
||||
|
||||
guint key_press_event_handler;
|
||||
guint key_release_event_handler;
|
||||
EekKeyboard *keyboard;
|
||||
EekClutterRenderer *renderer;
|
||||
};
|
||||
|
||||
static void
|
||||
eek_clutter_keyboard_real_set_name (EekElement *self,
|
||||
const gchar *name)
|
||||
eek_clutter_keyboard_real_get_preferred_width (ClutterActor *self,
|
||||
float for_height,
|
||||
float *min_width_p,
|
||||
float *natural_width_p)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
|
||||
gdouble width;
|
||||
|
||||
EEK_ELEMENT_CLASS (eek_clutter_keyboard_parent_class)->
|
||||
set_name (self, name);
|
||||
|
||||
if (priv->actor)
|
||||
clutter_actor_set_name (priv->actor, name);
|
||||
eek_renderer_get_size (EEK_RENDERER(priv->renderer), &width, NULL);
|
||||
*min_width_p = 0.0f;
|
||||
*natural_width_p = width;
|
||||
}
|
||||
|
||||
static void
|
||||
eek_clutter_keyboard_real_set_bounds (EekElement *self,
|
||||
EekBounds *bounds)
|
||||
eek_clutter_keyboard_real_get_preferred_height (ClutterActor *self,
|
||||
float for_width,
|
||||
float *min_height_p,
|
||||
float *natural_height_p)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
|
||||
gdouble height;
|
||||
|
||||
EEK_ELEMENT_CLASS (eek_clutter_keyboard_parent_class)->
|
||||
set_bounds (self, bounds);
|
||||
|
||||
if (priv->actor) {
|
||||
clutter_actor_set_position (priv->actor, bounds->x, bounds->y);
|
||||
clutter_actor_set_size (priv->actor, bounds->width, bounds->height);
|
||||
}
|
||||
eek_renderer_get_size (EEK_RENDERER(priv->renderer), NULL, &height);
|
||||
*min_height_p = 0.0f;
|
||||
*natural_height_p = height;
|
||||
}
|
||||
|
||||
static void
|
||||
key_pressed_event (EekSection *section,
|
||||
EekKey *key,
|
||||
EekKeyboard *keyboard)
|
||||
{
|
||||
g_signal_emit_by_name (keyboard, "key-pressed", key);
|
||||
}
|
||||
|
||||
static void
|
||||
key_released_event (EekSection *section,
|
||||
EekKey *key,
|
||||
EekKeyboard *keyboard)
|
||||
{
|
||||
g_signal_emit_by_name (keyboard, "key-released", key);
|
||||
}
|
||||
|
||||
static EekSection *
|
||||
eek_clutter_keyboard_real_create_section (EekKeyboard *self)
|
||||
eek_clutter_keyboard_real_allocate (ClutterActor *self,
|
||||
const ClutterActorBox *box,
|
||||
ClutterAllocationFlags flags)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
|
||||
EekSection *section;
|
||||
ClutterActor *actor;
|
||||
|
||||
if (!priv->context) {
|
||||
priv->context = eek_clutter_drawing_context_new ();
|
||||
g_object_ref_sink (G_OBJECT(priv->context));
|
||||
}
|
||||
g_assert (priv->renderer);
|
||||
eek_renderer_set_allocation_size (EEK_RENDERER(priv->renderer),
|
||||
box->x2 - box->x1,
|
||||
box->y2 - box->y1);
|
||||
|
||||
section = eek_clutter_section_new (priv->context);
|
||||
g_return_val_if_fail (section, NULL);
|
||||
|
||||
g_signal_connect (section, "key-pressed",
|
||||
G_CALLBACK(key_pressed_event), self);
|
||||
g_signal_connect (section, "key-released",
|
||||
G_CALLBACK(key_released_event), self);
|
||||
|
||||
EEK_CONTAINER_GET_CLASS(self)->add_child (EEK_CONTAINER(self),
|
||||
EEK_ELEMENT(section));
|
||||
|
||||
actor = eek_clutter_keyboard_get_actor (EEK_CLUTTER_KEYBOARD(self));
|
||||
clutter_container_add_actor
|
||||
(CLUTTER_CONTAINER(actor),
|
||||
eek_clutter_section_get_actor (EEK_CLUTTER_SECTION(section)));
|
||||
|
||||
return section;
|
||||
CLUTTER_ACTOR_CLASS (eek_clutter_keyboard_parent_class)->
|
||||
allocate (self, box, flags);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -128,39 +94,34 @@ eek_clutter_keyboard_dispose (GObject *object)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(object);
|
||||
|
||||
if (priv->context) {
|
||||
g_object_unref (G_OBJECT(priv->context));
|
||||
priv->context = NULL;
|
||||
if (priv->renderer) {
|
||||
g_object_unref (G_OBJECT(priv->renderer));
|
||||
priv->renderer = NULL;
|
||||
}
|
||||
if (priv->actor) {
|
||||
ClutterActor *stage;
|
||||
|
||||
stage = clutter_actor_get_stage (priv->actor);
|
||||
if (stage) {
|
||||
g_signal_handler_disconnect (stage,
|
||||
priv->key_press_event_handler);
|
||||
g_signal_handler_disconnect (stage,
|
||||
priv->key_release_event_handler);
|
||||
}
|
||||
g_object_unref (priv->actor);
|
||||
priv->actor = NULL;
|
||||
if (priv->keyboard && g_object_is_floating (priv->keyboard)) {
|
||||
g_object_unref (priv->keyboard);
|
||||
priv->keyboard = NULL;
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS (eek_clutter_keyboard_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
eek_clutter_keyboard_class_init (EekClutterKeyboardClass *klass)
|
||||
{
|
||||
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
EekElementClass *element_class = EEK_ELEMENT_CLASS (klass);
|
||||
EekKeyboardClass *keyboard_class = EEK_KEYBOARD_CLASS (klass);
|
||||
|
||||
g_type_class_add_private (gobject_class,
|
||||
sizeof (EekClutterKeyboardPrivate));
|
||||
|
||||
keyboard_class->create_section = eek_clutter_keyboard_real_create_section;
|
||||
element_class->set_name = eek_clutter_keyboard_real_set_name;
|
||||
element_class->set_bounds = eek_clutter_keyboard_real_set_bounds;
|
||||
actor_class->get_preferred_width =
|
||||
eek_clutter_keyboard_real_get_preferred_width;
|
||||
actor_class->get_preferred_height =
|
||||
eek_clutter_keyboard_real_get_preferred_height;
|
||||
actor_class->allocate = eek_clutter_keyboard_real_allocate;
|
||||
|
||||
gobject_class->dispose = eek_clutter_keyboard_dispose;
|
||||
}
|
||||
|
||||
@ -170,147 +131,67 @@ eek_clutter_keyboard_init (EekClutterKeyboard *self)
|
||||
EekClutterKeyboardPrivate *priv;
|
||||
|
||||
priv = self->priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(self);
|
||||
priv->actor = NULL;
|
||||
priv->keyboard = NULL;
|
||||
priv->renderer = NULL;
|
||||
}
|
||||
|
||||
struct _CreateSectionCallbackData {
|
||||
ClutterActor *actor;
|
||||
EekClutterRenderer *renderer;
|
||||
};
|
||||
typedef struct _CreateSectionCallbackData CreateSectionCallbackData;
|
||||
|
||||
static void
|
||||
create_section (EekElement *element, gpointer user_data)
|
||||
{
|
||||
CreateSectionCallbackData *data = user_data;
|
||||
ClutterActor *section;
|
||||
|
||||
section = eek_clutter_section_new (EEK_SECTION(element), data->renderer);
|
||||
clutter_container_add_actor (CLUTTER_CONTAINER(data->actor), section);
|
||||
}
|
||||
|
||||
/**
|
||||
* eek_clutter_keyboard_new:
|
||||
* @keyboard: an #EekKeyboard
|
||||
*
|
||||
* Create a new #EekClutterKeyboard.
|
||||
*/
|
||||
EekKeyboard*
|
||||
eek_clutter_keyboard_new (void)
|
||||
{
|
||||
return g_object_new (EEK_TYPE_CLUTTER_KEYBOARD, NULL);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
on_clutter_key_press_event (ClutterActor *actor,
|
||||
ClutterEvent *event,
|
||||
gpointer user_data)
|
||||
{
|
||||
guint keycode;
|
||||
EekKey *key;
|
||||
|
||||
keycode = clutter_event_get_key_code (event);
|
||||
key = eek_keyboard_find_key_by_keycode (user_data, keycode);
|
||||
if (key) {
|
||||
g_signal_emit_by_name (key, "pressed", NULL);
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
on_clutter_key_release_event (ClutterActor *actor,
|
||||
ClutterEvent *event,
|
||||
gpointer user_data)
|
||||
{
|
||||
guint keycode;
|
||||
EekKey *key;
|
||||
|
||||
keycode = clutter_event_get_key_code (event);
|
||||
key = eek_keyboard_find_key_by_keycode (user_data, keycode);
|
||||
if (key) {
|
||||
g_signal_emit_by_name (key, "released", NULL);
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
on_clutter_stage_resize (GObject *object,
|
||||
GParamSpec *param_spec,
|
||||
gpointer user_data)
|
||||
{
|
||||
ClutterActor *stage = CLUTTER_ACTOR(object);
|
||||
EekClutterKeyboard *keyboard = user_data;
|
||||
GValue value = {0};
|
||||
gfloat width, height, scale;
|
||||
EekBounds bounds;
|
||||
|
||||
eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
|
||||
g_object_get (G_OBJECT(stage), "width", &width, NULL);
|
||||
g_object_get (G_OBJECT(stage), "height", &height, NULL);
|
||||
|
||||
g_value_init (&value, G_TYPE_DOUBLE);
|
||||
|
||||
scale = width > height ? width / bounds.width : height / bounds.height;
|
||||
|
||||
g_value_set_double (&value, scale);
|
||||
g_object_set_property (G_OBJECT (stage),
|
||||
"scale-x",
|
||||
&value);
|
||||
|
||||
g_value_set_double (&value, scale);
|
||||
g_object_set_property (G_OBJECT (stage),
|
||||
"scale-y",
|
||||
&value);
|
||||
}
|
||||
|
||||
static void
|
||||
on_clutter_realize (ClutterActor *actor,
|
||||
gpointer user_data)
|
||||
{
|
||||
EekClutterKeyboard *keyboard = user_data;
|
||||
EekClutterKeyboardPrivate *priv =
|
||||
EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
|
||||
ClutterActor *stage;
|
||||
|
||||
stage = clutter_actor_get_stage (priv->actor);
|
||||
priv->key_press_event_handler =
|
||||
g_signal_connect (stage, "key-press-event",
|
||||
G_CALLBACK (on_clutter_key_press_event), keyboard);
|
||||
priv->key_release_event_handler =
|
||||
g_signal_connect (stage, "key-release-event",
|
||||
G_CALLBACK (on_clutter_key_release_event), keyboard);
|
||||
g_signal_connect (stage, "notify::width",
|
||||
G_CALLBACK (on_clutter_stage_resize), keyboard);
|
||||
g_signal_connect (stage, "notify::height",
|
||||
G_CALLBACK (on_clutter_stage_resize), keyboard);
|
||||
}
|
||||
|
||||
static void
|
||||
update_category_fonts (EekClutterKeyboard *keyboard)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv =
|
||||
EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
|
||||
PangoContext *context;
|
||||
PangoLayout *layout;
|
||||
PangoFontDescription *fonts[EEK_KEYSYM_CATEGORY_LAST], *base_font;
|
||||
gint i;
|
||||
|
||||
context = clutter_actor_get_pango_context (priv->actor);
|
||||
layout = pango_layout_new (context);
|
||||
base_font = pango_font_description_from_string ("Sans");
|
||||
pango_layout_set_font_description (layout, base_font);
|
||||
pango_font_description_free (base_font);
|
||||
eek_get_fonts (EEK_KEYBOARD(keyboard),
|
||||
layout,
|
||||
(PangoFontDescription **)&fonts);
|
||||
for (i = 0; i < EEK_KEYSYM_CATEGORY_LAST; i++) {
|
||||
eek_clutter_drawing_context_set_category_font (priv->context,
|
||||
i,
|
||||
fonts[i]);
|
||||
pango_font_description_free (fonts[i]);
|
||||
}
|
||||
g_object_unref (G_OBJECT(layout));
|
||||
}
|
||||
|
||||
ClutterActor *
|
||||
eek_clutter_keyboard_get_actor (EekClutterKeyboard *keyboard)
|
||||
eek_clutter_keyboard_new (EekKeyboard *keyboard)
|
||||
{
|
||||
EekClutterKeyboardPrivate *priv =
|
||||
EEK_CLUTTER_KEYBOARD_GET_PRIVATE(keyboard);
|
||||
if (!priv->actor) {
|
||||
priv->actor = clutter_group_new ();
|
||||
g_object_ref_sink (priv->actor);
|
||||
g_signal_connect (priv->actor, "realize",
|
||||
G_CALLBACK (on_clutter_realize), keyboard);
|
||||
g_return_val_if_fail (priv->actor, NULL);
|
||||
ClutterActor *actor;
|
||||
EekClutterKeyboardPrivate *priv;
|
||||
PangoContext *pcontext;
|
||||
CreateSectionCallbackData data;
|
||||
EekBounds bounds;
|
||||
gdouble scale;
|
||||
PangoFontDescription *font;
|
||||
|
||||
eek_keyboard_realize (EEK_KEYBOARD(keyboard));
|
||||
update_category_fonts (keyboard);
|
||||
}
|
||||
return priv->actor;
|
||||
actor = g_object_new (EEK_TYPE_CLUTTER_KEYBOARD, NULL);
|
||||
priv = EEK_CLUTTER_KEYBOARD_GET_PRIVATE(actor);
|
||||
priv->keyboard = g_object_ref_sink (keyboard);
|
||||
|
||||
pcontext = clutter_actor_get_pango_context (actor);
|
||||
font = pango_font_description_from_string ("Sans 48px");
|
||||
pango_context_set_font_description (pcontext, font);
|
||||
pango_font_description_free (font);
|
||||
|
||||
priv->renderer = eek_clutter_renderer_new (priv->keyboard, pcontext);
|
||||
|
||||
eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
|
||||
eek_renderer_set_allocation_size (EEK_RENDERER(priv->renderer),
|
||||
bounds.width,
|
||||
bounds.height);
|
||||
scale = eek_renderer_get_scale (EEK_RENDERER(priv->renderer));
|
||||
clutter_actor_set_position (actor, bounds.x * scale, bounds.y * scale);
|
||||
|
||||
data.actor = actor;
|
||||
data.renderer = priv->renderer;
|
||||
|
||||
eek_container_foreach_child (EEK_CONTAINER(priv->keyboard),
|
||||
create_section,
|
||||
&data);
|
||||
|
||||
return actor;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user