Added keyboard effect

Change-Id: Ic439ca113298eef35047a656c6d7f88ca9578fec
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>

diff --git a/data/effect.edc b/data/effect.edc
index 9640e49..81ed67b 100644 (file)
--- a/data/effect.edc
+++ b/data/effect.edc
@@ -12,5 +12,10 @@ collections {
    /* group "e/comp/effects/fade"                         */
    /*-----------------------------------------------------*/
    #include "group/fade.edc"
+
+   /*-----------------------------------------------------*/
+   /* group "e/comp/effects/keyboard"                     */
+   /*-----------------------------------------------------*/
+   #include "group/keyboard.edc"
 }
 

diff --git a/data/group/keyboard.edc b/data/group/keyboard.edc
new file mode 100644 (file)
index 0000000..1442cf6
--- /dev/null
+++ b/data/group/keyboard.edc
@@ -0,0 +1,174 @@
+group { name: "e/comp/effects/keyboard";
+     script {
+          public message(Msg_Type:type, id, ...) {
+             if ((type == MSG_INT_SET) && (id == 0)) {
+                  /*set state */
+                  new st;
+                  st = getarg(2);
+                  if (st == 0)
+                    {
+                       set_state(PART:"clipper", "default", 0.0);
+                       set_state(PART:"shower", "default", 0.0);
+                    }
+                  else if (st == 1)
+                    {
+                       set_state(PART:"clipper", "visible", 0.0);
+                       set_state(PART:"shower", "visible", 0.0);
+                    }
+                  else if (st == 2)
+                    {
+                       set_state(PART:"clipper", "restack_hidden", 0.0);
+                       set_state(PART:"shower", "restack_hidden", 0.0);
+                    }
+                  else if (st == 3)
+                    {
+                       set_state(PART:"clipper", "restack_visible", 0.0);
+                       set_state(PART:"shower", "restack_visible", 0.0);
+                    }
+                  else if (st == 4)
+                    {
+                       set_state(PART:"clipper", "restack_done", 0.0);
+                       set_state(PART:"shower", "restack_done", 0.0);
+                    }
+             } else if ((type == MSG_INT_SET) && (id == 1))
+               {
+               }
+          }
+     }
+   parts {
+        part { name: "clipper";
+        type: RECT;
+        mouse_events: 0;
+        description { state: "default" 0.0;
+           color: 255 255 255 255;
+           rel1.relative: -1.0  -1.0;
+           rel1.offset:  -9999 -9999;
+           rel2.relative:  2.0   2.0;
+           rel2.offset:   9999  9999;
+           visible: 1;
+        }
+        description { state: "visible" 0.0;
+           inherit: "default" 0.0;
+           color: 255 255 255 255;
+        }
+        description { state: "hide" 0.0;
+           inherit: "default" 0.0;
+        }
+        description { state: "restack_visible" 0.0;
+           inherit: "visible" 0.0;
+        }
+        description { state: "restack_hidden" 0.0;
+           inherit: "default" 0.0;
+        }
+        description { state: "restack_done" 0.0;
+           inherit: "visible" 0.0;
+        }
+        }
+        part { name: "shower";
+        type: SPACER;
+        mouse_events: 0;
+        description { state: "default" 0.0;
+           rel1.relative: 0 1;
+           rel2.relative: 1 2;
+        }
+        description { state: "visible" 0.0;
+           inherit: "default" 0.0;
+           rel1.relative: 0 0;
+           rel1.offset:   0 0;
+           rel2.relative: 1 1;
+        }
+        description { state: "hide" 0.0;
+           inherit: "default" 0.0;
+        }
+        description { state: "restack_visible" 0.0;
+           inherit: "visible" 0.0;
+        }
+        description { state: "restack_hidden" 0.0;
+           inherit: "default" 0.0;
+        }
+        description { state: "restack_done" 0.0;
+           inherit: "visible" 0.0;
+        }
+     }
+      part { name: "e.swallow.content"; type: SWALLOW;
+        type: SWALLOW;
+        clip_to: "clipper";
+        mouse_events: 0;
+        description { state: "default" 0.0;
+           rel1.to: "shower";
+           rel2.to: "shower";
+        }
+        description { state: "visible" 0.0;
+           rel1.to: "shower";
+           rel2.to: "shower";
+        }
+        description { state: "hide" 0.0;
+           rel1.to: "shower";
+           rel2.to: "shower";
+        }
+      }
+   }
+    programs {
+     program { name: "show1";
+        signal: "e,action,go";
+        source: "e";
+        filter: "shower" "default";
+        action: STATE_SET "visible" 0.0;
+        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        target: "shower";
+        target: "clipper";
+        target: "e.swallow.content";
+        after: "done";
+     }
+     program { name: "hide1";
+        signal: "e,action,go";
+        source: "e";
+        filter: "shower" "visible";
+        action: STATE_SET "hide" 0.0;
+        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        target: "shower";
+        target: "clipper";
+        after: "hide2";
+     }
+     program { name: "hide2";
+        action: STATE_SET "default" 0.0;
+        target: "shower";
+        target: "clipper";
+        after: "done";
+     }
+     program { name: "restack,hide";
+        signal: "e,action,go";
+        source: "e";
+        filter: "shower" "restack_visible";
+        action: STATE_SET "hide" 0.0;
+        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        target: "shower";
+        target: "clipper";
+        after: "done";
+     }
+     program { name: "restack,show";
+        signal: "e,action,go";
+        source: "e";
+        filter: "shower" "restack_hidden";
+        action: STATE_SET "visible" 0.0;
+        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        target: "shower";
+        target: "clipper";
+        target: "e.swallow.content";
+        after: "done";
+     }
+     program { name: "restack,finish";
+        signal: "e,action,go";
+        source: "e";
+        filter: "shower" "restack_done";
+        action: STATE_SET "visible" 0.0;
+        target: "shower";
+        target: "clipper";
+        target: "e.swallow.content";
+        after: "done";
+     }
+     program { name: "done";
+        action: SIGNAL_EMIT "e,action,done" "e";
+     }
+    }
+}

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index fa2190e..483bb7b 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -13,12 +13,19 @@ _e_mod_effect_object_setup(E_Client *ec)
    E_Comp_Config *config;
    config = e_comp_config_get();
 
-   if ((config) && (config->effect_style))
+   if (ec->vkbd.vkbd)
      {
-        e_comp_object_effect_set(ec->frame , config->effect_style);
+        e_comp_object_effect_set(ec->frame, "keyboard");
      }
    else
-     e_comp_object_effect_set(ec->frame, "no-effect");
+     {
+        if ((config) && (config->effect_style))
+          {
+             e_comp_object_effect_set(ec->frame , config->effect_style);
+          }
+        else
+          e_comp_object_effect_set(ec->frame, "no-effect");
+     }
 }
 
 static void