* Author: Daniel Stone <daniel@fooishbar.org>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <unistd.h>
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "utils.h"
+#include "xkb-priv.h"
+#include "atom.h"
struct xkb_context {
int refcnt;
- char **include_paths;
- int num_include_paths;
- int size_include_paths;
+
+ darray(char *) includes;
+
+ /* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
+ unsigned file_id;
+
+ struct atom_table *atom_table;
};
/**
* Append one directory to the context's include path.
*/
_X_EXPORT int
-xkb_context_include_path_append(struct xkb_context *context, const char *path)
+xkb_context_include_path_append(struct xkb_context *ctx, const char *path)
{
struct stat stat_buf;
int err;
-
- if (context->size_include_paths <= context->num_include_paths) {
- int new_size;
- char **new_paths;
- new_size = context->size_include_paths + 2;
- new_paths = uTypedRecalloc(context->include_paths,
- context->size_include_paths,
- new_size,
- typeof(new_paths));
- if (!new_paths)
- return 0;
- context->include_paths = new_paths;
- context->size_include_paths = new_size;
- }
+ char *tmp;
err = stat(path, &stat_buf);
if (err != 0)
return 0;
if (!S_ISDIR(stat_buf.st_mode))
return 0;
+
+#if defined(HAVE_EACCESS)
if (eaccess(path, R_OK | X_OK) != 0)
return 0;
+#elif defined(HAVE_EUIDACCESS)
+ if (euidaccess(path, R_OK | X_OK) != 0)
+ return 0;
+#endif
- context->include_paths[context->num_include_paths] = strdup(path);
- if (!context->include_paths[context->num_include_paths])
+ tmp = strdup(path);
+ if (!tmp)
return 0;
- context->num_include_paths++;
+ darray_append(ctx->includes, tmp);
return 1;
}
* Append the default include directories to the context.
*/
_X_EXPORT int
-xkb_context_include_path_append_default(struct xkb_context *context)
+xkb_context_include_path_append_default(struct xkb_context *ctx)
{
- const char *home = getenv("HOME");
+ const char *home;
char *user_path;
int err;
- (void) xkb_context_include_path_append(context, DFLT_XKB_CONFIG_ROOT);
+ (void) xkb_context_include_path_append(ctx, DFLT_XKB_CONFIG_ROOT);
home = getenv("HOME");
if (!home)
err = asprintf(&user_path, "%s/.xkb", home);
if (err <= 0)
return 1;
- (void) xkb_context_include_path_append(context, user_path);
+ (void) xkb_context_include_path_append(ctx, user_path);
free(user_path);
return 1;
* Remove all entries in the context's include path.
*/
_X_EXPORT void
-xkb_context_include_path_clear(struct xkb_context *context)
+xkb_context_include_path_clear(struct xkb_context *ctx)
{
- int i;
+ char **path;
- for (i = 0; i < context->num_include_paths; i++) {
- free(context->include_paths[i]);
- context->include_paths[i] = NULL;
- }
- free(context->include_paths);
- context->include_paths = NULL;
- context->num_include_paths = 0;
+ darray_foreach(path, ctx->includes)
+ free(*path);
+
+ darray_free(ctx->includes);
}
/**
* xkb_context_include_path_clear() + xkb_context_include_path_append_default()
*/
_X_EXPORT int
-xkb_context_include_path_reset_defaults(struct xkb_context *context)
+xkb_context_include_path_reset_defaults(struct xkb_context *ctx)
{
- xkb_context_include_path_clear(context);
- return xkb_context_include_path_append_default(context);
+ xkb_context_include_path_clear(ctx);
+ return xkb_context_include_path_append_default(ctx);
}
/**
* Returns the number of entries in the context's include path.
*/
_X_EXPORT unsigned int
-xkb_context_num_include_paths(struct xkb_context *context)
+xkb_context_num_include_paths(struct xkb_context *ctx)
{
- return context->num_include_paths;
+ return darray_size(ctx->includes);
}
/**
* invalid index is passed.
*/
_X_EXPORT const char *
-xkb_context_include_path_get(struct xkb_context *context, unsigned int idx)
+xkb_context_include_path_get(struct xkb_context *ctx, unsigned int idx)
{
- if (idx >= xkb_context_num_include_paths(context))
+ if (idx >= xkb_context_num_include_paths(ctx))
return NULL;
- return context->include_paths[idx];
+ return darray_item(ctx->includes, idx);
+}
+
+unsigned
+xkb_context_take_file_id(struct xkb_context *ctx)
+{
+ return ctx->file_id++;
}
/**
* Take a new reference on the context.
*/
_X_EXPORT struct xkb_context *
-xkb_context_ref(struct xkb_context *context)
+xkb_context_ref(struct xkb_context *ctx)
{
- context->refcnt++;
- return context;
+ ctx->refcnt++;
+ return ctx;
}
/**
* now 0.
*/
_X_EXPORT void
-xkb_context_unref(struct xkb_context *context)
+xkb_context_unref(struct xkb_context *ctx)
{
- if (--context->refcnt > 0)
+ if (--ctx->refcnt > 0)
return;
- xkb_context_include_path_clear(context);
- free(context);
+ xkb_context_include_path_clear(ctx);
+ atom_table_free(ctx->atom_table);
+ free(ctx);
}
/**
* Create a new context.
*/
_X_EXPORT struct xkb_context *
-xkb_context_new(void)
+xkb_context_new(enum xkb_context_flags flags)
{
- struct xkb_context *context = calloc(1, sizeof(*context));
+ struct xkb_context *ctx = calloc(1, sizeof(*ctx));
- if (!context)
+ if (!ctx)
return NULL;
- context->refcnt = 1;
+ ctx->refcnt = 1;
+
+ if (!(flags & XKB_CONTEXT_NO_DEFAULT_INCLUDES) &&
+ !xkb_context_include_path_append_default(ctx)) {
+ xkb_context_unref(ctx);
+ return NULL;
+ }
- if (!xkb_context_include_path_append_default(context)) {
- xkb_context_unref(context);
+ ctx->atom_table = atom_table_new();
+ if (!ctx->atom_table) {
+ xkb_context_unref(ctx);
return NULL;
}
- return context;
+ return ctx;
+}
+
+xkb_atom_t
+xkb_atom_intern(struct xkb_context *ctx, const char *string)
+{
+ return atom_intern(ctx->atom_table, string);
+}
+
+char *
+xkb_atom_strdup(struct xkb_context *ctx, xkb_atom_t atom)
+{
+ return atom_strdup(ctx->atom_table, atom);
+}
+
+const char *
+xkb_atom_text(struct xkb_context *ctx, xkb_atom_t atom)
+{
+ return atom_text(ctx->atom_table, atom);
}
projects / platform / upstream / libxkbcommon.git / blobdiff