jachym/dwlb
1
0
Fork 0
mirror of https://github.com/kolunmi/dwlb.git synced 2025-09-07 11:54:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #30 from DhruvaSambrani/send-to-socket

Browse Source 
implement send-to-socket
This commit is contained in:
kolunmi 2023-11-14 18:39:21 -07:00 committed by GitHub
commit f5739f35d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dwlb.c
View File

@ -97,6 +97,7 @@
" -urgent-bg-color [COLOR] specify background color of urgent tags\n" \ " -urgent-bg-color [COLOR] specify background color of urgent tags\n" \
" -scale [BUFFER_SCALE] specify buffer scale value for integer scaling\n" \ " -scale [BUFFER_SCALE] specify buffer scale value for integer scaling\n" \
"Commands\n" \ "Commands\n" \
" -target-socket [SOCKET-NAME] set the socket to send command to. Sockets can be found in `$XDG_RUNTIME_DIR/dwlb/`\n"\
" -status [OUTPUT] [TEXT] set status text\n" \ " -status [OUTPUT] [TEXT] set status text\n" \
" -status-stdin [OUTPUT] set status text from stdin\n" \ " -status-stdin [OUTPUT] set status text from stdin\n" \
" -title [OUTPUT] [TEXT] set title text, if -custom-title is enabled\n" \ " -title [OUTPUT] [TEXT] set title text, if -custom-title is enabled\n" \
@ -1565,7 +1566,7 @@ event_loop(void)
static void static void
client_send_command(struct sockaddr_un *sock_address, const char *output, client_send_command(struct sockaddr_un *sock_address, const char *output,
const char *cmd, const char *data) const char *cmd, const char *data, const char *target_socket)
{ {
DIR *dir; DIR *dir;
if (!(dir = opendir(socketdir))) if (!(dir = opendir(socketdir)))
@ -1584,20 +1585,22 @@ client_send_command(struct sockaddr_un *sock_address, const char *output,
/* Send data to all dwlb instances */ /* Send data to all dwlb instances */
while ((de = readdir(dir))) { while ((de = readdir(dir))) {
if (!strncmp(de->d_name, "dwlb-", 5)) { if (!strncmp(de->d_name, "dwlb-", 5)) {
if (newfd && (sock_fd = socket(AF_UNIX, SOCK_STREAM, 1)) == -1) if (!target_socket || !strncmp(de -> d_name, target_socket, 6)){
EDIE("socket"); if (newfd && (sock_fd = socket(AF_UNIX, SOCK_STREAM, 1)) == -1)
snprintf(sock_address->sun_path, sizeof sock_address->sun_path, "%s/%s", socketdir, de->d_name); EDIE("socket");
if (connect(sock_fd, (struct sockaddr *) sock_address, sizeof(*sock_address)) == -1) { snprintf(sock_address->sun_path, sizeof sock_address->sun_path, "%s/%s", socketdir, de->d_name);
newfd = false; if (connect(sock_fd, (struct sockaddr *) sock_address, sizeof(*sock_address)) == -1) {
continue; newfd = false;
continue;
}
if (send(sock_fd, sockbuf, len, 0) == -1)
fprintf(stderr, "Could not send status data to '%s'\n", sock_address->sun_path);
close(sock_fd);
newfd = true;
} }
if (send(sock_fd, sockbuf, len, 0) == -1)
fprintf(stderr, "Could not send status data to '%s'\n", sock_address->sun_path);
close(sock_fd);
newfd = true;
} }
} }
closedir(dir); closedir(dir);
} }
@ -1626,11 +1629,20 @@ main(int argc, char **argv)
sock_address.sun_family = AF_UNIX; sock_address.sun_family = AF_UNIX;
/* Parse options */ /* Parse options */
for (int i = 1; i < argc; i++) { char *target_socket = NULL;
int i = 1;
if (argc > 1 && !strcmp(argv[1], "-target-socket")) {
if (2 >= argc) {
DIE("Option -socket requires an argument");
}
target_socket = argv[2];
i += 2;
}
for (; i < argc; i++) {
if (!strcmp(argv[i], "-status")) { if (!strcmp(argv[i], "-status")) {
if (++i + 1 >= argc) if (++i + 1 >= argc)
DIE("Option -status requires two arguments"); DIE("Option -status requires two arguments");
client_send_command(&sock_address, argv[i], "status", argv[i + 1]); client_send_command(&sock_address, argv[i], "status", argv[i + 1], target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-status-stdin")) { } else if (!strcmp(argv[i], "-status-stdin")) {
if (++i >= argc) if (++i >= argc)
@ -1638,44 +1650,44 @@ main(int argc, char **argv)
char *status = malloc(TEXT_MAX * sizeof(char)); char *status = malloc(TEXT_MAX * sizeof(char));
while (fgets(status, TEXT_MAX-1, stdin)) { while (fgets(status, TEXT_MAX-1, stdin)) {
status[strlen(status)-1] = '\0'; status[strlen(status)-1] = '\0';
client_send_command(&sock_address, argv[i], "status", status); client_send_command(&sock_address, argv[i], "status", status, target_socket);
} }
free(status); free(status);
return 0; return 0;
} else if (!strcmp(argv[i], "-title")) { } else if (!strcmp(argv[i], "-title")) {
if (++i + 1 >= argc) if (++i + 1 >= argc)
DIE("Option -title requires two arguments"); DIE("Option -title requires two arguments");
client_send_command(&sock_address, argv[i], "title", argv[i + 1]); client_send_command(&sock_address, argv[i], "title", argv[i + 1], target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-show")) { } else if (!strcmp(argv[i], "-show")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -show requires an argument"); DIE("Option -show requires an argument");
client_send_command(&sock_address, argv[i], "show", NULL); client_send_command(&sock_address, argv[i], "show", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-hide")) { } else if (!strcmp(argv[i], "-hide")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -hide requires an argument"); DIE("Option -hide requires an argument");
client_send_command(&sock_address, argv[i], "hide", NULL); client_send_command(&sock_address, argv[i], "hide", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-toggle-visibility")) { } else if (!strcmp(argv[i], "-toggle-visibility")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -toggle requires an argument"); DIE("Option -toggle requires an argument");
client_send_command(&sock_address, argv[i], "toggle-visibility", NULL); client_send_command(&sock_address, argv[i], "toggle-visibility", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-set-top")) { } else if (!strcmp(argv[i], "-set-top")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -set-top requires an argument"); DIE("Option -set-top requires an argument");
client_send_command(&sock_address, argv[i], "set-top", NULL); client_send_command(&sock_address, argv[i], "set-top", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-set-bottom")) { } else if (!strcmp(argv[i], "-set-bottom")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -set-bottom requires an argument"); DIE("Option -set-bottom requires an argument");
client_send_command(&sock_address, argv[i], "set-bottom", NULL); client_send_command(&sock_address, argv[i], "set-bottom", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-toggle-location")) { } else if (!strcmp(argv[i], "-toggle-location")) {
if (++i >= argc) if (++i >= argc)
DIE("Option -toggle-location requires an argument"); DIE("Option -toggle-location requires an argument");
client_send_command(&sock_address, argv[i], "toggle-location", NULL); client_send_command(&sock_address, argv[i], "toggle-location", NULL, target_socket);
return 0; return 0;
} else if (!strcmp(argv[i], "-ipc")) { } else if (!strcmp(argv[i], "-ipc")) {
ipc = true; ipc = true;