Index: uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h =================================================================== --- uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h (revision ee3b28a97324351b0acfb1161a2ed94632eab95c) +++ uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h (revision 5b110a9d6669290b4b3628aaec8b0b1a67bc6d20) @@ -47,4 +47,5 @@ extern errno_t tbarcfg_open(const char *, tbarcfg_t **); extern void tbarcfg_close(tbarcfg_t *); +extern errno_t tbarcfg_sync(tbarcfg_t *); extern smenu_entry_t *tbarcfg_smenu_first(tbarcfg_t *); extern smenu_entry_t *tbarcfg_smenu_next(smenu_entry_t *); @@ -58,11 +59,10 @@ extern errno_t smenu_entry_set_cmd(smenu_entry_t *, const char *); extern void smenu_entry_set_terminal(smenu_entry_t *, bool); -extern errno_t smenu_entry_save(smenu_entry_t *); extern errno_t smenu_entry_create(tbarcfg_t *, const char *, const char *, bool, smenu_entry_t **); extern errno_t smenu_entry_sep_create(tbarcfg_t *, smenu_entry_t **); -extern errno_t smenu_entry_destroy(smenu_entry_t *); -extern errno_t smenu_entry_move_up(smenu_entry_t *); -extern errno_t smenu_entry_move_down(smenu_entry_t *); +extern void smenu_entry_destroy(smenu_entry_t *); +extern void smenu_entry_move_up(smenu_entry_t *); +extern void smenu_entry_move_down(smenu_entry_t *); extern errno_t tbarcfg_listener_create(const char *, void (*)(void *), void *, tbarcfg_listener_t **); Index: uspace/lib/tbarcfg/private/tbarcfg.h =================================================================== --- uspace/lib/tbarcfg/private/tbarcfg.h (revision ee3b28a97324351b0acfb1161a2ed94632eab95c) +++ uspace/lib/tbarcfg/private/tbarcfg.h (revision 5b110a9d6669290b4b3628aaec8b0b1a67bc6d20) @@ -39,5 +39,4 @@ #include -#include #include #include @@ -45,10 +44,8 @@ /** Taskbar configuration */ struct tbarcfg { - /** Repository session */ - sif_sess_t *repo; + /** Configuration file path */ + char *cfgpath; /** List of start menu entries (smenu_entry_t) */ list_t entries; - /** Entries SIF node */ - sif_node_t *nentries; }; @@ -59,6 +56,4 @@ /** Link to @c smenu->entries */ link_t lentries; - /** SIF node (persistent storage) */ - sif_node_t *nentry; /** Is this a separator entry */ bool separator; @@ -79,9 +74,4 @@ } tbarcfg_listener_t; -extern errno_t smenu_entry_new(tbarcfg_t *, sif_node_t *, const char *, - const char *, bool, smenu_entry_t **); -extern errno_t smenu_entry_sep_new(tbarcfg_t *, sif_node_t *, smenu_entry_t **); -extern void smenu_entry_delete(smenu_entry_t *); - #endif Index: uspace/lib/tbarcfg/src/tbarcfg.c =================================================================== --- uspace/lib/tbarcfg/src/tbarcfg.c (revision ee3b28a97324351b0acfb1161a2ed94632eab95c) +++ uspace/lib/tbarcfg/src/tbarcfg.c (revision 5b110a9d6669290b4b3628aaec8b0b1a67bc6d20) @@ -47,4 +47,5 @@ static void tbarcfg_notify_conn(ipc_call_t *, void *); +static errno_t smenu_entry_save(smenu_entry_t *, sif_node_t *); /** Create taskbar configuration. @@ -57,8 +58,8 @@ { tbarcfg_t *tbcfg; - sif_sess_t *repo = NULL; + sif_doc_t *doc = NULL; sif_node_t *rnode; - errno_t rc; - sif_trans_t *trans = NULL; + sif_node_t *nentries; + errno_t rc; tbcfg = calloc(1, sizeof(tbarcfg_t)); @@ -69,32 +70,35 @@ list_initialize(&tbcfg->entries); - - rc = sif_create(repopath, &repo); - if (rc != EOK) - goto error; - - tbcfg->repo = repo; - - rnode = sif_get_root(repo); - - rc = sif_trans_begin(repo, &trans); - if (rc != EOK) - goto error; - - rc = sif_node_append_child(trans, rnode, "entries", &tbcfg->nentries); - if (rc != EOK) - goto error; - - rc = sif_trans_end(trans); - if (rc != EOK) - goto error; + tbcfg->cfgpath = str_dup(repopath); + if (tbcfg->cfgpath == NULL) { + rc = ENOMEM; + goto error; + } + + rc = sif_new(&doc); + if (rc != EOK) + goto error; + + rnode = sif_get_root(doc); + + rc = sif_node_append_child(rnode, "entries", &nentries); + if (rc != EOK) + goto error; + + (void)nentries; + + rc = sif_save(doc, repopath); + if (rc != EOK) + goto error; + + sif_delete(doc); *rtbcfg = tbcfg; return EOK; error: - if (trans != NULL) - sif_trans_abort(trans); - if (repo != NULL) - sif_close(repo); + if (doc != NULL) + sif_delete(doc); + if (tbcfg != NULL && tbcfg->cfgpath != NULL) + free(tbcfg->cfgpath); if (tbcfg != NULL) free(tbcfg); @@ -111,5 +115,6 @@ { tbarcfg_t *tbcfg; - sif_sess_t *repo = NULL; + sif_doc_t *doc = NULL; + sif_node_t *nentries; sif_node_t *rnode; sif_node_t *nentry; @@ -128,14 +133,17 @@ list_initialize(&tbcfg->entries); - - rc = sif_open(repopath, &repo); - if (rc != EOK) - goto error; - - tbcfg->repo = repo; - - rnode = sif_get_root(repo); - tbcfg->nentries = sif_node_first_child(rnode); - ntype = sif_node_get_type(tbcfg->nentries); + tbcfg->cfgpath = str_dup(repopath); + if (tbcfg->cfgpath == NULL) { + rc = ENOMEM; + goto error; + } + + rc = sif_load(repopath, &doc); + if (rc != EOK) + goto error; + + rnode = sif_get_root(doc); + nentries = sif_node_first_child(rnode); + ntype = sif_node_get_type(nentries); if (str_cmp(ntype, "entries") != 0) { rc = EIO; @@ -143,5 +151,5 @@ } - nentry = sif_node_first_child(tbcfg->nentries); + nentry = sif_node_first_child(nentries); while (nentry != NULL) { ntype = sif_node_get_type(nentry); @@ -174,10 +182,10 @@ terminal = "n"; - rc = smenu_entry_new(tbcfg, nentry, caption, cmd, + rc = smenu_entry_create(tbcfg, caption, cmd, str_cmp(terminal, "y") == 0, NULL); if (rc != EOK) goto error; } else { - rc = smenu_entry_sep_new(tbcfg, nentry, NULL); + rc = smenu_entry_sep_create(tbcfg, NULL); if (rc != EOK) goto error; @@ -187,9 +195,12 @@ } + sif_delete(doc); *rtbcfg = tbcfg; return EOK; error: - if (repo != NULL) - sif_close(repo); + if (doc != NULL) + sif_delete(doc); + if (tbcfg != NULL && tbcfg->cfgpath != NULL) + free(tbcfg->cfgpath); if (tbcfg != NULL) free(tbcfg); @@ -207,10 +218,59 @@ entry = tbarcfg_smenu_first(tbcfg); while (entry != NULL) { - smenu_entry_delete(entry); + smenu_entry_destroy(entry); entry = tbarcfg_smenu_first(tbcfg); } - (void)sif_close(tbcfg->repo); + free(tbcfg->cfgpath); free(tbcfg); +} + +/** Synchronize taskbar configuration to config file. + * + * @param repopath Pathname of the menu repository + * @param rtbcfg Place to store pointer to taskbar configuration + * @return EOK on success or an error code + */ +errno_t tbarcfg_sync(tbarcfg_t *tbcfg) +{ + sif_doc_t *doc = NULL; + sif_node_t *nentries; + sif_node_t *rnode; + smenu_entry_t *entry; + errno_t rc; + + rc = sif_new(&doc); + if (rc != EOK) + goto error; + + rnode = sif_get_root(doc); + + rc = sif_node_append_child(rnode, "entries", &nentries); + if (rc != EOK) + goto error; + + entry = tbarcfg_smenu_first(tbcfg); + while (entry != NULL) { + rc = smenu_entry_save(entry, nentries); + if (rc != EOK) + goto error; + + entry = tbarcfg_smenu_next(entry); + } + + rc = sif_save(doc, tbcfg->cfgpath); + if (rc != EOK) + goto error; + + sif_delete(doc); + return EOK; +error: + if (doc != NULL) + sif_delete(doc); + if (tbcfg != NULL && tbcfg->cfgpath != NULL) + free(tbcfg->cfgpath); + if (tbcfg != NULL) + free(tbcfg); + return rc; } @@ -325,5 +385,5 @@ * * Note: To make the change visible to others and persistent, - * you must call @c smenu_entry_save() + * you must call @c tbarcfg_sync() * * @param entry Start menu entry @@ -349,5 +409,5 @@ * * Note: To make the change visible to others and persistent, - * you must call @c smenu_entry_save() + * you must call @c tbarcfg_sync() * * @param entry Start menu entry @@ -373,5 +433,5 @@ * * Note: To make the change visible to others and persistent, - * you must call @c smenu_entry_save() + * you must call @c tbarcfg_sync() * * @param entry Start menu entry @@ -387,27 +447,30 @@ * * @param entry Start menu entry - * @param trans Transaction - */ -static errno_t smenu_entry_save_trans(smenu_entry_t *entry, sif_trans_t *trans) -{ - errno_t rc; + * @param nentries Entries node + */ +static errno_t smenu_entry_save(smenu_entry_t *entry, sif_node_t *nentries) +{ + sif_node_t *nentry = NULL; + errno_t rc; + + rc = sif_node_append_child(nentries, "entry", &nentry); + if (rc != EOK) + goto error; if (entry->separator) { - rc = sif_node_set_attr(trans, entry->nentry, "separator", "y"); + rc = sif_node_set_attr(nentry, "separator", "y"); if (rc != EOK) goto error; } else { - sif_node_unset_attr(trans, entry->nentry, "separator"); - - rc = sif_node_set_attr(trans, entry->nentry, "cmd", entry->cmd); + rc = sif_node_set_attr(nentry, "cmd", entry->cmd); if (rc != EOK) goto error; - rc = sif_node_set_attr(trans, entry->nentry, "caption", + rc = sif_node_set_attr(nentry, "caption", entry->caption); if (rc != EOK) goto error; - rc = sif_node_set_attr(trans, entry->nentry, "terminal", + rc = sif_node_set_attr(nentry, "terminal", entry->terminal ? "y" : "n"); if (rc != EOK) @@ -417,41 +480,14 @@ return EOK; error: + if (nentry != NULL) + sif_node_destroy(nentry); return rc; } -/** Save any changes to start menu entry. - * - * @param entry Start menu entry - */ -errno_t smenu_entry_save(smenu_entry_t *entry) -{ - sif_trans_t *trans = NULL; - errno_t rc; - - rc = sif_trans_begin(entry->smenu->repo, &trans); - if (rc != EOK) - goto error; - - rc = smenu_entry_save_trans(entry, trans); - if (rc != EOK) - goto error; - - rc = sif_trans_end(trans); - if (rc != EOK) - goto error; - - return EOK; -error: - if (trans != NULL) - sif_trans_abort(trans); - return rc; -} - -/** Allocate a start menu entry and append it to the start menu (internal). +/** Create new start menu entry and append it to the start menu (internal). * * This only creates the entry in memory, but does not update the repository. * * @param smenu Start menu - * @param nentry Backing SIF node * @param caption Caption * @param cmd Command to run @@ -459,6 +495,6 @@ * @param rentry Place to store pointer to new entry or @c NULL */ -errno_t smenu_entry_new(tbarcfg_t *smenu, sif_node_t *nentry, - const char *caption, const char *cmd, bool terminal, smenu_entry_t **rentry) +errno_t smenu_entry_create(tbarcfg_t *smenu, const char *caption, + const char *cmd, bool terminal, smenu_entry_t **rentry) { smenu_entry_t *entry; @@ -470,6 +506,4 @@ goto error; } - - entry->nentry = nentry; entry->caption = str_dup(caption); @@ -504,5 +538,5 @@ } -/** Allocate a start menu separator entry and append it to the start menu +/** Create new start menu separator entry and append it to the start menu * (internal). * @@ -510,9 +544,7 @@ * * @param smenu Start menu - * @param nentry Backing SIF node * @param rentry Place to store pointer to new entry or @c NULL */ -errno_t smenu_entry_sep_new(tbarcfg_t *smenu, sif_node_t *nentry, - smenu_entry_t **rentry) +errno_t smenu_entry_sep_create(tbarcfg_t *smenu, smenu_entry_t **rentry) { smenu_entry_t *entry; @@ -525,5 +557,4 @@ } - entry->nentry = nentry; entry->separator = true; @@ -538,5 +569,5 @@ } -/** Delete start menu entry. +/** Destroy start menu entry. * * This only deletes the entry from, but does not update the @@ -545,5 +576,5 @@ * @param entry Start menu entry */ -void smenu_entry_delete(smenu_entry_t *entry) +void smenu_entry_destroy(smenu_entry_t *entry) { list_remove(&entry->lentries); @@ -555,183 +586,20 @@ } -/** Create new start menu entry. - * - * @param smenu Start menu - * @param nentry Backing SIF node - * @param caption Caption - * @param cmd Command to run - * @param terminal Start in terminal - * @param rentry Place to store pointer to new entry or @c NULL - */ -errno_t smenu_entry_create(tbarcfg_t *smenu, const char *caption, - const char *cmd, bool terminal, smenu_entry_t **rentry) -{ - sif_node_t *nentry; - smenu_entry_t *entry; - errno_t rc; - sif_trans_t *trans = NULL; - - rc = sif_trans_begin(smenu->repo, &trans); - if (rc != EOK) - goto error; - - rc = sif_node_append_child(trans, smenu->nentries, "entry", - &nentry); - if (rc != EOK) - goto error; - - rc = sif_node_set_attr(trans, nentry, "cmd", cmd); - if (rc != EOK) - goto error; - - rc = sif_node_set_attr(trans, nentry, "caption", caption); - if (rc != EOK) - goto error; - - rc = sif_node_set_attr(trans, nentry, "terminal", terminal ? "y" : "n"); - if (rc != EOK) - goto error; - - rc = smenu_entry_new(smenu, nentry, caption, cmd, terminal, &entry); - if (rc != EOK) - goto error; - - rc = sif_trans_end(trans); - if (rc != EOK) - goto error; - - if (rentry != NULL) - *rentry = entry; - return EOK; -error: - if (trans != NULL) - sif_trans_abort(trans); - return rc; -} - -/** Create new start menu separator entry. - * - * @param smenu Start menu - * @param nentry Backing SIF node - * @param rentry Place to store pointer to new entry or @c NULL - */ -errno_t smenu_entry_sep_create(tbarcfg_t *smenu, smenu_entry_t **rentry) -{ - sif_node_t *nentry; - smenu_entry_t *entry; - errno_t rc; - sif_trans_t *trans = NULL; - - rc = sif_trans_begin(smenu->repo, &trans); - if (rc != EOK) - goto error; - - rc = sif_node_append_child(trans, smenu->nentries, "entry", - &nentry); - if (rc != EOK) - goto error; - - rc = sif_node_set_attr(trans, nentry, "separator", "y"); - if (rc != EOK) - goto error; - - rc = smenu_entry_sep_new(smenu, nentry, &entry); - if (rc != EOK) - goto error; - - rc = sif_trans_end(trans); - if (rc != EOK) - goto error; - - if (rentry != NULL) - *rentry = entry; - return EOK; -error: - if (trans != NULL) - sif_trans_abort(trans); - return rc; -} - -/** Destroy start menu entry. - * - * @param entry Start menu entry - * @return EOK on success or an error code - */ -errno_t smenu_entry_destroy(smenu_entry_t *entry) -{ - errno_t rc; - sif_trans_t *trans = NULL; - - rc = sif_trans_begin(entry->smenu->repo, &trans); - if (rc != EOK) - goto error; - - sif_node_destroy(trans, entry->nentry); - - rc = sif_trans_end(trans); - if (rc != EOK) - goto error; - - smenu_entry_delete(entry); - return EOK; -error: - if (trans != NULL) - sif_trans_abort(trans); - return rc; -} - /** Move start menu entry up. * * @param entry Start menu entry - * @return EOK on success or an error code - */ -errno_t smenu_entry_move_up(smenu_entry_t *entry) -{ - errno_t rc; - sif_trans_t *trans = NULL; - sif_node_t *nnode = NULL; - sif_node_t *old_node; + */ +void smenu_entry_move_up(smenu_entry_t *entry) +{ smenu_entry_t *prev; - - rc = sif_trans_begin(entry->smenu->repo, &trans); - if (rc != EOK) - goto error; prev = tbarcfg_smenu_prev(entry); if (prev == NULL) { /* Entry is already at first position, nothing to do. */ - return EOK; - } - - rc = sif_node_insert_before(trans, prev->nentry, "entry", &nnode); - if (rc != EOK) - goto error; - - old_node = entry->nentry; - entry->nentry = nnode; - - rc = smenu_entry_save_trans(entry, trans); - if (rc != EOK) { - entry->nentry = old_node; - goto error; - } - - sif_node_destroy(trans, old_node); - - rc = sif_trans_end(trans); - if (rc != EOK) { - entry->nentry = old_node; - goto error; + return; } list_remove(&entry->lentries); list_insert_before(&entry->lentries, &prev->lentries); - return EOK; -error: - if (nnode != NULL) - sif_node_destroy(trans, nnode); - if (trans != NULL) - sif_trans_abort(trans); - return rc; } @@ -739,54 +607,17 @@ * * @param entry Start menu entry - * @return EOK on success or an error code - */ -errno_t smenu_entry_move_down(smenu_entry_t *entry) -{ - errno_t rc; - sif_trans_t *trans = NULL; - sif_node_t *nnode = NULL; - sif_node_t *old_node; + */ +void smenu_entry_move_down(smenu_entry_t *entry) +{ smenu_entry_t *next; - - rc = sif_trans_begin(entry->smenu->repo, &trans); - if (rc != EOK) - goto error; next = tbarcfg_smenu_next(entry); if (next == NULL) { /* Entry is already at last position, nothing to do. */ - return EOK; - } - - rc = sif_node_insert_after(trans, next->nentry, "entry", &nnode); - if (rc != EOK) - goto error; - - old_node = entry->nentry; - entry->nentry = nnode; - - rc = smenu_entry_save_trans(entry, trans); - if (rc != EOK) { - entry->nentry = old_node; - goto error; - } - - sif_node_destroy(trans, old_node); - - rc = sif_trans_end(trans); - if (rc != EOK) { - entry->nentry = old_node; - goto error; + return; } list_remove(&entry->lentries); list_insert_after(&entry->lentries, &next->lentries); - return EOK; -error: - if (nnode != NULL) - sif_node_destroy(trans, nnode); - if (trans != NULL) - sif_trans_abort(trans); - return rc; } Index: uspace/lib/tbarcfg/test/tbarcfg.c =================================================================== --- uspace/lib/tbarcfg/test/tbarcfg.c (revision ee3b28a97324351b0acfb1161a2ed94632eab95c) +++ uspace/lib/tbarcfg/test/tbarcfg.c (revision 5b110a9d6669290b4b3628aaec8b0b1a67bc6d20) @@ -57,4 +57,5 @@ PCUT_ASSERT_ERRNO_VAL(EOK, rc); + tbarcfg_sync(tbcfg); tbarcfg_close(tbcfg); @@ -170,4 +171,5 @@ PCUT_ASSERT_TRUE(smenu_entry_get_separator(e2)); + tbarcfg_sync(tbcfg); tbarcfg_close(tbcfg); @@ -261,5 +263,5 @@ smenu_entry_set_terminal(e, true); - rc = smenu_entry_save(e); + rc = tbarcfg_sync(tbcfg); PCUT_ASSERT_ERRNO_VAL(EOK, rc); @@ -272,4 +274,5 @@ PCUT_ASSERT_TRUE(terminal); + tbarcfg_sync(tbcfg); tbarcfg_close(tbcfg); @@ -359,6 +362,5 @@ PCUT_ASSERT_EQUALS(e, f); - rc = smenu_entry_destroy(e); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_destroy(e); f = tbarcfg_smenu_first(tbcfg); @@ -400,6 +402,5 @@ /* Moving the first entry up should have no effect */ - rc = smenu_entry_move_up(e1); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_up(e1); f = tbarcfg_smenu_first(tbcfg); @@ -408,6 +409,5 @@ /* Moving the second entry up should move it to first position */ - rc = smenu_entry_move_up(e2); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_up(e2); f = tbarcfg_smenu_first(tbcfg); @@ -416,6 +416,5 @@ /* Moving the last entry up should move it to second position */ - rc = smenu_entry_move_up(e3); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_up(e3); f = tbarcfg_smenu_first(tbcfg); @@ -428,4 +427,5 @@ PCUT_ASSERT_EQUALS(e1, f); + tbarcfg_sync(tbcfg); tbarcfg_close(tbcfg); @@ -496,6 +496,5 @@ /* Moving the last entry down should have no effect */ - rc = smenu_entry_move_down(e3); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_down(e3); f = tbarcfg_smenu_last(tbcfg); @@ -504,6 +503,5 @@ /* Moving the second entry down should move it to last position */ - rc = smenu_entry_move_down(e2); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_down(e2); f = tbarcfg_smenu_last(tbcfg); @@ -512,6 +510,5 @@ /* Moving the first entry down should move it to second position */ - rc = smenu_entry_move_down(e1); - PCUT_ASSERT_ERRNO_VAL(EOK, rc); + smenu_entry_move_down(e1); f = tbarcfg_smenu_last(tbcfg); @@ -524,4 +521,5 @@ PCUT_ASSERT_EQUALS(e3, f); + tbarcfg_sync(tbcfg); tbarcfg_close(tbcfg);