X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=st.c;h=a6fb7668355c2146d996c3352d2c810d93a0fc75;hb=73e37f562964c2d1cb6029693d1d79a69a22ff14;hp=ed750e6d6ad7ad8fbb373af9a8ef0f133efcad2c;hpb=674434ef6f75247fb25d8e5b39786bca9a0cabec;p=st.git

diff --git a/st.c b/st.c
index ed750e6..a6fb766 100644
--- a/st.c
+++ b/st.c
@@ -392,8 +392,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 	if(b) 
 		*b = e->xbutton.button;
 
-	*x = e->xbutton.x/xw.cw;
-	*y = e->xbutton.y/xw.ch;
+	*x = (e->xbutton.x - BORDER)/xw.cw;
+	*y = (e->xbutton.y - BORDER)/xw.ch;
 	sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
 	sel.b.y = MIN(sel.by, sel.ey);
 	sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
@@ -403,8 +403,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 void
 bpress(XEvent *e) {
 	sel.mode = 1;
-	sel.ex = sel.bx = e->xbutton.x/xw.cw;
-	sel.ey = sel.by = e->xbutton.y/xw.ch;
+	sel.ex = sel.bx = (e->xbutton.x - BORDER)/xw.cw;
+	sel.ey = sel.by = (e->xbutton.y - BORDER)/xw.ch;
 }
 
 void
@@ -483,7 +483,7 @@ selrequest(XEvent *e) {
 				XA_ATOM, 32, PropModeReplace,
 				(unsigned char *) &string, 1);
 		xev.property = xsre->property;
-	} else if(xsre->target == XA_STRING) {
+	} else if(xsre->target == sel.xtarget) {
 		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
 				xsre->target, 8, PropModeReplace,
 				(unsigned char *) sel.clip, strlen(sel.clip));