dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-03-13 10:52:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ctx initializer

Browse Source
This commit is contained in:
Stacy Harper 2021-08-25 22:06:51 +02:00 committed by John Sullivan
parent 283a758910
commit b65ea995f1
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drw.c
View File

@ -5,18 +5,6 @@
#include "drw.h" #include "drw.h"
#include "shm_open.h" #include "shm_open.h"
void
drw_init(struct drw *d, const char *fc_pattern, void *shm) {
d->shm = shm;
d->font_description = pango_font_description_from_string(fc_pattern);
}
void
drwsurf_init(struct drw *d, struct drwsurf *ds, struct wl_surface *surf) {
ds->ctx = d;
ds->surf = surf;
}
void void
drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, uint32_t s) { drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, uint32_t s) {
if (ds->buf) { if (ds->buf) {

2
drw.h
View File

@ -8,8 +8,6 @@ struct drw;
struct drwsurf; struct drwsurf;
struct kbd; struct kbd;
void drw_init(struct drw *d, const char *fc_pattern, void *iface);
void drwsurf_init(struct drw *d, struct drwsurf *ds, struct wl_surface *surf);
void drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, uint32_t s); void drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, uint32_t s);
void drwsurf_flip(struct drwsurf *ds); void drwsurf_flip(struct drwsurf *ds);

7
main.c
View File

@ -438,8 +438,11 @@ main(int argc, char **argv) {
/* create surface */ /* create surface */
wl_surface = wl_compositor_create_surface(compositor); wl_surface = wl_compositor_create_surface(compositor);
drw_init(&draw_ctx, fc_font_pattern, shm);
drwsurf_init(&draw_ctx, &draw_surf, wl_surface); draw_ctx.shm = shm;
draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern);
draw_surf.ctx = &draw_ctx;
draw_surf.surf = wl_surface;
layer_surface = zwlr_layer_shell_v1_get_layer_surface( layer_surface = zwlr_layer_shell_v1_get_layer_surface(
layer_shell, draw_surf.surf, wl_output, layer, namespace); layer_shell, draw_surf.surf, wl_output, layer, namespace);