mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	add wlr_output_layout_adjacent_output
This commit is contained in:
		
							parent
							
								
									71cba94e73
								
							
						
					
					
						commit
						85871cb666
					
				
					 3 changed files with 70 additions and 0 deletions
				
			
		| 
						 | 
					@ -5,6 +5,7 @@
 | 
				
			||||||
#include <wayland-util.h>
 | 
					#include <wayland-util.h>
 | 
				
			||||||
#include <wlr/types/wlr_box.h>
 | 
					#include <wlr/types/wlr_box.h>
 | 
				
			||||||
#include <wlr/types/wlr_output.h>
 | 
					#include <wlr/types/wlr_output.h>
 | 
				
			||||||
 | 
					#include <wlr/util/direction.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct wlr_output_layout_state;
 | 
					struct wlr_output_layout_state;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -96,4 +97,12 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout,
 | 
				
			||||||
struct wlr_output *wlr_output_layout_get_center_output(
 | 
					struct wlr_output *wlr_output_layout_get_center_output(
 | 
				
			||||||
		struct wlr_output_layout *layout);
 | 
							struct wlr_output_layout *layout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Get the closest adjacent output to the reference output from the reference
 | 
				
			||||||
 | 
					 * point in the given direction.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					struct wlr_output *wlr_output_layout_adjacent_output(
 | 
				
			||||||
 | 
							struct wlr_output_layout *layout, enum wlr_direction direction,
 | 
				
			||||||
 | 
							struct wlr_output *reference, double ref_x, double ref_y);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								include/wlr/util/direction.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								include/wlr/util/direction.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,11 @@
 | 
				
			||||||
 | 
					#ifndef WLR_UTIL_DIRECTION_H
 | 
				
			||||||
 | 
					#define WLR_UTIL_DIRECTION_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					enum wlr_direction {
 | 
				
			||||||
 | 
						WLR_DIRECTION_UP = 0,
 | 
				
			||||||
 | 
						WLR_DIRECTION_DOWN = 1,
 | 
				
			||||||
 | 
						WLR_DIRECTION_LEFT = 2,
 | 
				
			||||||
 | 
						WLR_DIRECTION_RIGHT = 4,
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -421,3 +421,53 @@ struct wlr_output *wlr_output_layout_get_center_output(
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return wlr_output_layout_output_at(layout, dest_x, dest_y);
 | 
						return wlr_output_layout_output_at(layout, dest_x, dest_y);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					struct wlr_output *wlr_output_layout_adjacent_output(
 | 
				
			||||||
 | 
							struct wlr_output_layout *layout, enum wlr_direction direction,
 | 
				
			||||||
 | 
							struct wlr_output *reference, double ref_x, double ref_y) {
 | 
				
			||||||
 | 
						// XXX should we allow reference to be NULL?
 | 
				
			||||||
 | 
						assert(reference);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						struct wlr_box *ref_box = wlr_output_layout_get_box(layout, reference);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						double min_distance = DBL_MAX;
 | 
				
			||||||
 | 
						struct wlr_output *closest_output = NULL;
 | 
				
			||||||
 | 
						struct wlr_output_layout_output *l_output;
 | 
				
			||||||
 | 
						wl_list_for_each(l_output, &layout->outputs, link) {
 | 
				
			||||||
 | 
							if (reference != NULL && reference == l_output->output) {
 | 
				
			||||||
 | 
								continue;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							struct wlr_box *box = wlr_output_layout_output_get_box(l_output);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							bool match = false;
 | 
				
			||||||
 | 
							// test to make sure this output is in the given direction
 | 
				
			||||||
 | 
							if (direction | WLR_DIRECTION_LEFT) {
 | 
				
			||||||
 | 
								match = box->x + box->width <= ref_box->x || match;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							if (direction | WLR_DIRECTION_RIGHT) {
 | 
				
			||||||
 | 
								match = box->x >= ref_box->x + ref_box->width || match;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							if (direction | WLR_DIRECTION_UP) {
 | 
				
			||||||
 | 
								match = box->y + box->height <= ref_box->y;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							if (direction | WLR_DIRECTION_DOWN) {
 | 
				
			||||||
 | 
								match = box->y >= ref_box->y + ref_box->height;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							if (!match) {
 | 
				
			||||||
 | 
								continue;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// calculate distance from the given reference point
 | 
				
			||||||
 | 
							double x, y;
 | 
				
			||||||
 | 
							wlr_output_layout_closest_point(layout, l_output->output,
 | 
				
			||||||
 | 
								ref_x, ref_y, &x, &y);
 | 
				
			||||||
 | 
							double distance =
 | 
				
			||||||
 | 
								(x - ref_x) * (x - ref_x) + (y - ref_y) * (y - ref_y);
 | 
				
			||||||
 | 
							if (distance < min_distance) {
 | 
				
			||||||
 | 
								min_distance = distance;
 | 
				
			||||||
 | 
								closest_output = l_output->output;
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return closest_output;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue