[Bf-blender-cvs] [edd91ba4240] soc-2020-info-editor: Refactor window manager to use CLOG instead of print
Mateusz Grzeliński
noreply at git.blender.org
Tue Jun 30 16:57:46 CEST 2020
Commit: edd91ba42401d3a4726bbec614679c1986dcca2f
Author: Mateusz Grzeliński
Date: Tue Jun 30 16:57:10 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBedd91ba42401d3a4726bbec614679c1986dcca2f
Refactor window manager to use CLOG instead of print
- added loggers wm.session, wm.job
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.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_files.c
M source/blender/windowmanager/intern/wm_gesture_ops.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
M source/blender/windowmanager/intern/wm_menu_type.c
M source/blender/windowmanager/intern/wm_operator_type.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_panel_type.c
M source/blender/windowmanager/intern/wm_uilist_type.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 482589e2ccb..bbbb6d5929c 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_print(const struct wmEvent *event);
+void WM_event_log(const struct wmEvent *event);
int WM_event_modifier_flag(const struct wmEvent *event);
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 4acce793707..7003908a648 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -923,6 +923,8 @@ extern struct CLG_LogRef *WM_LOG_KEYMAPS;
extern struct CLG_LogRef *WM_LOG_TOOLS;
extern struct CLG_LogRef *WM_LOG_MSGBUS_PUB;
extern struct CLG_LogRef *WM_LOG_MSGBUS_SUB;
+extern struct CLG_LogRef *WM_LOG_SESSION;
+extern struct CLG_LogRef *WM_LOG_JOB;
#ifdef __cplusplus
}
diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c
index 381c06983a8..55c82ad5f1e 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 <CLG_log.h>
#include <stdlib.h>
#include <string.h>
@@ -51,11 +52,13 @@
#include "DEG_depsgraph.h"
/* -------------------------------------------------------------------- */
-/** \name Event Printing
+/** \name Event Logging
* \{ */
-/* for debugging only, getting inspecting events manually is tedious */
-void WM_event_print(const wmEvent *event)
+/* 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)
{
if (event) {
const char *unknown = "UNKNOWN";
@@ -70,41 +73,44 @@ void WM_event_print(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);
- printf(
- "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\n",
- 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);
+ CLOG_INFO(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);
#ifdef WITH_INPUT_NDOF
if (ISNDOF(event->type)) {
const wmNDOFMotionData *ndof = event->customdata;
if (event->type == NDOF_MOTION) {
- printf(" ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %u\n",
- UNPACK3(ndof->rvec),
- UNPACK3(ndof->tvec),
- ndof->dt,
- ndof->progress);
+ CLOG_INFO(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 */
@@ -114,15 +120,17 @@ void WM_event_print(const wmEvent *event)
if (event->tablet.active != EVT_TABLET_NONE) {
const wmTabletData *wmtab = &event->tablet;
- printf(" tablet: active: %d, pressure %.4f, tilt: (%.4f %.4f)\n",
- wmtab->active,
- wmtab->pressure,
- wmtab->x_tilt,
- wmtab->y_tilt);
+ CLOG_INFO(WM_LOG_EVENTS,
+ 2,
+ " tablet: active: %d, pressure %.4f, tilt: (%.4f %.4f)",
+ wmtab->active,
+ wmtab->pressure,
+ wmtab->x_tilt,
+ wmtab->y_tilt);
}
}
else {
- printf("wmEvent - NULL\n");
+ CLOG_INFO(WM_LOG_EVENTS, 2, "wmEvent - NULL");
}
}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 53d6df915d6..fd4165941fd 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -430,7 +430,7 @@ void wm_event_do_notifiers(bContext *C)
WM_window_set_active_workspace(C, win, ref_ws);
if (G.debug & G_DEBUG_EVENTS) {
- printf("%s: Workspace set %p\n", __func__, note->reference);
+ CLOG_INFO(WM_LOG_EVENTS, 0, "Workspace set %p", note->reference);
}
}
else if (note->data == ND_WORKSPACE_DELETE) {
@@ -438,7 +438,7 @@ void wm_event_do_notifiers(bContext *C)
ED_workspace_delete(workspace, CTX_data_main(C), C, wm); // XXX hrms, think this over!
if (G.debug & G_DEBUG_EVENTS) {
- printf("%s: Workspace delete %p\n", __func__, workspace);
+ CLOG_INFO(WM_LOG_EVENTS, 0, "Workspace delete %p", workspace);
}
}
else if (note->data == ND_LAYOUTBROWSE) {
@@ -449,7 +449,7 @@ void wm_event_do_notifiers(bContext *C)
ED_screen_change(C, ref_screen); /* XXX hrms, think this over! */
if (G.debug & G_DEBUG_EVENTS) {
- printf("%s: screen set %p\n", __func__, note->reference);
+ CLOG_INFO(WM_LOG_EVENTS, 0, "screen set %p", note->reference);
}
}
else if (note->data == ND_LAYOUTDELETE) {
@@ -458,7 +458,7 @@ void wm_event_do_notifiers(bContext *C)
ED_workspace_layout_delete(workspace, layout, C); // XXX hrms, think this over!
if (G.debug & G_DEBUG_EVENTS) {
- printf("%s: screen delete %p\n", __func__, note->reference);
+ CLOG_INFO(WM_LOG_EVENTS, 0, "screen delete %p", note->reference);
}
}
}
@@ -512,12 +512,6 @@ void wm_event_do_notifiers(bContext *C)
/* XXX context in notifiers? */
CTX_wm_window_set(C, win);
-# if 0
- printf("notifier win %d screen %s cat %x\n",
- win->winid,
- win->screen->id.name + 2,
- note->category);
-# endif
ED_screen_do_listen(C, note);
for (region = screen->regionbase.first; region; region = region->next) {
@@ -2390,9 +2384,9 @@ static int wm_action_not_handled(int action)
return action == WM_HANDLER_CONTINUE || action == (WM_HANDLER_BREAK | WM_HANDLER_MODAL);
}
-#define PRINT \
+#define PRINT(...) \
if (do_debug_handler) \
- printf
+ CLOG_INFO(WM_LOG_HANDLERS, 1, __VA_ARGS__)
static int wm_handlers_do_keymap_with_keymap_handler(
/* From 'wm_handlers_do_intern' */
@@ -2411,24 +2405,23 @@ static int wm_handlers_do_keymap_with_keymap_handler(
BLI_assert(handler->dynamic.keymap_fn);
}
else {
- PRINT("%s: checking '%s' ...", __func__, keymap->idname);
if (WM_keymap_poll(C, keymap)) {
- PRINT("pass\n");
+ PRINT("checking '%s': pass", keymap->idname);
LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap->items) {
if (wm_eventmatch(event, kmi)) {
struct wmEventHandler_KeymapPost keymap_post = handler->post;
- PRINT("%s: item matched '%s'\n", __func__, kmi->idname);
+ PRINT(" item matched '%s'", kmi->idname);
action |= wm_handler_operator_call(
C, handlers, &handler->head, event, kmi->ptr, kmi->idname);
if (action & WM_HANDLER_BREAK) {
/* not always_pass here, it denotes removed handler_base */
- CLOG_INFO(WM_LOG_HANDLERS, 2, "handled! '%s'", kmi->idname);
+ CLOG_INFO(WM_LOG_HANDLERS, 2, " handled! '%s'", kmi->idname);
if (keymap_post.post_fn != NULL) {
keymap_post.post_fn(keymap, kmi, keymap_post.user_data);
}
@@ -2436,17 +2429,17 @@ static int wm_handlers_do_keymap_with_keymap_handler(
}
else {
if (action & WM_HANDLER_HANDLED) {
- CLOG_INFO(WM_LOG_HANDLERS, 2, "handled - and pass on! '%s'", kmi->idname);
+ CLOG_INFO(WM_LOG_HANDLERS, 2, " handled - and pass on! '%s'", kmi->idname);
}
else {
- CLOG_INFO(WM_LOG_HANDLERS, 2, "un-handled '%s'", kmi->idname);
+ CLOG_INFO(WM_LOG_HANDLERS, 2, " un-handled '%s'", kmi->idname);
}
}
}
}
}
else {
- PRINT("fail\n");
+ PRINT("checking '%s': fail", keymap->idname);
}
}
@@ -2469,14 +2462,12 @@ static int wm_handlers_do_keymap_with_gizmo_handler(
bool keymap_poll = false;
wmKeyMapItem *kmi;
- PRINT("%s: che
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list