add osx support

diff --git a/osx/Makefile b/osx/Makefile
new file mode 100644 (file)
index 0000000..532b8af
--- /dev/null
+++ b/osx/Makefile
@@ -0,0 +1,47 @@
+# $scrotwm$ 
+
+CFLAGS+= -O2 -Wall -ggdb -D_GNU_SOURCE -I.
+CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
+LDADD+=  -L/usr/X11/lib/ -lX11 -lXrandr
+
+PREFIX?= /usr/local
+BINDIR?= $(PREFIX)/bin
+LIBDIR?= $(PREFIX)/lib
+MANDIR?= $(PREFIX)/share/man
+
+CC= gcc
+
+LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
+
+all: scrotwm libswmhack.so.$(LVERS)
+
+scrotwm.c:
+       ln -sf ../scrotwm.c
+
+swm_hack.c:
+       ln -sf ../lib/swm_hack.c
+
+scrotwm: scrotwm.o osx.o
+       $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
+
+%.so: %.c
+       $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
+
+libswmhack.so.$(LVERS): swm_hack.so
+       $(CC) -shared -fpic -o libswmhack.so.$(LVERS) $(LDADD) swm_hack.so
+
+install: all
+       install -m 755 -d $(DESTDIR)$(BINDIR)
+       install -m 755 -d $(DESTDIR)$(LIBDIR)
+       install -m 755 -d $(DESTDIR)$(MANDIR)/man1
+       install -m 755 scrotwm $(DESTDIR)$(BINDIR)
+       install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)
+       install -m 644 ../scrotwm.1 $(DESTDIR)$(MANDIR)/man1/scrotwm.1
+       install -m 644 ../scrotwm_es.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_es.1
+       install -m 644 ../scrotwm_it.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_it.1
+       install -m 644 ../scrotwm_ru.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_ru.1
+
+clean:
+       rm -f scrotwm *.o *.so libswmhack.so.* scrotwm.c swm_hack.c
+
+.PHONY: all install clean

diff --git a/osx/osx.c b/osx/osx.c
new file mode 100644 (file)
index 0000000..4d27aa8
--- /dev/null
+++ b/osx/osx.c
@@ -0,0 +1,76 @@
+/* $scrotwm$ */
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+#include <errno.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "util.h"
+
+/* --------------------------------------------------------------------------- */
+/*     $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $    */
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define INVALID        1
+#define TOOSMALL       2
+#define TOOLARGE       3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+    const char **errstrp)
+{
+       long long ll = 0;
+       char *ep;
+       int error = 0;
+       struct errval {
+               const char *errstr;
+               int err;
+       } ev[4] = {
+               { NULL,         0 },
+               { "invalid",    EINVAL },
+               { "too small",  ERANGE },
+               { "too large",  ERANGE },
+       };
+
+       ev[0].err = errno;
+       errno = 0;
+       if (minval > maxval)
+               error = INVALID;
+       else {
+               ll = strtoll(numstr, &ep, 10);
+               if (numstr == ep || *ep != '\0')
+                       error = INVALID;
+               else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+                       error = TOOSMALL;
+               else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+                       error = TOOLARGE;
+       }
+       if (errstrp != NULL)
+               *errstrp = ev[error].errstr;
+       errno = ev[error].err;
+       if (error)
+               ll = 0;
+
+       return (ll);
+}

diff --git a/osx/util.h b/osx/util.h
new file mode 100644 (file)
index 0000000..e6d4061
--- /dev/null
+++ b/osx/util.h
@@ -0,0 +1,3 @@
+/* $scrotwm$ */
+
+long long strtonum(const char *, long long, long long, const char **);