Encapsulate sclnui method

Change-Id: I2b2ee4721128bbdeb8969412791eebb4ba3c8840
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/ISEDefaultNUI/ISEDefaultNUI.cs b/ISEDefaultNUI/ISEDefaultNUI.cs
index 6ebcb3a..abf8d70 100644 (file)
--- a/ISEDefaultNUI/ISEDefaultNUI.cs
+++ b/ISEDefaultNUI/ISEDefaultNUI.cs
@@ -132,10 +132,10 @@ namespace ISEDefaultNUI
             IseConfig.Instance.ReadIseConfig();
             LanguageManager.Instance.SetEnabledLanguages(IseConfig.Instance.EnabledLanguages);
 
-            SclNuiInit(Application.Current.DirectoryInfo.Resource + "main_entry.xml");
-            SclNuiEnableSound(false);
-            SclNuiEnableVibration(false);
-            SclNuiEnableMagnifier(false);
+            SclNui.Init(Application.Current.DirectoryInfo.Resource + "main_entry.xml");
+            SclNui.EnableSound(false);
+            SclNui.EnableVibration(false);
+            SclNui.EnableMagnifier(false);
 
             LanguageInfo currentLanguage = LanguageManager.Instance.GetLanguageInfo(IseConfig.Instance.SelectedLanguage);
             if (!currentLanguage.LoadInIME)
@@ -151,7 +151,7 @@ namespace ISEDefaultNUI
         private static void Terminate()
         {
             UnregisterCallback();
-            SclNuiFini();
+            SclNui.Fini();
             SclDbusShutdown();
             InputMethodEditor.Destroy();
         }
@@ -165,7 +165,7 @@ namespace ISEDefaultNUI
             AutoCapitalization autoCapitalization = b.AutoCapitalization;
             SclDbusSetInputHint((uint)b.InputHint);
             SclDbusUpdateBidiDirection((uint)b.BiDirection);
-            SclNuiSetUpdatePending(true);
+            SclNui.SetUpdatePending(true);
             ResetContext();
 
             if (b.Language == InputPanelLanguage.Alphabet)
@@ -199,7 +199,7 @@ namespace ISEDefaultNUI
             UpdateCursorPosition(b.CursorPosition);
 
             IMEShow(inputContext);
-            SclNuiSetUpdatePending(false);
+            SclNui.SetUpdatePending(false);
             navigator.Push(SclNui);
         }
 
@@ -215,9 +215,9 @@ namespace ISEDefaultNUI
         private static void IMEHide()
         {
             SclNui.ClearClickCount();
-            SclNuiSetUpdatePending(true);
-            SclNuiDisableInputEvent(true);
-            SclNuiHide();
+            SclNui.SetUpdatePending(true);
+            SclNui.DisableInputEvent(true);
+            SclNui.Hide();
 
             KeyboardState.Instance.VisibleState = false;
             ResetShiftState();
@@ -258,6 +258,7 @@ namespace ISEDefaultNUI
 
             if (keyboardState.Context != ic ||  keyboardState.NeedReset || !iseConfig.SelectedLanguage.Equals(currentLanguage))
                 resetInputMode = true;
+
             keyboardState.NeedReset = false;
 
             bool forcePrimaryLatin = false;
@@ -300,7 +301,7 @@ namespace ISEDefaultNUI
                 ResetContext();
 
                 if (!keyboardState.CapsMode)
-                    SclNuiSetShiftState((uint)ShiftState.Off);
+                    SclNui.SetShiftState((uint)ShiftState.Off);
 
                 if (keyboardState.Layout < KeyboardLayout.Max)
                 {
@@ -321,22 +322,22 @@ namespace ISEDefaultNUI
                     else
                         fileNameLayout = false;
 
-                    SclNuiEnableButton("exclamation", !fileNameLayout);
-                    SclNuiEnableButton("question", !fileNameLayout);
-                    SclNuiEnableButton("divide", !fileNameLayout);
-                    SclNuiEnableButton("multiply", !fileNameLayout);
-                    SclNuiEnableButton("colon", !fileNameLayout);
-                    SclNuiEnableButton("quotation", !fileNameLayout);
-                    SclNuiEnableButton("CM_KEY", true);
+                    SclNui.EnableButton("exclamation", !fileNameLayout);
+                    SclNui.EnableButton("question", !fileNameLayout);
+                    SclNui.EnableButton("divide", !fileNameLayout);
+                    SclNui.EnableButton("multiply", !fileNameLayout);
+                    SclNui.EnableButton("colon", !fileNameLayout);
+                    SclNui.EnableButton("quotation", !fileNameLayout);
+                    SclNui.EnableButton("CM_KEY", true);
 
                     Log.Info("NUIIME", "new layout index : " + layoutIndex.ToString());
 
                     if(defaultValue.Values[(int)layoutIndex].InputMode.Length > 0)
                     {
-                        SclNuiSetInputMode(defaultValue.Values[(int)layoutIndex].InputMode);
+                        SclNui.SetInputMode(defaultValue.Values[(int)layoutIndex].InputMode);
                     }
 
-                    SclNuiSetCurrentSublayout(defaultValue.Values[(int)layoutIndex].SublayoutName);
+                    SclNui.SetCurrentSublayout(defaultValue.Values[(int)layoutIndex].SublayoutName);
                 }
             }
 
