mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-14 05:33:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor style fixes

Browse source
This commit is contained in:
Johan Malm 2020-05-29 22:26:16 +01:00
parent 298d869092
commit a6ac2a0439
5 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/labwc.h
View file

@ -37,9 +37,9 @@
#define LAB_DISABLE_CSD (0) #define LAB_DISABLE_CSD (0)
enum cursor_mode { enum cursor_mode {
TINYWL_CURSOR_PASSTHROUGH, LAB_CURSOR_PASSTHROUGH,
TINYWL_CURSOR_MOVE, LAB_CURSOR_MOVE,
TINYWL_CURSOR_RESIZE, LAB_CURSOR_RESIZE,
}; };
struct server { struct server {

14
src/cursor.c
View file

@ -59,10 +59,10 @@ static void process_cursor_resize(struct server *server, uint32_t time)
static void process_cursor_motion(struct server *server, uint32_t time) static void process_cursor_motion(struct server *server, uint32_t time)
{ {
/* If the mode is non-passthrough, delegate to those functions. */ /* If the mode is non-passthrough, delegate to those functions. */
if (server->cursor_mode == TINYWL_CURSOR_MOVE) { if (server->cursor_mode == LAB_CURSOR_MOVE) {
process_cursor_move(server, time); process_cursor_move(server, time);
return; return;
} else if (server->cursor_mode == TINYWL_CURSOR_RESIZE) { } else if (server->cursor_mode == LAB_CURSOR_RESIZE) {
process_cursor_resize(server, time); process_cursor_resize(server, time);
return; return;
} }
@ -81,12 +81,12 @@ static void process_cursor_motion(struct server *server, uint32_t time)
* a default. This is what makes the cursor image appear when * a default. This is what makes the cursor image appear when
* you move it around the screen, not over any views. */ * you move it around the screen, not over any views. */
wlr_xcursor_manager_set_cursor_image( wlr_xcursor_manager_set_cursor_image(
server->cursor_mgr, "left_ptr", server->cursor); server->cursor_mgr, XCURSOR_DEFAULT, server->cursor);
} }
switch (view_area) { switch (view_area) {
case LAB_DECO_PART_TOP: case LAB_DECO_PART_TOP:
wlr_xcursor_manager_set_cursor_image( wlr_xcursor_manager_set_cursor_image(
server->cursor_mgr, "left_ptr", server->cursor); server->cursor_mgr, XCURSOR_DEFAULT, server->cursor);
break; break;
case LAB_DECO_PART_LEFT: case LAB_DECO_PART_LEFT:
wlr_xcursor_manager_set_cursor_image( wlr_xcursor_manager_set_cursor_image(
@ -181,16 +181,16 @@ void cursor_button(struct wl_listener *listener, void *data)
&view_area); &view_area);
if (event->state == WLR_BUTTON_RELEASED) { if (event->state == WLR_BUTTON_RELEASED) {
/* Exit interactive move/resize mode. */ /* Exit interactive move/resize mode. */
server->cursor_mode = TINYWL_CURSOR_PASSTHROUGH; server->cursor_mode = LAB_CURSOR_PASSTHROUGH;
} else { } else {
/* Focus that client if the button was _pressed_ */ /* Focus that client if the button was _pressed_ */
view_focus(view); view_focus(view);
switch (view_area) { switch (view_area) {
case LAB_DECO_PART_TOP: case LAB_DECO_PART_TOP:
interactive_begin(view, TINYWL_CURSOR_MOVE, 0); interactive_begin(view, LAB_CURSOR_MOVE, 0);
break; break;
case LAB_DECO_PART_LEFT: case LAB_DECO_PART_LEFT:
interactive_begin(view, TINYWL_CURSOR_RESIZE, interactive_begin(view, LAB_CURSOR_RESIZE,
WLR_EDGE_LEFT); WLR_EDGE_LEFT);
break; break;
} }

4
src/keyboard.c
View file

@ -44,8 +44,8 @@ static bool handle_keybinding(struct server *server, xkb_keysym_t sym)
} }
break; break;
case XKB_KEY_F6: case XKB_KEY_F6:
interactive_begin(view_front_toplevel(server), interactive_begin(view_front_toplevel(server), LAB_CURSOR_MOVE,
TINYWL_CURSOR_MOVE, 0); 0);
break; break;
case XKB_KEY_F12: case XKB_KEY_F12:
dbg_show_views(server); dbg_show_views(server);

9
src/output.c
View file

@ -78,8 +78,7 @@ static void render_surface(struct wlr_surface *surface, int sx, int sy,
ox += view->x + sx; ox += view->x + sx;
oy += view->y + sy; oy += view->y + sy;
/* We also have to apply the scale factor for HiDPI outputs. This is /* TODO: Support HiDPI */
* only part of the puzzle, TinyWL does not fully support HiDPI. */
struct wlr_box box = { struct wlr_box box = {
.x = ox * output->scale, .x = ox * output->scale,
.y = oy * output->scale, .y = oy * output->scale,
@ -105,8 +104,10 @@ static void render_surface(struct wlr_surface *surface, int sx, int sy,
wlr_matrix_project_box(matrix, &box, transform, 0, 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); wlr_render_texture_with_matrix(rdata->renderer, texture, matrix, 1);
/* This lets the client know that we've displayed that frame and it can /* This lets the client know that we've displayed that frame and it can

4
src/xdg.c
View file

@ -81,7 +81,7 @@ void xdg_toplevel_request_move(struct wl_listener *listener, void *data)
* client, to prevent the client from requesting this whenever they * client, to prevent the client from requesting this whenever they
* want. */ * want. */
struct view *view = wl_container_of(listener, view, request_move); struct view *view = wl_container_of(listener, view, request_move);
interactive_begin(view, TINYWL_CURSOR_MOVE, 0); interactive_begin(view, LAB_CURSOR_MOVE, 0);
} }
void xdg_toplevel_request_resize(struct wl_listener *listener, void *data) void xdg_toplevel_request_resize(struct wl_listener *listener, void *data)
@ -95,7 +95,7 @@ void xdg_toplevel_request_resize(struct wl_listener *listener, void *data)
* want. */ * want. */
struct wlr_xdg_toplevel_resize_event *event = data; struct wlr_xdg_toplevel_resize_event *event = data;
struct view *view = wl_container_of(listener, view, request_resize); struct view *view = wl_container_of(listener, view, request_resize);
interactive_begin(view, TINYWL_CURSOR_RESIZE, event->edges); interactive_begin(view, LAB_CURSOR_RESIZE, event->edges);
} }
void xdg_surface_new(struct wl_listener *listener, void *data) void xdg_surface_new(struct wl_listener *listener, void *data)