Encapsulate scldbus method 34/262334/4 accepted/tizen/unified/20210817.123200 submit/tizen/20210813.075431 submit/tizen/20210813.113502
authorJihoon Kim <jihoon48.kim@samsung.com>
Sun, 8 Aug 2021 03:52:57 +0000 (12:52 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 13 Aug 2021 02:47:57 +0000 (11:47 +0900)
Change-Id: I879d4297727b9e990e8143fbfa668bd8d98873a1
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
ISEDefaultNUI/ISEDefaultNUI.cs
ISEDefaultNUI/SclDbus.cs [new file with mode: 0644]

index abf8d70eb6869c4b989d4920c41a3edcf88dd9d2..f045c6420069116bd5b35feb9cd8d20c0832ed48 100644 (file)
@@ -16,6 +16,7 @@ namespace ISEDefaultNUI
     {
         private static Navigator navigator = null;
         private static SCLNUI SclNui = null;
+        private static SCLDBUS SclDbus = null;
 
         public Program(string styleSheet, WindowMode windowMode, Size2D windowSize, Position2D windowPosition, WindowType type) : base(styleSheet, windowMode, windowSize, windowPosition, type)
         {
@@ -93,7 +94,7 @@ namespace ISEDefaultNUI
         {
             await Task.Run(() =>
             {
-                int ret = SclDbusInit();
+                int ret = SclDbus.Init();
                 if (ret != 0)
                     Log.Info("NUIIME", "Failed to initialize dbus");
             });
@@ -102,6 +103,7 @@ namespace ISEDefaultNUI
         private static void Create()
         {
             SclNui = new SCLNUI(navigator);
+            SclDbus = new SCLDBUS();
             Task.Run(() => DbusInitialize());
 
             Window.Instance.AddAvailableOrientation(Window.WindowOrientation.Portrait);
@@ -143,7 +145,7 @@ namespace ISEDefaultNUI
                 /* FIXME : This comment should be removed when using IMEngine
                 string uuid = LanguageManager.Instance.GetUuid(currentLanguage.KeyboardISEUuid);
                 ApplicationInfo applicationInfo = new ApplicationInfo(uuid);
-                SclDbusSetImengine(uuid, applicationInfo.PackageId);
+                SclDbus.SetImengine(uuid, applicationInfo.PackageId);
                 */
             }
         }
@@ -152,7 +154,7 @@ namespace ISEDefaultNUI
         {
             UnregisterCallback();
             SclNui.Fini();
-            SclDbusShutdown();
+            SclDbus.Shutdown();
             InputMethodEditor.Destroy();
         }
 
@@ -163,8 +165,8 @@ namespace ISEDefaultNUI
             bool predictionAllow = b.PredictionMode;
             bool passwordMode = b.PasswordMode;
             AutoCapitalization autoCapitalization = b.AutoCapitalization;
-            SclDbusSetInputHint((uint)b.InputHint);
-            SclDbusUpdateBidiDirection((uint)b.BiDirection);
+            SclDbus.SetInputHint((uint)b.InputHint);
+            SclDbus.UpdateBidiDirection((uint)b.BiDirection);
             SclNui.SetUpdatePending(true);
             ResetContext();
 
@@ -609,7 +611,7 @@ namespace ISEDefaultNUI
             Log.Info("NUIIME", "context id : " + e.ContextId.ToString());
             KeyboardState.Instance.FocusedContext = 0;
             KeyboardState.Instance.ResetMultitapState(true);
-            SclDbusFocusOut();
+            SclDbus.FocusOut();
         }
 
         private static void FocusInEvent(object sender, FocusedInEventArgs e)
@@ -619,7 +621,7 @@ namespace ISEDefaultNUI
             if (keyboardState.CheckContextTemporary(keyboardState.Context) && !keyboardState.CheckContextTemporary(e.ContextId))
                 keyboardState.Context = e.ContextId;
             keyboardState.FocusedContext = e.ContextId;
-            SclDbusFocusIn();
+            SclDbus.FocusIn();
         }
 
         private static void SetIMESize()
diff --git a/ISEDefaultNUI/SclDbus.cs b/ISEDefaultNUI/SclDbus.cs
new file mode 100644 (file)
index 0000000..d22b630
--- /dev/null
@@ -0,0 +1,157 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Threading.Tasks;\r
+using static Interop.SclNuiCSharp;\r
+\r
+namespace ISEDefaultNUI\r
+{\r
+    class SCLDBUS\r
+    {\r
+        public int Init()\r
+        {\r
+            return SclDbusInit();\r
+        }\r
+\r
+        public int Shutdown()\r
+        {\r
+            return SclDbusShutdown();\r
+        }\r
+\r
+        public void SetImengine(string engineId, string moduleName)\r
+        {\r
+            SclDbusSetImengine(engineId, moduleName);\r
+        }\r
+\r
+        public void UnsetImengine()\r
+        {\r
+            SclDbusUnsetImengine();\r
+        }\r
+\r
+        public void FlushImengine()\r
+        {\r
+            SclDbusFlushImengine();\r
+        }\r
+\r
+        public void ResetImengine()\r
+        {\r
+            SclDbusResetImengine();\r
+        }\r
+\r
+        public void SendImengineEvent(int command, UInt32 value)\r
+        {\r
+            SclDbusSendImengineEvent(command, value);\r
+        }\r
+\r
+        public void ProcessKeyEvent(UInt32 code, UInt32 mask, UInt32 layout, UInt32 devClass, UInt32 devSubclass, string devName, UInt32 serial, bool needSurroundingText)\r
+        {\r
+            SclDbusProcessKeyEvent(code, mask, layout, devClass, devSubclass, devName, serial, needSurroundingText);\r
+        }\r
+\r
+        public void FocusIn()\r
+        {\r
+            SclDbusFocusIn();\r
+        }\r
+\r
+        public void FocusOut()\r
+        {\r
+            SclDbusFocusOut();\r
+        }\r
+\r
+        public void UpdateCursorPosition(int position)\r
+        {\r
+            SclDbusUpdateCursorPosition(position);\r
+        }\r
+\r
+        public void SetAutocapitalType(UInt32 type)\r
+        {\r
+            SclDbusSetAutocapitalType(type);\r
+        }\r
+\r
+        public void SetPredictionAllow(UInt32 predictionAllow)\r
+        {\r
+            SclDbusSetPredictionAllow(predictionAllow);\r
+        }\r
+\r
+        public void ResetInputContext()\r
+        {\r
+            SclDbusResetInputContext();\r
+        }\r
+\r
+        public void SetLayout(UInt32 layout)\r
+        {\r
+            SclDbusSetLayout(layout);\r
+        }\r
+\r
+        public void SetImdata(string imdata, UInt32 len)\r
+        {\r
+            SclDbusSetImdata(imdata, len);\r
+        }\r
+\r
+        public void SetInputHint(UInt32 hint)\r
+        {\r
+            SclDbusSetInputHint(hint);\r
+        }\r
+\r
+        public void UpdateBidiDirection(UInt32 direction)\r
+        {\r
+            SclDbusUpdateBidiDirection(direction);\r
+        }\r
+\r
+        public void TriggerProperty(string property)\r
+        {\r
+            SclDbusTriggerProperty(property);\r
+        }\r
+\r
+        public void ShowCandidateMoreWindow()\r
+        {\r
+            SclDbusShowCandidateMoreWindow();\r
+        }\r
+\r
+        public void HideCandidateMoreWindow()\r
+        {\r
+            SclDbusHideCandidateMoreWindow();\r
+        }\r
+\r
+        public void SelectAux(UInt32 item)\r
+        {\r
+            SclDbusSelectAux(item);\r
+        }\r
+\r
+        public void SelectCandidate(UInt32 item)\r
+        {\r
+            SclDbusSelectCandidate(item);\r
+        }\r
+\r
+        public void CandidateTablePageUp()\r
+        {\r
+            SclDbusCandidateTablePageUp();\r
+        }\r
+\r
+        public void CandidateTablePageDown()\r
+        {\r
+            SclDbusCandidateTablePageDown();\r
+        }\r
+\r
+        public void ChangeCandidatePageSize(UInt32 size)\r
+        {\r
+            SclDbusChangeCandidatePageSize(size);\r
+        }\r
+\r
+        public void SetCandidateItemLayout(List<UInt32> item)\r
+        {\r
+            SclDbusSetCandidateItemLayout(item);\r
+        }\r
+\r
+        public void ChangeCandidateNumber(UInt32 pageNum)\r
+        {\r
+            SclDbusChangeCandidateNumber(pageNum);\r
+        }\r
+\r
+        public void LongPressCandidateItem(UInt32 index)\r
+        {\r
+            SclDbusLongPressCandidateItem(index);\r
+        }\r
+    }\r
+}\r