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

westoy: Remove window_touch_move

Browse Source 
It seems to be the same as window_move, except it ignores the passed
in serial (???) and instead just uses the one of the display.
This commit is contained in:
Jasper St. Pierre
2013-11-12 20:19:57 -05:00
committed by Kristian Høgsberg
parent e505171a32
commit 01eaaac79a
5 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/flower.c
+1 -2
View File
@@ -158,8 +158,7 @@ touch_down_handler(struct widget *widget, struct input *input,
float x, float y, void *data) float x, float y, void *data)
{ {
struct flower *flower = data; struct flower *flower = data;
window_touch_move(flower->window, input, window_move(flower->window, input, display_get_serial(flower->display));
display_get_serial(flower->display));
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
clients/fullscreen.c
+1 -2
View File
@@ -283,8 +283,7 @@ touch_handler(struct widget *widget, struct input *input,
float x, float y, void *data) float x, float y, void *data)
{ {
struct fullscreen *fullscreen = data; struct fullscreen *fullscreen = data;
window_touch_move(fullscreen->window, input, window_move(fullscreen->window, input, display_get_serial(fullscreen->display));
display_get_serial(fullscreen->display));
} }
static void static void
clients/transformed.c
+1 -2
View File
@@ -227,8 +227,7 @@ touch_handler(struct widget *widget, struct input *input,
float x, float y, void *data) float x, float y, void *data)
{ {
struct transformed *transformed = data; struct transformed *transformed = data;
window_touch_move(transformed->window, input, window_move(transformed->window, input, display_get_serial(transformed->display));
display_get_serial(transformed->display));
} }
static void static void
clients/window.c
-10
View File
@@ -3590,16 +3590,6 @@ window_move(struct window *window, struct input *input, uint32_t serial)
wl_shell_surface_move(window->shell_surface, input->seat, serial); wl_shell_surface_move(window->shell_surface, input->seat, serial);
} }
void
window_touch_move(struct window *window, struct input *input, uint32_t serial)
{
if (!window->shell_surface)
return;
wl_shell_surface_move(window->shell_surface, input->seat,
window->display->serial);
}
static void static void
surface_set_synchronized(struct surface *surface) surface_set_synchronized(struct surface *surface)
{ {
clients/window.h
-2
View File
@@ -333,8 +333,6 @@ window_get_display(struct window *window);
void void
window_move(struct window *window, struct input *input, uint32_t time); window_move(struct window *window, struct input *input, uint32_t time);
void void
window_touch_move(struct window *window, struct input *input, uint32_t time);
void
window_get_allocation(struct window *window, struct rectangle *allocation); window_get_allocation(struct window *window, struct rectangle *allocation);
void void
window_schedule_redraw(struct window *window); window_schedule_redraw(struct window *window);