frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'krh/xwayland-for-keithp'

This commit is contained in:
Keith Packard 2014-04-21 14:59:51 -07:00
parent 9c86d5f4f6 66b6024740
commit ba5c2b6c87
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2458,7 +2458,6 @@ if test "x$XWAYLAND" = xyes; then
XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS"
AC_SUBST([XWAYLAND_LIBS]) AC_SUBST([XWAYLAND_LIBS])
AC_SUBST([XWAYLAND_SYS_LIBS]) AC_SUBST([XWAYLAND_SYS_LIBS])
WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland'])
fi fi

10
hw/xwayland/xwayland.c
View File

@ -218,7 +218,6 @@ xwl_realize_window(WindowPtr window)
screen->RealizeWindow = xwl_realize_window; screen->RealizeWindow = xwl_realize_window;
if (xwl_screen->rootless && !window->parent) { if (xwl_screen->rootless && !window->parent) {
ErrorF("Clearing root clip\n");
RegionNull(&window->clipList); RegionNull(&window->clipList);
RegionNull(&window->borderClip); RegionNull(&window->borderClip);
RegionNull(&window->winSize); RegionNull(&window->winSize);
@ -573,8 +572,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
fbPictureInit(pScreen, 0, 0); fbPictureInit(pScreen, 0, 0);
#ifdef HAVE_XSHMFENCE
if (!miSyncShmScreenInit(pScreen)) if (!miSyncShmScreenInit(pScreen))
return FALSE; return FALSE;
#endif
xwl_screen->wayland_fd = wl_display_get_fd(xwl_screen->display); xwl_screen->wayland_fd = wl_display_get_fd(xwl_screen->display);
AddGeneralSocket(xwl_screen->wayland_fd); AddGeneralSocket(xwl_screen->wayland_fd);
@ -616,8 +617,10 @@ xwl_log_handler(const char *format, va_list args)
FatalError("%s", msg); FatalError("%s", msg);
} }
static const ExtensionModule glx_extension[] = { static const ExtensionModule xwayland_extensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension }, { GlxExtensionInit, "GLX", &noGlxExtension },
#endif
}; };
void void
@ -639,7 +642,8 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv)
screen_info->bitmapBitOrder = BITMAP_BIT_ORDER; screen_info->bitmapBitOrder = BITMAP_BIT_ORDER;
screen_info->numPixmapFormats = ARRAY_SIZE(depths); screen_info->numPixmapFormats = ARRAY_SIZE(depths);
LoadExtensionList(glx_extension, ARRAY_SIZE(glx_extension), FALSE); LoadExtensionList(xwayland_extensions,
ARRAY_SIZE(xwayland_extensions), FALSE);
/* Cast away warning from missing printf annotation for /* Cast away warning from missing printf annotation for
* wl_log_func_t. Wayland 1.5 will have the annotation, so we can * wl_log_func_t. Wayland 1.5 will have the annotation, so we can