nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-30 16:30:29 -05:00
Code Issues Projects Releases Wiki Activity

Use the SELECT_* enum for a few more uxsel flags.

Browse Source 
This cleans up some spots that were missed in 47202c4e16.
This commit is contained in:
Colin Watson 2019-03-20 10:50:44 +00:00 committed by Simon Tatham
parent 867e691874
commit 6ce6fe5712
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unix/gtkcomm.c
View File

@ -107,18 +107,18 @@ uxsel_id *uxsel_input_add(int fd, int rwx) {
#if GTK_CHECK_VERSION(2,0,0) #if GTK_CHECK_VERSION(2,0,0)
int flags = 0; int flags = 0;
if (rwx & 1) flags |= G_IO_IN | G_IO_HUP; if (rwx & SELECT_R) flags |= G_IO_IN | G_IO_HUP;
if (rwx & 2) flags |= G_IO_OUT; if (rwx & SELECT_W) flags |= G_IO_OUT;
if (rwx & 4) flags |= G_IO_PRI; if (rwx & SELECT_X) flags |= G_IO_PRI;
id->chan = g_io_channel_unix_new(fd); id->chan = g_io_channel_unix_new(fd);
g_io_channel_set_encoding(id->chan, NULL, NULL); g_io_channel_set_encoding(id->chan, NULL, NULL);
id->watch_id = g_io_add_watch_full(id->chan, GDK_PRIORITY_REDRAW+1, flags, id->watch_id = g_io_add_watch_full(id->chan, GDK_PRIORITY_REDRAW+1, flags,
fd_input_func, NULL, NULL); fd_input_func, NULL, NULL);
#else #else
int flags = 0; int flags = 0;
if (rwx & 1) flags |= GDK_INPUT_READ; if (rwx & SELECT_R) flags |= GDK_INPUT_READ;
if (rwx & 2) flags |= GDK_INPUT_WRITE; if (rwx & SELECT_W) flags |= GDK_INPUT_WRITE;
if (rwx & 4) flags |= GDK_INPUT_EXCEPTION; if (rwx & SELECT_X) flags |= GDK_INPUT_EXCEPTION;
assert(flags); assert(flags);
id->id = gdk_input_add(fd, flags, fd_input_func, NULL); id->id = gdk_input_add(fd, flags, fd_input_func, NULL);
#endif #endif

4
unix/uxser.c
View File

@ -417,9 +417,9 @@ static void serial_uxsel_setup(Serial *serial)
int rwx = 0; int rwx = 0;
if (serial->inbufsize <= SERIAL_MAX_BACKLOG) if (serial->inbufsize <= SERIAL_MAX_BACKLOG)
rwx |= 1; rwx |= SELECT_R;
if (bufchain_size(&serial->output_data)) if (bufchain_size(&serial->output_data))
rwx |= 2; /* might also want to write to it */ rwx |= SELECT_W; /* might also want to write to it */
uxsel_set(serial->fd, rwx, serial_select_result); uxsel_set(serial->fd, rwx, serial_select_result);
} }