nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Changed my mind about r7164. Instead of checking for zero flags

Browse Source 
inside one single uxsel front end, better to do it centrally and
avoid passing zero flags on to the front end in the first place. I'm
sure other similarly structured front ends could get confused by it
too.

[originally from svn r7171]
[r7164 == 65f9735b95]
This commit is contained in:
Simon Tatham 2007-01-26 20:00:32 +00:00
parent 13ad541cb5
commit 0ed390d44a
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unix/gtkwin.c
View File

@ -2695,15 +2695,12 @@ int uxsel_input_add(int fd, int rwx) {
if (rwx & 1) flags |= GDK_INPUT_READ;
if (rwx & 2) flags |= GDK_INPUT_WRITE;
if (rwx & 4) flags |= GDK_INPUT_EXCEPTION;
if (flags)
return gdk_input_add(fd, flags, fd_input_func, NULL);
else
return -1;
assert(flags);
return gdk_input_add(fd, flags, fd_input_func, NULL);
}
void uxsel_input_remove(int id) {
if (id > 0)
gdk_input_remove(id);
gdk_input_remove(id);
}
char *guess_derived_font_name(GdkFont *font, int bold, int wide)

22
unix/uxsel.c
View File

@ -62,22 +62,18 @@ void uxsel_init(void)
void uxsel_set(int fd, int rwx, uxsel_callback_fn callback)
{
struct fd *newfd = snew(struct fd);
struct fd *oldfd;
struct fd *newfd;
newfd->fd = fd;
newfd->rwx = rwx;
newfd->callback = callback;
uxsel_del(fd);
oldfd = find234(fds, newfd, NULL);
if (oldfd) {
uxsel_input_remove(oldfd->id);
del234(fds, oldfd);
sfree(oldfd);
if (rwx) {
newfd = snew(struct fd);
newfd->fd = fd;
newfd->rwx = rwx;
newfd->callback = callback;
newfd->id = uxsel_input_add(fd, rwx);
add234(fds, newfd);
}
add234(fds, newfd);
newfd->id = uxsel_input_add(fd, rwx);
}
void uxsel_del(int fd)