@@ -347,31 +348,31 @@ namespace ISEDefaultNUI
                 {
                     if (keyboardState.Layout != KeyboardLayout.Normal)
                     {
-                        SclNuiSetAutocapitalShiftState(true);
-                        SclNuiSetShiftState((uint)ShiftState.Off);
+                        SclNui.SetAutocapitalShiftState(true);
+                        SclNui.SetShiftState((uint)ShiftState.Off);
                     }
                     else
                     {
                         Common.SendKeyEvent((KeyCode)ResourceManager.MVKShiftEnable);
                         if (keyboardState.CapsMode)
-                            SclNuiSetAutocapitalShiftState(false);
+                            SclNui.SetAutocapitalShiftState(false);
                     }
                 }
                 else
                 {
-                    SclNuiSetAutocapitalShiftState(true);
+                    SclNui.SetAutocapitalShiftState(true);
                     Common.SendKeyEvent((KeyCode)ResourceManager.MVKShiftDisable);
-                    SclNuiSetShiftState((uint)ShiftState.Off);
+                    SclNui.SetShiftState((uint)ShiftState.Off);
                 }
             }
             else
             {
-                SclNuiSetAutocapitalShiftState(true);
+                SclNui.SetAutocapitalShiftState(true);
             }
 
             UpdateSpaceKey();
-            SclNuiShow();
-            SclNuiDisableInputEvent(false);
+            SclNui.Show();
+            SclNui.DisableInputEvent(false);
             SetIMESize();
         }
 
@@ -435,12 +436,12 @@ namespace ISEDefaultNUI
 
             if (returnKey == InputPanelReturnKey.Default)
             {
-                SclNuiUnsetPrivateKey("Enter");
+                SclNui.UnsetPrivateKey("Enter");
             }
             else
             {
                 string[] imageLabel = {" ", " ", " "};
-                SclNuiSetPrivateKey("Enter", label, imageLabel, null, 0, "Enter", true);
+                SclNui.SetPrivateKey("Enter", label, imageLabel, null, 0, "Enter", true);
             }
             Log.Info("NUIIME", "return key label : " + label);
         }
@@ -448,7 +449,7 @@ namespace ISEDefaultNUI
         private static void SetReturnKeyDisable(bool disable)
         {
             Log.Info("NUIIME", "return key disable : " + disable);
-            SclNuiEnableButton("Enter", !disable);
+            SclNui.EnableButton("Enter", !disable);
         }
 
         private static void SetCapsMode(bool enable)
@@ -478,20 +479,20 @@ namespace ISEDefaultNUI
             if (keyboardState.Layout == KeyboardLayout.URL)
             {
                 if (position > 0)
-                    SclNuiSetStringSubstitution("www.", ".com");
+                    SclNui.SetStringSubstitution("www.", ".com");
                 else
-                    SclNuiUnsetStringSubstitution("www.");
+                    SclNui.UnsetStringSubstitution("www.");
             }
         }
 
         private static void ResetShiftState()
         {
             uint oldState, newState;
-            SclNuiGetShiftState(out oldState);
+            SclNui.GetShiftState(out oldState);
             newState = (uint)ShiftState.Off;
 
             if (oldState != newState)
-                SclNuiSetShiftState(newState);
+                SclNui.SetShiftState(newState);
         }
 
         private static void RegisterCallback()
