mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-19 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/keybind.c: move keybind_print() to dbg.c

Browse source
This commit is contained in:
Johan Malm 2020-06-18 20:39:55 +01:00
parent 7440919452
commit f6578248c0
6 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/labwc.h
View file

@ -182,5 +182,6 @@ void action(struct server *server, struct keybind *keybind);
void dbg_show_one_view(struct view *view); void dbg_show_one_view(struct view *view);
void dbg_show_views(struct server *server); void dbg_show_views(struct server *server);
void dbg_show_keybinds();
#endif /* LABWC_H */ #endif /* LABWC_H */

10
src/config/keybind.c
View file

@ -60,13 +60,3 @@ void keybind_init()
keybind_add(&rc.keybinds, "A-Tab", "NextWindow"); keybind_add(&rc.keybinds, "A-Tab", "NextWindow");
keybind_add(&rc.keybinds, "A-F3", "Execute"); keybind_add(&rc.keybinds, "A-F3", "Execute");
} }
void keybind_print()
{
struct keybind *keybind;
wl_list_for_each_reverse (keybind, &rc.keybinds, link) {
printf("KEY=%s-", keybind->action);
for (size_t i = 0; i < keybind->keysyms_len; i++)
printf(" %d\n", keybind->keysyms[i]);
}
}

4
src/config/rcxml.c
View file

@ -168,7 +168,6 @@ void rcxml_init()
LIBXML_TEST_VERSION LIBXML_TEST_VERSION
wl_list_init(&rc.keybinds); wl_list_init(&rc.keybinds);
keybind_init(); keybind_init();
keybind_print();
} }
void rcxml_read(const char *filename) void rcxml_read(const char *filename)
@ -176,7 +175,6 @@ void rcxml_read(const char *filename)
FILE *stream; FILE *stream;
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
ssize_t n_read;
struct buf b; struct buf b;
/* Read <filename> into buffer and then call rcxml_parse_xml() */ /* Read <filename> into buffer and then call rcxml_parse_xml() */
@ -186,7 +184,7 @@ void rcxml_read(const char *filename)
return; return;
} }
buf_init(&b); buf_init(&b);
while ((n_read = getline(&line, &len, stream) != -1)) { while (getline(&line, &len, stream) != -1) {
char *p = strrchr(line, '\n'); char *p = strrchr(line, '\n');
if (p) if (p)
*p = '\0'; *p = '\0';

11
src/debug/dbg.c
View file

@ -1,4 +1,5 @@
#include "labwc.h" #include "labwc.h"
#include "rcxml.h"
static void show_one_xdg_view(struct view *view) static void show_one_xdg_view(struct view *view)
{ {
@ -72,3 +73,13 @@ void dbg_show_views(struct server *server)
wl_list_for_each_reverse (view, &server->views, link) wl_list_for_each_reverse (view, &server->views, link)
dbg_show_one_view(view); dbg_show_one_view(view);
} }
void dbg_show_keybinds()
{
struct keybind *keybind;
wl_list_for_each_reverse (keybind, &rc.keybinds, link) {
printf("KEY=%s-", keybind->action);
for (size_t i = 0; i < keybind->keysyms_len; i++)
printf(" %d\n", keybind->keysyms[i]);
}
}

1
src/output.c
View file

@ -51,7 +51,6 @@ static void render_decorations(struct wlr_output *output, struct view *view)
draw_rect(&ddata, deco_box(view, LAB_DECO_PART_BOTTOM)); draw_rect(&ddata, deco_box(view, LAB_DECO_PART_BOTTOM));
draw_rect(&ddata, deco_box(view, LAB_DECO_PART_LEFT)); draw_rect(&ddata, deco_box(view, LAB_DECO_PART_LEFT));
if (view_hasfocus(view)) if (view_hasfocus(view))
ddata.rgba = theme.window_active_title_bg_color; ddata.rgba = theme.window_active_title_bg_color;
else else

3
src/theme/theme.c
View file

@ -85,14 +85,13 @@ void theme_read(const char *filename)
FILE *stream; FILE *stream;
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
ssize_t n_read;
stream = fopen(filename, "r"); stream = fopen(filename, "r");
if (!stream) { if (!stream) {
fprintf(stderr, "warn: cannot read '%s'\n", filename); fprintf(stderr, "warn: cannot read '%s'\n", filename);
return; return;
} }
while ((n_read = getline(&line, &len, stream) != -1)) { while (getline(&line, &len, stream) != -1) {
char *p = strrchr(line, '\n'); char *p = strrchr(line, '\n');
if (p) if (p)
*p = '\0'; *p = '\0';