Revision 9678d950 vnc.c

b/vnc.c
1234 1234
 */
1235 1235
void vnc_client_write(void *opaque)
1236 1236
{
1237
    long ret;
1238 1237
    VncState *vs = opaque;
1239 1238

  
1240 1239
#ifdef CONFIG_VNC_SASL
1241 1240
    if (vs->sasl.conn &&
1242 1241
        vs->sasl.runSSF &&
1243
        !vs->sasl.waitWriteSSF)
1244
        ret = vnc_client_write_sasl(vs);
1245
    else
1242
        !vs->sasl.waitWriteSSF) {
1243
        vnc_client_write_sasl(vs);
1244
    } else
1246 1245
#endif /* CONFIG_VNC_SASL */
1247
        ret = vnc_client_write_plain(vs);
1246
        vnc_client_write_plain(vs);
1248 1247
}
1249 1248

  
1250 1249
void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
......
1725 1724
                                       int x_position, int y_position,
1726 1725
                                       int w, int h)
1727 1726
{
1728
    if (x_position > ds_get_width(vs->ds))
1729
        x_position = ds_get_width(vs->ds);
1730 1727
    if (y_position > ds_get_height(vs->ds))
1731 1728
        y_position = ds_get_height(vs->ds);
1732
    if (x_position + w >= ds_get_width(vs->ds))
1733
        w = ds_get_width(vs->ds)  - x_position;
1734 1729
    if (y_position + h >= ds_get_height(vs->ds))
1735 1730
        h = ds_get_height(vs->ds) - y_position;
1736 1731

  

Also available in: Unified diff