github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.developing Turtle

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6844 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-01 16:35:46 +00:00
parent f3a3dc5724
commit 3a96ffc381
11 changed files with 260 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

69
rainbow/Turtle/Event.cpp
View file

@ -8,12 +8,17 @@ NAMESPACE_UPP
#define LDUMP(x) // RDUMP(x)
#define LTIMING(x)
int Ctrl::serial_time0 = Null;
int64 Ctrl::serial_0;
Time Ctrl::stat_started;
int64 Ctrl::stat_data_send;
int Ctrl::stat_putrect;
int Ctrl::stat_putimage;
int Ctrl::stat_setimage;
int64 Ctrl::stat_setimage_len;
int Ctrl::stat_roundtrip_ms;
int Ctrl::stat_client_ms;
static Point MousePos;
@ -64,12 +69,18 @@ bool Ctrl::IsWaitingEvent()
uint32 l = p.ReadNumber();
uint32 h = p.ReadNumber();
recieved_update_serial = MAKEQWORD(l, h);
stat_client_ms = p.ReadNumber();
}
else
event_queue.AddTail(s);
}
catch(CParser::Error) {}
}
if(recieved_update_serial == serial_0) {
serial_0 = 0;
stat_roundtrip_ms = msecs() - serial_time0;
serial_time0 = Null;
}
}
socket.Timeout(20000);
if(socket.IsError())
@ -77,23 +88,6 @@ bool Ctrl::IsWaitingEvent()
return event_queue.GetCount();
}
bool Ctrl::ProcessEvents(bool *quit)
{
GuiLock __;
LLOG("---- Process events");
bool r = false;
while(IsWaitingEvent()) {
while(event_queue.GetCount() >= 2 && *event_queue[0] == 'M' && *event_queue[1] == 'M')
event_queue.DropHead(); // MouseMove compression
String ev = event_queue[0];
event_queue.DropHead();
ProcessEvent(ev);
r = true;
}
TimerAndPaint();
return r;
}
void Ctrl::GuiSleep(int ms)
{
GuiLock __;
@ -317,8 +311,25 @@ bool Ctrl::ProcessEvent(const String& event)
if(p.Id("K")) {
int code = p.ReadInt();
int which = p.ReadInt();
int count = 1;
for(;;) {
if(event_queue.GetCount() && event_queue[0] == event) { // Chrome autorepeat
event_queue.DropHead();
count++;
}
else
if(event_queue.GetCount() >= 2 && *event_queue[0] == 'C' && event_queue[1] == event) { // Firefox autorepeat
String h = event_queue[0];
event_queue.DropHead();
event_queue.DropHead();
event_queue.AddHead(h);
count++;
}
else
break;
}
ReadKeyMods(p);
DoKeyFB(fbKEYtoK(which), 1);
DoKeyFB(fbKEYtoK(which), count);
}
else
if(p.Id("k")) {
@ -332,6 +343,11 @@ bool Ctrl::ProcessEvent(const String& event)
int code = p.ReadInt();
int which = p.ReadInt();
ReadKeyMods(p);
int count = 1;
while(event_queue.GetCount() && event_queue[0] == event) { // 'K's are not there anymore
event_queue.DropHead();
count++;
}
if(which && !keyAlt && !keyCtrl && findarg(which, 9, 0xd) < 0)
DoKeyFB(which, 1);
}
@ -340,6 +356,23 @@ bool Ctrl::ProcessEvent(const String& event)
return true;
}
bool Ctrl::ProcessEvents(bool *quit)
{
GuiLock __;
LLOG("---- Process events");
bool r = false;
while(IsWaitingEvent()) {
while(event_queue.GetCount() >= 2 && *event_queue[0] == 'M' && *event_queue[1] == 'M')
event_queue.DropHead(); // MouseMove compression
String ev = event_queue[0];
event_queue.DropHead();
ProcessEvent(ev);
r = true;
}
TimerAndPaint();
return r;
}
Point GetMousePos() {
return MousePos;
}