Merge pull request #309 from macvim-dev/fix/evalfunc

Re-merge evalfunc.c

Author: splhack

src/evalfunc.c

@@ -4036,7 +4036,14 @@ f_getchar(typval_T *argvars, typval_T *rettv)
 	rettv->vval.v_string = vim_strsave(temp);
 
 #ifdef FEAT_MOUSE
-	if (is_mouse_key(n))
+	if (is_mouse_key(n)
+# ifdef FEAT_GUI_MACVIM
+		|| n == K_SWIPELEFT
+		|| n == K_SWIPERIGHT
+		|| n == K_SWIPEUP
+		|| n == K_SWIPEDOWN
+# endif
+	   )
 	{
 	    int		row = mouse_row;
 	    int		col = mouse_col;
@@ -5140,6 +5147,9 @@ f_has(typval_T *argvars, typval_T *rettv)
 #if !defined(USE_SYSTEM) && defined(UNIX)
 	"fork",
 #endif
+#ifdef FEAT_FULLSCREEN
+	"fullscreen",
+#endif
 #ifdef FEAT_GETTEXT
 	"gettext",
 #endif
@@ -5167,6 +5177,9 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_GUI_MAC
 	"gui_mac",
 #endif
+#ifdef FEAT_GUI_MACVIM
+	"gui_macvim",
+#endif
 #ifdef FEAT_GUI_MOTIF
 	"gui_motif",
 #endif
@@ -5349,6 +5362,9 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_NETBEANS_INTG
 	"netbeans_intg",
 #endif
+#ifdef FEAT_ODB_EDITOR
+	"odbeditor",
+#endif
 #ifdef FEAT_SPELL
 	"spell",
 #endif
@@ -5396,6 +5412,9 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_TOOLBAR
 	"toolbar",
 #endif
+#ifdef FEAT_TRANSPARENCY
+	"transparency",
+#endif
 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
 	"unnamedplus",
 #endif
@@ -7998,8 +8017,10 @@ remote_common(typval_T *argvars, typval_T *rettv, int expr)
     char_u	buf[NUMBUFLEN];
 # ifdef WIN32
     HWND	w;
-# else
+# elif defined(FEAT_X11)
     Window	w;
+# elif defined(MAC_CLIENTSERVER)
+    int         w;      // This is the port number ('w' is a bit confusing)
 # endif
 
     if (check_restricted() || check_secure())
@@ -8016,9 +8037,11 @@ remote_common(typval_T *argvars, typval_T *rettv, int expr)
     keys = get_tv_string_buf(&argvars[1], buf);
 # ifdef WIN32
     if (serverSendToVim(server_name, keys, &r, &w, expr, TRUE) < 0)
-# else
+# elif defined(FEAT_X11)
     if (serverSendToVim(X_DISPLAY, server_name, keys, &r, &w, expr, 0, TRUE)
 									  < 0)
+# elif defined(MAC_CLIENTSERVER)
+    if (serverSendToVim(server_name, keys, &r, &w, expr, TRUE) < 0)
 # endif
     {
 	if (r != NULL)
@@ -8075,7 +8098,7 @@ f_remote_foreground(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
 	if (server_name != NULL)
 	    serverForeground(server_name);
     }
-# else
+# elif defined(FEAT_X11) || defined(MAC_CLIENTSERVER)
     /* Send a foreground() expression to the server. */
     argvars[1].v_type = VAR_STRING;
     argvars[1].vval.v_string = vim_strsave((char_u *)"foreground()");
@@ -8117,12 +8140,14 @@ f_remote_peek(typval_T *argvars UNUSED, typval_T *rettv)
 	s = serverGetReply((HWND)n, FALSE, FALSE, FALSE);
 	rettv->vval.v_number = (s != NULL);
     }
-# else
+# elif defined(FEAT_X11)
     if (check_connection() == FAIL)
 	return;
 
     rettv->vval.v_number = serverPeekReply(X_DISPLAY,
 						serverStrToWin(serverid), &s);
+# elif defined(MAC_CLIENTSERVER)
+    rettv->vval.v_number = serverPeekReply(serverStrToPort(serverid), &s);
 # endif
 
     if (argvars[1].v_type != VAR_UNKNOWN && rettv->vval.v_number > 0)
@@ -8159,9 +8184,11 @@ f_remote_read(typval_T *argvars UNUSED, typval_T *rettv)
 	if (n != 0)
 	    r = serverGetReply((HWND)n, FALSE, TRUE, TRUE);
 	if (r == NULL)
-# else
+# elif defined(FEAT_X11)
 	if (check_connection() == FAIL || serverReadReply(X_DISPLAY,
 		serverStrToWin(serverid), &r, FALSE) < 0)
+# elif defined(MAC_CLIENTSERVER)
+        if (serverReadReply(serverStrToPort(serverid), &r) < 0)
 # endif
 	    EMSG(_("E277: Unable to read a server reply"));
     }
@@ -9209,9 +9236,9 @@ f_serverlist(typval_T *argvars UNUSED, typval_T *rettv)
     char_u	*r = NULL;
 
 #ifdef FEAT_CLIENTSERVER
-# ifdef WIN32
+# if defined(WIN32) || defined(MAC_CLIENTSERVER)
     r = serverGetVimNames();
-# else
+# elif defined(FEAT_X11)
     make_connection();
     if (X_DISPLAY != NULL)
 	r = serverGetVimNames(X_DISPLAY);