elementary: fix string definition

eolian is note made to have ptr(char) be the same as string.

Differential Revision: https://phab.enlightenment.org/D11740

src/lib/efl_canvas_wl/meson.build

@@ -16,7 +16,7 @@ foreach eo_file : pub_eo_files
     input : eo_file,
     output : [eo_file + '.h'],
     depfile : eo_file + '.d',
-    install : true,
+    install : false,
     install_dir : dir_package_include,
     command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
                            '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
@@ -53,8 +53,8 @@ install_headers(efl_canvas_wl_header_src,
 )
 
 eolian_efl_canvas_wl_dir = join_paths(eolian_include_dir, package_version_name)
-if get_option('install-eo-files')
-  install_data(pub_eo_files,
-    install_dir: eolian_efl_canvas_wl_dir
-  )
-endif
+#if get_option('install-eo-files')
+#  install_data(pub_eo_files,
+#    install_dir: eolian_efl_canvas_wl_dir
+#  )
+#endif

src/lib/eina/eina_xattr.h

@@ -36,9 +36,13 @@
  * @since 1.1
  */
 typedef enum {
-  EINA_XATTR_INSERT, /**< This is the default behavior, it will either create or replace the extended attribute */
-  EINA_XATTR_REPLACE, /**< This will only succeed if the extended attribute previously existed */
-  EINA_XATTR_CREATED /**< This will only succeed if the extended attribute wasn't previously set */
+  EINA_XATTR_INSERT = 0, /**< This is the default behavior, it will either create or replace the extended attribute */
+  EINA_XATTR_REPLACE = 1, /**< This will only succeed if the extended attribute previously existed */
+  EINA_XATTR_CREATED = 2, /**< This will only succeed if the extended attribute wasn't previously set */
+  EINA_XATTR_FLAGS_INSERT = 0, /**< This is the default behavior, it will either create or replace the extended attribute */
+  EINA_XATTR_FLAGS_REPLACE = 1, /**< This will only succeed if the extended attribute previously existed */
+  EINA_XATTR_FLAGS_CREATED = 2 /**< This will only succeed if the extended attribute wasn't previously set */
+
 } Eina_Xattr_Flags;
 
 typedef struct _Eina_Xattr Eina_Xattr;

src/lib/elementary/efl_access_text.c

@@ -18,7 +18,7 @@ EAPI elm_atspi_text_text_attribute_free(Efl_Access_Text_Attribute *attr)
 EAPI void
 elm_atspi_text_text_range_free(Efl_Access_Text_Range *range)
 {
-   free(range->content);
+   free((char*)range->content);
    free(range);
 }
 

src/lib/elementary/efl_access_text.eo

@@ -31,7 +31,7 @@ struct @beta @free(elm_atspi_text_text_range_free) Efl.Access.Text_Range
    [[Text range]]
    start_offset: int; [[Range start offset]]
    end_offset : int; [[Range end offset]]
-   content: ptr(char); [[Range content]]
+   content: string; [[Range content]]
 }
 
 struct @beta Efl.Access.Text_Change_Info

src/lib/elementary/elm_general.eot

@@ -3,158 +3,3 @@
  */
 
 /* Legacy-only function pointer types, for the legacy EO classes (genlist, etc...) */
