aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1371

Browse Source 
Problem:    X11 GUI callbacks don't specify the part of the channel.
Solution:   Pass the fd instead of the channel ID.
This commit is contained in:
Bram Moolenaar
2016-02-20 18:44:39 +01:00
parent ddbe7d26b1
commit fffd5560c6
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/channel.c
View File

@@ -329,40 +329,21 @@ channel_free(channel_T *channel)
vim_free(channel); vim_free(channel);
} }
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
static channel_T *
channel_from_id(int id)
{
channel_T *channel;
for (channel = first_channel; channel != NULL; channel = channel->ch_next)
if (channel->ch_id == id)
return channel;
return NULL;
}
#endif
#if defined(FEAT_GUI) || defined(PROTO) #if defined(FEAT_GUI) || defined(PROTO)
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) #if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
static void static void
channel_read_netbeans(int id) channel_read_fd(int fd)
{ {
channel_T *channel = channel_from_id(id); channel_T *channel;
int part; int part;
channel = channel_fd2channel(fd, &part);
if (channel == NULL) if (channel == NULL)
ch_errorn(NULL, "Channel %d not found", id); ch_errorn(NULL, "Channel for fd %d not found", fd);
else else
{
/* TODO: check stderr */
if (channel->CH_SOCK_FD != INVALID_FD)
part = PART_SOCK;
else
part = PART_OUT;
channel_read(channel, part, "messageFromNetbeans"); channel_read(channel, part, "messageFromNetbeans");
} }
}
#endif #endif
/* /*
@@ -375,7 +356,7 @@ messageFromNetbeans(XtPointer clientData,
int *unused1 UNUSED, int *unused1 UNUSED,
XtInputId *unused2 UNUSED) XtInputId *unused2 UNUSED)
{ {
channel_read_netbeans((int)(long)clientData); channel_read_fd((int)(long)clientData);
} }
#endif #endif
@@ -385,7 +366,7 @@ messageFromNetbeans(gpointer clientData,
gint unused1 UNUSED, gint unused1 UNUSED,
GdkInputCondition unused2 UNUSED) GdkInputCondition unused2 UNUSED)
{ {
channel_read_netbeans((int)(long)clientData); channel_read_fd((int)(long)clientData);
} }
#endif #endif
@@ -401,7 +382,7 @@ channel_gui_register_one(channel_T *channel, int part)
channel->ch_part[part].ch_fd, channel->ch_part[part].ch_fd,
(XtPointer)(XtInputReadMask + XtInputExceptMask), (XtPointer)(XtInputReadMask + XtInputExceptMask),
messageFromNetbeans, messageFromNetbeans,
(XtPointer)(long)channel->ch_id); (XtPointer)(long)channel->ch_part[part].ch_fd);
# else # else
# ifdef FEAT_GUI_GTK # ifdef FEAT_GUI_GTK
/* Tell gdk we are interested in being called when there /* Tell gdk we are interested in being called when there
@@ -412,7 +393,7 @@ channel_gui_register_one(channel_T *channel, int part)
(GdkInputCondition) (GdkInputCondition)
((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), ((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
messageFromNetbeans, messageFromNetbeans,
(gpointer)(long)channel->ch_id); (gpointer)(long)channel->ch_part[part].ch_fd);
# else # else
# ifdef FEAT_GUI_W32 # ifdef FEAT_GUI_W32
/* Tell Windows we are interested in receiving message when there /* Tell Windows we are interested in receiving message when there
@@ -1812,13 +1793,14 @@ channel_read_json_block(channel_T *channel, int part, int id, typval_T **rettv)
return FAIL; return FAIL;
} }
# if defined(WIN32) || defined(PROTO) # if defined(WIN32) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \
|| defined(PROTO)
/* /*
* Lookup the channel from the socket. Set "part" to the fd index. * Lookup the channel from the socket. Set "partp" to the fd index.
* Returns NULL when the socket isn't found. * Returns NULL when the socket isn't found.
*/ */
channel_T * channel_T *
channel_fd2channel(sock_T fd, int *part) channel_fd2channel(sock_T fd, int *partp)
{ {
channel_T *channel; channel_T *channel;
int part; int part;
@@ -1834,7 +1816,7 @@ channel_fd2channel(sock_T fd, int *part)
# endif # endif
if (channel->ch_part[part].ch_fd == fd) if (channel->ch_part[part].ch_fd == fd)
{ {
*part = part; *partp = part;
return channel; return channel;
} }
} }

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1371,
/**/ /**/
1370, 1370,
/**/ /**/