support skin hard key and modify dbi.xsd

diff --git a/tizen/distrib/temp/dev/dbi-sample.xml b/tizen/distrib/temp/dev/dbi-sample.xml
index 9629cba5333f028c32d7669d8cbce6a1ccc5c147..517710244a3f8c3ae524b541dbd014828a944ddd 100644 (file)
--- a/tizen/distrib/temp/dev/dbi-sample.xml
+++ b/tizen/distrib/temp/dev/dbi-sample.xml
@@ -1,52 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<emulatorUI xmlns="http://www.tizen.org/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
-  <modeSections>
-    <modeSection id="0" name="Portrait">
-      <lcd id="0">
-          <region height="800" left="26" top="70" width="480"/>
-      </lcd>
-      <imageList>
-        <mainImage>default.png</mainImage>
-        <keyPressedImage>default.png</keyPressedImage>
-      </imageList>
-      <keyMapList>
-        <keyMap>
-        <region height="0" left="0" top="0" width="0"/>
-          <eventInfo status="KEY_PRESSED">
-            <eventID>eventID</eventID>
-            <eventValue>
-              <keyCode>0</keyCode>
-              <keyName>keyName</keyName>
-            </eventValue>
-          </eventInfo>
-          <tooltip>tooltip</tooltip>
-        </keyMap>
-      </keyMapList>
-    </modeSection>
-    <modeSection id="1" name="Landscape">
-      <lcd id="0">
-        <region height="480" left="70" top="30" width="800"/>
-      </lcd>
-      <imageList>
-        <mainImage>default_w90.png</mainImage>
-        <keyPressedImage>half_w90.png</keyPressedImage>
-      </imageList>
-      <keyMapList>
-        <keyMap>
-          <region height="0" left="0" top="0" width="0"/>
-          <eventInfo status="KEY_PRESSED">
-            <eventID>eventID</eventID>
-            <eventValue>
-              <keyCode>0</keyCode>
-              <keyName>keyName</keyName>
-            </eventValue>
-          </eventInfo>
-          <tooltip>tooltip</tooltip>
-        </keyMap>
-      </keyMapList>
-    </modeSection>
-  </modeSections>
-  <colors>
-    <hoverColor B="0" G="0" R="0"/>
-  </colors>
-</emulatorUI>
+<EmulatorUI xmlns="http://www.tizen.org/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.tizen.org/dbi dbi.xsd ">
+    <rotations>
+        <rotation id="0" name="Portrait">
+            <lcd id="0">
+                <region height="800" left="35" top="86" width="480" />
+            </lcd>
+            <imageList>
+                <mainImage>default.png</mainImage>
+                <keyPressedImage>default.png</keyPressedImage>
+            </imageList>
+            <keyMapList>
+                <keyMap>
+                    <region height="74" left="238" top="887" width="74"/>
+                    <eventInfo>
+                        <keyCode>101</keyCode>
+                        <keyName>HOME</keyName>
+                    </eventInfo>
+                    <tooltip>Home</tooltip>
+                </keyMap>
+                <keyMap>
+                    <region height="74" left="541" top="819" width="20"/>
+                    <eventInfo>
+                        <keyCode>103</keyCode>
+                        <keyName>POWER</keyName>
+                    </eventInfo>
+                    <tooltip>Power</tooltip>
+                </keyMap>
+            </keyMapList>
+        </rotation>
+        <rotation id="1" name="Landscape">
+            <lcd id="0">
+                <region height="480" left="86" top="46" width="800"/>
+            </lcd>
+            <imageList>
+                <mainImage>default_w90.png</mainImage>
+                <keyPressedImage>default_w90.png</keyPressedImage>
+            </imageList>
+            <keyMapList>
+                <keyMap>
+                    <region height="74" left="887" top="249" width="74"/>
+                    <eventInfo>
+                        <keyCode>101</keyCode>
+                        <keyName>HOME</keyName>
+                    </eventInfo>
+                    <tooltip>Home</tooltip>
+                </keyMap>
+                <keyMap>
+                    <region height="20" left="818" top="2" width="74"/>
+                    <eventInfo>
+                        <keyCode>103</keyCode>
+                        <keyName>POWER</keyName>
+                    </eventInfo>
+                    <tooltip>Power</tooltip>
+                </keyMap>
+            </keyMapList>
+        </rotation>
+    </rotations>
+    <colors>
+        <hoverColor B="255" G="255" R="255" />
+    </colors>
+</EmulatorUI>

