commit 9cf4fc1e7c6b9c33bad9b1e9176f4b9719269103
parent c07a9322777bd657460df4078649ef4d33a10124
Author: fjbalon <fjbalon@templier.es>
Date: Thu, 25 Jun 2026 17:34:05 +0200
Refactorización y optimización en códigos diff de artículo sobre slock
Diffstat:
| M | slock/index.html | | | 117 | +++++++++++++------------------------------------------------------------------- |
1 file changed, 18 insertions(+), 99 deletions(-)
diff --git a/slock/index.html b/slock/index.html
@@ -26,18 +26,7 @@
.diff .info {color:#848484;}
</style>
-<pre><code class="diff">
-<span class="info">From 36a4863f9a399740aaf8b1e01926485c0a055e1c Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Wed, 29 Apr 2020 13:52:42 +0200</span>
-<span class="info">Subject: [PATCH 1/8] Added Bg patch and screenshot capabilities</span>
-
-<span class="del">---</span>
- config.mk | 2 +-
- slock.c | 35 +++++++++++++++++++++++++++++++----
- 2 files changed, 32 insertions(+), 5 deletions(-)
-
-<span class="info">diff --git a/config.mk b/config.mk</span>
+<pre><code class="diff"><span class="info">diff --git a/config.mk b/config.mk</span>
<span class="info">index 74429ae..987819e 100644</span>
<span class="info">--- a/config.mk</span>
<span class="info">+++ b/config.mk</span>
@@ -136,26 +125,12 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="add">+ imlib_copy_drawable_to_image(0,0,0,scr->width,scr->height,0,0,1);</span>
<span class="add">+ </span>
/* check for Xrandr support */
- rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-
-<span class="del">-- </span>
-2.27.0
-
-
-<span class="info">From 9d89604ac52b0949d047dae2f9b78cb5085ee1a2 Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Wed, 29 Apr 2020 14:15:59 +0200</span>
-<span class="info">Subject: [PATCH 2/8] Added blur function</span>
-
-<span class="del">---</span>
- config.def.h | 3 +++
- slock.c | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);</code></pre>
-<span class="info">diff --git a/config.def.h b/config.def.h</span>
+<pre><code class="diff"><span class="info">diff --git a/config.h b/config.h</span>
<span class="info">index c8e52d6..fcc1b39 100644</span>
-<span class="info">--- a/config.def.h</span>
-<span class="info">+++ b/config.def.h</span>
+<span class="info">--- a/config.h</span>
+<span class="info">+++ b/config.h</span>
<span class="hunk">@@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = {</span>
/* treat a cleared input like a wrong password (color) */
@@ -184,25 +159,12 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="add">+ imlib_image_blur(blurRadius);</span>
/* check for Xrandr support */
- rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-<span class="del">-- </span>
-2.27.0
-
-
-<span class="info">From 069aabd7e30244befd4efe74c85d3468ed076c21 Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Wed, 29 Apr 2020 17:33:09 +0200</span>
-<span class="info">Subject: [PATCH 4/8] added Pixelation</span>
+ rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);</code></pre>
-<span class="del">---</span>
- config.def.h | 3 ++-
- slock.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 44 insertions(+), 1 deletion(-)
-
-<span class="info">diff --git a/config.def.h b/config.def.h</span>
+<pre><code class="diff"><span class="info">diff --git a/config.h b/config.h</span>
<span class="info">index fcc1b39..1c1aef3 100644</span>
-<span class="info">--- a/config.def.h</span>
-<span class="info">+++ b/config.def.h</span>
+<span class="info">--- a/config.h</span>
+<span class="info">+++ b/config.h</span>
<span class="hunk">@@ -12,4 +12,5 @@ static const char *colorname[NUMCOLS] = {</span>
static const int failonclear = 1;
@@ -264,21 +226,9 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="add">+ </span>
/* check for Xrandr support */
- rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-<span class="del">-- </span>
-2.27.0
-
+ rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);</code></pre>
-<span class="info">From 109bac015c1c7fbf8440fb42588fe7e0e9cb5e62 Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Wed, 29 Apr 2020 17:42:39 +0200</span>
-<span class="info">Subject: [PATCH 6/8] removed debug printf</span>
-
-<span class="del">---</span>
- slock.c | 1 -
- 1 file changed, 1 deletion(-)
-
-<span class="info">diff --git a/slock.c b/slock.c</span>
+<pre><code class="diff"><span class="info">diff --git a/slock.c b/slock.c</span>
<span class="info">index 33ca569..f54c459 100644</span>
<span class="info">--- a/slock.c</span>
<span class="info">+++ b/slock.c</span>
@@ -289,21 +239,9 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="del">- printf("R/G/B: %i/%i/%i\n",red,green,blue);</span>
imlib_context_set_color(red,green,blue,pixel.alpha);
imlib_image_fill_rectangle(x,y,pixelSize,pixelSize);
- red = 0;
-<span class="del">-- </span>
-2.27.0
-
-
-<span class="info">From a13a0f4ac86f82e4dff145b7ebd93e52d07492c9 Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Sun, 3 May 2020 18:03:38 +0200</span>
-<span class="info">Subject: [PATCH 7/8] Changed compilerflag to fast</span>
-
-<span class="del">---</span>
- config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ red = 0;</code></pre>
-<span class="info">diff --git a/config.mk b/config.mk</span>
+<pre><code class="diff"><span class="info">diff --git a/config.mk b/config.mk</span>
<span class="info">index 987819e..d0c2f01 100644</span>
<span class="info">--- a/config.mk</span>
<span class="info">+++ b/config.mk</span>
@@ -314,27 +252,12 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="del">-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}</span>
<span class="add">+CFLAGS = -std=c99 -pedantic -Wall -Ofast ${INCS} ${CPPFLAGS}</span>
LDFLAGS = -s ${LIBS}
- COMPATSRC = explicit_bzero.c
-
-<span class="del">-- </span>
-2.27.0
-
-
-<span class="info">From 31a7001c4954606c066cc3df4318fafd6d216bcd Mon Sep 17 00:00:00 2001</span>
-From: Lars Niesen <iah71niesen@gso-koeln.de>
-<span class="info">Date: Mon, 4 May 2020 10:00:40 +0200</span>
-<span class="info">Subject: [PATCH 8/8] Added defines for BLUR/PIXELATION to remove from code by</span>
- compilation
+ COMPATSRC = explicit_bzero.c</code></pre>
-<span class="del">---</span>
- config.def.h | 11 ++++++++---
- slock.c | 9 ++++++---
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-<span class="info">diff --git a/config.def.h b/config.def.h</span>
+<pre><code class="diff"><span class="info">diff --git a/config.h b/config.h</span>
<span class="info">index 1c1aef3..5407953 100644</span>
-<span class="info">--- a/config.def.h</span>
-<span class="info">+++ b/config.def.h</span>
+<span class="info">--- a/config.h</span>
+<span class="info">+++ b/config.h</span>
<span class="hunk">@@ -11,6 +11,11 @@ static const char *colorname[NUMCOLS] = {</span>
/* treat a cleared input like a wrong password (color) */
static const int failonclear = 1;
@@ -378,11 +301,7 @@ From: Lars Niesen <iah71niesen@gso-koeln.de>
<span class="del">- </span>
<span class="add">+#endif</span>
/* check for Xrandr support */
- rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-
-<span class="del">-- </span>
-2.27.0
-</code></pre>
+ rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);</code></pre>
<p>De tal forma que, una vez aplicados los cambios de software, al ser ejecutado captura la pantalla completa usando <emb>imlib2</emb> (<emb>imlib_copy_drawable_to_image</emb> desde <emb>RootWindow</emb>), aplica desenfoque directamente sobre es imagen en memoria con <emb>imlib_image_blur(blurRadius)</emb> y la convierte en un Pixmap, que pone como fondo de ventana de bloqueo con <emb>XSetWindowBackgroundPixmap</emb>.</p>
<p>Quedando un fondo como el siguiente ejemplo:</p>
<img src="slock-blur.gif" />
