diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/deps.mk | 66 | ||||
| -rw-r--r-- | src/feh.h | 1 | ||||
| -rw-r--r-- | src/ipc.c | 78 | ||||
| -rw-r--r-- | src/ipc.h | 51 |
4 files changed, 32 insertions, 164 deletions
diff --git a/src/deps.mk b/src/deps.mk index c3e5043..9777c8e 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -1,43 +1,41 @@ -collage.o: collage.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h winwidget.h filelist.h options.h -events.o: events.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +collage.o: collage.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + winwidget.h filelist.h options.h +events.o: events.c feh.h structs.h menu.h utils.h getopt.h debug.h \ filelist.h winwidget.h timers.h options.h events.h thumbnail.h -feh_png.o: feh_png.c feh_png.h feh.h structs.h menu.h ipc.h utils.h \ - getopt.h debug.h -filelist.o: filelist.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h options.h +feh_png.o: feh_png.c feh_png.h feh.h structs.h menu.h utils.h getopt.h \ + debug.h +filelist.o: filelist.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h options.h getopt.o: getopt.c getopt1.o: getopt1.c getopt.h -imlib.o: imlib.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +imlib.o: imlib.c feh.h structs.h menu.h utils.h getopt.h debug.h \ filelist.h winwidget.h options.h -index.o: index.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +index.o: index.c feh.h structs.h menu.h utils.h getopt.h debug.h \ filelist.h winwidget.h options.h -ipc.o: ipc.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +keyevents.o: keyevents.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + thumbnail.h filelist.h winwidget.h options.h +list.o: list.c feh.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ options.h -keyevents.o: keyevents.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h thumbnail.h filelist.h winwidget.h options.h -list.o: list.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ - filelist.h options.h -main.o: main.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ - filelist.h winwidget.h timers.h options.h events.h support.h +main.o: main.c feh.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ + winwidget.h timers.h options.h events.h support.h md5.o: md5.c md5.h -menu.o: menu.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ - support.h thumbnail.h filelist.h winwidget.h options.h -multiwindow.o: multiwindow.c feh.h structs.h menu.h ipc.h utils.h \ - getopt.h debug.h winwidget.h timers.h filelist.h options.h -options.o: options.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h options.h -signals.o: signals.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h winwidget.h -slideshow.o: slideshow.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h timers.h winwidget.h options.h signals.h -support.o: support.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h options.h support.h -thumbnail.o: thumbnail.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h winwidget.h options.h thumbnail.h md5.h feh_png.h -timers.o: timers.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +menu.o: menu.c feh.h structs.h menu.h utils.h getopt.h debug.h support.h \ + thumbnail.h filelist.h winwidget.h options.h +multiwindow.o: multiwindow.c feh.h structs.h menu.h utils.h getopt.h \ + debug.h winwidget.h timers.h filelist.h options.h +options.o: options.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h options.h +signals.o: signals.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + winwidget.h +slideshow.o: slideshow.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h timers.h winwidget.h options.h signals.h +support.o: support.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h options.h support.h +thumbnail.o: thumbnail.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h winwidget.h options.h thumbnail.h md5.h feh_png.h +timers.o: timers.c feh.h structs.h menu.h utils.h getopt.h debug.h \ options.h timers.h -utils.o: utils.c feh.h structs.h menu.h ipc.h utils.h getopt.h debug.h \ +utils.o: utils.c feh.h structs.h menu.h utils.h getopt.h debug.h \ options.h -winwidget.o: winwidget.c feh.h structs.h menu.h ipc.h utils.h getopt.h \ - debug.h filelist.h winwidget.h options.h +winwidget.o: winwidget.c feh.h structs.h menu.h utils.h getopt.h debug.h \ + filelist.h winwidget.h options.h @@ -60,7 +60,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "structs.h" #include "menu.h" -#include "ipc.h" #include "utils.h" #include "getopt.h" diff --git a/src/ipc.c b/src/ipc.c deleted file mode 100644 index 5299404..0000000 --- a/src/ipc.c +++ /dev/null @@ -1,78 +0,0 @@ -/* ipc.c - -Copyright (C) 1999-2003 Tom Gilbert. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies of the Software and its documentation and acknowledgment shall be -given in the documentation and software packages that this Software was -used. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ - -#include "feh.h" -#include "debug.h" -#include "options.h" - -static int session_id = 0; -static char *socket_name; -static int socket_fd = 0; - -void feh_ipc_create_socket(void) -{ - struct sockaddr_un saddr; - int i; - - if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) { - for (i = 0;; i++) { - saddr.sun_family = AF_UNIX; - snprintf(saddr.sun_path, 108, "%s/feh_%s.%d", feh_get_tmp_dir(), feh_get_user_name(), i); -/* - if (!feh_remote_is_running(i)) { - if ((unlink(saddr.sun_path) == -1) && errno != ENOENT) { - close(socket_fd); - eprintf("feh_ipc_create_socket: failed to unlink %s:", saddr.sun_path); - } - } else { - continue; - } -*/ - if (bind(socket_fd, (struct sockaddr *) &saddr, sizeof(saddr)) != -1) { - session_id = i; - socket_name = estrdup(saddr.sun_path); - listen(socket_fd, 50); - break; - } else { - close(socket_fd); - eprintf("feh_ipc_create_socket: failed to bind %s to a socket:", saddr.sun_path); - } - } - } else { - eprintf("feh_ipc_create_socket: failed to open socket:"); - } -} - -int feh_ipc_get_session_id(void) -{ - return session_id; -} - -void feh_ipc_cleanup(void) -{ - close(socket_fd); - unlink(socket_name); - free(socket_name); -} diff --git a/src/ipc.h b/src/ipc.h deleted file mode 100644 index ac1b814..0000000 --- a/src/ipc.h +++ /dev/null @@ -1,51 +0,0 @@ -/* ipc.h - -Copyright (C) 1999-2003 Tom Gilbert. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies of the Software and its documentation and acknowledgment shall be -given in the documentation and software packages that this Software was -used. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -*/ - -#ifndef IPC_H -#define IPC_H - -#define FEH_IPC_VERSION 0x100; - -void feh_ipc_create_socket(void); -int feh_ipc_get_session_id(void); - -typedef struct { - unsigned int version; - unsigned int command; - unsigned int data_length; -} feh_ipc_client_header; - -typedef struct { - unsigned int version; - unsigned int data_length; -} feh_ipc_server_header; - -enum { - IPC_CMD_QUIT, - IPC_CMD_FILELIST_NEXT, - IPC_CMD_FILELIST_PREV -}; - -#endif |