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

Fix updateXTime() to make sure the X timestamp doesn't get newer than

Browse source 
timestamp of events still in the X events queue.
CCMAIL: 81693-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=314035
This commit is contained in:
Luboš Luňák 2004-05-24 08:54:04 +00:00
parent 4f0139738a
commit 4952833028
2 changed files with 64 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
events.cpp
View file

@ -435,7 +435,7 @@ bool Workspace::workspaceEvent( XEvent * e )
XGetInputFocus( qt_xdisplay(), &focus, &revert ); XGetInputFocus( qt_xdisplay(), &focus, &revert );
if( focus == None || focus == PointerRoot ) if( focus == None || focus == PointerRoot )
{ {
kdWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl; //kdWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl;
if( mostRecentlyActivatedClient() != NULL ) if( mostRecentlyActivatedClient() != NULL )
requestFocus( mostRecentlyActivatedClient(), true ); requestFocus( mostRecentlyActivatedClient(), true );
else else

77
utils.cpp
View file

@ -213,23 +213,72 @@ QCString getStringProperty(WId w, Atom prop, char separator)
return result; return result;
} }
/*! static Time next_x_time;
Updates qt_x_time by receiving a current timestamp from the server. static Bool update_x_time_predicate( Display*, XEvent* event, XPointer )
{
if( next_x_time != CurrentTime )
return False;
// from qapplication_x11.cpp
switch ( event->type ) {
case ButtonPress:
// fallthrough intended
case ButtonRelease:
next_x_time = event->xbutton.time;
break;
case MotionNotify:
next_x_time = event->xmotion.time;
break;
case KeyPress:
// fallthrough intended
case KeyRelease:
next_x_time = event->xkey.time;
break;
case PropertyNotify:
next_x_time = event->xproperty.time;
break;
case EnterNotify:
case LeaveNotify:
next_x_time = event->xcrossing.time;
break;
case SelectionClear:
next_x_time = event->xselectionclear.time;
break;
default:
break;
}
return False;
}
Use this function only when really necessary. Keep in mind that it's static Time nextXTime()
a roundtrip to the X-Server. {
*/ next_x_time = CurrentTime;
XEvent dummy;
XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL );
return next_x_time;
}
/*
Updates qt_x_time. This used to simply fetch current timestamp from the server,
but that can cause qt_x_time to be newer than timestamp of events that are
still in our events queue, thus e.g. making XSetInputFocus() caused by such
event to be ignored. Therefore first events queue is searched for first
event with timestamp.
*/
void updateXTime() void updateXTime()
{ {
static QWidget* w = 0; qt_x_time = nextXTime();
if ( !w ) if( qt_x_time == CurrentTime )
w = new QWidget; {
long data = 1; static QWidget* w = 0;
XChangeProperty(qt_xdisplay(), w->winId(), atoms->kwin_running, atoms->kwin_running, 32, if ( !w )
PropModeAppend, (unsigned char*) &data, 1); w = new QWidget;
XEvent ev; long data = 1;
XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev ); XChangeProperty(qt_xdisplay(), w->winId(), atoms->kwin_running, atoms->kwin_running, 32,
qt_x_time = ev.xproperty.time; PropModeAppend, (unsigned char*) &data, 1);
XEvent ev;
XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev );
qt_x_time = ev.xproperty.time;
}
} }
static int server_grab_count = 0; static int server_grab_count = 0;