aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/ScintillaGTK.cxx16
-rw-r--r--gtk/ScintillaGTK.h6
-rw-r--r--gtk/ScintillaGTKAccessible.cxx58
-rw-r--r--gtk/ScintillaGTKAccessible.h36
4 files changed, 58 insertions, 58 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 46a4b488f..a5c09c8e2 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1029,7 +1029,7 @@ PRectangle ScintillaGTK::GetClientRectangle() const {
return rc;
}
-void ScintillaGTK::ScrollText(int linesToMove) {
+void ScintillaGTK::ScrollText(Sci::Line linesToMove) {
int diff = vs.lineHeight * -linesToMove;
//Platform::DebugPrintf("ScintillaGTK::ScrollText %d %d %0d,%0d %0d,%0d\n", linesToMove, diff,
// rc.left, rc.top, rc.right, rc.bottom);
@@ -1052,7 +1052,7 @@ void ScintillaGTK::SetHorizontalScrollPos() {
gtk_adjustment_set_value(GTK_ADJUSTMENT(adjustmenth), xOffset);
}
-bool ScintillaGTK::ModifyScrollBars(int nMax, int nPage) {
+bool ScintillaGTK::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
bool modified = false;
int pageScroll = LinesToScroll();
@@ -2763,7 +2763,7 @@ gboolean ScintillaGTK::DragMotion(GtkWidget *widget, GdkDragContext *context,
void ScintillaGTK::DragLeave(GtkWidget *widget, GdkDragContext * /*context*/, guint) {
ScintillaGTK *sciThis = FromWidget(widget);
try {
- sciThis->SetDragPosition(SelectionPosition(invalidPosition));
+ sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
//Platform::DebugPrintf("DragLeave %x\n", sciThis);
} catch (...) {
sciThis->errorStatus = SC_STATUS_FAILURE;
@@ -2776,7 +2776,7 @@ void ScintillaGTK::DragEnd(GtkWidget *widget, GdkDragContext * /*context*/) {
// If drag did not result in drop here or elsewhere
if (!sciThis->dragWasDropped)
sciThis->SetEmptySelection(sciThis->posDrag);
- sciThis->SetDragPosition(SelectionPosition(invalidPosition));
+ sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
//Platform::DebugPrintf("DragEnd %x %d\n", sciThis, sciThis->dragWasDropped);
sciThis->inDragDrop = ddNone;
} catch (...) {
@@ -2789,7 +2789,7 @@ gboolean ScintillaGTK::Drop(GtkWidget *widget, GdkDragContext * /*context*/,
ScintillaGTK *sciThis = FromWidget(widget);
try {
//Platform::DebugPrintf("Drop %x\n", sciThis);
- sciThis->SetDragPosition(SelectionPosition(invalidPosition));
+ sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
} catch (...) {
sciThis->errorStatus = SC_STATUS_FAILURE;
}
@@ -2801,7 +2801,7 @@ void ScintillaGTK::DragDataReceived(GtkWidget *widget, GdkDragContext * /*contex
ScintillaGTK *sciThis = FromWidget(widget);
try {
sciThis->ReceivedDrop(selection_data);
- sciThis->SetDragPosition(SelectionPosition(invalidPosition));
+ sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
} catch (...) {
sciThis->errorStatus = SC_STATUS_FAILURE;
}
@@ -2832,7 +2832,7 @@ void ScintillaGTK::DragDataGet(GtkWidget *widget, GdkDragContext *context,
}
sciThis->ClearSelection();
}
- sciThis->SetDragPosition(SelectionPosition(invalidPosition));
+ sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
} catch (...) {
sciThis->errorStatus = SC_STATUS_FAILURE;
}
@@ -2870,7 +2870,7 @@ void ScintillaGTK::IdleWork() {
styleIdleID = 0;
}
-void ScintillaGTK::QueueIdleWork(WorkNeeded::workItems items, int upTo) {
+void ScintillaGTK::QueueIdleWork(WorkNeeded::workItems items, Sci::Position upTo) {
Editor::QueueIdleWork(items, upTo);
if (!styleIdleID) {
// Only allow one style needed to be queued
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h
index 4ee55a6c8..225247c8f 100644
--- a/gtk/ScintillaGTK.h
+++ b/gtk/ScintillaGTK.h
@@ -111,10 +111,10 @@ private:
virtual bool PaintContains(PRectangle rc);
void FullPaint();
virtual PRectangle GetClientRectangle() const;
- virtual void ScrollText(int linesToMove);
+ virtual void ScrollText(Sci::Line linesToMove);
virtual void SetVerticalScrollPos();
virtual void SetHorizontalScrollPos();
- virtual bool ModifyScrollBars(int nMax, int nPage);
+ virtual bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage);
void ReconfigureScrollBars();
virtual void NotifyChange();
virtual void NotifyFocus(bool focus);
@@ -231,7 +231,7 @@ private:
static gboolean IdleCallback(gpointer pSci);
static gboolean StyleIdle(gpointer pSci);
virtual void IdleWork();
- virtual void QueueIdleWork(WorkNeeded::workItems items, int upTo);
+ virtual void QueueIdleWork(WorkNeeded::workItems items, Sci::Position upTo);
virtual void SetDocPointer(Document *document);
static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis);
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 5cabb5aa3..3b54ff1a8 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -168,7 +168,7 @@ ScintillaGTKAccessible::~ScintillaGTKAccessible() {
}
}
-gchar *ScintillaGTKAccessible::GetTextRangeUTF8(Position startByte, Position endByte) {
+gchar *ScintillaGTKAccessible::GetTextRangeUTF8(Sci::Position startByte, Sci::Position endByte) {
g_return_val_if_fail(startByte >= 0, NULL);
// FIXME: should we swap start/end if necessary?
g_return_val_if_fail(endByte >= startByte, NULL);
@@ -196,7 +196,7 @@ gchar *ScintillaGTKAccessible::GetTextRangeUTF8(Position startByte, Position end
}
gchar *ScintillaGTKAccessible::GetText(int startChar, int endChar) {
- Position startByte, endByte;
+ Sci::Position startByte, endByte;
if (endChar == -1) {
startByte = ByteOffsetFromCharacterOffset(startChar);
endByte = sci->pdoc->Length();
@@ -210,8 +210,8 @@ gchar *ScintillaGTKAccessible::GetTextAfterOffset(int charOffset,
AtkTextBoundary boundaryType, int *startChar, int *endChar) {
g_return_val_if_fail(charOffset >= 0, NULL);
- Position startByte, endByte;
- Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position startByte, endByte;
+ Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
switch (boundaryType) {
case ATK_TEXT_BOUNDARY_CHAR:
@@ -261,8 +261,8 @@ gchar *ScintillaGTKAccessible::GetTextBeforeOffset(int charOffset,
AtkTextBoundary boundaryType, int *startChar, int *endChar) {
g_return_val_if_fail(charOffset >= 0, NULL);
- Position startByte, endByte;
- Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position startByte, endByte;
+ Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
switch (boundaryType) {
case ATK_TEXT_BOUNDARY_CHAR:
@@ -323,8 +323,8 @@ gchar *ScintillaGTKAccessible::GetTextAtOffset(int charOffset,
AtkTextBoundary boundaryType, int *startChar, int *endChar) {
g_return_val_if_fail(charOffset >= 0, NULL);
- Position startByte, endByte;
- Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position startByte, endByte;
+ Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
switch (boundaryType) {
case ATK_TEXT_BOUNDARY_CHAR:
@@ -386,8 +386,8 @@ gchar *ScintillaGTKAccessible::GetStringAtOffset(int charOffset,
AtkTextGranularity granularity, int *startChar, int *endChar) {
g_return_val_if_fail(charOffset >= 0, NULL);
- Position startByte, endByte;
- Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position startByte, endByte;
+ Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
switch (granularity) {
case ATK_TEXT_GRANULARITY_CHAR:
@@ -417,8 +417,8 @@ gchar *ScintillaGTKAccessible::GetStringAtOffset(int charOffset,
gunichar ScintillaGTKAccessible::GetCharacterAtOffset(int charOffset) {
g_return_val_if_fail(charOffset >= 0, 0);
- Position startByte = ByteOffsetFromCharacterOffset(charOffset);
- Position endByte = PositionAfter(startByte);
+ Sci::Position startByte = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position endByte = PositionAfter(startByte);
gchar *ch = GetTextRangeUTF8(startByte, endByte);
gunichar unichar = g_utf8_get_char_validated(ch, -1);
g_free(ch);
@@ -466,7 +466,7 @@ void ScintillaGTKAccessible::GetCharacterExtents(int charOffset,
gint *x, gint *y, gint *width, gint *height, AtkCoordType coords) {
*x = *y = *height = *width = 0;
- Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+ Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
// FIXME: should we handle scrolling?
*x = sci->WndProc(SCI_POINTXFROMPOSITION, 0, byteOffset);
@@ -550,7 +550,7 @@ AtkAttributeSet *ScintillaGTKAccessible::GetAttributesForStyle(unsigned int styl
AtkAttributeSet *ScintillaGTKAccessible::GetRunAttributes(int charOffset, int *startChar, int *endChar) {
g_return_val_if_fail(charOffset >= -1, NULL);
- Position byteOffset;
+ Sci::Position byteOffset;
if (charOffset == -1) {
byteOffset = sci->WndProc(SCI_GETCURRENTPOS, 0, 0);
} else {
@@ -562,11 +562,11 @@ AtkAttributeSet *ScintillaGTKAccessible::GetRunAttributes(int charOffset, int *s
const char style = StyleAt(byteOffset, true);
// compute the range for this style
- Position startByte = byteOffset;
+ Sci::Position startByte = byteOffset;
// when going backwards, we know the style is already computed
while (startByte > 0 && sci->pdoc->StyleAt((startByte) - 1) == style)
(startByte)--;
- Position endByte = byteOffset + 1;
+ Sci::Position endByte = byteOffset + 1;
while (endByte < length && StyleAt(endByte, true) == style)
(endByte)++;
@@ -586,8 +586,8 @@ gchar *ScintillaGTKAccessible::GetSelection(gint selection_num, int *startChar,
if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count())
return NULL;
- Position startByte = sci->sel.Range(selection_num).Start().Position();
- Position endByte = sci->sel.Range(selection_num).End().Position();
+ Sci::Position startByte = sci->sel.Range(selection_num).Start().Position();
+ Sci::Position endByte = sci->sel.Range(selection_num).End().Position();
CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
return GetTextRangeUTF8(startByte, endByte);
@@ -595,7 +595,7 @@ gchar *ScintillaGTKAccessible::GetSelection(gint selection_num, int *startChar,
gboolean ScintillaGTKAccessible::AddSelection(int startChar, int endChar) {
size_t n_selections = sci->sel.Count();
- Position startByte, endByte;
+ Sci::Position startByte, endByte;
ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
// use WndProc() to set the selections so it notifies as needed
if (n_selections > 1 || ! sci->sel.Empty()) {
@@ -627,7 +627,7 @@ gboolean ScintillaGTKAccessible::SetSelection(gint selection_num, int startChar,
if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count())
return FALSE;
- Position startByte, endByte;
+ Sci::Position startByte, endByte;
ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
sci->WndProc(SCI_SETSELECTIONNSTART, selection_num, startByte);
@@ -668,7 +668,7 @@ void ScintillaGTKAccessible::SetTextContents(const gchar *contents) {
}
}
-bool ScintillaGTKAccessible::InsertStringUTF8(Position bytePos, const gchar *utf8, int lengthBytes) {
+bool ScintillaGTKAccessible::InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes) {
if (sci->pdoc->IsReadOnly()) {
return false;
}
@@ -688,7 +688,7 @@ bool ScintillaGTKAccessible::InsertStringUTF8(Position bytePos, const gchar *utf
}
void ScintillaGTKAccessible::InsertText(const gchar *text, int lengthBytes, int *charPosition) {
- Position bytePosition = ByteOffsetFromCharacterOffset(*charPosition);
+ Sci::Position bytePosition = ByteOffsetFromCharacterOffset(*charPosition);
// FIXME: should we update the target?
if (InsertStringUTF8(bytePosition, text, lengthBytes)) {
@@ -697,7 +697,7 @@ void ScintillaGTKAccessible::InsertText(const gchar *text, int lengthBytes, int
}
void ScintillaGTKAccessible::CopyText(int startChar, int endChar) {
- Position startByte, endByte;
+ Sci::Position startByte, endByte;
ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
sci->CopyRangeToClipboard(startByte, endByte);
}
@@ -716,7 +716,7 @@ void ScintillaGTKAccessible::DeleteText(int startChar, int endChar) {
g_return_if_fail(endChar >= startChar);
if (! sci->pdoc->IsReadOnly()) {
- Position startByte, endByte;
+ Sci::Position startByte, endByte;
ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
if (! sci->RangeContainsProtected(startByte, endByte)) {
@@ -735,13 +735,13 @@ void ScintillaGTKAccessible::PasteText(int charPosition) {
// has always done that without problems, so let's guess it's a fairly safe bet.
struct Helper : GObjectWatcher {
ScintillaGTKAccessible *scia;
- Position bytePosition;
+ Sci::Position bytePosition;
void Destroyed() override {
scia = 0;
}
- Helper(ScintillaGTKAccessible *scia_, Position bytePos_) :
+ Helper(ScintillaGTKAccessible *scia_, Sci::Position bytePos_) :
GObjectWatcher(G_OBJECT(scia_->sci->sci)),
scia(scia_),
bytePosition(bytePos_) {
@@ -757,7 +757,7 @@ void ScintillaGTKAccessible::PasteText(int charPosition) {
len = convertedText.length();
text = convertedText.c_str();
}
- scia->InsertStringUTF8(bytePosition, text, static_cast<int>(len));
+ scia->InsertStringUTF8(bytePosition, text, static_cast<Sci::Position>(len));
}
}
@@ -795,7 +795,7 @@ bool ScintillaGTKAccessible::Enabled() const {
// Callbacks
void ScintillaGTKAccessible::UpdateCursor() {
- Position pos = sci->WndProc(SCI_GETCURRENTPOS, 0, 0);
+ Sci::Position pos = sci->WndProc(SCI_GETCURRENTPOS, 0, 0);
if (old_pos != pos) {
int charPosition = CharacterOffsetFromByteOffset(pos);
g_signal_emit_by_name(accessible, "text-caret-moved", charPosition);
@@ -875,7 +875,7 @@ void ScintillaGTKAccessible::Notify(GtkWidget *, gint, SCNotification *nt) {
case SCN_MODIFIED: {
if (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) {
// invalidate character offset cache if applicable
- const Position line = sci->pdoc->LineFromPosition(nt->position);
+ const Sci::Line line = sci->pdoc->LineFromPosition(nt->position);
if (character_offsets.size() > static_cast<size_t>(line + 1)) {
character_offsets.resize(line + 1);
}
diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h
index 4403c4ed0..947b6198a 100644
--- a/gtk/ScintillaGTKAccessible.h
+++ b/gtk/ScintillaGTKAccessible.h
@@ -21,12 +21,12 @@ private:
ScintillaGTK *sci;
// cache holding character offset for each line start, see CharacterOffsetFromByteOffset()
- std::vector<Position> character_offsets;
+ std::vector<Sci::Position> character_offsets;
// cached length of the deletion, in characters (see Notify())
int deletionLengthChar;
// local state for comparing
- Position old_pos;
+ Sci::Position old_pos;
std::vector<SelectionRange> old_sels;
bool Enabled() const;
@@ -38,8 +38,8 @@ private:
} catch (...) {}
}
- Position ByteOffsetFromCharacterOffset(Position startByte, int characterOffset) {
- Position pos = sci->pdoc->GetRelativePosition(startByte, characterOffset);
+ Sci::Position ByteOffsetFromCharacterOffset(Sci::Position startByte, int characterOffset) {
+ Sci::Position pos = sci->pdoc->GetRelativePosition(startByte, characterOffset);
if (pos == INVALID_POSITION) {
// clamp invalid positions inside the document
if (characterOffset > 0) {
@@ -51,51 +51,51 @@ private:
return pos;
}
- Position ByteOffsetFromCharacterOffset(int characterOffset) {
+ Sci::Position ByteOffsetFromCharacterOffset(Sci::Position characterOffset) {
return ByteOffsetFromCharacterOffset(0, characterOffset);
}
- int CharacterOffsetFromByteOffset(Position byteOffset) {
- const Position line = sci->pdoc->LineFromPosition(byteOffset);
+ Sci::Position CharacterOffsetFromByteOffset(Sci::Position byteOffset) {
+ const Sci::Line line = sci->pdoc->LineFromPosition(byteOffset);
if (character_offsets.size() <= static_cast<size_t>(line)) {
if (character_offsets.empty())
character_offsets.push_back(0);
- for (Position i = character_offsets.size(); i <= line; i++) {
- const Position start = sci->pdoc->LineStart(i - 1);
- const Position end = sci->pdoc->LineStart(i);
+ for (Sci::Position i = character_offsets.size(); i <= line; i++) {
+ const Sci::Position start = sci->pdoc->LineStart(i - 1);
+ const Sci::Position end = sci->pdoc->LineStart(i);
character_offsets.push_back(character_offsets[i - 1] + sci->pdoc->CountCharacters(start, end));
}
}
- const Position lineStart = sci->pdoc->LineStart(line);
+ const Sci::Position lineStart = sci->pdoc->LineStart(line);
return character_offsets[line] + sci->pdoc->CountCharacters(lineStart, byteOffset);
}
- void CharacterRangeFromByteRange(Position startByte, Position endByte, int *startChar, int *endChar) {
+ void CharacterRangeFromByteRange(Sci::Position startByte, Sci::Position endByte, int *startChar, int *endChar) {
*startChar = CharacterOffsetFromByteOffset(startByte);
*endChar = *startChar + sci->pdoc->CountCharacters(startByte, endByte);
}
- void ByteRangeFromCharacterRange(int startChar, int endChar, Position& startByte, Position& endByte) {
+ void ByteRangeFromCharacterRange(int startChar, int endChar, Sci::Position& startByte, Sci::Position& endByte) {
startByte = ByteOffsetFromCharacterOffset(startChar);
endByte = ByteOffsetFromCharacterOffset(startByte, endChar - startChar);
}
- Position PositionBefore(Position pos) {
+ Sci::Position PositionBefore(Sci::Position pos) {
return sci->pdoc->MovePositionOutsideChar(pos - 1, -1, true);
}
- Position PositionAfter(Position pos) {
+ Sci::Position PositionAfter(Sci::Position pos) {
return sci->pdoc->MovePositionOutsideChar(pos + 1, 1, true);
}
- int StyleAt(Position position, bool ensureStyle = false) {
+ int StyleAt(Sci::Position position, bool ensureStyle = false) {
if (ensureStyle)
sci->pdoc->EnsureStyledTo(position);
return sci->pdoc->StyleAt(position);
}
// For AtkText
- gchar *GetTextRangeUTF8(Position startByte, Position endByte);
+ gchar *GetTextRangeUTF8(Sci::Position startByte, Sci::Position endByte);
gchar *GetText(int startChar, int endChar);
gchar *GetTextAfterOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar);
gchar *GetTextBeforeOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar);
@@ -118,7 +118,7 @@ private:
gboolean RemoveSelection(int selection_num);
gboolean SetSelection(gint selection_num, int startChar, int endChar);
// for AtkEditableText
- bool InsertStringUTF8(Position bytePos, const gchar *utf8, int lengthBytes);
+ bool InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes);
void SetTextContents(const gchar *contents);
void InsertText(const gchar *contents, int lengthBytes, int *charPosition);
void CopyText(int startChar, int endChar);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-12 22:53:12 +0000