diff --git a/docs/reference/eek/Makefile.am b/docs/reference/eek/Makefile.am index 6381583e..ffcd38bf 100644 --- a/docs/reference/eek/Makefile.am +++ b/docs/reference/eek/Makefile.am @@ -47,7 +47,7 @@ SCANGOBJ_OPTIONS= # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types +SCAN_OPTIONS=--rebuild-types --deprecated-guards="EEK_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml @@ -82,7 +82,8 @@ IGNORE_HFILES = \ eek-clutter-renderer.h \ eek-clutter-section.h \ eek-clutter-key.h \ - eek-gtk-renderer.h + eek-gtk-renderer.h \ + eek-enumtypes.h if !ENABLE_CLUTTER IGNORE_HFILES += eek-clutter-keyboard.h eek-clutter.h endif diff --git a/docs/reference/eek/eek-sections.txt b/docs/reference/eek/eek-sections.txt index f868280b..05be8758 100644 --- a/docs/reference/eek/eek-sections.txt +++ b/docs/reference/eek/eek-sections.txt @@ -1,9 +1,8 @@
eek-keyboard EekKeyboard -EekKeyboardClass -EekKeyboardPrivate EekKeyboard +EekKeyboardClass eek_keyboard_new eek_keyboard_get_layout eek_keyboard_get_size @@ -21,6 +20,11 @@ eek_keyboard_create_section eek_keyboard_find_key_by_keycode eek_keyboard_add_outline eek_keyboard_get_outline +eek_keyboard_set_num_lock_mask +eek_keyboard_get_num_lock_mask +eek_keyboard_set_alt_gr_mask +eek_keyboard_get_alt_gr_mask +EekKeyboardPrivate EEK_KEYBOARD EEK_IS_KEYBOARD @@ -34,8 +38,8 @@ EEK_KEYBOARD_GET_CLASS
eek-layout EekLayout -EekLayoutClass EekLayout +EekLayoutClass EEK_LAYOUT EEK_IS_LAYOUT @@ -51,8 +55,9 @@ EEK_LAYOUT_GET_CLASS EekGtkKeyboard EekGtkKeyboard EekGtkKeyboardClass -EekGtkKeyboardPrivate eek_gtk_keyboard_new +eek_gtk_keyboard_set_theme +EekGtkKeyboardPrivate EEK_GTK_KEYBOARD EEK_IS_GTK_KEYBOARD @@ -63,12 +68,42 @@ EEK_IS_GTK_KEYBOARD_CLASS EEK_GTK_KEYBOARD_GET_CLASS
+
+eek-theme-node +EekSide +EekCorner +eek_theme_node_new +eek_theme_node_get_parent +eek_theme_node_get_theme +eek_theme_node_get_element_type +eek_theme_node_get_element_id +eek_theme_node_get_element_class +eek_theme_node_get_pseudo_class +eek_theme_node_get_color +eek_theme_node_get_background_color +eek_theme_node_get_foreground_color +eek_theme_node_get_background_gradient +eek_theme_node_get_border_width +eek_theme_node_get_border_radius +eek_theme_node_get_border_color +eek_theme_node_get_font +EekThemeNodePrivate +EekThemeNodeClass + +EEK_THEME_NODE +EEK_IS_THEME_NODE +EEK_TYPE_THEME_NODE +eek_theme_node_get_type +EEK_THEME_NODE_CLASS +EEK_IS_THEME_NODE_CLASS +EEK_THEME_NODE_GET_CLASS +
+
eek-section EekSection -EekSectionClass -EekSectionPrivate EekSection +EekSectionClass eek_section_set_angle eek_section_get_angle eek_section_get_n_rows @@ -76,6 +111,7 @@ eek_section_add_row eek_section_get_row eek_section_create_key eek_section_find_key_by_keycode +EekSectionPrivate EEK_SECTION EEK_IS_SECTION @@ -86,17 +122,39 @@ EEK_IS_SECTION_CLASS EEK_SECTION_GET_CLASS
+
+eek-theme-context +eek_theme_context_new +eek_theme_context_set_theme +eek_theme_context_get_theme +eek_theme_context_set_resolution +eek_theme_context_set_default_resolution +eek_theme_context_get_resolution +eek_theme_context_set_font +eek_theme_context_get_font +eek_theme_context_get_root_node +EekThemeContextClass + +EEK_THEME_CONTEXT +EEK_IS_THEME_CONTEXT +EEK_TYPE_THEME_CONTEXT +eek_theme_context_get_type +EEK_THEME_CONTEXT_CLASS +EEK_IS_THEME_CONTEXT_CLASS +EEK_THEME_CONTEXT_GET_CLASS +
+
eek-container EekContainer -EekContainerClass -EekContainerPrivate EekCallback EekCompareFunc EekContainer +EekContainerClass eek_container_foreach_child eek_container_find eek_container_add_child +EekContainerPrivate EEK_CONTAINER EEK_IS_CONTAINER @@ -107,13 +165,30 @@ EEK_IS_CONTAINER_CLASS EEK_CONTAINER_GET_CLASS
+
+eek-clutter-keyboard +EekClutterKeyboard +EekClutterKeyboard +EekClutterKeyboardClass +eek_clutter_keyboard_new +eek_clutter_keyboard_set_theme +EekClutterKeyboardPrivate + +EEK_CLUTTER_KEYBOARD +EEK_IS_CLUTTER_KEYBOARD +EEK_TYPE_CLUTTER_KEYBOARD +eek_clutter_keyboard_get_type +EEK_CLUTTER_KEYBOARD_CLASS +EEK_IS_CLUTTER_KEYBOARD_CLASS +EEK_CLUTTER_KEYBOARD_GET_CLASS +
+
eek-symbol EekSymbol EekSymbolCategory -EekSymbolClass -EekSymbolPrivate EekSymbol +EekSymbolClass eek_symbol_new eek_symbol_set_name eek_symbol_get_name @@ -126,6 +201,7 @@ eek_symbol_set_modifier_mask eek_symbol_is_modifier eek_symbol_set_icon_name eek_symbol_get_icon_name +EekSymbolPrivate EEK_SYMBOL EEK_IS_SYMBOL @@ -141,7 +217,6 @@ EEK_SYMBOL_GET_CLASS EekXklLayout EekXklLayout EekXklLayoutClass -EekXklLayoutPrivate eek_xkl_layout_new eek_xkl_layout_set_config eek_xkl_layout_set_config_full @@ -156,6 +231,7 @@ eek_xkl_layout_get_layouts eek_xkl_layout_get_variants eek_xkl_layout_get_options eek_xkl_layout_get_option +EekXklLayoutPrivate EEK_XKL_LAYOUT EEK_IS_XKL_LAYOUT @@ -171,7 +247,6 @@ EEK_XKL_LAYOUT_GET_CLASS EekXkbLayout EekXkbLayout EekXkbLayoutClass -EekXkbLayoutPrivate eek_xkb_layout_new eek_xkb_layout_set_names eek_xkb_layout_set_names_full @@ -182,6 +257,7 @@ eek_xkb_layout_set_symbols eek_xkb_layout_get_keycodes eek_xkb_layout_get_geometry eek_xkb_layout_get_symbols +EekXkbLayoutPrivate EEK_XKB_LAYOUT EEK_IS_XKB_LAYOUT @@ -195,9 +271,8 @@ EEK_XKB_LAYOUT_GET_CLASS
eek-key EekKey -EekKeyClass -EekKeyPrivate EekKey +EekKeyClass eek_key_set_keycode eek_key_get_keycode eek_key_set_symbol_matrix @@ -210,6 +285,7 @@ eek_key_get_index eek_key_set_oref eek_key_get_oref eek_key_is_pressed +EekKeyPrivate EEK_KEY EEK_IS_KEY @@ -223,7 +299,6 @@ EEK_KEY_GET_CLASS
eek-serializable EekSerializable -EekSerializable EekSerializableIface eek_serializable_serialize eek_serializable_deserialize @@ -238,9 +313,8 @@ EEK_SERIALIZABLE_GET_IFACE
eek-element EekElement -EekElementClass -EekElementPrivate EekElement +EekElementClass eek_element_set_parent eek_element_get_parent eek_element_set_name @@ -256,6 +330,7 @@ eek_element_set_group eek_element_set_level eek_element_get_group eek_element_get_level +EekElementPrivate EEK_ELEMENT EEK_IS_ELEMENT @@ -271,10 +346,10 @@ EEK_ELEMENT_GET_CLASS EekXmlLayout EekXmlLayout EekXmlLayoutClass -EekXmlLayoutPrivate eek_xml_layout_new eek_xml_layout_set_source eek_xml_layout_get_source +EekXmlLayoutPrivate EEK_XML_LAYOUT EEK_IS_XML_LAYOUT @@ -285,16 +360,33 @@ EEK_IS_XML_LAYOUT_CLASS EEK_XML_LAYOUT_GET_CLASS
+
+eek-theme +eek_theme_new +eek_theme_load_stylesheet +eek_theme_unload_stylesheet +EekThemeClass + +EEK_THEME +EEK_IS_THEME +EEK_TYPE_THEME +eek_theme_get_type +EEK_THEME_CLASS +EEK_IS_THEME_CLASS +EEK_THEME_GET_CLASS +
+
eek-keysym EekKeysym EEK_KEYSYM -EekKeysymClass -EekKeysymPrivate EekKeysym +EekKeysymClass eek_keysym_new eek_keysym_get_xkeysym eek_keysym_new_from_name +eek_keysym_new_with_modifier +EekKeysymPrivate EEK_INVALID_KEYSYM EEK_IS_KEYSYM @@ -314,7 +406,6 @@ eek_keyboard_output
eek-types I_ -EEK_TYPE_SYMBOL_MATRIX EEK_TYPE_POINT EEK_TYPE_BOUNDS EEK_TYPE_OUTLINE @@ -323,23 +414,40 @@ EekOrientation EekModifierBehavior EekModifierType EEK_INVALID_KEYCODE -EekSymbolMatrix EekPoint +eek_point_get_type +eek_point_copy +eek_point_free +eek_point_rotate EekBounds +eek_bounds_get_type +eek_bounds_copy +eek_bounds_free +eek_bounds_long_side EekOutline +eek_outline_get_type +eek_outline_copy +eek_outline_free EekColor +eek_color_get_type +eek_color_new +eek_color_copy +eek_color_free +EekGradientType +EekThemeNode +EekThemeContext +EekTheme +
+ +
+eek-symbol-matrix +EekSymbolMatrix +EEK_TYPE_SYMBOL_MATRIX eek_symbol_matrix_get_type eek_symbol_matrix_new eek_symbol_matrix_copy eek_symbol_matrix_free -eek_point_get_type -eek_point_rotate -eek_bounds_get_type -eek_bounds_long_side -eek_outline_get_type -eek_outline_copy -eek_outline_free -eek_color_get_type -eek_color_new +eek_symbol_matrix_set_symbol +eek_symbol_matrix_get_symbol
diff --git a/eek/eek-key.c b/eek/eek-key.c index df4f528f..003a999c 100644 --- a/eek/eek-key.c +++ b/eek/eek-key.c @@ -557,9 +557,9 @@ eek_key_get_symbol_matrix (EekKey *key) /** * eek_key_get_symbol: * @key: an #EekKey - * @returns: (transfer none): the current #EekSymbol or %NULL on failure * * Get the current symbol of @key. + * Return value: (transfer none): the current #EekSymbol or %NULL on failure */ EekSymbol * eek_key_get_symbol (EekKey *key) @@ -572,9 +572,9 @@ eek_key_get_symbol (EekKey *key) * @key: an #EekKey * @fallback_group: fallback group index * @fallback_level: fallback level index - * @returns: (transfer none): the current #EekSymbol or %NULL on failure * * Get the current symbol of @key. + * Return value: (transfer none): the current #EekSymbol or %NULL on failure */ EekSymbol * eek_key_get_symbol_with_fallback (EekKey *key, @@ -628,9 +628,9 @@ eek_key_get_symbol_with_fallback (EekKey *key, * @level: level index of the symbol matrix * @fallback_group: fallback group index * @fallback_level: fallback level index - * @returns: (transfer none): an #EekSymbol at (@group, @level), or %NULL * * Get the symbol at (@group, @level) in the symbol matrix of @key. + * Return value: (transfer none): an #EekSymbol at (@group, @level), or %NULL */ EekSymbol * eek_key_get_symbol_at_index (EekKey *key, diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index 63f36d19..422ce75d 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -660,9 +660,9 @@ eek_keyboard_create_section (EekKeyboard *keyboard) * eek_keyboard_find_key_by_keycode: * @keyboard: an #EekKeyboard * @keycode: a keycode - * @returns: (transfer none): #EekKey whose keycode is @keycode * * Find an #EekKey whose keycode is @keycode. + * Return value: (transfer none): #EekKey whose keycode is @keycode */ EekKey * eek_keyboard_find_key_by_keycode (EekKeyboard *keyboard, diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h index 118be15f..faf1a8d4 100644 --- a/eek/eek-keyboard.h +++ b/eek/eek-keyboard.h @@ -104,6 +104,7 @@ void eek_keyboard_set_size (EekKeyboard *keyboard, gdouble width, gdouble height); +#ifndef EEK_DISABLE_DEPRECATED void eek_keyboard_set_symbol_index (EekKeyboard *keyboard, gint group, @@ -112,7 +113,6 @@ void eek_keyboard_get_symbol_index (EekKeyboard *keyboard, gint *group, gint *level); - void eek_keyboard_set_group (EekKeyboard *keyboard, gint group); @@ -123,6 +123,7 @@ gint eek_keyboard_get_group (EekKeyboard *keyboard); gint eek_keyboard_get_level (EekKeyboard *keyboard); +#endif /* EEK_DISABLE_DEPRECATED */ void eek_keyboard_set_modifier_behavior (EekKeyboard *keyboard, diff --git a/eek/eek-keysym.c b/eek/eek-keysym.c index 1ca2a4f4..999f5498 100644 --- a/eek/eek-keysym.c +++ b/eek/eek-keysym.c @@ -223,7 +223,8 @@ eek_keysym_init (EekKeysym *self) * modifier @modifier_mask. */ EekKeysym * -eek_keysym_new_with_modifier (guint xkeysym, EekModifierType modifier_mask) +eek_keysym_new_with_modifier (guint xkeysym, + EekModifierType modifier_mask) { EekKeysym *keysym; EekKeysymPrivate *priv; diff --git a/eek/eek-section.h b/eek/eek-section.h index 958addf6..6add97c6 100644 --- a/eek/eek-section.h +++ b/eek/eek-section.h @@ -54,6 +54,8 @@ struct _EekSection * @create_key: virtual function for creating key in the section * @find_key_by_keycode: virtual function for accessing a key in the * section by keycode + * @key_pressed: class handler for #EekSection::key-pressed signal + * @key_released: class handler for #EekSection::key-released signal */ struct _EekSectionClass { diff --git a/eek/eek-symbol-matrix.h b/eek/eek-symbol-matrix.h index badef2be..82f48118 100644 --- a/eek/eek-symbol-matrix.h +++ b/eek/eek-symbol-matrix.h @@ -39,6 +39,7 @@ struct _EekSymbolMatrix EekSymbol **data; }; +#define EEK_TYPE_SYMBOL_MATRIX (eek_symbol_matrix_get_type ()) GType eek_symbol_matrix_get_type (void) G_GNUC_CONST; EekSymbolMatrix *eek_symbol_matrix_new (gint num_groups, gint num_levels); diff --git a/eek/eek-symbol.c b/eek/eek-symbol.c index 53c701b4..241ee430 100644 --- a/eek/eek-symbol.c +++ b/eek/eek-symbol.c @@ -364,8 +364,9 @@ eek_symbol_get_category (EekSymbol *symbol) /** * eek_symbol_set_modifier_mask: * @symbol: an #EekSymbol + * @mask: an #EekModifierType * - * Set modifier mask @symbol can trigger. + * Set modifier mask that @symbol can trigger. */ void eek_symbol_set_modifier_mask (EekSymbol *symbol, @@ -383,7 +384,7 @@ eek_symbol_set_modifier_mask (EekSymbol *symbol, * eek_symbol_get_modifier_mask: * @symbol: an #EekSymbol * - * Get modifier mask @symbol can trigger. + * Get modifier mask that @symbol can trigger. */ EekModifierType eek_symbol_get_modifier_mask (EekSymbol *symbol) diff --git a/eek/eek-theme-context.c b/eek/eek-theme-context.c index 80f7af0e..c6211e41 100644 --- a/eek/eek-theme-context.c +++ b/eek/eek-theme-context.c @@ -121,7 +121,8 @@ eek_theme_context_changed (EekThemeContext *context) /** * eek_theme_context_set_theme: - * @context: a #EekThemeContext + * @context: an #EekThemeContext + * @theme: an #EekTheme * * Sets the default set of theme stylesheets for the context. This theme will * be used for the root node and for nodes descending from it, unless some other diff --git a/eek/eek-theme-context.h b/eek/eek-theme-context.h index 861ddf8b..a8498739 100644 --- a/eek/eek-theme-context.h +++ b/eek/eek-theme-context.h @@ -28,7 +28,7 @@ G_BEGIN_DECLS /** - * SECTION:EekThemeContext + * SECTION:eek-theme-context * @short_description: holds global information about a tree of styled objects * * #EekThemeContext is responsible for managing information global to diff --git a/eek/eek-theme-node.h b/eek/eek-theme-node.h index b2bcd8b0..8662ccfd 100644 --- a/eek/eek-theme-node.h +++ b/eek/eek-theme-node.h @@ -26,12 +26,12 @@ G_BEGIN_DECLS /** - * SECTION:EekThemeNode + * SECTION:eek-theme-node * @short_description: style information for one node in a tree of * themed objects * - * A #EekThemeNode represents the CSS style information (the set of - * CSS properties) for one node in a tree of themed objects. In + * The #EekThemeNode class represents the CSS style information (the + * set of CSS properties) for one node in a tree of themed objects. In * typical usage, it represents the style information for a single * #EekElement. A #EekThemeNode is immutable: attributes such as the * CSS classes for the node are passed in at construction. If the diff --git a/eek/eek-types.h b/eek/eek-types.h index be678dc8..0ef1f33f 100644 --- a/eek/eek-types.h +++ b/eek/eek-types.h @@ -26,7 +26,6 @@ G_BEGIN_DECLS #define I_(string) g_intern_static_string (string) -#define EEK_TYPE_SYMBOL_MATRIX (eek_symbol_matrix_get_type ()) #define EEK_TYPE_POINT (eek_point_get_type ()) #define EEK_TYPE_BOUNDS (eek_bounds_get_type ()) #define EEK_TYPE_OUTLINE (eek_outline_get_type ()) @@ -141,7 +140,6 @@ typedef struct _EekThemeContext EekThemeContext; typedef struct _EekThemeNode EekThemeNode; typedef struct _EekSymbolMatrix EekSymbolMatrix; -typedef struct _EekPoint EekPoint; typedef struct _EekBounds EekBounds; typedef struct _EekOutline EekOutline; typedef struct _EekColor EekColor; @@ -153,6 +151,7 @@ typedef struct _EekColor EekColor; * * 2D vertex */ +typedef struct _EekPoint EekPoint; struct _EekPoint { gdouble x; @@ -176,7 +175,6 @@ void eek_point_rotate (EekPoint *point, */ struct _EekBounds { - /*< public >*/ gdouble x; gdouble y; gdouble width;