commit 9eefeab
Michael Forney
·
2014-02-27 03:59:47 +0000 UTC
parent c22ad42
window: Rename begin_interactive_* -> begin_*
3 files changed,
+10,
-12
+2,
-2
1@@ -57,7 +57,7 @@ static void move(struct wl_client * client, struct wl_resource * resource,
2 if (!(button = pointer_get_button(swc.seat->pointer, serial)))
3 return;
4
5- window_begin_interactive_move(&shell_surface->window, button);
6+ window_begin_move(&shell_surface->window, button);
7 }
8
9 static void resize(struct wl_client * client, struct wl_resource * resource,
10@@ -70,7 +70,7 @@ static void resize(struct wl_client * client, struct wl_resource * resource,
11 if (!(button = pointer_get_button(swc.seat->pointer, serial)))
12 return;
13
14- window_begin_interactive_resize(&shell_surface->window, edges, button);
15+ window_begin_resize(&shell_surface->window, edges, button);
16 }
17
18 static void set_toplevel(struct wl_client * client,
+5,
-6
1@@ -127,8 +127,7 @@ static inline void window_begin_interaction
2 wl_list_insert(&swc.seat->pointer->handlers, &interaction->handler.link);
3 }
4
5-void window_begin_interactive_move(struct window * window,
6- struct button * button)
7+void window_begin_move(struct window * window, struct button * button)
8 {
9 struct swc_rectangle * geometry = &window->view->base.geometry;
10 int32_t px = wl_fixed_to_int(swc.seat->pointer->x),
11@@ -139,8 +138,8 @@ void window_begin_interactive_move(struct window * window,
12 window->move.offset.y = geometry->y - py;
13 }
14
15-void window_begin_interactive_resize(struct window * window, uint32_t edges,
16- struct button * button)
17+void window_begin_resize(struct window * window, uint32_t edges,
18+ struct button * button)
19 {
20 window_begin_interaction(window, &window->resize.interaction, button);
21
22@@ -157,7 +156,7 @@ void swc_window_begin_move(struct swc_window * base)
23 {
24 struct window * window = (struct window *) base;
25
26- window_begin_interactive_move(window, NULL);
27+ window_begin_move(window, NULL);
28 }
29
30 EXPORT
31@@ -173,7 +172,7 @@ void swc_window_begin_resize(struct swc_window * base, uint32_t edges)
32 {
33 struct window * window = (struct window *) base;
34
35- window_begin_interactive_resize(window, edges, NULL);
36+ window_begin_resize(window, edges, NULL);
37 }
38
39 EXPORT
+3,
-4
1@@ -78,11 +78,10 @@ void window_set_state(struct window * window, uint32_t state);
2
3 void window_set_parent(struct window * window, struct window * parent);
4
5-void window_begin_interactive_move(struct window * window,
6- struct button * button);
7+void window_begin_move(struct window * window, struct button * button);
8
9-void window_begin_interactive_resize(struct window * window, uint32_t edges,
10- struct button * button);
11+void window_begin_resize(struct window * window, uint32_t edges,
12+ struct button * button);
13
14 #endif
15