vim: src/if_xcmdsrv.c comparison

comparison src/if_xcmdsrv.c @ 39:410fa1a31baf v7.0023

updated for version 7.0023

author	vimboss
date	Sun, 19 Dec 2004 22:46:22 +0000
parents	726bdc53fa49
children	f529edb9bab3

comparison

equal deleted inserted replaced

-:c524f99c7925
+:410fa1a31baf
 * when a result is returned from a sent command, it is also appended
 * to the comm property.
 *
 * Each command and each result takes the form of ASCII text.  For a
 * command, the text consists of a nul character followed by several
-* nul-terminated ASCII strings.  The first string consists of the
+* nul-terminated ASCII strings.  The first string consists of a
-* single letter "c" for an expression, or "k" for keystrokes.  Subsequent
+* single letter:
-* strings have the form "option value" where the following options are
+* "c" for an expression
-* supported:
+* "k" for keystrokes
+* "r" for reply
+* "n" for notification.
+* Subsequent strings have the form "option value" where the following options
+* are supported:
 *
 * -r commWindow serial
 *
 *	This option means that a response should be sent to the window
 *	whose X identifier is "commWindow" (in hex), and the response should
 *	no response is sent.
 *
 * -n name
 *	"Name" gives the name of the application for which the command is
 *	intended.  This option must be present.
+*
+* -E encoding
+*	Encoding name used for the text.  This is the 'encoding' of the
+*	sender.  The receiver may want to do conversion to his 'encoding'.
 *
 * -s script
 *	"Script" is the script to be executed.  This option must be
 *	present.  Taken as a series of keystrokes in a "k" command where
 *	<Key>'s are expanded
 /*
 * Send the command to target interpreter by appending it to the
 * comm window in the communication window.
 */
-length = STRLEN(name) + STRLEN(cmd) + 10;
+length = STRLEN(name) + STRLEN(cmd) + 14;
-property = (char_u *)alloc((unsigned) length + 30);
+#ifdef FEAT_MBYTE
+length += STRLEN(p_enc);
+#endif
+property = (char_u *)alloc((unsigned)length + 30);
+#ifdef FEAT_MBYTE
+sprintf((char *)property, "%c%c%c-n %s%c-E %s%c-s %s",
+		      0, asExpr ? 'c' : 'k', 0, name, 0, p_enc, 0, cmd);
+#else
 sprintf((char *)property, "%c%c%c-n %s%c-s %s",
 		      0, asExpr ? 'c' : 'k', 0, name, 0, cmd);
+#endif
 if (name == loosename)
 	vim_free(loosename);
 /* Add a back reference to our comm window */
 serial++;
 sprintf((char *)property + length, "%c-r %x %d",
 return (Window)id;
 }
 /*
-* Send a reply string to client with id "name".
+* Send a reply string (notification) to client with id "name".
 * Return -1 if the window is invalid.
 */
 int
 serverSendReply(name, str)
 char_u	*name;
 	    return -2;
 }
 if (!WindowValid(dpy, win))
 	return -1;
-length = STRLEN(str) + 7;
+length = STRLEN(str) + 11;
-if ((property = (char_u *)alloc((unsigned) length + 30)) != NULL)
+#ifdef FEAT_MBYTE
-{
+length += STRLEN(p_enc);
-	sprintf((char *)property, "%c%c%c-n %s%c-w %x",
+#endif
-			  0, 'n', 0, str, 0, (unsigned int)commWindow);
+if ((property = (char_u *)alloc((unsigned)length + 30)) != NULL)
+{
+#ifdef FEAT_MBYTE
+	sprintf((char *)property, "%cn%c-E %s%c-n %s%c-w %x",
+			    0, 0, p_enc, 0, str, 0, (unsigned int)commWindow);
+#else
+	sprintf((char *)property, "%cn%c-n %s%c-w %x",
+			    0, 0, str, 0, (unsigned int)commWindow);
+#endif
 	length += STRLEN(property + length);
 	res = AppendPropCarefully(dpy, win, commProperty, property, length + 1);
 	vim_free(property);
 	return res;
 }
 char_u	*propInfo;
 char_u	*p;
 int		result, actualFormat, code;
 long_u	numItems, bytesAfter;
 Atom	actualType;
+char_u	*tofree;
 if (eventPtr != NULL)
 {
 	if (eventPtr->xproperty.atom != commProperty
 		|| eventPtr->xproperty.state != PropertyNewValue)
 	{
 	    Window	resWindow;
 	    char_u	*name, *script, *serial, *end, *res;
 	    Bool	asKeys = *p == 'k';
 	    garray_T	reply;
+	    char_u	*enc;
 	    /*
 	     * This is an incoming command from some other application.
 	     * Iterate over all of its options.  Stop when we reach
 	     * the end of the property or something that doesn't look
 	    p += 2;
 	    name = NULL;
 	    resWindow = None;
 	    serial = (char_u *)"";
 	    script = NULL;
+	    enc = NULL;
 	    while (p - propInfo < numItems && *p == '-')
 	    {
 		switch (p[1])
 		{
 		    case 'r':
 			break;
 		    case 's':
 			if (p[2] == ' ')
 			    script = p + 3;
 			break;
+		    case 'E':
+			if (p[2] == ' ')
+			    enc = p + 3;
+			break;
 		}
 		while (*p != 0)
 		    p++;
 		p++;
 	    }
 	     * time if we need to return an error.
 	     */
 	    if (resWindow != None)
 	    {
 		ga_init2(&reply, 1, 100);
+#ifdef FEAT_MBYTE
+		ga_grow(&reply, 50 + STRLEN(p_enc));
+		sprintf(reply.ga_data, "%cr%c-E %s%c-s %s%c-r ",
+						   0, 0, p_enc, 0, serial, 0);
+#else
 		ga_grow(&reply, 50);
 		sprintf(reply.ga_data, "%cr%c-s %s%c-r ", 0, 0, serial, 0);
+#endif
 		reply.ga_len = 10 + STRLEN(serial);
 		reply.ga_room -= reply.ga_len;
 	    }
 	    res = NULL;
 	    if (serverName != NULL && STRICMP(name, serverName) == 0)
 	    {
+		script = serverConvert(enc, script, &tofree);
 		if (asKeys)
 		    server_to_input_buf(script);
 		else
 		    res = eval_client_expr_to_string(script);
+		vim_free(tofree);
 	    }
 	    if (resWindow != None)
 	    {
 		if (res != NULL)
 		    ga_concat(&reply, res);
 		    ga_concat(&reply, (char_u *)"-c 1");
 		}
 		ga_append(&reply, NUL);
 		(void)AppendPropCarefully(dpy, resWindow, commProperty,
 					   reply.ga_data, reply.ga_len);
+		ga_clear(&reply);
 	    }
 	    vim_free(res);
 	}
 	else if (*p == 'r' && p[1] == 0)
 	{
-	    int	    serial, gotSerial;
+	    int		    serial, gotSerial;
-	    char_u  *res;
+	    char_u	    *res;
-	    PendingCommand *pcPtr;
+	    PendingCommand  *pcPtr;
+	    char_u	    *enc;
 	    /*
 	     * This is a reply to some command that we sent out.  Iterate
 	     * over all of its options.  Stop when we reach the end of the
 	     * property or something that doesn't look like an option.
 	     */
 	    p += 2;
 	    gotSerial = 0;
 	    res = (char_u *)"";
 	    code = 0;
+	    enc = NULL;
 	    while ((p-propInfo) < numItems && *p == '-')
 	    {
 		switch (p[1])
 		{
 		    case 'r':
 			if (p[2] == ' ')
 			    res = p + 3;
+			break;
+		    case 'E':
+			if (p[2] == ' ')
+			    enc = p + 3;
 			break;
 		    case 's':
 			if (sscanf((char *)p + 2, " %d", &serial) == 1)
 			    gotSerial = 1;
 			break;
 		if (serial != pcPtr->serial || pcPtr->result != NULL)
 		    continue;
 		pcPtr->code = code;
 		if (res != NULL)
-		    pcPtr->result = vim_strsave(res);
+		{
+		    res = serverConvert(enc, res, &tofree);
+		    if (tofree == NULL)
+			res = vim_strsave(res);
+		    pcPtr->result = res;
+		}
 		else
 		    pcPtr->result = vim_strsave((char_u *)"");
 		break;
 	    }
 	}
 	    unsigned int u;
 	    int		gotWindow;
 	    char_u	*str;
 	    char_u	winstr[30];
 	    struct	ServerReply *r;
+	    char_u	*enc;
 	    /*
 	     * This is a (n)otification.  Sent with serverreply_send in VimL.
 	     * Execute any autocommand and save it for later retrieval
 	     */
 	    p += 2;
 	    gotWindow = 0;
 	    str = (char_u *)"";
+	    enc = NULL;
 	    while ((p-propInfo) < numItems && *p == '-')
 	    {
 		switch (p[1])
 		{
 		    case 'n':
 			if (p[2] == ' ')
 			    str = p + 3;
+			break;
+		    case 'E':
+			if (p[2] == ' ')
+			    enc = p + 3;
 			break;
 		    case 'w':
 			if (sscanf((char *)p + 2, " %x", &u) == 1)
 			{
 			    win = u;
 		p++;
 	    }
 	    if (!gotWindow)
 		continue;
+	    str = serverConvert(enc, str, &tofree);
 	    if ((r = ServerReplyFind(win, SROP_Add)) != NULL)
 	    {
 		ga_concat(&(r->strings), str);
 		ga_append(&(r->strings), NUL);
 	    }
 #ifdef FEAT_AUTOCMD
 	    sprintf((char *)winstr, "0x%x", (unsigned int)win);
 	    apply_autocmds(EVENT_REMOTEREPLY, winstr, str, TRUE, curbuf);
 #endif
+	    vim_free(tofree);
 	}
 	else
 	{
 	    /*
 	     * Didn't recognize this thing.  Just skip through the next

Mercurial > vim

comparison src/if_xcmdsrv.c @ 39:410fa1a31baf v7.0023