about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@wmii.de>2006-07-11 18:19:01 +0200
committerAnselm R. Garbe <garbeam@wmii.de>2006-07-11 18:19:01 +0200
commitb1669b5c48f71c9a7a919dbf09a1af527c62f69a (patch)
treef94f1018357afe5abef9cde46a80d16a9676010f
parent586f66331d1105be03c42e6faeae1672b974a98a (diff)
downloaddwm-b1669b5c48f71c9a7a919dbf09a1af527c62f69a.tar.gz
removed unnecessary sel stuff
-rw-r--r--Makefile10
-rw-r--r--gridsel.c47
-rw-r--r--util.c38
-rw-r--r--util.h2
4 files changed, 2 insertions, 95 deletions
diff --git a/Makefile b/Makefile
index b38889b..e324e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,10 @@ WMSRC = bar.c client.c cmd.c draw.c event.c key.c util.c wm.c
 WMOBJ = ${WMSRC:.c=.o}
 MENSRC = menu.c draw.c util.c
 MENOBJ = ${MENSRC:.c=.o}
-SELSRC = gridsel.c util.c
-SELOBJ = ${SELSRC:.c=.o}
 MAN1 = gridwm.1 gridmenu.1
-BIN = gridwm gridmenu gridsel 
+BIN = gridwm gridmenu
 
-all: config gridwm gridmenu gridsel
+all: config gridwm gridmenu
 	@echo finished
 
 config:
@@ -36,10 +34,6 @@ gridwm: ${WMOBJ}
 	@echo LD $@
 	@${CC} -o $@ ${WMOBJ} ${LDFLAGS}
 
-gridsel: ${SELOBJ}
-	@echo LD $@
-	@${CC} -o $@ ${SELOBJ} ${LDFLAGS}
-
 clean:
 	rm -f gridwm gridmenu *.o core
 
diff --git a/gridsel.c b/gridsel.c
deleted file mode 100644
index c76105e..0000000
--- a/gridsel.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <util.h>
-
-static char version[] = "gridsel - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
-
-static void
-usage()
-{
-	fprintf(stderr, "%s\n", "usage: gridsel [-v]\n");
-	exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-	unsigned char *data;
-	unsigned long i, offset, len, remain;
-
-	/* command line args */
-	if(argc > 1) {
-		if(!strncmp(argv[1], "-v", 3)) {
-			fprintf(stdout, "%s", version);
-			exit(0);
-		} else
-			usage();
-	}
-	len = offset = remain = 0;
-	do {
-		data = getselection(offset, &len, &remain);
-		for(i = 0; i < len; i++)
-			putchar(data[i]);
-		offset += len;
-		free(data);
-	}
-	while(remain);
-	if(offset)
-		putchar('\n');
-	return 0;
-}
diff --git a/util.c b/util.c
index 2cc2d4d..76ba5ab 100644
--- a/util.c
+++ b/util.c
@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <X11/Xatom.h>
 
 #include "util.h"
 
@@ -139,40 +138,3 @@ pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[])
 	}
 	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;
-}
diff --git a/util.h b/util.h
index 00f0714..76fc09f 100644
--- a/util.h
+++ b/util.h
@@ -18,7 +18,5 @@ extern void failed_assert(char *a, char *file, int line);
 extern void pipe_spawn(char *buf, unsigned int len, Display *dpy, char *argv[]);
 extern void spawn(Display *dpy, char *argv[]);
 extern void swap(void **p1, void **p2);
-extern unsigned char *getselection(unsigned long offset, unsigned long *len,
-		unsigned long *remain);
 extern unsigned int tokenize(char **result, unsigned int reslen,
 		char *str, char delim);
369'>369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511