[Bf-blender-cvs] [26ba9c118b8] soc-2020-info-editor: Experimental: remove debug arguments from function, remove debug guardsfrom logs
Mateusz Grzeliński
noreply at git.blender.org
Thu Jul 9 16:39:31 CEST 2020
Commit: 26ba9c118b8ffcd632866fc5d5407ded79e85726
Author: Mateusz Grzeliński
Date: Wed Jul 8 16:37:50 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB26ba9c118b8ffcd632866fc5d5407ded79e85726
Experimental: remove debug arguments from function, remove debug guardsfrom logs
This is to see if loggers should be influenced by code.
Also rename function to *_sprintf
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_event_query.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operator_type.c
M source/blender/windowmanager/intern/wm_platform_support.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index bbbb6d5929c..7fd21f4a4fc 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -814,7 +814,7 @@ bool WM_window_modal_keymap_status_draw(struct bContext *C,
struct uiLayout *layout);
/* wm_event_query.c */
-void WM_event_log(const struct wmEvent *event);
+char *WM_event_sprinfN(const struct wmEvent *event);
int WM_event_modifier_flag(const struct wmEvent *event);
diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c
index ea7cd103644..9f88d17d534 100644
--- a/source/blender/windowmanager/intern/wm_event_query.c
+++ b/source/blender/windowmanager/intern/wm_event_query.c
@@ -23,6 +23,7 @@
* Read-only queries utility functions for the event system.
*/
+#include <BLI_dynstr.h>
#include <CLG_log.h>
#include <stdlib.h>
#include <string.h>
@@ -58,8 +59,10 @@
/* for debugging only, getting inspecting events manually is tedious
* will be printed with wm.event on log level 2
*/
-void WM_event_log(const wmEvent *event)
+char *WM_event_sprinfN(const wmEvent *event)
{
+ DynStr *message = BLI_dynstr_new();
+
if (event) {
const char *unknown = "UNKNOWN";
const char *type_id = unknown;
@@ -73,66 +76,62 @@ void WM_event_log(const wmEvent *event)
RNA_enum_identifier(rna_enum_event_type_items, event->prevtype, &prev_type_id);
RNA_enum_identifier(rna_enum_event_value_items, event->prevval, &prev_val_id);
- CLOG_VERBOSE(WM_LOG_EVENTS,
- 2,
- "wmEvent type:%d / %s, val:%d / %s,\n"
- " prev_type:%d / %s, prev_val:%d / %s,\n"
- " shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d, is_repeat:%d,\n"
- " mouse:(%d,%d), ascii:'%c', utf8:'%.*s', pointer:%p",
- event->type,
- type_id,
- event->val,
- val_id,
- event->prevtype,
- prev_type_id,
- event->prevval,
- prev_val_id,
- event->shift,
- event->ctrl,
- event->alt,
- event->oskey,
- event->keymodifier,
- event->is_repeat,
- event->x,
- event->y,
- event->ascii,
- BLI_str_utf8_size(event->utf8_buf),
- event->utf8_buf,
- (const void *)event);
+ BLI_dynstr_appendf(
+ message,
+ "wmEvent type:%d / %s, val:%d / %s,\n"
+ " prev_type:%d / %s, prev_val:%d / %s,\n"
+ " shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d, is_repeat:%d,\n"
+ " mouse:(%d,%d), ascii:'%c', utf8:'%.*s', pointer:%p",
+ event->type,
+ type_id,
+ event->val,
+ val_id,
+ event->prevtype,
+ prev_type_id,
+ event->prevval,
+ prev_val_id,
+ event->shift,
+ event->ctrl,
+ event->alt,
+ event->oskey,
+ event->keymodifier,
+ event->is_repeat,
+ event->x,
+ event->y,
+ event->ascii,
+ BLI_str_utf8_size(event->utf8_buf),
+ event->utf8_buf,
+ (const void *)event);
#ifdef WITH_INPUT_NDOF
if (ISNDOF(event->type)) {
const wmNDOFMotionData *ndof = event->customdata;
- if (event->type == NDOF_MOTION) {
- CLOG_VERBOSE(
- WM_LOG_EVENTS,
- 2,
- " ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %u",
- UNPACK3(ndof->rvec),
- UNPACK3(ndof->tvec),
- ndof->dt,
- ndof->progress);
- }
- else {
- /* ndof buttons printed already */
- }
+ BLI_dynstr_appendf(
+ message,
+ " ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %u",
+ UNPACK3(ndof->rvec),
+ UNPACK3(ndof->tvec),
+ ndof->dt,
+ ndof->progress);
}
#endif /* WITH_INPUT_NDOF */
if (event->tablet.active != EVT_TABLET_NONE) {
const wmTabletData *wmtab = &event->tablet;
- CLOG_VERBOSE(WM_LOG_EVENTS,
- 2,
- " tablet: active: %d, pressure %.4f, tilt: (%.4f %.4f)",
- wmtab->active,
- wmtab->pressure,
- wmtab->x_tilt,
- wmtab->y_tilt);
+ BLI_dynstr_appendf(message,
+ " tablet: active: %d, pressure %.4f, tilt: (%.4f %.4f)",
+ wmtab->active,
+ wmtab->pressure,
+ wmtab->x_tilt,
+ wmtab->y_tilt);
}
}
else {
- CLOG_VERBOSE(WM_LOG_EVENTS, 2, "wmEvent - NULL");
+ BLI_dynstr_append(message, "wmEvent - NULL");
}
+ char *cstring = BLI_dynstr_get_cstring(message);
+ BLI_dynstr_free(message);
+ return cstring;
}
/** \} */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 10f905435cb..551bfb29667 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -429,17 +429,13 @@ void wm_event_do_notifiers(bContext *C)
UI_popup_handlers_remove_all(C, &win->modalhandlers);
WM_window_set_active_workspace(C, win, ref_ws);
- if (G.debug & G_DEBUG_EVENTS) {
- CLOG_INFO(WM_LOG_EVENTS, "Workspace set %p", note->reference);
- }
+ CLOG_INFO(WM_LOG_EVENTS, "Workspace set %p", note->reference);
}
else if (note->data == ND_WORKSPACE_DELETE) {
WorkSpace *workspace = note->reference;
ED_workspace_delete(workspace, CTX_data_main(C), C, wm); // XXX hrms, think this over!
- if (G.debug & G_DEBUG_EVENTS) {
- CLOG_INFO(WM_LOG_EVENTS, "Workspace delete %p", workspace);
- }
+ CLOG_INFO(WM_LOG_EVENTS, "Workspace delete %p", workspace);
}
else if (note->data == ND_LAYOUTBROWSE) {
bScreen *ref_screen = BKE_workspace_layout_screen_get(note->reference);
@@ -448,18 +444,14 @@ void wm_event_do_notifiers(bContext *C)
UI_popup_handlers_remove_all(C, &win->modalhandlers);
ED_screen_change(C, ref_screen); /* XXX hrms, think this over! */
- if (G.debug & G_DEBUG_EVENTS) {
- CLOG_INFO(WM_LOG_EVENTS, "screen set %p", note->reference);
- }
+ CLOG_INFO(WM_LOG_EVENTS, "screen set %p", note->reference);
}
else if (note->data == ND_LAYOUTDELETE) {
WorkSpace *workspace = WM_window_get_active_workspace(win);
WorkSpaceLayout *layout = note->reference;
ED_workspace_layout_delete(workspace, layout, C); // XXX hrms, think this over!
- if (G.debug & G_DEBUG_EVENTS) {
- CLOG_INFO(WM_LOG_EVENTS, "screen delete %p", note->reference);
- }
+ CLOG_INFO(WM_LOG_EVENTS, "screen delete %p", note->reference);
}
}
}
@@ -930,11 +922,7 @@ static void wm_operator_finished(bContext *C, wmOperator *op, const bool repeat,
}
if (repeat == 0) {
- if (G.debug & G_DEBUG_WM) {
- char *buf = WM_operator_pystring(C, op, false, true);
- BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
- MEM_freeN(buf);
- }
+ CLOG_STR_INFO_N(WM_LOG_OPERATORS, WM_operator_pystring(C, op, false, true));
if (wm_operator_register_check(wm, op->type)) {
/* take ownership of reports (in case python provided own) */
@@ -2384,10 +2372,6 @@ static int wm_action_not_handled(int action)
return action == WM_HANDLER_CONTINUE || action == (WM_HANDLER_BREAK | WM_HANDLER_MODAL);
}
-#define PRINT(...) \
- if (do_debug_handler) \
- CLOG_VERBOSE(WM_LOG_HANDLERS, 1, __VA_ARGS__)
-
static int wm_handlers_do_keymap_with_keymap_handler(
/* From 'wm_handlers_do_intern' */
bContext *C,
@@ -2395,8 +2379,7 @@ static int wm_handlers_do_keymap_with_keymap_handler(
ListBase *handlers,
wmEventHandler_Keymap *handler,
/* Additional. */
- wmKeyMap *keymap,
- const bool do_debug_handler)
+ wmKeyMap *keymap)
{
int action = WM_HANDLER_CONTINUE;
@@ -2408,13 +2391,13 @@ static int wm_handlers_do_keymap_with_keymap_handler(
if (WM_keymap_poll(C, keymap)) {
- PRINT("checking '%s': pass", keymap->idname);
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 1, "checking '%s': pass", keymap->idname);
LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap->items) {
if (wm_eventmatch(event, kmi)) {
struct wmEventHandler_KeymapPost keymap_post = handler->post;
- PRINT(" item matched '%s'", kmi->idname);
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " item matched '%s'", kmi->idname);
action |= wm_handler_operator_call(
C, handlers, &handler->head, event, kmi->ptr, kmi->idname);
@@ -2439,7 +2422,7 @@ static int wm_handlers_do_keymap_with_keymap_handler(
}
}
else {
- PRINT("checking '%s': fail", keymap->idname);
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 1, "checking '%s': fail", keymap->idname);
}
}
@@ -2455,7 +2438,6 @@ static int wm_handlers_do_keymap_with_gizmo_handler(
/* Additional. */
wmGizmoGroup *gzgroup,
wmKeyMap *keymap,
- const bool do_debug_handler,
bool *r_keymap_poll)
{
int action = WM_HANDLER_CONTINUE;
@@ -2464,10 +2446,10 @@ static int wm_handlers_do_keymap_with_gizmo_handler(
if (WM_keymap_poll(C, keymap)) {
keymap_poll = true;
- PRINT("checking '%s': pass", keymap->idname);
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 1, "checking '%s': pass", keymap->idname);
for (kmi = keymap->items.first; kmi; kmi = kmi->next) {
if (wm_eventmatch(event, kmi)) {
- PRINT(" item matched '%s'", kmi->idname);
+ CLOG_VERBOSE(WM_LOG_HANDLERS, 2, " item matched '%s'", kmi->id
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list