pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move terminal echo logic into st.c
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
21cba9e
..
7d546da
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-167,11
+167,11
@@
static ssize_t xwrite(int, const char *, size_t);
/* Globals */
Term term;
/* Globals */
Term term;
-Selection sel;
int cmdfd;
pid_t pid;
int oldbutton = 3; /* button event on startup: 3 = release */
int cmdfd;
pid_t pid;
int oldbutton = 3; /* button event on startup: 3 = release */
+static Selection sel;
static CSIEscape csiescseq;
static STREscape strescseq;
static int iofd = 1;
static CSIEscape csiescseq;
static STREscape strescseq;
static int iofd = 1;
@@
-402,9
+402,17
@@
selstart(int col, int row, int snap)
}
void
}
void
-selextend(int col, int row, int type)
+selextend(int col, int row, int type
, int done
)
{
int oldey, oldex, oldsby, oldsey, oldtype;
{
int oldey, oldex, oldsby, oldsey, oldtype;
+
+ if (!sel.mode)
+ return;
+ if (done && sel.mode == SEL_EMPTY) {
+ selclear();
+ return;
+ }
+
oldey = sel.oe.y;
oldex = sel.oe.x;
oldsby = sel.nb.y;
oldey = sel.oe.y;
oldex = sel.oe.x;
oldsby = sel.nb.y;
@@
-419,6
+427,8
@@
selextend(int col, int row, int type)
if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+
+ sel.mode = done ? SEL_IDLE : SEL_READY;
}
void
}
void
@@
-774,12
+784,15
@@
ttyread(void)
}
void
}
void
-ttywrite(const char *s, size_t n)
+ttywrite(const char *s, size_t n
, int may_echo
)
{
fd_set wfd, rfd;
ssize_t r;
size_t lim = 256;
{
fd_set wfd, rfd;
ssize_t r;
size_t lim = 256;
+ if (may_echo && IS_SET(MODE_ECHO))
+ twrite(s, n, 1);
+
/*
* Remember that we are using a pty, which might be a modem line.
* Writing too much will clog the line. That's why we are doing this
/*
* Remember that we are using a pty, which might be a modem line.
* Writing too much will clog the line. That's why we are doing this
@@
-830,14
+843,6
@@
write_error:
die("write error on tty: %s\n", strerror(errno));
}
die("write error on tty: %s\n", strerror(errno));
}
-void
-ttysend(char *s, size_t n)
-{
- ttywrite(s, n);
- if (IS_SET(MODE_ECHO))
- twrite(s, n, 1);
-}
-
void
ttyresize(int tw, int th)
{
void
ttyresize(int tw, int th)
{
@@
-1560,7
+1565,7
@@
csihandle(void)
break;
case 'c': /* DA -- Device Attributes */
if (csiescseq.arg[0] == 0)
break;
case 'c': /* DA -- Device Attributes */
if (csiescseq.arg[0] == 0)
- ttywrite(vtiden, strlen(vtiden));
+ ttywrite(vtiden, strlen(vtiden)
, 0
);
break;
case 'C': /* CUF -- Cursor <n> Forward */
case 'a': /* HPR -- Cursor <n> Forward */
break;
case 'C': /* CUF -- Cursor <n> Forward */
case 'a': /* HPR -- Cursor <n> Forward */
@@
-1688,7
+1693,7
@@
csihandle(void)
if (csiescseq.arg[0] == 6) {
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
term.c.y+1, term.c.x+1);
if (csiescseq.arg[0] == 6) {
len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
term.c.y+1, term.c.x+1);
- ttywrite(buf, len);
+ ttywrite(buf, len
, 0
);
}
break;
case 'r': /* DECSTBM -- Set Scrolling Region */
}
break;
case 'r': /* DECSTBM -- Set Scrolling Region */
@@
-1906,7
+1911,7
@@
iso14755(const Arg *arg)
(*e != '\n' && *e != '\0'))
return;
(*e != '\n' && *e != '\0'))
return;
- tty
send(uc, utf8encode(utf32, uc)
);
+ tty
write(uc, utf8encode(utf32, uc), 1
);
}
void
}
void
@@
-2119,7
+2124,7
@@
tcontrolcode(uchar ascii)
case 0x99: /* TODO: SGCI */
break;
case 0x9a: /* DECID -- Identify Terminal */
case 0x99: /* TODO: SGCI */
break;
case 0x9a: /* DECID -- Identify Terminal */
- ttywrite(vtiden, strlen(vtiden));
+ ttywrite(vtiden, strlen(vtiden)
, 0
);
break;
case 0x9b: /* TODO: CSI */
case 0x9c: /* TODO: ST */
break;
case 0x9b: /* TODO: CSI */
case 0x9c: /* TODO: ST */
@@
-2191,7
+2196,7
@@
eschandle(uchar ascii)
}
break;
case 'Z': /* DECID -- Identify Terminal */
}
break;
case 'Z': /* DECID -- Identify Terminal */
- ttywrite(vtiden, strlen(vtiden));
+ ttywrite(vtiden, strlen(vtiden)
, 0
);
break;
case 'c': /* RIS -- Reset to inital state */
treset();
break;
case 'c': /* RIS -- Reset to inital state */
treset();