Fresco/Berlin/modules/Commands BoundedRangeImpl.cc,1.8,1.9 BoundedRangeImpl.hh,1.7,1.8 BoundedValueImpl.cc,1.8,1.9 BoundedValueImpl.hh,1.6,1.7 CommandKitImpl.cc,1.30,1.31 CommandKitImpl.hh,1.19,1.20 SelectionImpl.cc,1.8,1.9 SelectionImpl.hh,1.5,1.6 StreamBufferImpl.cc,1.7,1.8 StreamBufferImpl.hh,1.7,1.8 TelltaleImpl.cc,1.11,1.12 TelltaleImpl.hh,1.9,1.10 TextBufferImpl.cc,1.13,1.14 TextBufferImpl.hh,1.11,1.12
Tobias Hunger <[email protected]> Mon, 29 Dec 2003 09:12:08 +0100
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Commands
In directory purcel:/tmp/cvs-serv30213/modules/Commands
Modified Files:
BoundedRangeImpl.cc BoundedRangeImpl.hh BoundedValueImpl.cc
BoundedValueImpl.hh CommandKitImpl.cc CommandKitImpl.hh
SelectionImpl.cc SelectionImpl.hh StreamBufferImpl.cc
StreamBufferImpl.hh TelltaleImpl.cc TelltaleImpl.hh
TextBufferImpl.cc TextBufferImpl.hh
Log Message:
* Styleguidify Berlin
* Add namespace Berlin
Both patches are mixed into one since I did not want to commit two such
large and disruptive patches.
Index: BoundedRangeImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/BoundedRangeImpl.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- BoundedRangeImpl.cc 27 Oct 2003 17:08:35 -0000 1.8
+++ BoundedRangeImpl.cc 29 Dec 2003 08:03:20 -0000 1.9
@@ -28,105 +28,103 @@
Berlin::CommandKit::BoundedRangeImpl::BoundedRangeImpl(Coord l, Coord u,
Coord lv, Coord uv,
- Coord s, Coord p)
- : _s(s), _p(p)
+ Coord s, Coord p) :
+ my_s(s), my_p(p)
{
- _settings.lower = l;
- _settings.upper = u;
- _settings.lvalue = lv;
- _settings.uvalue = uv;
-};
+ my_settings.lower = l;
+ my_settings.upper = u;
+ my_settings.lvalue = lv;
+ my_settings.uvalue = uv;
+}
-Berlin::CommandKit::BoundedRangeImpl::~BoundedRangeImpl()
-{
-};
+Berlin::CommandKit::BoundedRangeImpl::~BoundedRangeImpl() { }
BoundedRange::Settings Berlin::CommandKit::BoundedRangeImpl::state()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _settings;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_settings;
}
void Berlin::CommandKit::BoundedRangeImpl::state(const Fresco::BoundedRange::Settings &s)
{
- Prague::Guard<Mutex> guard(_mutex);
- _settings = s;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_settings = s;
}
Coord Berlin::CommandKit::BoundedRangeImpl::lower()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _settings.lower;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_settings.lower;
}
void Berlin::CommandKit::BoundedRangeImpl::lower(Coord l)
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (l == _settings.lower) return;
- _settings.lower = l;
- _settings.lvalue = std::max(_settings.lvalue, _settings.lower);
- _settings.uvalue = std::max(_settings.uvalue, _settings.lower);
- any <<= _settings;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (l == my_settings.lower) return;
+ my_settings.lower = l;
+ my_settings.lvalue = std::max(my_settings.lvalue, my_settings.lower);
+ my_settings.uvalue = std::max(my_settings.uvalue, my_settings.lower);
+ any <<= my_settings;
}
notify(any);
}
Coord Berlin::CommandKit::BoundedRangeImpl::upper()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _settings.upper;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_settings.upper;
}
void Berlin::CommandKit::BoundedRangeImpl::upper(Coord u)
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (_settings.upper == u) return;
- _settings.upper = u;
- _settings.lvalue = std::min(_settings.lvalue, _settings.upper);
- _settings.uvalue = std::min(_settings.uvalue, _settings.upper);
- any <<= _settings;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (my_settings.upper == u) return;
+ my_settings.upper = u;
+ my_settings.lvalue = std::min(my_settings.lvalue, my_settings.upper);
+ my_settings.uvalue = std::min(my_settings.uvalue, my_settings.upper);
+ any <<= my_settings;
}
notify(any);
}
Coord Berlin::CommandKit::BoundedRangeImpl::step()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _s;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_s;
}
void Berlin::CommandKit::BoundedRangeImpl::step(Coord s)
{
- Prague::Guard<Mutex> guard(_mutex);
- _s = s;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_s = s;
}
Coord Berlin::CommandKit::BoundedRangeImpl::page()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _p;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_p;
}
void Berlin::CommandKit::BoundedRangeImpl::page(Coord p)
{
- Prague::Guard<Mutex> guard(_mutex);
- _p = p;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_p = p;
}
void Berlin::CommandKit::BoundedRangeImpl::forward()
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = std::min(_s, _settings.upper - _settings.uvalue);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = std::min(my_s, my_settings.upper - my_settings.uvalue);
if (t <= 0.) return;
- _settings.lvalue += t;
- _settings.uvalue += t;
- any <<= _settings;
+ my_settings.lvalue += t;
+ my_settings.uvalue += t;
+ any <<= my_settings;
}
notify(any);
}
@@ -135,12 +133,12 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = std::min(_s, _settings.lvalue - _settings.lower);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = std::min(my_s, my_settings.lvalue - my_settings.lower);
if (t <= 0.) return;
- _settings.lvalue -= t;
- _settings.uvalue -= t;
- any <<= _settings;
+ my_settings.lvalue -= t;
+ my_settings.uvalue -= t;
+ any <<= my_settings;
}
notify(any);
}
@@ -149,12 +147,12 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = std::min(_p, _settings.upper - _settings.uvalue);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = std::min(my_p, my_settings.upper - my_settings.uvalue);
if (t <= 0.) return;
- _settings.lvalue += t;
- _settings.uvalue += t;
- any <<= _settings;
+ my_settings.lvalue += t;
+ my_settings.uvalue += t;
+ any <<= my_settings;
}
notify(any);
}
@@ -163,12 +161,12 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = std::min(_p, _settings.lvalue - _settings.lower);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = std::min(my_p, my_settings.lvalue - my_settings.lower);
if (t <= 0.) return;
- _settings.lvalue -= t;
- _settings.uvalue -= t;
- any <<= _settings;
+ my_settings.lvalue -= t;
+ my_settings.uvalue -= t;
+ any <<= my_settings;
}
notify(any);
}
@@ -177,12 +175,12 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _settings.lvalue - _settings.lower;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_settings.lvalue - my_settings.lower;
if (t == 0.) return;
- _settings.lvalue -= t;
- _settings.uvalue -= t;
- any <<= _settings;
+ my_settings.lvalue -= t;
+ my_settings.uvalue -= t;
+ any <<= my_settings;
}
notify(any);
}
@@ -191,12 +189,12 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _settings.upper - _settings.uvalue;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_settings.upper - my_settings.uvalue;
if (t == 0.) return;
- _settings.lvalue += t;
- _settings.uvalue += t;
- any <<= _settings;
+ my_settings.lvalue += t;
+ my_settings.uvalue += t;
+ any <<= my_settings;
}
notify(any);
}
@@ -205,19 +203,19 @@
{
CORBA::Any any;
{
- lv = std::min(std::max(_settings.lower, lv), _settings.upper);
- Prague::Guard<Mutex> guard(_mutex);
- if (lv == _settings.lvalue) return;
- _settings.lvalue = lv;
- any <<= _settings;
+ lv = std::min(std::max(my_settings.lower, lv), my_settings.upper);
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (lv == my_settings.lvalue) return;
+ my_settings.lvalue = lv;
+ any <<= my_settings;
}
notify(any);
}
Coord Berlin::CommandKit::BoundedRangeImpl::lvalue()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _settings.lvalue;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_settings.lvalue;
}
@@ -225,18 +223,18 @@
{
CORBA::Any any;
{
- uv = std::min(std::max(_settings.lower, uv), _settings.upper);
- Prague::Guard<Mutex> guard(_mutex);
- if (_settings.uvalue == uv) return;
- _settings.uvalue = uv;
+ uv = std::min(std::max(my_settings.lower, uv), my_settings.upper);
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (my_settings.uvalue == uv) return;
+ my_settings.uvalue = uv;
}
notify(any);
}
Coord Berlin::CommandKit::BoundedRangeImpl::uvalue()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _settings.uvalue;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_settings.uvalue;
}
@@ -244,13 +242,13 @@
{
CORBA::Any any;
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = std::min(std::max(d, _settings.lower - _settings.lvalue),
- _settings.upper - _settings.uvalue);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = std::min(std::max(d, my_settings.lower - my_settings.lvalue),
+ my_settings.upper - my_settings.uvalue);
if (t == 0.) return;
- _settings.lvalue += t;
- _settings.uvalue += t;
- any <<= _settings;
+ my_settings.lvalue += t;
+ my_settings.uvalue += t;
+ any <<= my_settings;
}
notify(any);
}
Index: BoundedRangeImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/BoundedRangeImpl.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BoundedRangeImpl.hh 27 Oct 2003 17:08:35 -0000 1.7
+++ BoundedRangeImpl.hh 29 Dec 2003 08:03:20 -0000 1.8
@@ -19,8 +19,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _BoundedRangeImpl_hh
-#define _BoundedRangeImpl_hh
+#ifndef _CommandKit_BoundedRangeImpl_hh
+#define _CommandKit_BoundedRangeImpl_hh
#include <Prague/Sys/Thread.hh>
#include <Fresco/config.hh>
@@ -62,10 +62,10 @@
virtual void end();
virtual void adjust(Fresco::Coord);
private:
- Fresco::BoundedRange::Settings _settings;
- Fresco::Coord _s;
- Fresco::Coord _p;
- Prague::Mutex _mutex;
+ Fresco::BoundedRange::Settings my_settings;
+ Fresco::Coord my_s;
+ Fresco::Coord my_p;
+ Prague::Mutex my_mutex;
};
} // namespace
Index: BoundedValueImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/BoundedValueImpl.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- BoundedValueImpl.cc 27 Oct 2003 17:08:35 -0000 1.8
+++ BoundedValueImpl.cc 29 Dec 2003 08:03:20 -0000 1.9
@@ -25,9 +25,10 @@
using namespace Prague;
using namespace Fresco;
-Berlin::CommandKit::BoundedValueImpl::BoundedValueImpl(Coord l, Coord u, Coord v,
- Coord s, Coord p) :
- _l(l), _u(u), _v(v), _s(s), _p(p)
+Berlin::CommandKit::BoundedValueImpl::BoundedValueImpl(Coord l, Coord u,
+ Coord v, Coord s,
+ Coord p) :
+ my_l(l), my_u(u), my_v(v), my_s(s), my_p(p)
{ }
Berlin::CommandKit::BoundedValueImpl::~BoundedValueImpl()
@@ -35,17 +36,17 @@
Coord Berlin::CommandKit::BoundedValueImpl::lower()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _l;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_l;
}
void Berlin::CommandKit::BoundedValueImpl::lower(Coord l)
{
{
- Prague::Guard<Mutex> guard(_mutex);
- if (l == _l) return;
- _l = l;
- if (_v < _l) _v = _l;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (l == my_l) return;
+ my_l = l;
+ if (my_v < my_l) my_v = my_l;
}
CORBA::Any any;
notify(any);
@@ -53,17 +54,17 @@
Coord Berlin::CommandKit::BoundedValueImpl::upper()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _u;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_u;
}
void Berlin::CommandKit::BoundedValueImpl::upper(Coord u)
{
{
- Prague::Guard<Mutex> guard(_mutex);
- if (u == _u) return;
- _u = u;
- if (_v > _u) _v = _u;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (u == my_u) return;
+ my_u = u;
+ if (my_v > my_u) my_v = my_u;
}
CORBA::Any any;
notify(any);
@@ -71,94 +72,94 @@
Coord Berlin::CommandKit::BoundedValueImpl::step()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _s;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_s;
}
void Berlin::CommandKit::BoundedValueImpl::step(Coord s)
{
- Prague::Guard<Mutex> guard(_mutex);
- _s = s;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_s = s;
}
Coord Berlin::CommandKit::BoundedValueImpl::page()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _p;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_p;
}
void Berlin::CommandKit::BoundedValueImpl::page(Coord p)
{
- Prague::Guard<Mutex> guard(_mutex);
- _p = p;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_p = p;
}
void Berlin::CommandKit::BoundedValueImpl::forward()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _v + _s;
- if (t > _u) t = _u;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_v + my_s;
+ if (t > my_u) t = my_u;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
void Berlin::CommandKit::BoundedValueImpl::backward()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _v - _s;
- if (t < _l) t = _l;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_v - my_s;
+ if (t < my_l) t = my_l;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
void Berlin::CommandKit::BoundedValueImpl::fastforward()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _v + _p;
- if (t > _u) t = _u;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_v + my_p;
+ if (t > my_u) t = my_u;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
void Berlin::CommandKit::BoundedValueImpl::fastbackward()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _v - _p;
- if (t < _l) t = _l;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_v - my_p;
+ if (t < my_l) t = my_l;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
void Berlin::CommandKit::BoundedValueImpl::begin()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _l;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_l;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
@@ -166,48 +167,48 @@
void Berlin::CommandKit::BoundedValueImpl::end()
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _u;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_u;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
void Berlin::CommandKit::BoundedValueImpl::value(Coord v)
{
{
- Prague::Guard<Mutex> guard(_mutex);
- if (v > _u) v = _u;
- else if (v < _l) v = _l;
- if (v == _v) return;
- _v = v;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (v > my_u) v = my_u;
+ else if (v < my_l) v = my_l;
+ if (v == my_v) return;
+ my_v = v;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
Coord Berlin::CommandKit::BoundedValueImpl::value()
{
- Prague::Guard<Mutex> guard(_mutex);
- return _v;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_v;
}
void Berlin::CommandKit::BoundedValueImpl::adjust(Coord d)
{
{
- Prague::Guard<Mutex> guard(_mutex);
- Coord t = _v + d;
- if (t > _u) t = _u;
- else if (t < _l) t = _l;
- if (t == _v) return;
- _v = t;
+ Prague::Guard<Mutex> guard(my_mutex);
+ Coord t = my_v + d;
+ if (t > my_u) t = my_u;
+ else if (t < my_l) t = my_l;
+ if (t == my_v) return;
+ my_v = t;
}
CORBA::Any any;
- any <<= _v;
+ any <<= my_v;
notify(any);
}
Index: BoundedValueImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/BoundedValueImpl.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BoundedValueImpl.hh 27 Oct 2003 17:08:35 -0000 1.6
+++ BoundedValueImpl.hh 29 Dec 2003 08:03:20 -0000 1.7
@@ -20,8 +20,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _BoundedValueImpl_hh
-#define _BoundedValueImpl_hh
+#ifndef _CommandKit_BoundedValueImpl_hh
+#define _CommandKit_BoundedValueImpl_hh
#include <Prague/Sys/Thread.hh>
#include <Fresco/config.hh>
@@ -60,12 +60,12 @@
virtual void end();
virtual void adjust(Fresco::Coord);
private:
- Fresco::Coord _l;
- Fresco::Coord _u;
- Fresco::Coord _v;
- Fresco::Coord _s;
- Fresco::Coord _p;
- Prague::Mutex _mutex;
+ Fresco::Coord my_l;
+ Fresco::Coord my_u;
+ Fresco::Coord my_v;
+ Fresco::Coord my_s;
+ Fresco::Coord my_p;
+ Prague::Mutex my_mutex;
};
} // namespace
Index: CommandKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/CommandKitImpl.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CommandKitImpl.cc 27 Oct 2003 17:08:35 -0000 1.30
+++ CommandKitImpl.cc 29 Dec 2003 08:03:20 -0000 1.31
@@ -51,35 +51,35 @@
{
public:
DebugCommand(Command_ptr c, std::ostream &os, const char *t) :
- _command(Fresco::Command::_duplicate(c)), _os(os), _text(t) { }
+ my_command(Fresco::Command::_duplicate(c)), my_os(os), my_text(t) { }
virtual void execute(const CORBA::Any &any)
{
- _os << _text << " : entering execute" << std::endl;
- _command->execute(any);
- _os << _text << " : leaving execute" << std::endl;
+ my_os << my_text << " : entering execute" << std::endl;
+ my_command->execute(any);
+ my_os << my_text << " : leaving execute" << std::endl;
}
private:
- Command_var _command;
- std::ostream &_os;
- std::string _text;
+ Command_var my_command;
+ std::ostream &my_os;
+ std::string my_text;
};
class LogCommand : public CommandImpl
{
public:
- LogCommand(std::ostream &os, const char *text) : _os(os), _text(text) {}
- virtual void execute(const CORBA::Any &) { _os << _text << std::endl;}
+ LogCommand(std::ostream &os, const char *text) : my_os(os), my_text(text) {}
+ virtual void execute(const CORBA::Any &) { my_os << my_text << std::endl;}
private:
- std::ostream &_os;
- std::string _text;
+ std::ostream &my_os;
+ std::string my_text;
};
class PrintCommand : public CommandImpl
{
public:
PrintCommand(Graphic_ptr graphic, ServerContext_ptr server) :
- _graphic(Graphic::_duplicate(graphic)),
- _server(ServerContext::_duplicate(server))
+ my_graphic(Graphic::_duplicate(graphic)),
+ my_server(ServerContext::_duplicate(server))
{ }
virtual void execute(const CORBA::Any &)
{
@@ -88,10 +88,10 @@
props[0].name = CORBA::string_dup("implementation");
props[0].value = CORBA::string_dup("PSDrawingKit");
RefCount_var<DrawingKit> print =
- resolve_kit<DrawingKit>(_server, "IDL:fresco.org/Fresco/DrawingKit:1.0", props);
+ resolve_kit<DrawingKit>(my_server, "IDL:fresco.org/Fresco/DrawingKit:1.0", props);
Fresco::Graphic::Requisition r;
GraphicImpl::init_requisition(r);
- _graphic->request(r);
+ my_graphic->request(r);
Lease_var<RegionImpl> allocation(Provider<RegionImpl>::provide());
allocation->valid = true;
allocation->lower.x = allocation->lower.y = allocation->lower.z = 0;
@@ -103,11 +103,11 @@
allocation->zalign = r.z.align;
DrawTraversalImpl *traversal =
- new DrawTraversalImpl(_graphic, allocation->_this(),
+ new DrawTraversalImpl(my_graphic, allocation->_this(),
Transform::_nil(), print);
print->start_traversal(Traversal_var(traversal->_this()));
traversal->init();
- try { _graphic->traverse(Traversal_var(traversal->_this())); }
+ try { my_graphic->traverse(Traversal_var(traversal->_this())); }
catch (const CORBA::OBJECT_NOT_EXIST &)
{
std::cerr << "PrintCommand: warning: corrupt scene graph!" << std::endl;
@@ -121,8 +121,8 @@
print->finish_traversal();
}
private:
- Graphic_var _graphic;
- ServerContext_var _server;
+ Graphic_var my_graphic;
+ ServerContext_var my_server;
};
class MacroCommandImpl : public virtual POA_Fresco::MacroCommand, public CommandImpl
@@ -131,24 +131,24 @@
public:
virtual ~MacroCommandImpl()
{
- for (clist_t::iterator i = _commands.begin(); i != _commands.end(); ++i)
+ for (clist_t::iterator i = my_commands.begin(); i != my_commands.end(); ++i)
(*i)->destroy();
}
virtual void append(Fresco::Command_ptr c)
{
- _commands.push_back(Fresco::Command::_duplicate(c));
+ my_commands.push_back(Fresco::Command::_duplicate(c));
}
virtual void prepend(Fresco::Command_ptr c)
{
- _commands.insert(_commands.begin(), Fresco::Command::_duplicate(c));
+ my_commands.insert(my_commands.begin(), Fresco::Command::_duplicate(c));
}
virtual void execute(const CORBA::Any &any)
{
- for (clist_t::iterator i = _commands.begin(); i != _commands.end(); ++i)
+ for (clist_t::iterator i = my_commands.begin(); i != my_commands.end(); ++i)
(*i)->execute(any);
}
private:
- clist_t _commands;
+ clist_t my_commands;
};
} // namespace
@@ -164,7 +164,7 @@
void Berlin::CommandKit::CommandKitImpl::bind(ServerContext_ptr server)
{
- _server = ServerContext::_duplicate(server);
+ my_server = ServerContext::_duplicate(server);
}
Command_ptr Berlin::CommandKit::CommandKitImpl::debugger(Fresco::Command_ptr c, const char *text)
@@ -185,7 +185,7 @@
Command_ptr Berlin::CommandKit::CommandKitImpl::print(Graphic_ptr graphic)
{
- PrintCommand *command = new PrintCommand(graphic, _server);
+ PrintCommand *command = new PrintCommand(graphic, my_server);
activate(command);
return command->_this();
}
@@ -281,9 +281,9 @@
return buffer->_this();
}
-extern "C" KitImpl *load()
+extern "C" Berlin::KitImpl *load()
{
static std::string properties[] = {"implementation", "CommandKitImpl"};
- return create_prototype<Berlin::CommandKit::CommandKitImpl>
+ return Berlin::create_prototype<Berlin::CommandKit::CommandKitImpl>
("IDL:fresco.org/Fresco/CommandKit:1.0", properties, 2);
}
Index: CommandKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/CommandKitImpl.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CommandKitImpl.hh 27 Oct 2003 17:08:35 -0000 1.19
+++ CommandKitImpl.hh 29 Dec 2003 08:03:20 -0000 1.20
@@ -20,8 +20,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _CommandKitImpl_hh
-#define _CommandKitImpl_hh
+#ifndef _CommandKit_CommandKitImpl_hh
+#define _CommandKit_CommandKitImpl_hh
#include <Fresco/config.hh>
#include <Fresco/CommandKit.hh>
@@ -37,37 +37,46 @@
namespace CommandKit
{
- class CommandKitImpl : public virtual POA_Fresco::CommandKit, public KitImpl
+ class CommandKitImpl : public virtual POA_Fresco::CommandKit,
+ public KitImpl
{
public:
CommandKitImpl(const std::string &,
const Fresco::Kit::PropertySeq &,
ServerContextImpl *);
virtual ~CommandKitImpl();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
- {
- return new CommandKitImpl(repo_id(), p, c);
- }
+ virtual Berlin::KitImpl *clone(const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ { return new CommandKitImpl(repo_id(), p, c); }
virtual void bind(Fresco::ServerContext_ptr);
- virtual Fresco::Command_ptr debugger(Fresco::Command_ptr, const char *);
+ virtual Fresco::Command_ptr debugger(Fresco::Command_ptr,
+ const char *);
virtual Fresco::Command_ptr log(const char *);
virtual Fresco::Command_ptr print(Fresco::Graphic_ptr);
virtual Fresco::MacroCommand_ptr composite();
- virtual Fresco::TelltaleConstraint_ptr exclusive(Fresco::Telltale::Mask);
+ virtual Fresco::TelltaleConstraint_ptr
+ exclusive(Fresco::Telltale::Mask);
virtual Fresco::TelltaleConstraint_ptr selection_required();
- virtual Fresco::Telltale_ptr constrained_telltale(Fresco::TelltaleConstraint_ptr);
- virtual Fresco::Telltale_ptr normal_telltale();
- virtual Fresco::Selection_ptr group(Fresco::Selection::Policy);
- virtual Fresco::BoundedValue_ptr bvalue(Fresco::Coord, Fresco::Coord,
- Fresco::Coord, Fresco::Coord, Fresco::Coord);
- virtual Fresco::BoundedRange_ptr brange(Fresco::Coord, Fresco::Coord,
- Fresco::Coord, Fresco::Coord,
- Fresco::Coord, Fresco::Coord);
+ virtual Fresco::Telltale_ptr
+ constrained_telltale(Fresco::TelltaleConstraint_ptr);
+ virtual Fresco::Telltale_ptr normal_telltale();
+ virtual Fresco::Selection_ptr group(Fresco::Selection::Policy);
+ virtual Fresco::BoundedValue_ptr bvalue(Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord);
+ virtual Fresco::BoundedRange_ptr brange(Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord,
+ Fresco::Coord);
virtual Fresco::TextBuffer_ptr text();
virtual Fresco::StreamBuffer_ptr stream(CORBA::Long);
private:
- Fresco::ServerContext_var _server;
+ Fresco::ServerContext_var my_server;
};
} // namespace
Index: SelectionImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/SelectionImpl.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SelectionImpl.cc 27 Oct 2003 17:08:35 -0000 1.8
+++ SelectionImpl.cc 29 Dec 2003 08:03:20 -0000 1.9
@@ -34,103 +34,103 @@
*/
class Berlin::CommandKit::SelectionImpl::Observer : public ObserverImpl
{
-public:
- Observer(SelectionImpl *, Telltale_ptr, Tag);
- ~Observer();
- Tag id() const { return t;}
- bool toggled() { return cached;}
- void update(const CORBA::Any &);
-private:
- SelectionImpl *selection;
- RefCount_var<Fresco::Telltale> item;
- bool cached;
- Tag t;
+ public:
+ Observer(SelectionImpl *, Telltale_ptr, Tag);
+ ~Observer();
+ Tag id() const { return my_t;}
+ bool toggled() { return my_cached;}
+ void update(const CORBA::Any &);
+ private:
+ SelectionImpl *my_selection;
+ RefCount_var<Fresco::Telltale> my_item;
+ bool my_cached;
+ Tag my_t;
};
bool Berlin::CommandKit::SelectionImpl::Id_eq::operator()(const SelectionImpl::Observer *o) const
{ return o->id() == id; }
-Berlin::CommandKit::SelectionImpl::Observer::Observer(SelectionImpl *s, Telltale_ptr i,
+Berlin::CommandKit::SelectionImpl::Observer::Observer(SelectionImpl *s,
+ Telltale_ptr i,
Tag tt) :
- selection(s),
- item(RefCount_var<Fresco::Telltale>::increment(i)),
- cached(item->test(Fresco::Controller::toggled)),
- t(tt)
+ my_selection(s),
+ my_item(RefCount_var<Fresco::Telltale>::increment(i)),
+ my_cached(my_item->test(Fresco::Controller::toggled)),
+ my_t(tt)
{ }
Berlin::CommandKit::SelectionImpl::Observer::~Observer()
{
Trace trace("SelectionImpl::Observer::~Observer");
- item->detach(Observer_var(_this()));
- selection->remove_observer(t);
+ my_item->detach(Observer_var(_this()));
+ my_selection->remove_observer(my_t);
}
void Berlin::CommandKit::SelectionImpl::Observer::update(const CORBA::Any &any)
{
- bool toggled = item->test(Fresco::Controller::toggled);
- if (toggled == cached) return; // not for us...
- cached = toggled;
- selection->update(t, toggled);
+ bool toggled = my_item->test(Fresco::Controller::toggled);
+ if (toggled == my_cached) return; // not for us...
+ my_cached = toggled;
+ my_selection->update(my_t, toggled);
}
Berlin::CommandKit::SelectionImpl::SelectionImpl(Fresco::Selection::Policy p,
TelltaleConstraint_ptr c) :
- policy(p),
- constraint(RefCount_var<TelltaleConstraint>::increment(c))
-{
- Trace trace("SelectionImpl::SelectionImpl");
-}
+ my_policy(p),
+ my_constraint(RefCount_var<TelltaleConstraint>::increment(c))
+{ Trace trace("SelectionImpl::SelectionImpl"); }
Berlin::CommandKit::SelectionImpl::~SelectionImpl()
{
Trace trace("SelectionImpl::~SelectionImpl");
- // for (list_t::iterator i = items.begin(); i != items.end(); i++)
+ // for (list_t::iterator i = my_items.begin(); i != my_items.end(); i++)
// try { (*i)->deactivate();}
// catch (CORBA::OBJECT_NOT_EXIST &) {}
}
-Fresco::Selection::Policy Berlin::CommandKit::SelectionImpl::type() { return policy; }
+Fresco::Selection::Policy Berlin::CommandKit::SelectionImpl::type()
+{ return my_policy; }
void Berlin::CommandKit::SelectionImpl::type(Fresco::Selection::Policy p)
{
- Prague::Guard<Mutex> guard(mutex);
- policy = p;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_policy = p;
}
Tag Berlin::CommandKit::SelectionImpl::add(Telltale_ptr t)
{
Trace trace("SelectionImpl::add");
- Prague::Guard<Mutex> guard(mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
Tag id = uniqueId();
Observer *observer = new Observer(this, t, id);
// activate(observer);
t->attach(Observer_var(observer->_this()));
- if (!CORBA::is_nil(constraint)) constraint->add(t);
- items.push_back(observer);
+ if (!CORBA::is_nil(my_constraint)) my_constraint->add(t);
+ my_items.push_back(observer);
return id;
}
void Berlin::CommandKit::SelectionImpl::remove(Tag t)
{
Trace trace("SelectionImpl::remove");
- Prague::Guard<Mutex> guard(mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
size_t i = id_to_index(t);
- if (i < items.size())
+ if (i < my_items.size())
{
- // if (!CORBA::is_nil(constraint)) constraint->remove(t);
- items[i]->destroy();
- items.erase(items.begin() + i);
+ // if (!CORBA::is_nil(my_constraint)) my_constraint->remove(t);
+ my_items[i]->destroy();
+ my_items.erase(my_items.begin() + i);
}
}
Selection::Items * Berlin::CommandKit::SelectionImpl::toggled()
{
Trace trace("SelectionImpl::toggled");
- Prague::Guard<Mutex> guard(mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
Fresco::Selection::Items_var ret = new Fresco::Selection::Items;
- for (list_t::iterator i = items.begin(); i != items.end(); i++)
+ for (list_t::iterator i = my_items.begin(); i != my_items.end(); i++)
if ((*i)->toggled())
{
- // FIXME: Use push_back() once we finally switch to gcc 3 -- tobias
+ // FIXME: Use push_back() once we finally switch to gcc 3
ret->length(ret->length() + 1);
ret[ret->length() - 1] = (*i)->id();
}
@@ -151,21 +151,23 @@
void Berlin::CommandKit::SelectionImpl::remove_observer(Tag t)
{
Trace trace("SelectionImpl::remove_observer");
- Prague::Guard<Mutex> guard(mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
size_t i = id_to_index(t);
- if (i < items.size()) items.erase(items.begin() + i);
+ if (i < my_items.size()) my_items.erase(my_items.begin() + i);
}
Tag Berlin::CommandKit::SelectionImpl::uniqueId()
{
Tag id;
for (id = 0;
- std::find_if(items.begin(), items.end(), Id_eq(id)) != items.end();
- id++);
+ std::find_if(my_items.begin(), my_items.end(),
+ Id_eq(id)) != my_items.end();
+ ++id) { }
return id;
}
CORBA::Long Berlin::CommandKit::SelectionImpl::id_to_index(Tag id)
{
- return std::find_if(items.begin(), items.end(), Id_eq(id)) - items.begin();
+ return std::find_if(my_items.begin(), my_items.end(),
+ Id_eq(id)) - my_items.begin();
}
Index: SelectionImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/SelectionImpl.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SelectionImpl.hh 27 Oct 2003 17:08:35 -0000 1.5
+++ SelectionImpl.hh 29 Dec 2003 08:03:20 -0000 1.6
@@ -19,8 +19,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _SelectionImpl_hh
-#define _SelectionImpl_hh
+#ifndef _CommandKit_SelectionImpl_hh
+#define _CommandKit_SelectionImpl_hh
#include <Fresco/config.hh>
#include <Fresco/Telltale.hh>
@@ -48,7 +48,8 @@
Fresco::Tag id;
};
public:
- SelectionImpl(Fresco::Selection::Policy, Fresco::TelltaleConstraint_ptr);
+ SelectionImpl(Fresco::Selection::Policy,
+ Fresco::TelltaleConstraint_ptr);
virtual ~SelectionImpl();
virtual Fresco::Selection::Policy type();
virtual void type(Fresco::Selection::Policy);
@@ -60,10 +61,11 @@
void remove_observer(Fresco::Tag);
Fresco::Tag uniqueId();
CORBA::Long id_to_index(Fresco::Tag);
- Prague::Mutex mutex;
- Fresco::Selection::Policy policy;
- RefCount_var<Fresco::TelltaleConstraint> constraint;
- list_t items;
+
+ Prague::Mutex my_mutex;
+ Fresco::Selection::Policy my_policy;
+ RefCount_var<Fresco::TelltaleConstraint> my_constraint;
+ list_t my_items;
};
} // namespace
Index: StreamBufferImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/StreamBufferImpl.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- StreamBufferImpl.cc 27 Oct 2003 17:08:35 -0000 1.7
+++ StreamBufferImpl.cc 29 Dec 2003 08:03:20 -0000 1.8
@@ -27,55 +27,57 @@
CORBA::Long Berlin::CommandKit::StreamBufferImpl::size()
{
- Prague::Guard<Mutex> guard(mutex);
- return length;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_length;
}
CORBA::Long Berlin::CommandKit::StreamBufferImpl::available()
{
- Prague::Guard<Mutex> guard(mutex);
- return buffer.size();
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_buffer.size();
}
void Berlin::CommandKit::StreamBufferImpl::write(const Fresco::StreamBuffer::Data &data)
{
- bool overflow = false;
- {
- Prague::Guard<Mutex> guard(mutex);
- CORBA::ULong l = data.length();
- CORBA::ULong s = buffer.size();
- if (s + l > buffer.capacity()) buffer.reserve(s + l);
- for (unsigned long i = 0; i != l; i++) buffer.push_back(data[i]);
- if (buffer.size() >= length) overflow = true;
- }
- if (overflow)
+ bool overflow = false;
{
- CORBA::Any any;
- notify(any);
+ Prague::Guard<Mutex> guard(my_mutex);
+ CORBA::ULong l = data.length();
+ CORBA::ULong s = my_buffer.size();
+ if (s + l > my_buffer.capacity()) my_buffer.reserve(s + l);
+ for (unsigned long i = 0; i != l; ++i)
+ my_buffer.push_back(data[i]);
+ if (my_buffer.size() >= my_length) overflow = true;
+ }
+ if (overflow)
+ {
+ CORBA::Any any;
+ notify(any);
}
}
void Berlin::CommandKit::StreamBufferImpl::flush()
{
- bool overflow = false;
- {
- Prague::Guard<Mutex> guard(mutex);
- if (buffer.size()) overflow = true;
- }
- if (overflow)
+ bool overflow = false;
{
- CORBA::Any any;
- notify(any);
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (my_buffer.size()) overflow = true;
+ }
+ if (overflow)
+ {
+ CORBA::Any any;
+ notify(any);
}
}
Fresco::StreamBuffer::Data * Berlin::CommandKit::StreamBufferImpl::read()
{
- Guard<Mutex> guard(mutex);
- Fresco::StreamBuffer::Data_var data = new Fresco::StreamBuffer::Data;
- data->length(buffer.size());
- for (unsigned long i = 0; i != buffer.size(); i++) data[i] = buffer[i];
- buffer.erase(buffer.begin(), buffer.end());
- buffer.reserve(length);
- return data._retn();
+ Guard<Mutex> guard(my_mutex);
+ Fresco::StreamBuffer::Data_var data = new Fresco::StreamBuffer::Data;
+ data->length(my_buffer.size());
+ for (unsigned long i = 0; i != my_buffer.size(); ++i)
+ data[i] = my_buffer[i];
+ my_buffer.erase(my_buffer.begin(), my_buffer.end());
+ my_buffer.reserve(my_length);
+ return data._retn();
}
Index: StreamBufferImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/StreamBufferImpl.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- StreamBufferImpl.hh 27 Oct 2003 17:08:35 -0000 1.7
+++ StreamBufferImpl.hh 29 Dec 2003 08:03:20 -0000 1.8
@@ -19,8 +19,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _StreamBufferImpl_hh
-#define _StreamBufferImpl_hh
+#ifndef _CommandKit_StreamBufferImpl_hh
+#define _CommandKit_StreamBufferImpl_hh
#include <Prague/Sys/Thread.hh>
#include <Fresco/config.hh>
@@ -36,7 +36,8 @@
public SubjectImpl
{
public:
- StreamBufferImpl(long l) : length(l) { buffer.reserve(length);}
+ StreamBufferImpl(long l) : my_length(l)
+ { my_buffer.reserve(my_length); }
virtual ~StreamBufferImpl() { }
virtual CORBA::Long size();
virtual CORBA::Long available();
@@ -44,9 +45,9 @@
virtual void write(const Fresco::StreamBuffer::Data &);
virtual void flush();
private:
- size_t length;
- std::vector<CORBA::Octet> buffer;
- Prague::Mutex mutex;
+ size_t my_length;
+ std::vector<CORBA::Octet> my_buffer;
+ Prague::Mutex my_mutex;
};
} // namespace
Index: TelltaleImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TelltaleImpl.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TelltaleImpl.cc 27 Oct 2003 17:08:35 -0000 1.11
+++ TelltaleImpl.cc 29 Dec 2003 08:03:20 -0000 1.12
@@ -27,43 +27,42 @@
Berlin::CommandKit::TelltaleImpl::TelltaleImpl(TelltaleConstraint_ptr c,
CORBA::ULong m) :
- _mask(m),
- _constraint(c)
+ my_mask(m),
+ my_constraint(c)
{ }
-Berlin::CommandKit::TelltaleImpl::~TelltaleImpl()
-{ }
+Berlin::CommandKit::TelltaleImpl::~TelltaleImpl() { }
void Berlin::CommandKit::TelltaleImpl::set(Fresco::Telltale::Mask m)
{
Trace trace("TelltaleImpl::set");
- if (!CORBA::is_nil(_constraint))
- _constraint->trymodify(Telltale_var(_this()), m, true);
+ if (!CORBA::is_nil(my_constraint))
+ my_constraint->trymodify(Telltale_var(_this()), m, true);
else modify(m, true);
}
void Berlin::CommandKit::TelltaleImpl::clear(Fresco::Telltale::Mask m)
{
Trace trace("TelltaleImpl::clear");
- if (!CORBA::is_nil(_constraint))
- _constraint->trymodify(Telltale_var(_this()), m, false);
+ if (!CORBA::is_nil(my_constraint))
+ my_constraint->trymodify(Telltale_var(_this()), m, false);
else modify(m, false);
}
CORBA::Boolean Berlin::CommandKit::TelltaleImpl::test(Fresco::Telltale::Mask m)
{
- Prague::Guard<Mutex> guard(_mutex);
- return (_mask & m) == m;
+ Prague::Guard<Mutex> guard(my_mutex);
+ return (my_mask & m) == m;
}
void Berlin::CommandKit::TelltaleImpl::modify(Fresco::Telltale::Mask m,
CORBA::Boolean on)
{
- CORBA::ULong nf = on ? _mask | m : _mask & ~m;
+ CORBA::ULong nf = on ? my_mask | m : my_mask & ~m;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (nf == _mask) return;
- else _mask = nf;
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (nf == my_mask) return;
+ else my_mask = nf;
}
CORBA::Any any;
any <<= nf;
@@ -72,85 +71,95 @@
void Berlin::CommandKit::TelltaleImpl::constraint(TelltaleConstraint_ptr constraint)
{
- Prague::Guard<Mutex> guard(_mutex);
- _constraint = constraint;
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_constraint = constraint;
}
TelltaleConstraint_ptr Berlin::CommandKit::TelltaleImpl::constraint()
{
- Prague::Guard<Mutex> guard(_mutex);
- return TelltaleConstraint::_duplicate(_constraint);
+ Prague::Guard<Mutex> guard(my_mutex);
+ return TelltaleConstraint::_duplicate(my_constraint);
}
void Berlin::CommandKit::TelltaleConstraintImpl::add(Telltale_ptr t)
{
- Prague::Guard<Mutex> guard(_mutex);
- _telltales.push_back(Telltale::_duplicate(t));
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_telltales.push_back(Telltale::_duplicate(t));
t->constraint(TelltaleConstraint_var(_this()));
}
void Berlin::CommandKit::TelltaleConstraintImpl::remove(Telltale_ptr t)
{
- Prague::Guard<Mutex> guard(_mutex);
- for (tlist_t::iterator i = _telltales.begin(); i != _telltales.end(); ++i)
+ Prague::Guard<Mutex> guard(my_mutex);
+ for (tlist_t::iterator i = my_telltales.begin();
+ i != my_telltales.end();
+ ++i)
if ((*i) == t)
{
- _telltales.erase(i);
+ my_telltales.erase(i);
break;
}
}
Berlin::CommandKit::ExclusiveChoice::ExclusiveChoice(Fresco::Telltale::Mask m) :
- _mask(m)
+ my_mask(m)
{ }
void Berlin::CommandKit::ExclusiveChoice::trymodify(Telltale_ptr t,
Fresco::Telltale::Mask m,
CORBA::Boolean b)
{
- Prague::Guard<Mutex> guard(_mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
if (b)
- for (tlist_t::iterator i = _telltales.begin(); i != _telltales.end(); ++i)
+ for (tlist_t::iterator i = my_telltales.begin();
+ i != my_telltales.end();
+ ++i)
if ((*i)->test(m)) (*i)->modify(m, false);
- t->modify(m, b);
+ t->modify(m, b);
}
Berlin::CommandKit::SelectionRequired::SelectionRequired(Fresco::Telltale::Mask m) :
- _mask(m)
+ my_mask(m)
{ }
void Berlin::CommandKit::SelectionRequired::trymodify(Telltale_ptr t,
Fresco::Telltale::Mask m,
CORBA::Boolean b)
{
- Prague::Guard<Mutex> guard(_mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
size_t selected = 0;
if (!b)
- for (tlist_t::iterator i = _telltales.begin(); i != _telltales.end(); ++i)
+ for (tlist_t::iterator i = my_telltales.begin();
+ i != my_telltales.end();
+ ++i)
if ((*i)->test(m)) selected++;
if (b || selected > 1) t->modify(m, b);
}
Berlin::CommandKit::ExclusiveRequired::ExclusiveRequired(Fresco::Telltale::Mask m) :
- _mask(m)
+ my_mask(m)
{ }
void Berlin::CommandKit::ExclusiveRequired::trymodify(Telltale_ptr t,
Fresco::Telltale::Mask m,
CORBA::Boolean b)
{
- Prague::Guard<Mutex> guard(_mutex);
+ Prague::Guard<Mutex> guard(my_mutex);
if (b)
{
- for (tlist_t::iterator i = _telltales.begin(); i != _telltales.end(); ++i)
+ for (tlist_t::iterator i = my_telltales.begin();
+ i != my_telltales.end();
+ ++i)
if ((*i)->test(m)) (*i)->modify(m, false);
t->modify(m, true);
}
else
{
size_t selected = 0;
- for (tlist_t::iterator i = _telltales.begin(); i != _telltales.end(); ++i)
+ for (tlist_t::iterator i = my_telltales.begin();
+ i != my_telltales.end();
+ ++i)
if ((*i)->test(m)) selected++;
if (selected > 1) t->modify(m, false);
}
Index: TelltaleImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TelltaleImpl.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TelltaleImpl.hh 27 Oct 2003 17:08:35 -0000 1.9
+++ TelltaleImpl.hh 29 Dec 2003 08:03:20 -0000 1.10
@@ -20,8 +20,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _TelltaleImpl_hh
-#define _TelltaleImpl_hh
+#ifndef _CommandKit_TelltaleImpl_hh
+#define _CommandKit_TelltaleImpl_hh
#include <Prague/Sys/Thread.hh>
#include <Fresco/config.hh>
@@ -43,15 +43,15 @@
virtual void clear(Fresco::Telltale::Mask);
virtual CORBA::Boolean test(Fresco::Telltale::Mask);
virtual void modify(Fresco::Telltale::Mask, CORBA::Boolean);
- CORBA::ULong state() { return _mask;}
+ CORBA::ULong state() { return my_mask;}
virtual void constraint(Fresco::TelltaleConstraint_ptr);
virtual Fresco::TelltaleConstraint_ptr constraint();
protected:
- Prague::Mutex _mutex;
- CORBA::ULong _mask;
- Fresco::TelltaleConstraint_var _constraint;
+ Prague::Mutex my_mutex;
+ CORBA::ULong my_mask;
+ Fresco::TelltaleConstraint_var my_constraint;
};
class TelltaleConstraintImpl : public virtual POA_Fresco::TelltaleConstraint,
@@ -66,8 +66,8 @@
virtual void trymodify(Fresco::Telltale_ptr, Fresco::Telltale::Mask,
CORBA::Boolean) = 0;
protected:
- Prague::Mutex _mutex;
- tlist_t _telltales;
+ Prague::Mutex my_mutex;
+ tlist_t my_telltales;
};
class ExclusiveChoice : public TelltaleConstraintImpl
@@ -77,7 +77,7 @@
virtual void trymodify(Fresco::Telltale_ptr, Fresco::Telltale::Mask,
CORBA::Boolean);
private:
- Fresco::Telltale::Mask _mask;
+ Fresco::Telltale::Mask my_mask;
};
class SelectionRequired : public TelltaleConstraintImpl
@@ -87,7 +87,7 @@
virtual void trymodify(Fresco::Telltale_ptr, Fresco::Telltale::Mask,
CORBA::Boolean);
private:
- Fresco::Telltale::Mask _mask;
+ Fresco::Telltale::Mask my_mask;
};
class ExclusiveRequired : public TelltaleConstraintImpl
@@ -97,7 +97,7 @@
virtual void trymodify(Fresco::Telltale_ptr, Fresco::Telltale::Mask,
CORBA::Boolean);
private:
- Fresco::Telltale::Mask _mask;
+ Fresco::Telltale::Mask my_mask;
};
} // namespace
Index: TextBufferImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TextBufferImpl.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- TextBufferImpl.cc 27 Oct 2003 17:08:35 -0000 1.13
+++ TextBufferImpl.cc 29 Dec 2003 08:03:20 -0000 1.14
@@ -32,36 +32,36 @@
CORBA::ULong Berlin::CommandKit::TextBufferImpl::size()
{
Prague::Trace trace("TextBufferImpl::size()");
- Prague::Guard<Mutex> guard(_mutex);
- return _buffer.size();
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_buffer.size();
}
Unistring * Berlin::CommandKit::TextBufferImpl::value()
{
Prague::Trace trace("TextBufferImpl::value()");
- Prague::Guard<Mutex> guard(_mutex);
- Unistring *us = new Unistring(_buffer.size(), _buffer.size(),
- const_cast<Unichar *>(_buffer.get()), false);
+ Prague::Guard<Mutex> guard(my_mutex);
+ Unistring *us = new Unistring(my_buffer.size(), my_buffer.size(),
+ const_cast<Unichar *>(my_buffer.get()), false);
return us;
}
Unistring * Berlin::CommandKit::TextBufferImpl::get_chars(CORBA::ULong pos, CORBA::ULong len)
{
Prague::Trace trace("TextBufferImpl::get_chars(...)");
- Prague::Guard<Mutex> guard(_mutex);
- CORBA::ULong fin = _buffer.size();
+ Prague::Guard<Mutex> guard(my_mutex);
+ CORBA::ULong fin = my_buffer.size();
CORBA::ULong start = pos > fin ? fin : pos;
CORBA::ULong end = start + len > fin ? fin : start + len;
Unistring *us = new Unistring(end-start, end-start,
- const_cast<Unichar *>(_buffer.get() + start), false);
+ const_cast<Unichar *>(my_buffer.get() + start), false);
return us;
}
CORBA::ULong Berlin::CommandKit::TextBufferImpl::position()
{
Prague::Trace trace("TextBufferImpl::position()");
- Prague::Guard<Mutex> guard(_mutex);
- return _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ return my_buffer.position();
}
void Berlin::CommandKit::TextBufferImpl::position(CORBA::ULong p)
@@ -69,10 +69,10 @@
Prague::Trace trace("TextBufferImpl::position(...)");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (p < 0 || p > _buffer.size()) return;
- _buffer.position(p);
- ch.pos = _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (p < 0 || p > my_buffer.size()) return;
+ my_buffer.position(p);
+ ch.pos = my_buffer.position();
}
ch.len = 0;
ch.type = Fresco::TextBuffer::cursor;
@@ -87,10 +87,10 @@
Prague::Trace trace("TextBufferImpl::forward()");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (_buffer.position() >= _buffer.size()) return;
- _buffer.forward();
- ch.pos = _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (my_buffer.position() >= my_buffer.size()) return;
+ my_buffer.forward();
+ ch.pos = my_buffer.position();
}
ch.len = 0;
ch.type = Fresco::TextBuffer::cursor;
@@ -105,10 +105,10 @@
Prague::Trace trace("TextBufferImpl::backward()");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- if (_buffer.position() <= 0) return;
- _buffer.backward();
- ch.pos = _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ if (my_buffer.position() <= 0) return;
+ my_buffer.backward();
+ ch.pos = my_buffer.position();
}
ch.len = 0;
ch.type = Fresco::TextBuffer::cursor;
@@ -123,9 +123,9 @@
Prague::Trace trace("TextBufferImpl::size()");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- _buffer.shift(d);
- ch.pos = _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ my_buffer.shift(d);
+ ch.pos = my_buffer.position();
}
ch.len = 0;
ch.type = Fresco::TextBuffer::cursor;
@@ -140,9 +140,9 @@
Prague::Trace trace("TextBufferImpl::insert_char(...)");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- ch.pos = _buffer.position();
- _buffer.insert(u);
+ Prague::Guard<Mutex> guard(my_mutex);
+ ch.pos = my_buffer.position();
+ my_buffer.insert(u);
}
ch.len = 1;
ch.type = Fresco::TextBuffer::insert;
@@ -164,9 +164,9 @@
u[i] = s[i];
{
- Prague::Guard<Mutex> guard(_mutex);
- ch.pos = _buffer.position();
- _buffer.insert(u,ch.len);
+ Prague::Guard<Mutex> guard(my_mutex);
+ ch.pos = my_buffer.position();
+ my_buffer.insert(u,ch.len);
}
ch.type = Fresco::TextBuffer::insert;
@@ -181,11 +181,11 @@
Prague::Trace trace("TextBufferImpl::remove_backward(...)");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- ch.pos = _buffer.position();
+ Prague::Guard<Mutex> guard(my_mutex);
+ ch.pos = my_buffer.position();
n = std::min(n, ch.pos);
if (n == 0) return;
- _buffer.remove_backward(n);
+ my_buffer.remove_backward(n);
}
ch.len = -n;
ch.type = Fresco::TextBuffer::remove;
@@ -200,11 +200,11 @@
Prague::Trace trace("TextBufferImpl::remove_forward(...)");
Fresco::TextBuffer::Change ch;
{
- Prague::Guard<Mutex> guard(_mutex);
- ch.pos = _buffer.position();
- n = std::min(n, _buffer.size() - ch.pos);
+ Prague::Guard<Mutex> guard(my_mutex);
+ ch.pos = my_buffer.position();
+ n = std::min(n, my_buffer.size() - ch.pos);
if (n == 0) return;
- _buffer.remove_forward(n);
+ my_buffer.remove_forward(n);
}
ch.len = n;
ch.type = Fresco::TextBuffer::remove;
@@ -219,10 +219,10 @@
Fresco::TextBuffer::Change ch;
ch.type = Fresco::TextBuffer::remove;
{
- Prague::Guard<Mutex> guard(_mutex);
- ch.len = _buffer.size();
+ Prague::Guard<Mutex> guard(my_mutex);
+ ch.len = my_buffer.size();
ch.pos = 0;
- _buffer.clear_buffer();
+ my_buffer.clear_buffer();
}
CORBA::Any any;
Index: TextBufferImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Commands/TextBufferImpl.hh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TextBufferImpl.hh 27 Oct 2003 17:08:35 -0000 1.11
+++ TextBufferImpl.hh 29 Dec 2003 08:03:20 -0000 1.12
@@ -20,8 +20,8 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
* MA 02139, USA.
*/
-#ifndef _TextBufferImpl_hh
-#define _TextBufferImpl_hh
+#ifndef _CommandKit_TextBufferImpl_hh
+#define _CommandKit_TextBufferImpl_hh
#include <Prague/Sys/Thread.hh>
#include <Fresco/config.hh>
@@ -53,8 +53,8 @@
virtual void remove_forward(CORBA::ULong);
virtual void clear();
private:
- GapBuffer<Fresco::Unichar, 32> _buffer;
- Prague::Mutex _mutex;
+ GapBuffer<Fresco::Unichar, 32> my_buffer;
+ Prague::Mutex my_mutex;
};
} // namespace