forked from pool/tigervnc
b854932e02
- Update to tigervnc 1.4.1 on xorg-server 1.16.1. OBS-URL: https://build.opensuse.org/request/show/280582 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=46
89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
Index: tigervnc-1.4.1/vncviewer/DesktopWindow.cxx
|
|
===================================================================
|
|
--- tigervnc-1.4.1.orig/vncviewer/DesktopWindow.cxx
|
|
+++ tigervnc-1.4.1/vncviewer/DesktopWindow.cxx
|
|
@@ -188,6 +188,8 @@ DesktopWindow::~DesktopWindow()
|
|
|
|
OptionsDialog::removeCallback(handleOptions);
|
|
|
|
+ delete viewport;
|
|
+
|
|
// FLTK automatically deletes all child widgets, so we shouldn't touch
|
|
// them ourselves here
|
|
}
|
|
Index: tigervnc-1.4.1/vncviewer/Viewport.cxx
|
|
===================================================================
|
|
--- tigervnc-1.4.1.orig/vncviewer/Viewport.cxx
|
|
+++ tigervnc-1.4.1/vncviewer/Viewport.cxx
|
|
@@ -144,6 +144,11 @@ Viewport::Viewport(int w, int h, const r
|
|
|
|
Viewport::~Viewport()
|
|
{
|
|
+ // Send release for every pressed key
|
|
+ for(DownMap::iterator iter = downKeySym.begin(); iter != downKeySym.end(); ++iter) {
|
|
+ cc->writer()->keyEvent(iter->second, false);
|
|
+ }
|
|
+
|
|
// Unregister all timeouts in case they get a change tro trigger
|
|
// again later when this object is already gone.
|
|
Fl::remove_timeout(handlePointerTimeout, this);
|
|
Index: tigervnc-1.4.1/vncviewer/vncviewer.cxx
|
|
===================================================================
|
|
--- tigervnc-1.4.1.orig/vncviewer/vncviewer.cxx
|
|
+++ tigervnc-1.4.1/vncviewer/vncviewer.cxx
|
|
@@ -88,6 +88,8 @@ char vncServerName[VNCSERVERNAMELEN] = {
|
|
static bool exitMainloop = false;
|
|
static const char *exitError = NULL;
|
|
|
|
+static CConn *cc;
|
|
+
|
|
void exit_vncviewer(const char *error)
|
|
{
|
|
// Prioritise the first error we get as that is probably the most
|
|
@@ -114,6 +116,16 @@ static void CleanupSignalHandler(int sig
|
|
// CleanupSignalHandler allows C++ object cleanup to happen because it calls
|
|
// exit() rather than the default which is to abort.
|
|
vlog.info(_("CleanupSignalHandler called"));
|
|
+ delete cc;
|
|
+ exit(1);
|
|
+}
|
|
+
|
|
+static int CleanupXIOErrorHandler(Display *dpy)
|
|
+{
|
|
+ // CleanupSignalHandler allows C++ object cleanup to happen because it calls
|
|
+ // exit() rather than the default which is to abort.
|
|
+ vlog.info("XErrorHandler called");
|
|
+ delete cc;
|
|
exit(1);
|
|
}
|
|
|
|
@@ -392,11 +404,19 @@ int main(int argc, char** argv)
|
|
|
|
init_fltk();
|
|
|
|
+ fl_open_display();
|
|
+
|
|
+ XSetIOErrorHandler(CleanupXIOErrorHandler);
|
|
+
|
|
#if !defined(WIN32) && !defined(__APPLE__)
|
|
fl_open_display();
|
|
XkbSetDetectableAutoRepeat(fl_display, True, NULL);
|
|
#endif
|
|
|
|
+ fl_open_display();
|
|
+
|
|
+ XSetIOErrorHandler(CleanupXIOErrorHandler);
|
|
+
|
|
Configuration::enableViewerParams();
|
|
|
|
/* Load the default parameter settings */
|
|
@@ -497,7 +517,7 @@ int main(int argc, char** argv)
|
|
#endif
|
|
}
|
|
|
|
- CConn *cc = new CConn(vncServerName, sock);
|
|
+ cc = new CConn(vncServerName, sock);
|
|
|
|
while (!exitMainloop) {
|
|
int next_timer;
|