ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Relocating and correcting a few comments. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4774 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-15 11:25:29 +00:00
parent 4b5fa615ca
commit f876ee10c5
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2014-04-15 Benno Schulenberg <bensberg@justemail.net> 2014-04-15 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (precalc_multicolorinfo): Actually set the intended * src/nano.c (precalc_multicolorinfo): Actually set the intended
non-blocking mode for keyboard input. non-blocking mode for keyboard input.
* src/winio.c: Relocate and correct a few comments.
2014-04-14 Benno Schulenberg <bensberg@justemail.net> 2014-04-14 Benno Schulenberg <bensberg@justemail.net>
* src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter * src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter

24
src/winio.c
View File

@ -112,7 +112,6 @@ void get_key_buffer(WINDOW *win)
if (key_buffer != NULL) if (key_buffer != NULL)
return; return;
/* Read in the first character using blocking input. */
#ifndef NANO_TINY #ifndef NANO_TINY
allow_pending_sigwinch(TRUE); allow_pending_sigwinch(TRUE);
#endif #endif
@ -121,6 +120,7 @@ void get_key_buffer(WINDOW *win)
* screen updates. */ * screen updates. */
doupdate(); doupdate();
/* Read in the first character using whatever mode we're in. */
errcount = 0; errcount = 0;
if (nodelay_mode) { if (nodelay_mode) {
if ((input = wgetch(win)) == ERR) if ((input = wgetch(win)) == ERR)
@ -174,7 +174,7 @@ void get_key_buffer(WINDOW *win)
#endif #endif
} }
/* Switch back to non-blocking input. */ /* Switch back to waiting mode for input. */
nodelay(win, FALSE); nodelay(win, FALSE);
#ifdef DEBUG #ifdef DEBUG
@ -304,7 +304,7 @@ int *get_input(WINDOW *win, size_t input_len)
* [arrow key], Ctrl-[arrow key], Shift-[arrow key], Enter, Backspace, * [arrow key], Ctrl-[arrow key], Shift-[arrow key], Enter, Backspace,
* the editing keypad (Insert, Delete, Home, End, PageUp, and PageDown), * the editing keypad (Insert, Delete, Home, End, PageUp, and PageDown),
* the function keypad (F1-F16), and the numeric keypad with NumLock * the function keypad (F1-F16), and the numeric keypad with NumLock
* off. Assume nodelay(win) is FALSE. */ * off. */
int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key) int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
{ {
int kbinput; int kbinput;
@ -324,7 +324,7 @@ int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
/* Translate ASCII characters, extended keypad values, and escape /* Translate ASCII characters, extended keypad values, and escape
* sequences into their corresponding key values. Set meta_key to TRUE * sequences into their corresponding key values. Set meta_key to TRUE
* when we get a meta key sequence, and set func_key to TRUE when we get * when we get a meta key sequence, and set func_key to TRUE when we get
* a function key. Assume nodelay(win) is FALSE. */ * a function key. */
int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key) int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
{ {
static int escapes = 0, byte_digits = 0; static int escapes = 0, byte_digits = 0;
@ -1301,15 +1301,13 @@ int get_byte_kbinput(int kbinput)
break; break;
case 3: case 3:
/* Third digit: This must be from zero to five if the first /* Third digit: This must be from zero to five if the first
* was two and the second was between zero and five, and may * was two and the second was five, and may be any decimal
* be any decimal value if the first was zero or one and the * value otherwise. Put it in the 1's position of the byte
* second was between six and nine. Put it in the 1's * sequence holder. */
* position of the byte sequence holder. */
if (('0' <= kbinput && kbinput <= '5') || (byte < 250 && if (('0' <= kbinput && kbinput <= '5') || (byte < 250 &&
'6' <= kbinput && kbinput <= '9')) { '6' <= kbinput && kbinput <= '9')) {
byte += kbinput - '0'; byte += kbinput - '0';
/* If this character is a valid decimal value, then the /* The byte sequence is complete. */
* byte sequence is complete. */
retval = byte; retval = byte;
} else } else
/* This isn't the third digit of a byte sequence. /* This isn't the third digit of a byte sequence.
@ -2831,8 +2829,8 @@ void edit_draw(filestruct *fileptr, const char *converted, int
int update_line(filestruct *fileptr, size_t index) int update_line(filestruct *fileptr, size_t index)
{ {
int line = 0; int line = 0;
int extralinesused = 0;
/* The line in the edit window that we want to update. */ /* The line in the edit window that we want to update. */
int extralinesused = 0;
char *converted; char *converted;
/* fileptr->data converted to have tabs and control characters /* fileptr->data converted to have tabs and control characters
* expanded. */ * expanded. */
@ -2995,7 +2993,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
break; break;
openfile->edittop = openfile->edittop->next; openfile->edittop = openfile->edittop->next;
} }
/* Don't over-scroll on long lines */ /* Don't over-scroll on long lines. */
if (ISSET(SOFTWRAP) && (direction == UP_DIR)) { if (ISSET(SOFTWRAP) && (direction == UP_DIR)) {
ssize_t len = strlenpt(openfile->edittop->data) / COLS; ssize_t len = strlenpt(openfile->edittop->data) / COLS;
i -= len; i -= len;
@ -3179,7 +3177,7 @@ void edit_refresh(void)
filestruct *foo; filestruct *foo;
int nlines; int nlines;
/* Figure out what maxrows should really be */ /* Figure out what maxrows should really be. */
compute_maxrows(); compute_maxrows();
if (openfile->current->lineno < openfile->edittop->lineno || if (openfile->current->lineno < openfile->edittop->lineno ||