diff --git a/src/server-context-service.c b/src/server-context-service.c index e7619127..05315a5e 100644 --- a/src/server-context-service.c +++ b/src/server-context-service.c @@ -277,8 +277,8 @@ make_window (ServerContextService *context) { } context->window = GTK_WIDGET(g_object_new ( PHOSH_TYPE_LAYER_SURFACE, - "layer-shell", squeak_wayland->layer_shell, - "wl-output", g_ptr_array_index(squeak_wayland->outputs, 0), // TODO: select output as needed, + "layer-shell", squeek_wayland->layer_shell, + "wl-output", g_ptr_array_index(squeek_wayland->outputs, 0), // TODO: select output as needed, "height", 200, "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT diff --git a/src/server-main.c b/src/server-main.c index 172d27bf..6721a3ec 100644 --- a/src/server-main.c +++ b/src/server-main.c @@ -76,7 +76,7 @@ registry_handle_global (void *data, const char *interface, uint32_t version) { - struct squeak_wayland *wayland = data; + struct squeek_wayland *wayland = data; if (!strcmp (interface, zwlr_layer_shell_v1_interface.name)) { wayland->layer_shell = wl_registry_bind (registry, name, @@ -165,11 +165,11 @@ main (int argc, char **argv) g_error ("Failed to get display: %m\n"); } - struct squeak_wayland wayland = {0}; - squeak_wayland_init (&wayland); + struct squeek_wayland wayland = {0}; + squeek_wayland_init (&wayland); struct wl_registry *registry = wl_display_get_registry (display); wl_registry_add_listener (registry, ®istry_listener, &wayland); - squeak_wayland_set_global(&wayland); + squeek_wayland_set_global(&wayland); // set up dbus // TODO: make dbus errors non-always-fatal @@ -205,6 +205,6 @@ main (int argc, char **argv) g_object_unref (connection); g_main_loop_unref (loop); - squeak_wayland_deinit (&wayland); + squeek_wayland_deinit (&wayland); return 0; } diff --git a/src/wayland.c b/src/wayland.c index a0b9dc91..e441e2e7 100644 --- a/src/wayland.c +++ b/src/wayland.c @@ -1,3 +1,3 @@ #include "wayland.h" -struct squeak_wayland *squeak_wayland = NULL; +struct squeek_wayland *squeek_wayland = NULL; diff --git a/src/wayland.h b/src/wayland.h index 0d6a5ecb..36dae5d1 100644 --- a/src/wayland.h +++ b/src/wayland.h @@ -6,25 +6,25 @@ #include -struct squeak_wayland { +struct squeek_wayland { struct zwlr_layer_shell_v1 *layer_shell; GPtrArray *outputs; // *wl_output struct wl_seat *seat; }; -extern struct squeak_wayland *squeak_wayland; +extern struct squeek_wayland *squeek_wayland; -static inline void squeak_wayland_init(struct squeak_wayland *wayland) { +static inline void squeek_wayland_init(struct squeek_wayland *wayland) { wayland->outputs = g_ptr_array_new(); } -static inline void squeak_wayland_set_global(struct squeak_wayland *wayland) { - squeak_wayland = wayland; +static inline void squeek_wayland_set_global(struct squeek_wayland *wayland) { + squeek_wayland = wayland; } -static inline void squeak_wayland_deinit(struct squeak_wayland *wayland) { +static inline void squeek_wayland_deinit(struct squeek_wayland *wayland) { g_ptr_array_free(wayland->outputs, TRUE); }