swc

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.nihaljere.xyz/swc
Log | Files | Refs | README | LICENSE

commit 9eefeab29543f2dcf1da3fcd372a62cf7ea1f253
parent c22ad427821c72d179d957e292d2b8dbf6c79340
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 26 Feb 2014 19:59:47 -0800

window: Rename begin_interactive_* -> begin_*

Diffstat:
Mlibswc/shell_surface.c | 4++--
Mlibswc/window.c | 11+++++------
Mlibswc/window.h | 7+++----
3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libswc/shell_surface.c b/libswc/shell_surface.c @@ -57,7 +57,7 @@ static void move(struct wl_client * client, struct wl_resource * resource, if (!(button = pointer_get_button(swc.seat->pointer, serial))) return; - window_begin_interactive_move(&shell_surface->window, button); + window_begin_move(&shell_surface->window, button); } static void resize(struct wl_client * client, struct wl_resource * resource, @@ -70,7 +70,7 @@ static void resize(struct wl_client * client, struct wl_resource * resource, if (!(button = pointer_get_button(swc.seat->pointer, serial))) return; - window_begin_interactive_resize(&shell_surface->window, edges, button); + window_begin_resize(&shell_surface->window, edges, button); } static void set_toplevel(struct wl_client * client, diff --git a/libswc/window.c b/libswc/window.c @@ -127,8 +127,7 @@ static inline void window_begin_interaction wl_list_insert(&swc.seat->pointer->handlers, &interaction->handler.link); } -void window_begin_interactive_move(struct window * window, - struct button * button) +void window_begin_move(struct window * window, struct button * button) { struct swc_rectangle * geometry = &window->view->base.geometry; int32_t px = wl_fixed_to_int(swc.seat->pointer->x), @@ -139,8 +138,8 @@ void window_begin_interactive_move(struct window * window, window->move.offset.y = geometry->y - py; } -void window_begin_interactive_resize(struct window * window, uint32_t edges, - struct button * button) +void window_begin_resize(struct window * window, uint32_t edges, + struct button * button) { window_begin_interaction(window, &window->resize.interaction, button); @@ -157,7 +156,7 @@ void swc_window_begin_move(struct swc_window * base) { struct window * window = (struct window *) base; - window_begin_interactive_move(window, NULL); + window_begin_move(window, NULL); } EXPORT @@ -173,7 +172,7 @@ void swc_window_begin_resize(struct swc_window * base, uint32_t edges) { struct window * window = (struct window *) base; - window_begin_interactive_resize(window, edges, NULL); + window_begin_resize(window, edges, NULL); } EXPORT diff --git a/libswc/window.h b/libswc/window.h @@ -78,11 +78,10 @@ void window_set_state(struct window * window, uint32_t state); void window_set_parent(struct window * window, struct window * parent); -void window_begin_interactive_move(struct window * window, - struct button * button); +void window_begin_move(struct window * window, struct button * button); -void window_begin_interactive_resize(struct window * window, uint32_t edges, - struct button * button); +void window_begin_resize(struct window * window, uint32_t edges, + struct button * button); #endif