← Back to branch summary

~3v1n0/nux/check-dnd_area-trusty

« back to all changes in this revision

Viewing changes to NuxGraphics/XInputWindow.cpp

  • 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:
NuxGraphics/XInputWindow.cpp
22
22
#include "XInputWindow.h"
23
23
#include "GraphicsDisplayX11.h"
24
24
#include "GLThread.h"
25
 
#include "XIMController.h"
26
25
 
27
26
namespace nux
28
27
{
396
395
 
397
396
  void XInputWindow::Hide()
398
397
  {
399
 
    GetGraphicsDisplay()->RemoveFocusedWindowForXIMController();
400
 
 
401
398
    XMoveResizeWindow(display_, window_,
402
399
                      -100 - geometry_.width,
403
400
                      -100 - geometry_.height,
408
405
 
409
406
  void XInputWindow::Show()
410
407
  {
411
 
    GetGraphicsDisplay()->SetFocusedWindowForXIMController(window_);
412
 
 
413
408
    shown_ = true;
414
409
    if (!mapped_)
415
410
    {