summaryrefslogtreecommitdiff
path: root/pico/display.c
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2013-05-31 17:16:44 -0600
committerEduardo Chappa <chappa@washington.edu>2013-05-31 17:16:44 -0600
commita46157ba61f2c65f88b42abb31db60c4a714f87b (patch)
treee37bc41ad2f57b3fd2bad310576cc155a58ca6b7 /pico/display.c
parent81e994d7907f850506ddc248f84761a54995e58c (diff)
downloadalpine-a46157ba61f2c65f88b42abb31db60c4a714f87b.tar.xz
* somehow all.patch got here. Reversing.
Diffstat (limited to 'pico/display.c')
-rw-r--r--pico/display.c54
1 files changed, 6 insertions, 48 deletions
diff --git a/pico/display.c b/pico/display.c
index 6923e156..2741be3e 100644
--- a/pico/display.c
+++ b/pico/display.c
@@ -387,9 +387,6 @@ update(void)
int scroll = 0;
CELL c;
- if (sendnow)
- return;
-
#if TYPEAH
if (typahead())
return;
@@ -919,7 +916,7 @@ updateline(int row, /* row on screen */
int nbflag; /* non-blanks to the right flag? */
int cleartoeol = 0;
- if(row < 0 || row > term.t_nrow || sendnow)
+ if(row < 0 || row > term.t_nrow)
return;
/* set up pointers to virtual and physical lines */
@@ -1288,7 +1285,7 @@ get_cursor(int *row, int *col)
void
mlerase(void)
{
- if (term.t_nrow < term.t_mrow || sendnow)
+ if (term.t_nrow < term.t_mrow)
return;
movecursor(term.t_nrow - term.t_mrow, 0);
@@ -1363,10 +1360,6 @@ mlyesno(UCS *prompt, int dflt)
menu_yesno[6].label = N_("Cancel");
menu_yesno[7].name = "N";
menu_yesno[7].label = (dflt == FALSE) ? "[" N_("No") "]" : N_("No");
- if(Pmaster && Pmaster->onctrlc){
- menu_yesno[8].name = "T";
- menu_yesno[8].label = N_("counT");
- }
wkeyhelp(menu_yesno); /* paint generic menu */
sgarbk = TRUE; /* mark menu dirty */
if(Pmaster && curwp)
@@ -1445,14 +1438,6 @@ mlyesno(UCS *prompt, int dflt)
km_popped++;
break;
}
-
- case 'T':
- case 't':
- if(Pmaster && Pmaster->onctrlc){
- pputs_utf8(_("counT"), 1);
- rv = COUNT;
- break;
- }
/* else fall through */
default:
@@ -1766,11 +1751,6 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
b = &buf[ucs4_strlen(buf)];
continue;
- case (CTRL|'\\'):
- if (c = GetAccent())
- goto text;
- continue;
-
case (CTRL|'F') : /* CTRL-F forward a char*/
case KEY_RIGHT :
if(*b == '\0')
@@ -1780,18 +1760,6 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
continue;
- case (CTRL|'N'): /* Insert pattern */
- if (pat[0] != '\0'){
- ucs4_strncpy(buf+ucs4_strlen(buf), pat, NPAT);
- pputs(pat,1);
- b = &buf[ucs4_strlen(buf)];
- dline.vused += ucs4_strlen(pat);
- changed = TRUE;
- }
- else
- (*term.t_beep)();
- continue;
-
case (CTRL|'G') : /* CTRL-G help */
if(term.t_mrow == 0 && km_popped == 0){
movecursor(term.t_nrow-2, 0);
@@ -1901,7 +1869,7 @@ mlreplyd(UCS *prompt, UCS *buf, int nbuf, int flg, EXTRAKEYS *extras)
#endif
default :
-text:
+
/* look for match in extra_v */
for(i = 0; i < 12; i++)
if(c && c == extra_v[i]){
@@ -1995,7 +1963,7 @@ emlwrite_ucs4(UCS *message, EML *eml)
mlerase();
- if(!(message && *message) || term.t_nrow < 2 || sendnow)
+ if(!(message && *message) || term.t_nrow < 2)
return; /* nothing to write or no space to write, bag it */
bufp = message;
@@ -2184,9 +2152,8 @@ mlwrite(UCS *fmt, void *arg)
}
ret = ttcol;
- if(sendnow == 0)
- while(ttcol < term.t_ncol)
- pputc(' ', 0);
+ while(ttcol < term.t_ncol)
+ pputc(' ', 0);
movecursor(term.t_nrow - term.t_mrow, ret);
@@ -2665,8 +2632,6 @@ pputc(UCS c, /* char to write */
{
int ind, width, printable_ascii = 0;
- if(sendnow)
- return;
/*
* This is necessary but not sufficient to allow us to draw. Note that
* ttrow runs from 0 to t_nrow (so total number of rows is t_nrow+1)
@@ -2721,8 +2686,6 @@ void
pputs(UCS *s, /* string to write */
int a) /* and its attribute */
{
- if(sendnow)
- return;
while (*s != '\0')
pputc(*s++, a);
}
@@ -2733,8 +2696,6 @@ pputs_utf8(char *s, int a)
{
UCS *ucsstr = NULL;
- if(sendnow)
- return;
if(s && *s){
ucsstr = utf8_to_ucs4_cpystr(s);
if(ucsstr){
@@ -3035,9 +2996,6 @@ wkeyhelp(KEYMENU *keymenu)
char nbuf[NLINE];
#endif
- if(sendnow)
- return;
-
#ifdef _WINDOWS
pico_config_menu_items (keymenu);
#endif