Add information about the total number of elements

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/libkeymap/keymap/dump.h b/src/libkeymap/keymap/dump.h
index 8057e3a..a121e5c 100644 (file)
--- a/src/libkeymap/keymap/dump.h
+++ b/src/libkeymap/keymap/dump.h
@@ -29,6 +29,10 @@ struct kmapinfo {
        size_t      keymaps_alloced; /**< Number of keymaps dynamically allocated */
        size_t      functions;       /**< Number of function keys */
        size_t      composes;        /**< Number of compose definitions in actual use */
+
+       size_t      keymaps_total;
+       size_t      functions_total;
+       size_t      composes_total;
 };
 
 /**

diff --git a/src/libkeymap/keymap/kmap.h b/src/libkeymap/keymap/kmap.h
index b16d31f..e4dd90c 100644 (file)
--- a/src/libkeymap/keymap/kmap.h
+++ b/src/libkeymap/keymap/kmap.h
@@ -11,8 +11,7 @@
 int lk_add_map(struct lk_ctx *ctx,   unsigned int k_table);
 int lk_map_exists(struct lk_ctx *ctx, unsigned int k_table);
 
-int lk_maps_total(struct lk_ctx *ctx);
-int lk_keys_total(struct lk_ctx *ctx, unsigned int k_table);
+int lk_get_keys_total(struct lk_ctx *ctx, unsigned int k_table);
 
 int lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int keycode);
 int lk_del_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index);

diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c
index 08978db..28b9098 100644 (file)
--- a/src/libkeymap/kmap.c
+++ b/src/libkeymap/kmap.c
@@ -17,13 +17,7 @@ lk_map_exists(struct lk_ctx *ctx, unsigned int k_table)
 }
 
 int
-lk_maps_total(struct lk_ctx *ctx)
-{
-       return ctx->keymap->total;
-}
-
-int
-lk_keys_total(struct lk_ctx *ctx, unsigned int k_table)
+lk_get_keys_total(struct lk_ctx *ctx, unsigned int k_table)
 {
        struct lk_array *map;
        map = lk_array_get_ptr(ctx->keymap, k_table);

diff --git a/src/libkeymap/summary.c b/src/libkeymap/summary.c
index ae36446..46df90d 100644 (file)
--- a/src/libkeymap/summary.c
+++ b/src/libkeymap/summary.c
@@ -68,6 +68,10 @@ lk_get_kmapinfo(struct lk_ctx *ctx, struct kmapinfo *res)
        res->functions = ctx->func_table->count;
        res->composes  = ctx->accent_table->count;
 
+       res->keymaps_total   = ctx->keymap->total;
+       res->functions_total = ctx->func_table->total;
+       res->composes_total  = ctx->accent_table->total;
+
        res->keymaps_alloced = 0;
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {