diff options
Diffstat (limited to 'src/3rdparty/xkbcommon/src/context.c')
| -rw-r--r-- | src/3rdparty/xkbcommon/src/context.c | 179 |
1 files changed, 7 insertions, 172 deletions
diff --git a/src/3rdparty/xkbcommon/src/context.c b/src/3rdparty/xkbcommon/src/context.c index 8d56487004..e64b91542f 100644 --- a/src/3rdparty/xkbcommon/src/context.c +++ b/src/3rdparty/xkbcommon/src/context.c @@ -26,7 +26,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <ctype.h> #include <errno.h> #include <unistd.h> @@ -34,30 +33,6 @@ #include "utils.h" #include "context.h" -struct xkb_context { - int refcnt; - - ATTR_PRINTF(3, 0) void (*log_fn)(struct xkb_context *ctx, - enum xkb_log_level level, - const char *fmt, va_list args); - enum xkb_log_level log_level; - int log_verbosity; - void *user_data; - - struct xkb_rule_names names_dflt; - - darray(char *) includes; - darray(char *) failed_includes; - - struct atom_table *atom_table; - - /* Buffer for the *Text() functions. */ - char text_buffer[2048]; - size_t text_next; - - unsigned int use_environment_names : 1; -}; - /** * Append one directory to the context's include path. */ @@ -155,12 +130,6 @@ xkb_context_num_include_paths(struct xkb_context *ctx) return darray_size(ctx->includes); } -unsigned int -xkb_context_num_failed_include_paths(struct xkb_context *ctx) -{ - return darray_size(ctx->failed_includes); -} - /** * Returns the given entry in the context's include path, or NULL if an * invalid index is passed. @@ -174,16 +143,6 @@ xkb_context_include_path_get(struct xkb_context *ctx, unsigned int idx) return darray_item(ctx->includes, idx); } -const char * -xkb_context_failed_include_path_get(struct xkb_context *ctx, - unsigned int idx) -{ - if (idx >= xkb_context_num_failed_include_paths(ctx)) - return NULL; - - return darray_item(ctx->failed_includes, idx); -} - /** * Take a new reference on the context. */ @@ -214,15 +173,15 @@ log_level_to_prefix(enum xkb_log_level level) { switch (level) { case XKB_LOG_LEVEL_DEBUG: - return "Debug:"; + return "xkbcommon: DEBUG: "; case XKB_LOG_LEVEL_INFO: - return "Info:"; + return "xkbcommon: INFO: "; case XKB_LOG_LEVEL_WARNING: - return "Warning:"; + return "xkbcommon: WARNING: "; case XKB_LOG_LEVEL_ERROR: - return "Error:"; + return "xkbcommon: ERROR: "; case XKB_LOG_LEVEL_CRITICAL: - return "Critical:"; + return "xkbcommon: CRITICAL: "; default: return NULL; } @@ -235,7 +194,7 @@ default_log_fn(struct xkb_context *ctx, enum xkb_log_level level, const char *prefix = log_level_to_prefix(level); if (prefix) - fprintf(stderr, "%-10s", prefix); + fprintf(stderr, "%s", prefix); vfprintf(stderr, fmt, args); } @@ -246,7 +205,7 @@ log_level(const char *level) { errno = 0; lvl = strtol(level, &endptr, 10); - if (errno == 0 && (endptr[0] == '\0' || isspace(endptr[0]))) + if (errno == 0 && (endptr[0] == '\0' || is_space(endptr[0]))) return lvl; if (istreq_prefix("crit", level)) return XKB_LOG_LEVEL_CRITICAL; @@ -275,14 +234,6 @@ log_verbosity(const char *verbosity) { return 0; } -#ifndef DEFAULT_XKB_VARIANT -#define DEFAULT_XKB_VARIANT NULL -#endif - -#ifndef DEFAULT_XKB_OPTIONS -#define DEFAULT_XKB_OPTIONS NULL -#endif - /** * Create a new context. */ @@ -328,47 +279,6 @@ xkb_context_new(enum xkb_context_flags flags) return ctx; } -xkb_atom_t -xkb_atom_lookup(struct xkb_context *ctx, const char *string) -{ - return atom_lookup(ctx->atom_table, string); -} - -xkb_atom_t -xkb_atom_intern(struct xkb_context *ctx, const char *string) -{ - return atom_intern(ctx->atom_table, string, false); -} - -xkb_atom_t -xkb_atom_steal(struct xkb_context *ctx, char *string) -{ - return atom_intern(ctx->atom_table, string, true); -} - -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); -} - -void -xkb_log(struct xkb_context *ctx, enum xkb_log_level level, - const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - ctx->log_fn(ctx, level, fmt, args); - va_end(args); -} - XKB_EXPORT void xkb_context_set_log_fn(struct xkb_context *ctx, void (*log_fn)(struct xkb_context *ctx, @@ -415,78 +325,3 @@ xkb_context_set_user_data(struct xkb_context *ctx, void *user_data) { ctx->user_data = user_data; } - -char * -xkb_context_get_buffer(struct xkb_context *ctx, size_t size) -{ - char *rtrn; - - if (size >= sizeof(ctx->text_buffer)) - return NULL; - - if (sizeof(ctx->text_buffer) - ctx->text_next <= size) - ctx->text_next = 0; - - rtrn = &ctx->text_buffer[ctx->text_next]; - ctx->text_next += size; - - return rtrn; -} - -const char * -xkb_context_get_default_rules(struct xkb_context *ctx) -{ - const char *env = NULL; - - if (ctx->use_environment_names) - env = getenv("XKB_DEFAULT_RULES"); - - return env ? env : DEFAULT_XKB_RULES; -} - -const char * -xkb_context_get_default_model(struct xkb_context *ctx) -{ - const char *env = NULL; - - if (ctx->use_environment_names) - env = getenv("XKB_DEFAULT_MODEL"); - - return env ? env : DEFAULT_XKB_MODEL; -} - -const char * -xkb_context_get_default_layout(struct xkb_context *ctx) -{ - const char *env = NULL; - - if (ctx->use_environment_names) - env = getenv("XKB_DEFAULT_LAYOUT"); - - return env ? env : DEFAULT_XKB_LAYOUT; -} - -const char * -xkb_context_get_default_variant(struct xkb_context *ctx) -{ - const char *env = NULL; - const char *layout = getenv("XKB_DEFAULT_VARIANT"); - - /* We don't want to inherit the variant if they haven't also set a - * layout, since they're so closely paired. */ - if (layout && ctx->use_environment_names) - env = getenv("XKB_DEFAULT_VARIANT"); - - return env ? env : DEFAULT_XKB_VARIANT; -} - -const char * -xkb_context_get_default_options(struct xkb_context *ctx) -{ - const char *env = NULL; - - if (ctx->use_environment_names) - env = getenv("XKB_DEFAULT_OPTIONS"); - - return env ? env : DEFAULT_XKB_OPTIONS; -} |