Added E_VIRTUAL_KEYBOARD_TYPE type and value to E_Client 19/33419/1
authorMun, Gwan-gyeong <kk.moon@samsung.com>
Fri, 9 Jan 2015 07:49:31 +0000 (16:49 +0900)
committerMun, Gwan-gyeong <kk.moon@samsung.com>
Fri, 9 Jan 2015 07:50:16 +0000 (16:50 +0900)
Change-Id: I7a2b9378f528dab636acfb5b773e9a243ed11a4b

configure.ac
src/bin/e_client.h

index 295f7513ffaea1197e93a1e39357e8811691a9cd..059b049fe3038b383f1f25d7919c1ff8b26acdce 100644 (file)
@@ -603,8 +603,8 @@ PKG_CHECK_MODULES(E_OPEN, [
 ])
 
 e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs"
-e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_"
-e_configflags="-DUSE_E_CONFIG_H -D_F_ZONE_WINDOW_ROTATION_"
+e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_"
+e_configflags="-DUSE_E_CONFIG_H -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_"
 
 AC_SUBST([e_libs])
 AC_SUBST([e_cflags])
index f18fccc23be98058dabe9b1cc200e5694ec6312f..63b68bb70c9ddd58758a0a143d1121e3a9090f55 100644 (file)
@@ -131,6 +131,17 @@ typedef enum E_Client_Property
    E_CLIENT_PROPERTY_STICKY = (1 << 7),
 } E_Client_Property;
 
+#ifdef _F_E_VIRTUAL_KEYBOARD_TYPE_
+typedef enum _E_Virtual_Keyboard_Window_Type
+{
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_NONE = 0,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_KEYPAD = 1,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_PREDICTION = 2,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_MAGNIFIER = 3,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_POPUP = 4,
+} E_Virtual_Keyboard_Window_Type;
+#endif
+
 #ifdef _F_ZONE_WINDOW_ROTATION_
 typedef enum _E_Client_Rotation_Type
 {
@@ -599,6 +610,9 @@ struct E_Client
 #endif
       unsigned char                  have_property : 1;
       unsigned char                  vkbd : 1;
+#ifdef _F_E_VIRTUAL_KEYBOARD_TYPE_
+      E_Virtual_Keyboard_Window_Type win_type;
+#endif
    } vkbd;
 
    struct