Ticket #10064: 0002-CannaIM-copy-data-files-to-user-setting-directory.patch

src/add-ons/input_server/methods/canna/CannaLooper.cpp

@@ -8 +8 @@
 
 #include "CannaLooper.h"
 
-#include <string.h>
-
-#include <Debug.h>
-
 #include <Alert.h>
+#include <Debug.h>
+#include <Entry.h>
 #include <FindDirectory.h>
 #include <Input.h>
 #include <Menu.h>
 #include <MenuItem.h>
 #include <Messenger.h>
 #include <Path.h>
+#include <PathFinder.h>
 #include <Screen.h>
+#include <string.h>
+
+#include <CopyEngine.h>
 
 #include "CannaCommon.h"
 #include "CannaMethod.h"
@@ -44 +46 @@
     fMenu->AddItem(new BMenuItem("Reload Init file",
         new BMessage(RELOAD_INIT_FILE)));
 
+    font_family family;
+    font_style style;
+    strcpy(family, "VL PGothic");
+    strcpy(style, "regular");
+
+    fKouhoFont.SetFamilyAndStyle(family, style);
+    fKouhoFont.SetSize(12);
+
     if (gSettings.convert_arrowkey) {
         BMenuItem* item = fMenu->FindItem(ARROW_KEYS_FLIPPED);
         item->SetMarked(true);
@@ -95 +105 @@
 
 
 status_t
+CannaLooper::_CopyData(const char* dstPath)
+{
+    status_t status;
+    BPath srcPath;
+
+    // Use BPathFinder() and BPathFinder(B_CURRENT_IMAGE_SYMBOL)
+    // so that users can use either add-on or package.
+    status = BPathFinder().FindPath(
+        B_FIND_PATH_DATA_DIRECTORY, "Canna",
+        B_FIND_PATH_EXISTING_ONLY, srcPath);
+    if (status != B_OK) {
+        status = BPathFinder(B_CURRENT_IMAGE_SYMBOL).FindPath(
+            B_FIND_PATH_DATA_DIRECTORY, "Canna",
+            B_FIND_PATH_EXISTING_ONLY, srcPath);
+        if (status != B_OK)
+            return B_ERROR;
+    }
+    BCopyEngine CopyEngine(BCopyEngine::COPY_RECURSIVELY);
+    status = CopyEngine.CopyEntry(srcPath.Path(), dstPath);
+    if (status != B_OK)
+        return B_ERROR;
+
+    return B_OK;
+}
+
+
+status_t
 CannaLooper::ReadSettings(char* basePath)
 {
     BPath path;
-    status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+    status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
     if (status != B_OK)
         return status;
 
@@ -107 +144 @@
     strlcpy(basePath, path.Path(), B_PATH_NAME_LENGTH);
     strlcat(basePath, "/", B_PATH_NAME_LENGTH);
 
-    font_family family;
-    font_style style;
-    strcpy(family, "VL PGothic");
-    strcpy(style, "regular");
-
-    fKouhoFont.SetFamilyAndStyle(family, style);
-    fKouhoFont.SetSize(12);
+    BEntry ent(path.Path());
+    if (!ent.Exists()) {
+        return _CopyData(path.Path());
+    }
 
     return B_OK;
 }

src/add-ons/input_server/methods/canna/CannaLooper.h

@@ -38 +38 @@
             void            SendInputStarted();
 
 private:
+            status_t        _CopyData(const char* dstPath);
             void            _HandleKeyDown(BMessage* msg);
             void            _HandleLocationReply(BMessage* msg);
             void            _HandleMethodActivated(bool active);

src/add-ons/input_server/methods/canna/Jamfile

@@ -2 +2 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders interface ;
+UsePrivateHeaders interface storage ;
 
 SubDirSysHdrs $(SUBDIR) ;
 SubDirHdrs [ FDirName $(SUBDIR) canna ] ;