From 5518106cd80508c20dc0dec6ebc761ee54c30204 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 8 Oct 2021 08:32:28 +1100 Subject: Feature [feature-requests:#1417] Use global IsControl instead of local function. --- src/EditView.cxx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src') diff --git a/src/EditView.cxx b/src/EditView.cxx index 3ab4c17a5..3ad33f2d6 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -368,12 +368,6 @@ inline char CaseForce(Style::CaseForce caseForce, char chDoc, char chPrevious) n } } -constexpr bool IsControlCharacter(int ch) noexcept { - // iscntrl returns true for lots of chars > 127 which are displayable, - // currently only check C0 control characters. - return (ch >= 0 && ch < ' ') || (ch == 127); -} - bool ViewIsASCII(std::string_view text) { return std::all_of(text.cbegin(), text.cend(), IsASCII); } @@ -1673,7 +1667,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt } else if ((caretShape == ViewStyle::CaretShape::block) || imeCaretBlockOverride) { /* Block caret */ rcCaret.left = xposCaret; - if (canDrawBlockCaret && !(IsControlCharacter(ll->chars[offset]))) { + if (canDrawBlockCaret && !(IsControl(ll->chars[offset]))) { drawBlockCaret = true; rcCaret.right = xposCaret + widthOverstrikeCaret; } else { -- cgit v1.2.3