Skip to content

Commit

Permalink
client/wayland: Update Wayland input-method protocol to unstable v1
Browse files Browse the repository at this point in the history
Weston uses unstable v1 for input-method protocol.
Unfortunately weston-terminal does not enable input method and tested
the protocol with weston-editor:
https://github.com/wayland-project/weston/blob/master/clients/editor.c

BUG=#2030
  • Loading branch information
fujiwarat committed Aug 20, 2019
1 parent 28c10d6 commit b758478
Show file tree
Hide file tree
Showing 7 changed files with 979 additions and 637 deletions.
45 changes: 24 additions & 21 deletions client/wayland/Makefile.am
Expand Up @@ -3,7 +3,8 @@
# ibus - The Input Bus
#
# Copyright (c) 2007-2013 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2007-2013 Red Hat, Inc.
# Copyright (c) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
# Copyright (c) 2007-2019 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
Expand All @@ -25,38 +26,40 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
libexec_PROGRAMS = ibus-wayland

protocol_sources = \
input-method-protocol.c \
input-method-client-protocol.h \
$(NULL)
input-method-unstable-v1-client-protocol.h \
input-method-unstable-v1-protocol.c \
$(NULL)

ibus_wayland_SOURCES = \
$(protocol_sources) \
main.c \
$(NULL)
$(protocol_sources) \
main.c \
$(NULL)

ibus_wayland_DEPENDENCIES = \
$(libibus) \
$(NULL)
$(libibus) \
$(NULL)

ibus_wayland_LDADD = \
$(libibus) \
$(GIO2_LIBS) \
$(WAYLAND_LIBS) \
$(NULL)
$(libibus) \
$(GIO2_LIBS) \
$(WAYLAND_LIBS) \
$(NULL)

ibus_wayland_CFLAGS = \
$(GIO2_CFLAGS) \
$(WAYLAND_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(NULL)
$(GIO2_CFLAGS) \
$(WAYLAND_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
$(NULL)

$(libibus):
(cd $(top_builddir)/src; make)

EXTRA_DIST = \
README \
$(protocol_sources) \
$(NULL)
README \
$(protocol_sources) \
$(NULL)

@wayland_scanner_rules@

-include $(top_srcdir)/git.mk

0 comments on commit b758478

Please sign in to comment.