logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://hacktivis.me/git/etc_portage.git

0001-better-Input-Method-Editor-IME-support.patch (4610B)

    

  1. From e85b6b64660214121164ea97fb098eaa4935f7db Mon Sep 17 00:00:00 2001
  2. From: Ivan Tham <pickfire@riseup.net>
  3. Date: Tue, 12 Feb 2019 18:41:41 +0100
  4. Subject: [PATCH 1/5] better Input Method Editor (IME) support
  6. Features:
  8. - Allow input methods swap with hotkey (E.g. left ctrl + left shift).
  9. - Over-the-spot pre-editing style, pre-edit data placed over insertion point.
  10. - Restart IME without segmentation fault.
  12. TODO:
  14. - Automatically pickup IME if st started before IME
  15. ---
  16.  st.c  |  1 +
  17.  win.h |  1 +
  18.  x.c   | 69 ++++++++++++++++++++++++++++++++++++++++++++---------------
  19.  3 files changed, 54 insertions(+), 17 deletions(-)
  21. diff --git a/st.c b/st.c
  22. index b8e6077..cf8687e 100644
  23. --- a/st.c
  24. +++ b/st.c
  25. @@ -2594,6 +2594,7 @@ draw(void)
  26.  			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
  27.  	term.ocx = cx, term.ocy = term.c.y;
  28.  	xfinishdraw();
  29. +	xximspot(term.ocx, term.ocy);
  30.  }
  31.  
  32.  void
  33. diff --git a/win.h b/win.h
  34. index 31f327d..a6ef1b9 100644
  35. --- a/win.h
  36. +++ b/win.h
  37. @@ -36,3 +36,4 @@ void xsetmode(int, unsigned int);
  38.  void xsetpointermotion(int);
  39.  void xsetsel(char *);
  40.  int xstartdraw(void);
  41. +void xximspot(int, int);
  42. diff --git a/x.c b/x.c
  43. index 0422421..865dacc 100644
  44. --- a/x.c
  45. +++ b/x.c
  46. @@ -139,6 +139,9 @@ static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
  47.  static void xdrawglyph(Glyph, int, int);
  48.  static void xclear(int, int, int, int);
  49.  static int xgeommasktogravity(int);
  50. +static void ximopen(Display *);
  51. +static void ximinstantiate(Display *, XPointer, XPointer);
  52. +static void ximdestroy(XIM, XPointer, XPointer);
  53.  static void xinit(int, int);
  54.  static void cresize(int, int);
  55.  static void xresize(int, int);
  56. @@ -996,6 +999,43 @@ xunloadfonts(void)
  57.  	xunloadfont(&dc.ibfont);
  58.  }
  59.  
  60. +void
  61. +ximopen(Display *dpy)
  62. +{
  63. +	XIMCallback destroy = { .client_data = NULL, .callback = ximdestroy };
  64. +
  65. +	if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
  66. +		XSetLocaleModifiers("@im=local");
  67. +		if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
  68. +			XSetLocaleModifiers("@im=");
  69. +			if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL)
  70. +				die("XOpenIM failed. Could not open input device.\n");
  71. +		}
  72. +	}
  73. +	if (XSetIMValues(xw.xim, XNDestroyCallback, &destroy, NULL) != NULL)
  74. +		die("XSetIMValues failed. Could not set input method value.\n");
  75. +	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
  76. +				XNClientWindow, xw.win, XNFocusWindow, xw.win, NULL);
  77. +	if (xw.xic == NULL)
  78. +		die("XCreateIC failed. Could not obtain input method.\n");
  79. +}
  80. +
  81. +void
  82. +ximinstantiate(Display *dpy, XPointer client, XPointer call)
  83. +{
  84. +	ximopen(dpy);
  85. +	XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
  86. +					ximinstantiate, NULL);
  87. +}
  88. +
  89. +void
  90. +ximdestroy(XIM xim, XPointer client, XPointer call)
  91. +{
  92. +	xw.xim = NULL;
  93. +	XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
  94. +					ximinstantiate, NULL);
  95. +}
  96. +
  97.  void
  98.  xinit(int cols, int rows)
  99.  {
  100. @@ -1033,7 +1073,7 @@ xinit(int cols, int rows)
  101.  	xw.attrs.background_pixel = dc.col[defaultbg].pixel;
  102.  	xw.attrs.border_pixel = dc.col[defaultbg].pixel;
  103.  	xw.attrs.bit_gravity = NorthWestGravity;
  104. -	xw.attrs.event_mask = FocusChangeMask | KeyPressMask
  105. +	xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask
  106.  		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
  107.  		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
  108.  	xw.attrs.colormap = xw.cmap;
  109. @@ -1061,22 +1101,7 @@ xinit(int cols, int rows)
  110.  	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
  111.  
  112.  	/* input methods */
  113. -	if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
  114. -		XSetLocaleModifiers("@im=local");
  115. -		if ((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
  116. -			XSetLocaleModifiers("@im=");
  117. -			if ((xw.xim = XOpenIM(xw.dpy,
  118. -					NULL, NULL, NULL)) == NULL) {
  119. -				die("XOpenIM failed. Could not open input"
  120. -					" device.\n");
  121. -			}
  122. -		}
  123. -	}
  124. -	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
  125. -					   | XIMStatusNothing, XNClientWindow, xw.win,
  126. -					   XNFocusWindow, xw.win, NULL);
  127. -	if (xw.xic == NULL)
  128. -		die("XCreateIC failed. Could not obtain input method.\n");
  129. +	ximopen(xw.dpy);
  130.  
  131.  	/* white cursor, black outline */
  132.  	cursor = XCreateFontCursor(xw.dpy, mouseshape);
  133. @@ -1554,6 +1579,16 @@ xfinishdraw(void)
  134.  				defaultfg : defaultbg].pixel);
  135.  }
  136.  
  137. +void
  138. +xximspot(int x, int y)
  139. +{
  140. +	XPoint spot = { borderpx + x * win.cw, borderpx + (y + 1) * win.ch };
  141. +	XVaNestedList attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
  142. +
  143. +	XSetICValues(xw.xic, XNPreeditAttributes, attr, NULL);
  144. +	XFree(attr);
  145. +}
  146. +
  147.  void
  148.  expose(XEvent *ev)
  149.  {
  150. -- 
  151. 2.21.0