Makefile

@@ -16,10 +16,8 @@
 
 CC=gcc
 DEBUG=0
-PREFIX=/usr/local
 INCFLAGS=`pkg-config x11 --cflags`
 LDFLAGS=`pkg-config x11 --libs`
-DEFS=-DVERSION=\"1.0\"
 CFLAGS=$(INCFLAGS) -std=c99 -Wall -Wextra -Wfatal-errors -Werror
 HDRS=
 OBJS=src/main.o
@@ -36,13 +34,7 @@ endif
 tinyclip: $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-.PHONY: clean distclean install
+.PHONY: clean
 
 clean:
 	$(RM) $(OBJS)
-
-distclean: clean
-	$(RM) tinyclip
-
-install: tinyclip
-	install -m 755 tinyclip $(PREFIX)/bin/

README

@@ -3,25 +3,6 @@
 ================
 A tiny clipboard application for X.
 
-# Building
-----------
-## Dependencies
-To compile the project you will require:
- * C99 compatible compiler (GCC is recommended)
- * UNIX Make
- * X11
-
-## Compiling
-The project is built using the `make' command. For debug information
-append `DEBUG=1' to the command.
-
-# Installation
---------------
-Once the project is built, you can install by running `make install'. By
-default the `PREFIX' variable is set to `/usr/local' (installing the
-binary in `/usr/local/bin'). You can override this by appending
-`PREFIX=<prefix>' to the install command.
-
 # License
 ---------
 This project is licensed under the GNU General Public License version 3

TODO

@@ -1,5 +0,0 @@
-============
-*** TODO ***
-============
- - Setup response for INCR
- - Implement most common plain text targets

src/main.c

@@ -19,114 +19,41 @@
 #include <signal.h>
 #include <stdio.h>
 #include <time.h>
-#include <stdlib.h>
-#include <string.h>
 #include <X11/Xlib.h>
 
-Display *display;
-Window clip_win;
 int run;
 void *data;
 size_t data_size;
 
 void quit() {
 	run = 0;
-	XClientMessageEvent cme;
-	cme.type = ClientMessage;
-	cme.format = 32;
-	XSendEvent(display, clip_win, 0, 0, (XEvent*)&cme);
-	XFlush(display);
 }
 
-void get_selection(Atom property) {
-	Atom da, incr, type;
-	int di;
-	unsigned long size, dul;
-	unsigned char *prop_ret = NULL;
+void send_selection(Display *display, XSelectionRequestEvent *sre, Atom utf8) {
+	XSelectionEvent se;
+	time_t now_tm;
+	char *now;
 
-	XGetWindowProperty(display, clip_win, property, 0, 0, 0, AnyPropertyType,
-			&type, &di, &dul, &size, &prop_ret);
-	XFree(prop_ret);
-
-	incr = XInternAtom(display, "INCR", 0);
-	if(type == incr)
-	{
-		// TODO: prepare for multiple messages
-		return;
-	}
+	now_tm = time(NULL);
+	now = ctime(&now_tm);
 
 #ifdef DEBUG
-	printf("Property size: %lu\n", size);
-#endif
-	XGetWindowProperty(display, clip_win, property, 0, size, 0, AnyPropertyType,
-			&da, &di, &dul, &dul, &prop_ret);
-	free(data);
-	data = malloc(size);
-	strcpy(data, (void*)prop_ret);
-	data_size = size;
-#ifdef DEBUG
-	printf("Received data: %s\n", (char*)data);
-#endif
-	XFree(prop_ret);
-	XDeleteProperty(display, clip_win, property);
-}
-
-void send_reject(XSelectionRequestEvent *sre) {
-	XSelectionEvent reply_se;
-
-#ifdef DEBUG
-	char *target_name;
-	target_name = XGetAtomName(display, sre->target);
-	printf("Denying request for type `%s'\n", target_name);
-	if(target_name)
-		XFree(target_name);
+	char *an = XGetAtomName(display, sre->property);
+	printf("Sending CLIPBOARD to window 0x%1x, property '%s'\n", sre->requestor, an);
+	if(an)
+		XFree(an);
 #endif
 
-	reply_se.type = SelectionNotify;
-	reply_se.requestor = sre->requestor;
-	reply_se.selection = sre->selection;
-	reply_se.target = sre->target;
-	reply_se.property = None;
-	reply_se.time = sre->time;
+	XChangeProperty(display, sre->requestor, sre->property, utf8, 8, PropModeReplace, data, data_size);
 
-	XSendEvent(display, sre->requestor, 1,
-			NoEventMask, (XEvent*)&reply_se);
-}
-
-void send_selection(XSelectionRequestEvent *sre, Atom target)
-{
-	XSelectionEvent reply_se;
-
-#ifdef DEBUG
-	char *target_name = XGetAtomName(display, sre->property);
-	printf("Sending CLIPBOARD to window 0x%1x, property '%s'\n",
-			(unsigned int)sre->requestor, target_name);
-	if(target_name)
-		XFree(target_name);
-#endif
-
-	XChangeProperty(display, sre->requestor, sre->property,
-			target, 8, PropModeReplace, (unsigned char*)data, data_size);
-
-	reply_se.type = SelectionNotify;
-	reply_se.requestor = sre->requestor;
-	reply_se.selection = sre->selection;
-	reply_se.target = sre->target;
-	reply_se.property = sre->property;
-	reply_se.time = sre->time;
-
-	XSendEvent(display, sre->requestor, 1,
-			NoEventMask, (XEvent*)&reply_se);
 }
 
 int main() {
-	Window root, owner;
+	Display *display;
+	Window clip_win, root, owner;
 	int screen;
-	Atom selection, clip_property;
-	// target atoms
-	Atom utf8_target;//, text_target, string_target;
-	data = NULL;
-	data_size = 0;
+	Atom selection, utf8, clip_property;
+	XEvent event;
 
 	// get current X display
 	display = XOpenDisplay(NULL);
@@ -141,13 +68,11 @@ int main() {
 	// create a dummy window for tinyclip
 	clip_win = XCreateSimpleWindow(display, root, -10, -10, 1, 1, 0, 0, 0);
 	XSelectInput(display, clip_win,
-			SelectionClear | SelectionRequest | SelectionNotify | ClientMessage);
+			SelectionClear | SelectionRequest | SelectionNotify);
 
 	// create atoms for selections
 	selection = XInternAtom(display, "CLIPBOARD", 0);
-	utf8_target = XInternAtom(display, "UTF8_STRING", 0);
-	//text_target = XInternAtom(display, "TEXT", 0);
-	//string_target = XInternAtom(display, "STRING", 0);
+	utf8 = XInternAtom(display, "UTF8_STRING", 0);
 	clip_property = XInternAtom(display, "TINYCLIP", 0);
 
 	// check if there is currently someone using the clipboard
@@ -156,9 +81,9 @@ int main() {
 	{
 		// take ownership of clipboard while copying contents
 #ifdef DEBUG
-		printf("Current owner: 0x%1X\n", (unsigned int)owner);
+		printf("Current owner: 0x%1X\n", owner);
 #endif
-		XConvertSelection(display, selection, utf8_target,
+		XConvertSelection(display, selection, utf8,
 				clip_property, clip_win, CurrentTime);
 	}
 	else
@@ -169,29 +94,29 @@ int main() {
 	run = 1;
 	signal(SIGINT, quit);
 
-	Atom wmDeleteMessage = XInternAtom(display, "WM_DELETE_WINDOW", 0);
-	XSetWMProtocols(display, clip_win, &wmDeleteMessage, 1);
-
 	while(run)
 	{
-		XEvent event;
+		XNextEvent(display, &event);
 		XSelectionRequestEvent *sre;
 		XSelectionEvent *se;
-		XNextEvent(display, &event);
 		switch(event.type)
 		{
 			case SelectionClear:
 				// if someone else took the clipboard, regain ownership
-				XConvertSelection(display, selection, utf8_target,
+#ifdef DEBUG
+				printf("Lost selection.\n");
+#endif
+				XConvertSelection(display, selection, utf8,
 						clip_property, clip_win, CurrentTime);
 				break;
 			case SelectionNotify:
-				// we've been sent the new CLIPBOARD, now we take ownership of it
 				se = (XSelectionEvent*)&event.xselection;
 				if(se->property == None)
 					fprintf(stderr, "Conversion impossible.");
 				else
-					get_selection(clip_property);
+				{
+					// TODO: handle new clipboard information
+				}
 				XSetSelectionOwner(display, selection, clip_win, CurrentTime);
 				break;
 			case SelectionRequest:
@@ -199,14 +124,9 @@ int main() {
 				sre = (XSelectionRequestEvent*) &event.xselectionrequest;
 #ifdef DEBUG
 				printf("New selection request:\n"
-						"  requestor: 0x%1x\n", (unsigned int)sre->requestor);
+						"  requestor: 0x%1x\n", sre->requestor);
 #endif
-				if(sre->target != utf8_target || sre->property == None)
-					send_reject(sre);
-				else
-					send_selection(sre, utf8_target);
-				break;
-			case ClientMessage:
+				send_selection(display, sre, utf8);
 				break;
 		}
 	}