mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-10-29 05:40:12 -04:00 
			
		
		
		
	Avoid including generated headers publicly where possible
This is possible now that w-p ships enum headers. The remaining includes are from wlr-protocols.
This commit is contained in:
		
							parent
							
								
									812675ba34
								
							
						
					
					
						commit
						ad1b2f2819
					
				
					 14 changed files with 20 additions and 16 deletions
				
			
		|  | @ -9,10 +9,10 @@ | ||||||
| #ifndef WLR_TYPES_WLR_COLOR_MANAGEMENT_V1_H | #ifndef WLR_TYPES_WLR_COLOR_MANAGEMENT_V1_H | ||||||
| #define WLR_TYPES_WLR_COLOR_MANAGEMENT_V1_H | #define WLR_TYPES_WLR_COLOR_MANAGEMENT_V1_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server.h> | #include <wayland-server-core.h> | ||||||
| #include <wlr/render/color.h> | #include <wayland-protocols/color-management-v1-enum.h> | ||||||
| 
 | 
 | ||||||
| #include "color-management-v1-protocol.h" | #include <wlr/render/color.h> | ||||||
| 
 | 
 | ||||||
| struct wlr_surface; | struct wlr_surface; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,10 +10,9 @@ | ||||||
| #define WLR_TYPES_WLR_COLOR_REPRESENTATION_V1_H | #define WLR_TYPES_WLR_COLOR_REPRESENTATION_V1_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
|  | #include <wayland-protocols/color-representation-v1-enum.h> | ||||||
| #include <wlr/render/color.h> | #include <wlr/render/color.h> | ||||||
| 
 | 
 | ||||||
| #include "color-representation-v1-protocol.h" |  | ||||||
| 
 |  | ||||||
| struct wlr_surface; | struct wlr_surface; | ||||||
| 
 | 
 | ||||||
| // Supported coefficients and range are always paired together
 | // Supported coefficients and range are always paired together
 | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ | ||||||
| #define WLR_TYPES_WLR_CONTENT_TYPE_V1_H | #define WLR_TYPES_WLR_CONTENT_TYPE_V1_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
| #include "content-type-v1-protocol.h" | #include <wayland-protocols/content-type-v1-enum.h> | ||||||
| 
 | 
 | ||||||
| struct wlr_surface; | struct wlr_surface; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ | ||||||
| #define WLR_TYPES_WLR_CURSOR_SHAPE_V1_H | #define WLR_TYPES_WLR_CURSOR_SHAPE_V1_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
| #include "cursor-shape-v1-protocol.h" | #include <wayland-protocols/cursor-shape-v1-enum.h> | ||||||
| 
 | 
 | ||||||
| /**
 | /**
 | ||||||
|  * Manager for the cursor-shape-v1 protocol. |  * Manager for the cursor-shape-v1 protocol. | ||||||
|  |  | ||||||
|  | @ -10,9 +10,9 @@ | ||||||
| #define WLR_TYPES_WLR_EXT_IMAGE_COPY_CAPTURE_V1_H | #define WLR_TYPES_WLR_EXT_IMAGE_COPY_CAPTURE_V1_H | ||||||
| 
 | 
 | ||||||
| #include <pixman.h> | #include <pixman.h> | ||||||
| #include <wayland-server.h> | #include <wayland-server-protocol.h> | ||||||
|  | #include <wayland-protocols/ext-image-copy-capture-v1-enum.h> | ||||||
| #include <time.h> | #include <time.h> | ||||||
| #include "ext-image-copy-capture-v1-protocol.h" |  | ||||||
| 
 | 
 | ||||||
| struct wlr_renderer; | struct wlr_renderer; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -11,10 +11,10 @@ | ||||||
| 
 | 
 | ||||||
| #include <stdint.h> | #include <stdint.h> | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
|  | #include <wayland-protocols/pointer-constraints-unstable-v1-enum.h> | ||||||
| #include <pixman.h> | #include <pixman.h> | ||||||
| #include <wlr/types/wlr_compositor.h> | #include <wlr/types/wlr_compositor.h> | ||||||
| #include <wlr/types/wlr_seat.h> | #include <wlr/types/wlr_seat.h> | ||||||
| #include "pointer-constraints-unstable-v1-protocol.h" |  | ||||||
| 
 | 
 | ||||||
| struct wlr_seat; | struct wlr_seat; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,10 +10,9 @@ | ||||||
| #define WLR_TYPES_WLR_TABLET_V2_H | #define WLR_TYPES_WLR_TABLET_V2_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
|  | #include <wayland-protocols/tablet-v2-enum.h> | ||||||
| #include <wlr/types/wlr_seat.h> | #include <wlr/types/wlr_seat.h> | ||||||
| 
 | 
 | ||||||
| #include "tablet-v2-protocol.h" |  | ||||||
| 
 |  | ||||||
| /* This can probably be even lower,the tools don't have a lot of buttons */ | /* This can probably be even lower,the tools don't have a lot of buttons */ | ||||||
| #define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16 | #define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -11,11 +11,9 @@ | ||||||
| 
 | 
 | ||||||
| #include <stdint.h> | #include <stdint.h> | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
| #include <wayland-server-protocol.h> | #include <wayland-protocols/tearing-control-v1-enum.h> | ||||||
| #include <wlr/types/wlr_compositor.h> | #include <wlr/types/wlr_compositor.h> | ||||||
| 
 | 
 | ||||||
