aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Ronan Pigott <rpigott@berkeley.edu>2019-11-13 11:23:36 -0700
committerLibravatar Simon Ser <contact@emersion.fr>2019-11-29 18:13:37 +0100
commit6968fb3123e69f563cd01d472967a9e6ddca2ec1 (patch)
tree0e313d5e19da37762ab572e38c36ff33798f25fb /include
parentoutput: Ensure that frame_done is delayed on max_render_time (diff)
downloadsway-6968fb3123e69f563cd01d472967a9e6ddca2ec1.tar.gz
sway-6968fb3123e69f563cd01d472967a9e6ddca2ec1.tar.zst
sway-6968fb3123e69f563cd01d472967a9e6ddca2ec1.zip
add scale_filter output config option
Diffstat (limited to 'include')
-rw-r--r--include/sway/commands.h1
-rw-r--r--include/sway/config.h10
-rw-r--r--include/sway/output.h1
3 files changed, 12 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 67665d87..5f249980 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -276,6 +276,7 @@ sway_cmd output_cmd_max_render_time;
276sway_cmd output_cmd_mode; 276sway_cmd output_cmd_mode;
277sway_cmd output_cmd_position; 277sway_cmd output_cmd_position;
278sway_cmd output_cmd_scale; 278sway_cmd output_cmd_scale;
279sway_cmd output_cmd_scale_filter;
279sway_cmd output_cmd_subpixel; 280sway_cmd output_cmd_subpixel;
280sway_cmd output_cmd_toggle; 281sway_cmd output_cmd_toggle;
281sway_cmd output_cmd_transform; 282sway_cmd output_cmd_transform;
diff --git a/include/sway/config.h b/include/sway/config.h
index ed542790..9a00ccb5 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -204,6 +204,13 @@ enum config_dpms {
204 DPMS_OFF 204 DPMS_OFF
205}; 205};
206 206
207enum scale_filter_mode {
208 SCALE_FILTER_DEFAULT, // the default is currently smart
209 SCALE_FILTER_LINEAR,
210 SCALE_FILTER_NEAREST,
211 SCALE_FILTER_SMART
212};
213
207/** 214/**
208 * Size and position configuration for a particular output. 215 * Size and position configuration for a particular output.
209 * 216 *
@@ -217,6 +224,7 @@ struct output_config {
217 int custom_mode; 224 int custom_mode;
218 int x, y; 225 int x, y;
219 float scale; 226 float scale;
227 enum scale_filter_mode scale_filter;
220 int32_t transform; 228 int32_t transform;
221 enum wl_output_subpixel subpixel; 229 enum wl_output_subpixel subpixel;
222 int max_render_time; // In milliseconds 230 int max_render_time; // In milliseconds
@@ -655,6 +663,8 @@ int output_name_cmp(const void *item, const void *data);
655void output_get_identifier(char *identifier, size_t len, 663void output_get_identifier(char *identifier, size_t len,
656 struct sway_output *output); 664 struct sway_output *output);
657 665
666const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter);
667
658struct output_config *new_output_config(const char *name); 668struct output_config *new_output_config(const char *name);
659 669
660void merge_output_config(struct output_config *dst, struct output_config *src); 670void merge_output_config(struct output_config *dst, struct output_config *src);
diff --git a/include/sway/output.h b/include/sway/output.h
index ddc08022..bc03f4c5 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -32,6 +32,7 @@ struct sway_output {
32 int lx, ly; // layout coords 32 int lx, ly; // layout coords
33 int width, height; // transformed buffer size 33 int width, height; // transformed buffer size
34 enum wl_output_subpixel detected_subpixel; 34 enum wl_output_subpixel detected_subpixel;
35 enum scale_filter_mode scale_filter;
35 // last applied mode when the output is DPMS'ed 36 // last applied mode when the output is DPMS'ed
36 struct wlr_output_mode *current_mode; 37 struct wlr_output_mode *current_mode;
37 38