From 27b66bec0afdd6c877d524c8ccd9d4679c7eee72 Mon Sep 17 00:00:00 2001 From: Rakarake Date: Wed, 17 Dec 2025 17:03:01 +0100 Subject: [PATCH] makefile does wayland-scanner stuff --- .gitignore | 4 + Makefile | 27 +- credits | 5 + flake.nix | 1 + glonkers.c | 270 +++++++-------- protocols/wlr-layer-shell-unstable-v1.xml | 390 ++++++++++++++++++++++ 6 files changed, 554 insertions(+), 143 deletions(-) create mode 100644 credits create mode 100644 protocols/wlr-layer-shell-unstable-v1.xml diff --git a/.gitignore b/.gitignore index e2946f3..a1ef3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ glonkers *.o .ccls-cache .direnv +wlr-layer-shell-unstable-v1-protocol.h +wlr-layer-shell-unstable-v1-protocol.c +xdg-shell-protocol.h +xdg-shell-protocol.c diff --git a/Makefile b/Makefile index feab2ba..49ab1ed 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,26 @@ LIBS=sdl3 opengl wayland-client -CFLAGS=-g -Wall -Wextra $(shell pkg-config --cflags $(LIBS)) -LDFLAGS=$(shell pkg-config --libs $(LIBS)) +CFLAGS+=-g -Wall -Wextra $(shell pkg-config --cflags $(LIBS)) +LDLIBS+=$(shell pkg-config --libs $(LIBS)) -objects = renderer.o +WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) +WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) -glonkers: $(objects) glonkers.c - $(CC) $(CFLAGS) $(LDFLAGS) -o glonkers $^ +glonkers: wlr-layer-shell-unstable-v1-protocol.o xdg-shell-protocol.o renderer.o +glonkers.o: wlr-layer-shell-unstable-v1-protocol.h xdg-shell-protocol.h renderer.h +renderer.o: renderer.h -$(objects): %.o: %.c - $(CC) $(CFLAGS) $(LDFLAGS) -c $^ -o $@ +xdg-shell-protocol.h: + $(WAYLAND_SCANNER) client-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ +xdg-shell-protocol.c: + $(WAYLAND_SCANNER) private-code $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ +xdg-shell-protocol.o: xdg-shell-protocol.h + +wlr-layer-shell-unstable-v1-protocol.h: + $(WAYLAND_SCANNER) client-header protocols/wlr-layer-shell-unstable-v1.xml $@ +wlr-layer-shell-unstable-v1-protocol.c: + $(WAYLAND_SCANNER) private-code protocols/wlr-layer-shell-unstable-v1.xml $@ +wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h clean: - rm -f *.o glonkers + rm -f *.o *xdg *wlr glonkers diff --git a/credits b/credits new file mode 100644 index 0000000..fd2975a --- /dev/null +++ b/credits @@ -0,0 +1,5 @@ +I'm making this document for the time being, will set up proper lisencing +later. + +Makefile inspired by: https://github.com/kolunmi/sandbar + diff --git a/flake.nix b/flake.nix index d5b92e8..11ffd1d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ libGL wayland wayland-protocols + wayland-scanner ]; installPhase = '' mkdir -p $out/bin diff --git a/glonkers.c b/glonkers.c index 0339ee1..75c4673 100644 --- a/glonkers.c +++ b/glonkers.c @@ -22,146 +22,146 @@ // // wl_display_disconnect(display); //} -//struct our_state { -// // ... -// struct wl_compositor *compositor; -// // ... -//}; +struct our_state { + // ... + struct wl_compositor *compositor; + // ... +}; + +static void +registry_handle_global(void *data, struct wl_registry *registry, + uint32_t name, const char *interface, uint32_t version) +{ + printf("interface: '%s', version: %d, name: %d\n", + interface, version, name); + + struct our_state *state = data; + + if (strcmp(interface, wl_compositor_interface.name) == 0) { + state->compositor = wl_registry_bind( + registry, name, &wl_compositor_interface, 4); + } +} + +static void +registry_handle_global_remove(void *data, struct wl_registry *registry, + uint32_t name) +{ + // This space deliberately left blank +} + +static const struct wl_registry_listener +registry_listener = { + .global = registry_handle_global, + .global_remove = registry_handle_global_remove, +}; + +int +main(int argc, char *argv[]) +{ + struct our_state state = { 0 }; + struct wl_display *display = wl_display_connect(NULL); + struct wl_registry *registry = wl_display_get_registry(display); + wl_registry_add_listener(registry, ®istry_listener, &state); + wl_display_roundtrip(display); + return 0; +} + +//struct timespec program_start; // -//static void -//registry_handle_global(void *data, struct wl_registry *registry, -// uint32_t name, const char *interface, uint32_t version) -//{ -// printf("interface: '%s', version: %d, name: %d\n", -// interface, version, name); +//void init_timer() { +// clock_gettime(CLOCK_MONOTONIC, &program_start); +//} // -// struct our_state *state = data; +//double time_since_start() { +// struct timespec now; +// clock_gettime(CLOCK_MONOTONIC, &now); // -// if (strcmp(interface, wl_compositor_interface.name) == 0) { -// state->compositor = wl_registry_bind( -// registry, name, &wl_compositor_interface, 4); +// return (now.tv_sec - program_start.tv_sec) + +// (now.tv_nsec - program_start.tv_nsec) / 1e9; +//} +// +//_Atomic bool running = true; +// +//void intHandler(int dummy) { +// printf("exiting\n"); +// running = false; +// fclose(stdin); +//} +// +//bool reload_shader = false; +// +///// reads stdin on a separate thread. +//void *read_stdin(void *ptr) { +// char buff[10]; +// while (running) { +// fgets(buff, 10, stdin); +// if (strcmp(buff, "r\n") == 0) { +// printf("reloading shader\n"); +// reload_shader = true; +// } // } +// return NULL; //} // -//static void -//registry_handle_global_remove(void *data, struct wl_registry *registry, -// uint32_t name) -//{ -// // This space deliberately left blank +//int main(int argc, char *argv[]) { +// signal(SIGINT, intHandler); +// pthread_t stdin_thread; +// pthread_create( &stdin_thread, NULL, read_stdin, NULL); +// +// init_timer(); +// +// printf("Good Morning 🍵\n"); +// SDL_Init(SDL_INIT_VIDEO); +// SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "1"); +// SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, +// SDL_GL_CONTEXT_PROFILE_ES); +// SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); +// SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); +// SDL_Window* window = SDL_CreateWindow("SDL3 OpenGL Cube", +// 800, 600, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); +// if (!window) { +// printf("CreateWindow Error: %s\n", SDL_GetError()); +// SDL_Quit(); +// return 1; +// } +// +// SDL_GLContext glContext = SDL_GL_CreateContext(window); +// +// if (!glContext) { +// printf("GL Context Error: %s\n", SDL_GetError()); +// SDL_DestroyWindow(window); +// SDL_Quit(); +// return 1; +// } +// +// Renderer renderer = new_renderer(); +// +// SDL_Event e; +// int w, h; +// while (running) { +// while (SDL_PollEvent(&e)) { +// if (e.type == SDL_EVENT_QUIT) running = false; +// if (e.type == SDL_EVENT_WINDOW_RESIZED) { +// SDL_GetWindowSize(window, &w, &h); +// } +// } +// +// char *shader_path = NULL; +// if (argc >= 2) { +// shader_path = argv[1]; +// } else { +// printf("need to supply path to shader\n"); +// exit(1); +// } +// +// double time = time_since_start(); +// render(&renderer, w, h, time, shader_path, reload_shader); +// if (reload_shader) reload_shader = false; +// +// SDL_GL_SwapWindow(window); +// } +// +// pthread_join(stdin_thread, NULL); //} // -//static const struct wl_registry_listener -//registry_listener = { -// .global = registry_handle_global, -// .global_remove = registry_handle_global_remove, -//}; -// -//int -//main(int argc, char *argv[]) -//{ -// struct our_state state = { 0 }; -// struct wl_display *display = wl_display_connect(NULL); -// struct wl_registry *registry = wl_display_get_registry(display); -// wl_registry_add_listener(registry, ®istry_listener, &state); -// wl_display_roundtrip(display); -// return 0; -//} - -struct timespec program_start; - -void init_timer() { - clock_gettime(CLOCK_MONOTONIC, &program_start); -} - -double time_since_start() { - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - - return (now.tv_sec - program_start.tv_sec) + - (now.tv_nsec - program_start.tv_nsec) / 1e9; -} - -_Atomic bool running = true; - -void intHandler(int dummy) { - printf("exiting\n"); - running = false; - fclose(stdin); -} - -bool reload_shader = false; - -/// reads stdin on a separate thread. -void *read_stdin(void *ptr) { - char buff[10]; - while (running) { - fgets(buff, 10, stdin); - if (strcmp(buff, "r\n") == 0) { - printf("reloading shader\n"); - reload_shader = true; - } - } - return NULL; -} - -int main(int argc, char *argv[]) { - signal(SIGINT, intHandler); - pthread_t stdin_thread; - pthread_create( &stdin_thread, NULL, read_stdin, NULL); - - init_timer(); - - printf("Good Morning 🍵\n"); - SDL_Init(SDL_INIT_VIDEO); - SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "1"); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, - SDL_GL_CONTEXT_PROFILE_ES); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); - SDL_Window* window = SDL_CreateWindow("SDL3 OpenGL Cube", - 800, 600, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); - if (!window) { - printf("CreateWindow Error: %s\n", SDL_GetError()); - SDL_Quit(); - return 1; - } - - SDL_GLContext glContext = SDL_GL_CreateContext(window); - - if (!glContext) { - printf("GL Context Error: %s\n", SDL_GetError()); - SDL_DestroyWindow(window); - SDL_Quit(); - return 1; - } - - Renderer renderer = new_renderer(); - - SDL_Event e; - int w, h; - while (running) { - while (SDL_PollEvent(&e)) { - if (e.type == SDL_EVENT_QUIT) running = false; - if (e.type == SDL_EVENT_WINDOW_RESIZED) { - SDL_GetWindowSize(window, &w, &h); - } - } - - char *shader_path = NULL; - if (argc >= 2) { - shader_path = argv[1]; - } else { - printf("need to supply path to shader\n"); - exit(1); - } - - double time = time_since_start(); - render(&renderer, w, h, time, shader_path, reload_shader); - if (reload_shader) reload_shader = false; - - SDL_GL_SwapWindow(window); - } - - pthread_join(stdin_thread, NULL); -} - diff --git a/protocols/wlr-layer-shell-unstable-v1.xml b/protocols/wlr-layer-shell-unstable-v1.xml new file mode 100644 index 0000000..d62fd51 --- /dev/null +++ b/protocols/wlr-layer-shell-unstable-v1.xml @@ -0,0 +1,390 @@ + + + + Copyright © 2017 Drew DeVault + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + the copyright holders not be used in advertising or publicity + pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + + + + + Clients can use this interface to assign the surface_layer role to + wl_surfaces. Such surfaces are assigned to a "layer" of the output and + rendered with a defined z-depth respective to each other. They may also be + anchored to the edges and corners of a screen and specify input handling + semantics. This interface should be suitable for the implementation of + many desktop shell components, and a broad number of other applications + that interact with the desktop. + + + + + Create a layer surface for an existing surface. This assigns the role of + layer_surface, or raises a protocol error if another role is already + assigned. + + Creating a layer surface from a wl_surface which has a buffer attached + or committed is a client error, and any attempts by a client to attach + or manipulate a buffer prior to the first layer_surface.configure call + must also be treated as errors. + + After creating a layer_surface object and setting it up, the client + must perform an initial commit without any buffer attached. + The compositor will reply with a layer_surface.configure event. + The client must acknowledge it and is then allowed to attach a buffer + to map the surface. + + You may pass NULL for output to allow the compositor to decide which + output to use. Generally this will be the one that the user most + recently interacted with. + + Clients can specify a namespace that defines the purpose of the layer + surface. + + + + + + + + + + + + + + + + + These values indicate which layers a surface can be rendered in. They + are ordered by z depth, bottom-most first. Traditional shell surfaces + will typically be rendered between the bottom and top layers. + Fullscreen shell surfaces are typically rendered at the top layer. + Multiple surfaces can share a single layer, and ordering within a + single layer is undefined. + + + + + + + + + + + + + This request indicates that the client will not use the layer_shell + object any more. Objects that have been created through this instance + are not affected. + + + + + + + An interface that may be implemented by a wl_surface, for surfaces that + are designed to be rendered as a layer of a stacked desktop-like + environment. + + Layer surface state (layer, size, anchor, exclusive zone, + margin, interactivity) is double-buffered, and will be applied at the + time wl_surface.commit of the corresponding wl_surface is called. + + Attaching a null buffer to a layer surface unmaps it. + + Unmapping a layer_surface means that the surface cannot be shown by the + compositor until it is explicitly mapped again. The layer_surface + returns to the state it had right after layer_shell.get_layer_surface. + The client can re-map the surface by performing a commit without any + buffer attached, waiting for a configure event and handling it as usual. + + + + + Sets the size of the surface in surface-local coordinates. The + compositor will display the surface centered with respect to its + anchors. + + If you pass 0 for either value, the compositor will assign it and + inform you of the assignment in the configure event. You must set your + anchor to opposite edges in the dimensions you omit; not doing so is a + protocol error. Both values are 0 by default. + + Size is double-buffered, see wl_surface.commit. + + + + + + + + Requests that the compositor anchor the surface to the specified edges + and corners. If two orthogonal edges are specified (e.g. 'top' and + 'left'), then the anchor point will be the intersection of the edges + (e.g. the top left corner of the output); otherwise the anchor point + will be centered on that edge, or in the center if none is specified. + + Anchor is double-buffered, see wl_surface.commit. + + + + + + + Requests that the compositor avoids occluding an area with other + surfaces. The compositor's use of this information is + implementation-dependent - do not assume that this region will not + actually be occluded. + + A positive value is only meaningful if the surface is anchored to one + edge or an edge and both perpendicular edges. If the surface is not + anchored, anchored to only two perpendicular edges (a corner), anchored + to only two parallel edges or anchored to all edges, a positive value + will be treated the same as zero. + + A positive zone is the distance from the edge in surface-local + coordinates to consider exclusive. + + Surfaces that do not wish to have an exclusive zone may instead specify + how they should interact with surfaces that do. If set to zero, the + surface indicates that it would like to be moved to avoid occluding + surfaces with a positive exclusive zone. If set to -1, the surface + indicates that it would not like to be moved to accommodate for other + surfaces, and the compositor should extend it all the way to the edges + it is anchored to. + + For example, a panel might set its exclusive zone to 10, so that + maximized shell surfaces are not shown on top of it. A notification + might set its exclusive zone to 0, so that it is moved to avoid + occluding the panel, but shell surfaces are shown underneath it. A + wallpaper or lock screen might set their exclusive zone to -1, so that + they stretch below or over the panel. + + The default value is 0. + + Exclusive zone is double-buffered, see wl_surface.commit. + + + + + + + Requests that the surface be placed some distance away from the anchor + point on the output, in surface-local coordinates. Setting this value + for edges you are not anchored to has no effect. + + The exclusive zone includes the margin. + + Margin is double-buffered, see wl_surface.commit. + + + + + + + + + + Types of keyboard interaction possible for layer shell surfaces. The + rationale for this is twofold: (1) some applications are not interested + in keyboard events and not allowing them to be focused can improve the + desktop experience; (2) some applications will want to take exclusive + keyboard focus. + + + + + This value indicates that this surface is not interested in keyboard + events and the compositor should never assign it the keyboard focus. + + This is the default value, set for newly created layer shell surfaces. + + This is useful for e.g. desktop widgets that display information or + only have interaction with non-keyboard input devices. + + + + + Request exclusive keyboard focus if this surface is above the shell surface layer. + + For the top and overlay layers, the seat will always give + exclusive keyboard focus to the top-most layer which has keyboard + interactivity set to exclusive. If this layer contains multiple + surfaces with keyboard interactivity set to exclusive, the compositor + determines the one receiving keyboard events in an implementation- + defined manner. In this case, no guarantee is made when this surface + will receive keyboard focus (if ever). + + For the bottom and background layers, the compositor is allowed to use + normal focus semantics. + + This setting is mainly intended for applications that need to ensure + they receive all keyboard events, such as a lock screen or a password + prompt. + + + + + This requests the compositor to allow this surface to be focused and + unfocused by the user in an implementation-defined manner. The user + should be able to unfocus this surface even regardless of the layer + it is on. + + Typically, the compositor will want to use its normal mechanism to + manage keyboard focus between layer shell surfaces with this setting + and regular toplevels on the desktop layer (e.g. click to focus). + Nevertheless, it is possible for a compositor to require a special + interaction to focus or unfocus layer shell surfaces (e.g. requiring + a click even if focus follows the mouse normally, or providing a + keybinding to switch focus between layers). + + This setting is mainly intended for desktop shell components (e.g. + panels) that allow keyboard interaction. Using this option can allow + implementing a desktop shell that can be fully usable without the + mouse. + + + + + + + Set how keyboard events are delivered to this surface. By default, + layer shell surfaces do not receive keyboard events; this request can + be used to change this. + + This setting is inherited by child surfaces set by the get_popup + request. + + Layer surfaces receive pointer, touch, and tablet events normally. If + you do not want to receive them, set the input region on your surface + to an empty region. + + Keyboard interactivity is double-buffered, see wl_surface.commit. + + + + + + + This assigns an xdg_popup's parent to this layer_surface. This popup + should have been created via xdg_surface::get_popup with the parent set + to NULL, and this request must be invoked before committing the popup's + initial state. + + See the documentation of xdg_popup for more details about what an + xdg_popup is and how it is used. + + + + + + + When a configure event is received, if a client commits the + surface in response to the configure event, then the client + must make an ack_configure request sometime before the commit + request, passing along the serial of the configure event. + + If the client receives multiple configure events before it + can respond to one, it only has to ack the last configure event. + + A client is not required to commit immediately after sending + an ack_configure request - it may even ack_configure several times + before its next surface commit. + + A client may send multiple ack_configure requests before committing, but + only the last request sent before a commit indicates which configure + event the client really is responding to. + + + + + + + This request destroys the layer surface. + + + + + + The configure event asks the client to resize its surface. + + Clients should arrange their surface for the new states, and then send + an ack_configure request with the serial sent in this configure event at + some point before committing the new surface. + + The client is free to dismiss all but the last configure event it + received. + + The width and height arguments specify the size of the window in + surface-local coordinates. + + The size is a hint, in the sense that the client is free to ignore it if + it doesn't resize, pick a smaller size (to satisfy aspect ratio or + resize in steps of NxM pixels). If the client picks a smaller size and + is anchored to two opposite anchors (e.g. 'top' and 'bottom'), the + surface will be centered on this axis. + + If the width or height arguments are zero, it means the client should + decide its own window dimension. + + + + + + + + + The closed event is sent by the compositor when the surface will no + longer be shown. The output may have been destroyed or the user may + have asked for it to be removed. Further changes to the surface will be + ignored. The client should destroy the resource after receiving this + event, and create a new surface if they so choose. + + + + + + + + + + + + + + + + + + + + + + Change the layer that the surface is rendered on. + + Layer is double-buffered, see wl_surface.commit. + + + + +