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

WM: include tablet data in WM_event_print

Browse Source
This commit is contained in:
Campbell Barton
2015-06-01 17:39:47 +10:00
parent bfa7586ba3
commit 07a6d4ed75
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -566,10 +566,9 @@ void WM_event_print(const wmEvent *event)
RNA_enum_identifier(event_type_items, event->type, &type_id);
RNA_enum_identifier(event_value_items, event->val, &val_id);
printf("wmEvent type:%d / %s, val:%d / %s, \n"
" shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d, \n"
" mouse:(%d,%d), ascii:'%c', utf8:'%.*s', "
" keymap_idname:%s, pointer:%p\n",
printf("wmEvent type:%d / %s, val:%d / %s,\n"
" shift:%d, ctrl:%d, alt:%d, oskey:%d, keymodifier:%d,\n"
" mouse:(%d,%d), ascii:'%c', utf8:'%.*s', keymap_idname:%s, pointer:%p\n",
event->type, type_id, event->val, val_id,
event->shift, event->ctrl, event->alt, event->oskey, event->keymodifier,
event->x, event->y, event->ascii,
@@ -579,17 +578,19 @@ void WM_event_print(const wmEvent *event)
if (ISNDOF(event->type)) {
const wmNDOFMotionData *ndof = event->customdata;
if (event->type == NDOF_MOTION) {
printf(" ndof: rot: (%.4f %.4f %.4f),\n"
" tx: (%.4f %.4f %.4f),\n"
" dt: %.4f, progress: %d\n",
UNPACK3(ndof->rvec),
UNPACK3(ndof->tvec),
ndof->dt, ndof->progress);
printf(" ndof: rot: (%.4f %.4f %.4f), tx: (%.4f %.4f %.4f), dt: %.4f, progress: %d\n",
UNPACK3(ndof->rvec), UNPACK3(ndof->tvec), ndof->dt, ndof->progress);
}
else {
/* ndof buttons printed already */
}
}
if (event->tablet_data) {
const wmTabletData *wmtab = event->tablet_data;
printf(" tablet: active: %d, pressure %.4f, tilt: (%.4f %.4f)\n",
wmtab->Active, wmtab->Pressure, wmtab->Xtilt, wmtab->Ytilt);
}
}
else {
printf("wmEvent - NULL\n");