Modified to use libscl-common

Change-Id: I1be647a925613b4af0602041e641d72ff6497a36

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 912f852..5da1945 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ SET(PKGS_CHECK_MODULES
         libxml-2.0
         tts
         vconf
+        libscl-common
         )
 
 IF (with_wayland)
@@ -128,13 +129,10 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
 
-INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/scl.h" DESTINATION include/libscl-ui)
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/sclui.h" DESTINATION include/libscl-ui)
-INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/scltypes.h" DESTINATION include/libscl-ui)
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/sclconfig.h" DESTINATION include/libscl-ui)
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/sclstructs.h" DESTINATION include/libscl-ui)
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/scl/include/scleventcallback.h" DESTINATION include/libscl-ui)
-INSTALL(FILES "${CMAKE_SOURCE_DIR}/res/simple_debug.h" DESTINATION include/libscl-ui)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)

diff --git a/libscl-ui.pc.in b/libscl-ui.pc.in
index 63d3888..8568c69 100644 (file)
--- a/libscl-ui.pc.in
+++ b/libscl-ui.pc.in
@@ -8,6 +8,7 @@ includedir=${prefix}/include
 Name: libscl-ui
 Description: SCL UI - A library for developing XML-based software keyboards
 Version: 1.0
+Requires: libscl-common
 Libs: -L${libdir} -lscl-ui
 Cflags: -I${includedir}/libscl-ui
 

diff --git a/packaging/libscl-ui.spec b/packaging/libscl-ui.spec
index d57b03e..017b642 100644 (file)
--- a/packaging/libscl-ui.spec
+++ b/packaging/libscl-ui.spec
@@ -6,7 +6,7 @@
 
 Name:       libscl-ui
 Summary:    A library for developing XML-based software keyboards
-Version:    0.4.7
+Version:    0.5.0
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(tts)
+BuildRequires:  pkgconfig(libscl-common)
 
 
 %description

diff --git a/scl/include/scl.h b/scl/include/scl.h
deleted file mode 100644 (file)
index dce9cd9..0000000
--- a/scl/include/scl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2012 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef __SCL_H__
-#define __SCL_H__
-
-/**
- * @file scl.h
- * @brief   Main header file for SCL library, which helps developing S/W keyboards.
- * @author  Ji-hoon Lee (dalton.lee@samsung.com)
-*/
-
-#include "scltypes.h"
-#include "sclconfig.h"
-#include "sclstructs.h"
-#include "scleventcallback.h"
-#include "sclui.h"
-
-#endif

diff --git a/scl/include/sclconfig.h b/scl/include/sclconfig.h
index f707545..d6979c6 100644 (file)
--- a/scl/include/sclconfig.h
+++ b/scl/include/sclconfig.h
@@ -18,6 +18,9 @@
 #ifndef __SCL_CONFIG_H__
 #define __SCL_CONFIG_H__
 
+namespace scl
+{
+
 #ifndef IMG_PATH_PREFIX
 #define IMG_PATH_PREFIX "image"
 #endif
@@ -462,4 +465,6 @@ typedef enum _SCLDebugMode {
     DEBUGMODE_AUTOTEST,
 }SCLDebugMode;
 
+}
+
 #endif //__SCL_CONFIG_H__

diff --git a/scl/include/sclstructs.h b/scl/include/sclstructs.h
index 697b75f..da9b4cf 100644 (file)
--- a/scl/include/sclstructs.h
+++ b/scl/include/sclstructs.h
@@ -24,6 +24,9 @@
 
 //SCL_BEGIN_DECLS
 
+namespace scl
+{
+
 /**
   *@brief SCL input mode configuration structure, which indicates a type of SW keyboard
   */
@@ -419,6 +422,9 @@ typedef struct _SclModifierDecoration {
     sclchar *bg_image_path[DISPLAYMODE_MAX][KEY_MODIFIER_MAX];
 }SclModifierDecoration;
 
+
+}
+
 //SCL_END_DECLS
 
 #endif //__SCL_STRUCTS_H__