| #include "tearing-control-v1-protocol.h" |  | ||||||
| 
 |  | ||||||
| struct wlr_tearing_control_v1 { | struct wlr_tearing_control_v1 { | ||||||
| 	struct wl_client *client; | 	struct wl_client *client; | ||||||
| 	struct wl_list link; | 	struct wl_list link; | ||||||
|  |  | ||||||
|  | @ -10,10 +10,10 @@ | ||||||
| #define WLR_TYPES_WLR_XDG_SHELL_H | #define WLR_TYPES_WLR_XDG_SHELL_H | ||||||
| 
 | 
 | ||||||
| #include <wayland-server-core.h> | #include <wayland-server-core.h> | ||||||
|  | #include <wayland-protocols/xdg-shell-enum.h> | ||||||
| #include <wlr/types/wlr_compositor.h> | #include <wlr/types/wlr_compositor.h> | ||||||
| #include <wlr/types/wlr_seat.h> | #include <wlr/types/wlr_seat.h> | ||||||
| #include <wlr/util/box.h> | #include <wlr/util/box.h> | ||||||
| #include "xdg-shell-protocol.h" |  | ||||||
| 
 | 
 | ||||||
| struct wlr_xdg_shell { | struct wlr_xdg_shell { | ||||||
| 	struct wl_global *global; | 	struct wl_global *global; | ||||||
|  |  | ||||||
|  | @ -7,6 +7,7 @@ | ||||||
| #include <wlr/types/wlr_output.h> | #include <wlr/types/wlr_output.h> | ||||||
| #include <wlr/util/addon.h> | #include <wlr/util/addon.h> | ||||||
| 
 | 
 | ||||||
|  | #include "color-management-v1-protocol.h" | ||||||
| #include "render/color.h" | #include "render/color.h" | ||||||
| #include "util/mem.h" | #include "util/mem.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,6 +3,8 @@ | ||||||
| #include <wlr/types/wlr_content_type_v1.h> | #include <wlr/types/wlr_content_type_v1.h> | ||||||
| #include <wlr/types/wlr_compositor.h> | #include <wlr/types/wlr_compositor.h> | ||||||
| 
 | 
 | ||||||
|  | #include "content-type-v1-protocol.h" | ||||||
|  | 
 | ||||||
| #define CONTENT_TYPE_VERSION 1 | #define CONTENT_TYPE_VERSION 1 | ||||||
| 
 | 
 | ||||||
| struct wlr_content_type_v1_surface { | struct wlr_content_type_v1_surface { | ||||||
|  |  | ||||||
|  | @ -5,6 +5,8 @@ | ||||||
| #include <wlr/types/wlr_cursor_shape_v1.h> | #include <wlr/types/wlr_cursor_shape_v1.h> | ||||||
| #include <wlr/types/wlr_seat.h> | #include <wlr/types/wlr_seat.h> | ||||||
| #include <wlr/types/wlr_tablet_tool.h> | #include <wlr/types/wlr_tablet_tool.h> | ||||||
|  | 
 | ||||||
|  | #include "cursor-shape-v1-protocol.h" | ||||||
| #include "types/wlr_tablet_v2.h" | #include "types/wlr_tablet_v2.h" | ||||||
| 
 | 
 | ||||||
| #define CURSOR_SHAPE_MANAGER_V1_VERSION 2 | #define CURSOR_SHAPE_MANAGER_V1_VERSION 2 | ||||||
|  |  | ||||||
|  | @ -6,6 +6,7 @@ | ||||||
| #include <wlr/types/wlr_ext_image_copy_capture_v1.h> | #include <wlr/types/wlr_ext_image_copy_capture_v1.h> | ||||||
| #include <wlr/types/wlr_seat.h> | #include <wlr/types/wlr_seat.h> | ||||||
| #include <wlr/render/wlr_renderer.h> | #include <wlr/render/wlr_renderer.h> | ||||||
|  | #include "ext-image-copy-capture-v1-protocol.h" | ||||||
| #include "render/pixel_format.h" | #include "render/pixel_format.h" | ||||||
| 
 | 
 | ||||||
| #define IMAGE_COPY_CAPTURE_MANAGER_V1_VERSION 1 | #define IMAGE_COPY_CAPTURE_MANAGER_V1_VERSION 1 | ||||||
|  |  | ||||||
|  | @ -9,6 +9,8 @@ | ||||||
| #include <wlr/util/box.h> | #include <wlr/util/box.h> | ||||||
| #include <wlr/util/log.h> | #include <wlr/util/log.h> | ||||||
| 
 | 
 | ||||||
|  | #include "pointer-constraints-unstable-v1-protocol.h" | ||||||
|  | 
 | ||||||
| static const struct zwp_locked_pointer_v1_interface locked_pointer_impl; | static const struct zwp_locked_pointer_v1_interface locked_pointer_impl; | ||||||
| static const struct zwp_confined_pointer_v1_interface confined_pointer_impl; | static const struct zwp_confined_pointer_v1_interface confined_pointer_impl; | ||||||
| static const struct zwp_pointer_constraints_v1_interface pointer_constraints_impl; | static const struct zwp_pointer_constraints_v1_interface pointer_constraints_impl; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Kirill Primak
						Kirill Primak