#include <stdio.h>
#endif
-typedef void (*ObtDDParseGroupFunc)(const gchar *group,
- const gchar *key,
- const gchar *value);
+typedef struct _ObtDDParse ObtDDParse;
+typedef struct _ObtDDParseGroup ObtDDParseGroup;
-typedef struct _ObtDDParseGroup {
+typedef void (*ObtDDParseGroupFunc)(gchar *key, const gchar *val,
+ ObtDDParse *parse, gboolean *error);
+
+struct _ObtDDParseGroup {
gchar *name;
gboolean seen;
- ObtDDParseGroupFunc func;
-} ObtDDParseGroup;
+ ObtDDParseGroupFunc key_func;
+ /* the key is a string (a key inside the group in the .desktop).
+ the value is an ObtDDParseValue */
+ GHashTable *key_hash;
+};
-typedef struct _ObtDDParse {
+struct _ObtDDParse {
gchar *filename;
gulong lineno;
ObtDDParseGroup *group;
+ /* the key is a group name, the value is a ObtDDParseGroup */
GHashTable *group_hash;
-} ObtDDParse;
+};
typedef enum {
DATA_STRING,
DATA_LOCALESTRING,
+ DATA_STRINGS,
+ DATA_LOCALESTRINGS,
DATA_BOOLEAN,
DATA_NUMERIC,
NUM_DATA_TYPES
} ObtDDDataType;
+typedef struct _ObtDDParseValue {
+ ObtDDDataType type;
+ union _ObtDDParseValueValue {
+ gchar *string;
+ struct _ObtDDParseValueStrings {
+ gchar *s;
+ gulong n;
+ } strings;
+ gboolean boolean;
+ gfloat numeric;
+ } value;
+} ObtDDParseValue;
+
struct _ObtDDFile {
guint ref;
gchar *icon; /*!< Name/path for an icon for the object */
union _ObtDDFileData {
- struct {
+ struct _ObtDDFileApp {
gchar *exec; /*!< Executable to run for the app */
gchar *wdir; /*!< Working dir to run the app in */
gboolean term; /*!< Run the app in a terminal or not */
ObtDDFileAppStartup startup;
gchar *startup_wmclass;
} app;
- struct {
+ struct _ObtDDFileLink {
gchar *url;
} link;
- struct {
+ struct _ObtDDFileDir {
} dir;
} d;
};
+static void value_free(ObtDDParseValue *v)
+{
+ switch (v->type) {
+ case DATA_STRING:
+ case DATA_LOCALESTRING:
+ g_free(v->value.string); break;
+ case DATA_STRINGS:
+ case DATA_LOCALESTRINGS:
+ g_free(v->value.strings.s);
+ v->value.strings.n = 0;
+ break;
+ case DATA_BOOLEAN:
+ break;
+ case DATA_NUMERIC:
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ g_slice_free(ObtDDParseValue, v);
+}
+
+static ObtDDParseGroup* group_new(gchar *name, ObtDDParseGroupFunc f)
+{
+ ObtDDParseGroup *g = g_slice_new(ObtDDParseGroup);
+ g->name = name;
+ g->key_func = f;
+ g->seen = FALSE;
+ g->key_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, (GDestroyNotify)value_free);
+ return g;
+}
+
static void group_free(ObtDDParseGroup *g)
{
g_free(g->name);
+ g_hash_table_destroy(g->key_hash);
g_slice_free(ObtDDParseGroup, g);
}
}
/* reads an input string, strips out invalid stuff, and parses
- backslash-stuff */
-static gchar* parse_string(const gchar *in, gboolean locale,
+ backslash-stuff
+ if @nstrings is not NULL, then it splits the output string at ';'
+ characters. they are all returned in the same string with null zeros
+ between them, @nstrings is set to the number of such strings.
+ */
+static gchar* parse_string(const gchar *in,
+ gboolean locale,
+ gulong *nstrings,
const ObtDDParse *const parse,
gboolean *error)
{
else if (!g_utf8_validate(in, bytes, &end))
parse_error("Invalid bytes in localestring", parse, error);
+ if (nstrings) *nstrings = 1;
+
out = g_new(char, bytes + 1);
i = in; o = out;
backslash = FALSE;
case 'n': *o++ = '\n'; break;
case 't': *o++ = '\t'; break;
case 'r': *o++ = '\r'; break;
+ case ';': *o++ = ';'; break;
case '\\': *o++ = '\\'; break;
default:
parse_error((locale ?
}
else if (*i == '\\')
backslash = TRUE;
+ else if (*i == ';' && nstrings) {
+ ++nstrings;
+ *o = '\0';
+ }
else if ((guchar)*i >= 127 || (guchar)*i < 32) {
/* avoid ascii control characters */
parse_error("Found control character in string", parse, error);
return FALSE;
}
-static float parse_numeric(const gchar *in, const ObtDDParse *const parse,
+static gfloat parse_numeric(const gchar *in, const ObtDDParse *const parse,
gboolean *error)
{
- float out = 0;
+ gfloat out = 0;
if (sscanf(in, "%f", &out) == 0)
parse_error("Invalid numeric value", parse, error);
return out;
}
-gboolean parse_file_line(FILE *f, gchar **buf, gulong *size, gulong *read,
- ObtDDParse *parse, gboolean *error)
+static void parse_group_desktop_entry(gchar *key, const gchar *val,
+ ObtDDParse *parse, gboolean *error)
+{
+ ObtDDParseValue v, *pv;
+
+ /* figure out value type */
+ v.type = NUM_DATA_TYPES;
+
+ /* parse the value */
+
+ switch (v.type) {
+ case DATA_STRING:
+ v.value.string = parse_string(val, FALSE, NULL, parse, error);
+ g_assert(v.value.string);
+ break;
+ case DATA_LOCALESTRING:
+ v.value.string = parse_string(val, TRUE, NULL, parse, error);
+ g_assert(v.value.string);
+ break;
+ case DATA_STRINGS:
+ v.value.strings.s = parse_string(val, FALSE, &v.value.strings.n,
+ parse, error);
+ g_assert(v.value.strings.s);
+ g_assert(v.value.strings.n);
+ break;
+ case DATA_LOCALESTRINGS:
+ v.value.strings.s = parse_string(val, TRUE, &v.value.strings.n,
+ parse, error);
+ g_assert(v.value.strings.s);
+ g_assert(v.value.strings.n);
+ break;
+ case DATA_BOOLEAN:
+ v.value.boolean = parse_bool(val, parse, error);
+ break;
+ case DATA_NUMERIC:
+ v.value.numeric = parse_numeric(val, parse, error);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+
+ pv = g_slice_new(ObtDDParseValue);
+ *pv = v;
+ g_hash_table_insert(parse->group->key_hash, key, pv);
+}
+
+static gboolean parse_file_line(FILE *f, gchar **buf,
+ gulong *size, gulong *read,
+ ObtDDParse *parse, gboolean *error)
{
const gulong BUFMUL = 80;
size_t ret;
}
else {
if (!g) {
- g = g_slice_new(ObtDDParseGroup);
- g->name = group;
- g->func = NULL;
- g_hash_table_insert(parse->group_hash, group, g);
+ g = group_new(group, NULL);
+ g_hash_table_insert(parse->group_hash, g->name, g);
}
else
g_free(group);
}
}
+static void parse_key_value(const gchar *buf, gulong len,
+ ObtDDParse *parse, gboolean *error)
+{
+ gulong i, keyend, valstart, eq;
+ char *key;
+
+ /* find the end of the key */
+ for (i = 0; i < len; ++i)
+ if (!(((guchar)buf[i] >= 'A' && (guchar)buf[i] <= 'Z') ||
+ ((guchar)buf[i] >= 'a' && (guchar)buf[i] <= 'z') ||
+ ((guchar)buf[i] >= '0' && (guchar)buf[i] <= '9') ||
+ ((guchar)buf[i] == '-'))) {
+ /* not part of the key */
+ keyend = i;
+ break;
+ }
+ if (keyend < 1) {
+ parse_error("Empty key", parse, error);
+ return;
+ }
+ /* find the = character */
+ for (i = keyend; i < len; ++i) {
+ if (buf[i] == '=') {
+ eq = i;
+ break;
+ }
+ else if (buf[i] != ' ') {
+ parse_error("Invalid character in key name", parse, error);
+ return ;
+ }
+ }
+ if (i == len) {
+ parse_error("Key without value found", parse, error);
+ return;
+ }
+ /* find the start of the value */
+ for (i = eq+1; i < len; ++i)
+ if (buf[i] != ' ') {
+ valstart = i;
+ break;
+ }
+ if (i == len) {
+ parse_error("Empty value found", parse, error);
+ return;
+ }
+
+ key = g_strndup(buf, keyend);
+ if (g_hash_table_lookup(parse->group->key_hash, key)) {
+ parse_error("Duplicate key found", parse, error);
+ g_free(key);
+ return;
+ }
+ g_print("Found key/value %s=%s.\n", key, buf+valstart);
+ if (parse->group->key_func)
+ parse->group->key_func(key, buf+valstart, parse, error);
+}
+
static gboolean parse_file(ObtDDFile *dd, FILE *f, ObtDDParse *parse)
{
gchar *buf = NULL;
; /* ignore comment lines */
else if (buf[0] == '[' && buf[len-1] == ']')
parse_group(buf, len, parse, &error);
+ else if (!parse->group)
+ /* just ignore keys outside of groups */
+ parse_error("Key found before group", parse, NULL);
+ else
+ /* ignore errors in key-value pairs and continue */
+ parse_key_value(buf, len, parse, NULL);
++parse->lineno;
}
{
ObtDDFile *dd;
ObtDDParse parse;
+ ObtDDParseGroup *desktop_entry;
GSList *it;
FILE *f;
+ gboolean success;
dd = g_slice_new(ObtDDFile);
dd->ref = 1;
parse.filename = NULL;
parse.lineno = 0;
parse.group = NULL;
- /* hashtable keys are group names, value is a ObtDDParseGroup */
parse.group_hash = g_hash_table_new_full(g_str_hash,
g_str_equal,
NULL,
(GDestroyNotify)group_free);
- f = NULL;
- for (it = paths; it && !f; it = g_slist_next(it)) {
+ /* set up the groups (there's only one right now) */
+ desktop_entry = group_new(g_strdup("Desktop Entry"),
+ parse_group_desktop_entry);
+ g_hash_table_insert(parse.group_hash, desktop_entry->name, desktop_entry);
+
+ success = FALSE;
+ for (it = paths; it && !success; it = g_slist_next(it)) {
gchar *path = g_strdup_printf("%s/%s", (char*)it->data, name);
if ((f = fopen(path, "r"))) {
parse.filename = path;
parse.lineno = 1;
- if (!parse_file(dd, f, &parse)) f = NULL;
+ success = parse_file(dd, f, &parse);
+ fclose(f);
}
g_free(path);
}
- if (!f) {
+ if (!success) {
obt_ddfile_unref(dd);
dd = NULL;
}
projects / chaz / openbox / blobdiff