<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml">
<head><style type=3D"text/css"><!--
body {background:#ffffff;font-family:Verdana,Helvetica,Arial,sans-serif;}
h3 {margin:15px 0;padding:0;line-height:0;}
#msg {margin: 0 0 2em 0;}
#msg dl, #msg ul, #msg pre {padding:1em;border:1px dashed black;margin: 1=
0px 0 30px 0;}
#msg dl {background:#ccccff;}
#msg pre {background:#ffffcc;}
#msg ul {background:#cc99ff;list-style:none;}
#msg dt {font-weight:bold;float:left;width: 6em;}
#msg dt:after { content:':';}
#patch h4 {padding: 0 10px;line-height:1.5em;margin:0;background:#ccffff;=
border-bottom:1px solid black;margin:0 0 10px 0;}
#patch .propset h4, #patch .binary h4 {margin: 0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {background:#eeeeee;padding: 0 0 10px 0;}
#patch .propset .diff, #patch .binary .diff {padding: 10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc=
h .binary {border:1px solid black;margin:10px 0;}
#patch .add {background:#ddffdd;}
#patch .rem {background:#ffdddd;}
#patch .lines, .info {color:#888888;background:#ffffff;}
--></style>
<title>[306] tiki/src/gl/genmenu.cpp: Tiki: pass events with NULL device =
through</title>
</head>
<body>
<div id=3D"msg">
<dl>
<dt>Revision</dt> <dd>306</dd>
<dt>Author</dt> <dd>sam.steele</dd>
<dt>Date</dt> <dd>2006-02-19 13:36:15 -0800 (Sun, 19 Feb 2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tiki: pass events with NULL device through</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#tikisrcglgenmenucpp">tiki/src/gl/genmenu.cpp</a></li>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"tikisrcglgenmenucpp"></a>
<div class=3D"modfile"><h4>Modified: tiki/src/gl/genmenu.cpp (305 =3D> 30=
6)</h4>
<pre class=3D"diff">
<span class=3D"info">--- tiki/src/gl/genmenu.cpp 2006-02-18 16:34:52 UTC =
(rev 305)
+++ tiki/src/gl/genmenu.cpp 2006-02-19 21:36:15 UTC (rev 306)
</span><span class=3D"lines">@@ -217,9 +217,6 @@
</span><span class=3D"cx"> }
=20
void GenericMenu::processHidEvent(const Hid::Event & evt) {
</span><span class=3D"rem">- if(evt.dev =3D=3D NULL) {
- return;
- }
</span><span class=3D"cx"> // Just pass the event down as-is first.
// And why exactly C++ can't deal with making a default copy constructo=
r
// from a base class is anyone's guess.
</span><span class=3D"lines">@@ -235,14 +232,14 @@
</span><span class=3D"cx"> newevt.x =3D evt.x;
newevt.y =3D evt.y;
newevt.port =3D evt.port;
</span><span class=3D"rem">- if (evt.dev->getType() =3D=3D Hid::Device=
::TypeMouse) {
</span><span class=3D"add">+ if (evt.dev && evt.dev->getType()=
=3D=3D Hid::Device::TypeMouse) {
</span><span class=3D"cx"> Vector v =3D m_scene->getTranslate();
newevt.x -=3D (int)v.x;
newevt.y -=3D (int)v.y;
}
inputEvent(newevt);
// process mouse events for possible object interaction
</span><span class=3D"rem">- if (evt.dev->getType() =3D=3D Hid::Device=
::TypeMouse &&
</span><span class=3D"add">+ if (evt.dev && evt.dev->getType()=
=3D=3D Hid::Device::TypeMouse &&
</span><span class=3D"cx"> (evt.type =3D=3D Event::EvtBtnPress || evt=
.type =3D=3D Event::EvtBtnRelease)) {
}
else if (evt.type =3D=3D Event::EvtQuit) {
</span>
</pre>
</div>
</div>
</body>
</html>
|
