home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Individual map objects are now identified by unique numbers stored in the savefiles...
[plomrogue]
/
src
/
wincontrol.c
diff --git
a/src/wincontrol.c
b/src/wincontrol.c
index 6095d36a7a25dcd17f9888d0566edbea1929ce66..529457c0dc866f19e7cec44a2544cdd1b589099d 100644
(file)
--- a/
src/wincontrol.c
+++ b/
src/wincontrol.c
@@
-17,12
+17,13
@@
#include "rexit.h" /* for exit_err() */
#include "main.h" /* for World struct */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
#include "rexit.h" /* for exit_err() */
#include "main.h" /* for World struct */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
- * draw_win_keybindings_global(),
+ * draw_win_available_keybindings(),
+ * draw_win_keybindings_global(), draw_win_inventory(),
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
-#include "misc.h" /* for try_malloc() */
+#include "misc.h" /* for try_malloc()
, trouble_msg()
*/
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
@@
-172,7
+173,7
@@
static void init_win_from_winconf(struct World * world, char id)
-
extern
void save_win_config(struct World * world, char id)
+
static
void save_win_config(struct World * world, char id)
{
char * f_name = "save_win_config()";
{
char * f_name = "save_win_config()";
@@
-275,6
+276,10
@@
static struct WinConf * get_winconf_by_id(struct World * world, char id)
static void * get_drawfunc_by_char(char c)
{
static void * get_drawfunc_by_char(char c)
{
+ if ('c' == c)
+ {
+ return draw_win_inventory;
+ }
if ('i' == c)
{
return draw_win_info;
if ('i' == c)
{
return draw_win_info;
@@
-283,6
+288,10
@@
static void * get_drawfunc_by_char(char c)
{
return draw_win_log;
}
{
return draw_win_log;
}
+ else if ('k' == c)
+ {
+ return draw_win_available_keybindings;
+ }
else if ('m' == c)
{
return draw_win_map;
else if ('m' == c)
{
return draw_win_map;
@@
-419,15
+428,24
@@
extern void init_wins(struct World * world)
-extern void sorted_wintoggle(struct World * world)
+extern void sorted_wintoggle
_and_activate
(struct World * world)
{
{
- char * f_name = "sorted_wintoggle()";
- char * path = "config/windows/toggle_order";
+ char * f_name = "sorted_wintoggle_and_activate()";
+
+ char * path = "config/windows/toggle_order_and_active";
FILE * file = try_fopen(path, "r", world, f_name);
uint16_t linemax = get_linemax(file, world, f_name);
FILE * file = try_fopen(path, "r", world, f_name);
uint16_t linemax = get_linemax(file, world, f_name);
+
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, world, f_name);
char win_order[linemax + 1];
try_fgets(win_order, linemax + 1, file, world, f_name);
+
+ uint8_t a = 0;
+ char * err = trouble_msg(world, f_name, "read_uint8()");
+ exit_err(read_uint8(file, &a), world, err);
+ free(err);
+
try_fclose(file, world, f_name);
try_fclose(file, world, f_name);
+
uint8_t i = 0;
for (; i < linemax - 1; i++)
{
uint8_t i = 0;
for (; i < linemax - 1; i++)
{
@@
-435,7
+453,13
@@
extern void sorted_wintoggle(struct World * world)
{
continue;
}
{
continue;
}
- toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
+ struct Win * win = get_win_by_id(world, win_order[i]);
+ toggle_window(world->wmeta, win);
+
+ if (a == (uint8_t) win_order[i])
+ {
+ world->wmeta->active = win;
+ }
}
}
}
}
@@
-450,7
+474,7
@@
extern void reload_win_config(struct World * world)
free_winconfs(world);
init_winconfs(world);
init_wins(world);
free_winconfs(world);
init_winconfs(world);
init_wins(world);
- sorted_wintoggle(world);
+ sorted_wintoggle
_and_activate
(world);
}
}
@@
-465,8
+489,8
@@
extern void save_win_configs(struct World * world)
save_win_config(world, id);
}
save_win_config(world, id);
}
- char * path = "config/windows/toggle_order";
- char * path_tmp = "config/windows/toggle_order_tmp";
+ char * path = "config/windows/toggle_order
_and_active
";
+ char * path_tmp = "config/windows/toggle_order_
and_active_
tmp";
FILE * file = try_fopen(path_tmp, "w", world, f_name);
char line[6];
FILE * file = try_fopen(path_tmp, "w", world, f_name);
char line[6];
@@
-481,6
+505,11
@@
extern void save_win_configs(struct World * world)
}
line[i] = '\n';
try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
}
line[i] = '\n';
try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
+ if (0 != world->wmeta->active)
+ {
+ struct WinConf * wc = get_winconf_by_win(world, world->wmeta->active);
+ write_uint8(wc->id, file);
+ }
try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
}
try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
}