home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In client, keybinding databases now store keybindings as arrays instead
[plomrogue]
/
src
/
client
/
windows.c
diff --git
a/src/client/windows.c
b/src/client/windows.c
index b0734dc5cca71989e1b7bc9137b0a5dd33f62952..763178bf596465660b1f2ea4fa084504e7a12092 100644
(file)
--- a/
src/client/windows.c
+++ b/
src/client/windows.c
@@
-23,7
+23,7
@@
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_global()
*/
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_global()
*/
-#include "keybindings.h" /*
free_keybindings(),
write_keybidings_to_file(),
+#include "keybindings.h" /* write_keybidings_to_file(),
* read_keybindings_from_file()
*/
#include "misc.h" /* array_append() */
* read_keybindings_from_file()
*/
#include "misc.h" /* array_append() */
@@
-551,8
+551,8
@@
static void suspend_win(struct Win * w)
-extern uint16_t center_offset(uint16_t position, uint
16
_t mapsize,
- uint
16
_t frame_size)
+extern uint16_t center_offset(uint16_t position, uint
32
_t mapsize,
+ uint
32
_t frame_size)
{
uint16_t offset = 0;
if (mapsize > frame_size)
{
uint16_t offset = 0;
if (mapsize > frame_size)
@@
-739,7
+739,8
@@
extern void free_winDB()
{
struct Win * wc = get_win_by_id(id);
free(wc->title);
{
struct Win * wc = get_win_by_id(id);
free(wc->title);
- free_keybindings(wc->kb.kbs);
+ free(wc->kb.kbs);
+ wc->kb.kbs = NULL;
}
free(world.winDB.ids); /* NULL this too since add_win_to_winDB() checks */
world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/
}
free(world.winDB.ids); /* NULL this too since add_win_to_winDB() checks */
world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/