yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable focus in event handling in Client

Browse source
This commit is contained in:
Martin Gräßlin 2013-07-26 14:35:28 +02:00
parent bf775b1c0e
commit 6af74b86f4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -680,7 +680,7 @@ private:
void clientMessageEvent(XClientMessageEvent* e); void clientMessageEvent(XClientMessageEvent* e);
void enterNotifyEvent(xcb_enter_notify_event_t *e); void enterNotifyEvent(xcb_enter_notify_event_t *e);
void leaveNotifyEvent(xcb_leave_notify_event_t *e); void leaveNotifyEvent(xcb_leave_notify_event_t *e);
void focusInEvent(XFocusInEvent* e); void focusInEvent(xcb_focus_in_event_t *e);
void focusOutEvent(XFocusOutEvent* e); void focusOutEvent(XFocusOutEvent* e);
virtual void damageNotifyEvent(); virtual void damageNotifyEvent();

14
events.cpp
View file

@ -564,10 +564,10 @@ bool Client::windowEvent(xcb_generic_event_t *e)
// workspace()->updateFocusMousePosition( QPoint( e->xcrossing.x_root, e->xcrossing.y_root )); // workspace()->updateFocusMousePosition( QPoint( e->xcrossing.x_root, e->xcrossing.y_root ));
break; break;
} }
#if KWIN_QT5_PORTING case XCB_FOCUS_IN:
case FocusIn: focusInEvent(reinterpret_cast<xcb_focus_in_event_t*>(e));
focusInEvent(&e->xfocus);
break; break;
#if KWIN_QT5_PORTING
case FocusOut: case FocusOut:
focusOutEvent(&e->xfocus); focusOutEvent(&e->xfocus);
break; break;
@ -1336,13 +1336,13 @@ bool Client::motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_ro
return true; return true;
} }
void Client::focusInEvent(XFocusInEvent* e) void Client::focusInEvent(xcb_focus_in_event_t *e)
{ {
if (e->window != window()) if (e->event != window())
return; // only window gets focus return; // only window gets focus
if (e->mode == NotifyUngrab) if (e->mode == XCB_NOTIFY_MODE_UNGRAB)
return; // we don't care return; // we don't care
if (e->detail == NotifyPointer) if (e->detail == XCB_NOTIFY_DETAIL_POINTER)
return; // we don't care return; // we don't care
if (!isShown(false) || !isOnCurrentDesktop()) // we unmapped it, but it got focus meanwhile -> if (!isShown(false) || !isOnCurrentDesktop()) // we unmapped it, but it got focus meanwhile ->
return; // activateNextClient() already transferred focus elsewhere return; // activateNextClient() already transferred focus elsewhere