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

.rainbow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5593 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-11-29 18:33:57 +00:00
parent 106fc861bb
commit ce27df935f
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rainbow/Framebuffer/Wnd.cpp
View file

@ -263,7 +263,6 @@ void Ctrl::DoUpdate()
Vector<Rect> Ctrl::GetPaintRects()
{
Vector<Rect> r;
int q = FindTopCtrl();
r.Add(GetScreenRect());
for(int i = max(FindTopCtrl() + 1, 0); i < topctrl.GetCount(); i++)
Subtract(r, topctrl[i]->GetScreenRect());

12
rainbow/SDLFb/Proc.cpp
View file

@ -89,7 +89,7 @@ void HandleSDLEvent(SDL_Event* event)
case SDL_KEYDOWN:
case SDL_KEYUP: //SDL_KeyboardEvent
{
bool b = false;
// bool b = false;
dword keycode = 0;
if(event->type == SDL_KEYDOWN) {
switch(event->key.keysym.sym)
@ -99,17 +99,18 @@ void HandleSDLEvent(SDL_Event* event)
case SDLK_LCTRL: modkeys |= KM_LCTRL; break;
case SDLK_RCTRL: modkeys |= KM_RCTRL; break;
case SDLK_LALT: modkeys |= KM_LALT; break;
case SDLK_RALT: modkeys |= KM_RALT; break;
case SDLK_RALT: modkeys |= KM_RALT; break;
default:;
}
keycode = fbKEYtoK((dword)event->key.keysym.sym);
if(keycode != K_SPACE) //dont send space on keydown
b = Ctrl::DoKeyFB(keycode, 1);
/*b = */Ctrl::DoKeyFB(keycode, 1);
//send respective keyup things as char events as well
keycode = (dword)event->key.keysym.unicode;
if((keycode != 127 && keycode >= 32 && keycode < 255))
b = Ctrl::DoKeyFB(keycode, 1);
/*b = */Ctrl::DoKeyFB(keycode, 1);
}
else
if(event->type == SDL_KEYUP)
@ -122,10 +123,11 @@ void HandleSDLEvent(SDL_Event* event)
case SDLK_RCTRL: modkeys &= ~KM_RCTRL; break;
case SDLK_LALT: modkeys &= ~KM_LALT; break;
case SDLK_RALT: modkeys &= ~KM_RALT; break;
default:;
}
keycode = fbKEYtoK((dword)event->key.keysym.sym) | K_KEYUP;
b = Ctrl::DoKeyFB(keycode, 1);
/*b = */Ctrl::DoKeyFB(keycode, 1);
}
}
break;