diff options
| author | Rob Haarsma <phaseIV@zonnet.nl> | 2003-01-29 16:49:25 +0300 |
|---|---|---|
| committer | Rob Haarsma <phaseIV@zonnet.nl> | 2003-01-29 16:49:25 +0300 |
| commit | a8f71970543c6903795b3554676dd8954c838717 (patch) | |
| tree | d9d441a68a6e1cfd5d8ad5e604ed794027831561 | |
| parent | 744913e65487057f102a77c28e0eadb9a58ba50a (diff) | |
added win32 style ctrl keystrokes for cut/copy/paste/undo/redo
| -rw-r--r-- | source/blender/src/drawtext.c | 18 | ||||
| -rw-r--r-- | source/blender/src/toets.c | 12 |
2 files changed, 21 insertions, 9 deletions
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index f560addf455..b738e251a46 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -975,7 +975,7 @@ void winqreadtextspace(unsigned short event, short val, char ascii) break; case CKEY: - if (G.qual & LR_ALTKEY) { + if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) { txt_copy_sel(text); do_draw= 1; } @@ -1069,7 +1069,7 @@ void winqreadtextspace(unsigned short event, short val, char ascii) break; case VKEY: - if (G.qual & LR_ALTKEY) { + if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) { txt_paste(text); do_draw= 1; pop_space_text(st); @@ -1077,13 +1077,25 @@ void winqreadtextspace(unsigned short event, short val, char ascii) break; case XKEY: - if (G.qual & LR_ALTKEY) { + if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) { txt_cut_sel(text); do_draw= 1; pop_space_text(st); } break; + case ZKEY: + if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) { + if (G.qual & LR_SHIFTKEY) { + txt_do_redo(text); + do_draw= 1; + } else { + txt_do_undo(text); + do_draw= 1; + } + } + break; + case TABKEY: txt_add_char(text, '\t'); pop_space_text(st); diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index 7a814b24cf9..7a683ed9bfc 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -829,7 +829,6 @@ int blenderqread(unsigned short event, short val) break; case UKEY: - if(textediting==0) { if(G.qual & LR_CTRLKEY) { if(okee("SAVE USER DEFAULTS")) { @@ -862,13 +861,14 @@ int blenderqread(unsigned short event, short val) break; case XKEY: - if(G.qual & LR_CTRLKEY) { - if(okee("ERASE ALL")) { - if( BIF_read_homefile()==0) error("No file ~/.B.blend"); + if(textspace==0) { + if(G.qual & LR_CTRLKEY) { + if(okee("ERASE ALL")) { + if( BIF_read_homefile()==0) error("No file ~/.B.blend"); + } + return 0; } - return 0; } - break; } |