zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-05-06 12:31:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support for capitalizing words (M-c) from Festival speech-tools by Alan W Black <awb()cstr!ed!ac!uk>

Browse Source
This commit is contained in:
Joachim Nilsson 2010-07-26 01:44:18 +02:00
parent 167059d159
commit 02acd55b2e
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/editline.c
View File

@ -47,7 +47,7 @@
** The type of case-changing to perform. ** The type of case-changing to perform.
*/ */
typedef enum { typedef enum {
TOupper, TOlower TOupper, TOlower, TOcapitalize
} el_case_t; } el_case_t;
/* /*
@ -350,6 +350,7 @@ static el_status_t do_macro(int c)
return CSstay; return CSstay;
} }
/* Skip forward to start of next word. If @move is set we also move the cursor. */
static el_status_t do_forward(el_status_t move) static el_status_t do_forward(el_status_t move)
{ {
int i; int i;
@ -358,11 +359,14 @@ static el_status_t do_forward(el_status_t move)
i = 0; i = 0;
do { do {
p = &rl_line_buffer[rl_point]; p = &rl_line_buffer[rl_point];
for ( ; rl_point < rl_end && (*p == ' ' || !isalnum(*p)); rl_point++, p++)
/* Skip to end of word, if inside a word. */
for (; rl_point < rl_end && isalnum(p[0]); rl_point++, p++)
if (move == CSmove) if (move == CSmove)
right(CSstay); right(CSstay);
for (; rl_point < rl_end && isalnum(*p); rl_point++, p++) /* Skip to next word, or skip leading white space if outside a word. */
for ( ; rl_point < rl_end && (p[0] == ' ' || !isalnum(p[0])); rl_point++, p++)
if (move == CSmove) if (move == CSmove)
right(CSstay); right(CSstay);
@ -384,20 +388,22 @@ static el_status_t do_case(el_case_t type)
if (old_point != rl_point) { if (old_point != rl_point) {
if ((count = rl_point - old_point) < 0) if ((count = rl_point - old_point) < 0)
count = -count; count = -count;
rl_point = old_point; rl_point = old_point;
if ((end = rl_point + count) > rl_end) if ((end = rl_point + count) > rl_end)
end = rl_end; end = rl_end;
for (i = rl_point, p = &rl_line_buffer[i]; i < end; i++, p++) {
if (type == TOupper) { for (i = rl_point, p = &rl_line_buffer[i]; rl_point < end; p++) {
if ((type == TOupper) || (type == TOcapitalize && rl_point == i)) {
if (islower(*p)) if (islower(*p))
*p = toupper(*p); *p = toupper(*p);
} } else if (isupper(*p)) {
else if (isupper(*p)) {
*p = tolower(*p); *p = tolower(*p);
} }
right(CSmove); right(CSmove);
} }
} }
return CSstay; return CSstay;
} }
@ -411,6 +417,11 @@ static el_status_t case_up_word(void)
return do_case(TOupper); return do_case(TOupper);
} }
static el_status_t case_cap_word(void)
{
return do_case(TOcapitalize);
}
static void ceol(void) static void ceol(void)
{ {
int extras; int extras;
@ -518,7 +529,7 @@ static el_status_t do_hist(const char *(*move)(void))
i = 0; i = 0;
do { do {
if ((p = (*move)()) == NULL) if ((p = move()) == NULL)
return ring_bell(); return ring_bell();
} while (++i < Repeat); } while (++i < Repeat);
return do_insert_hist(p); return do_insert_hist(p);
@ -590,7 +601,7 @@ static const char *search_hist(const char *search, const char *(*move)(void))
} }
len = strlen(pat); len = strlen(pat);
for (pos = H.Pos; (*move)() != NULL; ) for (pos = H.Pos; move() != NULL; )
if (match(H.Lines[H.Pos], pat, len) == 0) if (match(H.Lines[H.Pos], pat, len) == 0)
return H.Lines[H.Pos]; return H.Lines[H.Pos];
H.Pos = pos; H.Pos = pos;
@ -851,7 +862,7 @@ static el_status_t meta(void)
return do_macro(c); return do_macro(c);
for (kp = MetaMap; kp->Function; kp++) for (kp = MetaMap; kp->Function; kp++)
if (kp->Key == c) if (kp->Key == c)
return (*kp->Function)(); return kp->Function();
return ring_bell(); return ring_bell();
} }
@ -876,7 +887,7 @@ static el_status_t emacs(int c)
if (kp->Key == c) if (kp->Key == c)
break; break;
} }
s = kp->Function ? (*kp->Function)() : insert_char(c); s = kp->Function ? kp->Function() : insert_char(c);
if (!el_pushed) { if (!el_pushed) {
/* No pushback means no repeat count; hacky, but true. */ /* No pushback means no repeat count; hacky, but true. */
Repeat = NO_ARG; Repeat = NO_ARG;
@ -1486,6 +1497,7 @@ static el_keymap_t MetaMap[64]= {
{ '>', h_last }, { '>', h_last },
{ '?', c_possible }, { '?', c_possible },
{ 'b', bk_word }, { 'b', bk_word },
{ 'c', case_cap_word },
{ 'd', fd_kill_word }, { 'd', fd_kill_word },
{ 'f', fd_word }, { 'f', fd_word },
{ 'l', case_down_word }, { 'l', case_down_word },