diff --git a/scl/include/scltypes.h b/scl/include/scltypes.h
deleted file mode 100644 (file)
index 7dccd48..0000000
--- a/scl/include/scltypes.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2012 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef __SCL_TYPES_H__
-#define __SCL_TYPES_H__
-
-#define SCL_BEGIN_DECLS extern "C" {
-#define SCL_END_DECLS }
-
-#ifndef        FALSE
-#define        FALSE (0)
-#endif
-
-#ifndef        TRUE
-#define        TRUE (!FALSE)
-#endif
-
-#ifndef        NOT_USED
-#define        NOT_USED -1
-#endif
-
-#ifndef        USED
-#define        USED 1
-#endif
-
-typedef signed char scl8;
-typedef signed short scl16;
-typedef signed int scl32;
-
-typedef unsigned char sclu8;
-typedef unsigned short sclu16;
-typedef unsigned int sclu32;
-
-typedef char sclchar;
-typedef short sclshort;
-typedef long scllong;
-typedef int sclint;
-typedef char sclboolean;
-
-typedef unsigned char sclbyte;
-typedef unsigned char scluchar;
-typedef unsigned short sclushort;
-typedef unsigned long sclulong;
-typedef unsigned int scluint;
-
-typedef float sclfloat;
-typedef double scldouble;
-
-/* sclwindow should be a struct - containing a flag whether it is a virtual window or not*/
-#define SCLWINDOW_INVALID 0
-#define SCLWINDOW_VIRTUAL_DIM -1
-#define SCLWINDOW_VIRTUAL_MAGNIFIER -2
-
-typedef enum _SCLEventReturnType {
-    SCL_EVENT_PASS_ON, /* This event needs further handling of default SCL event handler */
-    SCL_EVENT_DONE,    /* We're done with this event, do not call any other default SCL event handlers */
-} SCLEventReturnType;
-/*
-typedef struct _SclWindow {
-       operator =(void *ptr) {is = false}
-    sclboolean isVirtual;
-    void* ptr;
-} SclWindow;*/
-
-typedef void* sclwindow;
-typedef void* sclimage;
-typedef void* sclfont;
-typedef void* scldrawctx;
-typedef sclint scltouchdevice;
-#define SCLTOUCHDEVICE_INVALID -1
-
-typedef struct _SclPoint {
-    sclint x, y;
-}SclPoint;
-
-typedef struct _SclSize {
-    sclint width, height;
-}SclSize;
-
-typedef struct _SclRect {
-    sclint left, top, right, bottom;
-}SclRect;
-
-typedef struct _SclRectangle {
-    sclint x, y, width, height;
-}SclRectangle;
-
-typedef struct _SclColor {
-    sclbyte r, g, b, a;
-}SclColor;
-
-#define SCL_MAKEWORD(low, high) ((sclu16)(((sclu8)(low)) | ((sclu16)((sclu8)(high))) << 8))
-#define SCL_MAKELONG(low, high) ((sclu32)(((sclu16)(low)) | ((sclu32)((sclu16)(high))) << 16))
-#define SCL_LOWORD(i32) ((sclu16)((i32) & 0xFFFF))
-#define SCL_HIWORD(i32) ((sclu16)(((sclu32)(i32) >> 16) & 0xFFFF))
-#define SCL_LOBYTE(i16) ((sclu8)((i16) & 0xFF))
-#define SCL_HIBYTE(i16) ((sclu8)(((sclu16)(i16) >> 8) & 0xFF))
-
-/* Checks if the given character is in between '!'(0x21) and '~'(0x7e) range */
-#define SCL_ISCHAR(ch) ((ch) >= '!' && (ch) <= '~')
-
-#endif //__SCL_TYPES_H__

diff --git a/scl/include/sclui.h b/scl/include/sclui.h
index 0652b93..3d7b849 100644 (file)
--- a/scl/include/sclui.h
+++ b/scl/include/sclui.h
@@ -19,6 +19,7 @@
 #define __SCL_UI_H__
 
 #include "scltypes.h"
+#include "sclconfig.h"
 #include "sclstructs.h"
 #include "scleventcallback.h"
 

diff --git a/scl/include/sclversion.h b/scl/include/sclversion.h
index ac4de5e..99879bd 100644 (file)
--- a/scl/include/sclversion.h
+++ b/scl/include/sclversion.h
@@ -18,7 +18,7 @@
 #ifndef __SCL_VERSION_H__
 #define __SCL_VERSION_H__
 
-#define SCL_VERSION "0.4.7-1"
+#define SCL_VERSION "0.5.0-1"
 
 #endif //__SCL_VERSION_H
 

diff --git a/sclres/sclres_type.h b/sclres/sclres_type.h
index 6065aaf..b29dc5b 100644 (file)
--- a/sclres/sclres_type.h
+++ b/sclres/sclres_type.h
@@ -26,6 +26,8 @@
 #define MAX_SCL_LABEL_PROPERTIES 128
 #define MAX_SCL_MODIFIER_DECORATION_NUM 64
 
+using namespace scl;
+
 typedef SclInputModeConfigure (*PSclInputModeConfigure);
 typedef SclLayout (*PSclLayout);
 

diff --git a/xmlresource/include/xml_parser_utils.h b/xmlresource/include/xml_parser_utils.h
index 1ed8aa4..b72faf2 100644 (file)
--- a/xmlresource/include/xml_parser_utils.h
+++ b/xmlresource/include/xml_parser_utils.h
@@ -21,6 +21,9 @@
 #include <limits.h>
 #include <libxml/parser.h>
 #include "scltypes.h"
+
+using namespace scl;
+
 int get_content_int(const xmlNodePtr cur_node);
 bool get_content_bool(const xmlNodePtr cur_node);