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@283 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-11-23 15:10:40 +00:00
parent 8f6e7d2cae
commit e66e78ac16
29 changed files with 973 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/console/piconsole.cpp
View File

@@ -62,14 +62,14 @@ extern PIMutex __PICout_mutex__;
PRIVATE_DEFINITION_START(PIConsole) PRIVATE_DEFINITION_START(PIConsole)
#ifdef WINDOWS #ifdef WINDOWS
void getWinCurCoord() {GetConsoleScreenBufferInfo(hOut, &csbi); ccoord = csbi.dwCursorPosition;} void getWinCurCoord() {GetConsoleScreenBufferInfo(hOut, &csbi); ccoord = csbi.dwCursorPosition;}
COORD & getWinCoord(int dx = 0, int dy = 0) {getWinCurCoord(); ccoord.X += dx; ccoord.Y += dy; return ccoord;} COORD & getWinCoord(int dx = 0, int dy = 0) {getWinCurCoord(); ccoord.X += dx; ccoord.Y += dy; return ccoord;}
void * hOut; void * hOut;
CONSOLE_SCREEN_BUFFER_INFO sbi, csbi; CONSOLE_SCREEN_BUFFER_INFO sbi, csbi;
CONSOLE_CURSOR_INFO curinfo; CONSOLE_CURSOR_INFO curinfo;
COORD ccoord, ulcoord; COORD ccoord, ulcoord;
WORD dattr; WORD dattr;
DWORD smode, written; DWORD smode, written;
#endif #endif
PRIVATE_DEFINITION_END(PIConsole) PRIVATE_DEFINITION_END(PIConsole)
@@ -521,7 +521,7 @@ void PIConsole::run() {
} }
if (clen + tv_.offset < (uint)col_wid) { if (clen + tv_.offset < (uint)col_wid) {
PIString ts = PIString( PIString ts = PIString(
#if defined(QNX) || defined(FREE_BSD) #if defined(QNX) || defined(FREE_BSD)
col_wid - clen - tv_.offset - 1, ' '); col_wid - clen - tv_.offset - 1, ' ');
#else #else
col_wid - clen - tv_.offset, ' '); col_wid - clen - tv_.offset, ' ');

14
src/console/piconsole.h
View File

@@ -283,8 +283,8 @@ public:
EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data) EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
//! \handlers //! \handlers
//! \{ //! \{
//! \fn void waitForFinish() //! \fn void waitForFinish()
//! \brief block until finished (exit key will be pressed) //! \brief block until finished (exit key will be pressed)
@@ -298,16 +298,16 @@ public:
//! \fn void stop(bool clear = false) //! \fn void stop(bool clear = false)
//! \brief Stop console output and if "clear" clear the screen //! \brief Stop console output and if "clear" clear the screen
//! \} //! \}
//! \events //! \events
//! \{ //! \{
//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data) //! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object //! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
//! \} //! \}
private: private:
void begin(); void begin();
void run(); void run();
void fillLabels(); void fillLabels();

2
src/io/pifile.cpp
View File

@@ -82,7 +82,7 @@
* *
*/ */
REGISTER_DEVICE(PIFile); REGISTER_DEVICE(PIFile)
PIString PIFile::FileInfo::name() const { PIString PIFile::FileInfo::name() const {

2
src/io/pipacketextractor.cpp
View File

@@ -80,7 +80,7 @@
* *
* */ * */
REGISTER_DEVICE(PIPacketExtractor); REGISTER_DEVICE(PIPacketExtractor)
PIPacketExtractor::PIPacketExtractor(PIIODevice * device_, PIPacketExtractor::SplitMode mode) { PIPacketExtractor::PIPacketExtractor(PIIODevice * device_, PIPacketExtractor::SplitMode mode) {

2
src/io/piserial.cpp
View File

@@ -124,7 +124,7 @@
* *
*/ */
REGISTER_DEVICE(PISerial); REGISTER_DEVICE(PISerial)
PRIVATE_DEFINITION_START(PISerial) PRIVATE_DEFINITION_START(PISerial)

2
src/io/piusb.cpp
View File

@@ -9,7 +9,7 @@
# endif # endif
#endif #endif
REGISTER_DEVICE(PIUSB); REGISTER_DEVICE(PIUSB)
PIUSB::PIUSB(ushort vid, ushort pid): PIIODevice("", ReadWrite) { PIUSB::PIUSB(ushort vid, ushort pid): PIIODevice("", ReadWrite) {