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

desktop-shell: Remove unnecessary type casts

Browse Source 
Remove a few instances of casting weston_seat to weston_seat.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
dev
Derek Foreman 11 years ago committed by Bryce Harrington
parent aff7c334fa
commit 8aeeac827f
1 changed files with 7 additions and 8 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. 15
      desktop-shell/shell.c

15
desktop-shell/shell.c
Unescape View File

@ -4515,7 +4515,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, (struct weston_seat *) seat, 0); surface_move(shsurf, seat, 0);
} }
static void static void
@ -4585,7 +4585,7 @@ touch_move_binding(struct weston_seat *seat, uint32_t time, void *data)
shsurf->state.maximized) shsurf->state.maximized)
return; return;
surface_touch_move(shsurf, (struct weston_seat *) seat); surface_touch_move(shsurf, seat);
} }
static void static void
@ -4630,7 +4630,7 @@ resize_binding(struct weston_seat *seat, uint32_t time, uint32_t button, void *d
else else
edges |= WL_SHELL_SURFACE_RESIZE_BOTTOM; edges |= WL_SHELL_SURFACE_RESIZE_BOTTOM;
surface_resize(shsurf, (struct weston_seat *) seat, edges); surface_resize(shsurf, seat, edges);
} }
static void static void
@ -4666,8 +4666,7 @@ static void
do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis, do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis,
wl_fixed_t value) wl_fixed_t value)
{ {
struct weston_seat *ws = (struct weston_seat *) seat; struct weston_compositor *compositor = seat->compositor;
struct weston_compositor *compositor = ws->compositor;
struct weston_output *output; struct weston_output *output;
float increment; float increment;
@ -5946,7 +5945,7 @@ switcher_destroy(struct switcher *switcher)
if (switcher->current) if (switcher->current)
activate(switcher->shell, switcher->current, activate(switcher->shell, switcher->current,
(struct weston_seat *) keyboard->seat, true); keyboard->seat, true);
wl_list_remove(&switcher->listener.link); wl_list_remove(&switcher->listener.link);
weston_keyboard_end_grab(keyboard); weston_keyboard_end_grab(keyboard);
if (keyboard->input_method_resource) if (keyboard->input_method_resource)
@ -5984,7 +5983,7 @@ switcher_modifier(struct weston_keyboard_grab *grab, uint32_t serial,
uint32_t mods_locked, uint32_t group) uint32_t mods_locked, uint32_t group)
{ {
struct switcher *switcher = container_of(grab, struct switcher, grab); struct switcher *switcher = container_of(grab, struct switcher, grab);
struct weston_seat *seat = (struct weston_seat *) grab->keyboard->seat; struct weston_seat *seat = grab->keyboard->seat;
if ((seat->modifier_state & switcher->shell->binding_modifier) == 0) if ((seat->modifier_state & switcher->shell->binding_modifier) == 0)
switcher_destroy(switcher); switcher_destroy(switcher);
@ -6180,7 +6179,7 @@ debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
if (!grab) if (!grab)
return; return;
grab->seat = (struct weston_seat *) seat; grab->seat = seat;
grab->key[0] = key; grab->key[0] = key;
grab->grab.interface = &debug_binding_keyboard_grab; grab->grab.interface = &debug_binding_keyboard_grab;
weston_keyboard_start_grab(seat->keyboard, &grab->grab); weston_keyboard_start_grab(seat->keyboard, &grab->grab);

Write Preview
Loading…
Cancel
Save