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

Use Xcb::CurrentInput in the focus in event handler

Browse source
This commit is contained in:
Martin Gräßlin 2013-09-10 11:37:40 +02:00
parent 4576a0b6db
commit 439122e2bc
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
events.cpp
View file

@ -374,12 +374,9 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e)
const auto *event = reinterpret_cast<xcb_focus_in_event_t*>(e); const auto *event = reinterpret_cast<xcb_focus_in_event_t*>(e);
if (event->event == rootWindow() if (event->event == rootWindow()
&& (event->detail == XCB_NOTIFY_DETAIL_NONE || event->detail == XCB_NOTIFY_DETAIL_POINTER_ROOT)) { && (event->detail == XCB_NOTIFY_DETAIL_NONE || event->detail == XCB_NOTIFY_DETAIL_POINTER_ROOT)) {
Xcb::CurrentInput currentInput;
updateXTime(); // focusToNull() uses xTime(), which is old now (FocusIn has no timestamp) updateXTime(); // focusToNull() uses xTime(), which is old now (FocusIn has no timestamp)
// TODO: port to XCB if (!currentInput.isNull() && (currentInput->focus == XCB_WINDOW_NONE || currentInput->focus == XCB_NOTIFY_DETAIL_POINTER_ROOT)) {
Window focus;
int revert;
XGetInputFocus(display(), &focus, &revert);
if (focus == XCB_WINDOW_NONE || focus == XCB_NOTIFY_DETAIL_POINTER_ROOT) {
//kWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" ; //kWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" ;
Client *c = mostRecentlyActivatedClient(); Client *c = mostRecentlyActivatedClient();
if (c != NULL) if (c != NULL)