git-svn-id: svn://db.shs.com.ru/pip@12 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2015-03-10 10:59:29 +00:00
parent 1229ef9ccb
commit 1563d4827d
5 changed files with 89 additions and 5 deletions

View File

@@ -1,3 +1,6 @@
[Buildset]
BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x06\x00p\x00i\x00p)
[CMake]
Build Directory Count=1
Current Build Directory Index=0

59
ccm_kbd.cpp Normal file
View File

@@ -0,0 +1,59 @@
// Generated by "PIP Code model generator" 27.02.2015 20:30:36
#include <string.h>
#include "ccm_kbd.h"
using namespace PICodeInfo;
__ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__::__ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__() {
if (_inited_) return;
_inited_ = true;
EnumInfo * ei;
(*enumsInfo)[""] = new EnumInfo();
// Enums
ei = new EnumInfo();
(*enumsInfo)["PIKbdListener::SpecialKey"] = ei;
ei->name = "PIKbdListener::SpecialKey";
ei->members << PICodeInfo::EnumeratorInfo("Tab", 9);
ei->members << PICodeInfo::EnumeratorInfo("Return", 10);
ei->members << PICodeInfo::EnumeratorInfo("Esc", 27);
ei->members << PICodeInfo::EnumeratorInfo("Space", 32);
ei->members << PICodeInfo::EnumeratorInfo("Backspace", 127);
ei->members << PICodeInfo::EnumeratorInfo("UpArrow", -1);
ei->members << PICodeInfo::EnumeratorInfo("DownArrow", -2);
ei->members << PICodeInfo::EnumeratorInfo("RightArrow", -3);
ei->members << PICodeInfo::EnumeratorInfo("LeftArrow", -4);
ei->members << PICodeInfo::EnumeratorInfo("Home", -5);
ei->members << PICodeInfo::EnumeratorInfo("End", -6);
ei->members << PICodeInfo::EnumeratorInfo("PageUp", -7);
ei->members << PICodeInfo::EnumeratorInfo("PageDown", -8);
ei->members << PICodeInfo::EnumeratorInfo("Insert", -9);
ei->members << PICodeInfo::EnumeratorInfo("Delete", -10);
ei->members << PICodeInfo::EnumeratorInfo("F1", -11);
ei->members << PICodeInfo::EnumeratorInfo("F2", -12);
ei->members << PICodeInfo::EnumeratorInfo("F3", -13);
ei->members << PICodeInfo::EnumeratorInfo("F4", -14);
ei->members << PICodeInfo::EnumeratorInfo("F5", -15);
ei->members << PICodeInfo::EnumeratorInfo("F6", -16);
ei->members << PICodeInfo::EnumeratorInfo("F7", -17);
ei->members << PICodeInfo::EnumeratorInfo("F8", -18);
ei->members << PICodeInfo::EnumeratorInfo("F9", -19);
ei->members << PICodeInfo::EnumeratorInfo("F10", -20);
ei->members << PICodeInfo::EnumeratorInfo("F11", -21);
ei->members << PICodeInfo::EnumeratorInfo("F12", -22);
ei = new EnumInfo();
(*enumsInfo)["PIKbdListener::KeyModifier"] = ei;
ei->name = "PIKbdListener::KeyModifier";
ei->members << PICodeInfo::EnumeratorInfo("Ctrl", 1);
ei->members << PICodeInfo::EnumeratorInfo("Shift", 2);
ei->members << PICodeInfo::EnumeratorInfo("Alt", 4);
}
bool __ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__::_inited_ = false;

19
ccm_kbd.h Normal file
View File

@@ -0,0 +1,19 @@
// Generated by "PIP Code model generator" 27.02.2015 20:30:36
#ifndef ______LIBS_PIP_SRC_CCM_KBD_H
#define ______LIBS_PIP_SRC_CCM_KBD_H
#include "pivariant.h"
#include "picodeinfo.h"
class __ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__ {
public:
__ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__();
static bool _inited_;
};
static __ClassInfo_______LIBS_PIP_SRC_CCM_KBD_H_Initializer__ __classinfo_______libs_pip_src_ccm_kbd_h_initializer__;
#endif // ______LIBS_PIP_SRC_CCM_KBD_H

View File

@@ -84,7 +84,7 @@ private:
EVENT_HANDLER(void, ftevent) {
piCout << ft.stateString()
<< "(" << PIString::readableSize(ft.bytesFileCur()) << "/" << PIString::readableSize(ft.bytesFileAll()) << ", "
<< PIString::readableSize(ft.bytesTotalCur()) << "/" << PIString::readableSize(ft.bytesTotalAll()) << ")";
<< PIString::readableSize(ft.bytesCur()) << "/" << PIString::readableSize(ft.bytesAll()) << ")";
}
EVENT_HANDLER1(void, ftsend, PIByteArray &, data) {
@@ -100,7 +100,6 @@ private:
#include "ccm_kbd.h"
void key_event(PIKbdListener::KeyEvent e, void*) {
return;
PICodeInfo::EnumInfo * ei = PICodeInfo::enumsInfo->value("PIKbdListener::SpecialKey");
if (!ei) return;
piCout << PICoutManipulators::NewLine << "modifiers" << e.modifiers;
@@ -154,11 +153,11 @@ int main (int argc, char * argv[]) {
piCout << "wait for receiving";
}*/
Catcher catcher;
PIScreen screen(false);
PIScreen screen(false, key_event);
CONNECTU(&screen, tileEvent, &catcher, event)
CONNECTU(&screen, keyPressed, &catcher, eventKey)
screen.enableExitCapture(PIKbdListener::F10);
screen.start();
//screen.start();
float cx = 0, cy = 0, vx = 1., vy = 0.3, t = 0.;
PITimeMeasurer tm;
Color col = Red;

View File

@@ -236,11 +236,15 @@ void PIFileTransfer::receive_finished(bool ok) {
receiveFilesFinished(false);
}
}
if (pftheader.step == pft_Data) receiveFilesFinished(ok);
if (pftheader.step == pft_Data) {
work_file.close();
receiveFilesFinished(ok);
}
}
void PIFileTransfer::send_finished(bool ok) {
work_file.close();
sendFilesFinished(ok);
}