Merge lp://staging/~brandontschaefer/nux/xim-support-12-04-SRU into lp://staging/nux/2.0
Proposed by
Brandon Schaefer
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Andrea Azzarone | ||||||||||||
| Approved revision: | 626 | ||||||||||||
| Merged at revision: | 621 | ||||||||||||
| Proposed branch: | lp://staging/~brandontschaefer/nux/xim-support-12-04-SRU | ||||||||||||
| Merge into: | lp://staging/nux/2.0 | ||||||||||||
| Diff against target: |
733 lines (+494/-19) 11 files modified
Nux/TextEntry.cpp (+2/-0) NuxGraphics/Events.cpp (+5/-4) NuxGraphics/Events.h (+5/-1) NuxGraphics/GraphicsDisplayX11.cpp (+87/-9) NuxGraphics/GraphicsDisplayX11.h (+4/-1) NuxGraphics/Makefile.am (+7/-3) NuxGraphics/XICClient.cpp (+112/-0) NuxGraphics/XICClient.h (+60/-0) NuxGraphics/XIMController.cpp (+146/-0) NuxGraphics/XIMController.h (+62/-0) NuxGraphics/XInputWindow.cpp (+4/-1) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~brandontschaefer/nux/xim-support-12-04-SRU | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Azzarone (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Allocates the correct size of the texts that come in from input methods. Also allows for XIM support to be done iff IBus is not active.
To post a comment you must log in.
Revision history for this message
| Stephen M. Webb (bregma) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
(1) Does this handle the case of no IM present? You removed the XLookupString() case.
(2) Are you sure there is no leak here?
208 + m_pEvent->dtext = nullptr;