diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 04:34:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 08:22:28 +0400 |
commit | 617557b08ea94e2b65a1697ddf0b79651204d92b (patch) | |
tree | 50b24bab075b42fa20456140c9a9681cfb01325b /source/blender/windowmanager | |
parent | 2c00ecc738c04dc5dc22d4a6b81a1e937526ba6d (diff) |
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 18 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 67 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 16 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 38 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 76 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 107 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 4 |
11 files changed, 174 insertions, 170 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index c93ed89d78f..e73d599a643 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -132,7 +132,7 @@ struct ImBuf; #define OPTYPE_PRESET 32 /* show preset menu */ #define OPTYPE_INTERNAL 64 /* some operators are mainly for internal use * and don't make sense to be accessed from the - * search menu, even if poll() returns TRUE. + * search menu, even if poll() returns true. * currently only used for the search toolbox */ #define OPTYPE_LOCK_BYPASS 128 /* Allow operator to run when interface is locked */ @@ -169,7 +169,7 @@ enum { #define KM_OSKEY2 128 /* KM_MOD_ flags for wmKeyMapItem and wmEvent.alt/shift/oskey/ctrl */ -/* note that KM_ANY and FALSE are used with these defines too */ +/* note that KM_ANY and false are used with these defines too */ #define KM_MOD_FIRST 1 #define KM_MOD_SECOND 2 diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index b7b606552e3..e3a67c3824e 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -715,10 +715,10 @@ static bool wm_draw_update_test_window(wmWindow *win) for (ar = win->screen->regionbase.first; ar; ar = ar->next) { if (ar->do_draw_overlay) { wm_tag_redraw_overlay(win, ar); - ar->do_draw_overlay = FALSE; + ar->do_draw_overlay = false; } if (ar->swinid && ar->do_draw) - do_draw = TRUE; + do_draw = true; } for (sa = win->screen->areabase.first; sa; sa = sa->next) { @@ -726,7 +726,7 @@ static bool wm_draw_update_test_window(wmWindow *win) wm_region_test_render_do_draw(win->screen, sa, ar); if (ar->swinid && ar->do_draw) - do_draw = TRUE; + do_draw = true; } } @@ -796,13 +796,13 @@ void wm_tag_redraw_overlay(wmWindow *win, ARegion *ar) if (ar && win) { if (wm_automatic_draw_method(win) != USER_DRAW_TRIPLE) ED_region_tag_redraw(ar); - win->screen->do_draw_paintcursor = TRUE; + win->screen->do_draw_paintcursor = true; } } void WM_paint_cursor_tag_redraw(wmWindow *win, ARegion *ar) { - win->screen->do_draw_paintcursor = TRUE; + win->screen->do_draw_paintcursor = true; wm_tag_redraw_overlay(win, ar); } @@ -855,9 +855,9 @@ void wm_draw_update(bContext *C) else // if (drawmethod == USER_DRAW_TRIPLE) wm_method_draw_triple(C, win); - win->screen->do_draw_gesture = FALSE; - win->screen->do_draw_paintcursor = FALSE; - win->screen->do_draw_drag = FALSE; + win->screen->do_draw_gesture = false; + win->screen->do_draw_paintcursor = false; + win->screen->do_draw_drag = false; wm_window_swap_buffers(win); @@ -893,7 +893,7 @@ void wm_draw_region_clear(wmWindow *win, ARegion *ar) if (ELEM(drawmethod, USER_DRAW_OVERLAP, USER_DRAW_OVERLAP_FLIP)) wm_flush_regions_down(win->screen, &ar->winrct); - win->screen->do_draw = TRUE; + win->screen->do_draw = true; } void WM_redraw_windows(bContext *C) diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ecf56bcbc3a..9d04beac5ee 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -288,7 +288,7 @@ void wm_event_do_notifiers(bContext *C) { if (note->category == NC_SCENE) { if (note->data == ND_FRAME) - do_anim = TRUE; + do_anim = true; } } if (ELEM5(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_SCENE, NC_WM)) { @@ -301,7 +301,7 @@ void wm_event_do_notifiers(bContext *C) /* XXX, quick frame changes can cause a crash if framechange and rendering * collide (happens on slow scenes), BKE_scene_update_for_newframe can be called * twice which can depgraph update the same object at once */ - if (G.is_rendering == FALSE) { + if (G.is_rendering == false) { /* depsgraph gets called, might send more notifiers */ ED_update_for_newframe(CTX_data_main(C), win->screen->scene, 1); @@ -364,7 +364,7 @@ void wm_event_do_notifiers(bContext *C) } /* XXX make lock in future, or separated derivedmesh users in scene */ - if (G.is_rendering == FALSE) { + if (G.is_rendering == false) { /* depsgraph & animation: update tagged datablocks */ Main *bmain = CTX_data_main(C); @@ -489,7 +489,7 @@ int WM_operator_poll(bContext *C, wmOperatorType *ot) /* sets up the new context and calls 'wm_operator_invoke()' with poll_only */ int WM_operator_poll_context(bContext *C, wmOperatorType *ot, short context) { - return wm_operator_call_internal(C, ot, NULL, NULL, context, TRUE); + return wm_operator_call_internal(C, ot, NULL, NULL, context, true); } static void wm_operator_print(bContext *C, wmOperator *op) @@ -611,10 +611,10 @@ void WM_reportf(const bContext *C, ReportType type, const char *format, ...) BLI_dynstr_free(ds); } -/* (caller_owns_reports == TRUE) when called from python */ -static void wm_operator_reports(bContext *C, wmOperator *op, int retval, int caller_owns_reports) +/* (caller_owns_reports == true) when called from python */ +static void wm_operator_reports(bContext *C, wmOperator *op, int retval, bool caller_owns_reports) { - if (caller_owns_reports == FALSE) { /* popup */ + if (caller_owns_reports == false) { /* popup */ if (op->reports->list.first) { /* FIXME, temp setting window, see other call to uiPupMenuReports for why */ wmWindow *win_prev = CTX_wm_window(C); @@ -638,7 +638,7 @@ static void wm_operator_reports(bContext *C, wmOperator *op, int retval, int cal wm_operator_print(C, op); } - if (caller_owns_reports == FALSE) { + if (caller_owns_reports == false) { BKE_reports_print(op->reports, RPT_DEBUG); /* print out reports to console. */ } @@ -726,7 +726,7 @@ static int wm_operator_exec(bContext *C, wmOperator *op, const bool repeat, cons * Carefully checked all calls to wm_operator_exec and WM_operator_repeat, don't see any reason * why this was needed, but worth to note it in case something turns bad. (mont29) */ if (retval & (OPERATOR_FINISHED | OPERATOR_CANCELLED)/* && repeat == 0 */) - wm_operator_reports(C, op, retval, FALSE); + wm_operator_reports(C, op, retval, false); if (retval & OPERATOR_FINISHED) { if (store) { @@ -788,7 +788,7 @@ int WM_operator_repeat(bContext *C, wmOperator *op) { return wm_operator_exec(C, op, true, true); } -/* TRUE if WM_operator_repeat can run +/* true if WM_operator_repeat can run * simple check for now but may become more involved. * To be sure the operator can run call WM_operator_poll(C, op->type) also, since this call * checks if WM_operator_repeat() can run at all, not that it WILL run at any time. */ @@ -985,14 +985,14 @@ bool WM_operator_last_properties_store(wmOperator *op) #else -int WM_operator_last_properties_init(wmOperator *UNUSED(op)) +bool WM_operator_last_properties_init(wmOperator *UNUSED(op)) { - return FALSE; + return false; } -int WM_operator_last_properties_store(wmOperator *UNUSED(op)) +bool WM_operator_last_properties_store(wmOperator *UNUSED(op)) { - return FALSE; + return false; } #endif @@ -1075,7 +1075,7 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, */ if (ot->flag & OPTYPE_BLOCKING || (op->opm && op->opm->type->flag & OPTYPE_BLOCKING)) { int bounds[4] = {-1, -1, -1, -1}; - int wrap; + bool wrap; if (op->opm) { wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) && @@ -1090,7 +1090,7 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, if (wrap) { ARegion *ar = CTX_wm_region(C); if (ar && ar->regiontype == RGN_TYPE_HEADER) { - wrap = FALSE; + wrap = false; } } @@ -1267,7 +1267,7 @@ int WM_operator_name_call(bContext *C, const char *opstring, short context, Poin { wmOperatorType *ot = WM_operatortype_find(opstring, 0); if (ot) - return wm_operator_call_internal(C, ot, properties, NULL, context, FALSE); + return wm_operator_call_internal(C, ot, properties, NULL, context, false); return 0; } @@ -1308,7 +1308,7 @@ int WM_operator_call_py(bContext *C, wmOperatorType *ot, short context, wmWindowManager *wm = CTX_wm_manager(C); if (!is_undo && wm) wm->op_undo_depth++; - retval = wm_operator_call_internal(C, ot, properties, reports, context, FALSE); + retval = wm_operator_call_internal(C, ot, properties, reports, context, false); if (!is_undo && wm && (wm == CTX_wm_manager(C))) wm->op_undo_depth--; @@ -1579,7 +1579,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand wm->op_undo_depth--; if (retval & (OPERATOR_CANCELLED | OPERATOR_FINISHED)) - wm_operator_reports(C, op, retval, FALSE); + wm_operator_reports(C, op, retval, false); /* important to run 'wm_operator_finished' before NULLing the context members */ if (retval & OPERATOR_FINISHED) { @@ -1624,7 +1624,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand if (ot) { if (wm_operator_check_locked_interface(C, ot)) { - retval = wm_operator_invoke(C, ot, event, properties, NULL, FALSE); + retval = wm_operator_invoke(C, ot, event, properties, NULL, false); } } } @@ -2017,12 +2017,15 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) * wasn't handled, the KM_RELEASE will become a KM_CLICK */ if (win && event->val == KM_PRESS) { - win->eventstate->check_click = TRUE; + win->eventstate->check_click = true; } if (win && win->eventstate->prevtype == event->type) { - if (event->val == KM_RELEASE && win->eventstate->prevval == KM_PRESS && win->eventstate->check_click == TRUE) { + if ((event->val == KM_RELEASE) && + (win->eventstate->prevval == KM_PRESS) && + (win->eventstate->check_click == true)) + { event->val = KM_CLICK; if (G.debug & (G_DEBUG_HANDLERS)) { @@ -2141,10 +2144,10 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even } if (event->type == MOUSEMOVE) - win->screen->do_draw_drag = TRUE; + win->screen->do_draw_drag = true; else if (event->type == ESCKEY) { BLI_freelistN(&wm->drags); - win->screen->do_draw_drag = TRUE; + win->screen->do_draw_drag = true; } else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) { event->type = EVT_DROP; @@ -2160,7 +2163,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even event->customdatafree = 1; /* clear drop icon */ - win->screen->do_draw_drag = TRUE; + win->screen->do_draw_drag = true; /* restore cursor (disabled, see wm_dragdrop.c) */ // WM_cursor_modal_restore(win); @@ -2169,7 +2172,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even /* overlap fails otherwise */ if (win->screen->do_draw_drag) if (win->drawmethod == USER_DRAW_OVERLAP) - win->screen->do_draw = TRUE; + win->screen->do_draw = true; } @@ -2274,7 +2277,7 @@ void wm_event_do_handlers(bContext *C) wm_paintcursor_test(C, event); } else if (event->type == NDOF_MOTION) { - win->addmousemove = TRUE; + win->addmousemove = true; } for (sa = win->screen->areabase.first; sa; sa = sa->next) { @@ -3176,22 +3179,22 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U case LEFTSHIFTKEY: case RIGHTSHIFTKEY: evt->shift = (event.val == KM_PRESS) ? ((evt->ctrl || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : - FALSE; + false; break; case LEFTCTRLKEY: case RIGHTCTRLKEY: evt->ctrl = (event.val == KM_PRESS) ? ((evt->shift || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : - FALSE; + false; break; case LEFTALTKEY: case RIGHTALTKEY: evt->alt = (event.val == KM_PRESS) ? ((evt->ctrl || evt->shift || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : - FALSE; + false; break; case OSKEY: evt->oskey = (event.val == KM_PRESS) ? ((evt->ctrl || evt->alt || evt->shift) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : - FALSE; + false; break; default: if (event.val == KM_PRESS && event.keymodifier == 0) @@ -3225,7 +3228,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U /* check other modifiers because ms-windows uses these to bring up the task manager */ (event.shift == 0 && event.ctrl == 0 && event.alt == 0)) { - G.is_break = TRUE; + G.is_break = true; } /* double click test - only for press */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index e4e7a91361d..952fb42d607 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -352,7 +352,7 @@ static int wm_read_exotic(Scene *UNUSED(scene), const char *name) } else { #if 0 /* historic stuff - no longer used */ - WM_cursor_wait(TRUE); + WM_cursor_wait(true); if (is_foo_format(name)) { read_foo(name); @@ -364,7 +364,7 @@ static int wm_read_exotic(Scene *UNUSED(scene), const char *name) retval = BKE_READ_EXOTIC_FAIL_FORMAT; } #if 0 - WM_cursor_wait(FALSE); + WM_cursor_wait(false); #endif } } @@ -413,7 +413,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) ListBase wmbase; /* assume automated tasks with background, don't write recent file list */ - const bool do_history = (G.background == FALSE) && (CTX_wm_manager(C)->op_undo_depth == 0); + const bool do_history = (G.background == false) && (CTX_wm_manager(C)->op_undo_depth == 0); /* put aside screens to match with persistent windows later */ /* also exit screens and editors */ @@ -460,7 +460,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first); ED_editors_init(C); - DAG_on_visible_update(CTX_data_main(C), TRUE); + DAG_on_visible_update(CTX_data_main(C), true); #ifdef WITH_PYTHON /* run any texts that were loaded in and flagged as modules */ @@ -650,7 +650,7 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const c BKE_write_undo(C, "original"); /* save current state */ ED_editors_init(C); - DAG_on_visible_update(CTX_data_main(C), TRUE); + DAG_on_visible_update(CTX_data_main(C), true); #ifdef WITH_PYTHON if (CTX_py_init_get(C)) { @@ -671,7 +671,7 @@ int wm_homefile_read(bContext *C, ReportList *reports, bool from_memory, const c CTX_wm_window_set(C, NULL); /* exits queues */ } - return TRUE; + return true; } int wm_history_read_exec(bContext *UNUSED(C), wmOperator *UNUSED(op)) @@ -823,11 +823,11 @@ static ImBuf *blend_file_thumb(Scene *scene, bScreen *screen, int **thumb_pt) if (scene->camera) { ibuf = ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2, - IB_rect, OB_SOLID, FALSE, FALSE, R_ADDSKY, err_out); + IB_rect, OB_SOLID, false, false, R_ADDSKY, err_out); } else { ibuf = ED_view3d_draw_offscreen_imbuf(scene, v3d, ar, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2, - IB_rect, FALSE, R_ADDSKY, err_out); + IB_rect, false, R_ADDSKY, err_out); } if (ibuf) { diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 6e34c776719..f0b468145e3 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -382,7 +382,7 @@ void wm_gesture_tag_redraw(bContext *C) ARegion *ar = CTX_wm_region(C); if (screen) - screen->do_draw_gesture = TRUE; + screen->do_draw_gesture = true; wm_tag_redraw_overlay(win, ar); } diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 5b1fd90a0df..5325ade011f 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -538,5 +538,5 @@ void WM_exit(bContext *C) } #endif - exit(G.is_break == TRUE); + exit(G.is_break == true); } diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index d26723e7f8c..7c0d7bf3606 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -230,13 +230,13 @@ bool WM_jobs_test(wmWindowManager *wm, void *owner, int job_type) if (wm_job->owner == owner) { if (job_type == WM_JOB_TYPE_ANY || (wm_job->job_type == job_type)) { if (wm_job->running || wm_job->suspended) { - return TRUE; + return true; } } } } - return FALSE; + return false; } float WM_jobs_progress(wmWindowManager *wm, void *owner) @@ -305,7 +305,7 @@ void WM_jobs_customdata_set(wmJob *wm_job, void *customdata, void (*free)(void * if (wm_job->running) { /* signal job to end */ - wm_job->stop = TRUE; + wm_job->stop = true; } } @@ -333,7 +333,7 @@ static void *do_job_thread(void *job_v) wmJob *wm_job = job_v; wm_job->startjob(wm_job->run_customdata, &wm_job->stop, &wm_job->do_update, &wm_job->progress); - wm_job->ready = TRUE; + wm_job->ready = true; return NULL; } @@ -342,11 +342,11 @@ static void *do_job_thread(void *job_v) static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test) { wmJob *wm_job; - int suspend = FALSE; + bool suspend = false; /* job added with suspend flag, we wait 1 timer step before activating it */ if (test->flag & WM_JOB_SUSPEND) { - suspend = TRUE; + suspend = true; test->flag &= ~WM_JOB_SUSPEND; } else { @@ -367,11 +367,11 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test) if (0 == (wm_job->flag & WM_JOB_EXCL_RENDER)) continue; - suspend = TRUE; + suspend = true; /* if this job has higher priority, stop others */ if (test->flag & WM_JOB_PRIORITY) { - wm_job->stop = TRUE; + wm_job->stop = true; // printf("job stopped: %s\n", wm_job->name); } } @@ -388,7 +388,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job) { if (wm_job->running) { /* signal job to end and restart */ - wm_job->stop = TRUE; + wm_job->stop = true; // printf("job started a running job, ending... %s\n", wm_job->name); } else { @@ -397,19 +397,19 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job) wm_jobs_test_suspend_stop(wm, wm_job); - if (wm_job->suspended == FALSE) { + if (wm_job->suspended == false) { /* copy to ensure proper free in end */ wm_job->run_customdata = wm_job->customdata; wm_job->run_free = wm_job->free; wm_job->free = NULL; wm_job->customdata = NULL; - wm_job->running = TRUE; + wm_job->running = true; if (wm_job->initjob) wm_job->initjob(wm_job->run_customdata); - wm_job->stop = FALSE; - wm_job->ready = FALSE; + wm_job->stop = false; + wm_job->ready = false; wm_job->progress = 0.0; // printf("job started: %s\n", wm_job->name); @@ -444,7 +444,7 @@ static void wm_jobs_kill_job(wmWindowManager *wm, wmJob *wm_job) { if (wm_job->running) { /* signal job to end */ - wm_job->stop = TRUE; + wm_job->stop = true; wm_job_main_thread_yield(wm_job, true); BLI_end_threads(&wm_job->threads); @@ -508,7 +508,7 @@ void WM_jobs_stop(wmWindowManager *wm, void *owner, void *startjob) for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) { if (wm_job->owner == owner || wm_job->startjob == startjob) { if (wm_job->running) { - wm_job->stop = TRUE; + wm_job->stop = true; } } } @@ -573,7 +573,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt) if (wm_job->flag & WM_JOB_PROGRESS) WM_event_add_notifier(C, NC_WM | ND_JOB, NULL); - wm_job->do_update = FALSE; + wm_job->do_update = false; } if (wm_job->ready) { @@ -593,7 +593,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt) PIL_check_seconds_timer() - wm_job->start_time); } - wm_job->running = FALSE; + wm_job->running = false; wm_job_main_thread_yield(wm_job, true); BLI_end_threads(&wm_job->threads); wm_job->main_thread_mutex_ending = false; @@ -654,9 +654,9 @@ bool WM_jobs_has_running(wmWindowManager *wm) for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) { if (wm_job->running) { - return TRUE; + return true; } } - return FALSE; + return false; } diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index d6ceb8caf29..c0326e3582b 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -400,10 +400,10 @@ static void keymap_event_set(wmKeyMapItem *kmi, short type, short val, int modif kmi->shift = kmi->ctrl = kmi->alt = kmi->oskey = KM_ANY; } else { - kmi->shift = (modifier & KM_SHIFT) ? KM_MOD_FIRST : ((modifier & KM_SHIFT2) ? KM_MOD_SECOND : FALSE); - kmi->ctrl = (modifier & KM_CTRL) ? KM_MOD_FIRST : ((modifier & KM_CTRL2) ? KM_MOD_SECOND : FALSE); - kmi->alt = (modifier & KM_ALT) ? KM_MOD_FIRST : ((modifier & KM_ALT2) ? KM_MOD_SECOND : FALSE); - kmi->oskey = (modifier & KM_OSKEY) ? KM_MOD_FIRST : ((modifier & KM_OSKEY2) ? KM_MOD_SECOND : FALSE); + kmi->shift = (modifier & KM_SHIFT) ? KM_MOD_FIRST : ((modifier & KM_SHIFT2) ? KM_MOD_SECOND : false); + kmi->ctrl = (modifier & KM_CTRL) ? KM_MOD_FIRST : ((modifier & KM_CTRL2) ? KM_MOD_SECOND : false); + kmi->alt = (modifier & KM_ALT) ? KM_MOD_FIRST : ((modifier & KM_ALT2) ? KM_MOD_SECOND : false); + kmi->oskey = (modifier & KM_OSKEY) ? KM_MOD_FIRST : ((modifier & KM_OSKEY2) ? KM_MOD_SECOND : false); } } @@ -1040,7 +1040,7 @@ static wmKeyMapItem *wm_keymap_item_find( wmKeyMapItem *found = wm_keymap_item_find_props(C, opname, opcontext, properties, is_strict, is_hotkey, keymap_r); if (!found && properties) { - wmOperatorType *ot = WM_operatortype_find(opname, TRUE); + wmOperatorType *ot = WM_operatortype_find(opname, true); if (ot) { /* make a copy of the properties and set any unset props * to their default values, so the ID property compare function succeeds */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 259324935e6..f0ee8318a55 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -364,7 +364,7 @@ wmOperatorType *WM_operatortype_append_macro(const char *idname, const char *nam { wmOperatorType *ot; - if (WM_operatortype_find(idname, TRUE)) { + if (WM_operatortype_find(idname, true)) { printf("%s: macro error: operator %s exists\n", __func__, idname); return NULL; } @@ -676,7 +676,7 @@ static char *wm_prop_pystring_from_context(bContext *C, PointerRNA *ptr, Propert */ /* don't get from the context store since this is normally set only for the UI and not usable elsewhere */ - ListBase lb = CTX_data_dir_get_ex(C, FALSE, TRUE, TRUE); + ListBase lb = CTX_data_dir_get_ex(C, false, true, true); LinkData *link; const char *member_found = NULL; @@ -943,7 +943,7 @@ bool WM_operator_properties_default(PointerRNA *ptr, const bool do_update) break; } default: - if ((do_update == false) || (RNA_property_is_set(ptr, prop) == FALSE)) { + if ((do_update == false) || (RNA_property_is_set(ptr, prop) == false)) { if (RNA_property_reset(ptr, prop, -1)) { changed = true; } @@ -1014,9 +1014,9 @@ void WM_operator_view3d_unit_defaults(struct bContext *C, struct wmOperator *op) PropertySubType pstype = RNA_property_subtype(prop); if (pstype == PROP_DISTANCE) { /* we don't support arrays yet */ - BLI_assert(RNA_property_array_check(prop) == FALSE); + BLI_assert(RNA_property_array_check(prop) == false); /* initialize */ - if (!RNA_property_is_set_ex(op->ptr, prop, FALSE)) { + if (!RNA_property_is_set_ex(op->ptr, prop, false)) { const float value = RNA_property_float_get_default(op->ptr, prop) * dia; RNA_property_float_set(op->ptr, prop, value); } @@ -1093,7 +1093,7 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op) event.type = EVT_BUT_OPEN; event.val = KM_PRESS; event.customdata = but; - event.customdatafree = FALSE; + event.customdatafree = false; wm_event_add(win, &event); return block; @@ -1161,9 +1161,9 @@ bool WM_operator_filesel_ensure_ext_imtype(wmOperator *op, const struct ImageFor RNA_property_string_set(op->ptr, prop, filepath); /* note, we could check for and update 'filename' here, * but so far nothing needs this. */ - return TRUE; + return true; } - return FALSE; + return false; } /* default properties for fileselect */ @@ -1228,7 +1228,7 @@ void WM_operator_properties_filesel(wmOperatorType *ot, int filter, short type, RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); if (flag & WM_FILESEL_RELPATH) - RNA_def_boolean(ot->srna, "relative_path", TRUE, "Relative Path", "Select the file relative to the blend file"); + RNA_def_boolean(ot->srna, "relative_path", true, "Relative Path", "Select the file relative to the blend file"); prop = RNA_def_enum(ot->srna, "display_type", file_display_items, display, "Display Type", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); @@ -1340,7 +1340,7 @@ int WM_operator_winactive(bContext *C) return 1; } -/* return FALSE, if the UI should be disabled */ +/* return false, if the UI should be disabled */ bool WM_operator_check_ui_enabled(const bContext *C, const char *idname) { wmWindowManager *wm = CTX_wm_manager(C); @@ -1409,7 +1409,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op) if (op == WM_operator_last_redo(C)) if (!WM_operator_check_ui_enabled(C, op->type->name)) - uiLayoutSetEnabled(layout, FALSE); + uiLayoutSetEnabled(layout, false); if (op->type->flag & OPTYPE_MACRO) { for (op = op->macro.first; op; op = op->next) { @@ -1442,7 +1442,7 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2) WM_operator_call_ex(C, data->op, true); /* let execute handle freeing it */ - //data->free_op = FALSE; + //data->free_op = false; //data->op = NULL; /* in this case, wm_operator_ui_popup_cancel wont run */ @@ -1492,7 +1492,7 @@ static uiBlock *wm_block_dialog_create(bContext *C, ARegion *ar, void *userData) uiLayout *col; uiBut *btn; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); col_block = uiLayoutGetBlock(col); /* Create OK button, the callback of which will execute op */ btn = uiDefBut(col_block, BUT, 0, IFACE_("OK"), 0, -30, 0, UI_UNIT_Y, NULL, 0, 0, 0, 0, ""); @@ -1564,7 +1564,7 @@ int WM_operator_ui_popup(bContext *C, wmOperator *op, int width, int height) data->op = op; data->width = width; data->height = height; - data->free_op = TRUE; /* if this runs and gets registered we may want not to free it */ + data->free_op = true; /* if this runs and gets registered we may want not to free it */ uiPupBlockEx(C, wm_operator_ui_create, NULL, wm_operator_ui_popup_cancel, data); return OPERATOR_RUNNING_MODAL; } @@ -1624,7 +1624,7 @@ int WM_operator_props_dialog_popup(bContext *C, wmOperator *op, int width, int h data->op = op; data->width = width; data->height = height; - data->free_op = TRUE; /* if this runs and gets registered we may want not to free it */ + data->free_op = true; /* if this runs and gets registered we may want not to free it */ /* op is not executed until popup OK but is clicked */ uiPupBlockEx(C, wm_block_dialog_create, wm_operator_ui_popup_ok, wm_operator_ui_popup_cancel, data); @@ -1743,7 +1743,7 @@ static int wm_resource_check_prev(void) // if (res) printf("LOCAL: %s\n", res); if (res) { - return FALSE; + return false; } else { return (BLI_get_folder_version(BLENDER_RESOURCE_PATH_USER, BLENDER_VERSION - 1, true) != NULL); @@ -1758,7 +1758,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar uiStyle *style = UI_GetStyle(); struct RecentFile *recent; int i; - MenuType *mt = WM_menutype_find("USERPREF_MT_splash", TRUE); + MenuType *mt = WM_menutype_find("USERPREF_MT_splash", true); char url[96]; char file[FILE_MAX]; @@ -1865,8 +1865,8 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar uiBlockSetEmboss(block, UI_EMBOSSP); uiLayoutSetOperatorContext(layout, WM_OP_EXEC_REGION_WIN); - split = uiLayoutSplit(layout, 0.0f, FALSE); - col = uiLayoutColumn(split, FALSE); + split = uiLayoutSplit(layout, 0.0f, false); + col = uiLayoutColumn(split, false); uiItemL(col, IFACE_("Links"), ICON_NONE); uiItemStringO(col, IFACE_("Support an Open Animation Movie"), ICON_URL, "WM_OT_url_open", "url", "http://cloud.blender.org/gooseberry"); @@ -1891,7 +1891,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar uiItemStringO(col, IFACE_("Python API Reference"), ICON_URL, "WM_OT_url_open", "url", url); uiItemL(col, "", ICON_NONE); - col = uiLayoutColumn(split, FALSE); + col = uiLayoutColumn(split, false); if (wm_resource_check_prev()) { uiItemO(col, NULL, ICON_NEW, "WM_OT_copy_prev_settings"); @@ -1960,7 +1960,7 @@ static uiBlock *wm_block_search_menu(bContext *C, ARegion *ar, void *UNUSED(arg_ event.type = EVT_BUT_OPEN; event.val = KM_PRESS; event.customdata = but; - event.customdatafree = FALSE; + event.customdatafree = false; wm_event_add(win, &event); return block; @@ -2762,9 +2762,9 @@ static bool blend_save_check(bContext *UNUSED(C), wmOperator *op) * we keep getting nitpicking bug reports about this - campbell */ BLI_ensure_extension(filepath, FILE_MAX, ".blend"); RNA_string_set(op->ptr, "filepath", filepath); - return TRUE; + return true; } - return FALSE; + return false; } static void WM_OT_save_as_mainfile(wmOperatorType *ot) @@ -4648,15 +4648,15 @@ void wm_window_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "WM_OT_link_append", OKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); kmi = WM_keymap_add_item(keymap, "WM_OT_link_append", F1KEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "link", FALSE); - RNA_boolean_set(kmi->ptr, "instance_groups", FALSE); + RNA_boolean_set(kmi->ptr, "link", false); + RNA_boolean_set(kmi->ptr, "instance_groups", false); WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0); WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", F2KEY, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_ALT | KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "copy", TRUE); + RNA_boolean_set(kmi->ptr, "copy", true); WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "WM_OT_quit_blender", QKEY, KM_PRESS, KM_CTRL, 0); @@ -4765,57 +4765,57 @@ static EnumPropertyItem *rna_id_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(pt /* can add more as needed */ EnumPropertyItem *RNA_action_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, false); } #if 0 /* UNUSED */ EnumPropertyItem *RNA_action_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, true); } #endif EnumPropertyItem *RNA_group_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->group.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->group.first : NULL, false); } EnumPropertyItem *RNA_group_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->group.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->group.first : NULL, true); } EnumPropertyItem *RNA_image_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, false); } EnumPropertyItem *RNA_image_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, true); } EnumPropertyItem *RNA_scene_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, false); } EnumPropertyItem *RNA_scene_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, true); } EnumPropertyItem *RNA_movieclip_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, false); } EnumPropertyItem *RNA_movieclip_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, true); } EnumPropertyItem *RNA_mask_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, FALSE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, false); } EnumPropertyItem *RNA_mask_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, TRUE); + return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, true); } diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index ab48e72562e..16c424f4aec 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -90,14 +90,15 @@ typedef struct PlayState { /* playback state */ short direction; short next_frame; - short once; - short turbo; - short pingpong; - short noskip; - short sstep; - short wait2; - short stopped; - short go; + + bool once; + bool turbo; + bool pingpong; + bool noskip; + bool sstep; + bool wait2; + bool stopped; + bool go; int fstep; @@ -213,7 +214,7 @@ typedef struct PlayAnimPict { } PlayAnimPict; static struct ListBase picsbase = {NULL, NULL}; -static int fromdisk = FALSE; +static bool fromdisk = false; static double ptottime = 0.0, swaptime = 0.04; static PlayAnimPict *playanim_step(PlayAnimPict *playanim, int step) @@ -385,7 +386,7 @@ static void build_pict_list(PlayState *ps, char *first, int totframes, int fstep picture->size = size; picture->IB_flags = IB_rect; - if (fromdisk == FALSE) { + if (fromdisk == false) { mem = (char *)MEM_mallocN(size, "build pic list"); if (mem == NULL) { printf("Couldn't get memory\n"); @@ -462,7 +463,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) val = ELEM(type, GHOST_kEventKeyDown, GHOST_kEventButtonDown); if (ps->wait2 && ps->stopped) { - ps->stopped = FALSE; + ps->stopped = false; } if (ps->wait2) { @@ -525,8 +526,8 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) break; case GHOST_kKeyLeftArrow: if (val) { - ps->sstep = TRUE; - ps->wait2 = FALSE; + ps->sstep = true; + ps->wait2 = false; if (g_WS.qual & WS_QUAL_SHIFT) { ps->picture = picsbase.first; ps->next_frame = 0; @@ -538,20 +539,20 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) break; case GHOST_kKeyDownArrow: if (val) { - ps->wait2 = FALSE; + ps->wait2 = false; if (g_WS.qual & WS_QUAL_SHIFT) { ps->next_frame = ps->direction = -1; } else { ps->next_frame = -10; - ps->sstep = TRUE; + ps->sstep = true; } } break; case GHOST_kKeyRightArrow: if (val) { - ps->sstep = TRUE; - ps->wait2 = FALSE; + ps->sstep = true; + ps->wait2 = false; if (g_WS.qual & WS_QUAL_SHIFT) { ps->picture = picsbase.last; ps->next_frame = 0; @@ -563,13 +564,13 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) break; case GHOST_kKeyUpArrow: if (val) { - ps->wait2 = FALSE; + ps->wait2 = false; if (g_WS.qual & WS_QUAL_SHIFT) { ps->next_frame = ps->direction = 1; } else { ps->next_frame = 10; - ps->sstep = TRUE; + ps->sstep = true; } } break; @@ -591,29 +592,29 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) case GHOST_kKeyNumpad0: if (val) { if (ps->once) { - ps->once = ps->wait2 = FALSE; + ps->once = ps->wait2 = false; } else { ps->picture = NULL; - ps->once = TRUE; - ps->wait2 = FALSE; + ps->once = true; + ps->wait2 = false; } } break; case GHOST_kKeyEnter: case GHOST_kKeyNumpadEnter: if (val) { - ps->wait2 = ps->sstep = FALSE; + ps->wait2 = ps->sstep = false; } break; case GHOST_kKeyPeriod: case GHOST_kKeyNumpadPeriod: if (val) { if (ps->sstep) { - ps->wait2 = FALSE; + ps->wait2 = false; } else { - ps->sstep = TRUE; + ps->sstep = true; ps->wait2 = !ps->wait2; } } @@ -643,7 +644,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) break; } case GHOST_kKeyEsc: - ps->go = FALSE; + ps->go = false; break; default: break; @@ -713,8 +714,8 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) if (ps->picture->next == NULL) break; ps->picture = ps->picture->next; } - ps->sstep = TRUE; - ps->wait2 = FALSE; + ps->sstep = true; + ps->wait2 = false; ps->next_frame = 0; } break; @@ -761,7 +762,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) case GHOST_kEventQuit: case GHOST_kEventWindowClose: { - ps->go = FALSE; + ps->go = false; break; } case GHOST_kEventDraggingDropDone: @@ -774,7 +775,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) for (a = 0; a < stra->count; a++) { BLI_strncpy(ps->dropped_file, (char *)stra->strings[a], sizeof(ps->dropped_file)); - ps->go = FALSE; + ps->go = false; printf("drop file %s\n", stra->strings[a]); break; /* only one drop element supported now */ } @@ -803,7 +804,7 @@ static void playanim_window_open(const char *title, int posx, int posy, int size /* could optionally start fullscreen */ GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, - FALSE /* no stereo */, FALSE); + false /* no stereo */, false); } static void playanim_window_zoom(PlayState *ps, const float zoom_offset) @@ -841,21 +842,21 @@ static char *wm_main_playanim_intern(int argc, const char **argv) PlayState ps = {0}; - /* ps.doubleb = TRUE;*/ /* UNUSED */ - ps.go = TRUE; - ps.direction = TRUE; + /* ps.doubleb = true;*/ /* UNUSED */ + ps.go = true; + ps.direction = true; ps.next_frame = 1; - ps.once = FALSE; - ps.turbo = FALSE; - ps.pingpong = FALSE; - ps.noskip = FALSE; - ps.sstep = FALSE; - ps.wait2 = FALSE; - ps.stopped = FALSE; + ps.once = false; + ps.turbo = false; + ps.pingpong = false; + ps.noskip = false; + ps.sstep = false; + ps.wait2 = false; + ps.stopped = false; ps.picture = NULL; ps.dropped_file[0] = 0; ps.zoom = 1.0f; - /* resetmap = FALSE */ + /* resetmap = false */ ps.fstep = 1; @@ -865,7 +866,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) if (argv[1][0] == '-') { switch (argv[1][1]) { case 'm': - fromdisk = TRUE; + fromdisk = true; break; case 'p': if (argc > 3) { @@ -1039,7 +1040,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) if (ps.picture == NULL) { printf("couldn't find pictures\n"); - ps.go = FALSE; + ps.go = false; } if (ps.pingpong) { if (ps.direction == 1) { @@ -1096,17 +1097,17 @@ static char *wm_main_playanim_intern(int argc, const char **argv) if (ps.once) { if (ps.picture->next == NULL) { - ps.wait2 = TRUE; + ps.wait2 = true; } else if (ps.picture->prev == NULL) { - ps.wait2 = TRUE; + ps.wait2 = true; } } ps.next_frame = ps.direction; - while ( (hasevent = GHOST_ProcessEvents(g_WS.ghost_system, 0)) || ps.wait2 != 0) { + while ((hasevent = GHOST_ProcessEvents(g_WS.ghost_system, 0)) || ps.wait2) { if (hasevent) { GHOST_DispatchEvents(g_WS.ghost_system); } @@ -1120,15 +1121,15 @@ static char *wm_main_playanim_intern(int argc, const char **argv) } } } - if (!ps.go) { + if (ps.go == false) { break; } } ps.wait2 = ps.sstep; - if (ps.wait2 == 0 && ps.stopped == 0) { - ps.stopped = TRUE; + if (ps.wait2 == false && ps.stopped == false) { + ps.stopped = true; } pupdate_time(); @@ -1140,10 +1141,10 @@ static char *wm_main_playanim_intern(int argc, const char **argv) if (ps.once && ps.picture != NULL) { if (ps.picture->next == NULL) { - ps.wait2 = TRUE; + ps.wait2 = true; } else if (ps.picture->prev == NULL) { - ps.wait2 = TRUE; + ps.wait2 = true; } } @@ -1154,7 +1155,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) ps.picture = playanim_step(ps.picture, ps.next_frame); } } - if (ps.go == FALSE) { + if (ps.go == false) { break; } } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index dfac1f25c89..1bd9f15ba66 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -254,8 +254,8 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *winorig) BLI_strncpy(win->screenname, win->screen->id.name + 2, sizeof(win->screenname)); win->screen->winid = win->winid; - win->screen->do_refresh = TRUE; - win->screen->do_draw = TRUE; + win->screen->do_refresh = true; + win->screen->do_draw = true; win->drawmethod = U.wmdrawmethod; win->drawdata = NULL; |