blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

[curssorreq] fix braindamage in accounting

Browse Source
This commit is contained in:
nick black 2021-11-21 15:52:54 -05:00
parent 3c06ca496f
commit bab4434cb6
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/in.c
View File

@ -552,12 +552,14 @@ cursor_location_cb(inputctx* ictx){
unsigned y = amata_next_numeric(&ictx->amata, "\x1b[", ';') - 1;
unsigned x = amata_next_numeric(&ictx->amata, "", 'R') - 1;
// the first one doesn't go onto the queue; consume it here
pthread_mutex_lock(&ictx->clock);
--ictx->coutstanding;
if(ictx->initdata){
pthread_mutex_unlock(&ictx->clock);
ictx->initdata->cursory = y;
ictx->initdata->cursorx = x;
return 2;
}
pthread_mutex_lock(&ictx->clock);
if(ictx->cvalid == ictx->csize){
pthread_mutex_unlock(&ictx->clock);
logwarn("dropping cursor location report %u/%u\n", y, x);
@ -2207,14 +2209,15 @@ uint32_t ncdirect_get(ncdirect* n, const struct timespec* absdl, ncinput* ni){
int get_cursor_location(inputctx* ictx, const char* u7, unsigned* y, unsigned* x){
pthread_mutex_lock(&ictx->clock);
while(ictx->cvalid == 0 && ictx->coutstanding == 0){
if(tty_emit(u7, ictx->ti->ttyfd)){
return -1;
while(ictx->cvalid == 0){
if(ictx->coutstanding == 0){
if(tty_emit(u7, ictx->ti->ttyfd)){
return -1;
}
++ictx->coutstanding;
}
++ictx->coutstanding;
pthread_cond_wait(&ictx->ccond, &ictx->clock);
}
--ictx->coutstanding;
const cursorloc* cloc = &ictx->csrs[ictx->cread];
if(++ictx->cread == ictx->csize){
ictx->cread = 0;