fix linux build
git-svn-id: http://skia.googlecode.com/svn/trunk@7085 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
72708fa18d
commit
3792418358
@ -150,7 +150,7 @@ void SkOSWindow::post_linuxevent() {
|
|||||||
XFlush(fUnixWindow.fDisplay);
|
XFlush(fUnixWindow.fDisplay);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned getModifierKeys(const XEvent& evt) {
|
static unsigned getModi(const XEvent& evt) {
|
||||||
// unsigned xmod = evt.xkey.state;
|
// unsigned xmod = evt.xkey.state;
|
||||||
return 0; // TODO
|
return 0; // TODO
|
||||||
}
|
}
|
||||||
@ -177,16 +177,16 @@ void SkOSWindow::loop() {
|
|||||||
case ButtonPress:
|
case ButtonPress:
|
||||||
if (evt.xbutton.button == Button1)
|
if (evt.xbutton.button == Button1)
|
||||||
this->handleClick(evt.xbutton.x, evt.xbutton.y,
|
this->handleClick(evt.xbutton.x, evt.xbutton.y,
|
||||||
SkView::Click::kDown_State, getModifierKeys(evt));
|
SkView::Click::kDown_State, NULL, getModi(evt));
|
||||||
break;
|
break;
|
||||||
case ButtonRelease:
|
case ButtonRelease:
|
||||||
if (evt.xbutton.button == Button1)
|
if (evt.xbutton.button == Button1)
|
||||||
this->handleClick(evt.xbutton.x, evt.xbutton.y,
|
this->handleClick(evt.xbutton.x, evt.xbutton.y,
|
||||||
SkView::Click::kUp_State, getModifierKeys(evt));
|
SkView::Click::kUp_State, NULL, getModi(evt));
|
||||||
break;
|
break;
|
||||||
case MotionNotify:
|
case MotionNotify:
|
||||||
this->handleClick(evt.xmotion.x, evt.xmotion.y,
|
this->handleClick(evt.xmotion.x, evt.xmotion.y,
|
||||||
SkView::Click::kMoved_State, getModifierKeys(evt));
|
SkView::Click::kMoved_State, NULL, getModi(evt));
|
||||||
break;
|
break;
|
||||||
case KeyPress: {
|
case KeyPress: {
|
||||||
KeySym keysym = XkbKeycodeToKeysym(dsp, evt.xkey.keycode, 0, 0);
|
KeySym keysym = XkbKeycodeToKeysym(dsp, evt.xkey.keycode, 0, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user