1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
diff --git a/config.def.h b/config.def.h
index 9855e21..bc883ad 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,6 +1,11 @@
-/* user and group to drop privileges to */
-static const char *user = "nobody";
+/* user and group to drop privileges to */ static const char *user = "nobody";
static const char *group = "nogroup";
+/*Font settings for the time text*/
+static const float textsize=64.0;
+static const char* textfamily="serif";
+static const double textcolorred=255;
+static const double textcolorgreen=255;
+static const double textcolorblue=255;
static const char *colorname[NUMCOLS] = {
[INIT] = "black", /* after initialization */
diff --git a/config.mk b/config.mk
index 514c236..c42e301 100644
--- a/config.mk
+++ b/config.mk
@@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
# includes and libs
INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lcairo
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
diff --git a/slock.c b/slock.c
index b2f14e3..d370a00 100644
--- a/slock.c
+++ b/slock.c
@@ -5,6 +5,7 @@
#endif
#include <ctype.h>
+#include <cairo/cairo-xlib.h>
#include <errno.h>
#include <grp.h>
#include <pwd.h>
@@ -18,7 +19,8 @@
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-
+#include <pthread.h>
+#include <time.h>
#include "arg.h"
#include "util.h"
@@ -44,6 +46,14 @@ struct xrandr {
int errbase;
};
+struct displayData{
+ struct lock **locks;
+ Display* dpy;
+ int nscreens;
+ cairo_t **crs;
+ cairo_surface_t **surfaces;
+};
+static pthread_mutex_t mutex= PTHREAD_MUTEX_INITIALIZER;
#include "config.h"
static void
@@ -123,10 +133,46 @@ gethash(void)
return hash;
}
+static void
+refresh(Display *dpy, Window win , int screen, struct tm time, cairo_t* cr, cairo_surface_t* sfc)
+{/*Function that displays given time on the given screen*/
+ static char tm[24]="";
+ int xpos,ypos;
+ xpos=DisplayWidth(dpy, screen)/4;
+ ypos=DisplayHeight(dpy, screen)/2;
+ sprintf(tm,"%02d/%02d/%d %02d:%02d",time.tm_mday,time.tm_mon + 1,time.tm_year+1900,time.tm_hour,time.tm_min);
+ XClearWindow(dpy, win);
+ cairo_set_source_rgb(cr, textcolorred, textcolorgreen, textcolorblue);
+ cairo_select_font_face(cr, textfamily, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+ cairo_set_font_size(cr, textsize);
+ cairo_move_to(cr, xpos, ypos);
+ cairo_show_text(cr, tm);
+ cairo_surface_flush(sfc);
+ XFlush(dpy);
+}
+static void*
+displayTime(void* input)
+{ /*Thread that keeps track of time and refreshes it every 5 seconds */
+ struct displayData* displayData=(struct displayData*)input;
+ while (1){
+ pthread_mutex_lock(&mutex); /*Mutex to prevent interference with refreshing screen while typing password*/
+ time_t rawtime;
+ time(&rawtime);
+ struct tm tm = *localtime(&rawtime);
+ for (int k=0;k<displayData->nscreens;k++){
+ refresh(displayData->dpy, displayData->locks[k]->win, displayData->locks[k]->screen, tm,displayData->crs[k],displayData->surfaces[k]);
+ }
+ pthread_mutex_unlock(&mutex);
+ sleep(5);
+ }
+ return NULL;
+}
+
+
static void
readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- const char *hash)
+ const char *hash,cairo_t **crs,cairo_surface_t **surfaces)
{
XRRScreenChangeNotifyEvent *rre;
char buf[32], passwd[256], *inputhash;
@@ -189,16 +235,23 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
}
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
if (running && oldc != color) {
+ pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering*/
for (screen = 0; screen < nscreens; screen++) {
XSetWindowBackground(dpy,
locks[screen]->win,
locks[screen]->colors[color]);
XClearWindow(dpy, locks[screen]->win);
+ time_t rawtime;
+ time(&rawtime);
+ refresh(dpy, locks[screen]->win,locks[screen]->screen, *localtime(&rawtime),crs[screen],surfaces[screen]);
+ /*Redraw the time after screen cleared*/
}
+ pthread_mutex_unlock(&mutex);
oldc = color;
}
} else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
rre = (XRRScreenChangeNotifyEvent*)&ev;
+ pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering.*/
for (screen = 0; screen < nscreens; screen++) {
if (locks[screen]->win == rre->window) {
if (rre->rotation == RR_Rotate_90 ||
@@ -212,6 +265,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
break;
}
}
+
+ pthread_mutex_unlock(&mutex);
} else {
for (screen = 0; screen < nscreens; screen++)
XRaiseWindow(dpy, locks[screen]->win);
@@ -343,7 +398,7 @@ main(int argc, char **argv) {
errno = 0;
if (!crypt("", hash))
die("slock: crypt: %s\n", strerror(errno));
-
+ XInitThreads();
if (!(dpy = XOpenDisplay(NULL)))
die("slock: cannot open display\n");
@@ -389,7 +444,33 @@ main(int argc, char **argv) {
}
/* everything is now blank. Wait for the correct password */
- readpw(dpy, &rr, locks, nscreens, hash);
+ pthread_t thredid;
+ /* Create Cairo drawables upon which the time will be shown. */
+ struct displayData displayData;
+ cairo_surface_t **surfaces;
+ cairo_t **crs;
+ if (!(surfaces=calloc(nscreens, sizeof(cairo_surface_t*)))){
+ die("Out of memory");
+ }
+ if (!(crs=calloc(nscreens, sizeof(cairo_t*)))){
+ die("Out of memory");
+ }
+ for (int k=0;k<nscreens;k++){
+ Drawable win=locks[k]->win;
+ int screen=locks[k]->screen;
+ XMapWindow(dpy, win);
+ surfaces[k]=cairo_xlib_surface_create(dpy, win, DefaultVisual(dpy, screen),DisplayWidth(dpy, screen) , DisplayHeight(dpy, screen));
+ crs[k]=cairo_create(surfaces[k]);
+ }
+ displayData.dpy=dpy;
+ displayData.locks=locks;
+ displayData.nscreens=nscreens;
+ displayData.crs=crs;
+ displayData.surfaces=surfaces;
+ /*Start the thread that redraws time every 5 seconds*/
+ pthread_create(&thredid, NULL, displayTime, &displayData);
+ /*Wait for the password*/
+ readpw(dpy, &rr, locks, nscreens, hash,crs,surfaces);
return 0;
}
|
