~3v1n0/nux/check-dnd_area-trusty

« back to all changes in this revision

Viewing changes to NuxGraphics/Makefile.am

  • Committer: Tarmac
  • Author(s): Brandon Schaefer
  • Date: 2014-01-03 18:02:22 UTC
  • mfrom: (831.2.9 nux-xim)
  • Revision ID: tarmac-20140103180222-f8031e8kdo09rf3x
Adds preedit support to XIM. Such as preedit rendering in the TextEntry.

Move XIM support from GraphicsDisplayX11 to WindowThread. Fixes: https://bugs.launchpad.net/bugs/1265565.

Approved by Christopher Townsend, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
source_h += \
94
94
  $(srcdir)/GraphicsDisplayX11.h \
95
95
  $(srcdir)/VirtualKeyCodesX11.h \
96
 
  $(srcdir)/XInputWindow.h \
97
 
  $(srcdir)/XICClient.h \
98
 
  $(srcdir)/XIMController.h
 
96
  $(srcdir)/XInputWindow.h
99
97
endif
100
98
 
101
99
if !NUX_OPENGLES_20
170
168
if USE_X11
171
169
source_cpp += \
172
170
  $(srcdir)/GraphicsDisplayX11.cpp \
173
 
  $(srcdir)/XInputWindow.cpp \
174
 
  $(srcdir)/XICClient.cpp \
175
 
  $(srcdir)/XIMController.cpp
 
171
  $(srcdir)/XInputWindow.cpp
176
172
endif
177
173
 
178
174
if !NUX_OPENGLES_20