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

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

@@ -18 +18 @@
 #include <Menu.h>
 #include <MenuItem.h>
 #include <Messenger.h>
+#include <Entry.h>
 #include <Path.h>
 #include <Screen.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)
+{
+    // We should copy data from /boot/system/Data or /boot/home/config/Data
+    // so that user can drop canna package either to /boot/system/pacages
+    // or to /boot/home/config/packages. 
+
+    bool found = false;
+    status_t status;
+    BPath srcPath;
+    BEntry ent;
+    directory_which which[] = {
+        B_USER_DATA_DIRECTORY,
+        B_SYSTEM_DATA_DIRECTORY
+    };
+
+    for(unsigned int i = 0; i < sizeof(which) / sizeof(directory_which); i++) {
+        status = find_directory(which[i], &srcPath);
+        if (status != B_OK)
+            continue;
+
+        srcPath.Append("Canna");
+        ent.SetTo(srcPath.Path());
+        if (ent.Exists()) {
+            found = true;
+            break;
+        }
+    }
+
+    if (!found) {
+        return B_ERROR;
+    }
+
+    BCopyEngine CopyEngine(BCopyEngine::COPY_RECURSIVELY);
+    status = CopyEngine.CopyEntry(srcPath.Path(), dstPath);
+    if (status != B_OK)
+        return B_ERROR;
+
+    // TODO: if Haiku goes multi-user, we need SetOwner() to data files
+    // and directory.
+
+    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 +162 @@
     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 ] ;