drop support for wlr-input-inhibitor-unstable-v1
deprecated in favor of ext-session-lock-v1
References: 4aa366e3dd
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3848
			
			
This commit is contained in:
		
							
								
								
									
										6
									
								
								dwl.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								dwl.c
									
									
									
									
									
								
							@@ -29,7 +29,6 @@
 | 
				
			|||||||
#include <wlr/types/wlr_idle_inhibit_v1.h>
 | 
					#include <wlr/types/wlr_idle_inhibit_v1.h>
 | 
				
			||||||
#include <wlr/types/wlr_idle_notify_v1.h>
 | 
					#include <wlr/types/wlr_idle_notify_v1.h>
 | 
				
			||||||
#include <wlr/types/wlr_input_device.h>
 | 
					#include <wlr/types/wlr_input_device.h>
 | 
				
			||||||
#include <wlr/types/wlr_input_inhibitor.h>
 | 
					 | 
				
			||||||
#include <wlr/types/wlr_keyboard.h>
 | 
					#include <wlr/types/wlr_keyboard.h>
 | 
				
			||||||
#include <wlr/types/wlr_layer_shell_v1.h>
 | 
					#include <wlr/types/wlr_layer_shell_v1.h>
 | 
				
			||||||
#include <wlr/types/wlr_output.h>
 | 
					#include <wlr/types/wlr_output.h>
 | 
				
			||||||
@@ -349,7 +348,6 @@ static struct wl_list fstack;  /* focus order */
 | 
				
			|||||||
static struct wlr_idle *idle;
 | 
					static struct wlr_idle *idle;
 | 
				
			||||||
static struct wlr_idle_notifier_v1 *idle_notifier;
 | 
					static struct wlr_idle_notifier_v1 *idle_notifier;
 | 
				
			||||||
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_layer_shell_v1 *layer_shell;
 | 
					static struct wlr_layer_shell_v1 *layer_shell;
 | 
				
			||||||
static struct wlr_output_manager_v1 *output_mgr;
 | 
					static struct wlr_output_manager_v1 *output_mgr;
 | 
				
			||||||
static struct wlr_gamma_control_manager_v1 *gamma_control_mgr;
 | 
					static struct wlr_gamma_control_manager_v1 *gamma_control_mgr;
 | 
				
			||||||
@@ -1428,8 +1426,7 @@ keypress(struct wl_listener *listener, void *data)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* On _press_ if there is no active screen locker,
 | 
						/* On _press_ if there is no active screen locker,
 | 
				
			||||||
	 * attempt to process a compositor keybinding. */
 | 
						 * attempt to process a compositor keybinding. */
 | 
				
			||||||
	if (!locked && !input_inhibit_mgr->active_inhibitor
 | 
						if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
 | 
				
			||||||
			&& event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
 | 
					 | 
				
			||||||
		for (i = 0; i < nsyms; i++)
 | 
							for (i = 0; i < nsyms; i++)
 | 
				
			||||||
			handled = keybinding(mods, syms[i]) || handled;
 | 
								handled = keybinding(mods, syms[i]) || handled;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2290,7 +2287,6 @@ setup(void)
 | 
				
			|||||||
	xdg_shell = wlr_xdg_shell_create(dpy, 4);
 | 
						xdg_shell = wlr_xdg_shell_create(dpy, 4);
 | 
				
			||||||
	wl_signal_add(&xdg_shell->events.new_surface, &new_xdg_surface);
 | 
						wl_signal_add(&xdg_shell->events.new_surface, &new_xdg_surface);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	input_inhibit_mgr = wlr_input_inhibit_manager_create(dpy);
 | 
					 | 
				
			||||||
	session_lock_mgr = wlr_session_lock_manager_v1_create(dpy);
 | 
						session_lock_mgr = wlr_session_lock_manager_v1_create(dpy);
 | 
				
			||||||
	wl_signal_add(&session_lock_mgr->events.new_lock, &session_lock_create_lock);
 | 
						wl_signal_add(&session_lock_mgr->events.new_lock, &session_lock_create_lock);
 | 
				
			||||||
	wl_signal_add(&session_lock_mgr->events.destroy, &session_lock_mgr_destroy);
 | 
						wl_signal_add(&session_lock_mgr->events.destroy, &session_lock_mgr_destroy);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user