mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: make client_initiated a bool

Browse Source 
Make it a bool in both surface_move() and struct weston_move_grab

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
dev
Derek Foreman 10 years ago committed by Bryce Harrington
parent bab996e571
commit cf7d95a688
1 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      desktop-shell/shell.c

12
desktop-shell/shell.c
Unescape View File

@ -199,7 +199,7 @@ struct shell_touch_grab {
struct weston_move_grab { struct weston_move_grab {
struct shell_grab base; struct shell_grab base;
wl_fixed_t dx, dy; wl_fixed_t dx, dy;
int client_initiated; bool client_initiated;
}; };
struct weston_touch_move_grab { struct weston_touch_move_grab {
@ -1749,7 +1749,7 @@ static const struct weston_pointer_grab_interface move_grab_interface = {
static int static int
surface_move(struct shell_surface *shsurf, struct weston_seat *seat, surface_move(struct shell_surface *shsurf, struct weston_seat *seat,
int client_initiated) bool client_initiated)
{ {
struct weston_move_grab *move; struct weston_move_grab *move;
@ -1790,7 +1790,7 @@ common_surface_move(struct wl_resource *resource,
seat->pointer->grab_serial == serial) { seat->pointer->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->pointer->focus->surface); surface = weston_surface_get_main_surface(seat->pointer->focus->surface);
if ((surface == shsurf->surface) && if ((surface == shsurf->surface) &&
(surface_move(shsurf, seat, 1) < 0)) (surface_move(shsurf, seat, true) < 0))
wl_resource_post_no_memory(resource); wl_resource_post_no_memory(resource);
} else if (seat->touch && } else if (seat->touch &&
seat->touch->focus && seat->touch->focus &&
@ -2045,7 +2045,7 @@ busy_cursor_grab_button(struct weston_pointer_grab *base,
if (shsurf && button == BTN_LEFT && state) { if (shsurf && button == BTN_LEFT && state) {
activate(shsurf->shell, shsurf->surface, seat, true); activate(shsurf->shell, shsurf->surface, seat, true);
surface_move(shsurf, seat, 0); surface_move(shsurf, seat, false);
} else if (shsurf && button == BTN_RIGHT && state) { } else if (shsurf && button == BTN_RIGHT && state) {
activate(shsurf->shell, shsurf->surface, seat, true); activate(shsurf->shell, shsurf->surface, seat, true);
surface_rotate(shsurf, seat); surface_rotate(shsurf, seat);
@ -3059,7 +3059,7 @@ shell_interface_set_maximized(struct shell_surface *shsurf)
static int static int
shell_interface_move(struct shell_surface *shsurf, struct weston_seat *ws) shell_interface_move(struct shell_surface *shsurf, struct weston_seat *ws)
{ {
return surface_move(shsurf, ws, 1); return surface_move(shsurf, ws, true);
} }
static const struct weston_pointer_grab_interface popup_grab_interface; static const struct weston_pointer_grab_interface popup_grab_interface;
@ -4608,7 +4608,7 @@ move_binding(struct weston_seat *seat, uint32_t time, uint32_t button, void *dat
shsurf->state.maximized) shsurf->state.maximized)
return; return;
surface_move(shsurf, seat, 0); surface_move(shsurf, seat, false);
} }
static void static void

Write Preview
Loading…
Cancel
Save