SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@370 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-17 08:52:24 +00:00
parent 9c59a27999
commit f76510e74a
21 changed files with 101 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/console/piconsole.cpp
View File

@@ -107,12 +107,13 @@ PIConsole::PIConsole(bool startNow, PIKbdListener::KBFunc slot): PIThread() {
tabs.reserve(16);
addTab("main");
listener = new PIKbdListener(key_event, this);
peer_timer = new PITimer();
peer = 0;
server_mode = pause_ = false;
state = Disconnected;
peer_timer.addDelimiter(20);
peer_timer.setName("__S__PIConsole::peer_timer");
CONNECT2(void, void * , int, &peer_timer, tickEvent, this, peerTimer);
peer_timer->addDelimiter(20);
peer_timer->setName("__S__PIConsole::peer_timer");
CONNECT2(void, void * , int, peer_timer, tickEvent, this, peerTimer);
if (startNow) start();
}
@@ -123,6 +124,7 @@ PIConsole::~PIConsole() {
stop();
clearTabs(false);
delete listener;
delete peer_timer;
#ifdef WINDOWS
SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
@@ -882,14 +884,14 @@ void PIConsole::startServer(const PIString & name) {
peer = new PIPeer("_rcs_:" + name);
CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
CONNECT1(void, const PIString & , peer, peerDisconnectedEvent, this, peerDisconnectedEvent);
peer_timer.start(50.);
peer_timer->start(50.);
serverSendInfo();
}
void PIConsole::stopPeer() {
remote_clients.clear();
peer_timer.stop();
peer_timer->stop();
if (peer != 0) delete peer;
peer = 0;
state = Disconnected;
@@ -914,7 +916,7 @@ void PIConsole::listenServers() {
srand(PISystemTime::current().nanoseconds);
peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(rand()));
CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
peer_timer.start(100.);
peer_timer->start(100.);
}

4
src/console/piconsole.h
View File

@@ -24,12 +24,12 @@
#define PICONSOLE_H
#include "pikbdlistener.h"
#include "pitimer.h"
class PIProtocol;
class PIDiagnostics;
class PISystemMonitor;
class PIPeer;
class PITimer;
class PIP_EXPORT PIConsole: public PIThread
{
@@ -444,7 +444,7 @@ public:
uint cur_tab, col_cnt;
PIPeer * peer;
PITimer peer_timer;
PITimer * peer_timer;
PITimeMeasurer peer_tm;
PIString server_name;
bool server_mode, pause_;

1
src/console/piterminal.h
View File

@@ -23,7 +23,6 @@
#ifndef PITERMINAL_H
#define PITERMINAL_H
#include "pithread.h"
#include "pikbdlistener.h"
#include "piscreentypes.h"