livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Linux primary "clipboard" tainted by auto-selection 

This reverts to QT/Emacs style primary: only user selections go to the primary.
The Mozilla style LL decided for also takes auto-selected text to the primary,
which makes it pretty useless.
Armin Weatherwax 2012-06-06 17:30:07 +02:00
parent f1b03ba324
commit 5c66d2e669
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llui/lllineeditor.cpp
View File

@ -589,7 +589,7 @@ void LLLineEditor::selectAll()
setCursor(mSelectionEnd);
//mScrollHPos = 0;
mIsSelecting = TRUE;
updatePrimary();
}
// [SL:KB] - Patch: Misc-Spellcheck | Checked: 2010-12-19 (Catznip-2.7.0a) | Added: Catznip-2.5.0a
@ -750,9 +750,6 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
// delay cursor flashing
mKeystrokeTimer.reset();
// take selection to 'primary' clipboard
updatePrimary();
return TRUE;
}
@ -1178,12 +1175,6 @@ BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
break;
}
}
if(handled)
{
// take selection to 'primary' clipboard
updatePrimary();
}
return handled;
}

14
indra/llui/lltexteditor.cpp
View File

@ -699,7 +699,6 @@ void LLTextEditor::selectAll()
mSelectionStart = getLength();
mSelectionEnd = 0;
setCursorPos(mSelectionEnd);
updatePrimary();
}
// [SL:KB] - Patch: Misc-Spellcheck | Checked: 2011-09-09 (Catznip-2.8.0a) | Added: Catznip-2.8.0a
@ -1026,8 +1025,6 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
// delay cursor flashing
resetCursorBlink();
// take selection to 'primary' clipboard
updatePrimary();
handled = TRUE;
}
@ -1345,12 +1342,6 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
}
}
if( handled )
{
// take selection to 'primary' clipboard
updatePrimary();
}
return handled;
}
@ -1713,11 +1704,6 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
}
}
if (handled)
{
updatePrimary();
}
return handled;
}