diff options
author | Ton Roosendaal <ton@blender.org> | 2011-03-28 22:51:27 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-03-28 22:51:27 +0400 |
commit | b2ac8ff1e16235ceedb52a65abebf30ff15e21fc (patch) | |
tree | 50757fe16d684562829170a6ee4a94d8b2ae9d76 | |
parent | 9b9c4184c88c49ff96f3f23cbfbd00f6811d7301 (diff) |
Maintenance:
Gave the report-timer (in top header) an own TIMER define, to not
confuse with timers in use for UI. Easier for debugging. :)
Also gave better malloc names to regions in 3d window.
All this for testing proper buffer drawing in Intel cards... which
is still unsolved.
-rw-r--r-- | source/blender/editors/space_info/space_info.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 13 |
4 files changed, 15 insertions, 12 deletions
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index 0068e42ba19..bd2e8077eab 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -198,7 +198,7 @@ static void info_keymap(struct wmKeyConfig *keyconf) { wmKeyMap *keymap= WM_keymap_find(keyconf, "Window", 0, 0); - WM_keymap_verify_item(keymap, "INFO_OT_reports_display_update", TIMER, KM_ANY, KM_ANY, 0); + WM_keymap_verify_item(keymap, "INFO_OT_reports_display_update", TIMERREPORT, KM_ANY, KM_ANY, 0); /* info space */ keymap= WM_keymap_find(keyconf, "Info", SPACE_INFO, 0); diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 5d75d645695..72d7977e132 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1078,7 +1078,7 @@ void ED_spacetype_view3d(void) st->context= view3d_context; /* regions: main window */ - art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); + art= MEM_callocN(sizeof(ARegionType), "spacetype view3d main region"); art->regionid = RGN_TYPE_WINDOW; art->keymapflag= ED_KEYMAP_GPENCIL; art->draw= view3d_main_area_draw; @@ -1091,7 +1091,7 @@ void ED_spacetype_view3d(void) BLI_addhead(&st->regiontypes, art); /* regions: listview/buttons */ - art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); + art= MEM_callocN(sizeof(ARegionType), "spacetype view3d buttons region"); art->regionid = RGN_TYPE_UI; art->prefsizex= 180; // XXX art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES; @@ -1103,7 +1103,7 @@ void ED_spacetype_view3d(void) view3d_buttons_register(art); /* regions: tool(bar) */ - art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); + art= MEM_callocN(sizeof(ARegionType), "spacetype view3d tools region"); art->regionid = RGN_TYPE_TOOLS; art->prefsizex= 160; // XXX art->prefsizey= 50; // XXX @@ -1119,7 +1119,7 @@ void ED_spacetype_view3d(void) #endif /* regions: tool properties */ - art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); + art= MEM_callocN(sizeof(ARegionType), "spacetype view3d tool properties region"); art->regionid = RGN_TYPE_TOOL_PROPS; art->prefsizex= 0; art->prefsizey= 120; @@ -1133,7 +1133,7 @@ void ED_spacetype_view3d(void) /* regions: header */ - art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); + art= MEM_callocN(sizeof(ARegionType), "spacetype view3d header region"); art->regionid = RGN_TYPE_HEADER; art->prefsizey= HEADERY; art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES|ED_KEYMAP_HEADER; diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 8dcd3fa34d1..b52e8e92f22 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -469,7 +469,7 @@ static void wm_operator_reports(bContext *C, wmOperator *op, int retval, int pop WM_event_remove_timer(wm, NULL, wm_reports->reporttimer); /* Records time since last report was added */ - wm_reports->reporttimer= WM_event_add_timer(wm, CTX_wm_window(C), TIMER, 0.05); + wm_reports->reporttimer= WM_event_add_timer(wm, CTX_wm_window(C), TIMERREPORT, 0.05); rti = MEM_callocN(sizeof(ReportTimerInfo), "ReportTimerInfo"); wm_reports->reporttimer->customdata = rti; diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 39545a0ad01..ee080e7c0aa 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -86,8 +86,14 @@ #define TIMER0 0x0111 /* timer event, slot for internal use */ #define TIMER1 0x0112 /* timer event, slot for internal use */ #define TIMER2 0x0113 /* timer event, slot for internal use */ -#define TIMERJOBS 0x0114 /* timer event, internal use */ -#define TIMERAUTOSAVE 0x0115 /* timer event, internal use */ +#define TIMERJOBS 0x0114 /* timer event, jobs system */ +#define TIMERAUTOSAVE 0x0115 /* timer event, autosave */ +#define TIMERREPORT 0x0116 /* timer event, reports */ +#define TIMERF 0x011F /* last timer */ + +/* test whether the event is timer event */ +#define ISTIMER(event) (event >= TIMER && event <= TIMERF) + /* standard keyboard */ #define AKEY 'a' @@ -231,9 +237,6 @@ /* test whether the event is a mouse button */ #define ISMOUSE(event) (event >= LEFTMOUSE && event <= MOUSEROTATE) - /* test whether the event is timer event */ -#define ISTIMER(event) (event >= TIMER && event <= TIMERAUTOSAVE) - /* test whether the event is tweak event */ #define ISTWEAK(event) (event >= EVT_TWEAK_L && event <= EVT_GESTURE) |