mirror/dwl
1
0
Fork 1
mirror of https://codeberg.org/dwl/dwl.git synced 2024-12-27 03:36:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove now unused input_popup lists

Browse source
This commit is contained in:
Silvan Jegen 2022-05-22 15:35:13 +02:00
parent 8841d17ec8
commit cc9f4a3dc4
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dwl.c
View file

@ -217,7 +217,6 @@ typedef struct {
*/ */
struct dwl_input_method_relay { struct dwl_input_method_relay {
struct wl_list text_inputs; // dwl_text_input::link struct wl_list text_inputs; // dwl_text_input::link
struct wl_list input_popups; // dwl_input_popup::link
struct wlr_input_method_v2 *input_method; // doesn't have to be present struct wlr_input_method_v2 *input_method; // doesn't have to be present
struct wl_listener text_input_new; struct wl_listener text_input_new;
@ -260,9 +259,6 @@ struct dwl_input_popup {
int x, y; int x, y;
bool visible; bool visible;
struct wl_list link;
struct wl_list view_link;
struct wl_listener popup_map; struct wl_listener popup_map;
struct wl_listener popup_unmap; struct wl_listener popup_unmap;
struct wl_listener popup_destroy; struct wl_listener popup_destroy;
@ -390,8 +386,6 @@ static struct wlr_xdg_activation_v1 *activation;
static struct wl_list clients; /* tiling order */ static struct wl_list clients; /* tiling order */
static struct wl_list fstack; /* focus order */ static struct wl_list fstack; /* focus order */
static struct wl_list input_popups; /* dwl_input_popup::view_link to be rendered for the input method */
static struct wlr_idle *idle; static struct wlr_idle *idle;
static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr; static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr;
static struct wlr_input_inhibit_manager *input_inhibit_mgr; static struct wlr_input_inhibit_manager *input_inhibit_mgr;
@ -2443,8 +2437,6 @@ static void handle_im_popup_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&popup->popup_destroy.link); wl_list_remove(&popup->popup_destroy.link);
wl_list_remove(&popup->popup_unmap.link); wl_list_remove(&popup->popup_unmap.link);
wl_list_remove(&popup->popup_map.link); wl_list_remove(&popup->popup_map.link);
wl_list_remove(&popup->view_link);
wl_list_remove(&popup->link);
free(popup); free(popup);
} }
@ -2459,8 +2451,6 @@ static void handle_im_focused_surface_destroy(
struct wl_listener *listener, void *data) { struct wl_listener *listener, void *data) {
struct dwl_input_popup *popup = struct dwl_input_popup *popup =
wl_container_of(listener, popup, focused_surface_unmap); wl_container_of(listener, popup, focused_surface_unmap);
wl_list_remove(&popup->view_link);
wl_list_init(&popup->view_link);
input_popup_update(popup); input_popup_update(popup);
} }
@ -2470,13 +2460,11 @@ static void input_popup_set_focus(struct dwl_input_popup *popup,
struct wlr_layer_surface_v1* layer_surface; struct wlr_layer_surface_v1* layer_surface;
LayerSurface* layer; LayerSurface* layer;
wl_list_remove(&popup->view_link);
wl_list_remove(&popup->focused_surface_unmap.link); wl_list_remove(&popup->focused_surface_unmap.link);
if (wlr_surface_is_layer_surface(surface)) { if (wlr_surface_is_layer_surface(surface)) {
layer_surface = wlr_layer_surface_v1_from_wlr_surface(surface); layer_surface = wlr_layer_surface_v1_from_wlr_surface(surface);
layer = layer_surface_from_wlr_layer_surface_v1(layer_surface); layer = layer_surface_from_wlr_layer_surface_v1(layer_surface);
wl_list_insert(&input_popups, &popup->view_link);
wl_signal_add(&layer->layer_surface->events.unmap, wl_signal_add(&layer->layer_surface->events.unmap,
&popup->focused_surface_unmap); &popup->focused_surface_unmap);
input_popup_update(popup); input_popup_update(popup);
@ -2484,7 +2472,6 @@ static void input_popup_set_focus(struct dwl_input_popup *popup,
} }
client = client_from_wlr_surface(surface); client = client_from_wlr_surface(surface);
wl_list_insert(&input_popups, &popup->view_link);
wl_signal_add(&client->surface.xdg->events.unmap, wl_signal_add(&client->surface.xdg->events.unmap,
&popup->focused_surface_unmap); &popup->focused_surface_unmap);
input_popup_update(popup); input_popup_update(popup);
@ -2502,8 +2489,6 @@ static void handle_im_new_popup_surface(struct wl_listener *listener, void *data
popup->popup_surface = data; popup->popup_surface = data;
popup->popup_surface->data = popup; popup->popup_surface->data = popup;
wl_list_init(&popup->view_link);
LISTEN(&popup->popup_surface->events.map, &popup->popup_map, LISTEN(&popup->popup_surface->events.map, &popup->popup_map,
handle_im_popup_map); handle_im_popup_map);
@ -2525,8 +2510,6 @@ static void handle_im_new_popup_surface(struct wl_listener *listener, void *data
} else { } else {
input_popup_set_focus(popup, NULL); input_popup_set_focus(popup, NULL);
} }
wl_list_insert(&relay->input_popups, &popup->link);
} }
@ -2572,7 +2555,6 @@ static void relay_handle_input_method(struct wl_listener *listener,
void dwl_input_method_relay_init(struct dwl_input_method_relay *relay) { void dwl_input_method_relay_init(struct dwl_input_method_relay *relay) {
wl_list_init(&relay->text_inputs); wl_list_init(&relay->text_inputs);
wl_list_init(&relay->input_popups);
LISTEN(&text_input_manager->events.text_input, &relay->text_input_new, LISTEN(&text_input_manager->events.text_input, &relay->text_input_new,
relay_handle_text_input); relay_handle_text_input);
@ -2694,8 +2676,6 @@ setup(void)
wl_list_init(&clients); wl_list_init(&clients);
wl_list_init(&fstack); wl_list_init(&fstack);
wl_list_init(&input_popups);
idle = wlr_idle_create(dpy); idle = wlr_idle_create(dpy);
idle_inhibit_mgr = wlr_idle_inhibit_v1_create(dpy); idle_inhibit_mgr = wlr_idle_inhibit_v1_create(dpy);