mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix gtk accelerator loading

Browse Source
This commit is contained in:
Vincent Sanders 2018-04-22 13:10:16 +01:00
parent b94b96e272
commit d196ea7795
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontends/gtk/accelerator.c
View File

@ -25,36 +25,55 @@
#include <stdint.h>
#include <gtk/gtk.h>
#include "utils/log.h"
#include "utils/errors.h"
#include "utils/hashtable.h"
#include "gtk/resources.h"
#include "gtk/accelerator.h"
/** acclelerators are stored in a fixed-size hash table. */
#define HASH_SIZE 53
/** The hash table used to store the accelerators */
static struct hash_table *accelerators_hash = NULL;
nserror nsgtk_accelerator_init(char **respaths)
{
nserror ret;
nserror res;
const uint8_t *data;
size_t data_size;
ret = nsgtk_data_from_resname("accelerators", &data, &data_size);
if (ret == NSERROR_OK) {
//ret = hashtable_add_from_inline(data, data_size);
if (accelerators_hash == NULL) {
accelerators_hash = hash_create(HASH_SIZE);
}
if (accelerators_hash == NULL) {
NSLOG(netsurf, INFO, "Unable to create hash table");
return NSERROR_NOMEM;
}
res = nsgtk_data_from_resname("accelerators", &data, &data_size);
if (res == NSERROR_OK) {
res = hash_add_inline(accelerators_hash, data, data_size);
} else {
const char *accelerators;
const char *accelerators_path;
/* Obtain path to accelerators */
ret = nsgtk_path_from_resname("accelerators", &accelerators);
if (ret == NSERROR_OK) {
//ret = hashtable_add_from_file(messages);
res = nsgtk_path_from_resname("accelerators",
&accelerators_path);
if (res == NSERROR_OK) {
res = hash_add_file(accelerators_hash,
accelerators_path);
}
}
return ret;
return res;
}
const char *nsgtk_accelerator_get_desc(const char *key)
{
if ((key == NULL) ||
(accelerators_hash == NULL)) {
return NULL;
}
return hash_get(accelerators_hash, key);
}

3
frontends/gtk/fetch.c
View File

@ -30,6 +30,7 @@
* ASCII hence not using locale dependant ctype functions for parsing.
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@ -39,8 +40,8 @@
#include <strings.h>
#include <gtk/gtk.h>
#include "utils/hashtable.h"
#include "utils/log.h"
#include "utils/hashtable.h"
#include "utils/filepath.h"
#include "utils/file.h"
#include "utils/nsurl.h"