[hackers] [st][PATCH 2/2] Rename spotlist to preedit

From: Ivan Tham <pickfire_AT_riseup.net>
Date: Mon, 3 Feb 2020 13:37:48 +0800

Input Context Values contains both preedit and status attributes which
both takes in XVaNestedList type. It would be clearer to use preedit
explains more of the preedit attributes compared to spotlist which may
not only be used for spot.

---
 x.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/x.c b/x.c
index 1f62129..039cdf3 100644
--- a/x.c
+++ b/x.c
_AT_@ -98,7 +98,7 @@ typedef struct {
 		XIM xim;
 		XIC xic;
 		XPoint spot;
-		XVaNestedList spotlist;
+		XVaNestedList preedit;
 	} ime;
 	Draw draw;
 	Visual *vis;
_AT_@ -1040,8 +1040,7 @@ ximopen(Display *dpy)
 		fprintf(stderr, "XSetIMValues: "
 		                "Could not set XNDestroyCallback.\n");
 
-	xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
-	                                      NULL);
+	xw.ime.preedit = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot, NULL);
 
 	if (xw.ime.xic == NULL) {
 		xw.ime.xic = XCreateIC(xw.ime.xim, XNInputStyle,
_AT_@ -1071,7 +1070,7 @@ ximdestroy(XIM xim, XPointer client, XPointer call)
 	xw.ime.xim = NULL;
 	XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
 	                               ximinstantiate, NULL);
-	XFree(xw.ime.spotlist);
+	XFree(xw.ime.preedit);
 }
 
 int
_AT_@ -1633,7 +1632,7 @@ xximspot(int x, int y)
 	xw.ime.spot.x = borderpx + x * win.cw;
 	xw.ime.spot.y = borderpx + (y + 1) * win.ch;
 
-	XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);
+	XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.preedit, NULL);
 }
 
 void
-- 
2.25.0

Received on Mon Feb 03 2020 - 06:37:48 CET