From 379b02c5cf1db5999558d0d01462cefb837193db Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 15 Jan 2022 12:14:15 -0500 Subject: [PATCH] ncplayer: use modifier accessors --- src/player/play.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/player/play.cpp b/src/player/play.cpp index c13d29751..d0f96d4fc 100644 --- a/src/player/play.cpp +++ b/src/player/play.cpp @@ -126,14 +126,14 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts, return 0; }else if(keyp == ' '){ // space for unpause continue; - }else if(keyp == 'L' && ni.ctrl && !ni.alt){ + }else if(keyp == 'L' && ncinput_ctrl_p(&ni) && !ncinput_alt_p(&ni)){ nc.refresh(nullptr, nullptr); continue; - }else if(keyp >= '0' && keyp <= '6' && !ni.alt && !ni.ctrl){ + }else if(keyp >= '0' && keyp <= '6' && !ncinput_alt_p(&ni) && !ncinput_ctrl_p(&ni)){ marsh->blitter = static_cast(keyp - '0'); vopts->blitter = marsh->blitter; continue; - }else if(keyp >= '7' && keyp <= '9' && !ni.alt && !ni.ctrl){ + }else if(keyp >= '7' && keyp <= '9' && !ncinput_alt_p(&ni) && !ncinput_ctrl_p(&ni)){ continue; // don't error out }else if(keyp == NCKey::Up){ // FIXME move backwards significantly