From 7732869870d739ab2ec8d45e2d7f7d4618116980 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Fri, 27 Dec 2019 21:22:45 +0000 Subject: [PATCH] Add .clang-format and apply --- .clang-format | 166 ++++++++++++++++++++++++++++++++++ labwc.h | 11 ++- main.c | 245 +++++++++++++++++++++++++++----------------------- output.c | 103 +++++++++++---------- server.c | 158 ++++++++++++++++---------------- view.c | 77 +++++++++------- xdg.c | 20 +++-- xwl.c | 26 +++--- 8 files changed, 513 insertions(+), 293 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..7ac923e8 --- /dev/null +++ b/.clang-format @@ -0,0 +1,166 @@ +# Copied from https://github.com/git/git/blob/master/.clang-format +# under GPL-2.0. + +UseTab: Always +TabWidth: 8 +IndentWidth: 8 +ContinuationIndentWidth: 8 +ColumnLimit: 80 + +# C Language specifics +Language: Cpp + +# Align parameters on the open bracket +# someLongFunction(argument1, +# argument2); +AlignAfterOpenBracket: Align + +# Don't align consecutive assignments +# int aaaa = 12; +# int b = 14; +AlignConsecutiveAssignments: false + +# Don't align consecutive declarations +# int aaaa = 12; +# double b = 3.14; +AlignConsecutiveDeclarations: false + +# Align escaped newlines as far left as possible +# #define A \ +# int aaaa; \ +# int b; \ +# int cccccccc; +AlignEscapedNewlines: Left + +# Align operands of binary and ternary expressions +# int aaa = bbbbbbbbbbb + +# cccccc; +AlignOperands: true + +# Don't align trailing comments +# int a; // Comment a +# int b = 2; // Comment b +AlignTrailingComments: false + +# By default don't allow putting parameters onto the next line +# myFunction(foo, bar, baz); +AllowAllParametersOfDeclarationOnNextLine: false + +# Don't allow short braced statements to be on a single line +# if (a) not if (a) return; +# return; +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false + +# By default don't add a line break after the return type of top-level functions +# int foo(); +AlwaysBreakAfterReturnType: None + +# Pack as many parameters or arguments onto the same line as possible +# int myFunction(int aaaaaaaaaaaa, int bbbbbbbb, +# int cccc); +BinPackArguments: true +BinPackParameters: true + +# Attach braces to surrounding context except break before braces on function +# definitions. +# void foo() +# { +# if (true) { +# } else { +# } +# }; +BreakBeforeBraces: Linux + +# Break after operators +# int valuve = aaaaaaaaaaaaa + +# bbbbbb - +# ccccccccccc; +BreakBeforeBinaryOperators: None +BreakBeforeTernaryOperators: false + +# Don't break string literals +BreakStringLiterals: false + +# Use the same indentation level as for the switch statement. +# Switch statement body is always indented one level more than case labels. +IndentCaseLabels: false + +# Don't indent a function definition or declaration if it is wrapped after the +# type +IndentWrappedFunctionNames: false + +# Align pointer to the right +# int *a; +PointerAlignment: Right + +# Don't insert a space after a cast +# x = (int32)y; not x = (int32) y; +SpaceAfterCStyleCast: false + +# Insert spaces before and after assignment operators +# int a = 5; not int a=5; +# a += 42; a+=42; +SpaceBeforeAssignmentOperators: true + +# Put a space before opening parentheses only after control statement keywords. +# void f() { +# if (true) { +# f(); +# } +# } +SpaceBeforeParens: ControlStatements + +# Don't insert spaces inside empty '()' +SpaceInEmptyParentheses: false + +# The number of spaces before trailing line comments (// - comments). +# This does not affect trailing block comments (/* - comments). +SpacesBeforeTrailingComments: 1 + +# Don't insert spaces in casts +# x = (int32) y; not x = ( int32 ) y; +SpacesInCStyleCastParentheses: false + +# Don't insert spaces inside container literals +# var arr = [1, 2, 3]; not var arr = [ 1, 2, 3 ]; +SpacesInContainerLiterals: false + +# Don't insert spaces after '(' or before ')' +# f(arg); not f( arg ); +SpacesInParentheses: false + +# Don't insert spaces after '[' or before ']' +# int a[5]; not int a[ 5 ]; +SpacesInSquareBrackets: false + +# Insert a space after '{' and before '}' in struct initializers +Cpp11BracedListStyle: false + +# A list of macros that should be interpreted as foreach loops instead of as +# function calls. +ForEachMacros: + - 'wl_list_for_each' + - 'wl_list_for_each_reverse' + +# The maximum number of consecutive empty lines to keep. +MaxEmptyLinesToKeep: 1 + +# No empty line at the start of a block. +KeepEmptyLinesAtTheStartOfBlocks: false + +# Penalties +# This decides what order things should be done if a line is too long +PenaltyBreakAssignment: 10 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +# Don't sort #include's +SortIncludes: false diff --git a/labwc.h b/labwc.h index 6ac70e88..402c0e4f 100644 --- a/labwc.h +++ b/labwc.h @@ -82,10 +82,7 @@ struct output { struct wl_listener frame; }; -enum view_type { - LAB_XDG_SHELL_VIEW, - LAB_XWAYLAND_VIEW -}; +enum view_type { LAB_XDG_SHELL_VIEW, LAB_XWAYLAND_VIEW }; struct view { enum view_type type; @@ -136,10 +133,12 @@ void xwl_surface_new(struct wl_listener *listener, void *data); void focus_view(struct view *view, struct wlr_surface *surface); void view_focus_next_toplevel(struct server *server); -void begin_interactive(struct view *view, enum cursor_mode mode, uint32_t edges); +void begin_interactive(struct view *view, enum cursor_mode mode, + uint32_t edges); bool is_toplevel(struct view *view); struct view *desktop_view_at(struct server *server, double lx, double ly, - struct wlr_surface **surface, double *sx, double *sy); + struct wlr_surface **surface, double *sx, + double *sy); /* TODO: try to refactor to remove from header file */ struct view *first_toplevel(struct server *server); diff --git a/main.c b/main.c index 128f8a7d..d96c9797 100644 --- a/main.c +++ b/main.c @@ -6,10 +6,11 @@ #include #include -static struct view *last_toplevel(struct server *server) { +static struct view *last_toplevel(struct server *server) +{ struct view *view; - wl_list_for_each_reverse(view, &server->views, link) { + wl_list_for_each_reverse (view, &server->views, link) { if (!view->been_mapped) { continue; } @@ -21,7 +22,8 @@ static struct view *last_toplevel(struct server *server) { return NULL; } -static void view_focus_last_toplevel(struct server *server) { +static void view_focus_last_toplevel(struct server *server) +{ /* TODO: write view_nr_toplevel_views() */ if (wl_list_length(&server->views) < 2) { return; @@ -30,25 +32,26 @@ static void view_focus_last_toplevel(struct server *server) { focus_view(view, view->surface); } -static void keyboard_handle_modifiers( - struct wl_listener *listener, void *data) { +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 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. + * 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, keyboard->device); /* Send modifiers to the client. */ - wlr_seat_keyboard_notify_modifiers(keyboard->server->seat, - &keyboard->device->keyboard->modifiers); + wlr_seat_keyboard_notify_modifiers( + keyboard->server->seat, &keyboard->device->keyboard->modifiers); } -static void xdg_debug_show_one_view(struct view *view) { +static void xdg_debug_show_one_view(struct view *view) +{ fprintf(stderr, "XDG "); switch (view->xdg_surface->role) { case WLR_XDG_SURFACE_ROLE_NONE: @@ -63,32 +66,30 @@ static void xdg_debug_show_one_view(struct view *view) { } fprintf(stderr, " %p %s", (void *)view, view->xdg_surface->toplevel->app_id); - fprintf(stderr, " {%d, %d, %d, %d}\n", - view->xdg_surface->geometry.x, + fprintf(stderr, " {%d, %d, %d, %d}\n", view->xdg_surface->geometry.x, view->xdg_surface->geometry.y, view->xdg_surface->geometry.height, view->xdg_surface->geometry.width); } -static void xwl_debug_show_one_view(struct view *view) { +static void xwl_debug_show_one_view(struct view *view) +{ fprintf(stderr, "XWL "); if (!view->been_mapped) { fprintf(stderr, "- "); } else { fprintf(stderr, "%d ", xwl_nr_parents(view)); } - fprintf(stderr, " %d ", wl_list_length(&view->xwayland_surface->children)); + fprintf(stderr, " %d ", + wl_list_length(&view->xwayland_surface->children)); if (view->mapped) { fprintf(stderr, "Y"); } else { fprintf(stderr, "-"); } - fprintf(stderr, " %p %s {%d,%d,%d,%d}\n", - (void *)view, - view->xwayland_surface->class, - view->xwayland_surface->x, - view->xwayland_surface->y, - view->xwayland_surface->width, + fprintf(stderr, " %p %s {%d,%d,%d,%d}\n", (void *)view, + view->xwayland_surface->class, view->xwayland_surface->x, + view->xwayland_surface->y, view->xwayland_surface->width, view->xwayland_surface->height); /* * Other variables to consider printing: @@ -104,27 +105,30 @@ static void xwl_debug_show_one_view(struct view *view) { */ } -static void debug_show_one_view(struct view *view) { +static void debug_show_one_view(struct view *view) +{ if (view->type == LAB_XDG_SHELL_VIEW) xdg_debug_show_one_view(view); else if (view->type == LAB_XWAYLAND_VIEW) xwl_debug_show_one_view(view); } -static void debug_show_views(struct server *server) { +static void debug_show_views(struct server *server) +{ struct view *view; fprintf(stderr, "---\n"); fprintf(stderr, "TYPE NR_PNT NR_CLD MAPPED VIEW-POINTER NAME\n"); - wl_list_for_each_reverse(view, &server->views, link) + wl_list_for_each_reverse (view, &server->views, link) debug_show_one_view(view); } -static bool handle_keybinding(struct server *server, xkb_keysym_t sym) { +static bool handle_keybinding(struct server *server, xkb_keysym_t sym) +{ /* * 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. + * processing keys, rather than passing them on to the client for its + * own processing. * * This function assumes Alt is held down. */ @@ -142,8 +146,8 @@ static bool handle_keybinding(struct server *server, xkb_keysym_t sym) { } break; case XKB_KEY_F6: - begin_interactive(first_toplevel(server), - TINYWL_CURSOR_MOVE, 0); + begin_interactive(first_toplevel(server), TINYWL_CURSOR_MOVE, + 0); break; case XKB_KEY_F12: debug_show_views(server); @@ -154,11 +158,10 @@ static bool handle_keybinding(struct server *server, xkb_keysym_t sym) { return true; } -static void keyboard_handle_key( - struct wl_listener *listener, void *data) { +static void keyboard_handle_key(struct wl_listener *listener, void *data) +{ /* This event is raised when a key is pressed or released. */ - struct keyboard *keyboard = - wl_container_of(listener, keyboard, key); + struct keyboard *keyboard = wl_container_of(listener, keyboard, key); struct server *server = keyboard->server; struct wlr_event_keyboard_key *event = data; struct wlr_seat *seat = server->seat; @@ -168,13 +171,14 @@ static void keyboard_handle_key( /* 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); + keyboard->device->keyboard->xkb_state, keycode, &syms); bool handled = false; - uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); + uint32_t modifiers = + wlr_keyboard_get_modifiers(keyboard->device->keyboard); if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_KEY_PRESSED) { - /* If alt is held down and this button was _pressed_, we attempt to - * process it as a compositor keybinding. */ + /* 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]); } @@ -184,14 +188,14 @@ static void keyboard_handle_key( /* 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); + event->keycode, event->state); } } static void server_new_keyboard(struct server *server, - struct wlr_input_device *device) { - struct keyboard *keyboard = - calloc(1, sizeof(struct keyboard)); + struct wlr_input_device *device) +{ + struct keyboard *keyboard = calloc(1, sizeof(struct keyboard)); keyboard->server = server; keyboard->device = device; @@ -199,8 +203,8 @@ static void server_new_keyboard(struct server *server, * assumes the defaults (e.g. layout = "us"). */ 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); + 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); @@ -209,7 +213,8 @@ static void server_new_keyboard(struct server *server, /* Here we set up listeners for keyboard events. */ keyboard->modifiers.notify = keyboard_handle_modifiers; - wl_signal_add(&device->keyboard->events.modifiers, &keyboard->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); @@ -220,19 +225,20 @@ static void server_new_keyboard(struct server *server, } static void server_new_pointer(struct server *server, - struct wlr_input_device *device) { - /* We don't do anything special with pointers. All of our pointer handling - * is proxied through wlr_cursor. On another compositor, you might take this - * opportunity to do libinput configuration on the device to set - * acceleration, etc. */ + struct wlr_input_device *device) +{ + /* We don't do anything special with pointers. All of our pointer + * handling is proxied through wlr_cursor. On another compositor, you + * might take this opportunity to do libinput configuration on the + * device to set acceleration, etc. */ wlr_cursor_attach_input_device(server->cursor, device); } -static void server_new_input(struct wl_listener *listener, void *data) { +static void server_new_input(struct wl_listener *listener, void *data) +{ /* This event is raised by the backend when a new input device becomes * available. */ - struct server *server = - wl_container_of(listener, server, new_input); + struct server *server = wl_container_of(listener, server, new_input); struct wlr_input_device *device = data; switch (device->type) { case WLR_INPUT_DEVICE_KEYBOARD: @@ -245,8 +251,9 @@ static void server_new_input(struct wl_listener *listener, void *data) { break; } /* We need to let the wlr_seat know what our capabilities are, which is - * communiciated to the client. In TinyWL we always have a cursor, even if - * there are no pointer devices, so we always include that capability. */ + * communiciated to the client. In TinyWL we always have a cursor, even + * if there are no pointer devices, so we always include that + * capability. */ uint32_t caps = WL_SEAT_CAPABILITY_POINTER; if (!wl_list_empty(&server->keyboards)) { caps |= WL_SEAT_CAPABILITY_KEYBOARD; @@ -254,26 +261,29 @@ static void server_new_input(struct wl_listener *listener, void *data) { wlr_seat_set_capabilities(server->seat, caps); } -static void seat_request_cursor(struct wl_listener *listener, void *data) { - struct server *server = wl_container_of( - listener, server, request_cursor); - /* This event is rasied by the seat when a client provides a cursor image */ +static void seat_request_cursor(struct wl_listener *listener, void *data) +{ + struct server *server = + wl_container_of(listener, server, 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 = server->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. */ + /* 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(server->cursor, event->surface, - event->hotspot_x, event->hotspot_y); + event->hotspot_x, event->hotspot_y); } } -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ wlr_log_init(WLR_ERROR, NULL); char *startup_cmd = NULL; @@ -297,27 +307,30 @@ int main(int argc, char *argv[]) { /* The Wayland display is managed by libwayland. It handles accepting * clients from the Unix socket, manging Wayland globals, and so on. */ server.wl_display = wl_display_create(); - /* The backend is a wlroots feature which abstracts the underlying input and - * output hardware. The autocreate option will choose the most suitable - * backend based on the current environment, such as opening an X11 window - * if an X11 server is running. The NULL argument here optionally allows you - * to pass in a custom renderer if wlr_renderer doesn't meet your needs. The - * backend uses the renderer, for example, to fall back to software cursors - * if the backend does not support hardware cursors (some older GPUs - * don't). */ + /* The backend is a wlroots feature which abstracts the underlying input + * and output hardware. The autocreate option will choose the most + * suitable backend based on the current environment, such as opening an + * X11 window if an X11 server is running. The NULL argument here + * optionally allows you to pass in a custom renderer if wlr_renderer + * doesn't meet your needs. The backend uses the renderer, for example, + * to fall back to software cursors if the backend does not support + * hardware cursors (some older GPUs don't). */ server.backend = wlr_backend_autocreate(server.wl_display, NULL); - /* If we don't provide a renderer, autocreate makes a GLES2 renderer for us. - * The renderer is responsible for defining the various pixel formats it - * supports for shared memory, this configures that for clients. */ + /* If we don't provide a renderer, autocreate makes a GLES2 renderer for + * us. The renderer is responsible for defining the various pixel + * formats it supports for shared memory, this configures that for + * clients. */ server.renderer = wlr_backend_get_renderer(server.backend); wlr_renderer_init_wl_display(server.renderer, server.wl_display); /* This creates some hands-off wlroots interfaces. The compositor is - * necessary for clients to allocate surfaces and the data device manager - * handles the clipboard. Each of these wlroots interfaces has room for you - * to dig your fingers in and play with their behavior if you want. */ - server.compositor = wlr_compositor_create(server.wl_display, server.renderer); + * necessary for clients to allocate surfaces and the data device + * manager handles the clipboard. Each of these wlroots interfaces has + * room for you to dig your fingers in and play with their behavior if + * you want. */ + server.compositor = + wlr_compositor_create(server.wl_display, server.renderer); wlr_data_device_manager_create(server.wl_display); wlr_export_dmabuf_manager_v1_create(server.wl_display); @@ -330,15 +343,15 @@ int main(int argc, char *argv[]) { * arrangement of screens in a physical layout. */ server.output_layout = wlr_output_layout_create(); - /* Configure a listener to be notified when new outputs are available on the - * backend. */ + /* Configure a listener to be notified when new outputs are available on + * the backend. */ wl_list_init(&server.outputs); server.new_output.notify = server_new_output; wl_signal_add(&server.backend->events.new_output, &server.new_output); - /* Set up our list of views and the xdg-shell. The xdg-shell is a Wayland - * protocol which is used for application windows. For more detail on - * shells, refer to my article: + /* Set up our list of views and the xdg-shell. The xdg-shell is a + * Wayland protocol which is used for application windows. For more + * detail on shells, refer to my article: * * https://drewdevault.com/2018/07/29/Wayland-shells.html */ @@ -346,7 +359,7 @@ int main(int argc, char *argv[]) { server.xdg_shell = wlr_xdg_shell_create(server.wl_display); server.new_xdg_surface.notify = xdg_surface_new; wl_signal_add(&server.xdg_shell->events.new_surface, - &server.new_xdg_surface); + &server.new_xdg_surface); /* * Creates a cursor, which is a wlroots utility for tracking the cursor @@ -356,22 +369,23 @@ int main(int argc, char *argv[]) { wlr_cursor_attach_output_layout(server.cursor, server.output_layout); /* - * wlr_cursor *only* displays an image on screen. It does not move around - * when the pointer moves. However, we can attach input devices to it, and - * it will generate aggregate events for all of them. In these events, we - * can choose how we want to process them, forwarding them to clients and - * moving the cursor around. More detail on this process is described in my - * input handling blog post: + * wlr_cursor *only* displays an image on screen. It does not move + * around when the pointer moves. However, we can attach input devices + * to it, and it will generate aggregate events for all of them. In + * these events, we can choose how we want to process them, forwarding + * them to clients and moving the cursor around. More detail on this + * process is described in my input handling blog post: * * https://drewdevault.com/2018/07/17/Input-handling-in-wlroots.html * - * And more comments are sprinkled throughout the notify functions above. + * And more comments are sprinkled throughout the notify functions + * above. */ 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_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; @@ -382,8 +396,8 @@ int main(int argc, char *argv[]) { /* * Configures a seat, which is a single "seat" at which a user sits and * operates the computer. This conceptually includes up to one keyboard, - * pointer, touch, and drawing tablet device. We also rig up a listener to - * let us know when new input devices are available on the backend. + * pointer, touch, and drawing tablet device. We also rig up a listener + * to let us know when new input devices are available on the backend. */ wl_list_init(&server.keyboards); server.new_input.notify = server_new_input; @@ -391,7 +405,7 @@ int main(int argc, char *argv[]) { 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); + &server.request_cursor); /* Add a Unix socket to the Wayland display. */ const char *socket = wl_display_add_socket_auto(server.wl_display); @@ -400,46 +414,53 @@ int main(int argc, char *argv[]) { return 1; } - /* Start the backend. This will enumerate outputs and inputs, become the DRM - * master, etc */ + /* Start the backend. This will enumerate outputs and inputs, become the + * DRM master, etc */ if (!wlr_backend_start(server.backend)) { wlr_backend_destroy(server.backend); wl_display_destroy(server.wl_display); return 1; } - /* Set the WAYLAND_DISPLAY environment variable to our socket and run the - * startup command if requested. */ + /* Set the WAYLAND_DISPLAY environment variable to our socket and run + * the startup command if requested. */ setenv("WAYLAND_DISPLAY", socket, true); wl_display_init_shm(server.wl_display); /* Init xwayland */ - server.xwayland = wlr_xwayland_create(server.wl_display, server.compositor, false); + server.xwayland = wlr_xwayland_create(server.wl_display, + server.compositor, false); server.new_xwayland_surface.notify = xwl_surface_new; - wl_signal_add(&server.xwayland->events.new_surface, &server.new_xwayland_surface); + wl_signal_add(&server.xwayland->events.new_surface, + &server.new_xwayland_surface); setenv("DISPLAY", server.xwayland->display_name, true); wlr_xwayland_set_seat(server.xwayland, server.seat); /* Creates an xcursor manager, another wlroots utility which loads up - * Xcursor themes to source cursor images from and makes sure that cursor - * images are available at all scale factors on the screen (necessary for - * HiDPI support). We add a cursor theme at scale factor 1 to begin with. */ - server.cursor_mgr = wlr_xcursor_manager_create(XCURSOR_DEFAULT, XCURSOR_SIZE); + * Xcursor themes to source cursor images from and makes sure that + * cursor images are available at all scale factors on the screen + * (necessary for + * HiDPI support). We add a cursor theme at scale factor 1 to begin + * with. */ + server.cursor_mgr = + wlr_xcursor_manager_create(XCURSOR_DEFAULT, XCURSOR_SIZE); wlr_xcursor_manager_load(server.cursor_mgr, 1); - struct wlr_xcursor *xcursor = - wlr_xcursor_manager_get_xcursor(server.cursor_mgr, XCURSOR_DEFAULT, 1); + struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor( + server.cursor_mgr, XCURSOR_DEFAULT, 1); if (xcursor) { struct wlr_xcursor_image *image = xcursor->images[0]; wlr_xwayland_set_cursor(server.xwayland, image->buffer, - image->width * 4, image->width, image->height, - image->hotspot_x, image->hotspot_y); + image->width * 4, image->width, + image->height, image->hotspot_x, + image->hotspot_y); } if (startup_cmd) { if (fork() == 0) { - execl("/bin/sh", "/bin/sh", "-c", startup_cmd, (void *)NULL); + execl("/bin/sh", "/bin/sh", "-c", startup_cmd, + (void *)NULL); } } /* Run the Wayland event loop. This does not return until you exit the @@ -447,7 +468,7 @@ int main(int argc, char *argv[]) { * loop configuration to listen to libinput events, DRM events, generate * frame events at the refresh rate, and so on. */ wlr_log(WLR_INFO, "Running Wayland compositor on WAYLAND_DISPLAY=%s", - socket); + socket); wl_display_run(server.wl_display); /* Once wl_display_run returns, we shut down the server. */ diff --git a/output.c b/output.c index 4e28aaa8..129b7734 100644 --- a/output.c +++ b/output.c @@ -11,7 +11,8 @@ struct render_data { struct timespec *when; }; -static void render_decorations(struct wlr_output *output, struct view *view) { +static void render_decorations(struct wlr_output *output, struct view *view) +{ if (!view->surface) return; if (view->type != LAB_XWAYLAND_VIEW) @@ -24,46 +25,49 @@ static void render_decorations(struct wlr_output *output, struct view *view) { .y = view->y - XWL_TITLEBAR_HEIGHT - XWL_WINDOW_BORDER, .width = view->surface->current.width + 2 * XWL_WINDOW_BORDER, .height = view->surface->current.height + XWL_TITLEBAR_HEIGHT + - 2 * XWL_WINDOW_BORDER, + 2 * XWL_WINDOW_BORDER, }; float matrix[9]; wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0, - output->transform_matrix); + output->transform_matrix); float color[] = { 0.2, 0.2, 0.7, 0.9 }; wlr_render_quad_with_matrix(view->server->renderer, color, matrix); } -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. */ +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 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. */ + * 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). */ + /* 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->output_layout, output, &ox, &oy); + wlr_output_layout_output_coords(view->server->output_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, TinyWL does not fully support HiDPI. */ + /* We also have to apply the scale factor for HiDPI outputs. This is + * only part of the puzzle, TinyWL does not fully support HiDPI. */ struct wlr_box box = { .x = ox * output->scale, .y = oy * output->scale, @@ -72,12 +76,13 @@ static void render_surface(struct wlr_surface *surface, }; /* - * Those familiar with OpenGL are also familiar with the role of matricies - * 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. + * Those familiar with OpenGL are also familiar with the role of + * matricies 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. @@ -86,10 +91,10 @@ static void render_surface(struct wlr_surface *surface, enum wl_output_transform transform = wlr_output_transform_invert(surface->current.transform); wlr_matrix_project_box(matrix, &box, transform, 0, - output->transform_matrix); + output->transform_matrix); - /* This takes our matrix, the texture, and an alpha, and performs the actual - * rendering on the GPU. */ + /* 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 @@ -97,11 +102,11 @@ static void render_surface(struct wlr_surface *surface, wlr_surface_send_frame_done(surface, rdata->when); } -void output_frame(struct wl_listener *listener, void *data) { - /* This function is called every time an output is ready to display a frame, - * generally at the output's refresh rate (e.g. 60Hz). */ - struct output *output = - wl_container_of(listener, output, frame); +void output_frame(struct wl_listener *listener, void *data) +{ + /* This function is called every time an output is ready to display a + * frame, generally at the output's refresh rate (e.g. 60Hz). */ + struct output *output = wl_container_of(listener, output, frame); struct wlr_renderer *renderer = output->server->renderer; struct timespec now; @@ -114,16 +119,18 @@ void output_frame(struct wl_listener *listener, void *data) { /* The "effective" resolution can change if you rotate your outputs. */ int width, height; wlr_output_effective_resolution(output->wlr_output, &width, &height); - /* Begin the renderer (calls glViewport and some other GL sanity checks) */ + /* Begin the renderer (calls glViewport and some other GL sanity checks) + */ wlr_renderer_begin(renderer, width, height); - float color[4] = {0.3, 0.3, 0.3, 1.0}; + float color[4] = { 0.3, 0.3, 0.3, 1.0 }; wlr_renderer_clear(renderer, color); - /* Each subsequent window we render is rendered on top of the last. Because - * our view list is ordered front-to-back, we iterate over it backwards. */ + /* Each subsequent window we render is rendered on top of the last. + * Because our view list is ordered front-to-back, we iterate over it + * backwards. */ struct view *view; - wl_list_for_each_reverse(view, &output->server->views, link) { + wl_list_for_each_reverse (view, &output->server->views, link) { if (!view->mapped) { /* An unmapped view should not be rendered. */ continue; @@ -137,22 +144,23 @@ void output_frame(struct wl_listener *listener, void *data) { render_decorations(output->wlr_output, view); - /* This calls our render_surface function for each surface among the - * xdg_surface's toplevel and popups. */ + /* This calls our render_surface function for each surface among + * the xdg_surface's toplevel and popups. */ if (view->type == LAB_XDG_SHELL_VIEW) { - wlr_xdg_surface_for_each_surface(view->xdg_surface, - render_surface, &rdata); + wlr_xdg_surface_for_each_surface( + view->xdg_surface, render_surface, &rdata); } else if (view->type == LAB_XWAYLAND_VIEW) { render_surface(view->xwayland_surface->surface, 0, 0, - &rdata); + &rdata); } } - /* Hardware cursors are rendered by the GPU on a separate plane, and can be - * moved around without re-rendering what's beneath them - which is more - * efficient. However, not all hardware supports hardware cursors. For this - * reason, wlroots provides a software fallback, which we ask it to render - * here. wlr_cursor handles configuring hardware vs software cursors for you, + /* Hardware cursors are rendered by the GPU on a separate plane, and can + * be moved around without re-rendering what's beneath them - which is + * more efficient. However, not all hardware supports hardware cursors. + * For this reason, wlroots provides a software fallback, which we ask + * it to render here. wlr_cursor handles configuring hardware vs + * software cursors for you, * and this function is a no-op when hardware cursors are in use. */ wlr_output_render_software_cursors(output->wlr_output, NULL); @@ -161,4 +169,3 @@ void output_frame(struct wl_listener *listener, void *data) { wlr_renderer_end(renderer); wlr_output_commit(output->wlr_output); } - diff --git a/server.c b/server.c index a46fe670..b18fc463 100644 --- a/server.c +++ b/server.c @@ -11,13 +11,13 @@ static void process_cursor_resize(struct server *server, uint32_t time) { /* * Resizing the grabbed view can be a little bit complicated, because we - * could be resizing from any corner or edge. This not only resizes the view - * on one or two axes, but can also move the view if you resize from the top - * or left edges (or top-left corner). + * could be resizing from any corner or edge. This not only resizes the + * view on one or two axes, but can also move the view if you resize + * from the top or left edges (or top-left corner). * - * Note that I took some shortcuts here. In a more fleshed-out compositor, - * you'd wait for the client to prepare a buffer at the new size, then - * commit any movement that was prepared. + * Note that I took some shortcuts here. In a more fleshed-out + * compositor, you'd wait for the client to prepare a buffer at the new + * size, then commit any movement that was prepared. */ struct view *view = server->grabbed_view; double dx = server->cursor->x - server->grab_x; @@ -60,71 +60,75 @@ static void process_cursor_motion(struct server *server, uint32_t time) return; } - /* Otherwise, find the view under the pointer and send the event along. */ + /* Otherwise, find the view under the pointer and send the event along. + */ double sx, sy; struct wlr_seat *seat = server->seat; struct wlr_surface *surface = NULL; - struct view *view = desktop_view_at(server, - server->cursor->x, server->cursor->y, &surface, &sx, &sy); + struct view *view = desktop_view_at(server, server->cursor->x, + server->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. */ + /* 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_mgr, "left_ptr", server->cursor); + server->cursor_mgr, "left_ptr", server->cursor); } if (surface) { - bool focus_changed = seat->pointer_state.focused_surface != 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. + * "Enter" the surface if necessary. This lets the client know + * that the cursor has entered one of its surfaces. * - * Note that this gives the surface "pointer focus", which is distinct - * from keyboard focus. You get pointer focus by moving the pointer over - * a window. + * Note that this gives the surface "pointer focus", which is + * distinct from keyboard focus. You get pointer focus by moving + * the pointer over a window. */ 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. */ + /* 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. */ + /* 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); } } void server_cursor_motion(struct wl_listener *listener, void *data) { - /* This event is forwarded by the cursor when a pointer emits a _relative_ - * pointer motion event (i.e. a delta) */ + /* This event is forwarded by the cursor when a pointer emits a + * _relative_ pointer motion event (i.e. a delta) */ struct server *server = wl_container_of(listener, server, cursor_motion); struct wlr_event_pointer_motion *event = data; - /* The cursor doesn't move unless we tell it to. The cursor automatically - * handles constraining the motion to the output layout, as well as any - * special configuration applied for the specific input device which - * generated the event. You can pass NULL for the device if you want to move - * the cursor around without any input. */ - wlr_cursor_move(server->cursor, event->device, - event->delta_x, event->delta_y); + /* The cursor doesn't move unless we tell it to. The cursor + * automatically handles constraining the motion to the output layout, + * as well as any special configuration applied for the specific input + * device which generated the event. You can pass NULL for the device if + * you want to move the cursor around without any input. */ + wlr_cursor_move(server->cursor, event->device, event->delta_x, + event->delta_y); process_cursor_motion(server, event->time_msec); } void server_cursor_motion_absolute(struct wl_listener *listener, void *data) { - /* This event is forwarded by the cursor when a pointer emits an _absolute_ - * motion event, from 0..1 on each axis. This happens, for example, when - * wlroots is running under a Wayland window rather than KMS+DRM, and you - * move the mouse over the window. You could enter the window from any edge, - * so we have to warp the mouse there. There is also some hardware which - * emits these events. */ + /* This event is forwarded by the cursor when a pointer emits an + * _absolute_ motion event, from 0..1 on each axis. This happens, for + * example, when wlroots is running under a Wayland window rather than + * KMS+DRM, and you move the mouse over the window. You could enter the + * window from any edge, so we have to warp the mouse there. There is + * also some hardware which emits these events. */ struct 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); + wlr_cursor_warp_absolute(server->cursor, event->device, event->x, + event->y); process_cursor_motion(server, event->time_msec); } @@ -135,15 +139,18 @@ void server_cursor_button(struct wl_listener *listener, void *data) struct server *server = wl_container_of(listener, server, 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(server->seat, - event->time_msec, event->button, event->state); + /* Notify the client with pointer focus that a button press has occurred + */ + wlr_seat_pointer_notify_button(server->seat, event->time_msec, + event->button, event->state); double sx, sy; struct wlr_surface *surface; - struct view *view = desktop_view_at(server, - server->cursor->x, server->cursor->y, &surface, &sx, &sy); + struct view *view = desktop_view_at(server, server->cursor->x, + server->cursor->y, &surface, &sx, + &sy); if (event->state == WLR_BUTTON_RELEASED) { - /* If you released any buttons, we exit interactive move/resize mode. */ + /* If you released any buttons, we exit interactive move/resize + * mode. */ server->cursor_mode = TINYWL_CURSOR_PASSTHROUGH; } else { /* Focus that client if the button was _pressed_ */ @@ -151,42 +158,43 @@ void server_cursor_button(struct wl_listener *listener, void *data) } } -void server_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 server *server = - wl_container_of(listener, server, cursor_axis); +void server_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 server *server = wl_container_of(listener, server, cursor_axis); struct wlr_event_pointer_axis *event = data; /* Notify the client with pointer focus of the axis event. */ - wlr_seat_pointer_notify_axis(server->seat, - event->time_msec, event->orientation, event->delta, - event->delta_discrete, event->source); + wlr_seat_pointer_notify_axis(server->seat, event->time_msec, + event->orientation, event->delta, + event->delta_discrete, event->source); } -void server_cursor_frame(struct wl_listener *listener, void *data) { +void server_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 + * 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 server *server = - wl_container_of(listener, server, cursor_frame); + struct server *server = wl_container_of(listener, server, cursor_frame); /* Notify the client with pointer focus of the frame event. */ wlr_seat_pointer_notify_frame(server->seat); } void server_new_output(struct wl_listener *listener, void *data) { - /* This event is rasied by the backend when a new output (aka a display or - * monitor) becomes available. */ - struct server *server = - wl_container_of(listener, server, new_output); + /* This event is rasied by the backend when a new output (aka a display + * or monitor) becomes available. */ + struct server *server = wl_container_of(listener, server, new_output); struct wlr_output *wlr_output = data; - /* Some backends don't have modes. DRM+KMS does, and we need to set a mode - * before we can use the output. The mode is a tuple of (width, height, - * refresh rate), and each monitor supports only a specific set of modes. We - * just pick the first, a more sophisticated compositor would let the user - * configure it or pick the mode the display advertises as preferred. */ + /* Some backends don't have modes. DRM+KMS does, and we need to set a + * mode before we can use the output. The mode is a tuple of (width, + * height, refresh rate), and each monitor supports only a specific set + * of modes. We just pick the first, a more sophisticated compositor + * would let the user configure it or pick the mode the display + * advertises as preferred. */ if (!wl_list_empty(&wlr_output->modes)) { struct wlr_output_mode *mode = wl_container_of(wlr_output->modes.prev, mode, link); @@ -194,8 +202,7 @@ void server_new_output(struct wl_listener *listener, void *data) } /* Allocates and configures our state for this output */ - struct output *output = - calloc(1, sizeof(struct output)); + struct output *output = calloc(1, sizeof(struct output)); output->wlr_output = wlr_output; output->server = server; /* Sets up a listener for the frame notify event. */ @@ -203,15 +210,14 @@ void server_new_output(struct wl_listener *listener, void *data) wl_signal_add(&wlr_output->events.frame, &output->frame); wl_list_insert(&server->outputs, &output->link); - /* Adds this to the output layout. The add_auto function arranges outputs - * from left-to-right in the order they appear. A more sophisticated - * compositor would let the user configure the arrangement of outputs in the - * layout. */ + /* Adds this to the output layout. The add_auto function arranges + * outputs from left-to-right in the order they appear. A more + * sophisticated compositor would let the user configure the arrangement + * of outputs in the layout. */ wlr_output_layout_add_auto(server->output_layout, wlr_output); - /* Creating the global adds a wl_output global to the display, which Wayland - * clients can see to find out information about the output (such as - * DPI, scale factor, manufacturer, etc). */ + /* Creating the global adds a wl_output global to the display, which + * Wayland clients can see to find out information about the output + * (such as DPI, scale factor, manufacturer, etc). */ wlr_output_create_global(wlr_output); } - diff --git a/view.c b/view.c index 92daf8ab..a94ea106 100644 --- a/view.c +++ b/view.c @@ -1,12 +1,14 @@ #include "labwc.h" -static void activate_view(struct view *view) { +static void activate_view(struct view *view) +{ if (view->type == LAB_XDG_SHELL_VIEW) { wlr_xdg_toplevel_set_activated(view->xdg_surface, true); } else if (view->type == LAB_XWAYLAND_VIEW) { wlr_xwayland_surface_activate(view->xwayland_surface, true); } else { - fprintf(stderr, "warn: view was of unknown type (%s)\n", __func__); + fprintf(stderr, "warn: view was of unknown type (%s)\n", + __func__); } } @@ -14,7 +16,8 @@ static void activate_view(struct view *view) { * Request that this toplevel surface show itself in an activated or * deactivated state. */ -static void set_activated(struct wlr_surface *s, bool activated) { +static void set_activated(struct wlr_surface *s, bool activated) +{ if (wlr_surface_is_xdg_surface(s)) { struct wlr_xdg_surface *previous; previous = wlr_xdg_surface_from_wlr_surface(s); @@ -26,12 +29,14 @@ static void set_activated(struct wlr_surface *s, bool activated) { } } -static void move_to_front(struct view *view) { +static void move_to_front(struct view *view) +{ wl_list_remove(&view->link); wl_list_insert(&view->server->views, &view->link); } -void focus_view(struct view *view, struct wlr_surface *surface) { +void focus_view(struct view *view, struct wlr_surface *surface) +{ /* Note: this function only deals with keyboard focus. */ if (view == NULL) { return; @@ -48,7 +53,8 @@ void focus_view(struct view *view, struct wlr_surface *surface) { if (view->type == LAB_XWAYLAND_VIEW) { /* Don't focus on menus, etc */ move_to_front(view); - if (!wlr_xwayland_or_surface_wants_focus(view->xwayland_surface)) { + if (!wlr_xwayland_or_surface_wants_focus( + view->xwayland_surface)) { return; } } @@ -65,7 +71,8 @@ void focus_view(struct view *view, struct wlr_surface *surface) { * appropriate clients without additional work on your part. */ wlr_seat_keyboard_notify_enter(seat, view->surface, keyboard->keycodes, - keyboard->num_keycodes, &keyboard->modifiers); + keyboard->num_keycodes, + &keyboard->modifiers); } static struct view *next_toplevel(struct view *current) @@ -78,18 +85,19 @@ static struct view *next_toplevel(struct view *current) return tmp; } -void view_focus_next_toplevel(struct server *server) { +void view_focus_next_toplevel(struct server *server) +{ struct view *view; view = first_toplevel(server); view = next_toplevel(view); focus_view(view, view->surface); } -void begin_interactive(struct view *view, - enum cursor_mode mode, uint32_t edges) { - /* This function sets up an interactive move or resize operation, where the - * compositor stops propegating pointer events to clients and instead - * consumes them itself, to move or resize windows. */ +void begin_interactive(struct view *view, enum cursor_mode mode, uint32_t edges) +{ + /* This function sets up an interactive move or resize operation, where + * the compositor stops propegating pointer events to clients and + * instead consumes them itself, to move or resize windows. */ struct server *server = view->server; struct wlr_surface *focused_surface = server->seat->pointer_state.focused_surface; @@ -125,7 +133,8 @@ void begin_interactive(struct view *view, server->resize_edges = edges; } -bool is_toplevel(struct view *view) { +bool is_toplevel(struct view *view) +{ switch (view->type) { case LAB_XWAYLAND_VIEW: return xwl_nr_parents(view) > 0 ? false : true; @@ -135,10 +144,11 @@ bool is_toplevel(struct view *view) { return false; } -struct view *first_toplevel(struct server *server) { +struct view *first_toplevel(struct server *server) +{ struct view *view; - wl_list_for_each(view, &server->views, link) { + wl_list_for_each (view, &server->views, link) { if (!view->been_mapped) { continue; } @@ -150,15 +160,16 @@ struct view *first_toplevel(struct server *server) { return NULL; } -static bool view_at(struct view *view, - double lx, double ly, struct wlr_surface **surface, - double *sx, double *sy) { +static bool view_at(struct 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. + * 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; @@ -173,9 +184,9 @@ static bool view_at(struct view *view, case LAB_XWAYLAND_VIEW: if (!view->xwayland_surface->surface) return false; - _surface = wlr_surface_surface_at( - view->xwayland_surface->surface, - view_sx, view_sy, &_sx, &_sy); + _surface = + wlr_surface_surface_at(view->xwayland_surface->surface, + view_sx, view_sy, &_sx, &_sy); break; } @@ -189,15 +200,17 @@ static bool view_at(struct view *view, } struct view *desktop_view_at(struct 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 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 view *view; - wl_list_for_each(view, &server->views, link) { + wl_list_for_each (view, &server->views, link) { if (view_at(view, lx, ly, surface, sx, sy)) { return view; } } return NULL; } - diff --git a/xdg.c b/xdg.c index c1a42d6a..17ba78dd 100644 --- a/xdg.c +++ b/xdg.c @@ -28,9 +28,11 @@ 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. Note that a more sophisticated compositor should check the - * provied serial against a list of button press serials sent to this - * client, to prevent the client from requesting this whenever they want. */ + * decorations. Note that a more sophisticated compositor should check + * the provied serial against a list of button press serials sent to + * this + * client, to prevent the client from requesting this whenever they + * want. */ struct view *view = wl_container_of(listener, view, request_move); begin_interactive(view, TINYWL_CURSOR_MOVE, 0); } @@ -39,9 +41,11 @@ 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. Note that a more sophisticated compositor should check the - * provied serial against a list of button press serials sent to this - * client, to prevent the client from requesting this whenever they want. */ + * decorations. Note that a more sophisticated compositor should check + * the provied serial against a list of button press serials sent to + * this + * client, to prevent the client from requesting this whenever they + * want. */ struct wlr_xdg_toplevel_resize_event *event = data; struct view *view = wl_container_of(listener, view, request_resize); begin_interactive(view, TINYWL_CURSOR_RESIZE, event->edges); @@ -56,8 +60,7 @@ void xdg_surface_new(struct wl_listener *listener, void *data) return; } - struct view *view = - calloc(1, sizeof(struct view)); + struct view *view = calloc(1, sizeof(struct view)); view->server = server; view->type = LAB_XDG_SHELL_VIEW; view->xdg_surface = xdg_surface; @@ -77,4 +80,3 @@ void xdg_surface_new(struct wl_listener *listener, void *data) wl_list_insert(&server->views, &view->link); } - diff --git a/xwl.c b/xwl.c index 7fbe354b..4f4afa8b 100644 --- a/xwl.c +++ b/xwl.c @@ -1,6 +1,7 @@ #include "labwc.h" -int xwl_nr_parents(struct view *view) { +int xwl_nr_parents(struct view *view) +{ struct wlr_xwayland_surface *s = view->xwayland_surface; int i = 0; @@ -15,7 +16,8 @@ int xwl_nr_parents(struct view *view) { return i; } -void xwl_surface_map(struct wl_listener *listener, void *data) { +void xwl_surface_map(struct wl_listener *listener, void *data) +{ struct view *view = wl_container_of(listener, view, map); view->mapped = true; view->been_mapped = true; @@ -25,27 +27,31 @@ void xwl_surface_map(struct wl_listener *listener, void *data) { focus_view(view, view->xwayland_surface->surface); } -void xwl_surface_unmap(struct wl_listener *listener, void *data) { +void xwl_surface_unmap(struct wl_listener *listener, void *data) +{ struct view *view = wl_container_of(listener, view, unmap); view->mapped = false; if (is_toplevel(view)) view_focus_next_toplevel(view->server); } -void xwl_surface_destroy(struct wl_listener *listener, void *data) { +void xwl_surface_destroy(struct wl_listener *listener, void *data) +{ struct view *view = wl_container_of(listener, view, destroy); wl_list_remove(&view->link); free(view); } -void xwl_surface_configure(struct wl_listener *listener, void *data) { +void xwl_surface_configure(struct wl_listener *listener, void *data) +{ struct view *view = wl_container_of(listener, view, request_configure); struct wlr_xwayland_surface_configure_event *event = data; - wlr_xwayland_surface_configure(view->xwayland_surface, event->x, event->y, - event->width, event->height); + wlr_xwayland_surface_configure(view->xwayland_surface, event->x, + event->y, event->width, event->height); } -void xwl_surface_new(struct wl_listener *listener, void *data) { +void xwl_surface_new(struct wl_listener *listener, void *data) +{ struct server *server = wl_container_of(listener, server, new_xwayland_surface); struct wlr_xwayland_surface *xwayland_surface = data; @@ -63,8 +69,8 @@ void xwl_surface_new(struct wl_listener *listener, void *data) { view->destroy.notify = xwl_surface_destroy; wl_signal_add(&xwayland_surface->events.destroy, &view->destroy); view->request_configure.notify = xwl_surface_configure; - wl_signal_add(&xwayland_surface->events.request_configure, &view->request_configure); + wl_signal_add(&xwayland_surface->events.request_configure, + &view->request_configure); wl_list_insert(&server->views, &view->link); } -