diff --git a/tizen/distrib/temp/image/default.png b/tizen/distrib/temp/image/default.png
index efdf3e293b5ccfadebbd64971a9c1b7abcb24565..6d33f38e8f92d74ca92cd583faddcbfdc291c4cd 100644 (file)
Binary files a/tizen/distrib/temp/image/default.png and b/tizen/distrib/temp/image/default.png differ

diff --git a/tizen/distrib/temp/image/default_w90.png b/tizen/distrib/temp/image/default_w90.png
index 1b5d31d35c4bb42e30e4dd29b2dbfcfa3a3e3fa9..76d008f51e84c43ed93e6206268cb53fb7f4072f 100644 (file)
Binary files a/tizen/distrib/temp/image/default_w90.png and b/tizen/distrib/temp/image/default_w90.png differ

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index cdb2824db8422364725150b0c0755beb929a0e91..9e28e6b1c568016a5ad91a0a3bfee3f3a1ff385f 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -34,9 +34,14 @@
 #include "debug_ch.h"
 #include "../hw/maru_pm.h"
 #include "maruskin_keymap.h"
+#include "console.h"
 
 MULTI_DEBUG_CHANNEL(qemu, skin_operation);
 
+enum {
+    HARD_KEY_HOME = 101,
+    HARD_KEY_POWER = 103,
+};
 
 enum {
     DIRECTION_PORTRAIT = 1,
@@ -96,35 +101,31 @@ void do_key_event( int event_type, int keycode ) {
 void do_hardkey_event( int event_type, int keycode ) {
     INFO( "do_hardkey_event event_type:%d, keycode:%d\n", event_type, keycode );
 
-    //TODO convert keycode ?
-
-//FIXME uncomment
-//    // press
-//    if ( KEY_PRESSED ) {
-//
-//        if ( kbd_mouse_is_absolute() ) {
-//
-//            // home key or power key is used for resume.
-//            if ( ( 101 == keycode ) || ( 103 == keycode ) ) {
-//                if ( is_suspended_state() ) {
-//                    INFO( "user requests system resume.\n" );
-//                    resume();
-//                    usleep( 500 * 1000 );
-//                }
-//            }
-//
-//            ps2kbd_put_keycode( keycode & 0x7f );
-//
-//        }
-//
-//    } else if ( KEY_RELEASED ) {
-//
-//        if ( kbd_mouse_is_absolute() ) {
-//            TRACE( "release parsing keycode = %d, result = %d\n", keycode, keycode | 0x80 );
-//            ps2kbd_put_keycode( keycode | 0x80 );
-//        }
-//
-//    }
+    // press
+    if ( KEY_PRESSED == event_type ) {
+
+        if ( kbd_mouse_is_absolute() ) {
+
+            // home key or power key is used for resume.
+            if ( ( HARD_KEY_HOME == keycode ) || ( HARD_KEY_POWER == keycode ) ) {
+                if ( is_suspended_state() ) {
+                    INFO( "user requests system resume.\n" );
+                    resume();
+                    usleep( 500 * 1000 );
+                }
+            }
+
+            ps2kbd_put_keycode( keycode & 0x7f );
+
+        }
+
+    } else if ( KEY_RELEASED == event_type ) {
+
+        if ( kbd_mouse_is_absolute() ) {
+            ps2kbd_put_keycode( keycode | 0x80 );
+        }
+
+    }
 
 }