mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strictly use handle_ prefix for signal handlers

Browse source
This commit is contained in:
tokyo4j 2025-06-26 18:23:09 +09:00 • committed by Hiroaki Yamamoto
parent 6f70cd0d6e
commit 75bd188592
11 changed files with 49 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/cursor.c
View file

@ -710,7 +710,7 @@ handle_constraint_commit(struct wl_listener *listener, void *data)
}
static void
destroy_constraint(struct wl_listener *listener, void *data)
handle_constraint_destroy(struct wl_listener *listener, void *data)
{
struct constraint *constraint = wl_container_of(listener, constraint,
destroy);
@ -741,7 +741,7 @@ create_constraint(struct wl_listener *listener, void *data)
constraint->constraint = wlr_constraint;
constraint->seat = &server->seat;
constraint->destroy.notify = destroy_constraint;
constraint->destroy.notify = handle_constraint_destroy;
wl_signal_add(&wlr_constraint->events.destroy, &constraint->destroy);
struct view *view = server->active_view;

17
src/input/keyboard.c
View file

@ -6,6 +6,7 @@
#include <wlr/backend/session.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include "action.h"
#include "common/macros.h"
#include "common/three-state.h"
#include "idle.h"
#include "input/ime.h"
@ -140,9 +141,9 @@ broadcast_modifiers_to_unfocused_clients(struct wlr_seat *seat,
}
static void
keyboard_modifiers_notify(struct wl_listener *listener, void *data)
handle_modifiers(struct wl_listener *listener, void *data)
{
struct keyboard *keyboard = wl_container_of(listener, keyboard, modifier);
struct keyboard *keyboard = wl_container_of(listener, keyboard, modifiers);
struct seat *seat = keyboard->base.seat;
struct server *server = seat->server;
struct wlr_keyboard *wlr_keyboard = keyboard->wlr_keyboard;
@ -358,7 +359,7 @@ get_keyinfo(struct wlr_keyboard *wlr_keyboard, uint32_t evdev_keycode)
&keyinfo.raw.syms);
/*
* keyboard_key_notify() is called before keyboard_key_modifier(),
* handle_key() is called before handle_modifiers(),
* so 'modifiers' refers to modifiers that were pressed before the
* key event in hand. Consequently, we use is_modifier_key() to
* find out if the key event being processed is a modifier.
@ -632,7 +633,7 @@ keyboard_cancel_all_keybind_repeats(struct seat *seat)
}
static void
keyboard_key_notify(struct wl_listener *listener, void *data)
handle_key(struct wl_listener *listener, void *data)
{
/* This event is raised when a key is pressed or released. */
struct keyboard *keyboard = wl_container_of(listener, keyboard, key);
@ -822,12 +823,8 @@ keyboard_group_init(struct seat *seat)
void
keyboard_setup_handlers(struct keyboard *keyboard)
{
struct wlr_keyboard *wlr_kb = keyboard->wlr_keyboard;
keyboard->key.notify = keyboard_key_notify;
wl_signal_add(&wlr_kb->events.key, &keyboard->key);
keyboard->modifier.notify = keyboard_modifiers_notify;
wl_signal_add(&wlr_kb->events.modifiers, &keyboard->modifier);
CONNECT_SIGNAL(keyboard->wlr_keyboard, keyboard, key);
CONNECT_SIGNAL(keyboard->wlr_keyboard, keyboard, modifiers);
}
void