griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#24148] unable to get keyboard mappings to work in the text window

Browse Source 
this exposes another problem: RNA_property_is_set cant be used on properties set from a keymap, they are always set. for now check for string length.
This commit is contained in:
Campbell Barton
2010-10-05 18:35:02 +00:00
parent 5bab95fc58
commit 458de52151
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_console/console_ops.c
View File

@@ -403,8 +403,14 @@ static int insert_exec(bContext *C, wmOperator *op)
static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
if(!RNA_property_is_set(op->ptr, "text")) {
// if(!RNA_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */
if(!RNA_string_length(op->ptr, "text")) {
char str[2] = {event->ascii, '\0'};
/* if alt/ctrl/super are pressed pass through */
if(event->alt || event->ctrl || event->oskey)
return OPERATOR_PASS_THROUGH;
RNA_string_set(op->ptr, "text", str);
}
return insert_exec(C, op);

19
source/blender/editors/space_text/text_ops.c
View File

@@ -2317,18 +2317,19 @@ static int insert_exec(bContext *C, wmOperator *op)
static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
char str[2];
int ret;
/* XXX old code from winqreadtextspace, is it still needed somewhere? */
/* smartass code to prevent the CTRL/ALT events below from not working! */
/*if(qual & (LR_ALTKEY|LR_CTRLKEY))
if(!ispunct(ascii))
ascii= 0;*/
str[0]= event->ascii;
str[1]= '\0';
// if(!RNA_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */
if(!RNA_string_length(op->ptr, "text")) {
char str[2] = {event->ascii, '\0'};
/* if alt/ctrl/super are pressed pass through */
if(event->alt || event->ctrl || event->oskey)
return OPERATOR_PASS_THROUGH;
RNA_string_set(op->ptr, "text", str);
}
RNA_string_set(op->ptr, "text", str);
ret = insert_exec(C, op);
/* run the script while editing, evil but useful */