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

Refactor: Make it more obvious that wm_event_add is not a static function

Browse Source 
By renaming it to WM_ follow the other public functions.
This commit is contained in:
Sebastian Parborg
2025-02-25 14:06:16 +01:00
committed by Sebastian Parborg
parent 73b7edbe09
commit ec29eb6580
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.cc
View File

@@ -6709,7 +6709,7 @@ void UI_but_focus_on_enter_event(wmWindow *win, uiBut *but)
event.customdata = but;
event.customdata_free = false;
wm_event_add(win, &event);
WM_event_add(win, &event);
}
void UI_but_func_hold_set(uiBut *but, uiButHandleHoldFunc func, void *argN)

2
source/blender/editors/screen/screen_ops.cc
View File

@@ -1084,7 +1084,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
event.customdata_free = true;
op->customdata = nullptr;
wm_event_add(win, &event);
WM_event_add(win, &event);
}
static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)

4
source/blender/windowmanager/WM_api.hh
View File

@@ -741,10 +741,10 @@ void WM_global_report(eReportType type, const char *message);
*/
void WM_global_reportf(eReportType type, const char *format, ...) ATTR_PRINTF_FORMAT(2, 3);
wmEvent *wm_event_add_ex(wmWindow *win,
wmEvent *WM_event_add_ex(wmWindow *win,
const wmEvent *event_to_add,
const wmEvent *event_to_add_after) ATTR_NONNULL(1, 2);
wmEvent *wm_event_add(wmWindow *win, const wmEvent *event_to_add) ATTR_NONNULL(1, 2);
wmEvent *WM_event_add(wmWindow *win, const wmEvent *event_to_add) ATTR_NONNULL(1, 2);
void wm_event_init_from_window(wmWindow *win, wmEvent *event);

40
source/blender/windowmanager/intern/wm_event_system.cc
View File

@@ -177,7 +177,7 @@ static bool screen_temp_region_exists(const ARegion *region)
/** \name Event Management
* \{ */
wmEvent *wm_event_add_ex(wmWindow *win,
wmEvent *WM_event_add_ex(wmWindow *win,
const wmEvent *event_to_add,
const wmEvent *event_to_add_after)
{
@@ -196,9 +196,9 @@ wmEvent *wm_event_add_ex(wmWindow *win,
return event;
}
wmEvent *wm_event_add(wmWindow *win, const wmEvent *event_to_add)
wmEvent *WM_event_add(wmWindow *win, const wmEvent *event_to_add)
{
return wm_event_add_ex(win, event_to_add, nullptr);
return WM_event_add_ex(win, event_to_add, nullptr);
}
wmEvent *WM_event_add_simulate(wmWindow *win, const wmEvent *event_to_add)
@@ -207,7 +207,7 @@ wmEvent *WM_event_add_simulate(wmWindow *win, const wmEvent *event_to_add)
BLI_assert_unreachable();
return nullptr;
}
wmEvent *event = wm_event_add(win, event_to_add);
wmEvent *event = WM_event_add(win, event_to_add);
/* Logic for setting previous value is documented on the #wmEvent struct,
* see #wm_event_add_ghostevent for the implementation of logic this follows. */
@@ -4288,7 +4288,7 @@ void wm_event_do_handlers(bContext *C)
tevent.prev_xy[0] = tevent.xy[0];
tevent.prev_xy[1] = tevent.xy[1];
tevent.flag = (eWM_EventFlag)0;
wm_event_add(win, &tevent);
WM_event_add(win, &tevent);
win->addmousemove = 0;
}
@@ -4320,7 +4320,7 @@ void WM_event_fileselect_event(wmWindowManager *wm, void *ophandle, const int ev
event.flag = (eWM_EventFlag)0;
event.customdata = ophandle; /* Only as void pointer type check. */
wm_event_add(win, &event);
WM_event_add(win, &event);
}
}
@@ -5585,7 +5585,7 @@ static wmEvent *wm_event_add_mousemove(wmWindow *win, const wmEvent *event)
event_last->flag = (eWM_EventFlag)0;
}
wmEvent *event_new = wm_event_add(win, event);
wmEvent *event_new = WM_event_add(win, event);
if (event_last == nullptr) {
event_last = win->eventstate;
}
@@ -5618,7 +5618,7 @@ static wmEvent *wm_event_add_mousemove_to_head(wmWindow *win)
tevent.val = KM_NOTHING;
copy_v2_v2_int(tevent.prev_xy, tevent.xy);
wmEvent *event_new = wm_event_add(win, &tevent);
wmEvent *event_new = WM_event_add(win, &tevent);
BLI_remlink(&win->event_queue, event_new);
BLI_addhead(&win->event_queue, event_new);
@@ -5639,7 +5639,7 @@ static wmEvent *wm_event_add_trackpad(wmWindow *win, const wmEvent *event, int d
}
/* Set prev_xy, the delta is computed from this in operators. */
wmEvent *event_new = wm_event_add(win, event);
wmEvent *event_new = WM_event_add(win, event);
event_new->prev_xy[0] = event_new->xy[0] - deltax;
event_new->prev_xy[1] = event_new->xy[1] - deltay;
@@ -5964,10 +5964,10 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
event_other.val = event.val;
event_other.tablet = event.tablet;
wm_event_add(win_other, &event_other);
WM_event_add(win_other, &event_other);
}
else {
wm_event_add(win, &event);
WM_event_add(win, &event);
}
break;
@@ -6132,7 +6132,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
}
if (!wm_event_is_ignorable_key_press(win, event)) {
wm_event_add(win, &event);
WM_event_add(win, &event);
}
break;
@@ -6162,7 +6162,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
* instead of generating multiple events. */
event.val = KM_PRESS;
for (int i = 0; i < click_step; i++) {
wm_event_add(win, &event);
WM_event_add(win, &event);
}
break;
@@ -6173,7 +6173,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
event.type = NDOF_MOTION;
event.val = KM_NOTHING;
attach_ndof_data(&event, static_cast<const GHOST_TEventNDOFMotionData *>(customdata));
wm_event_add(win, &event);
WM_event_add(win, &event);
CLOG_INFO(WM_LOG_HANDLERS, 1, "sending NDOF_MOTION, prev = %d %d", event.xy[0], event.xy[1]);
break;
@@ -6204,7 +6204,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
event_state_prev_press_time_ms_p,
(GHOST_TEventType)type);
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
@@ -6216,7 +6216,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
case GHOST_kEventWindowDeactivate: {
event.type = WINDEACTIVATE;
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
@@ -6228,20 +6228,20 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
BLI_assert(win->ime_data != nullptr);
win->ime_data_is_composing = true;
event.type = WM_IME_COMPOSITE_START;
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
case GHOST_kEventImeComposition: {
event.val = KM_PRESS;
event.type = WM_IME_COMPOSITE_EVENT;
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
case GHOST_kEventImeCompositionEnd: {
event.val = KM_PRESS;
win->ime_data_is_composing = false;
event.type = WM_IME_COMPOSITE_END;
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
#endif /* WITH_INPUT_IME */
@@ -6265,7 +6265,7 @@ void wm_event_add_xrevent(wmWindow *win, wmXrActionData *actiondata, short val)
event.customdata = actiondata;
event.customdata_free = true;
wm_event_add(win, &event);
WM_event_add(win, &event);
}
#endif /* WITH_XR_OPENXR */

8
source/blender/windowmanager/intern/wm_window.cc
View File

@@ -1568,7 +1568,7 @@ static bool ghost_event_proc(GHOST_EventHandle ghost_event, GHOST_TUserDataPtr C
copy_v2_v2_int(event.prev_xy, event.xy);
event.flag = eWM_EventFlag(0);
wm_event_add(win, &event);
WM_event_add(win, &event);
break;
}
@@ -1730,7 +1730,7 @@ static bool ghost_event_proc(GHOST_EventHandle ghost_event, GHOST_TUserDataPtr C
wm->winactive = win;
win->active = 1;
wm_event_add(win, &event);
WM_event_add(win, &event);
/* Make blender drop event with custom data pointing to wm drags. */
event.type = EVT_DROP;
@@ -1739,7 +1739,7 @@ static bool ghost_event_proc(GHOST_EventHandle ghost_event, GHOST_TUserDataPtr C
event.customdata = &wm->drags;
event.customdata_free = true;
wm_event_add(win, &event);
WM_event_add(win, &event);
// printf("Drop detected\n");
@@ -1878,7 +1878,7 @@ static bool wm_window_timers_process(const bContext *C, int *sleep_us_p)
event.flag = eWM_EventFlag(0);
event.custom = EVT_DATA_TIMER;
event.customdata = wt;
wm_event_add(win, &event);
WM_event_add(win, &event);
has_event = true;
}