commit fba6f2f5a9c47da8e33c8679a822a50bf8079185
parent c39ccc70c79791d229ce585a99f1a4f1e0048139
Author: Raymond Li <hi@raymond.li>
Date: Wed, 2 Jun 2021 21:19:57 -0400
Merge branch 'master' into better-tiling
Diffstat:
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/i3lock.1 b/i3lock.1
@@ -125,6 +125,24 @@ If an image is specified (via \-i) it will display the image centered on the
screen (with a multi-monitor setup, the image is visible on all screens).
.TP
+.B \-F, \-\-fill
+If an image is specified (via \-i) it will scale the image until it fills the
+screen. A portion of the image will be cropped.
+(with a multi-monitor setup, the image is visible on all screens).
+
+.TP
+.B \-M, \-\-max
+If an image is specified (via \-i) it will scale the image until either the
+width or the height fits the screen without being cropped. The border color
+can be set via \-c. (with a multi-monitor setup, the image is visible on all screens).
+
+.TP
+.B \-L, \-\-scale
+If an image is specified (via \-i) it will stretch the image until both the
+width and the height fits the screen.
+(with a multi-monitor setup, the image is visible on all screens).
+
+.TP
.BI \-p\ win|default \fR,\ \fB\-\-pointer= win|default
If you specify "default",
.B i3lock
diff --git a/unlock_indicator.c b/unlock_indicator.c
@@ -875,7 +875,7 @@ void render_lock(uint32_t *resolution, xcb_drawable_t drawable) {
scaling_factor, button_diameter_physical);
// variable mapping for evaluating the clock position expression
- const unsigned int vars_size = 11;
+ const unsigned int vars_size = 14;
te_variable vars[] =
{{"w", &width},
{"h", &height},