Merge branch 'swaywm:master' into master

include/stringop.h

@@ -40,4 +40,6 @@ bool expand_path(char **path);
 char *vformat_str(const char *fmt, va_list args) _SWAY_ATTRIB_PRINTF(1, 0);
 char *format_str(const char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
 
+bool has_prefix(const char *str, const char *prefix);
+
 #endif

include/sway/config.h

@@ -262,6 +262,7 @@ enum scale_filter_mode {
 
 enum render_bit_depth {
 	RENDER_BIT_DEPTH_DEFAULT, // the default is currently 8
+	RENDER_BIT_DEPTH_6,
 	RENDER_BIT_DEPTH_8,
 	RENDER_BIT_DEPTH_10,
 };
@@ -296,14 +297,6 @@ struct output_config {
 	char *background_fallback;
 };
 
-/**
- * An output config pre-matched to an output
- */
-struct matched_output_config {
-	struct sway_output *output;
-	struct output_config *config;
-};
-
 /**
  * Stores size of gaps for each side
  */
@@ -695,13 +688,10 @@ const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filt
 
 struct output_config *new_output_config(const char *name);
 
-bool apply_output_configs(struct matched_output_config *configs,
-		size_t configs_len, bool test_only, bool degrade_to_off);
+bool apply_output_configs(struct output_config **ocs, size_t ocs_len,
+		bool test_only, bool degrade_to_off);
 
-void apply_all_output_configs(void);
-
-void sort_output_configs_by_priority(struct matched_output_config *configs,
-		size_t configs_len);
+void apply_stored_output_configs(void);
 
 /**
  * store_output_config stores a new output config. An output may be matched by
@@ -716,6 +706,10 @@ struct output_config *find_output_config(struct sway_output *output);
 
 void free_output_config(struct output_config *oc);
 
+void request_modeset(void);
+void force_modeset(void);
+bool modeset_is_pending(void);
+
 bool spawn_swaybg(void);
 
 int workspace_output_cmp_workspace(const void *a, const void *b);

include/sway/input/text_input_popup.h

@@ -9,11 +9,14 @@ struct sway_input_popup {
 	struct wlr_scene_tree *scene_tree;
 	struct sway_popup_desc desc;
 	struct wlr_input_popup_surface_v2 *popup_surface;
+	struct wlr_output *fixed_output;
 
 	struct wl_list link;
 
 	struct wl_listener popup_destroy;
 	struct wl_listener popup_surface_commit;
+	struct wl_listener popup_surface_map;
+	struct wl_listener popup_surface_unmap;
 
 	struct wl_listener focused_surface_unmap;
 };

include/sway/lock.h

@@ -0,0 +1,6 @@
+#ifndef _SWAY_LOCK_H
+#define _SWAY_LOCK_H
+
+void arrange_locks(void);
+
+#endif

include/sway/output.h

@@ -57,7 +57,6 @@ struct sway_output {
 
 	struct wl_listener layout_destroy;
 	struct wl_listener destroy;
-	struct wl_listener commit;
 	struct wl_listener present;
 	struct wl_listener frame;
 	struct wl_listener request_state;
@@ -72,7 +71,6 @@ struct sway_output {
 	uint32_t refresh_nsec;
 	int max_render_time; // In milliseconds
 	struct wl_event_source *repaint_timer;
-	bool gamma_lut_changed;
 	bool allow_tearing;
 };
 
@@ -136,10 +134,6 @@ enum sway_container_layout output_get_default_layout(
 
 enum wlr_direction opposite_direction(enum wlr_direction d);
 
-void handle_output_layout_change(struct wl_listener *listener, void *data);
-
-void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data);
-
 void handle_output_manager_apply(struct wl_listener *listener, void *data);
 
 void handle_output_manager_test(struct wl_listener *listener, void *data);
@@ -149,4 +143,6 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener,
 
 struct sway_output_non_desktop *output_non_desktop_create(struct wlr_output *wlr_output);
 
+void update_output_manager_config(struct sway_server *server);
+
 #endif

include/sway/server.h

@@ -45,7 +45,6 @@ struct sway_server {
 	struct sway_input_manager *input;
 
 	struct wl_listener new_output;
-	struct wl_listener output_layout_change;
 	struct wl_listener renderer_lost;
 
 	struct wlr_idle_notifier_v1 *idle_notifier_v1;

include/sway/tree/container.h

@@ -102,6 +102,8 @@ struct sway_container {
 	char *title;           // The view's title (unformatted)
 	char *formatted_title; // The title displayed in the title bar
 	int title_width;
+	
+	char *title_format;
 
 	enum sway_container_layout prev_split_layout;
 
@@ -183,6 +185,8 @@ void container_update_title_bar(struct sway_container *container);
 
 void container_update_marks(struct sway_container *container);
 
+size_t parse_title_format(struct sway_container *container, char *buffer);
+
 size_t container_build_representation(enum sway_container_layout layout,
 		list_t *children, char *buffer);
 

include/sway/tree/root.h

@@ -16,8 +16,6 @@ struct sway_root {
 	struct sway_node node;
 	struct wlr_output_layout *output_layout;
 
-	struct wl_listener output_layout_change;
-
 	// scene node layout:
 	// - root
 	// 	- staging

include/sway/tree/view.h

@@ -80,8 +80,6 @@ struct sway_view {
 	// Used when changing a view from tiled to floating.
 	int natural_width, natural_height;
 
-	char *title_format;
-
 	bool using_csd;
 
 	struct timespec urgent;