X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fevents%2Fkey-event.h;h=336e737280ccfc0d9237a21d071071e575bb8ef4;hb=646f736e77b085c86e982c0d1d4b895c2a431330;hp=f0d5681a4e8c1024042bc587d7434070b465f674;hpb=1fd51ce4009daf5b63b2127fc6f5c6d8c34c932e;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/events/key-event.h b/dali/public-api/events/key-event.h
old mode 100644
new mode 100755
index f0d5681..336e737
--- a/dali/public-api/events/key-event.h
+++ b/dali/public-api/events/key-event.h
@@ -2,7 +2,7 @@
 #define __DALI_KEY_EVENT_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <string>
+#include <cstdint> // int32_t
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/events/device.h>
 
 namespace Dali
 {
@@ -46,7 +48,7 @@ namespace Dali
  * module.
  * @SINCE_1_0.0
  */
-struct DALI_IMPORT_API KeyEvent
+struct DALI_CORE_API KeyEvent
 {
   // Enumerations
 
@@ -78,7 +80,7 @@ struct DALI_IMPORT_API KeyEvent
    * @param[in] timeStamp The time (in ms) that the key event occurred
    * @param[in] keyState The state of the key event
    */
-  KeyEvent(const std::string& keyName, const std::string& keyString, int keyCode, int keyModifier, unsigned long timeStamp, const State& keyState);
+  KeyEvent(const std::string& keyName, const std::string& keyString, int32_t keyCode, int32_t keyModifier, unsigned long timeStamp, const State& keyState);
 
   /**
    * @brief Copy constructor.
@@ -125,6 +127,40 @@ struct DALI_IMPORT_API KeyEvent
    */
   bool IsAltModifier() const;
 
+  /**
+   * @brief Get the key compose string.
+   *
+   * @SINCE_1_3.22
+   * @return The compose string
+   */
+  std::string GetCompose() const;
+
+  /**
+   * @brief Get the device name the key event originated from.
+   *
+   * @SINCE_1_2.60
+   * @return The device name
+   */
+  std::string GetDeviceName() const;
+
+  /**
+   * @brief Get the device class the key event originated from.
+   *
+   * The device class type is classification type of the input device of event received
+   * @SINCE_1_2.60
+   * @return The type of the device class
+   */
+  Device::Class::Type GetDeviceClass() const;
+
+  /**
+   * @brief Get the device subclass the key event originated from.
+   *
+   * The device subclass type is subclassification type of the input device of event received.
+   * @SINCE_1_2.60
+   * @return The type of the device subclass
+   */
+  Device::Subclass::Type GetDeviceSubclass() const;
+
   // Data
 
   /**
@@ -145,12 +181,12 @@ struct DALI_IMPORT_API KeyEvent
    * platform-specific key code. You need to use IsKey() to know what a key event means
    * instead of direct comparison of key code value.
    */
-  int  keyCode;
+  int32_t keyCode;
 
   /**
    * @brief special keys like shift, alt and control which modify the next key pressed.
    */
-  int  keyModifier;
+  int32_t keyModifier;
 
   /**
    * @brief The time (in ms) that the key event occurred.