diff options
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 26 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_intern.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 60 | ||||
| -rw-r--r-- | source/blender/editors/screen/screendump.c | 13 |
5 files changed, 56 insertions, 55 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 70378046b02..f62166d33b0 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -151,7 +151,7 @@ void ED_area_do_refresh(bContext *C, ScrArea *sa) if (sa->type && sa->type->refresh) { sa->type->refresh(C, sa); } - sa->do_refresh = FALSE; + sa->do_refresh = false; } /** @@ -526,7 +526,7 @@ void ED_area_tag_redraw_regiontype(ScrArea *sa, int regiontype) void ED_area_tag_refresh(ScrArea *sa) { if (sa) - sa->do_refresh = TRUE; + sa->do_refresh = true; } /* *************************************************************** */ @@ -1332,7 +1332,7 @@ void ED_region_init(bContext *C, ARegion *ar) } /* for quick toggle, can skip fades */ -void region_toggle_hidden(bContext *C, ARegion *ar, int do_fade) +void region_toggle_hidden(bContext *C, ARegion *ar, bool do_fade) { ScrArea *sa = CTX_wm_area(C); @@ -1359,7 +1359,7 @@ void ED_region_toggle_hidden(bContext *C, ARegion *ar) /* sa2 to sa1, we swap spaces for fullscreen to keep all allocated data */ /* area vertices were set */ -void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space) +void area_copy_data(ScrArea *sa1, ScrArea *sa2, const bool swap_space) { SpaceType *st; ARegion *ar; diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 23ead971cd3..b10f521d25d 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -468,7 +468,7 @@ bScreen *ED_screen_add(wmWindow *win, Scene *scene, const char *name) sc = BKE_libblock_alloc(G.main, ID_SCR, name); sc->scene = scene; - sc->do_refresh = TRUE; + sc->do_refresh = true; sc->redraws_flag = TIME_ALL_3D_WIN | TIME_ALL_ANIM_WIN; sc->winid = win->winid; @@ -1099,18 +1099,18 @@ void ED_screen_do_listen(bContext *C, wmNotifier *note) switch (note->category) { case NC_WM: if (note->data == ND_FILEREAD) - win->screen->do_draw = TRUE; + win->screen->do_draw = true; break; case NC_WINDOW: - win->screen->do_draw = TRUE; + win->screen->do_draw = true; break; case NC_SCREEN: if (note->action == NA_EDITED) - win->screen->do_draw = win->screen->do_refresh = TRUE; + win->screen->do_draw = win->screen->do_refresh = true; break; case NC_SCENE: if (note->data == ND_MODE) - region_cursor_set(win, note->swinid, TRUE); + region_cursor_set(win, note->swinid, true); break; } } @@ -1185,7 +1185,7 @@ void ED_screen_draw(wmWindow *win) glDisable(GL_BLEND); } - win->screen->do_draw = FALSE; + win->screen->do_draw = false; } /* helper call for below, dpi changes headers */ @@ -1240,7 +1240,7 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) if (G.debug & G_DEBUG_EVENTS) { printf("%s: set screen\n", __func__); } - win->screen->do_refresh = FALSE; + win->screen->do_refresh = false; win->screen->context = ed_screen_context; } @@ -1415,11 +1415,11 @@ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) if (oldswin != scr->subwinactive) { for (sa = scr->areabase.first; sa; sa = sa->next) { - int do_draw = FALSE; + bool do_draw = false; for (ar = sa->regionbase.first; ar; ar = ar->next) if (ar->swinid == oldswin || ar->swinid == scr->subwinactive) - do_draw = TRUE; + do_draw = true; if (do_draw) { for (ar = sa->regionbase.first; ar; ar = ar->next) @@ -1436,7 +1436,7 @@ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) else { /* notifier invokes freeing the buttons... causing a bit too much redraws */ if (oldswin != scr->subwinactive) { - region_cursor_set(win, scr->subwinactive, TRUE); + region_cursor_set(win, scr->subwinactive, true); /* this used to be a notifier, but needs to be done immediate * because it can undo setting the right button as active due @@ -1444,7 +1444,7 @@ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) uiFreeActiveButtons(C, win->screen); } else - region_cursor_set(win, scr->subwinactive, FALSE); + region_cursor_set(win, scr->subwinactive, false); } } } @@ -1563,7 +1563,7 @@ void ED_screen_set(bContext *C, bScreen *sc) * have different layers visible in 3D viewpots. This is possible * because of view3d.lock_camera_and_layers option. */ - DAG_on_visible_update(bmain, FALSE); + DAG_on_visible_update(bmain, false); } } @@ -1697,7 +1697,7 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) CTX_data_scene_set(C, scene); BKE_scene_set_background(bmain, scene); - DAG_on_visible_update(bmain, FALSE); + DAG_on_visible_update(bmain, false); ED_render_engine_changed(bmain); ED_update_for_newframe(bmain, scene, 1); diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index 8a76c52d985..b279ddab42f 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -38,8 +38,8 @@ struct Scene; #define AZONESPOT (0.6f * U.widget_unit) /* area.c */ -void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space); -void region_toggle_hidden(bContext *C, ARegion *ar, int do_fade); +void area_copy_data(ScrArea *sa1, ScrArea *sa2, const bool swap_space); +void region_toggle_hidden(bContext *C, ARegion *ar, const bool do_fade); /* screen_edit.c */ ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index f5c2c9e5fcb..915ed7679f4 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -193,10 +193,10 @@ int ED_operator_view3d_active(bContext *C) int ED_operator_region_view3d_active(bContext *C) { if (CTX_wm_region_view3d(C)) - return TRUE; + return true; CTX_wm_operator_poll_msg_set(C, "expected a view3d region"); - return FALSE; + return false; } /* generic for any view2d which uses anim_ops */ @@ -205,7 +205,7 @@ int ED_operator_animview_active(bContext *C) if (ED_operator_areaactive(C)) { SpaceLink *sl = (SpaceLink *)CTX_wm_space_data(C); if (sl && (ELEM5(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME))) - return TRUE; + return true; } CTX_wm_operator_poll_msg_set(C, "expected a timeline/animation area to be active"); @@ -453,10 +453,10 @@ int ED_operator_uvmap(bContext *C) } if (em && (em->bm->totface)) { - return TRUE; + return true; } - return FALSE; + return false; } int ED_operator_editsurfcurve(bContext *C) @@ -552,7 +552,7 @@ int ED_operator_mask(bContext *C) } } - return FALSE; + return false; } /* *************************** action zone operator ************************** */ @@ -662,7 +662,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type) event.type = EVT_ACTIONZONE_REGION; event.val = 0; event.customdata = op->customdata; - event.customdatafree = TRUE; + event.customdatafree = true; op->customdata = NULL; wm_event_add(win, &event); @@ -1625,7 +1625,7 @@ static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event) } } - CTX_wm_window(C)->screen->do_draw = TRUE; + CTX_wm_window(C)->screen->do_draw = true; } @@ -2123,20 +2123,20 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) if (CFRA != (int)ak->cfra) { /* this changes the frame, so set the frame and we're done */ CFRA = (int)ak->cfra; - done = TRUE; + done = true; } else { /* make this the new starting point for the search */ cfra = ak->cfra; } } - } while ((ak != NULL) && (done == FALSE)); + } while ((ak != NULL) && (done == false)); /* free temp stuff */ BLI_dlrbTree_free(&keys); /* any success? */ - if (done == FALSE) { + if (done == false) { BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction"); return OPERATOR_CANCELLED; @@ -2162,7 +2162,7 @@ static void SCREEN_OT_keyframe_jump(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "next", TRUE, "Next Keyframe", ""); + RNA_def_boolean(ot->srna, "next", true, "Next Keyframe", ""); } /* ************** jump to marker operator ***************************** */ @@ -2222,7 +2222,7 @@ static void SCREEN_OT_marker_jump(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, "next", TRUE, "Next Marker", ""); + RNA_def_boolean(ot->srna, "next", true, "Next Marker", ""); } /* ************** switch screen operator ***************************** */ @@ -3238,7 +3238,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv else sync = (scene->flag & SCE_FRAME_DROP); if ((scene->audio.flag & AUDIO_SYNC) && - (sad->flag & ANIMPLAY_FLAG_REVERSE) == FALSE && + (sad->flag & ANIMPLAY_FLAG_REVERSE) == false && finite(time = sound_sync_scene(scene))) { scene->r.cfra = (double)time * FPS + 0.5; @@ -3473,7 +3473,7 @@ static void SCREEN_OT_animation_cancel(wmOperatorType *ot) ot->poll = ED_operator_screenactive; - RNA_def_boolean(ot->srna, "restore_frame", TRUE, "Restore Frame", "Restore the frame when animation was initialized"); + RNA_def_boolean(ot->srna, "restore_frame", true, "Restore Frame", "Restore the frame when animation was initialized"); } /* ************** border select operator (template) ***************************** */ @@ -4052,10 +4052,10 @@ void ED_keymap_screen(wmKeyConfig *keyconf) /* render */ kmi = WM_keymap_add_item(keymap, "RENDER_OT_render", F12KEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "use_viewport", TRUE); + RNA_boolean_set(kmi->ptr, "use_viewport", true); kmi = WM_keymap_add_item(keymap, "RENDER_OT_render", F12KEY, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "animation", TRUE); - RNA_boolean_set(kmi->ptr, "use_viewport", TRUE); + RNA_boolean_set(kmi->ptr, "animation", true); + RNA_boolean_set(kmi->ptr, "use_viewport", true); WM_keymap_add_item(keymap, "RENDER_OT_view_cancel", ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "RENDER_OT_view_show", F11KEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "RENDER_OT_play_rendered_anim", F11KEY, KM_PRESS, KM_CTRL, 0); @@ -4079,27 +4079,27 @@ void ED_keymap_screen(wmKeyConfig *keyconf) RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", WHEELDOWNMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "delta", 1); RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", WHEELUPMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "delta", -1); - RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", UPARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0)->ptr, "end", TRUE); - RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", DOWNARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0)->ptr, "end", FALSE); - RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", TRUE); - RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", FALSE); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", UPARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0)->ptr, "end", true); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", DOWNARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0)->ptr, "end", false); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", true); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", false); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", UPARROWKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "next", TRUE); + RNA_boolean_set(kmi->ptr, "next", true); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", DOWNARROWKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "next", FALSE); + RNA_boolean_set(kmi->ptr, "next", false); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", MEDIALAST, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "next", TRUE); + RNA_boolean_set(kmi->ptr, "next", true); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", MEDIAFIRST, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "next", FALSE); + RNA_boolean_set(kmi->ptr, "next", false); /* play (forward and backwards) */ WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0)->ptr, "reverse", TRUE); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0)->ptr, "reverse", true); WM_keymap_add_item(keymap, "SCREEN_OT_animation_cancel", ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", MEDIAPLAY, KM_PRESS, 0, 0); @@ -4109,11 +4109,11 @@ void ED_keymap_screen(wmKeyConfig *keyconf) #if 0 /* XXX: disabled for restoring later... bad implementation */ keymap = WM_keymap_find(keyconf, "Frames", 0, 0); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", RIGHTARROWKEY, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "cycle_speed", TRUE); + RNA_boolean_set(kmi->ptr, "cycle_speed", true); kmi = WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", LEFTARROWKEY, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "reverse", TRUE); - RNA_boolean_set(kmi->ptr, "cycle_speed", TRUE); + RNA_boolean_set(kmi->ptr, "reverse", true); + RNA_boolean_set(kmi->ptr, "cycle_speed", true); WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", DOWNARROWKEY, KM_PRESS, KM_ALT, 0); #endif diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 0153d609adb..c5ca5ab921f 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -138,11 +138,11 @@ static int screenshot_data_create(bContext *C, wmOperator *op) op->customdata = scd; - return TRUE; + return true; } else { op->customdata = NULL; - return FALSE; + return false; } } @@ -257,7 +257,7 @@ static void screenshot_draw(bContext *UNUSED(C), wmOperator *op) /* image template */ RNA_pointer_create(NULL, &RNA_ImageFormatSettings, &scd->im_format, &ptr); - uiTemplateImageSettings(layout, &ptr, FALSE); + uiTemplateImageSettings(layout, &ptr, false); /* main draw call */ RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); @@ -356,7 +356,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float sj->stop = stop; sj->do_update = do_update; - *do_update = TRUE; /* wait for opengl rect */ + *do_update = true; /* wait for opengl rect */ while (*stop == 0) { @@ -378,7 +378,8 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float char name[FILE_MAX]; int ok; - BKE_makepicstring(name, rd.pic, sj->bmain->name, rd.cfra, &rd.im_format, rd.scemode & R_EXTENSION, TRUE); + BKE_makepicstring(name, rd.pic, sj->bmain->name, rd.cfra, + &rd.im_format, (rd.scemode & R_EXTENSION) != 0, true); ibuf->rect = sj->dumprect; ok = BKE_imbuf_write(ibuf, name, &rd.im_format); @@ -400,7 +401,7 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float MEM_freeN(sj->dumprect); sj->dumprect = NULL; - *do_update = TRUE; + *do_update = true; rd.cfra++; |