[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58600] trunk/blender/source/blender/ editors/interface/interface.c: ui: internal change.
Campbell Barton
ideasman42 at gmail.com
Thu Jul 25 15:18:11 CEST 2013
Revision: 58600
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58600
Author: campbellbarton
Date: 2013-07-25 13:18:11 +0000 (Thu, 25 Jul 2013)
Log Message:
-----------
ui: internal change. replace strcat with BLI string functions for key-event drawing.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-07-25 12:46:20 UTC (rev 58599)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-07-25 13:18:11 UTC (rev 58600)
@@ -2477,29 +2477,30 @@
if (!but->editstr) {
char str[UI_MAX_DRAW_STR];
- ui_get_but_string(but, str, UI_MAX_DRAW_STR - strlen(but->str));
-
+ ui_get_but_string(but, str, UI_MAX_DRAW_STR);
BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%s", but->str, str);
}
break;
case KEYEVT:
- BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR);
+ {
+ const char *str;
if (but->flag & UI_SELECT) {
- strcat(but->drawstr, "Press a key");
+ str = "Press a key";
}
else {
UI_GET_BUT_VALUE_INIT(but, value);
- strcat(but->drawstr, WM_key_event_string((short)value));
+ str = WM_key_event_string((short)value);
}
+ BLI_snprintf(but->drawstr, UI_MAX_DRAW_STR, "%s%s", but->str, str);
break;
-
+ }
case HOTKEYEVT:
if (but->flag & UI_SELECT) {
- but->drawstr[0] = '\0';
if (but->modifier_key) {
char *str = but->drawstr;
+ but->drawstr[0] = '\0';
if (but->modifier_key & KM_SHIFT)
str += BLI_strcpy_rlen(str, "Shift ");
@@ -2512,8 +2513,9 @@
(void)str; /* UNUSED */
}
- else
- strcat(but->drawstr, "Press a key ");
+ else {
+ BLI_strncpy(but->drawstr, "Press a key", UI_MAX_DRAW_STR);
+ }
}
else
BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR);
More information about the Bf-blender-cvs
mailing list