mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-02-16 22:05:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: turn keymap sync into XWAYLAND macro

Browse source
This commit is contained in:
DreamMaoMao 2026-02-08 12:44:56 +08:00
parent 570ea57eda
commit 8b6ef770ba
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/mango.c
View file

@ -736,7 +736,6 @@ static void set_rect_size(struct wlr_scene_rect *rect, int32_t width,
static Client *center_tiled_select(Monitor *m);
static void handlecursoractivity(void);
static int32_t hidecursor(void *data);
static int32_t synckeymap(void *data);
static bool check_hit_no_border(Client *c);
static void reset_keyboard_layout(void);
static void client_update_oldmonname_record(Client *c, Monitor *m);
@ -887,7 +886,6 @@ struct dvec2 *baked_points_opafadein;
struct dvec2 *baked_points_opafadeout;
static struct wl_event_source *hide_source;
static struct wl_event_source *sync_keymap;
static bool cursor_hidden = false;
static bool tag_combo = false;
static const char *cli_config_path = NULL;
@ -954,6 +952,7 @@ static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = {
.notify = handle_keyboard_shortcuts_inhibit_new_inhibitor};
#ifdef XWAYLAND
static int32_t synckeymap(void *data);
static void activatex11(struct wl_listener *listener, void *data);
static void configurex11(struct wl_listener *listener, void *data);
static void createnotifyx11(struct wl_listener *listener, void *data);
@ -965,6 +964,7 @@ static void setgeometrynotify(struct wl_listener *listener, void *data);
static struct wl_listener new_xwayland_surface = {.notify = createnotifyx11};
static struct wl_listener xwayland_ready = {.notify = xwaylandready};
static struct wlr_xwayland *xwayland;
static struct wl_event_source *sync_keymap;
#endif
#include "animation/client.h"
@ -5275,8 +5275,6 @@ void setup(void) {
&request_set_cursor_shape);
hide_source = wl_event_loop_add_timer(wl_display_get_event_loop(dpy),
hidecursor, cursor);
sync_keymap = wl_event_loop_add_timer(wl_display_get_event_loop(dpy),
synckeymap, NULL);
/*
* Configures a seat, which is a single "seat" at which a user sits and
* operates the computer. This conceptually includes up to one keyboard,
@ -5363,6 +5361,8 @@ void setup(void) {
fprintf(stderr,
"failed to setup XWayland X server, continuing without it\n");
}
sync_keymap = wl_event_loop_add_timer(wl_display_get_event_loop(dpy),
synckeymap, NULL);
#endif
}
@ -5500,13 +5500,6 @@ int32_t hidecursor(void *data) {
return 1;
}
int32_t synckeymap(void *data) {
reset_keyboard_layout();
// we only need to sync keymap once
wl_event_source_timer_update(sync_keymap, 0);
return 1;
}
void unlocksession(struct wl_listener *listener, void *data) {
SessionLock *lock = wl_container_of(listener, lock, unlock);
destroylock(lock, 1);
@ -5977,6 +5970,13 @@ void virtualpointer(struct wl_listener *listener, void *data) {
}
#ifdef XWAYLAND
int32_t synckeymap(void *data) {
reset_keyboard_layout();
// we only need to sync keymap once
wl_event_source_timer_update(sync_keymap, 0);
return 1;
}
void activatex11(struct wl_listener *listener, void *data) {
Client *c = wl_container_of(listener, c, activate);
bool need_arrange = false;