revert shift lock handling (broke uppercase letters)

[i3/i3lock] / unlock_indicator.c

diff --git a/unlock_indicator.c b/unlock_indicator.c
index 1775c15495ae662b467bbf5bc8847360bcd111b8..a0decb44657a6d7263f79df7c5638af0299075f9 100644 (file)
--- a/unlock_indicator.c
+++ b/unlock_indicator.c
@@ -113,7 +113,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
         uint32_t rgb16[3] = {(strtol(strgroups[0], NULL, 16)),
                              (strtol(strgroups[1], NULL, 16)),
                              (strtol(strgroups[2], NULL, 16))};
-        cairo_set_source_rgb(xcb_ctx, rgb16[0], rgb16[1], rgb16[2]);
+        cairo_set_source_rgb(xcb_ctx, rgb16[0] / 255.0, rgb16[1] / 255.0, rgb16[2] / 255.0);
         cairo_rectangle(xcb_ctx, 0, 0, resolution[0], resolution[1]);
         cairo_fill(xcb_ctx);
     }
@@ -272,12 +272,12 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
  * Calls draw_image on a new pixmap and swaps that with the current pixmap
  *
  */
-void redraw_screen() {
+void redraw_screen(void) {
     xcb_pixmap_t bg_pixmap = draw_image(last_resolution);
     xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){ bg_pixmap });
     /* XXX: Possible optimization: Only update the area in the middle of the
      * screen instead of the whole screen. */
-    xcb_clear_area(conn, 0, win, 0, 0, screen->width_in_pixels, screen->height_in_pixels);
+    xcb_clear_area(conn, 0, win, 0, 0, last_resolution[0], last_resolution[1]);
     xcb_free_pixmap(conn, bg_pixmap);
     xcb_flush(conn);
 }
@@ -303,7 +303,7 @@ static void clear_indicator(EV_P_ ev_timer *w, int revents) {
  * after an unsuccessful authentication attempt.
  *
  */
-void start_clear_indicator_timeout() {
+void start_clear_indicator_timeout(void) {
     if (clear_indicator_timeout) {
         ev_timer_stop(main_loop, clear_indicator_timeout);
         ev_timer_set(clear_indicator_timeout, 1.0, 0.);
@@ -322,7 +322,7 @@ void start_clear_indicator_timeout() {
  * Stops the clear_indicator timeout.
  *
  */
-void stop_clear_indicator_timeout() {
+void stop_clear_indicator_timeout(void) {
     if (clear_indicator_timeout) {
         ev_timer_stop(main_loop, clear_indicator_timeout);
         free(clear_indicator_timeout);