mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 01:48:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Handle the XR_SESSION_NOT_FOCUSED case for XRInput

Browse source
This commit is contained in:
Zhongwang Zhang 2023-11-15 16:52:44 +08:00 committed by Jakob Bornecrantz
parent af015a2b04
commit bb6e8eb9f8
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xrt/state_trackers/oxr/oxr_input.c
View file

@ -1047,8 +1047,10 @@ oxr_action_cache_update(struct oxr_logger *log,
return; return;
} }
// If the input is not active signal that. bool is_focused = sess->state == XR_SESSION_STATE_FOCUSED;
if (!is_active) {
// If the input is not active signal or the session state is not in focused that.
if (!is_focused || !is_active) {
// Reset all state. // Reset all state.
U_ZERO(&cache->current); U_ZERO(&cache->current);
return; return;
@ -2015,14 +2017,16 @@ oxr_action_apply_haptic_feedback(struct oxr_logger *log,
stop_ns = now_ns + data->duration; stop_ns = now_ns + data->duration;
} }
bool is_focused = sess->state == XR_SESSION_STATE_FOCUSED;
#define SET_OUT_VIBRATION(X) \ #define SET_OUT_VIBRATION(X) \
if (act_attached->X.current.active && (subaction_paths.X || subaction_paths.any)) { \ if (is_focused && act_attached->X.current.active && (subaction_paths.X || subaction_paths.any)) { \
set_action_output_vibration(sess, &act_attached->X, stop_ns, data); \ set_action_output_vibration(sess, &act_attached->X, stop_ns, data); \
} }
OXR_FOR_EACH_SUBACTION_PATH(SET_OUT_VIBRATION) OXR_FOR_EACH_SUBACTION_PATH(SET_OUT_VIBRATION)
#undef SET_OUT_VIBRATION #undef SET_OUT_VIBRATION
return oxr_session_success_result(sess); return oxr_session_success_focused_result(sess);
} }
XrResult XrResult
@ -2038,13 +2042,15 @@ oxr_action_stop_haptic_feedback(struct oxr_logger *log,
return oxr_error(log, XR_ERROR_ACTIONSET_NOT_ATTACHED, "Action has not been attached to this session"); return oxr_error(log, XR_ERROR_ACTIONSET_NOT_ATTACHED, "Action has not been attached to this session");
} }
bool is_focused = sess->state == XR_SESSION_STATE_FOCUSED;
#define STOP_VIBRATION(X) \ #define STOP_VIBRATION(X) \
if (act_attached->X.current.active && (subaction_paths.X || subaction_paths.any)) { \ if (is_focused && act_attached->X.current.active && (subaction_paths.X || subaction_paths.any)) { \
oxr_action_cache_stop_output(log, sess, &act_attached->X); \ oxr_action_cache_stop_output(log, sess, &act_attached->X); \
} }
OXR_FOR_EACH_SUBACTION_PATH(STOP_VIBRATION) OXR_FOR_EACH_SUBACTION_PATH(STOP_VIBRATION)
#undef STOP_VIBRATION #undef STOP_VIBRATION
return oxr_session_success_result(sess); return oxr_session_success_focused_result(sess);
} }