author | wazlaf <wazlaf> | 2002-10-20 14:53:08 (UTC) |
---|---|---|
committer | wazlaf <wazlaf> | 2002-10-20 14:53:08 (UTC) |
commit | 18ba3be9ca69c42476e310649e3068d2d5f8a03b (patch) (unidiff) | |
tree | d6a68e8f1a319ef8320d714356beebcf440a630f /noncore/apps/opie-console/emulation_layer.cpp | |
parent | 9f442f5af601d1e15bb4d0509ed012e61609260d (diff) | |
download | opie-18ba3be9ca69c42476e310649e3068d2d5f8a03b.zip opie-18ba3be9ca69c42476e310649e3068d2d5f8a03b.tar.gz opie-18ba3be9ca69c42476e310649e3068d2d5f8a03b.tar.bz2 |
scripting fixed (moved from emulation_layer to emulation_handler). Scripts now use QByteArray instead of QString
Diffstat (limited to 'noncore/apps/opie-console/emulation_layer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/emulation_layer.cpp | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/noncore/apps/opie-console/emulation_layer.cpp b/noncore/apps/opie-console/emulation_layer.cpp index 265c11f..6a2679e 100644 --- a/noncore/apps/opie-console/emulation_layer.cpp +++ b/noncore/apps/opie-console/emulation_layer.cpp | |||
@@ -107,7 +107,6 @@ EmulationLayer::EmulationLayer( WidgetLayer* gui ) | |||
107 | bulk_nlcnt = 0; // reset bulk newline counter | 107 | bulk_nlcnt = 0; // reset bulk newline counter |
108 | bulk_incnt = 0; // reset bulk counter | 108 | bulk_incnt = 0; // reset bulk counter |
109 | connected = FALSE; | 109 | connected = FALSE; |
110 | m_script = 0; | ||
111 | 110 | ||
112 | QObject::connect(&bulk_timer, SIGNAL( timeout() ), this, SLOT( showBulk() ) ); | 111 | QObject::connect(&bulk_timer, SIGNAL( timeout() ), this, SLOT( showBulk() ) ); |
113 | QObject::connect(gui,SIGNAL( imageSizeChanged( int, int ) ), | 112 | QObject::connect(gui,SIGNAL( imageSizeChanged( int, int ) ), |
@@ -133,8 +132,6 @@ EmulationLayer::~EmulationLayer() | |||
133 | { | 132 | { |
134 | delete screen[0]; | 133 | delete screen[0]; |
135 | delete screen[1]; | 134 | delete screen[1]; |
136 | if (isRecording()) | ||
137 | clearScript(); | ||
138 | bulk_timer.stop(); | 135 | bulk_timer.stop(); |
139 | } | 136 | } |
140 | 137 | ||
@@ -232,9 +229,6 @@ void EmulationLayer::onKeyPress( QKeyEvent* ev ) | |||
232 | c.at( 0 ) = ev->ascii(); | 229 | c.at( 0 ) = ev->ascii(); |
233 | // ibot: qbytearray is emited not char* | 230 | // ibot: qbytearray is emited not char* |
234 | 231 | ||
235 | /* Are we currently recording a script? If so, store the typed character */ | ||
236 | if (isRecording()) | ||
237 | m_script->appendString(ev->text()); | ||
238 | emit sndBlock( (QByteArray) c ); | 232 | emit sndBlock( (QByteArray) c ); |
239 | } | 233 | } |
240 | } | 234 | } |
@@ -261,35 +255,6 @@ void EmulationLayer::onRcvBlock(const QByteArray &s ) | |||
261 | bulkEnd(); | 255 | bulkEnd(); |
262 | } | 256 | } |
263 | 257 | ||
264 | // Scripts ----------------------------------------------------------------- -- | ||
265 | |||
266 | |||
267 | Script *EmulationLayer::script() { | ||
268 | return m_script; | ||
269 | } | ||
270 | |||
271 | bool EmulationLayer::isRecording() { | ||
272 | return (m_script != 0); | ||
273 | } | ||
274 | |||
275 | void EmulationLayer::startRecording() { | ||
276 | if (!isRecording()) | ||
277 | m_script = new Script(); | ||
278 | } | ||
279 | |||
280 | void EmulationLayer::clearScript() { | ||
281 | if (isRecording()) { | ||
282 | |||
283 | } | ||
284 | } | ||
285 | |||
286 | void EmulationLayer::runScript(const Script *script) { | ||
287 | QByteArray a = QByteArray(); | ||
288 | QString str = script->script(); | ||
289 | a.setRawData(str.ascii(), str.length()); | ||
290 | emit sndBlock(a); | ||
291 | } | ||
292 | |||
293 | // Selection --------------------------------------------------------------- -- | 258 | // Selection --------------------------------------------------------------- -- |
294 | 259 | ||
295 | void EmulationLayer::onSelectionBegin(const int x, const int y) { | 260 | void EmulationLayer::onSelectionBegin(const int x, const int y) { |
@@ -406,3 +371,4 @@ void EmulationLayer::setColumns(int columns) | |||
406 | // Can we put this straight or explain it at least? | 371 | // Can we put this straight or explain it at least? |
407 | emit changeColumns(columns); | 372 | emit changeColumns(columns); |
408 | } | 373 | } |
374 | |||