-type @beta Evas_Smart_Cb: __undefined_type; [[Evas smart callback type]]
-
-/* FIXME: Move to Efl.Ui namespace after Efl.Ui.List gets merged! */
-enum @beta @extern Elm.Object.Select_Mode
-{
-   [[Possible values for the #ELM_OBJECT_SELECT_MODE policy.
-
-     @since 1.7
-   ]]
-   default = 0, [[default select mode. Once an item is selected, it would stay
-                  highlighted and not going to call selected callback again
-                  even it was clicked. Items can get focus.]]
-   always, [[always select mode. Item selected callbacks will be called every
-             time for click events, even after the item was already selected.
-             Items can get focus.]]
-   none, [[no select mode. Items will never be highlighted and selected but
-           the size will be adjusted by the finger size configuration. Items
-           can't get focus.]]
-   display_only, [[no select mode with no finger size rule. Items will never
-                   be highlighted and selected and ignore the finger size. So
-                   the item size can be reduced below than the finger size
-                   configuration. Items can't get focus.]]
-   max [[canary value: any value greater or equal to ELM_OBJECT_SELECT_MODE_MAX
-         is forbidden.]]
-}
-
-enum @beta @extern Elm.Icon.Type
-{
-   [[Elementary icon types]]
-   legacy: elm_icon;
-   none, [[Icon has no type set]]
-   file, [[Icon is of type file]]
-   standard [[Icon is of type standard]]
-}
-
-/* FIXME: shouldn't exist, they are unusable by the bindings */
-struct @beta @extern Elm.Entry_Anchor_Info; [[The info sent in the callback for the "anchor,clicked" signals emitted
-                                              by entries.]]
-struct @beta @extern Elm.Entry_Anchor_Hover_Info; [[The info sent in the callback for "anchor,hover" signals emitted
-                                                    by the Anchor_Hover widget]]
-
-enum @beta @extern Elm.Input.Panel.Layout
-{
-   [[Input panel (virtual keyboard) layout types.
-     Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired.
-   ]]
-   normal,      [[Default layout.]]
-   number,      [[Number layout.]]
-   email,       [[Email layout.]]
-   url,         [[URL layout.]]
-   phonenumber, [[Phone Number layout.]]
-   ip,          [[IP layout.]]
-   month,       [[Month layout.]]
-   numberonly,  [[Number Only layout.]]
-   invalid,     [[Never use this.]]
-   hex,         [[Hexadecimal layout.]]
-   terminal,    [[Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization).]]
-   password,    [[Like normal, but no auto-correct, no auto-capitalization etc.]]
-   datetime,    [[Date and time layout
-
-                  @since 1.8]]
-   emoticon,    [[Emoticon layout
-
-                  @since 1.10]]
-   voice        [[Voice layout, but if the IME does not support voice layout, then normal layout will be shown.
-
-                  @since 1.19]]
-}
-
-enum @beta @extern Elm.Input.Panel.Lang
-{
-   [[Input panel (virtual keyboard) language modes.
-   ]]
-   automatic,    [[Automatic]]
-   alphabet      [[Alphabet]]
-}
-
-enum @beta @extern Elm.Autocapital.Type
-{
-   [[Autocapitalization Types.
-     Choose method of auto-capitalization.
-   ]]
-   none,         [[No auto-capitalization when typing.]]
-   word,         [[Autocapitalize each word typed.]]
-   sentence,     [[Autocapitalize the start of each sentence.]]
-   allcharacter  [[Autocapitalize all letters.]]
-}
-
-enum @beta @extern Elm.Input.Panel.Return_Key.Type
-{
-   [["Return" Key types on the input panel (virtual keyboard).
-   ]]
-   default, [[Default.]]
-   done,    [[Done.]]
-   go,      [[Go.]]
-   join,    [[Join.]]
-   login,   [[Login.]]
-   next,    [[Next.]]
-   search,  [[Search string or magnifier icon.]]
-   send,    [[Send.]]
-   signin   [[Sign-in
-
-              @since 1.8]]
-}
-
-enum @beta @extern Elm.Input.Hints
-{
-   [[Enumeration that defines the types of Input Hints.
-
-     @since 1.12
-   ]]
-   legacy: elm_input_hint;
-   none                = 0,        [[No active hints
-
-                                     @since 1.12]]
-   auto_complete       = 1 << 0,   [[Suggest word auto completion
-
-                                     @since 1.12]]
-   sensitive_data      = 1 << 1,   [[Typed text should not be stored.
-
-                                     @since 1.12]]
-   autofill_credit_card_expiration_date   = 0x100, [[ Autofill hint for a credit card expiration date
-
-                                                      @since 1.21]]
-   autofill_credit_card_expiration_day    = 0x200, [[Autofill hint for a credit card expiration day
-
-                                                     @since 1.21]]
-   autofill_credit_card_expiration_month  = 0x300, [[ Autofill hint for a credit card expiration month
-
-                                                      @since 1.21]]
-   autofill_credit_card_expiration_year   = 0x400, [[ Autofill hint for a credit card expiration year
-
-                                                      @since 1.21]]
-   autofill_credit_card_number            = 0x500, [[ Autofill hint for a credit card number
-
-                                                      @since 1.21]]
-   autofill_email_address                 = 0x600, [[ Autofill hint for an email address
-
-                                                      @since 1.21]]
-   autofill_name                          = 0x700, [[ Autofill hint for a user's real name
-
-                                                      @since 1.21]]
-   autofill_phone                         = 0x800, [[ Autofill hint for a phone number
-
-                                                      @since 1.21]]
-   autofill_postal_address                = 0x900, [[ Autofill hint for a postal address
-
-                                                      @since 1.21]]
-   autofill_postal_code                   = 0xA00, [[ Autofill hint for a postal code
-
-                                                      @since 1.21]]
-   autofill_id                            = 0xB00  [[ Autofill hint for a user's ID
-
-                                                      @since 1.21]]
-}

src/lib/elementary/meson.build

@@ -17,6 +17,9 @@ pub_legacy_eo_files = [
   'elm_actionslider_part.eo',
   'elm_bubble_part.eo',
   'elm_fileselector_part.eo',
+  'elm_multibuttonentry_part.eo',
+  'elm_interface_scrollable.eo',
+  'elm_code_widget.eo',
 ]
 
 pub_eo_file_target = []
@@ -139,7 +142,6 @@ pub_eo_files = [
   'efl_access_window.eo',
   'efl_ui_theme.eo',
   'efl_config_global.eo',
-  'elm_code_widget.eo',
   'efl_ui_selection.eo',
   'efl_ui_dnd.eo',
   'efl_ui_focus_manager_window_root.eo',
@@ -159,8 +161,6 @@ pub_eo_files = [
   'efl_ui_radio_legacy_part.eo',
   'efl_ui_check_legacy_part.eo',
   'efl_ui_progressbar_legacy_part.eo',
-  'elm_multibuttonentry_part.eo',
-  'elm_interface_scrollable.eo',
   'efl_ui_image_zoomable_pan.eo',
   'efl_ui_textbox_part.eo',
   'efl_ui_caching_factory.eo',

src/lib/eo/meson.build

@@ -23,10 +23,25 @@ pub_eo_types_files = [
   'eina_types.eot'
 ]
 
-eo_header = ['Eo.h']
-
 pub_eo_file_target = []
 priv_eo_file_target = []
+
+foreach eo_file : pub_eo_types_files
+  pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
+    input : eo_file,
+    output : [eo_file + '.h'],
+    depfile : eo_file + '.d',
+    install : true,
+    install_dir : dir_package_include,
+    command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
+                           '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
+                           '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
+                           '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+                           '-gchd', '@INPUT@'])
+endforeach
+
+eo_header = ['Eo.h']
+
 foreach eo_file : pub_eo_files
   pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
     input : eo_file,

src/lib/evas/canvas/efl_canvas_animation_types.eot

@@ -1,8 +1,3 @@
-// ----------------------------------------------------------------------------
-// All the below types are for Efl Animation
-
-struct @beta Efl.Canvas.Animation_Player_Event_Running; [[Information of event running]]
-
 enum Efl.Canvas.Animation_Repeat_Mode
 {
    [[Animation repeat mode. @since 1.24]]

src/lib/evas/canvas/efl_canvas_object.eo

@@ -1,6 +1,5 @@
 import efl_text_types;
 
-struct @beta Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
 struct Efl.Event_Animator_Tick {
    [[EFL event animator tick data structure