s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename squeak_ to squeek_ for consitency

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-06-23 10:30:25 +00:00
parent 752592a3d8
commit e503e35b84
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server-context-service.c
View File

@ -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

10
src/server-main.c
View File

@ -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, &registry_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;
}

2
src/wayland.c
View File

@ -1,3 +1,3 @@
#include "wayland.h"
struct squeak_wayland *squeak_wayland = NULL;
struct squeek_wayland *squeek_wayland = NULL;

12
src/wayland.h
View File

@ -6,25 +6,25 @@
#include <gmodule.h>
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);
}