aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Ctrl-Y fixed when there was no text to undelete. Added CTRL() macro for

Browse Source 
defining control keys easier.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@458 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-11 00:25:50 +00:00 committed by cras
parent f05068ba7c
commit 1475e38417
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fe-text/gui-readline.c
View File

@ -35,6 +35,8 @@
#include <signal.h> #include <signal.h>
#define CTRL(x) ((x) & 0x1f) /* Ctrl+x */
typedef void (*ENTRY_REDIRECT_KEY_FUNC) (int key, void *data, SERVER_REC *server, WI_ITEM_REC *item); typedef void (*ENTRY_REDIRECT_KEY_FUNC) (int key, void *data, SERVER_REC *server, WI_ITEM_REC *item);
typedef void (*ENTRY_REDIRECT_ENTRY_FUNC) (const char *line, void *data, SERVER_REC *server, WI_ITEM_REC *item); typedef void (*ENTRY_REDIRECT_ENTRY_FUNC) (const char *line, void *data, SERVER_REC *server, WI_ITEM_REC *item);
@ -130,7 +132,7 @@ void handle_key(int key)
int c; int c;
/* Quit if we get 5 CTRL-C's in a row. */ /* Quit if we get 5 CTRL-C's in a row. */
if (key != 3) if (key != CTRL('c'))
sigint_count = 0; sigint_count = 0;
else if (++sigint_count >= 5) else if (++sigint_count >= 5)
raise(SIGTERM); raise(SIGTERM);
@ -194,16 +196,17 @@ void handle_key(int key)
gui_entry_move_pos(-1); gui_entry_move_pos(-1);
break; break;
case 21: case CTRL('u'):
/* Ctrl-U, clear line */ /* Ctrl-U, clear line */
g_free_not_null(savebuffer); g_free_not_null(savebuffer);
savebuffer = g_strdup(gui_entry_get_text()); savebuffer = g_strdup(gui_entry_get_text());
gui_entry_set_text(""); gui_entry_set_text("");
break; break;
case 25: case CTRL('y'):
/* Ctrl-Y, write last ^U'd line */ /* Ctrl-Y, write last ^U'd line */
gui_entry_insert_text(savebuffer); if (savebuffer != NULL)
gui_entry_insert_text(savebuffer);
break; break;
case 9: case 9:
key_pressed("Tab", NULL); key_pressed("Tab", NULL);
@ -215,12 +218,12 @@ void handle_key(int key)
gui_entry_erase(1); gui_entry_erase(1);
break; break;
case 23: case CTRL('w'):
/* C-w - erase word to the left of marker */ /* C-w - erase word to the left of marker */
gui_entry_erase_word(); gui_entry_erase_word();
break; break;
case 4: case CTRL('d'):
case KEY_DC: case KEY_DC:
if (gui_entry_get_pos() < strlen(gui_entry_get_text())) { if (gui_entry_get_pos() < strlen(gui_entry_get_text())) {
gui_entry_move_pos(1); gui_entry_move_pos(1);
@ -228,7 +231,7 @@ void handle_key(int key)
} }
break; break;
case 11: case CTRL('k'):
/* C-K - erase the rest of the line */ /* C-K - erase the rest of the line */
c = gui_entry_get_pos(); c = gui_entry_get_pos();
gui_entry_set_pos(strlen(gui_entry_get_text())); gui_entry_set_pos(strlen(gui_entry_get_text()));
@ -238,11 +241,11 @@ void handle_key(int key)
case 0: case 0:
/* Ctrl-space - ignore */ /* Ctrl-space - ignore */
break; break;
case 1: case CTRL('a'):
/* C-A, home */ /* C-A, home */
gui_entry_set_pos(0); gui_entry_set_pos(0);
break; break;
case 5: case CTRL('e'):
/* C-E, end */ /* C-E, end */
gui_entry_set_pos(strlen(gui_entry_get_text())); gui_entry_set_pos(strlen(gui_entry_get_text()));
break; break;