mirror of https://github.com/i3/i3lock.git
commit
dfe167bcac
12
i3lock.c
12
i3lock.c
|
@ -750,7 +750,7 @@ static void xcb_check_cb(EV_P_ ev_check *w, int revents) {
|
||||||
xcb_generic_event_t *event;
|
xcb_generic_event_t *event;
|
||||||
|
|
||||||
if (xcb_connection_has_error(conn))
|
if (xcb_connection_has_error(conn))
|
||||||
errx(EXIT_FAILURE, "X11 connection broke, did your server terminate?\n");
|
errx(EXIT_FAILURE, "X11 connection broke, did your server terminate?");
|
||||||
|
|
||||||
while ((event = xcb_poll_for_event(conn)) != NULL) {
|
while ((event = xcb_poll_for_event(conn)) != NULL) {
|
||||||
if (event->response_type == 0) {
|
if (event->response_type == 0) {
|
||||||
|
@ -820,7 +820,7 @@ static void raise_loop(xcb_window_t window) {
|
||||||
int screens;
|
int screens;
|
||||||
|
|
||||||
if (xcb_connection_has_error((conn = xcb_connect(NULL, &screens))) > 0)
|
if (xcb_connection_has_error((conn = xcb_connect(NULL, &screens))) > 0)
|
||||||
errx(EXIT_FAILURE, "Cannot open display\n");
|
errx(EXIT_FAILURE, "Cannot open display");
|
||||||
|
|
||||||
/* We need to know about the window being obscured or getting destroyed. */
|
/* We need to know about the window being obscured or getting destroyed. */
|
||||||
xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK,
|
xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK,
|
||||||
|
@ -900,7 +900,7 @@ int main(int argc, char *argv[]) {
|
||||||
if ((pw = getpwuid(getuid())) == NULL)
|
if ((pw = getpwuid(getuid())) == NULL)
|
||||||
err(EXIT_FAILURE, "getpwuid() failed");
|
err(EXIT_FAILURE, "getpwuid() failed");
|
||||||
if ((username = pw->pw_name) == NULL)
|
if ((username = pw->pw_name) == NULL)
|
||||||
errx(EXIT_FAILURE, "pw->pw_name is NULL.\n");
|
errx(EXIT_FAILURE, "pw->pw_name is NULL.");
|
||||||
|
|
||||||
char *optstring = "hvnbdc:p:ui:teI:fl";
|
char *optstring = "hvnbdc:p:ui:teI:fl";
|
||||||
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
|
while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {
|
||||||
|
@ -928,7 +928,7 @@ int main(int argc, char *argv[]) {
|
||||||
arg++;
|
arg++;
|
||||||
|
|
||||||
if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1)
|
if (strlen(arg) != 6 || sscanf(arg, "%06[0-9a-fA-F]", color) != 1)
|
||||||
errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb\n");
|
errx(EXIT_FAILURE, "color is invalid, it must be given in 3-byte hexadecimal format: rrggbb");
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -947,7 +947,7 @@ int main(int argc, char *argv[]) {
|
||||||
} else if (!strcmp(optarg, "default")) {
|
} else if (!strcmp(optarg, "default")) {
|
||||||
curs_choice = CURS_DEFAULT;
|
curs_choice = CURS_DEFAULT;
|
||||||
} else {
|
} else {
|
||||||
errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".\n");
|
errx(EXIT_FAILURE, "i3lock: Invalid pointer type given. Expected one of \"win\" or \"default\".");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
|
@ -1133,7 +1133,7 @@ int main(int argc, char *argv[]) {
|
||||||
/* Initialize the libev event loop. */
|
/* Initialize the libev event loop. */
|
||||||
main_loop = EV_DEFAULT;
|
main_loop = EV_DEFAULT;
|
||||||
if (main_loop == NULL)
|
if (main_loop == NULL)
|
||||||
errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?\n");
|
errx(EXIT_FAILURE, "Could not initialize libev. Bad LIBEV_FLAGS?");
|
||||||
|
|
||||||
#if defined(__linux__)
|
#if defined(__linux__)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue