[haiku-commits] haiku: hrev47320 - src/apps/terminal
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 6 Jun 2014 00:02:56 +0200 (CEST)
hrev47320 adds 2 changesets to branch 'master'
old head: 5443e035e83626db525aa21c9cd1aec90baef3d6
new head: 7a214200edb572c607d24ee57d3bc0e5766495bd
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7a21420+%5E5443e03
----------------------------------------------------------------------------
4bf5fb9: Revert "Fix #10902 Terminal crashes setting window size."
This reverts commit 4c8d2387169eb503e9a4a347645dd37c238d1c8a.
7a21420: Revert "TermViewStates: Check if fView is NULL before using it."
This reverts commit b84955c73892d942d2b53e7a992b63e774e52789.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 14 insertions(+), 51 deletions(-)
src/apps/terminal/TermViewStates.cpp | 65 +++++++-------------------------
############################################################################
Commit: 4bf5fb92520ef0d519117343134a921baaa6e5b6
URL: http://cgit.haiku-os.org/haiku/commit/?id=4bf5fb9
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jun 5 22:02:33 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10902
Revert "Fix #10902 Terminal crashes setting window size."
This reverts commit 4c8d2387169eb503e9a4a347645dd37c238d1c8a.
----------------------------------------------------------------------------
diff --git a/src/apps/terminal/TermViewStates.cpp
b/src/apps/terminal/TermViewStates.cpp
index daaa697..93b19c2 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -966,10 +966,10 @@ TermView::HyperLinkState::_EntryExists(const BString&
path,
void
TermView::HyperLinkState::_UpdateHighlight()
{
- if (fView == NULL)
- return;
-
- _UpdateHighlight(fView->fLastClickPoint, fView->fModifiers);
+ BPoint where;
+ uint32 buttons;
+ fView->GetMouse(&where, &buttons, false);
+ _UpdateHighlight(where, fView->fModifiers);
}
############################################################################
Revision: hrev47320
Commit: 7a214200edb572c607d24ee57d3bc0e5766495bd
URL: http://cgit.haiku-os.org/haiku/commit/?id=7a21420
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jun 5 22:02:44 2014 UTC
Revert "TermViewStates: Check if fView is NULL before using it."
This reverts commit b84955c73892d942d2b53e7a992b63e774e52789.
----------------------------------------------------------------------------
diff --git a/src/apps/terminal/TermViewStates.cpp
b/src/apps/terminal/TermViewStates.cpp
index 93b19c2..ed366b2 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -1,16 +1,13 @@
/*
- * Copyright 2004-2014, Haiku, Inc.
+ * Copyright 2001-2013, Haiku, Inc.
* Copyright 2003-2004 Kian Duffy, myob@xxxxxxxxxxxxxxxxxxxxx
* Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
- * All rights reserved.
- *
- * Distributed under the terms of the MIT license.
+ * All rights reserved. Distributed under the terms of the MIT license.
*
* Authors:
* Stefano Ceccherini, stefano.ceccherini@xxxxxxxxx
* Kian Duffy, myob@xxxxxxxxxxxxxxxxxxxxx
* Y.Hayakawa, hida@xxxxxxxxxxxxxxxxxxxxxxxx
- * John Scipione, jscipione@xxxxxxxxx
* Ingo Weinhold, ingo_weinhold@xxxxxx
* Clemens Zeidler, haiku@xxxxxxxxxxxxxxxxxx
* Siarzhuk Zharski, zharik@xxxxxx
@@ -155,9 +152,6 @@ TermView::StandardBaseState::StandardBaseState(TermView*
view)
bool
TermView::StandardBaseState::_StandardMouseMoved(BPoint where, int32 modifiers)
{
- if (fView == NULL)
- return false;
-
if (!fView->fReportAnyMouseEvent && !fView->fReportButtonMouseEvent)
return false;
@@ -199,9 +193,6 @@ TermView::DefaultState::ModifiersChanged(int32
oldModifiers, int32 modifiers)
void
TermView::DefaultState::KeyDown(const char* bytes, int32 numBytes)
{
- if (fView == NULL || fView->Looper() == NULL)
- return;
-
int32 key;
int32 mod;
int32 rawChar;
@@ -375,9 +366,6 @@ TermView::DefaultState::KeyDown(const char* bytes, int32
numBytes)
void
TermView::DefaultState::MouseDown(BPoint where, int32 buttons, int32 modifiers)
{
- if (fView == NULL)
- return;
-
if (fView->fReportAnyMouseEvent || fView->fReportButtonMouseEvent
|| fView->fReportNormalMouseEvent ||
fView->fReportX10MouseEvent) {
TermPos clickPos = fView->_ConvertToTerminal(where);
@@ -414,7 +402,7 @@ TermView::DefaultState::MouseMoved(BPoint where, uint32
transit,
void
TermView::DefaultState::WindowActivated(bool active)
{
- if (active && fView != NULL)
+ if (active)
_CheckEnterHyperLinkState(fView->fModifiers);
}
@@ -422,8 +410,7 @@ TermView::DefaultState::WindowActivated(bool active)
bool
TermView::DefaultState::_CheckEnterHyperLinkState(int32 modifiers)
{
- if ((modifiers & B_COMMAND_KEY) != 0 && fView != NULL
- && fView->Window() != NULL && fView->Window()->IsActive()) {
+ if ((modifiers & B_COMMAND_KEY) != 0 && fView->Window()->IsActive()) {
fView->_NextState(fView->fHyperLinkState);
return true;
}
@@ -448,9 +435,6 @@ TermView::SelectState::SelectState(TermView* view)
void
TermView::SelectState::Prepare(BPoint where, int32 modifiers)
{
- if (fView == NULL || fView->Window() == NULL)
- return;
-
int32 clicks;
fView->Window()->CurrentMessage()->FindInt32("clicks", &clicks);
@@ -608,9 +592,6 @@ TermView::SelectState::MouseUp(BPoint where, int32 buttons)
fCheckMouseTracking = false;
fMouseTracking = false;
- if (fView == NULL)
- return;
-
if (fView->fAutoScrollRunner != NULL) {
delete fView->fAutoScrollRunner;
fView->fAutoScrollRunner = NULL;
@@ -635,9 +616,6 @@ TermView::SelectState::MouseUp(BPoint where, int32 buttons)
void
TermView::SelectState::_AutoScrollUpdate()
{
- if (fView == NULL)
- return;
-
if (fMouseTracking && fView->fAutoScrollRunner != NULL
&& fView->fScrollBar != NULL) {
float value = fView->fScrollBar->Value();
@@ -674,9 +652,6 @@ TermView::HyperLinkState::HyperLinkState(TermView* view)
void
TermView::HyperLinkState::Entered()
{
- if (fView == NULL)
- return;
-
ActiveProcessInfo activeProcessInfo;
if (fView->GetActiveProcessInfo(activeProcessInfo))
fCurrentDirectory = activeProcessInfo.CurrentDirectory();
@@ -697,9 +672,6 @@ TermView::HyperLinkState::Exited()
void
TermView::HyperLinkState::ModifiersChanged(int32 oldModifiers, int32 modifiers)
{
- if (fView == NULL)
- return;
-
if ((modifiers & B_COMMAND_KEY) == 0)
fView->_NextState(fView->fDefaultState);
else
@@ -722,10 +694,8 @@ TermView::HyperLinkState::MouseDown(BPoint where, int32
buttons,
if ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0) {
link.Open();
} else if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) {
- if (fView != NULL) {
- fView->fHyperLinkMenuState->Prepare(where, link);
- fView->_NextState(fView->fHyperLinkMenuState);
- }
+ fView->fHyperLinkMenuState->Prepare(where, link);
+ fView->_NextState(fView->fHyperLinkMenuState);
}
}
@@ -741,7 +711,7 @@ TermView::HyperLinkState::MouseMoved(BPoint where, uint32
transit,
void
TermView::HyperLinkState::WindowActivated(bool active)
{
- if (!active && fView != NULL)
+ if (!active)
fView->_NextState(fView->fDefaultState);
}
@@ -763,10 +733,7 @@ TermView::HyperLinkState::ForegroundColor()
rgb_color
TermView::HyperLinkState::BackgroundColor()
{
- if (fView != NULL)
- return fView->fTextBackColor;
-
- return make_color(255, 255, 255);
+ return fView->fTextBackColor;
}
@@ -1000,9 +967,6 @@ TermView::HyperLinkState::_ActivateHighlight(const
TermPos& start,
}
fHighlight.SetRange(start, end);
- if (fView == NULL)
- return;
-
fView->_AddHighlight(&fHighlight);
BCursor cursor(B_CURSOR_ID_FOLLOW_LINK);
fView->SetViewCursor(&cursor);
@@ -1013,7 +977,7 @@ TermView::HyperLinkState::_ActivateHighlight(const
TermPos& start,
void
TermView::HyperLinkState::_DeactivateHighlight()
{
- if (fHighlightActive && fView != NULL) {
+ if (fHighlightActive) {
fView->_RemoveHighlight(&fHighlight);
BCursor cursor(B_CURSOR_ID_SYSTEM_DEFAULT);
fView->SetViewCursor(&cursor);
@@ -1124,8 +1088,7 @@ TermView::HyperLinkMenuState::MessageReceived(BMessage*
message)
}
case kMessageMenuClosed:
- if (fView != NULL)
- fView->_NextState(fView->fDefaultState);
+ fView->_NextState(fView->fDefaultState);
return true;
}
Other related posts:
- » [haiku-commits] haiku: hrev47320 - src/apps/terminal - jscipione