@@ -600,7 +601,7 @@ namespace ISEDefaultNUI
         private static void RotationChangedEvent(object sender, RotationChangedEventArgs e)
         {
             Log.Info("NUIIME", "degree : " + e.Degree.ToString());
-            SclNuiSetRotation(e.Degree);
+            SclNui.SetRotation(e.Degree);
         }
 
         private static void FocusOutEvent(object sender, FocusedOutEventArgs e)
@@ -624,12 +625,12 @@ namespace ISEDefaultNUI
         private static void SetIMESize()
         {
             IntPtr inputModePtr;
-            SclNuiGetInputMode(out inputModePtr);
+            SclNui.GetInputMode(out inputModePtr);
             string inputMode = Marshal.PtrToStringAnsi(inputModePtr);
 
             int portraitWidth, portraitHeight, landscapeWidth, landscapeHeight;
-            SclNuiGetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Portrait, out portraitWidth, out portraitHeight);
-            SclNuiGetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Landscape, out landscapeWidth, out landscapeHeight);
+            SclNui.GetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Portrait, out portraitWidth, out portraitHeight);
+            SclNui.GetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Landscape, out landscapeWidth, out landscapeHeight);
 
             Rectangle portraitRectangle = new Rectangle(0, 0, portraitWidth, portraitHeight);
             Rectangle landscapeRectangle = new Rectangle(0, 0, landscapeWidth, landscapeHeight);
@@ -649,14 +650,14 @@ namespace ISEDefaultNUI
                 LanguageInfo languageInfo = LanguageManager.Instance.GetLanguageInfo(LanguageManager.Instance.GetCurrentLanguage());
                 if (languageInfo != null && languageInfo.Enabled)
                 {
-                    SclNuiEnableButton("SPACE_ARROW_LEFT", false);
-                    SclNuiEnableButton("SPACE_ARROW_RIGHT", false);
+                    SclNui.EnableButton("SPACE_ARROW_LEFT", false);
+                    SclNui.EnableButton("SPACE_ARROW_RIGHT", false);
                 }
             }
             else
             {
-                SclNuiEnableButton("SPACE_ARROW_LEFT", true);
-                SclNuiEnableButton("SPACE_ARROW_RIGHT", true);
+                SclNui.EnableButton("SPACE_ARROW_LEFT", true);
+                SclNui.EnableButton("SPACE_ARROW_RIGHT", true);
             }
         }
 

diff --git a/ISEDefaultNUI/SCLNUI.cs b/ISEDefaultNUI/SCLNUI.cs
index 04123cf..492c691 100644 (file)
--- a/ISEDefaultNUI/SCLNUI.cs
+++ b/ISEDefaultNUI/SCLNUI.cs
@@ -39,8 +39,8 @@ namespace ISEDefaultNUI
         private KeyboardState keyboardState = KeyboardState.Instance;
 
         private uint clickCount = 0;
-        private string[] sigDec = {".", "-"};
-        private uint[] sigDecEvent = {'.', '-'};
+        private string[] sigDec = { ".", "-" };
+        private uint[] sigDecEvent = { '.', '-' };
         private Timer commitTimer;
 
         enum LabelAlignment
