i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed some methods so that it's clearer what they do.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23603 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-01-18 10:34:21 +00:00
parent 1490792706
commit e97cd7f18b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermView.cpp
+10 -10
View File
@@ -1790,7 +1790,7 @@ TermView::MouseDown(BPoint where)
Window()->CurrentMessage()->FindInt32("clicks", &clicks); Window()->CurrentMessage()->FindInt32("clicks", &clicks);
if (_HasSelection()) { if (_HasSelection()) {
CurPos inPos = _BPointToCurPos(where); CurPos inPos = _ConvertToTerminal(where);
if (_CheckSelectedRegion(inPos)) { if (_CheckSelectedRegion(inPos)) {
if (mod & B_CONTROL_KEY) { if (mod & B_CONTROL_KEY) {
BPoint p; BPoint p;
@@ -1826,7 +1826,7 @@ TermView::MouseDown(BPoint where)
fClickPoint = where; fClickPoint = where;
if (mod & B_SHIFT_KEY) if (mod & B_SHIFT_KEY)
_AddSelectRegion(_BPointToCurPos(where)); _AddSelectRegion(_ConvertToTerminal(where));
else else
_DeSelect(); _DeSelect();
@@ -1863,8 +1863,8 @@ TermView::MouseMoved(BPoint where, uint32 transit, const BMessage *message)
if (!fMouseTracking) if (!fMouseTracking)
return; return;
CurPos startPos = _BPointToCurPos(fClickPoint); CurPos startPos = _ConvertToTerminal(fClickPoint);
CurPos endPos = _BPointToCurPos(where); CurPos endPos = _ConvertToTerminal(where);
if (endPos.y < 0) if (endPos.y < 0)
return; return;
@@ -2082,7 +2082,7 @@ TermView::_SelectWord(BPoint where, int mod)
CurPos start, end, pos; CurPos start, end, pos;
bool flag; bool flag;
pos = _BPointToCurPos(where); pos = _ConvertToTerminal(where);
flag = fTextBuffer->FindWord(pos, &start, &end); flag = fTextBuffer->FindWord(pos, &start, &end);
fTextBuffer->Select(start, end); fTextBuffer->Select(start, end);
@@ -2105,7 +2105,7 @@ TermView::_SelectWord(BPoint where, int mod)
void void
TermView::_SelectLine(BPoint where, int mod) TermView::_SelectLine(BPoint where, int mod)
{ {
CurPos pos = _BPointToCurPos(where); CurPos pos = _ConvertToTerminal(where);
if (mod & B_SHIFT_KEY) { if (mod & B_SHIFT_KEY) {
@@ -2126,7 +2126,7 @@ TermView::_SelectLine(BPoint where, int mod)
// Convert View visible area corrdination to cursor position. // Convert View visible area corrdination to cursor position.
CurPos CurPos
TermView::_BPointToCurPos(const BPoint &p) TermView::_ConvertToTerminal(const BPoint &p)
{ {
return CurPos(p.x / fFontWidth, p.y / fFontHeight); return CurPos(p.x / fFontWidth, p.y / fFontHeight);
} }
@@ -2134,7 +2134,7 @@ TermView::_BPointToCurPos(const BPoint &p)
// Convert cursor position to view coordination. // Convert cursor position to view coordination.
BPoint BPoint
TermView::_CurPosToBPoint(const CurPos &pos) TermView::_ConvertFromTerminal(const CurPos &pos)
{ {
return BPoint(fFontWidth * pos.x, pos.y * fFontHeight + fTop); return BPoint(fFontWidth * pos.x, pos.y * fFontHeight + fTop);
} }
@@ -2323,8 +2323,8 @@ TermView::InitiateDrag()
BMessage message(B_MIME_DATA); BMessage message(B_MIME_DATA);
message.AddData("text/plain", B_MIME_TYPE, copyStr.String(), copyStr.Length()); message.AddData("text/plain", B_MIME_TYPE, copyStr.String(), copyStr.Length());
BPoint start = _CurPosToBPoint(fSelStart); BPoint start = _ConvertFromTerminal(fSelStart);
BPoint end = _CurPosToBPoint(fSelEnd); BPoint end = _ConvertFromTerminal(fSelEnd);
BRect rect; BRect rect;
if (fSelStart.y == fSelEnd.y) { if (fSelStart.y == fSelEnd.y) {
src/apps/terminal/TermView.h
+2 -2
View File
@@ -183,8 +183,8 @@ private:
void _SelectLine(BPoint where, int mod); void _SelectLine(BPoint where, int mod);
// point and text offset conversion. // point and text offset conversion.
CurPos _BPointToCurPos(const BPoint &p); CurPos _ConvertToTerminal(const BPoint &p);
BPoint _CurPosToBPoint(const CurPos &pos); BPoint _ConvertFromTerminal(const CurPos &pos);
bool _CheckSelectedRegion(const CurPos &pos); bool _CheckSelectedRegion(const CurPos &pos);