aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/cursor.c10
-rw-r--r--sway/input/input-manager.c28
-rw-r--r--sway/input/seat.c58
3 files changed, 48 insertions, 48 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index d608a9cf..7d05e942 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -84,7 +84,7 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
// find the focused workspace on the output for this seat
struct sway_container *ws =
- sway_seat_get_focus_inactive(cursor->seat, output->swayc);
+ seat_get_focus_inactive(cursor->seat, output->swayc);
if (ws && ws->type != C_WORKSPACE) {
ws = container_parent(ws, C_WORKSPACE);
}
@@ -129,7 +129,7 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
double sx, sy;
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
if (c && config->focus_follows_mouse) {
- sway_seat_set_focus_warp(cursor->seat, c, false);
+ seat_set_focus_warp(cursor->seat, c, false);
}
// reset cursor if switching between clients
@@ -191,15 +191,15 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
if (new_ws && new_ws->type != C_WORKSPACE) {
new_ws = container_parent(new_ws, C_WORKSPACE);
}
- struct sway_container *old_ws = sway_seat_get_focus(cursor->seat);
+ struct sway_container *old_ws = seat_get_focus(cursor->seat);
if (old_ws && old_ws->type != C_WORKSPACE) {
old_ws = container_parent(old_ws, C_WORKSPACE);
}
if (new_ws != old_ws) {
- sway_seat_set_focus(cursor->seat, cont);
+ seat_set_focus(cursor->seat, cont);
}
} else {
- sway_seat_set_focus(cursor->seat, cont);
+ seat_set_focus(cursor->seat, cont);
}
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index d421a03f..66ade685 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -40,7 +40,7 @@ struct sway_seat *input_manager_get_seat(
}
}
- return sway_seat_create(input, seat_name);
+ return seat_create(input, seat_name);
}
static char *get_device_identifier(struct wlr_input_device *device) {
@@ -175,7 +175,7 @@ static void handle_device_destroy(struct wl_listener *listener, void *data) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) {
- sway_seat_remove_device(seat, input_device);
+ seat_remove_device(seat, input_device);
}
wl_list_remove(&input_device->link);
@@ -221,7 +221,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
if (!input_has_seat_configuration(input)) {
wlr_log(L_DEBUG, "no seat configuration, using default seat");
seat = input_manager_get_seat(input, default_seat);
- sway_seat_add_device(seat, input_device);
+ seat_add_device(seat, input_device);
return;
}
@@ -232,7 +232,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
seat_config_get_attachment(seat->config, "*"));
if (has_attachment) {
- sway_seat_add_device(seat, input_device);
+ seat_add_device(seat, input_device);
added = true;
}
}
@@ -240,7 +240,7 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
if (!added) {
wl_list_for_each(seat, &input->seats, link) {
if (seat->config && seat->config->fallback == 1) {
- sway_seat_add_device(seat, input_device);
+ seat_add_device(seat, input_device);
added = true;
}
}
@@ -281,7 +281,7 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
struct sway_container *container) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
- if (sway_seat_get_focus(seat) == container) {
+ if (seat_get_focus(seat) == container) {
return true;
}
}
@@ -293,7 +293,7 @@ void sway_input_manager_set_focus(struct sway_input_manager *input,
struct sway_container *container) {
struct sway_seat *seat ;
wl_list_for_each(seat, &input->seats, link) {
- sway_seat_set_focus(seat, container);
+ seat_set_focus(seat, container);
}
}
@@ -311,7 +311,7 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
- sway_seat_configure_device(seat, input_device);
+ seat_configure_device(seat, input_device);
}
}
}
@@ -326,7 +326,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
return;
}
- sway_seat_set_config(seat, seat_config);
+ seat_set_config(seat, seat_config);
// for every device, try to add it to a seat and if no seat has it
// attached, add it to the fallback seats.
@@ -355,17 +355,17 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
}
}
if (attached) {
- sway_seat_add_device(seat, input_device);
+ seat_add_device(seat, input_device);
} else {
- sway_seat_remove_device(seat, input_device);
+ seat_remove_device(seat, input_device);
}
}
} else {
wl_list_for_each(seat, &input->seats, link) {
if (seat->config && seat->config->fallback == 1) {
- sway_seat_add_device(seat, input_device);
+ seat_add_device(seat, input_device);
} else {
- sway_seat_remove_device(seat, input_device);
+ seat_remove_device(seat, input_device);
}
}
}
@@ -376,7 +376,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
void sway_input_manager_configure_xcursor(struct sway_input_manager *input) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
- sway_seat_configure_xcursor(seat);
+ seat_configure_xcursor(seat);
}
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 9aa34aca..70395144 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -25,7 +25,7 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
free(seat_device);
}
-void sway_seat_destroy(struct sway_seat *seat) {
+void seat_destroy(struct sway_seat *seat) {
struct sway_seat_device *seat_device, *next;
wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
seat_device_destroy(seat_device);
@@ -42,18 +42,18 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
struct sway_seat *seat = seat_con->seat;
struct sway_container *con = seat_con->container;
- bool is_focus = (sway_seat_get_focus(seat) == con);
+ bool is_focus = (seat_get_focus(seat) == con);
wl_list_remove(&seat_con->link);
if (is_focus) {
// pick next focus
- sway_seat_set_focus(seat, NULL);
- struct sway_container *next = sway_seat_get_focus_inactive(seat, con->parent);
+ seat_set_focus(seat, NULL);
+ struct sway_container *next = seat_get_focus_inactive(seat, con->parent);
if (next == NULL) {
next = con->parent;
}
- sway_seat_set_focus(seat, next);
+ seat_set_focus(seat, next);
}
wl_list_remove(&seat_con->destroy.link);
@@ -110,7 +110,7 @@ static void collect_focus_iter(struct sway_container *con, void *data) {
wl_list_insert(&seat->focus_stack, &seat_con->link);
}
-struct sway_seat *sway_seat_create(struct sway_input_manager *input,
+struct sway_seat *seat_create(struct sway_input_manager *input,
const char *seat_name) {
struct sway_seat *seat = calloc(1, sizeof(struct sway_seat));
if (!seat) {
@@ -147,7 +147,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
WL_SEAT_CAPABILITY_POINTER |
WL_SEAT_CAPABILITY_TOUCH);
- sway_seat_configure_xcursor(seat);
+ seat_configure_xcursor(seat);
wl_list_insert(&input->seats, &seat->link);
@@ -169,7 +169,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
sway_keyboard_configure(seat_device->keyboard);
wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device);
- struct sway_container *focus = sway_seat_get_focus(seat);
+ struct sway_container *focus = seat_get_focus(seat);
if (focus && focus->type == C_VIEW) {
// force notify reenter to pick up the new configuration
wlr_seat_keyboard_clear_focus(seat->wlr_seat);
@@ -179,7 +179,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
}
}
-static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
+static struct sway_seat_device *seat_get_device(struct sway_seat *seat,
struct sway_input_device *input_device) {
struct sway_seat_device *seat_device = NULL;
wl_list_for_each(seat_device, &seat->devices, link) {
@@ -191,10 +191,10 @@ static struct sway_seat_device *sway_seat_get_device(struct sway_seat *seat,
return NULL;
}
-void sway_seat_configure_device(struct sway_seat *seat,
+void seat_configure_device(struct sway_seat *seat,
struct sway_input_device *input_device) {
struct sway_seat_device *seat_device =
- sway_seat_get_device(seat, input_device);
+ seat_get_device(seat, input_device);
if (!seat_device) {
return;
}
@@ -219,10 +219,10 @@ void sway_seat_configure_device(struct sway_seat *seat,
}
}
-void sway_seat_add_device(struct sway_seat *seat,
+void seat_add_device(struct sway_seat *seat,
struct sway_input_device *input_device) {
- if (sway_seat_get_device(seat, input_device)) {
- sway_seat_configure_device(seat, input_device);
+ if (seat_get_device(seat, input_device)) {
+ seat_configure_device(seat, input_device);
return;
}
@@ -240,13 +240,13 @@ void sway_seat_add_device(struct sway_seat *seat,
seat_device->input_device = input_device;
wl_list_insert(&seat->devices, &seat_device->link);
- sway_seat_configure_device(seat, input_device);
+ seat_configure_device(seat, input_device);
}
-void sway_seat_remove_device(struct sway_seat *seat,
+void seat_remove_device(struct sway_seat *seat,
struct sway_input_device *input_device) {
struct sway_seat_device *seat_device =
- sway_seat_get_device(seat, input_device);
+ seat_get_device(seat, input_device);
if (!seat_device) {
return;
@@ -258,7 +258,7 @@ void sway_seat_remove_device(struct sway_seat *seat,
seat_device_destroy(seat_device);
}
-void sway_seat_configure_xcursor(struct sway_seat *seat) {
+void seat_configure_xcursor(struct sway_seat *seat) {
// TODO configure theme and size
const char *cursor_theme = NULL;
@@ -292,9 +292,9 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->cursor->y);
}
-void sway_seat_set_focus_warp(struct sway_seat *seat,
+void seat_set_focus_warp(struct sway_seat *seat,
struct sway_container *container, bool warp) {
- struct sway_container *last_focus = sway_seat_get_focus(seat);
+ struct sway_container *last_focus = seat_get_focus(seat);
if (container && last_focus == container) {
return;
@@ -372,12 +372,12 @@ void sway_seat_set_focus_warp(struct sway_seat *seat,
seat->has_focus = (container != NULL);
}
-void sway_seat_set_focus(struct sway_seat *seat,
+void seat_set_focus(struct sway_seat *seat,
struct sway_container *container) {
- sway_seat_set_focus_warp(seat, container, true);
+ seat_set_focus_warp(seat, container, true);
}
-struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {
+struct sway_container *seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {
struct sway_seat_container *current = NULL;
struct sway_container *parent = NULL;
wl_list_for_each(current, &seat->focus_stack, link) {
@@ -398,16 +398,16 @@ struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, stru
return NULL;
}
-struct sway_container *sway_seat_get_focus(struct sway_seat *seat) {
+struct sway_container *seat_get_focus(struct sway_seat *seat) {
if (!seat->has_focus) {
return NULL;
}
- return sway_seat_get_focus_inactive(seat, &root_container);
+ return seat_get_focus_inactive(seat, &root_container);
}
-struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
+struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
enum sway_container_type type) {
- struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
+ struct sway_container *focus = seat_get_focus_inactive(seat, &root_container);
if (focus->type == type) {
return focus;
}
@@ -415,7 +415,7 @@ struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
return container_parent(focus, type);
}
-void sway_seat_set_config(struct sway_seat *seat,
+void seat_set_config(struct sway_seat *seat,
struct seat_config *seat_config) {
// clear configs
free_seat_config(seat->config);
@@ -434,6 +434,6 @@ void sway_seat_set_config(struct sway_seat *seat,
seat->config = copy_seat_config(seat_config);
wl_list_for_each(seat_device, &seat->devices, link) {
- sway_seat_configure_device(seat, seat_device->input_device);
+ seat_configure_device(seat, seat_device->input_device);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 09:53:17 +0000