From 5f4c64fbeba941d5dbf4b1467d98c7235e455988 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 10:56:55 -0400 Subject: [PATCH 1/8] Tiny Wayland compositor --- tinywl/.gitignore | 3 + tinywl/Makefile | 24 ++ tinywl/tinywl.c | 620 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 647 insertions(+) create mode 100644 tinywl/.gitignore create mode 100644 tinywl/Makefile create mode 100644 tinywl/tinywl.c diff --git a/tinywl/.gitignore b/tinywl/.gitignore new file mode 100644 index 00000000..2b5bb6f8 --- /dev/null +++ b/tinywl/.gitignore @@ -0,0 +1,3 @@ +tinywl +*-protocol.c +*-protocol.h diff --git a/tinywl/Makefile b/tinywl/Makefile new file mode 100644 index 00000000..3ecd4670 --- /dev/null +++ b/tinywl/Makefile @@ -0,0 +1,24 @@ +WAYLAND_PROTOCOLS=/usr/share/wayland-protocols + +xdg-shell-protocol.h: + wayland-scanner server-header \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +xdg-shell-protocol.c: xdg-shell-protocol.h + wayland-scanner private-code \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +tinywl: tinywl.c xdg-shell-protocol.h xdg-shell-protocol.c + $(CC) $(CFLAGS) \ + -g -Werror -I. \ + -DWLR_USE_UNSTABLE \ + $(shell pkg-config --cflags --libs wlroots) \ + $(shell pkg-config --cflags --libs wayland-server) \ + $(shell pkg-config --cflags --libs xkbcommon) \ + -o $@ $< + +clean: + rm -f tinywl xdg-shell-protocol.h xdg-shell-protocol.c + +.DEFAULT_GOAL=tinywl +.PHONY: clean diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c new file mode 100644 index 00000000..101cd53a --- /dev/null +++ b/tinywl/tinywl.c @@ -0,0 +1,620 @@ +#define _POSIX_C_SOURCE 200112L +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +enum tinywl_cursor_mode { + TINYWL_CURSOR_PASSTHROUGH, + TINYWL_CURSOR_MOVE, + TINYWL_CURSOR_RESIZE, +}; + +struct tinywl_server { + struct wl_display *wl_display; + struct wlr_backend *backend; + struct wlr_renderer *renderer; + + struct wlr_xdg_shell *xdg_shell; + struct wl_listener new_xdg_surface; + struct wl_list views; + + struct wlr_cursor *cursor; + struct wlr_xcursor_manager *cursor_mgr; + struct wl_listener cursor_motion; + struct wl_listener cursor_motion_absolute; + struct wl_listener cursor_button; + struct wl_listener cursor_axis; + + struct wlr_seat *seat; + struct wl_listener new_input; + struct wl_listener request_cursor; + struct wl_list keyboards; + enum tinywl_cursor_mode cursor_mode; + struct tinywl_view *grabbed_view; + double grab_x, grab_y; + int grab_width, grab_height; + uint32_t resize_edges; + + struct wlr_output_layout *output_layout; + struct wl_list outputs; + struct wl_listener new_output; +}; + +struct tinywl_output { + struct wl_list link; + struct tinywl_server *server; + struct wlr_output *wlr_output; + struct wl_listener frame; +}; + +struct tinywl_view { + struct wl_list link; + struct tinywl_server *server; + struct wlr_xdg_surface *xdg_surface; + struct wl_listener map; + struct wl_listener unmap; + struct wl_listener destroy; + struct wl_listener request_move; + struct wl_listener request_resize; + bool mapped; + int x, y; +}; + +struct tinywl_keyboard { + struct wl_list link; + struct tinywl_server *server; + struct wlr_input_device *device; + + struct wl_listener modifiers; + struct wl_listener key; +}; + +struct tinywl_pointer { + struct wl_list link; + struct tinywl_server *server; + struct wlr_input_device *device; +}; + +static void keyboard_handle_modifiers( + struct wl_listener *listener, void *data) { + struct tinywl_keyboard *keyboard = + wl_container_of(listener, keyboard, modifiers); + wlr_seat_set_keyboard(keyboard->server->seat, keyboard->device); + wlr_seat_keyboard_notify_modifiers(keyboard->server->seat, + &keyboard->device->keyboard->modifiers); +} + +static void keyboard_handle_key( + struct wl_listener *listener, void *data) { + struct tinywl_keyboard *keyboard = + wl_container_of(listener, keyboard, key); + struct wlr_event_keyboard_key *event = data; + struct wlr_seat *seat = keyboard->server->seat; + // TODO: keybindings for moving windows about + wlr_seat_set_keyboard(seat, keyboard->device); + wlr_seat_keyboard_notify_key(seat, event->time_msec, + event->keycode, event->state); +} + +static void server_new_keyboard(struct tinywl_server *server, + struct wlr_input_device *device) { + struct tinywl_keyboard *keyboard = + calloc(1, sizeof(struct tinywl_keyboard)); + keyboard->server = server; + keyboard->device = device; + + struct xkb_rule_names rules = { 0 }; + struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules, + XKB_KEYMAP_COMPILE_NO_FLAGS); + + wlr_keyboard_set_keymap(device->keyboard, keymap); + xkb_keymap_unref(keymap); + xkb_context_unref(context); + wlr_keyboard_set_repeat_info(device->keyboard, 25, 600); + + keyboard->modifiers.notify = keyboard_handle_modifiers; + wl_signal_add(&device->keyboard->events.modifiers, &keyboard->modifiers); + keyboard->key.notify = keyboard_handle_key; + wl_signal_add(&device->keyboard->events.key, &keyboard->key); + + wlr_seat_set_keyboard(server->seat, device); + + wl_list_insert(&server->keyboards, &keyboard->link); +} + +static void server_new_pointer(struct tinywl_server *server, + struct wlr_input_device *device) { + wlr_cursor_attach_input_device(server->cursor, device); +} + +static void server_new_input(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, new_input); + struct wlr_input_device *device = data; + switch (device->type) { + case WLR_INPUT_DEVICE_KEYBOARD: + server_new_keyboard(server, device); + break; + case WLR_INPUT_DEVICE_POINTER: + server_new_pointer(server, device); + break; + } + uint32_t caps = WL_SEAT_CAPABILITY_POINTER; + if (!wl_list_empty(&server->keyboards)) { + caps |= WL_SEAT_CAPABILITY_KEYBOARD; + } + wlr_seat_set_capabilities(server->seat, caps); +} + +static void seat_request_cursor(struct wl_listener *listener, void *data) { + struct tinywl_server *server = wl_container_of( + listener, server, request_cursor); + struct wlr_seat_pointer_request_set_cursor_event *event = data; + struct wlr_seat_client *focused_client = + server->seat->pointer_state.focused_client; + if (focused_client == event->seat_client) { + wlr_cursor_set_surface(server->cursor, event->surface, + event->hotspot_x, event->hotspot_y); + } +} + +static bool view_at(struct tinywl_view *view, + double lx, double ly, struct wlr_surface **surface, + double *sx, double *sy) { + double view_sx = lx - view->x; + double view_sy = ly - view->y; + + struct wlr_surface_state *state = &view->xdg_surface->surface->current; + struct wlr_box box = { + .x = 0, .y = 0, + .width = state->width, .height = state->height, + }; + + double _sx, _sy; + struct wlr_surface *_surface = NULL; + _surface = wlr_xdg_surface_surface_at( + view->xdg_surface, view_sx, view_sy, &_sx, &_sy); + + if (_surface != NULL) { + *sx = _sx; + *sy = _sy; + *surface = _surface; + return true; + } + + return false; +} + +static struct tinywl_view *desktop_view_at( + struct tinywl_server *server, double lx, double ly, + struct wlr_surface **surface, double *sx, double *sy) { + struct tinywl_view *view; + wl_list_for_each(view, &server->views, link) { + if (view_at(view, lx, ly, surface, sx, sy)) { + return view; + } + } + return NULL; +} + +static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { + struct tinywl_server *server = view->server; + struct wlr_seat *seat = server->seat; + struct wlr_surface *prev_surface = seat->keyboard_state.focused_surface; + if (prev_surface == surface) { + return; + } + if (prev_surface) { + struct wlr_xdg_surface *previous = wlr_xdg_surface_from_wlr_surface( + seat->keyboard_state.focused_surface); + wlr_xdg_toplevel_set_activated(previous, false); + } + struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat); + wl_list_remove(&view->link); + wl_list_insert(&server->views, &view->link); + wlr_xdg_toplevel_set_activated(view->xdg_surface, true); + wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, + keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); +} + +static void process_cursor_move(struct tinywl_server *server, uint32_t time) { + server->grabbed_view->x = server->cursor->x - server->grab_x; + server->grabbed_view->y = server->cursor->y - server->grab_y; +} + +static void process_cursor_resize(struct tinywl_server *server, uint32_t time) { + struct tinywl_view *view = server->grabbed_view; + double dx = server->cursor->x - server->grab_x; + double dy = server->cursor->y - server->grab_y; + double x = view->x; + double y = view->y; + int width = server->grab_width; + int height = server->grab_height; + if (server->resize_edges & WLR_EDGE_TOP) { + y = server->grab_y + dy; + height -= dy; + if (height < 1) { + y += height; + } + } else if (server->resize_edges & WLR_EDGE_BOTTOM) { + height += dy; + } + if (server->resize_edges & WLR_EDGE_LEFT) { + x = server->grab_x + dx; + width -= dx; + if (width < 1) { + x += width; + } + } else if (server->resize_edges & WLR_EDGE_RIGHT) { + width += dx; + } + view->x = x; + view->y = y; + wlr_xdg_toplevel_set_size(view->xdg_surface, width, height); +} + +static void process_cursor_motion(struct tinywl_server *server, uint32_t time) { + if (server->cursor_mode == TINYWL_CURSOR_MOVE) { + process_cursor_move(server, time); + return; + } else if (server->cursor_mode == TINYWL_CURSOR_RESIZE) { + process_cursor_resize(server, time); + return; + } + + double sx, sy; + struct wlr_seat *seat = server->seat; + struct wlr_surface *surface; + struct tinywl_view *view = desktop_view_at(server, + server->cursor->x, server->cursor->y, &surface, &sx, &sy); + if (!view) { + wlr_xcursor_manager_set_cursor_image( + server->cursor_mgr, "left_ptr", server->cursor); + return; + } + + if (surface) { + bool focus_changed = seat->pointer_state.focused_surface != surface; + wlr_seat_pointer_notify_enter(seat, surface, sx, sy); + if (!focus_changed) { + wlr_seat_pointer_notify_motion(seat, time, sx, sy); + } + } else { + wlr_seat_pointer_clear_focus(seat); + } +} + +static void server_cursor_motion(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, cursor_motion_absolute); + struct wlr_event_pointer_motion *event = data; + wlr_cursor_move(server->cursor, event->device, + event->delta_x, event->delta_y); + process_cursor_motion(server, event->time_msec); +} + +static void server_cursor_motion_absolute( + struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, cursor_motion_absolute); + struct wlr_event_pointer_motion_absolute *event = data; + wlr_cursor_warp_absolute(server->cursor, event->device, event->x, event->y); + process_cursor_motion(server, event->time_msec); +} + +static void server_cursor_button(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, cursor_button); + struct wlr_event_pointer_button *event = data; + wlr_seat_pointer_notify_button(server->seat, + event->time_msec, event->button, event->state); + double sx, sy; + struct wlr_seat *seat = server->seat; + struct wlr_surface *surface; + struct tinywl_view *view = desktop_view_at(server, + server->cursor->x, server->cursor->y, &surface, &sx, &sy); + if (event->state == WLR_BUTTON_RELEASED) { + server->cursor_mode = TINYWL_CURSOR_PASSTHROUGH; + } else { + focus_view(view, surface); + } +} + +static void server_cursor_axis(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, cursor_axis); + struct wlr_event_pointer_axis *event = data; + wlr_seat_pointer_notify_axis(server->seat, + event->time_msec, event->orientation, event->delta, + event->delta_discrete, event->source); +} + +struct render_data { + struct wlr_output *output; + struct wlr_renderer *renderer; + struct tinywl_view *view; + struct timespec *when; +}; + +static void render_surface(struct wlr_surface *surface, + int sx, int sy, void *data) { + struct render_data *rdata = data; + struct tinywl_view *view = rdata->view; + struct wlr_output *output = rdata->output; + + struct wlr_texture *texture = wlr_surface_get_texture(surface); + if (texture == NULL) { + return; + } + + double ox, oy; + wlr_output_layout_output_coords( + view->server->output_layout, output, &ox, &oy); + ox += view->x + sx, oy += view->y + sy; + + struct wlr_box box = { + .x = ox * output->scale, + .y = oy * output->scale, + .width = surface->current.width * output->scale, + .height = surface->current.height * output->scale, + }; + + float matrix[9]; + enum wl_output_transform transform = + wlr_output_transform_invert(surface->current.transform); + wlr_matrix_project_box(matrix, &box, transform, 0, + output->transform_matrix); + + wlr_render_texture_with_matrix(rdata->renderer, texture, matrix, 1); + + wlr_surface_send_frame_done(surface, rdata->when); +} + +static void output_frame(struct wl_listener *listener, void *data) { + struct tinywl_output *output = + wl_container_of(listener, output, frame); + struct wlr_renderer *renderer = output->server->renderer; + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + + wlr_output_make_current(output->wlr_output, NULL); + int width, height; + wlr_output_effective_resolution(output->wlr_output, &width, &height); + wlr_renderer_begin(renderer, width, height); + + float color[4] = {0.3, 0.3, 0.3, 1.0}; + wlr_renderer_clear(renderer, color); + + struct tinywl_view *view; + wl_list_for_each_reverse(view, &output->server->views, link) { + if (!view->mapped) { + continue; + } + struct render_data rdata = { + .output = output->wlr_output, + .view = view, + .renderer = renderer, + .when = &now, + }; + wlr_xdg_surface_for_each_surface(view->xdg_surface, + render_surface, &rdata); + } + + wlr_output_swap_buffers(output->wlr_output, NULL, NULL); + wlr_renderer_end(renderer); +} + +static void server_new_output(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, new_output); + struct wlr_output *wlr_output = data; + + struct tinywl_output *output = + calloc(1, sizeof(struct tinywl_output)); + output->wlr_output = wlr_output; + output->server = server; + output->frame.notify = output_frame; + wl_signal_add(&wlr_output->events.frame, &output->frame); + wl_list_insert(&server->outputs, &output->link); + + wlr_output_layout_add_auto(server->output_layout, wlr_output); + + wlr_output_create_global(wlr_output); +} + +static void xdg_surface_map(struct wl_listener *listener, void *data) { + struct tinywl_view *view = wl_container_of(listener, view, map); + view->mapped = true; + focus_view(view, view->xdg_surface->surface); +} + +static void xdg_surface_unmap(struct wl_listener *listener, void *data) { + struct tinywl_view *view = wl_container_of(listener, view, unmap); + view->mapped = false; +} + +static void xdg_surface_destroy(struct wl_listener *listener, void *data) { + struct tinywl_view *view = wl_container_of(listener, view, destroy); + wl_list_remove(&view->link); + free(view); +} + +static void begin_interactive(struct tinywl_view *view, + enum tinywl_cursor_mode mode, uint32_t edges) { + struct tinywl_server *server = view->server; + struct wlr_surface *focused_surface = + server->seat->pointer_state.focused_surface; + if (view->xdg_surface->surface != focused_surface) { + return; + } + server->grabbed_view = view; + server->cursor_mode = mode; + struct wlr_box geo_box; + wlr_xdg_surface_get_geometry(view->xdg_surface, &geo_box); + if (mode == TINYWL_CURSOR_MOVE) { + server->grab_x = server->cursor->x - view->x; + server->grab_y = server->cursor->y - view->y; + } else { + server->grab_x = server->cursor->x + geo_box.x; + server->grab_y = server->cursor->y + geo_box.y; + } + server->grab_width = geo_box.width; + server->grab_height = geo_box.height; + server->resize_edges = edges; +} + +static void xdg_toplevel_request_move( + struct wl_listener *listener, void *data) { + struct tinywl_view *view = wl_container_of(listener, view, request_move); + begin_interactive(view, TINYWL_CURSOR_MOVE, 0); +} + +static void xdg_toplevel_request_resize( + struct wl_listener *listener, void *data) { + struct wlr_xdg_toplevel_resize_event *event = data; + struct tinywl_view *view = wl_container_of(listener, view, request_resize); + begin_interactive(view, TINYWL_CURSOR_RESIZE, event->edges); +} + +static void server_new_xdg_surface(struct wl_listener *listener, void *data) { + struct tinywl_server *server = + wl_container_of(listener, server, new_xdg_surface); + struct wlr_xdg_surface *xdg_surface = data; + if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) { + return; + } + + struct tinywl_view *view = + calloc(1, sizeof(struct tinywl_view)); + view->server = server; + view->xdg_surface = xdg_surface; + + view->map.notify = xdg_surface_map; + wl_signal_add(&xdg_surface->events.map, &view->map); + view->unmap.notify = xdg_surface_unmap; + wl_signal_add(&xdg_surface->events.unmap, &view->unmap); + view->destroy.notify = xdg_surface_destroy; + wl_signal_add(&xdg_surface->events.destroy, &view->destroy); + + struct wlr_xdg_toplevel *toplevel = xdg_surface->toplevel; + view->request_move.notify = xdg_toplevel_request_move; + wl_signal_add(&toplevel->events.request_move, &view->request_move); + view->request_resize.notify = xdg_toplevel_request_resize; + wl_signal_add(&toplevel->events.request_resize, &view->request_resize); + + wl_list_insert(&server->views, &view->link); +} + +int main(int argc, char *argv[]) { + char *startup_cmd = NULL; + + int c; + while ((c = getopt(argc, argv, "s:h")) != -1) { + switch (c) { + case 's': + startup_cmd = optarg; + break; + default: + printf("Usage: %s [-s startup command]\n", argv[0]); + return 0; + } + } + if (optind < argc) { + printf("Usage: %s [-s startup command]\n", argv[0]); + return 0; + } + + struct tinywl_server server; + server.wl_display = wl_display_create(); + server.backend = wlr_backend_autocreate(server.wl_display, NULL); + + server.renderer = wlr_backend_get_renderer(server.backend); + wlr_renderer_init_wl_display(server.renderer, server.wl_display); + + wlr_compositor_create(server.wl_display, server.renderer); + wlr_linux_dmabuf_v1_create(server.wl_display, server.renderer); + wlr_data_device_manager_create(server.wl_display); + + server.output_layout = wlr_output_layout_create(); + + wl_list_init(&server.outputs); + server.new_output.notify = server_new_output; + wl_signal_add(&server.backend->events.new_output, &server.new_output); + + wl_list_init(&server.views); + server.xdg_shell = wlr_xdg_shell_create(server.wl_display); + server.new_xdg_surface.notify = server_new_xdg_surface; + wl_signal_add(&server.xdg_shell->events.new_surface, + &server.new_xdg_surface); + + server.cursor = wlr_cursor_create(); + wlr_cursor_attach_output_layout(server.cursor, server.output_layout); + + server.cursor_mgr = wlr_xcursor_manager_create(NULL, 24); + wlr_xcursor_manager_load(server.cursor_mgr, 1); + + server.cursor_motion.notify = server_cursor_motion; + wl_signal_add(&server.cursor->events.motion, &server.cursor_motion); + server.cursor_motion_absolute.notify = server_cursor_motion_absolute; + wl_signal_add(&server.cursor->events.motion_absolute, + &server.cursor_motion_absolute); + server.cursor_button.notify = server_cursor_button; + wl_signal_add(&server.cursor->events.button, &server.cursor_button); + server.cursor_axis.notify = server_cursor_axis; + wl_signal_add(&server.cursor->events.axis, &server.cursor_axis); + + wl_list_init(&server.keyboards); + server.new_input.notify = server_new_input; + wl_signal_add(&server.backend->events.new_input, &server.new_input); + server.seat = wlr_seat_create(server.wl_display, "seat0"); + server.request_cursor.notify = seat_request_cursor; + wl_signal_add(&server.seat->events.request_set_cursor, + &server.request_cursor); + + const char *socket = wl_display_add_socket_auto(server.wl_display); + if (!socket) { + wlr_backend_destroy(server.backend); + return 1; + } + + if (!wlr_backend_start(server.backend)) { + wlr_backend_destroy(server.backend); + wl_display_destroy(server.wl_display); + return 1; + } + + setenv("WAYLAND_DISPLAY", socket, true); + if (startup_cmd) { + if (fork() == 0) { + execl("/bin/sh", "/bin/sh", "-c", startup_cmd, (void *)NULL); + } + } + wl_display_run(server.wl_display); + + wl_display_destroy_clients(server.wl_display); + wl_display_destroy(server.wl_display); + return 0; +} From 09c8a048dade4fffa94fb5789a3dbb85893cf295 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 18:48:31 -0400 Subject: [PATCH 2/8] Fix various bugs --- tinywl/tinywl.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index 101cd53a..d542bee4 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -220,6 +220,9 @@ static struct tinywl_view *desktop_view_at( } static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { + if (view == NULL) { + return; + } struct tinywl_server *server = view->server; struct wlr_seat *seat = server->seat; struct wlr_surface *prev_surface = seat->keyboard_state.focused_surface; @@ -286,15 +289,13 @@ static void process_cursor_motion(struct tinywl_server *server, uint32_t time) { double sx, sy; struct wlr_seat *seat = server->seat; - struct wlr_surface *surface; + struct wlr_surface *surface = NULL; struct tinywl_view *view = desktop_view_at(server, server->cursor->x, server->cursor->y, &surface, &sx, &sy); if (!view) { wlr_xcursor_manager_set_cursor_image( server->cursor_mgr, "left_ptr", server->cursor); - return; } - if (surface) { bool focus_changed = seat->pointer_state.focused_surface != surface; wlr_seat_pointer_notify_enter(seat, surface, sx, sy); @@ -308,7 +309,7 @@ static void process_cursor_motion(struct tinywl_server *server, uint32_t time) { static void server_cursor_motion(struct wl_listener *listener, void *data) { struct tinywl_server *server = - wl_container_of(listener, server, cursor_motion_absolute); + wl_container_of(listener, server, cursor_motion); struct wlr_event_pointer_motion *event = data; wlr_cursor_move(server->cursor, event->device, event->delta_x, event->delta_y); @@ -400,7 +401,9 @@ static void output_frame(struct wl_listener *listener, void *data) { struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); - wlr_output_make_current(output->wlr_output, NULL); + if (!wlr_output_make_current(output->wlr_output, NULL)) { + return; + } int width, height; wlr_output_effective_resolution(output->wlr_output, &width, &height); wlr_renderer_begin(renderer, width, height); @@ -423,8 +426,8 @@ static void output_frame(struct wl_listener *listener, void *data) { render_surface, &rdata); } - wlr_output_swap_buffers(output->wlr_output, NULL, NULL); wlr_renderer_end(renderer); + wlr_output_swap_buffers(output->wlr_output, NULL, NULL); } static void server_new_output(struct wl_listener *listener, void *data) { @@ -432,6 +435,12 @@ static void server_new_output(struct wl_listener *listener, void *data) { wl_container_of(listener, server, new_output); struct wlr_output *wlr_output = data; + if (!wl_list_empty(&wlr_output->modes)) { + struct wlr_output_mode *mode = + wl_container_of(wlr_output->modes.prev, mode, link); + wlr_output_set_mode(wlr_output, mode); + } + struct tinywl_output *output = calloc(1, sizeof(struct tinywl_output)); output->wlr_output = wlr_output; @@ -529,6 +538,7 @@ static void server_new_xdg_surface(struct wl_listener *listener, void *data) { } int main(int argc, char *argv[]) { + wlr_log_init(WLR_DEBUG, NULL); char *startup_cmd = NULL; int c; From 9e6ef44deb81e0a78bbfa3dcbdf8f4d6fb68c7ae Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 18:54:34 -0400 Subject: [PATCH 3/8] Fix uninitialized variable --- tinywl/tinywl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index d542bee4..9c749d05 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -370,7 +370,7 @@ static void render_surface(struct wlr_surface *surface, return; } - double ox, oy; + double ox = 0, oy = 0; wlr_output_layout_output_coords( view->server->output_layout, output, &ox, &oy); ox += view->x + sx, oy += view->y + sy; From 20e55f945854a84e20f55f9284698c1fa942c4a8 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 19:12:27 -0400 Subject: [PATCH 4/8] Implement Alt+F1 (next window) and Alt+Esc (exit) --- tinywl/tinywl.c | 97 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 28 deletions(-) diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index 9c749d05..6939b604 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -96,6 +96,29 @@ struct tinywl_pointer { struct wlr_input_device *device; }; +static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { + if (view == NULL) { + return; + } + struct tinywl_server *server = view->server; + struct wlr_seat *seat = server->seat; + struct wlr_surface *prev_surface = seat->keyboard_state.focused_surface; + if (prev_surface == surface) { + return; + } + if (prev_surface) { + struct wlr_xdg_surface *previous = wlr_xdg_surface_from_wlr_surface( + seat->keyboard_state.focused_surface); + wlr_xdg_toplevel_set_activated(previous, false); + } + struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat); + wl_list_remove(&view->link); + wl_list_insert(&server->views, &view->link); + wlr_xdg_toplevel_set_activated(view->xdg_surface, true); + wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, + keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); +} + static void keyboard_handle_modifiers( struct wl_listener *listener, void *data) { struct tinywl_keyboard *keyboard = @@ -105,16 +128,57 @@ static void keyboard_handle_modifiers( &keyboard->device->keyboard->modifiers); } +static bool handle_keybinding(struct tinywl_server *server, xkb_keysym_t sym) { + switch (sym) { + case XKB_KEY_Escape: + wl_display_terminate(server->wl_display); + break; + case XKB_KEY_F1: + /* Cycle to the next view */ + if (wl_list_length(&server->views) < 2) { + break; + } + struct tinywl_view *current_view = wl_container_of( + server->views.next, current_view, link); + struct tinywl_view *next_view = wl_container_of( + current_view->link.next, next_view, link); + focus_view(next_view, next_view->xdg_surface->surface); + /* Move the previous view to the end of the list */ + wl_list_remove(¤t_view->link); + wl_list_insert(server->views.prev, ¤t_view->link); + break; + default: + return false; + } + return true; +} + static void keyboard_handle_key( struct wl_listener *listener, void *data) { struct tinywl_keyboard *keyboard = wl_container_of(listener, keyboard, key); + struct tinywl_server *server = keyboard->server; struct wlr_event_keyboard_key *event = data; - struct wlr_seat *seat = keyboard->server->seat; - // TODO: keybindings for moving windows about - wlr_seat_set_keyboard(seat, keyboard->device); - wlr_seat_keyboard_notify_key(seat, event->time_msec, - event->keycode, event->state); + struct wlr_seat *seat = server->seat; + + uint32_t keycode = event->keycode + 8; + const xkb_keysym_t *syms; + int nsyms = xkb_state_key_get_syms( + keyboard->device->keyboard->xkb_state, keycode, &syms); + + bool handled = false; + uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); + if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_BUTTON_PRESSED) { + for (int i = 0; i < nsyms; i++) { + handled = handle_keybinding(server, syms[i]); + } + } + + if (!handled) { + wlr_seat_set_keyboard(seat, keyboard->device); + wlr_seat_keyboard_notify_key(seat, event->time_msec, + event->keycode, event->state); + } } static void server_new_keyboard(struct tinywl_server *server, @@ -219,29 +283,6 @@ static struct tinywl_view *desktop_view_at( return NULL; } -static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { - if (view == NULL) { - return; - } - struct tinywl_server *server = view->server; - struct wlr_seat *seat = server->seat; - struct wlr_surface *prev_surface = seat->keyboard_state.focused_surface; - if (prev_surface == surface) { - return; - } - if (prev_surface) { - struct wlr_xdg_surface *previous = wlr_xdg_surface_from_wlr_surface( - seat->keyboard_state.focused_surface); - wlr_xdg_toplevel_set_activated(previous, false); - } - struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat); - wl_list_remove(&view->link); - wl_list_insert(&server->views, &view->link); - wlr_xdg_toplevel_set_activated(view->xdg_surface, true); - wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, - keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); -} - static void process_cursor_move(struct tinywl_server *server, uint32_t time) { server->grabbed_view->x = server->cursor->x - server->grab_x; server->grabbed_view->y = server->cursor->y - server->grab_y; From b2c967514086f2be621faa1fb446cac183fd282c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 19:17:20 -0400 Subject: [PATCH 5/8] CC0 --- tinywl/LICENSE | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 tinywl/LICENSE diff --git a/tinywl/LICENSE b/tinywl/LICENSE new file mode 100644 index 00000000..0153f302 --- /dev/null +++ b/tinywl/LICENSE @@ -0,0 +1,125 @@ +This work is licensed under CC0, which effectively puts it in the public domain. + +--- + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. From ec20afd6d831e1a70f9d1178b0da1039da6700b2 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 15 Aug 2018 19:19:41 -0400 Subject: [PATCH 6/8] Add README --- tinywl/README | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tinywl/README diff --git a/tinywl/README b/tinywl/README new file mode 100644 index 00000000..eb39a338 --- /dev/null +++ b/tinywl/README @@ -0,0 +1,5 @@ + TinyWL + +Tiny Wayland compositor. + +Send patches to: ~sircmpwn/public-inbox@lists.sr.ht From b1d820c492de873264cd954111b7d04389f40cb4 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Mon, 26 Nov 2018 22:35:20 +0000 Subject: [PATCH 7/8] Correct WLR_BUTTON_PRESSED to WLR_KEY_PRESSED This worked since it was the same value, but results in compile warnings. --- tinywl/tinywl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index 6939b604..bf98495d 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -168,7 +168,7 @@ static void keyboard_handle_key( bool handled = false; uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); - if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_BUTTON_PRESSED) { + if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_KEY_PRESSED) { for (int i = 0; i < nsyms; i++) { handled = handle_keybinding(server, syms[i]); } From b3f51e39f80c2a8ec44184d95bd3719ce5ba137e Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 27 Nov 2018 20:26:02 +0000 Subject: [PATCH 8/8] view_at: remove unused variable --- tinywl/tinywl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index bf98495d..6a63e03d 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -251,10 +251,6 @@ static bool view_at(struct tinywl_view *view, double view_sy = ly - view->y; struct wlr_surface_state *state = &view->xdg_surface->surface->current; - struct wlr_box box = { - .x = 0, .y = 0, - .width = state->width, .height = state->height, - }; double _sx, _sy; struct wlr_surface *_surface = NULL;