mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add option --rotate-unlock-indicator to rotate it with every keypress instead of random positions

pull/142/head
Claus Strasburger 2017-08-21 10:38:06 +02:00
parent 698204a987
commit 1b64c9f58b
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
i3lock.c
View File

@ -65,6 +65,7 @@ static char password[512];
static bool beep = false;
bool debug_mode = false;
bool unlock_indicator = true;
bool unlock_indicator_rotate = false;
char *modifier_string = NULL;
static bool dont_fork = false;
struct ev_loop *main_loop;
@ -830,6 +831,7 @@ int main(int argc, char *argv[]) {
{"debug", no_argument, NULL, 0},
{"help", no_argument, NULL, 'h'},
{"no-unlock-indicator", no_argument, NULL, 'u'},
{"rotate-unlock-indicator", no_argument, NULL, 'r'},
{"image", required_argument, NULL, 'i'},
{"tiling", no_argument, NULL, 't'},
{"ignore-empty-password", no_argument, NULL, 'e'},
@ -842,7 +844,7 @@ int main(int argc, char *argv[]) {
if ((username = pw->pw_name) == NULL)
errx(EXIT_FAILURE, "pw->pw_name is NULL.\n");
char *optstring = "hvnbdc:p:ui:teI:f";
char *optstring = "hvnbdc:p:uri:teI:f";
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
switch (o) {
case 'v':
@ -875,6 +877,9 @@ int main(int argc, char *argv[]) {
case 'u':
unlock_indicator = false;
break;
case 'r':
unlock_indicator_rotate = true;
break;
case 'i':
image_path = strdup(optarg);
break;

28
unlock_indicator.c
View File

@ -6,19 +6,19 @@
* See LICENSE for licensing information
*
*/
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include <xcb/xcb.h>
#include <ev.h>
#include <cairo.h>
#include <cairo/cairo-xcb.h>
#include <ev.h>
#include <math.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <xcb/xcb.h>
#include "i3lock.h"
#include "xcb.h"
#include "unlock_indicator.h"
#include "xcb.h"
#include "xinerama.h"
#define BUTTON_RADIUS 90
@ -45,6 +45,9 @@ extern uint32_t last_resolution[2];
/* Whether the unlock indicator is enabled (defaults to true). */
extern bool unlock_indicator;
/* Whether the unlock indicator rotates in a circle or randomly (default false = randomly) */
extern bool unlock_indicator_rotate;
/* List of pressed modifiers, or NULL if none are pressed. */
extern char *modifier_string;
@ -80,6 +83,9 @@ static xcb_visualtype_t *vistype;
unlock_state_t unlock_state;
auth_state_t auth_state;
/* Current rotation position of the unlock indicator */
double highlight_start = 0;
/*
* Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook
* Pro 13" Retina screen, the scaling factor is 227/96 = 2.36.
@ -266,7 +272,11 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
if (unlock_state == STATE_KEY_ACTIVE ||
unlock_state == STATE_BACKSPACE_ACTIVE) {
cairo_new_sub_path(ctx);
double highlight_start = (rand() % (int)(2 * M_PI * 100)) / 100.0;
if (unlock_indicator_rotate) {
highlight_start += 2 * M_PI / 10;
} else {
highlight_start = (rand() % (int)(2 * M_PI * 100)) / 100.0;
}
cairo_arc(ctx,
BUTTON_CENTER /* x */,
BUTTON_CENTER /* y */,