diff options
author | Armin Weatherwax | 2009-06-08 11:10:27 +0200 |
---|---|---|
committer | McCabe Maxsted | 2009-09-04 11:34:24 -0700 |
commit | 3f0082a9dda60432b8b759e09f19b495d9d5275c (patch) | |
tree | 989f5e10f9b9891ec7718b5ee2406582b6c0e352 /linden/indra/llui/llview.h | |
parent | Rebranded startup loading page to Imprudence (diff) | |
download | meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.zip meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.gz meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.bz2 meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.xz |
Linux middle mouse button paste/primary selection support and gtk clipboard handler (fixes crashbug using synergy mouse-keyboard-clipboard-sharing over lan)
modified: linden/doc/contributions.txt
modified: linden/indra/llui/llclipboard.cpp
modified: linden/indra/llui/llclipboard.h
modified: linden/indra/llui/llfloater.cpp
modified: linden/indra/llui/llfloater.h
modified: linden/indra/llui/lllineeditor.cpp
modified: linden/indra/llui/lllineeditor.h
modified: linden/indra/llui/lltexteditor.cpp
modified: linden/indra/llui/lltexteditor.h
modified: linden/indra/llui/llview.cpp
modified: linden/indra/llui/llview.h
modified: linden/indra/llwindow/CMakeLists.txt
new file: linden/indra/llwindow/llmousehandler.cpp
modified: linden/indra/llwindow/llmousehandler.h
modified: linden/indra/llwindow/llwindow.cpp
modified: linden/indra/llwindow/llwindow.h
modified: linden/indra/llwindow/llwindowsdl.cpp
modified: linden/indra/llwindow/llwindowsdl.h
modified: linden/indra/newview/lltool.cpp
modified: linden/indra/newview/lltool.h
modified: linden/indra/newview/llviewertexteditor.cpp
modified: linden/indra/newview/llviewertexteditor.h
modified: linden/indra/newview/llviewerwindow.cpp
modified: linden/indra/newview/llviewerwindow.h
(cherry picked from commit 594f4830922f4294dda432fa748935adffaeed8f)
Diffstat (limited to 'linden/indra/llui/llview.h')
-rw-r--r-- | linden/indra/llui/llview.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h index 80dd348..da7f164 100644 --- a/linden/indra/llui/llview.h +++ b/linden/indra/llui/llview.h | |||
@@ -463,6 +463,8 @@ public: | |||
463 | /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); | 463 | /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); |
464 | /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 464 | /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
465 | /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 465 | /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
466 | /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask); | ||
467 | /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); | ||
466 | /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); | 468 | /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); |
467 | /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); | 469 | /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); |
468 | /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); | 470 | /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); |
@@ -596,6 +598,8 @@ protected: | |||
596 | LLView* childrenHandleHover(S32 x, S32 y, MASK mask); | 598 | LLView* childrenHandleHover(S32 x, S32 y, MASK mask); |
597 | LLView* childrenHandleMouseUp(S32 x, S32 y, MASK mask); | 599 | LLView* childrenHandleMouseUp(S32 x, S32 y, MASK mask); |
598 | LLView* childrenHandleMouseDown(S32 x, S32 y, MASK mask); | 600 | LLView* childrenHandleMouseDown(S32 x, S32 y, MASK mask); |
601 | LLView* childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask); | ||
602 | LLView* childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask); | ||
599 | LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask); | 603 | LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask); |
600 | LLView* childrenHandleScrollWheel(S32 x, S32 y, S32 clicks); | 604 | LLView* childrenHandleScrollWheel(S32 x, S32 y, S32 clicks); |
601 | LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask); | 605 | LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask); |