Attachment 125934 Details for Bug 97424 – main, libply: Add device scale setting

[patch] main, libply: Add device scale setting

0001-main-libply-Add-device-scale-setting.patch (text/plain), 3.79 KB, created by Michael Kuhn on 2016-08-20 22:06:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2016-08-20 22:06:27 UTC

Size: 3.79 KB

patch

obsolete

>From 8ba11444628f9ca3205c73b2f124f15048cb40ef Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Sat, 20 Aug 2016 23:33:11 +0200
>Subject: [PATCH] main, libply: Add device scale setting
>
>This adds a DeviceScale setting to plymouthd.conf. It can be used to
>override the device scale detection when setting the
>PLYMOUTH_FORCE_SCALE environment variable is too complicated.
>---
> src/libply/ply-utils.c | 13 ++++++++++++-
> src/libply/ply-utils.h |  2 ++
> src/main.c             | 17 +++++++++++++++++
> 3 files changed, 31 insertions(+), 1 deletion(-)
>
>diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
>index 31b642e..e9c6a6a 100644
>--- a/src/libply/ply-utils.c
>+++ b/src/libply/ply-utils.c
>@@ -78,6 +78,8 @@
> static int errno_stack[PLY_ERRNO_STACK_SIZE];
> static int errno_stack_position = 0;
> 
>+static int device_scale_setting = 0;
>+
> bool
> ply_open_unidirectional_pipe (int *sender_fd,
>                               int *receiver_fd)
>@@ -960,6 +962,12 @@ out:
>         return (pid_t) ppid;
> }
> 
>+void
>+ply_set_device_scale (int device_scale)
>+{
>+    device_scale_setting = device_scale;
>+}
>+
> /* The minimum resolution at which we turn on a device-scale of 2 */
> #define HIDPI_LIMIT 192
> #define HIDPI_MIN_HEIGHT 1200
>@@ -981,7 +989,10 @@ ply_get_device_scale (uint32_t width,
>         if ((force_device_scale = getenv ("PLYMOUTH_FORCE_SCALE")))
>                 return strtoul (force_device_scale, NULL, 0);
> 
>-        if (width >= SMALLEST_4K_WIDTH)
>+        if (device_scale_setting != 0)
>+                return device_scale_setting;
>+
>+        if (width < SMALLEST_4K_WIDTH)
>                 return 1;
> 
>         if (height < HIDPI_MIN_HEIGHT)
>diff --git a/src/libply/ply-utils.h b/src/libply/ply-utils.h
>index 2f4ce81..c46603e 100644
>--- a/src/libply/ply-utils.h
>+++ b/src/libply/ply-utils.h
>@@ -121,6 +121,8 @@ int ply_utf8_string_get_length (const char *string,
> char *ply_get_process_command_line (pid_t pid);
> pid_t ply_get_process_parent_pid (pid_t pid);
> 
>+void ply_set_device_scale (int device_scale);
>+
> int ply_get_device_scale (uint32_t width,
>                           uint32_t height,
>                           uint32_t width_mm,
>diff --git a/src/main.c b/src/main.c
>index a5b6d7a..ab2f662 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -108,6 +108,7 @@ typedef struct
>         double                  start_time;
>         double                  splash_delay;
>         double                  device_timeout;
>+        int                     device_scale;
> 
>         char                    kernel_command_line[PLY_MAX_COMMAND_LINE_SIZE];
>         uint32_t                kernel_command_line_is_set : 1;
>@@ -334,6 +335,17 @@ load_settings (state_t    *state,
>                 }
>         }
> 
>+        if (state->device_scale == 0) {
>+                const char *scale_string;
>+
>+                scale_string = ply_key_file_get_value (key_file, "Daemon", "DeviceScale");
>+
>+                if (scale_string != NULL) {
>+                        state->device_scale = strtoul (scale_string, NULL, 0);
>+                        ply_trace ("Device scale is set to %d", state->device_scale);
>+                }
>+        }
>+
>         settings_loaded = true;
> out:
>         ply_key_file_free (key_file);
>@@ -2294,6 +2306,7 @@ main (int    argc,
>         state.progress = ply_progress_new ();
>         state.splash_delay = NAN;
>         state.device_timeout = NAN;
>+        state.device_scale = 0;
> 
>         ply_progress_load_cache (state.progress,
>                                  get_cache_file_for_mode (state.mode));
>@@ -2326,6 +2339,10 @@ main (int    argc,
>                 state.splash_delay = NAN;
>         }
> 
>+        if (state.device_scale != 0) {
>+                ply_set_device_scale (state.device_scale);
>+        }
>+
>         load_devices (&state, device_manager_flags);
> 
>         ply_trace ("entering event loop");
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 97424: 125933 | 125934 | 125948 | 125949 | 125950 | 125963 | 125964 | 125965

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.