edje: support action seats on edje_edit

diff --git a/src/examples/edje/edje-multiseat.c b/src/examples/edje/edje-multiseat.c
index 6207244..3387fb1 100644 (file)
--- a/src/examples/edje/edje-multiseat.c
+++ b/src/examples/edje/edje-multiseat.c
@@ -25,12 +25,16 @@
 #include <Ecore_Evas.h>
 #include <Edje.h>
 
+#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
+#include <Edje_Edit.h>
+
 #define WIDTH  400
 #define HEIGHT 400
 
 static const char *GROUPNAME = "example/main";
 static const char *PARTNAME_KNOB1 = "example/knob1";
 static const char *PARTNAME_KNOB2 = "example/knob2";
+static const char *EDJE_FILE = PACKAGE_DATA_DIR"/multiseat.edj";
 
 static void
 _on_destroy(Ecore_Evas *ee EINA_UNUSED)
@@ -100,14 +104,31 @@ _on_rect_focus_out(void *data, const Efl_Event *event)
 }
 
 static void
-_on_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o, void *event_info)
+_on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *event_info)
 {
    Evas_Event_Key_Down *ev = event_info;
+   const Evas_Modifier *mods;
    Efl_Input_Device *seat;
+   Evas *evas = data;
 
    seat = efl_input_device_seat_get(ev->dev);
    printf("Seat %s (%s) pressed key %s\n", efl_input_device_name_get(seat),
-           edje_obj_seat_name_get(o, seat), ev->key);
+          edje_obj_seat_name_get(o, seat), ev->key);
+
+   mods = evas_key_modifier_get(evas);
+   if (!strcmp(ev->key, "p") &&
+       evas_seat_key_modifier_is_set(mods, "Control", seat))
+     {
+        Evas_Object *edje_edit_obj;
+
+        edje_edit_obj = edje_edit_object_add(evas);
+        if (!edje_object_file_set(edje_edit_obj, EDJE_FILE, GROUPNAME))
+          printf("failed to set file %s.\n", EDJE_FILE);
+
+        printf("EDC source code:\n%s\n",
+               edje_edit_source_generate(edje_edit_obj));
+        evas_object_del(edje_edit_obj);
+     }
 }
 
 static void
@@ -171,7 +192,6 @@ _device_added(void *data, const Efl_Event *event)
 int
 main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 {
-   const char *edje_file = PACKAGE_DATA_DIR"/multiseat.edj";
    const Eina_List *devices, *l;
    Evas_Object *edje_obj, *bg, *rect;
    Efl_Input_Device *dev;
@@ -201,8 +221,8 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 
    edje_obj = edje_object_add(evas);
 
-   if (!edje_object_file_set(edje_obj, edje_file, GROUPNAME))
-     printf("failed to set file %s.\n", edje_file);
+   if (!edje_object_file_set(edje_obj, EDJE_FILE, GROUPNAME))
+     printf("failed to set file %s.\n", EDJE_FILE);
 
    evas_object_move(edje_obj, 0, 0);
    evas_object_resize(edje_obj, WIDTH, HEIGHT);
@@ -238,7 +258,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
                           _device_added, edje_obj);
    evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN,
-                                  _on_key_down, NULL);
+                                  _on_key_down, evas);
    edje_object_signal_callback_add(edje_obj, "seat,*", "",
                                    _edje_seat_cb, NULL);
    edje_object_signal_callback_add(edje_obj, "load", "",
@@ -246,6 +266,8 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 
    printf("Running example on evas engine %s\n",
           ecore_evas_engine_name_get(ee));
+   printf("Press 'Ctrl + p' to print EDC source code\n");
+
    ecore_evas_show(ee);
 
    ecore_main_loop_begin();

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index eab121f..3178920 100644 (file)
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -13187,13 +13187,25 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
 
       case EDJE_ACTION_TYPE_FOCUS_SET:
       {
-         BUF_APPEND(I4 "action: FOCUS_SET;\n");
+         if (epr->seat)
+           {
+              BUF_APPEND(I4 "action: FOCUS_SET ");
+              BUF_APPENDF("\"%s\";\n", epr->seat);
+           }
+         else
+           BUF_APPEND(I4 "action: FOCUS_SET;\n");
          break;
       }
 
       case EDJE_ACTION_TYPE_FOCUS_OBJECT:
       {
-         BUF_APPEND(I4 "action: FOCUS_OBJECT;\n");
+         if (epr->seat)
+           {
+              BUF_APPEND(I4 "action: FOCUS_OBJECT ");
+              BUF_APPENDF("\"%s\";\n", epr->seat);
+           }
+         else
+           BUF_APPEND(I4 "action: FOCUS_OBJECT;\n");
          break;
       }