koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add situational exit codes (#4107)

Browse Source 
Add situational exit codes

Distinguish user canceled and other errors
Closes #3705
This commit is contained in:
Alessandro Vinciguerra 2020-10-20 09:38:35 +02:00 committed by GitHub
parent 83078a1e16
commit 9e059ccc55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE-NOTES-next
View File

@ -26,6 +26,7 @@ working. Please reach out to us in that case!
to their definition order in the config file to their definition order in the config file
• update i3bar config when necessary (reduces redraws on bar mode changes) • update i3bar config when necessary (reduces redraws on bar mode changes)
• mention rofi in default config file • mention rofi in default config file
• i3-input: add different exit codes for when i3-input fails
┌────────────────────────────┐ ┌────────────────────────────┐
│ Bugfixes │ │ Bugfixes │

24
i3-input/main.c
View File

@ -32,6 +32,14 @@ xcb_visualtype_t *visual_type = NULL;
#define BORDER logical_px(2) #define BORDER logical_px(2)
#define PADDING logical_px(2) #define PADDING logical_px(2)
/* Exit codes for i3-input:
* 0 if i3-input exited successfully and the command was run
* 1 if the user canceled input
* 2 if i3-input fails for any other reason */
const int EXIT_OK = 0;
const int EXIT_CANCEL = 1;
const int EXIT_ERROR = 2;
/* IPC format string. %s will be replaced with what the user entered, then /* IPC format string. %s will be replaced with what the user entered, then
* the command will be sent to i3 */ * the command will be sent to i3 */
static char *format; static char *format;
@ -186,11 +194,11 @@ static void finish_input(void) {
/* prefix the command if a prefix was specified on commandline */ /* prefix the command if a prefix was specified on commandline */
printf("command = %s\n", full); printf("command = %s\n", full);
ipc_send_message(sockfd, strlen(full), 0, (uint8_t *)full); int ret = ipc_send_message(sockfd, strlen(full), 0, (uint8_t *)full);
free(full); free(full);
exit(0); exit(ret == 0 ? EXIT_OK : EXIT_ERROR);
} }
/* /*
@ -239,7 +247,7 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press
return 1; return 1;
} }
if (sym == XK_Escape) { if (sym == XK_Escape) {
exit(0); exit(EXIT_CANCEL);
} }
/* TODO: handle all of these? */ /* TODO: handle all of these? */
@ -297,7 +305,7 @@ static xcb_rectangle_t get_window_position(void) {
xcb_intern_atom_reply_t *nswc_reply = xcb_intern_atom_reply(conn, nswc_cookie, NULL); xcb_intern_atom_reply_t *nswc_reply = xcb_intern_atom_reply(conn, nswc_cookie, NULL);
if (nswc_reply == NULL) { if (nswc_reply == NULL) {
ELOG("Could not intern atom _NET_SUPPORTING_WM_CHECK\n"); ELOG("Could not intern atom _NET_SUPPORTING_WM_CHECK\n");
exit(-1); exit(EXIT_ERROR);
} }
A__NET_SUPPORTING_WM_CHECK = nswc_reply->atom; A__NET_SUPPORTING_WM_CHECK = nswc_reply->atom;
free(nswc_reply); free(nswc_reply);
@ -392,7 +400,7 @@ int main(int argc, char *argv[]) {
break; break;
case 'v': case 'v':
printf("i3-input " I3_VERSION); printf("i3-input " I3_VERSION);
return 0; return EXIT_OK;
case 'p': case 'p':
/* This option is deprecated, but will still work in i3 v4.1, 4.2 and 4.3 */ /* This option is deprecated, but will still work in i3 v4.1, 4.2 and 4.3 */
fprintf(stderr, "i3-input: WARNING: the -p option is DEPRECATED in favor of the -F (format) option\n"); fprintf(stderr, "i3-input: WARNING: the -p option is DEPRECATED in favor of the -F (format) option\n");
@ -420,7 +428,7 @@ int main(int argc, char *argv[]) {
printf("\n"); printf("\n");
printf("Example:\n"); printf("Example:\n");
printf(" i3-input -F 'workspace \"%%s\"' -P 'Switch to workspace: '\n"); printf(" i3-input -F 'workspace \"%%s\"' -P 'Switch to workspace: '\n");
return 0; return EXIT_OK;
} }
} }
if (!format) { if (!format) {
@ -491,7 +499,7 @@ int main(int argc, char *argv[]) {
if (reply->status != XCB_GRAB_STATUS_SUCCESS) { if (reply->status != XCB_GRAB_STATUS_SUCCESS) {
fprintf(stderr, "Could not grab keyboard, status = %d\n", reply->status); fprintf(stderr, "Could not grab keyboard, status = %d\n", reply->status);
exit(-1); exit(EXIT_ERROR);
} }
xcb_flush(conn); xcb_flush(conn);
@ -527,5 +535,5 @@ int main(int argc, char *argv[]) {
} }
draw_util_surface_free(conn, &surface); draw_util_surface_free(conn, &surface);
return 0; return EXIT_OK;
} }