diff --git a/README.md b/README.md index 39b8e8b..614f1d7 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ contributing.](https://github.com/wizbright/waybox/blob/master/CONTRIBUTING.md) * meson * wlroots * wayland +* xkbcommon ### Build instructions diff --git a/include/waybox/cursor.h b/include/waybox/cursor.h index 370c8b5..ac99f68 100644 --- a/include/waybox/cursor.h +++ b/include/waybox/cursor.h @@ -4,15 +4,32 @@ #include #include +#include "waybox/server.h" + +enum wb_cursor_mode { + WB_CURSOR_PASSTHROUGH, + WB_CURSOR_MOVE, + WB_CURSOR_RESIZE, +}; + struct wb_cursor { struct wlr_cursor *cursor; struct wlr_xcursor_manager *xcursor_manager; + struct wb_server *server; + + enum wb_cursor_mode cursor_mode; struct wl_listener cursor_motion; struct wl_listener cursor_motion_absolute; + + struct wl_listener cursor_button; + struct wl_listener cursor_axis; + struct wl_listener cursor_frame; + + struct wl_listener request_cursor; }; -struct wb_cursor *wb_cursor_create(); +struct wb_cursor *wb_cursor_create(struct wb_server *server); void wb_cursor_destroy(struct wb_cursor *cursor); #endif // cursor.h diff --git a/include/waybox/output.h b/include/waybox/output.h index b68e240..0d692be 100644 --- a/include/waybox/output.h +++ b/include/waybox/output.h @@ -20,7 +20,6 @@ struct wb_output { struct wlr_output *wlr_output; struct wb_server *server; - struct timespec last_frame; struct wl_listener destroy; struct wl_listener frame; @@ -28,6 +27,20 @@ struct wb_output { struct wl_list link; }; +struct wb_view { + struct wl_list link; + struct wb_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; +}; + void output_frame_notify(struct wl_listener* listener, void *data); void output_destroy_notify(struct wl_listener* listener, void *data); void new_output_notify(struct wl_listener* listener, void *data); diff --git a/include/waybox/seat.h b/include/waybox/seat.h new file mode 100644 index 0000000..a348846 --- /dev/null +++ b/include/waybox/seat.h @@ -0,0 +1,27 @@ +#ifndef _WB_SEAT_H +#define _WB_SEAT_H + +#include +#include + +#include "waybox/server.h" + +struct wb_seat { + struct wlr_seat *seat; + + struct wl_list keyboards; +}; + +struct wb_keyboard { + struct wl_list link; + struct wb_server *server; + struct wlr_input_device *device; + + struct wl_listener modifiers; + struct wl_listener key; +}; + +struct wb_server; +struct wb_seat *wb_seat_create(struct wb_server *server); +void wb_seat_destroy(struct wb_seat *seat); +#endif diff --git a/include/waybox/server.h b/include/waybox/server.h index bc09448..88680e0 100644 --- a/include/waybox/server.h +++ b/include/waybox/server.h @@ -1,38 +1,49 @@ #ifndef SERVER_H #define SERVER_H -#ifndef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 200809L +#ifdef _POSIX_C_SOURCE +#undef _POSIX_C_SOURCE #endif +#define _POSIX_C_SOURCE 200112L -#include #include -#include -#include #include #include #include #include +#include #include #include #include #include #include #include +#include #include "waybox/output.h" #include "waybox/cursor.h" +#include "waybox/seat.h" struct wb_server { struct wl_display *wl_display; - struct wl_event_loop *wl_event_loop; struct wlr_backend *backend; struct wlr_compositor *compositor; + struct wlr_renderer *renderer; struct wlr_output_layout *layout; struct wb_cursor *cursor; + struct wb_seat *seat; + + struct wb_view *grabbed_view; + double grab_x, grab_y; + int grab_width, grab_height; + uint32_t resize_edges; + + struct wlr_xdg_shell *xdg_shell; + struct wl_listener new_xdg_surface; + struct wl_list views; struct wl_listener new_output; struct wl_listener new_input; diff --git a/include/waybox/xdg_shell.h b/include/waybox/xdg_shell.h new file mode 100644 index 0000000..08833bb --- /dev/null +++ b/include/waybox/xdg_shell.h @@ -0,0 +1,7 @@ +#include "waybox/server.h" + +void init_xdg_shell(struct wb_server *server); +void focus_view(struct wb_view *view, struct wlr_surface *surface); +struct wb_view *desktop_view_at( + struct wb_server *server, double lx, double ly, + struct wlr_surface **surface, double *sx, double *sy); diff --git a/meson.build b/meson.build index 1c728d3..f5414ad 100644 --- a/meson.build +++ b/meson.build @@ -15,6 +15,7 @@ project( add_project_arguments('-Wno-unused-parameter', language: 'c') add_project_arguments('-DWLR_USE_UNSTABLE', language: 'c') +add_project_arguments('-DVERSION="' + meson.project_version() + '"', language: 'c') cc = meson.get_compiler('c') @@ -23,7 +24,7 @@ if cc.get_id() == 'clang' add_project_arguments('-Wno-missing-braces', language: 'c') endif -# Hiding depreciation warnings +# Hide deprecated API add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c') # Adding include directory @@ -34,6 +35,7 @@ wlroots = dependency('wlroots', version: '>=0.6.0') wayland_server = dependency('wayland-server') wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols', version: '>=1.12') +xkbcommon = dependency('xkbcommon') subdir('protocol') subdir('waybox') diff --git a/protocol/meson.build b/protocol/meson.build index ec66c47..7982dd8 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -24,7 +24,6 @@ protocols = [ [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'], - [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'wlr-gamma-control-unstable-v1.xml', 'gtk-primary-selection.xml', 'idle.xml', @@ -34,7 +33,6 @@ protocols = [ ] client_protocols = [ - [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], 'idle.xml', diff --git a/waybox/cursor.c b/waybox/cursor.c index fb769a4..739f904 100644 --- a/waybox/cursor.c +++ b/waybox/cursor.c @@ -1,22 +1,172 @@ #include #include "waybox/cursor.h" +#include "waybox/xdg_shell.h" + +static void process_cursor_move(struct wb_server *server, uint32_t time) { + /* Move the grabbed view to the new position. */ + server->grabbed_view->x = server->cursor->cursor->x - server->grab_x; + server->grabbed_view->y = server->cursor->cursor->y - server->grab_y; +} + +static void process_cursor_resize(struct wb_server *server, uint32_t time) { + struct wb_view *view = server->grabbed_view; + double dx = server->cursor->cursor->x - server->grab_x; + double dy = server->cursor->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 wb_server *server, uint32_t time) { + /* If the mode is non-passthrough, delegate to those functions. */ + if (server->cursor->cursor_mode == WB_CURSOR_MOVE) { + process_cursor_move(server, time); + return; + } else if (server->cursor->cursor_mode == WB_CURSOR_RESIZE) { + process_cursor_resize(server, time); + return; + } + + /* Otherwise, find the view under the pointer and send the event along. */ + double sx, sy; + struct wlr_seat *seat = server->seat->seat; + struct wlr_surface *surface = NULL; + struct wb_view *view = desktop_view_at(server, + server->cursor->cursor->x, server->cursor->cursor->y, &surface, &sx, &sy); + if (!view) { + /* If there's no view under the cursor, set the cursor image to a + * default. This is what makes the cursor image appear when you move it + * around the screen, not over any views. */ + wlr_xcursor_manager_set_cursor_image( + server->cursor->xcursor_manager, "left_ptr", server->cursor->cursor); + } + if (surface) { + bool focus_changed = seat->pointer_state.focused_surface != surface; + /* + * "Enter" the surface if necessary. This lets the client know that the + * cursor has entered one of its surfaces. + */ + wlr_seat_pointer_notify_enter(seat, surface, sx, sy); + if (!focus_changed) { + /* The enter event contains coordinates, so we only need to notify + * on motion if the focus did not change. */ + wlr_seat_pointer_notify_motion(seat, time, sx, sy); + } + } else { + /* Clear pointer focus so future button events and such are not sent to + * the last client to have the cursor over it. */ + wlr_seat_pointer_clear_focus(seat); + } +} static void handle_cursor_motion(struct wl_listener *listener, void *data) { struct wb_cursor *cursor = wl_container_of(listener, cursor, cursor_motion); struct wlr_event_pointer_motion *event = data; wlr_cursor_move(cursor->cursor, event->device, event->delta_x, event->delta_y); + process_cursor_motion(cursor->server, event->time_msec); } static void handle_cursor_motion_absolute(struct wl_listener *listener, void *data) { struct wb_cursor *cursor = wl_container_of(listener, cursor, cursor_motion_absolute); struct wlr_event_pointer_motion_absolute *event = data; wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y); + process_cursor_motion(cursor->server, event->time_msec); } -struct wb_cursor *wb_cursor_create() { +static void handle_cursor_button(struct wl_listener *listener, void *data) { + /* This event is forwarded by the cursor when a pointer emits a button + * event. */ + struct wb_cursor *cursor = + wl_container_of(listener, cursor, cursor_button); + struct wlr_event_pointer_button *event = data; + /* Notify the client with pointer focus that a button press has occurred */ + wlr_seat_pointer_notify_button(cursor->server->seat->seat, + event->time_msec, event->button, event->state); + double sx, sy; + struct wlr_surface *surface; + struct wb_view *view = desktop_view_at(cursor->server, + cursor->server->cursor->cursor->x, cursor->server->cursor->cursor->y, &surface, &sx, &sy); + if (event->state == WLR_BUTTON_RELEASED) { + /* If you released any buttons, we exit interactive move/resize mode. */ + cursor->cursor_mode = WB_CURSOR_PASSTHROUGH; + } else { + /* Focus that client if the button was _pressed_ */ + focus_view(view, surface); + } +} + +static void handle_cursor_axis(struct wl_listener *listener, void *data) { + /* This event is forwarded by the cursor when a pointer emits an axis event, + * for example when you move the scroll wheel. */ + struct wb_cursor *cursor = + wl_container_of(listener, cursor, cursor_axis); + struct wlr_event_pointer_axis *event = data; + /* Notify the client with pointer focus of the axis event. */ + wlr_seat_pointer_notify_axis(cursor->server->seat->seat, + event->time_msec, event->orientation, event->delta, + event->delta_discrete, event->source); +} + +static void handle_cursor_frame(struct wl_listener *listener, void *data) { + /* This event is forwarded by the cursor when a pointer emits an frame + * event. Frame events are sent after regular pointer events to group + * multiple events together. For instance, two axis events may happen at the + * same time, in which case a frame event won't be sent in between. */ + struct wb_cursor *cursor = + wl_container_of(listener, cursor, cursor_frame); + /* Notify the client with pointer focus of the frame event. */ + wlr_seat_pointer_notify_frame(cursor->server->seat->seat); +} + +static void handle_cursor_request(struct wl_listener *listener, void *data) { + struct wb_cursor *cursor = wl_container_of( + listener, cursor, request_cursor); + /* This event is rasied by the seat when a client provides a cursor image */ + struct wlr_seat_pointer_request_set_cursor_event *event = data; + struct wlr_seat_client *focused_client = + cursor->server->seat->seat->pointer_state.focused_client; + /* This can be sent by any client, so we check to make sure this one is + * actually has pointer focus first. */ + if (focused_client == event->seat_client) { + /* Once we've vetted the client, we can tell the cursor to use the + * provided surface as the cursor image. It will set the hardware cursor + * on the output that it's currently on and continue to do so as the + * cursor moves between outputs. */ + wlr_cursor_set_surface(cursor->cursor, event->surface, + event->hotspot_x, event->hotspot_y); + } +} + +struct wb_cursor *wb_cursor_create(struct wb_server *server) { struct wb_cursor *cursor = malloc(sizeof(struct wb_cursor)); cursor->cursor = wlr_cursor_create(); - cursor->xcursor_manager = wlr_xcursor_manager_create("default", 24); + cursor->server = server; + + const char *xcursor_size = getenv("XCURSOR_SIZE"); + cursor->xcursor_manager = wlr_xcursor_manager_create(getenv("XCURSOR_THEME"), xcursor_size ? atoi(xcursor_size) : 24); + wlr_xcursor_manager_load(cursor->xcursor_manager, 1); cursor->cursor_motion.notify = handle_cursor_motion; wl_signal_add(&cursor->cursor->events.motion, &cursor->cursor_motion); @@ -24,6 +174,21 @@ struct wb_cursor *wb_cursor_create() { cursor->cursor_motion_absolute.notify = handle_cursor_motion_absolute; wl_signal_add(&cursor->cursor->events.motion_absolute, &cursor->cursor_motion_absolute); + cursor->cursor_button.notify = handle_cursor_button; + wl_signal_add(&cursor->cursor->events.button, &cursor->cursor_button); + + cursor->cursor_axis.notify = handle_cursor_axis; + wl_signal_add(&cursor->cursor->events.axis, &cursor->cursor_axis); + + cursor->cursor_frame.notify = handle_cursor_frame; + wl_signal_add(&cursor->cursor->events.frame, &cursor->cursor_frame); + + cursor->request_cursor.notify = handle_cursor_request; + wl_signal_add(&server->seat->seat->events.request_set_cursor, + &cursor->request_cursor); + + wlr_cursor_attach_output_layout(cursor->cursor, server->layout); + return cursor; } diff --git a/waybox/main.c b/waybox/main.c index cb47e1f..11f17dc 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -1,18 +1,34 @@ -#define _POSIX_C_SOURCE 200809L #include -#include +#include +#include #include -#include #include "waybox/server.h" -struct wl_display* display = NULL; - int main(int argc, char **argv){ - struct wb_server server = {0}; + char *startup_cmd = NULL; + if (argc > 0) { + int i; + for (i = 0; i < argc; i++) + { + if (!strcmp("--debug", argv[i]) || !strcmp("-v", argv[i]) || !strcmp("--exit", argv[i])) { + printf("Warning: option %s is currently unimplemented\n", argv[i]); + } + else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { + startup_cmd = argv[i + 1]; + } + else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { + printf(VERSION "\n"); + return 0; + } + else if (argv[i][0] == '-') { + printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]); + return strcmp("--help", argv[i]) != 0 && strcmp("-h", argv[i]) != 0; + } + } + } - // Global display - display = server.wl_display; + struct wb_server server = {0}; if (init_wb(&server) == false) { printf("Failed to create backend\n"); @@ -25,6 +41,12 @@ int main(int argc, char **argv){ exit(EXIT_FAILURE); } + if (startup_cmd) { + if (fork() == 0) { + execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); + } + } + wl_display_run(server.wl_display); terminate_wb(&server); diff --git a/waybox/meson.build b/waybox/meson.build index a44d004..9a05460 100644 --- a/waybox/meson.build +++ b/waybox/meson.build @@ -2,13 +2,16 @@ wb_src = files( 'cursor.c', 'main.c', 'output.c', + 'seat.c', 'server.c', + 'xdg_shell.c', ) wb_dep = [ wayland_server, wlroots, pixman, + xkbcommon, ] executable( diff --git a/waybox/output.c b/waybox/output.c index b8a4332..2eed274 100644 --- a/waybox/output.c +++ b/waybox/output.c @@ -1,43 +1,109 @@ -#include +#include "waybox/output.h" + +struct render_data { + struct wlr_output *output; + struct wlr_renderer *renderer; + struct wb_view *view; + struct timespec *when; +}; + +static void render_surface(struct wlr_surface *surface, int sx, int sy, void *data) { + /* This function is called for every surface that needs to be rendered. */ + struct render_data *rdata = data; + struct wb_view *view = rdata->view; + struct wlr_output *output = rdata->output; + + /* We first obtain a wlr_texture, which is a GPU resource. wlroots + * automatically handles negotiating these with the client. The underlying + * resource could be an opaque handle passed from the client, or the client + * could have sent a pixel buffer which we copied to the GPU, or a few other + * means. You don't have to worry about this, wlroots takes care of it. */ + struct wlr_texture *texture = wlr_surface_get_texture(surface); + if (texture == NULL) { + return; + } + + /* The view has a position in layout coordinates. If you have two displays, + * one next to the other, both 1080p, a view on the rightmost display might + * have layout coordinates of 2000,100. We need to translate that to + * output-local coordinates, or (2000 - 1920). */ + double ox = 0, oy = 0; + wlr_output_layout_output_coords( + view->server->layout, output, &ox, &oy); + ox += view->x + sx, oy += view->y + sy; + + /* We also have to apply the scale factor for HiDPI outputs. This is only + * part of the puzzle, Waybox does not fully support HiDPI. */ + struct wlr_box box = { + .x = ox * output->scale, + .y = oy * output->scale, + .width = surface->current.width * output->scale, + .height = surface->current.height * output->scale, + }; + + /* + * Those familiar with OpenGL are also familiar with the role of matrices + * in graphics programming. We need to prepare a matrix to render the view + * with. wlr_matrix_project_box is a helper which takes a box with a desired + * x, y coordinates, width and height, and an output geometry, then + * prepares an orthographic projection and multiplies the necessary + * transforms to produce a model-view-projection matrix. + * + * Naturally you can do this any way you like, for example to make a 3D + * compositor. + */ + 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); + + /* This takes our matrix, the texture, and an alpha, and performs the actual + * rendering on the GPU. */ + wlr_render_texture_with_matrix(rdata->renderer, texture, matrix, 1); + + /* This lets the client know that we've displayed that frame and it can + * prepare another one now if it likes. */ + wlr_surface_send_frame_done(surface, rdata->when); +} void output_frame_notify(struct wl_listener *listener, void *data) { struct wb_output *output = wl_container_of(listener, output, frame); -// struct wlr_backend *backend = output->server->backend; - struct wlr_output *wlr_output = data; - struct wlr_renderer *renderer = wlr_backend_get_renderer( - wlr_output->backend); + struct wlr_renderer *renderer = output->server->renderer; struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); - wlr_output_attach_render(wlr_output, NULL); - wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height); + if (!wlr_output_attach_render(output->wlr_output, NULL)) { + return; + } + int width, height; + wlr_output_effective_resolution(output->wlr_output, &width, &height); + wlr_renderer_begin(renderer, width, height); float color[4] = {0.4f, 0.4f, 0.4f, 1.0f}; wlr_renderer_clear(renderer, color); - struct wl_resource *_surface; - wl_resource_for_each(_surface, &output->server->compositor->surface_resources) { - struct wlr_surface *surface = wlr_surface_from_resource(_surface); - if (!wlr_surface_has_buffer(surface)) { + struct wb_view *view; + wl_list_for_each_reverse(view, &output->server->views, link) + { + if (!view->mapped) + /* An unmapped view should not be rendered */ continue; - } - struct wlr_box render_box = { - .x = 20, .y = 20, - .width = surface->current.width, - .height = surface->current.height + + struct render_data rdata = { + .output = output->wlr_output, + .renderer = renderer, + .view = view, + .when = &now, }; - float matrix[16]; - wlr_matrix_project_box(matrix, &render_box, surface->current.transform, - 0, wlr_output->transform_matrix); - struct wlr_texture *texture = wlr_surface_get_texture(surface); - wlr_render_texture_with_matrix(renderer, texture, matrix, 1.0f); - wlr_surface_send_frame_done(surface, &now); + + wlr_xdg_surface_for_each_surface(view->xdg_surface, render_surface, &rdata); } - wlr_output_commit(wlr_output); + wlr_output_render_software_cursors(output->wlr_output, NULL); wlr_renderer_end(renderer); - output->last_frame = now; + wlr_output_commit(output->wlr_output); } void output_destroy_notify(struct wl_listener *listener, void *data) { @@ -56,15 +122,16 @@ void new_output_notify(struct wl_listener *listener, void *data) { 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); + struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output); wlr_output_set_mode(wlr_output, mode); + wlr_output_enable(wlr_output, true); - wlr_output_create_global(wlr_output); + if (!wlr_output_commit(wlr_output)) { + return; + } } struct wb_output *output = calloc(1, sizeof(struct wb_output)); - clock_gettime(CLOCK_MONOTONIC, &output->last_frame); output->server = server; output->wlr_output = wlr_output; wl_list_insert(&server->outputs, &output->link); @@ -74,7 +141,6 @@ void new_output_notify(struct wl_listener *listener, void *data) { output->frame.notify = output_frame_notify; wl_signal_add(&wlr_output->events.frame, &output->frame); - wlr_output_layout_add_auto(server->layout, output->wlr_output); - wlr_xcursor_manager_load(server->cursor->xcursor_manager, output->wlr_output->scale); - wlr_xcursor_manager_set_cursor_image(server->cursor->xcursor_manager, "left_ptr", server->cursor->cursor); + wlr_output_layout_add_auto(server->layout, wlr_output); + wlr_output_create_global(wlr_output); } diff --git a/waybox/seat.c b/waybox/seat.c new file mode 100644 index 0000000..18672e0 --- /dev/null +++ b/waybox/seat.c @@ -0,0 +1,163 @@ +#include + +#include "waybox/seat.h" +#include "waybox/xdg_shell.h" + +static bool handle_keybinding(struct wb_server *server, xkb_keysym_t sym, uint32_t modifiers) { + /* + * Here we handle compositor keybindings. This is when the compositor is + * processing keys, rather than passing them on to the client for its own + * processing. + */ + + if (modifiers & WLR_MODIFIER_CTRL && sym == XKB_KEY_Escape) { + wl_display_terminate(server->wl_display); + } + else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_Tab) { + /* Cycle to the next view */ + if (wl_list_length(&server->views) < 2) { + return false; + } + struct wb_view *current_view = wl_container_of( + server->views.next, current_view, link); + struct wb_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); + } + else if (modifiers & WLR_MODIFIER_ALT && sym == XKB_KEY_F2) + { + if (fork() == 0) { + execl("/bin/sh", "/bin/sh", "-c", "(obrun || bemenu-run || synapse || gmrun || gnome-do || dmenu_run) 2>/dev/null", NULL); + } + } + else return false; + return true; +} + +static void keyboard_handle_modifiers( + struct wl_listener *listener, void *data) { + /* This event is raised when a modifier key, such as shift or alt, is + * pressed. We simply communicate this to the client. */ + struct wb_keyboard *keyboard = + wl_container_of(listener, keyboard, modifiers); + /* + * A seat can only have one keyboard, but this is a limitation of the + * Wayland protocol - not wlroots. We assign all connected keyboards to the + * same seat. You can swap out the underlying wlr_keyboard like this and + * wlr_seat handles this transparently. + */ + wlr_seat_set_keyboard(keyboard->server->seat->seat, keyboard->device); + /* Send modifiers to the client. */ + wlr_seat_keyboard_notify_modifiers(keyboard->server->seat->seat, + &keyboard->device->keyboard->modifiers); +} + +static void keyboard_handle_key( + struct wl_listener *listener, void *data) { + /* This event is raised when a key is pressed or released. */ + struct wb_keyboard *keyboard = + wl_container_of(listener, keyboard, key); + struct wb_server *server = keyboard->server; + struct wlr_event_keyboard_key *event = data; + struct wlr_seat *seat = server->seat->seat; + + /* Translate libinput keycode -> xkbcommon */ + uint32_t keycode = event->keycode + 8; + /* Get a list of keysyms based on the keymap for this keyboard */ + 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 (event->state == WLR_KEY_PRESSED) { + /* If alt is held down and this button was _pressed_, we attempt to + * process it as a compositor keybinding. */ + for (int i = 0; i < nsyms; i++) { + handled = handle_keybinding(server, syms[i], modifiers); + } + } + + if (!handled) { + /* Otherwise, we pass it along to the client. */ + wlr_seat_set_keyboard(seat, keyboard->device); + wlr_seat_keyboard_notify_key(seat, event->time_msec, + event->keycode, event->state); + } +} + +static void handle_new_keyboard(struct wb_server *server, + struct wlr_input_device *device) { + struct wb_keyboard *keyboard = + calloc(1, sizeof(struct wb_keyboard)); + keyboard->server = server; + keyboard->device = device; + + /* We need to prepare an XKB keymap and assign it to the keyboard. */ + struct xkb_rule_names rules = { + .rules = getenv("XKB_DEFAULT_RULES"), + .model = getenv("XKB_DEFAULT_MODEL"), + .layout = getenv("XKB_DEFAULT_LAYOUT"), + .variant = getenv("XKB_DEFAULT_VARIANT"), + .options = getenv("XKB_DEFAULT_OPTIONS"), + }; + 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); + + /* Here we set up listeners for keyboard events. */ + 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->seat, device); + + /* And add the keyboard to our list of keyboards */ + wl_list_insert(&server->seat->keyboards, &keyboard->link); +} + +static void new_input_notify(struct wl_listener *listener, void *data) { + struct wlr_input_device *device = data; + struct wb_server *server = wl_container_of(listener, server, new_input); + switch (device->type) { + case WLR_INPUT_DEVICE_KEYBOARD: + handle_new_keyboard(server, device); + break; + case WLR_INPUT_DEVICE_POINTER: + wlr_cursor_attach_input_device(server->cursor->cursor, device); + break; + default: + break; + } + + uint32_t caps = WL_SEAT_CAPABILITY_POINTER; + if (!wl_list_empty(&server->seat->keyboards)) { + caps |= WL_SEAT_CAPABILITY_KEYBOARD; + } + wlr_seat_set_capabilities(server->seat->seat, caps); +} + +struct wb_seat *wb_seat_create(struct wb_server *server) { + struct wb_seat *seat = malloc(sizeof(struct wb_seat)); + + wl_list_init(&seat->keyboards); + server->new_input.notify = new_input_notify; + wl_signal_add(&server->backend->events.new_input, &server->new_input); + seat->seat = wlr_seat_create(server->wl_display, "seat0"); + + return seat; +} + +void wb_seat_destroy(struct wb_seat *seat) { + wlr_seat_destroy(seat->seat); + free(seat); +} diff --git a/waybox/server.c b/waybox/server.c index 70c9792..21687a0 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -1,84 +1,77 @@ #include "waybox/server.h" - -static void new_input_notify(struct wl_listener *listener, void *data) { - struct wlr_input_device *device = data; - struct wb_server *server = wl_container_of(listener, server, new_input); - switch (device->type) { - case WLR_INPUT_DEVICE_POINTER: - wlr_cursor_attach_input_device(server->cursor->cursor, device); - break; - default: - break; - } -} +#include "waybox/xdg_shell.h" bool init_wb(struct wb_server* server) { - // create display - server->wl_display = wl_display_create(); - assert(server->wl_display); + // create display + server->wl_display = wl_display_create(); + if (server->wl_display == NULL) { + fprintf(stderr, "Failed to connect to a Wayland display\n"); + return false; + } - // create shared memory - wl_display_init_shm(server->wl_display); - - // event loop stuff - server->wl_event_loop = wl_display_get_event_loop(server->wl_display); - assert(server->wl_event_loop); - - // create backend + // create backend server->backend = wlr_backend_autocreate(server->wl_display, NULL); - assert(server->backend); - if(server->backend == NULL){ - printf("Failed to create backend\n"); - return false; - } + if (server->backend == NULL) { + printf("Failed to create backend\n"); + return false; + } + server->renderer = wlr_backend_get_renderer(server->backend); + wlr_renderer_init_wl_display(server->renderer, server->wl_display); + + server->compositor = wlr_compositor_create(server->wl_display, + server->renderer); server->layout = wlr_output_layout_create(); - server->cursor = wb_cursor_create(); - wlr_cursor_attach_output_layout(server->cursor->cursor, server->layout); + server->seat = wb_seat_create(server); + server->cursor = wb_cursor_create(server); - return true; + return true; } bool start_wb(struct wb_server* server) { - wl_list_init(&server->outputs); + wl_list_init(&server->outputs); server->new_output.notify = new_output_notify; wl_signal_add(&server->backend->events.new_output, &server->new_output); - server->new_input.notify = new_input_notify; - wl_signal_add(&server->backend->events.new_input, &server->new_input); - const char *socket = wl_display_add_socket_auto(server->wl_display); - assert(socket); + if (!socket) + { + wlr_backend_destroy(server->backend); + return false; + } - if (!wlr_backend_start(server->backend)) { + if (!wlr_backend_start(server->backend)) { fprintf(stderr, "Failed to start backend\n"); + wlr_backend_destroy(server->backend); wl_display_destroy(server->wl_display); return false; } - wlr_gamma_control_manager_v1_create(server->wl_display); + printf("Running Wayland compositor on Wayland display '%s'\n", socket); + setenv("WAYLAND_DISPLAY", socket, true); + + wlr_gamma_control_manager_v1_create(server->wl_display); wlr_screencopy_manager_v1_create(server->wl_display); wlr_gtk_primary_selection_device_manager_create(server->wl_display); wlr_idle_create(server->wl_display); - server->compositor = wlr_compositor_create(server->wl_display, - wlr_backend_get_renderer(server->backend)); + wlr_data_device_manager_create(server->wl_display); + wl_list_init(&server->views); + init_xdg_shell(server); -// wlr_xdg_shell_v6_create(server.wl_display); - wlr_idle_create(server->wl_display); - - return true; + return true; } bool terminate_wb(struct wb_server* server) { - wl_display_destroy(server->wl_display); - - printf("Display destroyed.\n"); - + wl_display_destroy_clients(server->wl_display); wb_cursor_destroy(server->cursor); + wb_seat_destroy(server->seat); wlr_output_layout_destroy(server->layout); + wl_display_destroy(server->wl_display); - return true; + printf("Display destroyed.\n"); + + return true; } diff --git a/waybox/xdg_shell.c b/waybox/xdg_shell.c new file mode 100644 index 0000000..4fa8889 --- /dev/null +++ b/waybox/xdg_shell.c @@ -0,0 +1,199 @@ +#include "waybox/xdg_shell.h" + +void focus_view(struct wb_view *view, struct wlr_surface *surface) { + /* Note: this function only deals with keyboard focus. */ + if (view == NULL) { + return; + } + struct wb_server *server = view->server; + struct wlr_seat *seat = server->seat->seat; + struct wlr_surface *prev_surface = seat->keyboard_state.focused_surface; + if (prev_surface == surface) { + /* Don't re-focus an already focused surface. */ + return; + } + if (prev_surface) { + /* + * Deactivate the previously focused surface. This lets the client know + * it no longer has focus and the client will repaint accordingly, e.g. + * stop displaying a caret. + */ + 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); + /* Move the view to the front */ + wl_list_remove(&view->link); + wl_list_insert(&server->views, &view->link); + /* Activate the new surface */ + wlr_xdg_toplevel_set_activated(view->xdg_surface, true); + /* + * Tell the seat to have the keyboard enter this surface. wlroots will keep + * track of this and automatically send key events to the appropriate + * clients without additional work on your part. + */ + wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, + keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); +} + +static void xdg_surface_map(struct wl_listener *listener, void *data) { + /* Called when the surface is mapped, or ready to display on-screen. */ + struct wb_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) { + /* Called when the surface is unmapped, and should no longer be shown. */ + struct wb_view *view = wl_container_of(listener, view, unmap); + view->mapped = false; + + struct wb_view *current_view = (struct wb_view *) view->server->views.next; + struct wb_view *next_view = (struct wb_view *) current_view->link.next; + + /* If the current view is mapped, focus it. */ + if (current_view->mapped) { + focus_view(current_view, current_view->xdg_surface->surface); + } + /* Otherwise, focus the next view, if any. */ + else if (next_view->xdg_surface->surface) { + focus_view(next_view, next_view->xdg_surface->surface); + } +} + +static void xdg_surface_destroy(struct wl_listener *listener, void *data) { + /* Called when the surface is destroyed and should never be shown again. */ + struct wb_view *view = wl_container_of(listener, view, destroy); + wl_list_remove(&view->link); + free(view); +} + +static void begin_interactive(struct wb_view *view, + enum wb_cursor_mode mode, uint32_t edges) { + /* This function sets up an interactive move or resize operation, where the + * compositor stops propagating pointer events to clients and instead + * consumes them itself, to move or resize windows. */ + struct wb_server *server = view->server; + struct wlr_surface *focused_surface = + server->seat->seat->pointer_state.focused_surface; + if (view->xdg_surface->surface != focused_surface) { + /* Deny move/resize requests from unfocused clients. */ + return; + } + server->grabbed_view = view; + server->cursor->cursor_mode = mode; + struct wlr_box geo_box; + wlr_xdg_surface_get_geometry(view->xdg_surface, &geo_box); + if (mode == WB_CURSOR_MOVE) { + server->grab_x = server->cursor->cursor->x - view->x; + server->grab_y = server->cursor->cursor->y - view->y; + } else { + server->grab_x = server->cursor->cursor->x + geo_box.x; + server->grab_y = server->cursor->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) { + /* This event is raised when a client would like to begin an interactive + * move, typically because the user clicked on their client-side + * decorations. */ + struct wb_view *view = wl_container_of(listener, view, request_move); + begin_interactive(view, WB_CURSOR_MOVE, 0); +} + +static void xdg_toplevel_request_resize( + struct wl_listener *listener, void *data) { + /* This event is raised when a client would like to begin an interactive + * resize, typically because the user clicked on their client-side + * decorations. */ + struct wlr_xdg_toplevel_resize_event *event = data; + struct wb_view *view = wl_container_of(listener, view, request_resize); + begin_interactive(view, WB_CURSOR_RESIZE, event->edges); +} + +static void handle_new_xdg_surface(struct wl_listener *listener, void *data) { + /* This event is raised when wlr_xdg_shell receives a new xdg surface from a + * client, either a toplevel (application window) or popup. */ + struct wb_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; + } + + /* Allocate a wb_view for this surface */ + struct wb_view *view = + calloc(1, sizeof(struct wb_view)); + view->server = server; + view->xdg_surface = xdg_surface; + + /* Listen to the various events it can emit */ + 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); + + /* Add it to the list of views. */ + wl_list_insert(&server->views, &view->link); +} + +bool view_at(struct wb_view *view, + double lx, double ly, struct wlr_surface **surface, + double *sx, double *sy) { + /* + * XDG toplevels may have nested surfaces, such as popup windows for context + * menus or tooltips. This function tests if any of those are underneath the + * coordinates lx and ly (in output Layout Coordinates). If so, it sets the + * surface pointer to that wlr_surface and the sx and sy coordinates to the + * coordinates relative to that surface's top-left corner. + */ + double view_sx = lx - view->x; + double view_sy = ly - view->y; + + 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; +} + +struct wb_view *desktop_view_at( + struct wb_server *server, double lx, double ly, + struct wlr_surface **surface, double *sx, double *sy) { + /* This iterates over all of our surfaces and attempts to find one under the + * cursor. This relies on server->views being ordered from top-to-bottom. */ + struct wb_view *view; + wl_list_for_each(view, &server->views, link) { + if (view_at(view, lx, ly, surface, sx, sy)) { + return view; + } + } + return NULL; +} + +void init_xdg_shell(struct wb_server *server) { + server->xdg_shell = wlr_xdg_shell_create(server->wl_display); + server->new_xdg_surface.notify = handle_new_xdg_surface; + wl_signal_add(&server->xdg_shell->events.new_surface, &server->new_xdg_surface); +}