equal
deleted
inserted
replaced
1051 |
1051 |
1052 void QVNCServer::clientCutText() |
1052 void QVNCServer::clientCutText() |
1053 { |
1053 { |
1054 QRfbClientCutText ev; |
1054 QRfbClientCutText ev; |
1055 |
1055 |
1056 if (ev.read(client)) { |
1056 if (cutTextPending == 0 && ev.read(client)) { |
1057 cutTextPending = ev.length; |
1057 cutTextPending = ev.length; |
1058 if (!cutTextPending) |
1058 if (!cutTextPending) |
1059 handleMsg = false; |
1059 handleMsg = false; |
1060 } |
1060 } |
1061 |
1061 |
1479 *dst32++ = result2; |
1479 *dst32++ = result2; |
1480 *dst32++ = result1; |
1480 *dst32++ = result1; |
1481 } |
1481 } |
1482 if (count & 0x1) { |
1482 if (count & 0x1) { |
1483 const quint16 *src16 = reinterpret_cast<const quint16*>(src); |
1483 const quint16 *src16 = reinterpret_cast<const quint16*>(src); |
1484 dst32[count - 1] = qt_conv16ToRgb(src16[count - 1]); |
1484 *dst32 = qt_conv16ToRgb(src16[count - 1]); |
1485 } |
1485 } |
1486 return; |
1486 return; |
1487 #endif |
1487 #endif |
1488 } |
1488 } |
1489 } |
1489 } |
2036 encoder = 0; |
2036 encoder = 0; |
2037 #ifndef QT_NO_QWS_CURSOR |
2037 #ifndef QT_NO_QWS_CURSOR |
2038 delete qvnc_cursor; |
2038 delete qvnc_cursor; |
2039 qvnc_cursor = 0; |
2039 qvnc_cursor = 0; |
2040 #endif |
2040 #endif |
2041 if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting) |
2041 if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting && QWSServer::instance()) |
2042 QWSServer::instance()->enablePainting(false); |
2042 QWSServer::instance()->enablePainting(false); |
2043 } |
2043 } |
2044 |
2044 |
2045 |
2045 |
2046 //=========================================================================== |
2046 //=========================================================================== |