@@ -235,7 +235,7 @@ namespace ISEDefaultNUI
             _update_window_cb = (int type, int x, int y, int width, int height, IntPtr user_data) =>
             {
                 WindowAttribute.WindowType windowType = (WindowAttribute.WindowType)type;
-                switch(windowType)
+                switch (windowType)
                 {
                     case WindowAttribute.WindowType.Keypad:
                         {
@@ -308,7 +308,7 @@ namespace ISEDefaultNUI
 
                             if (inputMode.Length > 0 && inputMode.Equals("NUMBERONLY_3X4_SIGDEC") && keyValue.Equals("."))
                             {
-                                Common.UpdatePreeditString(sigDec[clickCount%ResourceManager.SigDecSize], false);
+                                Common.UpdatePreeditString(sigDec[clickCount % ResourceManager.SigDecSize], false);
                                 InputMethodEditor.ShowPreEditString();
                                 commitTimer.Start();
                                 clickCount++;
@@ -373,8 +373,8 @@ namespace ISEDefaultNUI
                         else if (key_event > 0)
                         {
                             Common.SendKeyEvent((KeyCode)key_event);
-                        }
-                            break;
+                        }\r
+                        break;
                     case SclNuiKeyType.Modechange:
                         break;
                     case SclNuiKeyType.User:
@@ -516,7 +516,7 @@ namespace ISEDefaultNUI
         private bool CommitTimerTick(object source, Timer.TickEventArgs e)
         {
             InputMethodEditor.HidePreEditString();
-            Common.ForwardKeyEvent((KeyCode)sigDecEvent[(clickCount - 1)%ResourceManager.SigDecSize]);
+            Common.ForwardKeyEvent((KeyCode)sigDecEvent[(clickCount - 1) % ResourceManager.SigDecSize]);
             clickCount = 0;
             return true;
         }
@@ -700,6 +700,16 @@ namespace ISEDefaultNUI
             }
         }
 
+        public int Init(string entry_filepath)
+        {
+            return SclNuiInit(entry_filepath);\r
+        }
+
+        public int Fini()\r
+        {\r
+            return SclNuiFini();\r
+        }
+
         public int SetInputMode(string mode)
         {
             return SclNuiSetInputMode(mode);
@@ -719,14 +729,79 @@ namespace ISEDefaultNUI
             return SclNuiSetStringSubstitution(original, substitute);
         }
 
+        public int UnsetStringSubstitution(string original)\r
+        {\r
+            return SclNuiUnsetStringSubstitution(original);\r
+        }
+
         public int EnableMagnifier(bool enabled)
         {
             return SclNuiEnableMagnifier(enabled);
         }
 
+        public int EnableSound(bool enabled)
+        {
+            return SclNuiEnableSound(enabled);
+        }
+
+        public int EnableVibration(bool enabled)
+        {
+            return SclNuiEnableVibration(enabled);
+        }
+
+        public int EnableButton(string customId, bool enabled)\r
+        {\r
+            return SclNuiEnableButton(customId, enabled);\r
+        }
+
         public void ClearClickCount()
         {
             clickCount = 0;
         }
-    }
-}
+
+        public int DisableInputEvent(bool disable)\r
+        {\r
+            return SclNuiDisableInputEvent(disable);\r
+        }
+
+        public int SetShiftState(uint state)\r
+        {\r
+            return SclNuiSetShiftState(state);\r
+        }\r
+\r
+        public int GetShiftState(out uint state)\r
+        {\r
+            return SclNuiGetShiftState(out state);\r
+        }
+
+        public int SetAutocapitalShiftState(bool state)\r
+        {\r
+            return SclNuiSetAutocapitalShiftState(state);\r
+        }
+
+        public int GetInputMode(out IntPtr mode)\r
+        {\r
+            return SclNuiGetInputMode(out mode);\r
+        }
+
+        public int GetInputModeSize(string mode, int display_mode, out int width, out int height)\r
+        {\r
+            return SclNuiGetInputModeSize(mode, display_mode, out width, out height);\r
+        }\r
+\r
+        public int SetPrivateKey(string customId, string label, string[] imageLabel, string[] imageBG, ulong keyEvent, string keyValue, bool redraw)\r
+        {\r
+            return SclNuiSetPrivateKey(customId, label, imageLabel, imageBG, keyEvent, keyValue, redraw);\r
+        }\r
+\r
+        public int UnsetPrivateKey(string customId)\r
+        {\r
+            return SclNuiUnsetPrivateKey(customId);\r
+        }\r
+\r
+        public int SetRotation(int degree)\r
+        {\r
+            return SclNuiSetRotation(degree);\r
+        }\r
+    }\r
+}
\ No newline at end of file