prepared 0.3

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 2cc2d4d..1e36b25 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,35 +2,26 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <X11/Xatom.h>
 
-#include "util.h"
-
-void
-error(char *errstr, ...) {
-       va_list ap;
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(1);
-}
+/* static */
 
 static void
 bad_malloc(unsigned int size)
 {
        fprintf(stderr, "fatal: could not malloc() %d bytes\n",
                        (int) size);
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
@@ -40,51 +31,19 @@ emallocz(unsigned int size)
        return res;
 }
 
-void *
-emalloc(unsigned int size)
-{
-       void *res = malloc(size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-void *
-erealloc(void *ptr, unsigned int size)
-{
-       void *res = realloc(ptr, size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-char *
-estrdup(const char *str)
-{
-       void *res = strdup(str);
-       if(!res)
-               bad_malloc(strlen(str));
-       return res;
-}
-
-void
-failed_assert(char *a, char *file, int line)
-{
-       fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-       abort();
-}
-
 void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
+eprint(const char *errstr, ...) {
+       va_list ap;
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
 }
 
 void
-spawn(Display *dpy, char *argv[])
+spawn(Arg *arg)
 {
+       char **argv = (char **)arg->argv;
        if(!argv || !argv[0])
                return;
        if(fork() == 0) {
@@ -93,86 +52,10 @@ spawn(Display *dpy, char *argv[])
                                close(ConnectionNumber(dpy));
                        setsid();
                        execvp(argv[0], argv);
-                       fprintf(stderr, "gridwm: execvp %s", argv[0]);
+                       fprintf(stderr, "dwm: execvp %s", argv[0]);
                        perror(" failed");
                }
-               exit (0);
+               exit(EXIT_FAILURE);
        }
        wait(0);
 }
-
-void
-pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[])
-{
-       unsigned int l, n;
-       int pfd[2];
-
-       if(!argv || !argv[0])
-               return;
-
-       if(pipe(pfd) == -1) {
-               perror("pipe");
-               exit(1);
-       }
-
-       if(fork() == 0) {
-               if(dpy)
-                       close(ConnectionNumber(dpy));
-               setsid();
-               dup2(pfd[1], STDOUT_FILENO);
-               close(pfd[0]);
-               close(pfd[1]);
-               execvp(argv[0], argv);
-               fprintf(stderr, "gridwm: execvp %s", argv[0]);
-               perror(" failed");
-       }
-       else {
-               n = 0;
-               close(pfd[1]);
-               while(l > n) {
-                       if((l = read(pfd[0], buf + n, len - n)) < 1)
-                               break;
-                       n += l;
-               }
-               close(pfd[0]);
-               buf[n - 1] = 0;
-       }
-       wait(0);
-}
-
-
-unsigned char *
-getselection(unsigned long offset, unsigned long *len, unsigned long *remain)
-{
-       Display *dpy;
-       Atom xa_clip_string;
-       Window w;
-       XEvent ev;
-       Atom typeret;
-       int format;
-       unsigned char *data;
-       unsigned char *result = NULL;
-
-       dpy = XOpenDisplay(0);
-       if(!dpy)
-               return NULL;
-       xa_clip_string = XInternAtom(dpy, "_SEL_STRING", False);
-       w = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, 200, 200,
-                       1, CopyFromParent, CopyFromParent);
-       XConvertSelection(dpy, XA_PRIMARY, XA_STRING, xa_clip_string,
-                       w, CurrentTime);
-       XFlush(dpy);
-       XNextEvent(dpy, &ev);
-       if(ev.type == SelectionNotify && ev.xselection.property != None) {
-               XGetWindowProperty(dpy, w, ev.xselection.property, offset, 4096L, False,
-                               AnyPropertyType, &typeret, &format, len, remain, &data);
-               if(*len) {
-                       result = emalloc(sizeof(unsigned char) * *len);
-                       memcpy(result, data, *len);
-               }
-               XDeleteProperty(dpy, w, ev.xselection.property);
-       }
-       XDestroyWindow(dpy, w);
-       XCloseDisplay(dpy);
-       return result;
-}