mirror of
				https://github.com/labwc/labwc.git
				synced 2025-11-03 09:01:51 -05:00 
			
		
		
		
	xdg: on init, set maximize according to wlr_xdg_surface status
This commit is contained in:
		
							parent
							
								
									64a80e144e
								
							
						
					
					
						commit
						c1269adc40
					
				
					 2 changed files with 3 additions and 17 deletions
				
			
		| 
						 | 
					@ -11,9 +11,9 @@
 | 
				
			||||||
#include <wlr/types/wlr_output_damage.h>
 | 
					#include <wlr/types/wlr_output_damage.h>
 | 
				
			||||||
#include <wlr/util/region.h>
 | 
					#include <wlr/util/region.h>
 | 
				
			||||||
#include "labwc.h"
 | 
					#include "labwc.h"
 | 
				
			||||||
 | 
					#include "layers.h"
 | 
				
			||||||
#include "menu/menu.h"
 | 
					#include "menu/menu.h"
 | 
				
			||||||
#include "theme.h"
 | 
					#include "theme.h"
 | 
				
			||||||
#include "layers.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
//#define DEBUG 1
 | 
					//#define DEBUG 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										18
									
								
								src/xdg.c
									
										
									
									
									
								
							
							
						
						
									
										18
									
								
								src/xdg.c
									
										
									
									
									
								
							| 
						 | 
					@ -121,18 +121,9 @@ handle_request_resize(struct wl_listener *listener, void *data)
 | 
				
			||||||
static void
 | 
					static void
 | 
				
			||||||
handle_request_maximize(struct wl_listener *listener, void *data)
 | 
					handle_request_maximize(struct wl_listener *listener, void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	/* This event is raised when a client would like to begin an interactive
 | 
					 | 
				
			||||||
	 * resize, typically because the user clicked on their client-side
 | 
					 | 
				
			||||||
	 * decorations. Note that a more sophisticated compositor should check
 | 
					 | 
				
			||||||
	 * the provied serial against a list of button press serials sent to
 | 
					 | 
				
			||||||
	 * this
 | 
					 | 
				
			||||||
	 * client, to prevent the client from requesting this whenever they want.
 | 
					 | 
				
			||||||
	 */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	struct view *view = wl_container_of(listener, view, request_maximize);
 | 
						struct view *view = wl_container_of(listener, view, request_maximize);
 | 
				
			||||||
 | 
					 | 
				
			||||||
	struct wlr_xdg_surface *surface = data;
 | 
						struct wlr_xdg_surface *surface = data;
 | 
				
			||||||
	if(view != NULL) {
 | 
						if (view) {
 | 
				
			||||||
		view_maximize(view, surface->toplevel->client_pending.maximized);
 | 
							view_maximize(view, surface->toplevel->client_pending.maximized);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -284,7 +275,7 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 | 
				
			||||||
	view->type = LAB_XDG_SHELL_VIEW;
 | 
						view->type = LAB_XDG_SHELL_VIEW;
 | 
				
			||||||
	view->impl = &xdg_toplevel_view_impl;
 | 
						view->impl = &xdg_toplevel_view_impl;
 | 
				
			||||||
	view->xdg_surface = xdg_surface;
 | 
						view->xdg_surface = xdg_surface;
 | 
				
			||||||
	view->maximized = false;
 | 
						view_maximize(view, xdg_surface->toplevel->client_pending.maximized);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	view->map.notify = handle_map;
 | 
						view->map.notify = handle_map;
 | 
				
			||||||
	wl_signal_add(&xdg_surface->events.map, &view->map);
 | 
						wl_signal_add(&xdg_surface->events.map, &view->map);
 | 
				
			||||||
| 
						 | 
					@ -304,10 +295,5 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 | 
				
			||||||
	view->request_maximize.notify = handle_request_maximize;
 | 
						view->request_maximize.notify = handle_request_maximize;
 | 
				
			||||||
	wl_signal_add(&toplevel->events.request_maximize, &view->request_maximize);
 | 
						wl_signal_add(&toplevel->events.request_maximize, &view->request_maximize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// hacky workaround to bug where sometimes a window starts maximized and
 | 
					 | 
				
			||||||
	// when we hit the maximize button, labwc crashes. instead we unmaximize
 | 
					 | 
				
			||||||
	// it from the start to avoid this situation
 | 
					 | 
				
			||||||
	view_maximize(view, false);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	wl_list_insert(&server->views, &view->link);
 | 
						wl_list_insert(&server->views, &view->link);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue