dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-07-12 22:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop wld and implement our own pangocairo renderer

Browse Source
This commit is contained in:
Stacy Harper
2021-08-24 18:52:05 +02:00
committed by John Sullivan
parent 9b53b2c836
commit c806023fd5
10 changed files with 210 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
keyboard.h
View File

@ -91,7 +91,7 @@ struct kbd {
static inline void draw_inset(struct drwsurf *d, uint32_t x, uint32_t y,
uint32_t width, uint32_t height, uint32_t border,
uint32_t color);
Color color);
static void kbd_init(struct kbd *kb, struct layout * layouts, char * layer_names_list);
static void kbd_init_layout(struct layout *l, uint32_t width, uint32_t height);
@ -406,10 +406,8 @@ kbd_draw_key(struct kbd *kb, struct key *k, bool pressed) {
label);
struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1);
Color *fill = pressed ? &scheme->high : &scheme->fg;
draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, fill->color);
uint32_t xoffset = k->w / (strlen(label) + 2);
wld_draw_text(d->render, d->ctx->font, scheme->text.color, k->x + xoffset,
k->y + (k->h / 2), label, -1, NULL);
draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, *fill);
drw_draw_text(d, scheme->text, k->x, k->y, k->w, k->h, label);
}
void
@ -419,7 +417,7 @@ kbd_draw_layout(struct kbd *kb) {
bool pressed = false;
if (debug) fprintf(stderr, "Draw layout");
wld_fill_rectangle(d->render, kb->scheme.bg.color, 0, 0, kb->w, kb->h);
drw_fill_rectangle(d, kb->scheme.bg, 0, 0, kb->w, kb->h);
while (next_key->type != Last) {
if ((next_key->type == Pad) || (next_key->type == EndRow)) {
@ -452,7 +450,7 @@ kbd_resize(struct kbd *kb, uint32_t w, uint32_t h, struct layout *layouts,
void
draw_inset(struct drwsurf *d, uint32_t x, uint32_t y, uint32_t width,
uint32_t height, uint32_t border, uint32_t color) {
wld_fill_rectangle(d->render, color, x + border, y + border, width - border,
uint32_t height, uint32_t border, Color color) {
drw_fill_rectangle(d, color, x + border, y + border, width - border,
height - border);
}