Commit 36fab879 authored by Michael Migliore's avatar Michael Migliore Committed by Kitware Robot
Browse files

Merge topic 'fix-x11' into release

0171d592

 Fix X11 issues with full screen
Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarMathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !6773
parents 018ffe01 0171d592
...@@ -659,6 +659,12 @@ void vtkXOpenGLRenderWindow::CreateAWindow() ...@@ -659,6 +659,12 @@ void vtkXOpenGLRenderWindow::CreateAWindow()
width = winattr.width; width = winattr.width;
height = winattr.height; height = winattr.height;
this->Mapped = 1; this->Mapped = 1;
if (this->FullScreen)
{
XGrabKeyboard(
this->DisplayId, this->WindowId, False, GrabModeAsync, GrabModeAsync, CurrentTime);
}
} }
// free the visual info // free the visual info
if (v) if (v)
...@@ -1206,7 +1212,7 @@ int* vtkXOpenGLRenderWindow::GetPosition(void) ...@@ -1206,7 +1212,7 @@ int* vtkXOpenGLRenderWindow::GetPosition(void)
x = attribs.x; x = attribs.x;
y = attribs.y; y = attribs.y;
XTranslateCoordinates(this->DisplayId, this->WindowId, XTranslateCoordinates(this->DisplayId, this->ParentId,
XRootWindowOfScreen(XScreenOfDisplay(this->DisplayId, 0)), x, y, &this->Position[0], XRootWindowOfScreen(XScreenOfDisplay(this->DisplayId, 0)), x, y, &this->Position[0],
&this->Position[1], &child); &this->Position[1], &child);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment