home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
All members of structs Win and WinMeta are now officially visible externally, removed...
[plomrogue]
/
src
/
wincontrol.c
diff --git
a/src/wincontrol.c
b/src/wincontrol.c
index d4f01f8ba3d4ca6578d218713e5570092c89d4aa..5ebc0573c60592218449174c2ff53de87a5653ba 100644
(file)
--- a/
src/wincontrol.c
+++ b/
src/wincontrol.c
@@
-2,7
+2,7
@@
#include "wincontrol.h"
#include <stdlib.h> /* for free() */
#include "wincontrol.h"
#include <stdlib.h> /* for free() */
-#include <string.h> /* for strlen() */
+#include <string.h> /* for strlen()
, strchr(), strstr()
*/
#include <stdint.h> /* for uint8_t, uint16_t */
#include <stdio.h> /* for fwrite() */
#include <unistd.h> /* for access(), unlink() */
#include <stdint.h> /* for uint8_t, uint16_t */
#include <stdio.h> /* for fwrite() */
#include <unistd.h> /* for access(), unlink() */
@@
-55,7
+55,7
@@
static void set_winconf(struct World * world, char id);
/* Get WinConf by "id"; get id of WinConf mothering "win". */
static struct WinConf * get_winconf_by_id(struct World * world, char id);
/* Get WinConf by "id"; get id of WinConf mothering "win". */
static struct WinConf * get_winconf_by_id(struct World * world, char id);
-/* Get (Win->
_
draw) function identified by "c"; NULL if c not mapped to one. */
+/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
static void * get_drawfunc_by_char(char c);
/* Iterate over bytes of world->winconf_ids array. Re-start after null byte. */
static void * get_drawfunc_by_char(char c);
/* Iterate over bytes of world->winconf_ids array. Re-start after null byte. */
@@
-86,37
+86,42
@@
static void create_winconf(char id, struct WinConf * wcp)
static void init_winconf_from_file(struct World * world, char id)
{
static void init_winconf_from_file(struct World * world, char id)
{
- char * f_name = "init_winconf_from_file()";
+ char * tmp = "init_winconf_from_file() on window id '_'";
+ char * context = try_malloc(strlen(tmp) + 1, world,
+ "init_winconf_from_file()");
+ memcpy(context, tmp, strlen(tmp) + 1);
+ context[strlen(tmp) - 2] = id;
char * path = string_prefixed_id(world, "config/windows/Win_", id);
char * path = string_prefixed_id(world, "config/windows/Win_", id);
- FILE * file = try_fopen(path, "r", world,
f_name
);
+ FILE * file = try_fopen(path, "r", world,
context
);
free(path);
free(path);
- uint16_t linemax = get_linemax(file, world,
f_name
);
+ uint16_t linemax = get_linemax(file, world,
context
);
char line[linemax + 1];
struct WinConf * winconf = get_winconf_by_id(world, id);
char line[linemax + 1];
struct WinConf * winconf = get_winconf_by_id(world, id);
- try_fgets(line, linemax + 1, file, world,
f_name
);
- winconf->title = try_malloc(strlen(line), world,
f_name
);
+ try_fgets(line, linemax + 1, file, world,
context
);
+ winconf->title = try_malloc(strlen(line), world,
context
);
memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */
memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */
- try_fgets(line, linemax + 1, file, world,
f_name
);
+ try_fgets(line, linemax + 1, file, world,
context
);
winconf->draw = line[0];
winconf->draw = line[0];
- try_fgets(line, linemax + 1, file, world,
f_name
);
+ try_fgets(line, linemax + 1, file, world,
context
);
winconf->height = atoi(line);
if (0 >= winconf->height)
{
winconf->height_type = 1;
}
winconf->height = atoi(line);
if (0 >= winconf->height)
{
winconf->height_type = 1;
}
- try_fgets(line, linemax + 1, file, world,
f_name
);
+ try_fgets(line, linemax + 1, file, world,
context
);
winconf->width = atoi(line);
if (0 >= winconf->width)
{
winconf->width_type = 1;
}
winconf->width = atoi(line);
if (0 >= winconf->width)
{
winconf->width_type = 1;
}
- try_fclose(file, world, f_name);
+ try_fclose(file, world, context);
+ free(context);
}
}
@@
-377,6
+382,10
@@
extern void sorted_wintoggle(struct World * world)
uint8_t i = 0;
for (; i < linemax - 1; i++)
{
uint8_t i = 0;
for (; i < linemax - 1; i++)
{
+ if (NULL == strchr(world->winconf_ids, win_order[i]))
+ {
+ continue;
+ }
toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
}
}
toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
}
}
@@
-413,13
+422,13
@@
extern void save_win_configs(struct World * world)
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];
- struct Win * w_p = world->wmeta->
_
chain_start;
+ struct Win * w_p = world->wmeta->chain_start;
uint8_t i = 0;
while (0 != w_p)
{
struct WinConf * wc = get_winconf_by_win(world, w_p);
line[i] = wc->id;
uint8_t i = 0;
while (0 != w_p)
{
struct WinConf * wc = get_winconf_by_win(world, w_p);
line[i] = wc->id;
- w_p = w_p->
_
next;
+ w_p = w_p->next;
i++;
}
line[i] = '\n';
i++;
}
line[i] = '\n';
@@
-449,12
+458,12
@@
extern void toggle_winconfig(struct World * world, struct Win * win)
struct WinConf * wcp = get_winconf_by_win(world, win);
if (0 == wcp->view)
{
struct WinConf * wcp = get_winconf_by_win(world, win);
if (0 == wcp->view)
{
- win->
_
draw = draw_winconf;
+ win->draw = draw_winconf;
wcp->view = 1;
}
else
{
wcp->view = 1;
}
else
{
- win->
_
draw = get_drawfunc_by_char(wcp->draw);
+ win->draw = get_drawfunc_by_char(wcp->draw);
wcp->view = 0;
}
}
wcp->view = 0;
}
}