github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.developing Turtle

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6853 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-02 18:28:40 +00:00
parent c7cdd6fb0a
commit 9e531f3ca9
11 changed files with 86 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rainbow/Turtle/Ctrl.h
View file

@ -99,6 +99,7 @@ public:
static int port;
static bool debugmode;
static String ip;
static int connection_limit;
static Time stat_started;
static int64 stat_data_send;
@ -110,9 +111,14 @@ public:
static int stat_client_ms;
static bool StartSession();
static Callback WhenDisconnect;
static void EndSession();
static Callback2<int, String> WhenConnect;
static Callback1<int> WhenTerminate;
static Callback WhenDisconnect;
static void SetDesktop(Ctrl& q);
static Ctrl *GetDesktop() { return desktop; }
static void SetDesktopSize(Size sz);

1
rainbow/Turtle/DrawDragRect.cpp
View file

@ -52,7 +52,6 @@ void DrawDragRect(Ctrl& q, const DrawDragRectInfo& f)
void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
Color color, int type, int animation)
{
DLOG("DrawDragRect");
Ctrl *top = q.GetTopCtrl();
if(top) {
Point off = q.GetScreenView().TopLeft();

15
rainbow/Turtle/Event.cpp
View file

@ -258,6 +258,19 @@ void Ctrl::DoMouseButton(int event, CParser& p)
Point pt = ReadPoint(p);
int64 tm = p.ReadInt64();
(button == 0 ? mouseLeft : button == 2 ? mouseRight : mouseMiddle) = event == DOWN;
if(event == DOWN) {
if(ignoremouseup) {
KillRepeat();
ignoreclick = false;
ignoremouseup = false;
}
if(ignoreclick)
return;
}
if(event == UP) {
if(ignoreclick)
EndIgnore();
}
if(event == DOWN)
if(sDistMax(mouseDownPos, pt) < GUI_DragDistance() && tm - mouseDownTime < 800) {
event = DOUBLE;
@ -272,7 +285,7 @@ void Ctrl::DoMouseButton(int event, CParser& p)
bool Ctrl::ProcessEvent(const String& event)
{
DLOG("Processing event " << event);
LLOG("Processing event " << event);
CParser p(event);
try {
if(p.Id("I"))

74
rainbow/Turtle/FB.iml
View file

@ -23,41 +23,41 @@ IMAGE_ID(border)
IMAGE_ID(Hand)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,90,77,72,85,65,20,158,82,251,129,39,97,84,4,181,104,253,86,209,42,42,8,90,185,146,200,46,36,21)
IMAGE_DATA(70,70,161,21,24,148,80,16,26,72,68,32,189,69,152,139,50,65,91,248,178,22,225,38,52,208,69,17,66,17,253,192)
IMAGE_DATA(35,138,32,4,17,55,182,107,119,154,185,222,185,205,157,55,63,231,92,239,163,31,238,185,28,238,157,153,239,59,115,230)
IMAGE_DATA(156,51,115,47,143,199,10,108,43,19,178,142,173,17,55,224,26,48,188,0,145,3,229,50,137,3,63,127,238,130,177,177)
IMAGE_DATA(237,88,14,252,248,177,15,150,151,15,194,240,240,110,12,7,150,150,14,195,226,226,81,88,88,56,14,131,131,135,124,28)
IMAGE_DATA(152,159,239,128,239,223,207,193,183,111,23,225,235,215,203,80,42,29,113,113,224,203,151,43,240,249,243,85,168,84,122,225)
IMAGE_DATA(227,199,155,240,254,253,0,220,190,125,202,198,129,79,159,250,225,195,135,91,240,238,221,29,120,251,118,8,230,230,70,225)
IMAGE_DATA(245,235,49,232,239,239,50,113,56,166,4,111,222,220,229,184,251,240,234,213,56,204,204,204,68,250,4,122,123,47,232,28)
IMAGE_DATA(110,107,136,227,238,195,203,151,163,48,59,251,52,196,142,140,140,72,156,170,33,126,118,246,1,215,17,120,241,226,17,76)
IMAGE_DATA(79,63,134,231,207,159,57,215,59,53,245,16,174,93,59,31,219,233,233,233,118,226,123,122,58,213,113,161,208,221,125,65)
IMAGE_DATA(245,33,129,55,197,160,171,235,172,53,158,134,190,112,142,142,142,83,182,57,76,2,237,237,39,40,117,27,206,17,4,71)
IMAGE_DATA(73,115,180,182,30,161,224,3,130,63,102,105,96,155,216,90,182,62,84,166,37,94,168,20,237,57,118,88,107,255,243,125)
IMAGE_DATA(150,245,86,197,133,21,120,224,26,120,208,26,146,129,195,106,152,185,29,227,131,78,85,176,76,226,119,150,205,170,224,227)
IMAGE_DATA(69,109,27,184,110,228,136,62,49,166,225,131,141,123,247,192,230,75,103,18,28,241,44,250,196,24,51,236,36,149,227,193)
IMAGE_DATA(38,56,98,126,161,30,108,204,209,98,231,196,18,236,83,252,167,198,135,26,127,74,126,169,245,67,171,207,38,126,109,136)
IMAGE_DATA(46,91,224,44,100,244,209,136,80,107,210,60,56,202,184,203,95,151,157,52,252,170,4,42,109,236,252,182,103,138,255,38)
IMAGE_DATA(191,40,124,41,62,27,62,190,207,6,134,111,178,97,91,39,38,78,182,103,95,174,171,14,107,135,95,62,31,76,125,20)
IMAGE_DATA(254,106,246,3,165,158,168,251,22,99,203,204,69,28,72,43,86,185,136,87,182,184,35,156,48,242,203,229,178,224,67,116)
IMAGE_DATA(39,217,81,249,188,153,202,78,228,127,34,48,209,178,92,135,69,194,7,80,36,50,25,139,203,23,149,43,113,170,13,27)
IMAGE_DATA(198,180,126,213,95,221,134,186,78,53,62,122,252,116,177,245,169,118,76,241,195,170,244,59,11,63,178,136,71,86,121,201)
IMAGE_DATA(170,62,84,49,197,153,82,167,122,124,152,33,126,105,236,164,225,171,118,80,49,104,226,159,253,27,88,93,168,58,217,23)
IMAGE_DATA(0,91,160,109,197,98,179,65,221,60,38,97,127,96,243,96,252,200,34,30,153,228,37,79,116,158,232,60,209,255,83,162)
IMAGE_DATA(215,243,84,215,69,169,214,13,186,18,232,74,140,47,224,138,191,137,0,105,237,216,105,57,102,90,208,223,60,230,90,159)
IMAGE_DATA(43,46,174,120,186,242,160,230,169,42,127,141,252,90,23,93,213,245,137,171,30,147,179,20,14,230,99,68,229,20,139,69)
IMAGE_DATA(52,71,6,67,104,75,75,139,151,167,36,33,144,1,197,240,84,201,146,135,217,197,58,15,123,122,72,158,136,39,139,98)
IMAGE_DATA(139,229,48,37,127,152,124,235,69,141,225,24,107,49,63,153,106,55,230,90,159,43,46,53,63,153,92,98,173,20,15,135)
IMAGE_DATA(90,145,105,42,159,186,195,168,59,153,122,98,96,78,38,37,217,232,19,80,198,147,122,210,202,152,80,78,116,198,210,191)
IMAGE_DATA(57,24,225,13,69,173,169,188,96,243,130,117,114,216,223,86,176,249,171,180,118,99,174,245,185,226,82,243,87,105,154,74)
IMAGE_DATA(145,139,208,157,165,112,242,143,124,59,207,117,2,218,120,255,245,71,126,129,95,89,72,80,228,197,234,80,19,222,101,107)
IMAGE_DATA(21,248,149,141,83,180,254,142,100,194,219,236,103,138,71,198,199,149,72,235,156,68,188,75,211,75,6,197,228,115,78,119)
IMAGE_DATA(18,227,112,142,175,45,158,146,47,188,172,182,152,182,212,215,7,7,26,27,65,220,49,99,162,189,159,171,222,47,177,114)
IMAGE_DATA(204,214,47,218,166,62,211,188,225,120,161,16,170,13,155,224,8,108,132,19,207,54,44,21,79,241,135,186,222,180,241,196)
IMAGE_DATA(230,139,36,245,252,146,210,218,58,4,199,58,39,224,228,141,9,56,125,111,2,168,237,216,88,29,191,6,202,131,176,26)
IMAGE_DATA(13,203,188,129,95,226,139,177,173,173,13,168,138,17,241,159,106,21,255,251,63,217,102,237,235,235,203,241,53,194,203,182)
IMAGE_DATA(79,211,212,66,88,76,142,31,70,228,191,156,212,187,11,7,165,82,41,113,183,112,226,241,74,165,146,184,91,56,85,56)
IMAGE_DATA(121,87,230,97,10,223,138,87,230,137,253,104,110,110,70,227,69,91,42,6,63,57,57,153,224,152,84,193,7,194,23,225)
IMAGE_DATA(19,18,239,229,136,249,53,124,204,49,225,69,191,45,103,62,95,126,1,244,79,194,252,0,0,0,0,0,0,0,0,0)
IMAGE_DATA(120,156,237,90,77,72,85,65,20,158,82,203,224,73,24,21,65,45,90,191,85,180,138,10,130,86,174,36,210,187,144,2)
IMAGE_DATA(5,163,200,10,12,74,72,8,93,72,132,32,189,69,72,130,153,144,45,122,81,139,112,35,22,232,66,145,160,136,126,224)
IMAGE_DATA(17,69,32,66,68,155,218,185,59,205,220,238,220,230,206,155,159,115,238,187,143,76,238,185,28,230,222,153,239,59,115,230)
IMAGE_DATA(156,51,115,47,143,199,10,108,15,19,178,141,109,17,13,112,13,24,94,128,200,129,114,153,196,129,245,245,131,48,51,179)
IMAGE_DATA(15,203,129,95,191,142,194,207,159,39,96,106,234,16,134,3,63,126,156,130,239,223,59,225,219,183,51,48,62,126,210,199)
IMAGE_DATA(129,181,181,94,88,93,189,0,95,191,94,129,47,95,174,65,169,116,218,197,129,207,159,175,195,167,79,55,160,82,25,130)
IMAGE_DATA(15,31,110,193,187,119,99,48,58,218,99,227,192,199,143,35,240,254,253,109,120,251,246,14,188,121,115,15,94,189,122,8)
IMAGE_DATA(43,43,51,48,50,210,103,226,112,76,9,94,191,190,203,113,147,176,188,252,24,22,22,22,34,125,10,67,67,151,117,14)
IMAGE_DATA(183,117,143,227,38,97,105,233,33,44,46,62,11,177,211,211,211,18,167,106,136,95,92,188,207,117,26,94,190,124,4,47)
IMAGE_DATA(94,60,129,185,185,231,206,245,206,207,63,128,193,193,75,177,157,129,129,126,39,126,96,224,162,58,46,20,250,251,47,171)
IMAGE_DATA(62,36,240,166,24,244,245,157,183,198,211,208,23,206,209,219,219,99,155,195,36,208,221,125,150,82,183,225,28,65,208,73)
IMAGE_DATA(154,163,163,227,52,5,31,16,252,49,75,19,219,201,182,178,237,161,50,45,241,66,165,104,247,177,195,218,243,127,223,103)
IMAGE_DATA(89,111,85,92,88,129,7,174,137,7,173,41,25,56,172,134,153,219,255,120,220,169,10,150,73,252,129,178,89,21,124,188)
IMAGE_DATA(168,189,99,55,141,28,209,39,198,52,124,176,227,200,97,216,117,245,92,130,35,238,69,159,24,99,134,157,164,114,60,216)
IMAGE_DATA(4,71,204,47,212,131,141,57,90,236,156,88,130,125,138,255,212,248,80,227,79,201,47,181,126,104,245,217,202,175,230,232)
IMAGE_DATA(178,5,206,66,70,31,141,8,181,38,205,131,163,140,187,252,117,217,73,195,175,74,160,242,140,157,223,118,79,241,223,228)
IMAGE_DATA(23,133,47,197,103,195,199,247,217,192,240,77,54,108,235,196,196,201,118,239,203,117,213,97,237,240,203,231,131,169,143,194)
IMAGE_DATA(175,101,63,80,234,137,186,111,49,182,204,92,196,129,244,199,42,23,241,202,22,45,194,9,35,191,92,46,11,62,68,45)
IMAGE_DATA(201,142,202,231,143,169,236,68,254,39,2,19,45,203,117,88,36,124,0,69,34,147,177,184,124,81,185,18,167,218,176,97)
IMAGE_DATA(76,235,87,253,213,109,168,235,84,227,163,199,79,23,91,159,106,199,20,63,172,74,191,179,240,35,139,120,100,149,151,172)
IMAGE_DATA(234,67,21,83,156,41,117,170,199,135,25,226,151,198,78,26,190,106,7,21,131,86,254,217,223,204,26,66,213,201,190,0)
IMAGE_DATA(216,2,109,43,22,155,13,234,230,49,9,251,7,155,7,227,71,22,241,200,36,47,121,162,243,68,231,137,222,76,137,222)
IMAGE_DATA(206,83,221,16,165,90,55,232,74,160,43,49,190,128,43,254,38,2,164,61,199,78,203,49,211,130,54,242,152,107,125,174)
IMAGE_DATA(184,184,226,233,202,131,154,167,170,252,181,240,107,91,116,85,215,39,174,122,76,206,82,56,152,143,17,149,83,44,22,209)
IMAGE_DATA(28,25,12,161,237,237,237,94,158,146,132,64,6,20,195,83,37,75,30,102,23,235,60,236,233,33,121,34,158,44,138,45)
IMAGE_DATA(150,195,148,252,97,242,173,23,53,134,99,172,197,252,100,170,223,152,107,125,174,184,212,253,100,114,137,181,82,60,28,106)
IMAGE_DATA(69,166,169,124,234,14,163,238,100,234,137,129,57,153,148,100,163,79,64,25,79,234,73,43,99,66,57,209,25,75,255,230)
IMAGE_DATA(96,132,55,20,181,166,242,130,205,11,214,201,97,27,173,96,243,87,105,253,198,92,235,115,197,165,238,175,210,52,149,34)
IMAGE_DATA(23,161,59,75,225,228,31,249,118,158,235,4,180,241,54,245,71,126,129,95,89,72,80,228,197,234,80,19,222,101,171,6)
IMAGE_DATA(252,159,141,83,180,254,142,100,194,219,236,103,138,71,198,199,149,72,235,156,68,188,75,211,75,6,197,228,115,78,119,18)
IMAGE_DATA(227,112,142,175,47,158,146,47,188,212,90,76,187,27,27,131,227,45,45,32,90,204,152,120,62,198,85,239,151,88,57,102)
IMAGE_DATA(235,23,207,166,62,211,188,225,120,161,16,170,13,155,224,8,108,132,19,247,54,44,21,79,241,135,186,222,180,241,196,230)
IMAGE_DATA(139,36,141,252,146,50,49,49,1,181,104,108,172,129,95,71,134,86,160,22,13,203,188,137,95,226,139,177,171,171,11,168)
IMAGE_DATA(138,17,241,159,106,21,255,247,63,217,102,29,30,30,206,241,117,194,203,103,159,166,169,133,176,152,28,63,140,200,127,57)
IMAGE_DATA(169,173,11,7,165,82,41,209,90,56,241,120,165,82,73,180,22,78,21,78,182,202,60,76,225,91,241,202,60,177,31,109)
IMAGE_DATA(109,109,104,188,120,150,138,193,207,206,206,38,56,38,85,240,129,240,69,248,132,196,123,57,98,126,13,31,115,76,120,209)
IMAGE_DATA(111,203,153,207,151,223,126,19,195,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(1184, 22)

2
rainbow/Turtle/Image.cpp
View file

@ -26,7 +26,7 @@ void SystemDraw::ImageSysData::Init(const Image& m)
{
img = m;
handle = AllocImageHandle();
DLOG("SetImage " << handle << ", size: " << img.GetSize() << ", cache size: " << SystemDraw::cache.GetSize());
LLOG("SetImage " << handle << ", size: " << img.GetSize() << ", cache size: " << SystemDraw::cache.GetSize());
Ctrl::Put8(SETIMAGE);
Ctrl::Put16(handle);
Ctrl::Put(img.GetSize());

2
rainbow/Turtle/Output.cpp
View file

@ -61,7 +61,7 @@ void Ctrl::Output()
Put32(HIDWORD(x));
String s = turtle_stream.FlushStream();
stat_data_send += s.GetCount();
DLOG("Sending " << s.GetLength());
LLOG("Sending " << s.GetLength());
websocket.SendBinary(s);
}
}

13
rainbow/Turtle/Server.cpp
View file

@ -30,12 +30,16 @@ void Ctrl::Broadcast(int signal) {
String Ctrl::host = "localhost";
int Ctrl::port = 8088;
bool Ctrl::debugmode;
int Ctrl::connection_limit = INT_MAX;
String Ctrl::ip = "0.0.0.0";
TcpSocket Ctrl::socket;
WebSocket Ctrl::websocket;
int64 Ctrl::update_serial;
int64 Ctrl::recieved_update_serial;
Callback2<int, String> Ctrl::WhenConnect;
Callback1<int> Ctrl::WhenTerminate;
bool Ctrl::StartSession()
{
LLOG("Connect");
@ -72,8 +76,10 @@ bool Ctrl::StartSession()
#ifdef PLATFORM_POSIX
int i = 0;
while(i < pid.GetCount())
if(pid[i] && waitpid(pid[i], 0, WNOHANG | WUNTRACED) > 0)
if(pid[i] && waitpid(pid[i], 0, WNOHANG | WUNTRACED) > 0) {
WhenTerminate(pid[i]);
pid.Remove(i);
}
else
i++;
#endif
@ -84,6 +90,10 @@ bool Ctrl::StartSession()
if(http.Read(socket)) {
RLOG("Accepted, header read");
if(websocket.WebAccept(socket, http)) { // TODO: Connection limit, info
if(pid.GetCount() >= connection_limit) {
socket.Close();
continue;
}
#ifdef PLATFORM_POSIX
if(debugmode)
break;
@ -92,6 +102,7 @@ bool Ctrl::StartSession()
break;
else {
pid.Add(newpid);
WhenConnect(newpid, socket.GetPeerAddr());
socket.Close();
continue;
}

2
rainbow/Turtle/TopFrame.cpp
View file

@ -80,7 +80,7 @@ void TopWindowFrame::Paint(Draw& w)
tx += c;
tcx -= c;
}
DrawTextEllipsis(w, tx, m.top + 2, tcx, title, "..", StdFont(), SColorHighlightText());
DrawTextEllipsis(w, tx, m.top + 2, tcx, title, "..", StdFont(), SColorText());
}
void TopWindowFrame::Layout()

1
rainbow/Turtle/Turtle.h
View file

@ -80,7 +80,6 @@ public:
~ImageSysData();
};
static LRUCache<ImageSysData, int64> cache;
Point pos;

10
rainbow/Turtle/Turtle.html
View file

@ -453,6 +453,10 @@ document.onkeydown = function(event)
{
event_queue += "K " + event.keyCode + " " + event.which + key_flags(event);
ScheduleSend();
if(event.ctrlKey || event.altKey) {
event.stopPropagation();
event.preventDefault();
}
}
document.onkeypress = function(event)
@ -460,6 +464,8 @@ document.onkeypress = function(event)
event_queue += "C " + event.keyCode + " " + event.which + key_flags(event);
event.preventDefault();
ScheduleSend();
event.stopPropagation();
event.preventDefault();
}
document.onkeyup = function(event)
@ -467,6 +473,10 @@ document.onkeyup = function(event)
event_queue += "k " + event.keyCode + " " + event.which + key_flags(event);
event.preventDefault();
ScheduleSend();
if(event.ctrlKey || event.altKey) {
event.stopPropagation();
event.preventDefault();
}
}
function ResizeCanvas()

6
rainbow/Turtle/Wnd.cpp
View file

@ -186,9 +186,9 @@ void Ctrl::WndShow(bool b)
void Ctrl::WndUpdate()
{
GuiLock __;
SyncClient();
DoPaint();
Output();
// SyncClient();
// DoPaint();
// Output();
}
bool Ctrl::IsWndOpen() const {