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

Remove useless variable

Browse Source
This commit is contained in:
Stacy Harper 2021-08-25 22:26:54 +02:00 committed by John Sullivan
parent efd00ad31b
commit c8a02479a9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@ -21,11 +21,9 @@ static const char *namespace = "wlroots";
static struct wl_display *display; static struct wl_display *display;
static struct wl_compositor *compositor; static struct wl_compositor *compositor;
static struct wl_seat *seat; static struct wl_seat *seat;
static struct wl_shm *shm;
static struct wl_pointer *pointer; static struct wl_pointer *pointer;
static struct wl_touch *touch; static struct wl_touch *touch;
static struct wl_output *wl_output; static struct wl_output *wl_output;
static struct wl_surface *wl_surface;
static struct zwlr_layer_shell_v1 *layer_shell; static struct zwlr_layer_shell_v1 *layer_shell;
static struct zwlr_layer_surface_v1 *layer_surface; static struct zwlr_layer_surface_v1 *layer_surface;
static struct zwp_virtual_keyboard_manager_v1 *vkbd_mgr; static struct zwp_virtual_keyboard_manager_v1 *vkbd_mgr;
@ -278,7 +276,7 @@ handle_global(void *data, struct wl_registry *registry, uint32_t name,
if (strcmp(interface, wl_compositor_interface.name) == 0) { if (strcmp(interface, wl_compositor_interface.name) == 0) {
compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 3); compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 3);
} else if (strcmp(interface, wl_shm_interface.name) == 0) { } else if (strcmp(interface, wl_shm_interface.name) == 0) {
shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); draw_ctx.shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
} else if (strcmp(interface, "wl_output") == 0) { } else if (strcmp(interface, "wl_output") == 0) {
if (!wl_output) { if (!wl_output) {
wl_output = wl_registry_bind(registry, name, &wl_output_interface, 2); wl_output = wl_registry_bind(registry, name, &wl_output_interface, 2);
@ -417,7 +415,7 @@ main(int argc, char **argv) {
if (compositor == NULL) { if (compositor == NULL) {
die("wl_compositor not available\n"); die("wl_compositor not available\n");
} }
if (shm == NULL) { if (draw_ctx.shm == NULL) {
die("wl_shm not available\n"); die("wl_shm not available\n");
} }
if (layer_shell == NULL) { if (layer_shell == NULL) {
@ -437,12 +435,10 @@ main(int argc, char **argv) {
keyboard.surf = &draw_surf; keyboard.surf = &draw_surf;
/* create surface */ /* create surface */
wl_surface = wl_compositor_create_surface(compositor); draw_surf.surf = wl_compositor_create_surface(compositor);;
draw_ctx.shm = shm;
draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern); draw_ctx.font_description = pango_font_description_from_string(fc_font_pattern);
draw_surf.ctx = &draw_ctx; 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);