Remove eek-container
This commit is contained in:
Dorota Czaplejewicz
@ -1,230 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
|
||||||
* Copyright (C) 2010-2011 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
||||||
* 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* SECTION:eek-container
|
|
||||||
* @short_description: Base class of a keyboard container
|
|
||||||
*
|
|
||||||
* The #EekContainerClass class represents a keyboard container, which
|
|
||||||
* shall be used to implement #EekKeyboard and #EekSection.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include "eek-container.h"
|
|
||||||
|
|
||||||
enum {
|
|
||||||
CHILD_ADDED,
|
|
||||||
CHILD_REMOVED,
|
|
||||||
LAST_SIGNAL
|
|
||||||
};
|
|
||||||
|
|
||||||
static guint signals[LAST_SIGNAL] = { 0, };
|
|
||||||
|
|
||||||
typedef struct _EekContainerPrivate
|
|
||||||
{
|
|
||||||
GList *head;
|
|
||||||
GList *last;
|
|
||||||
} EekContainerPrivate;
|
|
||||||
|
|
||||||
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekContainer, eek_container, EEK_TYPE_ELEMENT)
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_real_add_child (EekContainer *self,
|
|
||||||
EekElement *child)
|
|
||||||
{
|
|
||||||
EekContainerPrivate *priv = (EekContainerPrivate*)eek_container_get_instance_private (self);
|
|
||||||
|
|
||||||
g_return_if_fail (EEK_IS_ELEMENT(child));
|
|
||||||
g_object_ref (child);
|
|
||||||
|
|
||||||
if (!priv->head) {
|
|
||||||
priv->head = priv->last = g_list_prepend (priv->head, child);
|
|
||||||
} else {
|
|
||||||
priv->last->next = g_list_prepend (priv->last->next, child);
|
|
||||||
priv->last = priv->last->next;
|
|
||||||
}
|
|
||||||
g_signal_emit (self, signals[CHILD_ADDED], 0, child);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_real_remove_child (EekContainer *self,
|
|
||||||
EekElement *child)
|
|
||||||
{
|
|
||||||
EekContainerPrivate *priv = eek_container_get_instance_private (self);
|
|
||||||
GList *head;
|
|
||||||
|
|
||||||
g_return_if_fail (EEK_IS_ELEMENT(child));
|
|
||||||
head = g_list_find (priv->head, child);
|
|
||||||
g_return_if_fail (head);
|
|
||||||
g_object_unref (child);
|
|
||||||
if (head == priv->last)
|
|
||||||
priv->last = g_list_previous (priv->last);
|
|
||||||
priv->head = g_list_remove_link (priv->head, head);
|
|
||||||
g_signal_emit (self, signals[CHILD_REMOVED], 0, child);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_real_foreach_child (EekContainer *self,
|
|
||||||
EekCallback callback,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
EekContainerPrivate *priv = eek_container_get_instance_private (self);
|
|
||||||
GList *head;
|
|
||||||
|
|
||||||
for (head = priv->head; head; head = g_list_next (head))
|
|
||||||
(*callback) (EEK_ELEMENT(head->data), user_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static EekElement *
|
|
||||||
eek_container_real_find (EekContainer *self,
|
|
||||||
EekCompareFunc func,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
EekContainerPrivate *priv = eek_container_get_instance_private (self);
|
|
||||||
GList *head;
|
|
||||||
|
|
||||||
head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
|
|
||||||
if (head)
|
|
||||||
return head->data;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_dispose (GObject *object)
|
|
||||||
{
|
|
||||||
EekContainer *self = EEK_CONTAINER (object);
|
|
||||||
EekContainerPrivate *priv = eek_container_get_instance_private (self);
|
|
||||||
GList *head;
|
|
||||||
|
|
||||||
for (head = priv->head; head; head = priv->head) {
|
|
||||||
g_object_unref (head->data);
|
|
||||||
priv->head = g_list_next (head);
|
|
||||||
g_list_free1 (head);
|
|
||||||
}
|
|
||||||
G_OBJECT_CLASS(eek_container_parent_class)->dispose (object);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_class_init (EekContainerClass *klass)
|
|
||||||
{
|
|
||||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
||||||
|
|
||||||
klass->add_child = eek_container_real_add_child;
|
|
||||||
klass->remove_child = eek_container_real_remove_child;
|
|
||||||
klass->foreach_child = eek_container_real_foreach_child;
|
|
||||||
klass->find = eek_container_real_find;
|
|
||||||
|
|
||||||
/* signals */
|
|
||||||
klass->child_added = NULL;
|
|
||||||
klass->child_removed = NULL;
|
|
||||||
|
|
||||||
gobject_class->dispose = eek_container_dispose;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EekContainer::child-added:
|
|
||||||
* @container: an #EekContainer
|
|
||||||
* @element: an #EekElement
|
|
||||||
*
|
|
||||||
* The ::child-added signal is emitted each time an element is
|
|
||||||
* added to @container.
|
|
||||||
*/
|
|
||||||
signals[CHILD_ADDED] =
|
|
||||||
g_signal_new (I_("child-added"),
|
|
||||||
G_TYPE_FROM_CLASS(gobject_class),
|
|
||||||
G_SIGNAL_RUN_FIRST,
|
|
||||||
G_STRUCT_OFFSET(EekContainerClass, child_added),
|
|
||||||
NULL, NULL,
|
|
||||||
g_cclosure_marshal_VOID__OBJECT,
|
|
||||||
G_TYPE_NONE, 1,
|
|
||||||
EEK_TYPE_ELEMENT);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EekContainer::child-removed:
|
|
||||||
* @container: an #EekContainer
|
|
||||||
* @element: an #EekElement
|
|
||||||
*
|
|
||||||
* The ::child-removed signal is emitted each time an element is
|
|
||||||
* removed from @container.
|
|
||||||
*/
|
|
||||||
signals[CHILD_REMOVED] =
|
|
||||||
g_signal_new (I_("child-removed"),
|
|
||||||
G_TYPE_FROM_CLASS(gobject_class),
|
|
||||||
G_SIGNAL_RUN_FIRST,
|
|
||||||
G_STRUCT_OFFSET(EekContainerClass, child_removed),
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
g_cclosure_marshal_VOID__OBJECT,
|
|
||||||
G_TYPE_NONE, 1,
|
|
||||||
EEK_TYPE_ELEMENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_container_init (EekContainer *self)
|
|
||||||
{
|
|
||||||
/* void */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* eek_container_foreach_child:
|
|
||||||
* @container: an #EekContainer
|
|
||||||
* @callback: (scope call): an #EekCallback
|
|
||||||
* @user_data: additional data passed to @callback
|
|
||||||
*
|
|
||||||
* Enumerate children of @container and run @callback with each child.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
eek_container_foreach_child (EekContainer *container,
|
|
||||||
EekCallback callback,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
g_return_if_fail (EEK_IS_CONTAINER(container));
|
|
||||||
EEK_CONTAINER_GET_CLASS(container)->foreach_child (container,
|
|
||||||
callback,
|
|
||||||
user_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* eek_container_find:
|
|
||||||
* @container: an #EekContainer
|
|
||||||
* @func: function to be used to compare two children
|
|
||||||
* @user_data: additional data passed to @func
|
|
||||||
*
|
|
||||||
* Find a child which matches the criteria supplied as @func, in @container.
|
|
||||||
* Returns: an #EekElement or NULL on failure
|
|
||||||
*/
|
|
||||||
EekElement *
|
|
||||||
eek_container_find (EekContainer *container,
|
|
||||||
EekCompareFunc func,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (EEK_IS_CONTAINER(container), NULL);
|
|
||||||
return EEK_CONTAINER_GET_CLASS(container)->find (container,
|
|
||||||
func,
|
|
||||||
user_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
eek_container_add_child (EekContainer *container, EekElement *element)
|
|
||||||
{
|
|
||||||
g_return_if_fail (EEK_IS_CONTAINER(container));
|
|
||||||
g_return_if_fail (EEK_IS_ELEMENT(element));
|
|
||||||
return EEK_CONTAINER_GET_CLASS(container)->add_child (container, element);
|
|
||||||
}
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
|
|
||||||
* Copyright (C) 2010-2011 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
||||||
* 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION)
|
|
||||||
#error "Only <eek/eek.h> can be included directly."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef EEK_CONTAINER_H
|
|
||||||
#define EEK_CONTAINER_H 1
|
|
||||||
|
|
||||||
#include "eek-element.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
#define EEK_TYPE_CONTAINER (eek_container_get_type())
|
|
||||||
G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElement)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EekCallback:
|
|
||||||
* @element: an #EekElement
|
|
||||||
* @user_data: user-supplied data
|
|
||||||
*
|
|
||||||
* The type of the callback function used for iterating over the
|
|
||||||
* children of a container, see eek_container_foreach_child().
|
|
||||||
*/
|
|
||||||
typedef void (*EekCallback) (EekElement *element, gpointer user_data);
|
|
||||||
typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EekContainerClass:
|
|
||||||
* @foreach_child: virtual function for iterating over the container's children
|
|
||||||
* @find: virtual function for looking up a child
|
|
||||||
* @child_added: class handler for #EekContainer::child-added
|
|
||||||
* @child_removed: class handler for #EekContainer::child-added
|
|
||||||
*/
|
|
||||||
struct _EekContainerClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
EekElementClass parent_class;
|
|
||||||
|
|
||||||
void (* add_child) (EekContainer *self,
|
|
||||||
EekElement *element);
|
|
||||||
|
|
||||||
void (* remove_child) (EekContainer *self,
|
|
||||||
EekElement *element);
|
|
||||||
|
|
||||||
/*< public >*/
|
|
||||||
void (* foreach_child) (EekContainer *self,
|
|
||||||
EekCallback callback,
|
|
||||||
gpointer user_data);
|
|
||||||
EekElement *(* find) (EekContainer *self,
|
|
||||||
EekCompareFunc func,
|
|
||||||
gpointer data);
|
|
||||||
|
|
||||||
/* signals */
|
|
||||||
void (* child_added) (EekContainer *self,
|
|
||||||
EekElement *element);
|
|
||||||
void (* child_removed) (EekContainer *self,
|
|
||||||
EekElement *element);
|
|
||||||
/*< private >*/
|
|
||||||
/* padding */
|
|
||||||
gpointer pdummy[24];
|
|
||||||
};
|
|
||||||
|
|
||||||
GType eek_container_get_type (void) G_GNUC_CONST;
|
|
||||||
|
|
||||||
void eek_container_foreach_child (EekContainer *container,
|
|
||||||
EekCallback callback,
|
|
||||||
gpointer user_data);
|
|
||||||
EekElement *eek_container_find (EekContainer *container,
|
|
||||||
EekCompareFunc func,
|
|
||||||
gpointer user_data);
|
|
||||||
void eek_container_add_child (EekContainer *container,
|
|
||||||
EekElement *element);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
#endif /* EEK_CONTAINER_H */
|
|
||||||
@ -31,7 +31,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "eek-element.h"
|
#include "eek-element.h"
|
||||||
#include "eek-container.h"
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
|
|||||||
@ -254,22 +254,6 @@ void level_keyboard_free(LevelKeyboard *self) {
|
|||||||
g_free(self);
|
g_free(self);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
eek_keyboard_real_child_added (EekContainer *self,
|
|
||||||
EekElement *element)
|
|
||||||
{
|
|
||||||
(void)self;
|
|
||||||
(void)element;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
eek_keyboard_real_child_removed (EekContainer *self,
|
|
||||||
EekElement *element)
|
|
||||||
{
|
|
||||||
(void)self;
|
|
||||||
(void)element;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
eek_keyboard_class_init (EekKeyboardClass *klass)
|
eek_keyboard_class_init (EekKeyboardClass *klass)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
#include "eek-container.h"
|
|
||||||
#include "eek-types.h"
|
#include "eek-types.h"
|
||||||
#include "eek-layout.h"
|
#include "eek-layout.h"
|
||||||
#include "src/layout.h"
|
#include "src/layout.h"
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
#define EEK_SECTION_H 1
|
#define EEK_SECTION_H 1
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include "eek-container.h"
|
#include "eek-element.h"
|
||||||
#include "eek-types.h"
|
#include "eek-types.h"
|
||||||
#include "eek-keyboard.h"
|
#include "eek-keyboard.h"
|
||||||
#include "src/keyboard.h"
|
#include "src/keyboard.h"
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
#ifndef __LAYOUT_H
|
#ifndef __LAYOUT_H
|
||||||
#define __LAYOUT_H
|
#define __LAYOUT_H
|
||||||
|
|
||||||
#include "inttypes.h"
|
#include <inttypes.h>
|
||||||
|
#include <glib.h>
|
||||||
#include "eek/eek-container.h"
|
#include "eek/eek-element.h"
|
||||||
#include "src/keyboard.h"
|
#include "src/keyboard.h"
|
||||||
|
|
||||||
struct squeek_button;
|
struct squeek_button;
|
||||||
|
|||||||
@ -16,7 +16,6 @@ sources = [
|
|||||||
'server-context-service.c',
|
'server-context-service.c',
|
||||||
'wayland.c',
|
'wayland.c',
|
||||||
'../eek/eek.c',
|
'../eek/eek.c',
|
||||||
'../eek/eek-container.c',
|
|
||||||
'../eek/eek-element.c',
|
'../eek/eek-element.c',
|
||||||
'../eek/eek-gtk-keyboard.c',
|
'../eek/eek-gtk-keyboard.c',
|
||||||
'../eek/eek-keyboard.c',
|
'../eek/eek-keyboard.c',
|
||||||
|
|||||||
Reference in New Issue
Block a user