FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Intoduce new osgWidget::PdfReader and osgWidget::VncClient front ends to osgWidget,

Browse Source 
with new pdf plugin and updated vnc plugin that now support these front ends.

Updated osgpdf and osgvnc examples to new these new interfaces.
This commit is contained in:
Robert Osfield
2008-12-07 17:02:30 +00:00
parent 0114ac4734
commit 6f356aeb97
20 changed files with 752 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgPlugins/gecko/UBrowser.cpp
View File

@@ -478,7 +478,7 @@ struct PointerEventOperation : public osg::Operation
int _buttonDelta;
};
void UBrowserManager::sendPointerEvent(UBrowserImage* image, int x, int y, int buttonMask)
bool UBrowserManager::sendPointerEvent(UBrowserImage* image, int x, int y, int buttonMask)
{
int deltaButton = (buttonMask&1) - (_previousButtonMask&1);
_previousButtonMask = buttonMask;
@@ -486,6 +486,8 @@ void UBrowserManager::sendPointerEvent(UBrowserImage* image, int x, int y, int b
_thread->add(new PointerEventOperation(image, x, y, deltaButton));
active(image);
return true;
}
@@ -509,15 +511,17 @@ struct KeyEventOperation : public osg::Operation
bool _isUnicode;
};
void UBrowserManager::sendKeyEvent(UBrowserImage* image, int key, bool keyDown)
bool UBrowserManager::sendKeyEvent(UBrowserImage* image, int key, bool keyDown)
{
if (!keyDown) return;
if (!keyDown) return false;
KeyMap::const_iterator itr = _keyMap.find(key);
if (_keyMap.find(key)==_keyMap.end()) _thread->add(new KeyEventOperation(image, key, true));
else _thread->add(new KeyEventOperation(image, itr->second, false));
active(image);
return true;
}
@@ -582,14 +586,14 @@ UBrowserImage::~UBrowserImage()
_manager->unregisterUBrowserImage(this);
}
void UBrowserImage::sendPointerEvent(int x, int y, int buttonMask)
bool UBrowserImage::sendPointerEvent(int x, int y, int buttonMask)
{
_manager->sendPointerEvent(this, x, y, buttonMask);
return _manager->sendPointerEvent(this, x, y, buttonMask);
}
void UBrowserImage::sendKeyEvent(int key, bool keyDown)
bool UBrowserImage::sendKeyEvent(int key, bool keyDown)
{
_manager->sendKeyEvent(this, key, keyDown);
return _manager->sendKeyEvent(this, key, keyDown);
}
void UBrowserImage::setFrameLastRendered(const osg::FrameStamp*)

8
src/osgPlugins/gecko/UBrowser.h
View File

@@ -60,9 +60,9 @@ class UBrowserManager : public osgWidget::BrowserManager
if (itr != _ubrowserImageList.end()) _ubrowserImageList.erase(itr);
}
void sendKeyEvent(UBrowserImage* image, int key, bool keyDown);
bool sendKeyEvent(UBrowserImage* image, int key, bool keyDown);
void sendPointerEvent(UBrowserImage* image, int x, int y, int buttonMask);
bool sendPointerEvent(UBrowserImage* image, int x, int y, int buttonMask);
void navigateTo(UBrowserImage* image, const std::string& page);
@@ -108,9 +108,9 @@ class UBrowserImage : public osgWidget::BrowserImage, public LLEmbeddedBrowserWi
const std::string& getHomeURL() const { return _homeURL; }
virtual void sendPointerEvent(int x, int y, int buttonMask);
virtual bool sendPointerEvent(int x, int y, int buttonMask);
virtual void sendKeyEvent(int key, bool keyDown);
virtual bool sendKeyEvent(int key, bool keyDown);
virtual void setFrameLastRendered(const osg::FrameStamp* frameStamp);