Make X dock support optional.

This commit is contained in:
Daiki Ueno
2011-06-14 07:14:45 +09:00
parent 1dbf0d70da
commit 78480f7577
3 changed files with 23 additions and 0 deletions

View File

@ -120,6 +120,22 @@ fi
AM_CONDITIONAL(ENABLE_XTEST, [test x$enable_xtest = xyes]) AM_CONDITIONAL(ENABLE_XTEST, [test x$enable_xtest = xyes])
AC_MSG_RESULT($enable_xtest) AC_MSG_RESULT($enable_xtest)
dnl use X to mark the fullscreen window as dock
AC_MSG_CHECKING([whether you enable X dock])
AC_ARG_ENABLE(x-dock,
AS_HELP_STRING([--enable-x-dock=no/yes],
[Enable X dock default=yes]),,
enable_x_dock=yes)
if test x$enable_x_dock = xyes; then
PKG_CHECK_MODULES([XDOCK], [x], , enable_x_dock=no)
if test x$enable_x_dock = xyes; then
AC_DEFINE([HAVE_XDOCK], [1], [Define if X dock is found])
fi
fi
AM_CONDITIONAL(ENABLE_XDOCK, [test x$enable_x_dock = xyes])
AC_MSG_RESULT($enable_x_dock)
focus_listeners="" focus_listeners=""
keystroke_listeners="" keystroke_listeners=""

View File

@ -83,6 +83,11 @@ eekboard_server_CFLAGS += $(CLUTTER_GTK_CFLAGS)
eekboard_server_LDADD += $(top_builddir)/eek/libeek-clutter.la $(CLUTTER_GTK_LIBS) eekboard_server_LDADD += $(top_builddir)/eek/libeek-clutter.la $(CLUTTER_GTK_LIBS)
endif endif
if ENABLE_XDOCK
eekboard_server_CFLAGS += $(XDOCK_CFLAGS)
eekboard_server_LDADD += $(XDOCK_LIBS)
endif
eekboard_server_headers = server-server.h server-context.h eekboard_server_headers = server-server.h server-context.h
eekboard_server_SOURCES = server-server.c server-context.c server-main.c eekboard_server_SOURCES = server-server.c server-context.c server-main.c

View File

@ -200,6 +200,7 @@ static void
on_realize_set_dock (GtkWidget *widget, on_realize_set_dock (GtkWidget *widget,
gpointer user_data) gpointer user_data)
{ {
#ifdef HAVE_XDOCK
GdkWindow *window = gtk_widget_get_window (widget); GdkWindow *window = gtk_widget_get_window (widget);
Atom atoms[2] = { None, None }; Atom atoms[2] = { None, None };
gint x, y, width, height, depth; gint x, y, width, height, depth;
@ -243,6 +244,7 @@ on_realize_set_dock (GtkWidget *widget,
"_NET_WM_STRUT_PARTIAL", False), "_NET_WM_STRUT_PARTIAL", False),
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
(guchar *)vals, 12); (guchar *)vals, 12);
#endif /* HAVE_XDOCK */
} }
static void static void