diff options
Diffstat (limited to 'source/blender/windowmanager/WM_api.h')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 2cb91f6cadf..6781f055fc2 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -188,7 +188,7 @@ void WM_lib_reload(struct Library *lib, struct bContext *C, struct ReportList *r /* mouse cursors */ void WM_cursor_set(struct wmWindow *win, int curs); -bool WM_cursor_set_from_tool(struct wmWindow *win, const ScrArea *sa, const ARegion *ar); +bool WM_cursor_set_from_tool(struct wmWindow *win, const ScrArea *sa, const ARegion *region); void WM_cursor_modal_set(struct wmWindow *win, int curs); void WM_cursor_modal_restore(struct wmWindow *win); void WM_cursor_wait(bool val); @@ -205,14 +205,14 @@ struct wmPaintCursor *WM_paint_cursor_activate( void *customdata); bool WM_paint_cursor_end(struct wmWindowManager *wm, struct wmPaintCursor *handle); -void WM_paint_cursor_tag_redraw(struct wmWindow *win, struct ARegion *ar); +void WM_paint_cursor_tag_redraw(struct wmWindow *win, struct ARegion *region); void WM_cursor_warp(struct wmWindow *win, int x, int y); void WM_cursor_compatible_xy(wmWindow *win, int *x, int *y); /* handlers */ -typedef bool (*EventHandlerPoll)(const ARegion *ar, const struct wmEvent *event); +typedef bool (*EventHandlerPoll)(const ARegion *region, const struct wmEvent *event); struct wmEventHandler_Keymap *WM_event_add_keymap_handler(ListBase *handlers, wmKeyMap *keymap); struct wmEventHandler_Keymap *WM_event_add_keymap_handler_poll(ListBase *handlers, wmKeyMap *keymap, @@ -628,7 +628,7 @@ void WM_gesture_straightline_cancel(struct bContext *C, struct wmOperator *op); /* Gesture manager API */ struct wmGesture *WM_gesture_new(struct wmWindow *window, - const struct ARegion *ar, + const struct ARegion *region, const struct wmEvent *event, int type); void WM_gesture_end(struct wmWindow *win, struct wmGesture *gesture); @@ -669,7 +669,7 @@ void wmWindowViewport(struct wmWindow *win); /* OpenGL utilities with safety check */ void wmOrtho2(float x1, float x2, float y1, float y2); /* use for conventions (avoid hard-coded offsets all over) */ -void wmOrtho2_region_pixelspace(const struct ARegion *ar); +void wmOrtho2_region_pixelspace(const struct ARegion *region); void wmOrtho2_pixelspace(const float x, const float y); void wmGetProjectionMatrix(float mat[4][4], const struct rcti *winrct); @@ -768,14 +768,14 @@ void *WM_draw_cb_activate(struct wmWindow *win, void WM_draw_cb_exit(struct wmWindow *win, void *handle); void WM_redraw_windows(struct bContext *C); -void WM_draw_region_viewport_ensure(struct ARegion *ar, short space_type); -void WM_draw_region_viewport_bind(struct ARegion *ar); -void WM_draw_region_viewport_unbind(struct ARegion *ar); +void WM_draw_region_viewport_ensure(struct ARegion *region, short space_type); +void WM_draw_region_viewport_bind(struct ARegion *region); +void WM_draw_region_viewport_unbind(struct ARegion *region); /* Region drawing */ -void WM_draw_region_free(struct ARegion *ar); -struct GPUViewport *WM_draw_region_get_viewport(struct ARegion *ar, int view); -struct GPUViewport *WM_draw_region_get_bound_viewport(struct ARegion *ar); +void WM_draw_region_free(struct ARegion *region); +struct GPUViewport *WM_draw_region_get_viewport(struct ARegion *region, int view); +struct GPUViewport *WM_draw_region_get_bound_viewport(struct ARegion *region); void WM_main_playanim(int argc, const char **argv); @@ -834,7 +834,7 @@ bool WM_event_is_ime_switch(const struct wmEvent *event); /* wm_tooltip.c */ typedef struct ARegion *(*wmTooltipInitFn)(struct bContext *C, - struct ARegion *ar, + struct ARegion *region, int *pass, double *r_pass_delay, bool *r_exit_on_event); @@ -842,18 +842,18 @@ typedef struct ARegion *(*wmTooltipInitFn)(struct bContext *C, void WM_tooltip_immediate_init(struct bContext *C, struct wmWindow *win, struct ScrArea *sa, - struct ARegion *ar, + struct ARegion *region, wmTooltipInitFn init); void WM_tooltip_timer_init_ex(struct bContext *C, struct wmWindow *win, struct ScrArea *sa, - struct ARegion *ar, + struct ARegion *region, wmTooltipInitFn init, double delay); void WM_tooltip_timer_init(struct bContext *C, struct wmWindow *win, struct ScrArea *sa, - struct ARegion *ar, + struct ARegion *region, wmTooltipInitFn init); void WM_tooltip_timer_clear(struct bContext *C, struct wmWindow *win); void WM_tooltip_clear(struct bContext *C, struct wmWindow *win); |