[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55784] trunk/blender/source/blender: code cleanup: use bools in interface handlers, dont show translation menu when right clicking on splash, use less confusing args for copy/paste function.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 4 17:16:29 CEST 2013
Revision: 55784
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55784
Author: campbellbarton
Date: 2013-04-04 15:16:29 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
code cleanup: use bools in interface handlers, dont show translation menu when right clicking on splash, use less confusing args for copy/paste function.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/WM_keymap.h
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-04-04 15:10:52 UTC (rev 55783)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-04-04 15:16:29 UTC (rev 55784)
@@ -819,7 +819,7 @@
/* XXX, this code will shorten any allocated string to 'UI_MAX_NAME_STR'
* since this is really long its unlikely to be an issue,
* but this could be supported */
-void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const short do_strip)
+void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const bool do_strip)
{
if (do_strip) {
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-04-04 15:10:52 UTC (rev 55783)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-04-04 15:16:29 UTC (rev 55784)
@@ -124,14 +124,14 @@
wmWindow *window;
ARegion *region;
- int interactive;
+ bool interactive;
/* overall state */
uiHandleButtonState state;
int retval;
/* booleans (could be made into flags) */
- char cancel, escapecancel;
- char applied, appliedinteractive;
+ bool cancel, escapecancel;
+ bool applied, applied_interactive;
wmTimer *flashtimer;
/* edited value */
@@ -146,7 +146,7 @@
wmTimer *tooltiptimer;
/* auto open */
- int used_mouse;
+ bool used_mouse;
wmTimer *autoopentimer;
/* text selection/editing */
@@ -156,7 +156,8 @@
/* coords are Window/uiBlock relative (depends on the button) */
int draglastx, draglasty;
int dragstartx, dragstarty;
- int dragchange, draglock, dragsel;
+ bool dragchange, draglock;
+ int dragsel;
float dragf, dragfstart;
CBData *dragcbd;
@@ -257,7 +258,7 @@
}
}
-static int ui_but_editable(uiBut *but)
+static bool ui_but_editable(uiBut *but)
{
return ELEM5(but->type, LABEL, SEPR, ROUNDBOX, LISTBOX, PROGRESSBAR);
}
@@ -517,7 +518,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_BUTM(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -526,7 +527,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -537,7 +538,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_TOG(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -600,7 +601,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_ROW(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data)
@@ -617,7 +618,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_TEX(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -636,7 +637,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_NUM(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -646,7 +647,7 @@
data->value = ui_get_but_val(but);
}
else {
- data->cancel = TRUE;
+ data->cancel = true;
return;
}
}
@@ -657,7 +658,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_TOG3(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -692,7 +693,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_VEC(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -702,21 +703,21 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_COLORBAND(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_CURVE(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_IDPOIN(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -725,7 +726,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
#ifdef WITH_INTERNATIONAL
@@ -733,7 +734,7 @@
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
#endif
@@ -884,7 +885,7 @@
#endif /* USE_DRAG_TOGGLE */
-static int ui_but_mouse_inside_icon(uiBut *but, ARegion *ar, const wmEvent *event)
+static bool ui_but_mouse_inside_icon(uiBut *but, ARegion *ar, const wmEvent *event)
{
rcti rect;
int x = event->x, y = event->y;
@@ -908,7 +909,7 @@
return BLI_rcti_isect_pt(&rect, x, y);
}
-static int ui_but_start_drag(bContext *C, uiBut *but, uiHandleButtonData *data, const wmEvent *event)
+static bool ui_but_start_drag(bContext *C, uiBut *but, uiHandleButtonData *data, const wmEvent *event)
{
/* prevent other WM gestures to start while we try to drag */
WM_gestures_remove(C);
@@ -916,7 +917,7 @@
if (ABS(data->dragstartx - event->x) + ABS(data->dragstarty - event->y) > U.dragthreshold) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
- data->cancel = TRUE;
+ data->cancel = true;
#ifdef USE_DRAG_TOGGLE
if (ui_is_but_bool(but)) {
uiDragToggleHandle *drag_info = MEM_callocN(sizeof(*drag_info), __func__);
@@ -941,10 +942,10 @@
if (but->imb)
WM_event_drag_image(drag, but->imb, but->imb_scale, BLI_rctf_size_x(&but->rect), BLI_rctf_size_y(&but->rect));
}
- return 1;
+ return true;
}
- return 0;
+ return false;
}
/* ********************** linklines *********************** */
@@ -1159,39 +1160,39 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
}
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_IMAGE(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_HISTOGRAM(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_WAVEFORM(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
static void ui_apply_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = TRUE;
+ data->applied = true;
}
-static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, int interactive)
+static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, const bool interactive)
{
char *editstr;
double *editval;
@@ -1219,9 +1220,9 @@
/* we avoid applying interactive edits a second time
* at the end with the appliedinteractive flag */
if (interactive) {
- data->appliedinteractive = TRUE;
+ data->applied_interactive = true;
}
- else if (data->appliedinteractive) {
+ else if (data->applied_interactive) {
return;
}
}
@@ -1465,7 +1466,7 @@
button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
BLI_strncpy(buf, active_data->str, UI_MAX_DRAW_STR);
WM_clipboard_text_set(active_data->str, 0);
- active_data->cancel = TRUE;
+ active_data->cancel = true;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else {
@@ -1476,7 +1477,7 @@
if (ELEM(but->type, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
/* else uiSearchboxData.active member is not updated [#26856] */
- ui_searchbox_update(C, data->searchbox, but, 1);
+ ui_searchbox_update(C, data->searchbox, but, true);
}
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -1585,14 +1586,14 @@
/* ************* in-button text selection/editing ************* */
-static int ui_textedit_delete_selection(uiBut *but, uiHandleButtonData *data)
+static bool ui_textedit_delete_selection(uiBut *but, uiHandleButtonData *data)
{
char *str = data->str;
- int len = strlen(str);
- int change = 0;
+ const int len = strlen(str);
+ bool change = false;
if (but->selsta != but->selend && len) {
memmove(str + but->selsta, str + but->selend, (len - but->selend) + 1);
- change = 1;
+ change = true;
}
but->pos = but->selend = but->selsta;
@@ -1713,11 +1714,12 @@
/* this is used for both utf8 and ascii, its meant to be used for single keys,
* notice the buffer is either copied or not, so its not suitable for pasting in
* - campbell */
-static int ui_textedit_type_buf(uiBut *but, uiHandleButtonData *data,
- const char *utf8_buf, int utf8_buf_len)
+static bool ui_textedit_type_buf(uiBut *but, uiHandleButtonData *data,
+ const char *utf8_buf, int utf8_buf_len)
{
char *str;
- int len, changed = 0;
+ int len;
+ bool changed = false;
str = data->str;
len = strlen(str);
@@ -1735,14 +1737,14 @@
memmove(&str[but->pos + step], &str[but->pos], (len + 1) - but->pos);
memcpy(&str[but->pos], utf8_buf, step * sizeof(char));
but->pos += step;
- changed = 1;
+ changed = true;
}
}
return changed;
}
-static int ui_textedit_type_ascii(uiBut *but, uiHandleButtonData *data, char ascii)
+static bool ui_textedit_type_ascii(uiBut *but, uiHandleButtonData *data, char ascii)
{
char buf[2] = {ascii, '\0'};
@@ -1750,7 +1752,7 @@
printf("%s: entering invalid ascii char into an ascii key (%d)\n",
__func__, (int)(unsigned char)ascii);
- return 0;
+ return false;
}
/* in some cases we want to allow invalid utf8 chars */
@@ -1834,15 +1836,15 @@
}
}
-static int ui_textedit_delete(uiBut *but, uiHandleButtonData *data, int direction, strCursorJumpType jump)
+static bool ui_textedit_delete(uiBut *but, uiHandleButtonData *data, int direction, strCursorJumpType jump)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list