Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 11:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace x11Time() helper function with its body

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-03-31 11:14:38 +00:00
parent bb960ee98f
commit dfbfd3bf6f
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/kernel/qx11embed_x11.cpp
View file

@ -275,13 +275,6 @@ static int x11ErrorHandler(Display *, XErrorEvent *)
return 0; return 0;
} }
// Returns the X11 timestamp. Maintained mainly by qapplication
// internals, but also updated by the XEmbed widgets.
static Time x11Time()
{
return qt_x11Data->time;
}
// Gives the version and flags of the supported XEmbed protocol. // Gives the version and flags of the supported XEmbed protocol.
static unsigned int XEmbedVersion() static unsigned int XEmbedVersion()
{ {
@ -300,7 +293,7 @@ static void sendXEmbedMessage(WId window, Display *display, long message,
c.display = display; c.display = display;
c.window = window; c.window = window;
c.data.l[0] = x11Time(); c.data.l[0] = qt_x11Data->time;
c.data.l[1] = message; c.data.l[1] = message;
c.data.l[2] = detail; c.data.l[2] = detail;
c.data.l[3] = data1; c.data.l[3] = data1;
@ -1254,7 +1247,7 @@ bool QX11EmbedContainer::eventFilter(QObject *o, QEvent *event)
} else { } else {
d->checkGrab(); d->checkGrab();
if (hasFocus()) if (hasFocus())
XSetInputFocus(x11Info().display(), d->client, RevertToParent, x11Time()); XSetInputFocus(x11Info().display(), d->client, RevertToParent, qt_x11Data->time);
} }
if (!d->isEmbedded()) if (!d->isEmbedded())
d->moveInputToProxy(); d->moveInputToProxy();
@ -1298,7 +1291,7 @@ bool QX11EmbedContainer::eventFilter(QObject *o, QEvent *event)
} }
} else { } else {
d->checkGrab(); d->checkGrab();
XSetInputFocus(x11Info().display(), d->client, RevertToParent, x11Time()); XSetInputFocus(x11Info().display(), d->client, RevertToParent, qt_x11Data->time);
} }
} }
break; break;
@ -1695,7 +1688,7 @@ void QX11EmbedContainerPrivate::acceptClient(WId window)
if (!clientIsXEmbed) { if (!clientIsXEmbed) {
checkGrab(); checkGrab();
if (q->hasFocus()) { if (q->hasFocus()) {
XSetInputFocus(q->x11Info().display(), client, RevertToParent, x11Time()); XSetInputFocus(q->x11Info().display(), client, RevertToParent, qt_x11Data->time);
} }
} else { } else {
if (!isEmbedded()) if (!isEmbedded())