|
|
@@ -572,9 +572,7 @@ int Viewport::handle(int event) |
|
|
|
cc->sendClipboardData(filtered); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
|
|
|
|
strFree(filtered); |
|
|
@@ -670,9 +668,7 @@ void Viewport::sendPointerEvent(const rfb::Point& pos, int buttonMask) |
|
|
|
cc->writer()->writePointerEvent(pos, buttonMask); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (!Fl::has_timeout(handlePointerTimeout, this)) |
|
|
@@ -773,9 +769,7 @@ void Viewport::handleClipboardChange(int source, void *data) |
|
|
|
self->cc->announceClipboard(true); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -788,9 +782,7 @@ void Viewport::flushPendingClipboard() |
|
|
|
cc->requestClipboard(); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} |
|
|
|
if (pendingClientClipboard) { |
|
|
@@ -799,9 +791,7 @@ void Viewport::flushPendingClipboard() |
|
|
|
cc->announceClipboard(true); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -827,9 +817,7 @@ void Viewport::handlePointerTimeout(void *data) |
|
|
|
self->lastButtonMask); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -898,9 +886,7 @@ void Viewport::handleKeyPress(int keyCode, rdr::U32 keySym) |
|
|
|
cc->writer()->writeKeyEvent(keySym, keyCode, true); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -934,9 +920,7 @@ void Viewport::handleKeyRelease(int keyCode) |
|
|
|
cc->writer()->writeKeyEvent(iter->second, keyCode, false); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("%s", e.str()); |
|
|
|
abort_connection(_("An unexpected error occurred when " |
|
|
|
"communicating with the server:\n\n%s"), |
|
|
|
e.str()); |
|
|
|
abort_connection_with_unexpected_error(e); |
|
|
|
} |
|
|
|
|
|
|
|
downKeySym.erase(iter); |