From 5dcf59a7e9589f4d4d7841aadbbaa1711e26bfec Mon Sep 17 00:00:00 2001 From: Jaidyn Ann Date: Sun, 1 Aug 2021 06:56:07 -0500 Subject: [PATCH] (libinterface/runview) Split RunView's URL highlighting into seperate class --- libs/libinterface/EnterTextView.cpp | 4 +- libs/libinterface/EnterTextView.h | 4 +- libs/libinterface/Makefile | 3 +- libs/libinterface/UrlTextView.cpp | 316 ++++++++++++++++++++++++++++ libs/libinterface/UrlTextView.h | 58 +++++ libs/librunview/RunView.cpp | 292 +------------------------ libs/librunview/RunView.h | 38 +--- 7 files changed, 385 insertions(+), 330 deletions(-) create mode 100644 libs/libinterface/UrlTextView.cpp create mode 100644 libs/libinterface/UrlTextView.h diff --git a/libs/libinterface/EnterTextView.cpp b/libs/libinterface/EnterTextView.cpp index 669623c..75792bd 100644 --- a/libs/libinterface/EnterTextView.cpp +++ b/libs/libinterface/EnterTextView.cpp @@ -10,7 +10,7 @@ EnterTextView::EnterTextView(const char* name) : - BTextView(name), + UrlTextView(name), fTarget(NULL) { } @@ -19,7 +19,7 @@ EnterTextView::EnterTextView(const char* name) EnterTextView::EnterTextView(const char* name, const BFont* initialFont, const rgb_color* initialColor, uint32 flags) : - BTextView(name, initialFont, initialColor, flags), + UrlTextView(name, initialFont, initialColor, flags), fTarget(NULL) { } diff --git a/libs/libinterface/EnterTextView.h b/libs/libinterface/EnterTextView.h index 4c26966..0154619 100644 --- a/libs/libinterface/EnterTextView.h +++ b/libs/libinterface/EnterTextView.h @@ -5,10 +5,10 @@ #ifndef _ENTER_TEXT_VIEW_H #define _ENTER_TEXT_VIEW_H -#include +#include "UrlTextView.h" -class EnterTextView : public BTextView { +class EnterTextView : public UrlTextView { public: EnterTextView(const char* name); EnterTextView(const char* name, const BFont* initialFont, diff --git a/libs/libinterface/Makefile b/libs/libinterface/Makefile index 6041a29..a6190ab 100644 --- a/libs/libinterface/Makefile +++ b/libs/libinterface/Makefile @@ -38,7 +38,8 @@ SRCS = \ libs/libinterface/Divider.cpp \ libs/libinterface/EnterTextView.cpp \ libs/libinterface/MenuButton.cpp \ - libs/libinterface/PictureView.cpp + libs/libinterface/PictureView.cpp \ + libs/libinterface/UrlTextView.cpp # Specify the resource definition files to use. Full or relative paths can be # used. diff --git a/libs/libinterface/UrlTextView.cpp b/libs/libinterface/UrlTextView.cpp new file mode 100644 index 0000000..df2ef7e --- /dev/null +++ b/libs/libinterface/UrlTextView.cpp @@ -0,0 +1,316 @@ +/* + * Copyright 2021, Jaidyn Levesque + * All rights reserved. Distributed under the terms of the MIT license. + */ + +#include "UrlTextView.h" + +#include +#include +#include +#include +#include +#include + + +const uint32 kSearchDdg = 'RVse'; +const uint32 kSearchDict = 'RVdc'; + + +UrlTextView::UrlTextView(const char* name) + : + UrlTextView(name, NULL, NULL, B_WILL_DRAW) +{ +} + + +UrlTextView::UrlTextView(const char* name, const BFont* initialFont, + const rgb_color* initialColor, uint32 flags) + : + BTextView(name, initialFont, initialColor, flags), + fUrlCursor(new BCursor(B_CURSOR_ID_FOLLOW_LINK)), + fMouseDown(false), + fSelecting(false) +{ + MakeEditable(false); + SetStylable(true); + AdoptSystemColors(); + SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); + + BFont urlFont; + urlFont.SetFace(B_REGULAR_FACE | B_UNDERSCORE_FACE); + text_run urlRun = { 0, urlFont, ui_color(B_LINK_TEXT_COLOR) }; + fUrlRun = { 1, {urlRun} }; +} + + +void +UrlTextView::MessageReceived(BMessage* msg) +{ + switch (msg->what) + { + case kSearchDdg: + case kSearchDict: + { + int32 start = 0; + int32 end = 0; + GetSelection(&start, &end); + if (start == end) + break; + char* buffer = new char[end - start]; + GetText(start, end - start, buffer); + + // Build query + BString query; + if (msg->what == kSearchDict) + query = "https://%lang%.wiktionary.org/w/index.php?search=%q%"; + else + query = "https://duckduckgo.com/?q=%q%"; + + BLanguage lang; + if (BLocale().GetLanguage(&lang) == B_OK) + query.ReplaceAll("%lang%", lang.Code()); + else + query.ReplaceAll("%lang", "eo"); + + query.ReplaceAll("%q%", BUrl::UrlEncode(BString(buffer))); + + // Send query + BUrl url(query.String()); + if (url.IsValid()) + url.OpenWithPreferredApplication(true); + break; + } + default: + BTextView::MessageReceived(msg); + } +} + + +void +UrlTextView::Insert(const char* text, const text_run_array* runs) +{ + BString buf(text); + + int32 specStart = 0; + int32 specEnd = 0; + int32 lastEnd = 0; + int32 length = buf.CountChars(); + + while (_FindUrlString(buf, &specStart, &specEnd, lastEnd) == true) { + if (lastEnd < specStart) { + BString normie; + buf.CopyCharsInto(normie, lastEnd, specStart - lastEnd); + BTextView::Insert(TextLength(), normie.String(), normie.Length(), + runs); + } + BString special; + buf.CopyCharsInto(special, specStart, specEnd - specStart); + BTextView::Insert(TextLength(), special.String(), special.Length(), + &fUrlRun); + + lastEnd = specEnd; + } + if (lastEnd < length) { + BString remaining; + buf.CopyCharsInto(remaining, lastEnd, length - lastEnd); + BTextView::Insert(TextLength(), remaining.String(), remaining.Length(), + runs); + } +} + + +void +UrlTextView::MouseDown(BPoint where) +{ + uint32 buttons = 0; + Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons); + + if (buttons & B_SECONDARY_MOUSE_BUTTON) + _RightClickPopUp(where)->Go(ConvertToScreen(where), true, false); + else + BTextView::MouseDown(where); + + if ((buttons & B_PRIMARY_MOUSE_BUTTON) && OverUrl(where)) { + fMouseDown = true; + + BUrl url(WordAt(where)); + if (url.IsValid() == true) { + fLastClicked = url; + } + } +} + + +void +UrlTextView::MouseUp(BPoint where) +{ + BTextView::MouseUp(where); + + if (fMouseDown && fSelecting == false && fLastClicked.IsValid() == true) { + fLastClicked.OpenWithPreferredApplication(true); + fLastClicked = BUrl(); + } + fMouseDown = false; + fSelecting = false; +} + + +void +UrlTextView::MouseMoved(BPoint where, uint32 code, const BMessage* drag) +{ + if (fSelecting == true) + return; + + if (code == B_INSIDE_VIEW) + if (OverUrl(where) == true) + SetViewCursor(fUrlCursor); + else + SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); +} + + +void +UrlTextView::Select(int32 startOffset, int32 endOffset) +{ + BTextView::Select(startOffset, endOffset); + if (startOffset < endOffset) { + fSelecting = true; + } +} + + +BString +UrlTextView::WordAt(BPoint point) +{ + int32 start = 0; + int32 end = 0; + BString word; + + FindWordAround(OffsetAt(point), &start, &end, &word); + return word; +} + + +void +UrlTextView::FindWordAround(int32 offset, int32* start, int32* end, BString* _word) +{ + int32 lineOffset = OffsetAt(LineAt(offset)); + const char* lineBuff = GetLine(LineAt(offset)); + BString line(lineBuff); + delete lineBuff; + + int32 wordStart = line.FindLast(" ", offset - lineOffset) + 1; + int32 wordEnd = line.FindFirst(" ", offset - lineOffset); + + if (wordStart == B_ERROR) + wordStart = 0; + if (wordEnd == B_ERROR) + wordEnd = line.CountChars(); + + *start = lineOffset + wordStart; + *end = lineOffset + wordEnd; + + if (_word != NULL) + line.CopyCharsInto(*_word, wordStart, wordEnd - wordStart); +} + + +const char* +UrlTextView::GetLine(int32 line) +{ + int32 length = 0; + int32 startOffset = OffsetAt(line); + int32 maxLength = TextLength() - startOffset; + while (length < maxLength && ByteAt(startOffset + length) != '\n') + length++; + + char* buffer = new char[length]; + GetText(startOffset, length, buffer); + return buffer; +} + + +bool +UrlTextView::OverText(BPoint where) +{ + int32 offset = OffsetAt(where); + BPoint point = PointAt(offset); + if (point.x + 10 < where.x) + return false; + return true; +} + + +bool +UrlTextView::OverUrl(BPoint where) +{ + if (OverText(where) == false) + return false; + + int32 offset = OffsetAt(where); + text_run_array* rArray = RunArray(offset, offset + 1); + text_run run = rArray->runs[0]; + text_run urlRun = fUrlRun.runs[0]; + + if (run.font.Face() == urlRun.font.Face() + && (run.color == urlRun.color)) + return true; + return false; +} + + +BPopUpMenu* +UrlTextView::_RightClickPopUp(BPoint where) +{ + BPopUpMenu* menu = new BPopUpMenu("rightClickPopUp"); + BMenuItem* ddgSearch = + new BMenuItem("Search" B_UTF8_ELLIPSIS, new BMessage(kSearchDdg)); + BMenuItem* dictSearch = + new BMenuItem("Dictionary" B_UTF8_ELLIPSIS, new BMessage(kSearchDict)); + BMenuItem* copy = + new BMenuItem("Copy", new BMessage(B_COPY), 'C', B_COMMAND_KEY); + BMenuItem* selectAll = new BMenuItem("Select all", + new BMessage(B_SELECT_ALL), 'A', B_COMMAND_KEY); + + // Try and ensure we have something selected + int32 start = 0; + int32 end = 0; + GetSelection(&start, &end); + + if (start == end && OverText(where) == true) { + start = 0; + end = 0; + FindWordAround(OffsetAt(where), &start, &end); + Select(start, end); + } + copy->SetEnabled(start < end); + dictSearch->SetEnabled(start < end); + ddgSearch->SetEnabled(start < end); + + menu->AddItem(ddgSearch); + menu->AddItem(dictSearch); + menu->AddSeparatorItem(); + menu->AddItem(copy); + menu->AddItem(selectAll); + menu->SetTargetForItems(this); + return menu; +} + + +bool +UrlTextView::_FindUrlString(BString text, int32* start, int32* end, int32 offset) +{ + int32 urlOffset = text.FindFirst("://", offset); + int32 urlStart = text.FindLast(" ", urlOffset) + 1; + int32 urlEnd = text.FindFirst(" ", urlOffset); + if (urlStart == B_ERROR) urlStart = 0; + if (urlEnd == B_ERROR) urlEnd = text.CountChars(); + + if (urlOffset != B_ERROR) { + *start = urlStart; + *end = urlEnd; + return true; + } + return false; +} diff --git a/libs/libinterface/UrlTextView.h b/libs/libinterface/UrlTextView.h new file mode 100644 index 0000000..a30a10d --- /dev/null +++ b/libs/libinterface/UrlTextView.h @@ -0,0 +1,58 @@ +/* + * Copyright 2021, Jaidyn Levesque + * All rights reserved. Distributed under the terms of the MIT license. + */ +#ifndef _URL_TEXT_VIEW_H +#define _URL_TEXT_VIEW_H + +#include +#include + +class BPopUpMenu; + + +/*! TextView that highlights and allows selecting of URLs― also provides a + * right-click pop-up menu with internet search options */ +class UrlTextView : public BTextView { +public: + UrlTextView(const char* name); + UrlTextView(const char* name, const BFont* initialFont, + const rgb_color* initialColor, uint32 flags); + + + virtual void MessageReceived(BMessage* msg); + + // Only differs in that it changes font face and color of any URLs + virtual void Insert(const char* text, const text_run_array* runs = NULL); + + virtual void MouseDown(BPoint where); + virtual void MouseUp(BPoint where); + virtual void MouseMoved(BPoint where, uint32 code, const BMessage* drag); + + virtual void Select(int32 startOffset, int32 endOffset); + + BString WordAt(BPoint point); + void FindWordAround(int32 offset, int32* start, int32* end, + BString* _word = NULL); + const char* GetLine(int32 line); + + bool OverText(BPoint where); + bool OverUrl(BPoint where); + +private: + BPopUpMenu* _RightClickPopUp(BPoint where); + + bool _FindUrlString(BString text, int32* start, int32* end, + int32 offset); + + // For safe-keeping + text_run_array fUrlRun; + BCursor* fUrlCursor; + + // Information between MouseDown and MouseUp + BUrl fLastClicked; + bool fMouseDown; + bool fSelecting; +}; + +#endif // _URL_TEXT_VIEW_H diff --git a/libs/librunview/RunView.cpp b/libs/librunview/RunView.cpp index 0122f9b..a3ad024 100644 --- a/libs/librunview/RunView.cpp +++ b/libs/librunview/RunView.cpp @@ -19,160 +19,11 @@ const uint32 kSearchDict = 'RVdc'; RunView::RunView(const char* name) : - BTextView(name), - fLastStyled(false), - fUrlCursor(new BCursor(B_CURSOR_ID_FOLLOW_LINK)), - fMouseDown(false), - fSelecting(false) + UrlTextView(name), + fLastStyled(false) { - MakeEditable(false); - SetStylable(true); - AdoptSystemColors(); - SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); - text_run run = { 0, BFont(), ui_color(B_PANEL_TEXT_COLOR) }; fDefaultRun = { 1, {run} }; - - BFont urlFont; - urlFont.SetFace(B_REGULAR_FACE | B_UNDERSCORE_FACE); - text_run urlRun = { 0, urlFont, ui_color(B_LINK_TEXT_COLOR) }; - fUrlRun = { 1, {urlRun} }; -} - - -void -RunView::MessageReceived(BMessage* msg) -{ - switch (msg->what) - { - case kSearchDdg: - case kSearchDict: - { - int32 start = 0; - int32 end = 0; - GetSelection(&start, &end); - if (start == end) - break; - char* buffer = new char[end - start]; - GetText(start, end - start, buffer); - - // Build query - BString query; - if (msg->what == kSearchDict) - query = "https://%lang%.wiktionary.org/w/index.php?search=%q%"; - else - query = "https://duckduckgo.com/?q=%q%"; - - BLanguage lang; - if (BLocale().GetLanguage(&lang) == B_OK) - query.ReplaceAll("%lang%", lang.Code()); - else - query.ReplaceAll("%lang", "eo"); - - query.ReplaceAll("%q%", BUrl::UrlEncode(BString(buffer))); - - // Send query - BUrl url(query.String()); - if (url.IsValid()) - url.OpenWithPreferredApplication(true); - break; - } - default: - BTextView::MessageReceived(msg); - } -} - - -void -RunView::Insert(const char* text, const text_run_array* runs) -{ - BString buf(text); - - int32 specStart = 0; - int32 specEnd = 0; - int32 lastEnd = 0; - int32 length = buf.CountChars(); - - while (_FindUrlString(buf, &specStart, &specEnd, lastEnd) == true) { - if (lastEnd < specStart) { - BString normie; - buf.CopyCharsInto(normie, lastEnd, specStart - lastEnd); - BTextView::Insert(TextLength(), normie.String(), normie.Length(), - runs); - } - BString special; - buf.CopyCharsInto(special, specStart, specEnd - specStart); - BTextView::Insert(TextLength(), special.String(), special.Length(), - &fUrlRun); - - lastEnd = specEnd; - } - if (lastEnd < length) { - BString remaining; - buf.CopyCharsInto(remaining, lastEnd, length - lastEnd); - BTextView::Insert(TextLength(), remaining.String(), remaining.Length(), - runs); - } -} - - -void -RunView::MouseDown(BPoint where) -{ - uint32 buttons = 0; - Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons); - - if (buttons & B_SECONDARY_MOUSE_BUTTON) - _RightClickPopUp(where)->Go(ConvertToScreen(where), true, false); - else - BTextView::MouseDown(where); - - if ((buttons & B_PRIMARY_MOUSE_BUTTON) && OverUrl(where)) { - fMouseDown = true; - - BUrl url(WordAt(where)); - if (url.IsValid() == true) { - fLastClicked = url; - } - } -} - - -void -RunView::MouseUp(BPoint where) -{ - BTextView::MouseUp(where); - - if (fMouseDown && fSelecting == false && fLastClicked.IsValid() == true) { - fLastClicked.OpenWithPreferredApplication(true); - fLastClicked = BUrl(); - } - fMouseDown = false; - fSelecting = false; -} - - -void -RunView::MouseMoved(BPoint where, uint32 code, const BMessage* drag) -{ - if (fSelecting == true) - return; - - if (code == B_INSIDE_VIEW) - if (OverUrl(where) == true) - SetViewCursor(fUrlCursor); - else - SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); -} - - -void -RunView::Select(int32 startOffset, int32 endOffset) -{ - BTextView::Select(startOffset, endOffset); - if (startOffset < endOffset) { - fSelecting = true; - } } @@ -214,147 +65,8 @@ RunView::Append(const char* text) } -BString -RunView::WordAt(BPoint point) -{ - int32 start = 0; - int32 end = 0; - BString word; - - FindWordAround(OffsetAt(point), &start, &end, &word); - return word; -} - - -void -RunView::FindWordAround(int32 offset, int32* start, int32* end, BString* _word) -{ - int32 lineOffset = OffsetAt(LineAt(offset)); - const char* lineBuff = GetLine(LineAt(offset)); - BString line(lineBuff); - delete lineBuff; - - int32 wordStart = line.FindLast(" ", offset - lineOffset) + 1; - int32 wordEnd = line.FindFirst(" ", offset - lineOffset); - - if (wordStart == B_ERROR) - wordStart = 0; - if (wordEnd == B_ERROR) - wordEnd = line.CountChars(); - - *start = lineOffset + wordStart; - *end = lineOffset + wordEnd; - - if (_word != NULL) - line.CopyCharsInto(*_word, wordStart, wordEnd - wordStart); -} - - -const char* -RunView::GetLine(int32 line) -{ - int32 length = 0; - int32 startOffset = OffsetAt(line); - int32 maxLength = TextLength() - startOffset; - while (length < maxLength && ByteAt(startOffset + length) != '\n') - length++; - - char* buffer = new char[length]; - GetText(startOffset, length, buffer); - return buffer; -} - - -bool -RunView::OverText(BPoint where) -{ - int32 offset = OffsetAt(where); - BPoint point = PointAt(offset); - if (point.x + 10 < where.x) - return false; - return true; -} - - -bool -RunView::OverUrl(BPoint where) -{ - if (OverText(where) == false) - return false; - - int32 offset = OffsetAt(where); - text_run_array* rArray = RunArray(offset, offset + 1); - text_run run = rArray->runs[0]; - text_run urlRun = fUrlRun.runs[0]; - text_run urlHover = fUrlHoverRun.runs[0]; - text_run urlVisit = fUrlVisitedRun.runs[0]; - - if (run.font.Face() == urlRun.font.Face() - && (run.color == urlRun.color || run.color == urlHover.color - || run.color == urlVisit.color)) - return true; - return false; -} - - void RunView::ScrollToBottom() { ScrollToOffset(TextLength()); } - - -BPopUpMenu* -RunView::_RightClickPopUp(BPoint where) -{ - BPopUpMenu* menu = new BPopUpMenu("rightClickPopUp"); - BMenuItem* ddgSearch = - new BMenuItem("Search" B_UTF8_ELLIPSIS, new BMessage(kSearchDdg)); - BMenuItem* dictSearch = - new BMenuItem("Dictionary" B_UTF8_ELLIPSIS, new BMessage(kSearchDict)); - BMenuItem* copy = - new BMenuItem("Copy", new BMessage(B_COPY), 'C', B_COMMAND_KEY); - BMenuItem* selectAll = new BMenuItem("Select all", - new BMessage(B_SELECT_ALL), 'A', B_COMMAND_KEY); - - // Try and ensure we have something selected - int32 start = 0; - int32 end = 0; - GetSelection(&start, &end); - - if (start == end && OverText(where) == true) { - start = 0; - end = 0; - FindWordAround(OffsetAt(where), &start, &end); - Select(start, end); - } - copy->SetEnabled(start < end); - dictSearch->SetEnabled(start < end); - ddgSearch->SetEnabled(start < end); - - menu->AddItem(ddgSearch); - menu->AddItem(dictSearch); - menu->AddSeparatorItem(); - menu->AddItem(copy); - menu->AddItem(selectAll); - menu->SetTargetForItems(this); - return menu; -} - - -bool -RunView::_FindUrlString(BString text, int32* start, int32* end, int32 offset) -{ - int32 urlOffset = text.FindFirst("://", offset); - int32 urlStart = text.FindLast(" ", urlOffset) + 1; - int32 urlEnd = text.FindFirst(" ", urlOffset); - if (urlStart == B_ERROR) urlStart = 0; - if (urlEnd == B_ERROR) urlEnd = text.CountChars(); - - if (urlOffset != B_ERROR) { - *start = urlStart; - *end = urlEnd; - return true; - } - return false; -} diff --git a/libs/librunview/RunView.h b/libs/librunview/RunView.h index 34648f6..c3bb3b7 100644 --- a/libs/librunview/RunView.h +++ b/libs/librunview/RunView.h @@ -5,62 +5,30 @@ #ifndef _RUN_VIEW_H #define _RUN_VIEW_H -#include #include +#include + class BPopUpMenu; -class RunView : public BTextView { +class RunView : public UrlTextView { public: RunView(const char* name); - virtual void MessageReceived(BMessage* msg); - - // Only differs in that it changes font face and color of any URLs - virtual void Insert(const char* text, const text_run_array* runs = NULL); - - virtual void MouseDown(BPoint where); - virtual void MouseUp(BPoint where); - virtual void MouseMoved(BPoint where, uint32 code, const BMessage* drag); - - virtual void Select(int32 startOffset, int32 endOffset); - void Append(const char* text, rgb_color color, BFont font); void Append(const char* text, rgb_color color, uint16 fontFace); void Append(const char* text, rgb_color color); void Append(const char* text); - BString WordAt(BPoint point); - void FindWordAround(int32 offset, int32* start, int32* end, - BString* _word = NULL); - const char* GetLine(int32 line); - - bool OverText(BPoint where); - bool OverUrl(BPoint where); - void ScrollToBottom(); private: - BPopUpMenu* _RightClickPopUp(BPoint where); - - bool _FindUrlString(BString text, int32* start, int32* end, - int32 offset); - // For safe-keeping text_run_array fDefaultRun; - text_run_array fUrlRun; - text_run_array fUrlHoverRun; - text_run_array fUrlVisitedRun; - BCursor* fUrlCursor; // Whether or not the run was changed from default bool fLastStyled; - - // Information between MouseDown and MouseUp - BUrl fLastClicked; - bool fMouseDown; - bool fSelecting; }; #endif // _RUN_VIEW_H