Permalink
Browse files
Merge Linux xrandr branch into v1.8.4
- Loading branch information...
Showing
with
6 additions
and
1 deletion.
-
+4
−1
CMakeLists.txt
-
+2
−0
src/lib/platform/XWindowsScreen.cpp
|
|
@@ -205,7 +205,10 @@ if (UNIX) |
|
|
set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH}:/usr/local/include")
|
|
|
|
|
|
set(XKBlib "X11/Xlib.h;X11/XKBlib.h")
|
|
|
- check_symbol_exists("XRRNotifyEvent" "${XKBlib};X11/extensions/Xrandr.h" HAVE_X11_EXTENSIONS_XRANDR_H)
|
|
|
+ set(CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
|
|
|
+ check_type_size("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
|
|
|
+ set(HAVE_X11_EXTENSIONS_XRANDR_H "${X11_EXTENSIONS_XRANDR_H}")
|
|
|
+ set(CMAKE_EXTRA_INCLUDE_FILES)
|
|
|
|
|
|
check_include_files("${XKBlib};X11/extensions/dpms.h" HAVE_X11_EXTENSIONS_DPMS_H)
|
|
|
check_include_files("X11/extensions/Xinerama.h" HAVE_X11_EXTENSIONS_XINERAMA_H)
|
|
|
|
|
|
@@ -1442,6 +1442,8 @@ XWindowsScreen::handleSystemEvent(const Event& event, void*) |
|
|
XMoveWindow(m_display, m_window, m_x, m_y);
|
|
|
XResizeWindow(m_display, m_window, m_w, m_h);
|
|
|
}
|
|
|
+
|
|
|
+ sendEvent(m_events->forIScreen().shapeChanged());
|
|
|
}
|
|
|
}
|
|
|
#endif
|
|
|
|
0 comments on commit
360d5a7