pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement most ICCCM rules for selection handling.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
7dbd87a
..
6bfa834
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-419,12
+419,11
@@
static int xsetcolorname(int, const char *);
static int xgeommasktogravity(int);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static int xgeommasktogravity(int);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
-static int xloadfontset(Font *);
static void xsettitle(char *);
static void xresettitle(void);
static void xsetpointermotion(int);
static void xseturgency(int);
static void xsettitle(char *);
static void xresettitle(void);
static void xsetpointermotion(int);
static void xseturgency(int);
-static void xsetsel(char *);
+static void xsetsel(char *
, Time
);
static void xtermclear(int, int, int, int);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xtermclear(int, int, int, int);
static void xunloadfont(Font *);
static void xunloadfonts(void);
@@
-450,7
+449,7
@@
static void selinit(void);
static void selnormalize(void);
static inline bool selected(int, int);
static char *getsel(void);
static void selnormalize(void);
static inline bool selected(int, int);
static char *getsel(void);
-static void selcopy(
void
);
+static void selcopy(
Time
);
static void selscroll(int, int);
static void selsnap(int, int *, int *, int);
static int x2col(int);
static void selscroll(int, int);
static void selsnap(int, int *, int *, int);
static int x2col(int);
@@
-985,8
+984,8
@@
getsel(void) {
}
void
}
void
-selcopy(
void
) {
- xsetsel(getsel());
+selcopy(
Time t
) {
+ xsetsel(getsel()
, t
);
}
void
}
void
@@
-998,7
+997,7
@@
selnotify(XEvent *e) {
XSelectionEvent *xsev;
ofs = 0;
XSelectionEvent *xsev;
ofs = 0;
- xsev =
(XSelectionEvent *)e
;
+ xsev =
&e->xselection
;
if (xsev->property == None)
return;
do {
if (xsev->property == None)
return;
do {
@@
-1084,6
+1083,9
@@
selrequest(XEvent *e) {
xev.selection = xsre->selection;
xev.target = xsre->target;
xev.time = xsre->time;
xev.selection = xsre->selection;
xev.target = xsre->target;
xev.time = xsre->time;
+ if (xsre->property == None)
+ xsre->property = xsre->target;
+
/* reject */
xev.property = None;
/* reject */
xev.property = None;
@@
-1126,11
+1128,13
@@
selrequest(XEvent *e) {
}
void
}
void
-xsetsel(char *str) {
+xsetsel(char *str
, Time t
) {
free(sel.primary);
sel.primary = str;
free(sel.primary);
sel.primary = str;
- XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
+ XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
+ if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+ selclear(0);
}
void
}
void
@@
-1147,7
+1151,7
@@
brelease(XEvent *e) {
selclear(NULL);
} else {
getbuttoninfo(e);
selclear(NULL);
} else {
getbuttoninfo(e);
- selcopy();
+ selcopy(
e->xbutton.time
);
}
sel.mode = 0;
tsetdirt(sel.nb.y, sel.ne.y);
}
sel.mode = 0;
tsetdirt(sel.nb.y, sel.ne.y);
@@
-2393,7
+2397,7
@@
tputtab(int n) {
for(--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
for(--x; x > 0 && !term.tabs[x]; --x)
/* nothing */ ;
}
- t
moveto(x, term.c.y
);
+ t
erm.c.x = LIMIT(x, 0, term.col-1
);
}
void
}
void
@@
-3116,15
+3120,6
@@
xloadfonts(char *fontstr, double fontsize) {
FcPatternDestroy(pattern);
}
FcPatternDestroy(pattern);
}
-int
-xloadfontset(Font *f) {
- FcResult result;
-
- if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
- return 1;
- return 0;
-}
-
void
xunloadfont(Font *f) {
XftFontClose(xw.dpy, f->match);
void
xunloadfont(Font *f) {
XftFontClose(xw.dpy, f->match);
@@
-3472,7
+3467,8
@@
xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
/* Nothing was found. */
if(i >= frclen) {
if(!font->set)
/* Nothing was found. */
if(i >= frclen) {
if(!font->set)
- xloadfontset(font);
+ font->set = FcFontSort(0, font->pattern,
+ FcTrue, 0, &fcres);
fcsets[0] = font->set;
/*
fcsets[0] = font->set;
/*
@@
-3600,15
+3596,15
@@
xdrawcursor(void) {
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &dc.col[defaultcs],
borderpx + curx * xw.cw,
case 4: /* Steady Underline */
XftDrawRect(xw.draw, &dc.col[defaultcs],
borderpx + curx * xw.cw,
- borderpx + (term.c.y + 1) * xw.ch -
1
,
- xw.cw,
1
);
+ borderpx + (term.c.y + 1) * xw.ch -
cursorthickness
,
+ xw.cw,
cursorthickness
);
break;
case 5: /* Blinking bar */
case 6: /* Steady bar */
XftDrawRect(xw.draw, &dc.col[defaultcs],
break;
case 5: /* Blinking bar */
case 6: /* Steady bar */
XftDrawRect(xw.draw, &dc.col[defaultcs],
-
borderpx + curx * xw.cw,
-
borderpx + term.c.y * xw.ch,
-
1
, xw.ch);
+ borderpx + curx * xw.cw,
+ borderpx + term.c.y * xw.ch,
+
cursorthickness
, xw.ch);
break;
}
} else {
break;
}
} else {
@@
-4081,7
+4077,7
@@
main(int argc, char *argv[]) {
run:
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
run:
setlocale(LC_CTYPE, "");
XSetLocaleModifiers("");
- tnew(
cols? cols : 1, rows? rows : 1
);
+ tnew(
MAX(cols, 1), MAX(rows, 1)
);
xinit();
selinit();
run();
xinit();
selinit();
run();