- x2go-dev - X2Go ListServ

Bug#12: The reported issue has been resolved with Python X2Go release 0.2.1.0
by Mike Gabriel 11 Dec '12

11 Dec '12

close #12 close #14 thanks This issue has been resolved in Python X2Go release 0.2.1.0. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#24: Issue resolved with PyHoca-GUI release 0.2.1.0
by Mike Gabriel 11 Dec '12

11 Dec '12

close #24 close #76 thanks This issue has been solved in PyHoca-GUI release 0.2.1.0. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Re: [X2Go-Dev] cairo release 1.12.4 now available
by Reinhard Tartler 07 Dec '12

07 Dec '12

The following message is a courtesy copy of an article that has been posted to gmane.comp.lib.cairo as well. On Sa, Okt 06, 2012 at 11:56:13 (CEST), Chris Wilson wrote: > On Sat, 6 Oct 2012 11:31:14 +0200, Andreas Radke <andyrtr(a)archlinux.org> wrote: >> I've packaged the new release and it works well in ArchLinux with my >> local Awesome WM setup. >> >> Remote connections using OpenNX are broken when used with Xfce. >> Xfce-panel and menu keep crashing instantly until I downgrade to 1.12.2 >> on the server. > > There is not enough information here to begin to access the cause. A > stack trace would be a good start. It seems that cairo unconditionally assumes that the xserver does support the latest version of the Xrender extension: http://cgit.freedesktop.org/cairo/tree/src/cairo-xlib-display.c?id=1.12.2#n… This assumption does not hold for many non-Xorg Xservers, including nxagent, which is used by NX and derivatives like OpenNX, FreeNX or X2Go: http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-X11/include/extension… Note that the defines for Operators only available in version 0.11 in Xorg are *not* included: /* * Operators only available in version 0.11 */ #define PictOpBlendMinimum 0x30 #define PictOpMultiply 0x30 #define PictOpScreen 0x31 #define PictOpOverlay 0x32 #define PictOpDarken 0x33 #define PictOpLighten 0x34 #define PictOpColorDodge 0x35 #define PictOpColorBurn 0x36 #define PictOpHardLight 0x37 #define PictOpSoftLight 0x38 #define PictOpDifference 0x39 #define PictOpExclusion 0x3a #define PictOpHSLHue 0x3b #define PictOpHSLSaturation 0x3c #define PictOpHSLColor 0x3d #define PictOpHSLLuminosity 0x3e #define PictOpBlendMaximum 0x3e Also, note that nxagent does not use pixman (which is the software implementation that Xorg uses nowadays), but the old, previous implementation of low-level pixel rendering, AFAIUI for example: http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-X11/programs/Xserver/… I would assume that there are still a number of other non-Xorg X11 servers (most of them commercial) that do not support these operations. Chris, is there any chance to fix/change cairo to work also without operators that are only available in version 0.11? -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4

1 0

Bug#81: get rid of remnant html tags in client<->broker communications
by Mike Gabriel 07 Dec '12

07 Dec '12

Package: x2goclient Severity: normal Version: 3.99.3.1-HEAD Tags: patch confirmed Hi Alex, I have taken a closer look at the httpbrokerclient.cpp code in x2goclient. Most replies from the httpbroker are compliant with a text/plain content type. This is good IMHO. However, in HttpBrokerClient::createIniFile x2goclient expects html tags as line breaks. If these tags are missing, the session profile won't get recognized by x2goclient. With the current developmental code in x2gobroker.git, I try to implement the current broker API with no html elements at all, so I'd be happy if these last required s could be made unnecessary. Currently, as a list of session profiles the httpbroker client code in x2goclient expects some broker output like this: """ START_USER_SESSIONS [b00830a9-aec4-4e9e-88f8-ddbffeb1c8ea]defsndport=1 sndport=4713 xinerama=1 variant= useiconv=0 iconvfrom=UTF-8 height=600 usekbd=1 applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE host=localhost export= user= fstunnel=1 quality=9 sshport=22 sound=1 fullscreen=0 rootless=0 layout= name=LOCALHOST sshproxyport=22 soundsystem=pulse speed=2 iconvto=UTF-8 soundtunnel=1 useexports=1 width=800 command=KDE multidisp=0 print=1 setdpi=0 type=auto dpi=96 pack=16m-jpeg END_USER_SESSIONS """ So, I am quite keen on x2goclient being able to _also_ handle broker output that looks like this, instead: """ [47af8619-d619-43de-bf00-2c30c47772d1] defsndport=1 sndport=4713 xinerama=1 variant= useiconv=0 iconvfrom=UTF-8 height=600 usekbd=1 applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE host=localhost export= user= fstunnel=1 quality=9 sshport=22 sound=1 fullscreen=0 rootless=0 layout= name=LOCALHOST sshproxyport=22 soundsystem=pulse speed=2 iconvto=UTF-8 soundtunnel=1 useexports=1 width=800 command=KDE multidisp=0 print=1 setdpi=0 type=auto dpi=96 pack=16m-jpeg END_USER_SESSIONS """ Attached to this post you find a patch against httpbrokerclient.* that makes x2goclient understand both variants of httpbroker output (IMHO). Can you please cross-check if that patch keeps x2goclient working with all other broker implementations that are currently deployed at your customers' sites? Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Processed: your mail
by git-admin＠x2go.org 06 Dec '12

06 Dec '12

Processing commands for control(a)bugs.x2go.org: > tag #35 confirmed Bug #35 [x2goagent] On Debian systems (wheezy/sid): Menus in Libreoffice and some other applications are not rendered properly Added tag(s) confirmed. > severity #78 important Bug #78 [x2goagent] NX_xrandr lacks support from Xrandr 1.2 and higher Severity set to 'important' from 'normal' > tag #78 confirmed Bug #78 [x2goagent] NX_xrandr lacks support from Xrandr 1.2 and higher Added tag(s) confirmed. > thanks Stopping processing here. Please contact me if you need assistance. -- 35: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=35 78: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=78 X2Go Bug Tracking System Contact git-admin(a)x2go.org with problems

1 0

Processed: your mail
by git-admin＠x2go.org 06 Dec '12

06 Dec '12

Processing commands for control(a)bugs.x2go.org: > tag #80 patch Bug #80 [x2goclient] Improve resume session dialog Added tag(s) patch. > thanks Stopping processing here. Please contact me if you need assistance. -- 80: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=80 X2Go Bug Tracking System Contact git-admin(a)x2go.org with problems

1 0

Bug#80: patch for x2goclient from Ezra Bühler
by Mike Gabriel 06 Dec '12

06 Dec '12

Hi Alex, can you please take a look at the latest patch we received for x2goclient? If the patch is acceptable, then please place the changelog entry under the author's name in the changelog and also do a git-commit under the author's identity (using --author with git commit). Greets+Thanks, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Bug#80: Improve resume session dialog
by Ezra Bühler 06 Dec '12

06 Dec '12

Package: x2goclient Version: HEAD

1 0

[PATCH] Improve resume session dialog
by Ezra Bühler 06 Dec '12

06 Dec '12

Hello I was unable to send my patch to patches(a)x2go.org so I thought I'll try this list. If this is the wrong place, please help me out... It fixes a UI issue of the client that annoys me every day... Cheers, Ezra.

1 0

Processed: reassign
by git-admin＠x2go.org 06 Dec '12

06 Dec '12

Processing commands for control(a)bugs.x2go.org: > reassign 74 x2goagent Bug #74 [nxagent] make nxagent keybindings configurable Warning: Unknown package 'nxagent' Bug reassigned from package 'nxagent' to 'x2goagent'. Ignoring request to alter found versions of bug #74 to the same values previously set Ignoring request to alter fixed versions of bug #74 to the same values previously set > -- Stopping processing here. Please contact me if you need assistance. -- 74: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=74 X2Go Bug Tracking System Contact git-admin(a)x2go.org with problems

1 0

Bug#79: x2goruncommand is not "user friendly"
by Reinhard Tartler 06 Dec '12

06 Dec '12

Package: x2goserver It seems that x2goruncommand is not supposed to be called directly by the user. Calling it without parameters yields to: >> x2goruncommand /usr/bin/x2goruncommand: Zeile 46: /home/inf4/tartler/.x2go/C-/cmdoutput: Datei oder Verzeichnis nicht gefunden /usr/bin/x2goruncommand: Zeile 262: /home/inf4/tartler/.x2go/C-/cmdoutput: Datei oder Verzeichnis nicht gefunden kill: Gebrauch: kill [-s Signalname | -n Signalnummer | -Signalname] [pid | job] ... oder kill -l [Signalname] Died at /usr/lib/x2go/x2gochangestatus line 35. argument "session_id" missed at /usr/lib/x2go/x2godbwrapper.pm line 575. The fact that it is installed by default into /usr/bin makes it appear in the tab-completion of modern shells such as bash and implies that users are supposed to call it directly. I would suggest to either: a) make it robust against wrong calling usage, b) place it in /usr/lib/x2go/x2goruncommand instead, or c) both. -- regards, Reinhard

3 2

Bug#35: Reproducible on wheezy and quantal
by Reinhard Tartler 06 Dec '12

06 Dec '12

I can reproduce this problem with both Debian/wheezy and Ubuntu/quantal. Downgrading to libcairo 1.10 makes the fonts readable again. This is not an acceptable solution, as this cannot be done without breaking package dependency constraints. -- regards, Reinhard

1 0

Bug#75: fails to use RSA SSH keys
by Reinhard Tartler 06 Dec '12

06 Dec '12

Package: pyhoca-gui Version: 0.2.0.4-0~789~precise1 The configuration dialogue asks for a private RSA/DSA keys. Unfortunately, when I try to use my RSA SSH key, the connection fails with "not a valid DSA key". Which is correct, but not helpful. BTW, when browsing for a keyfile, the window title of the file browser says (in german) "select public SSH Key". I guess it still wants a private one instead. -- regards, Reinhard

2 3

Processed: your mail
by git-admin＠x2go.org 06 Dec '12

06 Dec '12

Processing commands for control(a)bugs.x2go.org: > tag #76 pending Bug #76 [pyhoca-gui] Fails to use my local SSH agent Added tag(s) pending. > thanks Stopping processing here. Please contact me if you need assistance. -- 76: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=76 X2Go Bug Tracking System Contact git-admin(a)x2go.org with problems

1 0

Bug#76: Fails to use my local SSH agent
by Reinhard Tartler 06 Dec '12

06 Dec '12

Package: pyhoca-gui Version: 0.2.0.4-0~789~precise1 It would be nice if pyhoca-gui could just reuse my local sshagent, which happens to be gnome-keyring-daemon. -- regards, Reinhard

3 4

Bug#74: Patch applied, packages for heuler (Debian) are currently building
by Mike Gabriel 06 Dec '12

06 Dec '12

tag #74 pending thanks Hi Arw, the patch has been applied to nx-libs.git. Packages are currently building. Please add the README for the keybindings to our wiki and post the link on the x2go-dev mailing list, so that people can start testing the new feature. Ctrl-t for gnome-terminal is back, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 3

[PATCH] allow user to set his preferred applications in ~/.x2go/applications
by Reinhard Tartler 04 Dec '12

04 Dec '12

This file is sourced by the shell. Applications can be specified e.g. like this: WWWBROWSER=/usr/bin/google-chrome MAILCLIENT=/local/thunderbird/bin/thunderbird If the application does not exist, or is not specified, the hard coded list will be consulted --- x2goserver/bin/x2goruncommand | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b88c3b9..7d826b5 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -31,6 +31,10 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +if [ $HOME/.x2go/applications ]; then + . $HOME/.x2go/applications +fi + export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION @@ -131,7 +135,9 @@ elif [ "$cmd" == "TRINITY" ]; then fi if [ "$cmd" == "WWWBROWSER" ]; then - if [ -e "/usr/bin/firefox" ]; then + if [ -n "$WWWBROWSER" ] && [ -e "$WWWBROWSER" ]; then + cmd="$WWWBROWSER" + elif [ -e "/usr/bin/firefox" ]; then cmd="/usr/bin/firefox" elif [ -e "/usr/bin/iceweasel" ]; then cmd="/usr/bin/iceweasel" @@ -147,7 +153,9 @@ if [ "$cmd" == "WWWBROWSER" ]; then fi if [ "$cmd" == "MAILCLIENT" ]; then - if [ -e "/usr/bin/thunderbird" ]; then + if [ -n "$MAILCLIENT" ] && [ -e "$MAILCLIENT" ]; then + cmd="$MAILCLIENT" + elif [ -e "/usr/bin/thunderbird" ]; then cmd="/usr/bin/thunderbird" elif [ -e "/usr/bin/icedove" ]; then cmd="/usr/bin/icedove" @@ -159,7 +167,9 @@ if [ "$cmd" == "MAILCLIENT" ]; then fi if [ "$cmd" == "OFFICE" ]; then - if [ -e "/usr/bin/loffice" ]; then + if [ -n "$OFFICE" ] && [ -e "$OFFICE" ]; then + cmd="$OFFICE" + elif [ -e "/usr/bin/loffice" ]; then cmd="/usr/bin/loffice" elif [ -e "/usr/bin/ooffice" ]; then cmd="/usr/bin/ooffice" @@ -168,7 +178,9 @@ fi if [ "$cmd" == "TERMINAL" ]; then IMEXIT="true" - if [ -e "/usr/bin/konsole" ]; then + if [ -n "$TERMINAL" ] && [ -e "$TERMINAL" ]; then + cmd="$TERMINAL" + elif [ -e "/usr/bin/konsole" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" -- 1.7.9.5

3 6

Bug#74: nxagent keystroke handling: make keys configurable at runtime
by Alexander Wuerstlein 03 Dec '12

03 Dec '12

Replaces the hardcoded nxagent keybindings by a configurable table of keybindings. The default configuration is the same as the original one, to maintain compatibility. A user/administrator can either specify a command line parameter, environment variable or place a file in ~/.nx/config/keystroke.cfg or /etc/nx/keystroke.cfg to reconfigure these keybindings. The configuration file format is XML, a dependency on libxml2 is added to allow parsing the configuration. --- nx-X11/programs/Xserver/Imakefile | 9 +- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 9 +- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 699 ++++++++++++++++-------- nx-X11/programs/Xserver/hw/nxagent/Keystroke.h | 47 ++ 4 files changed, 527 insertions(+), 237 deletions(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3f53eca..80e3a71 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -1013,15 +1013,18 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \ + `pkg-config --libs libxml-2.0` #endif #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index a8e1621..ccd53d1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -142,7 +142,8 @@ INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../ -I../../miext/damage -I../../miext/cw \ -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) + $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ + `pkg-config --cflags-only-I libxml-2.0` #ifdef SunArchitecture INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -I../../../../extras/Mesa/include \ @@ -152,7 +153,8 @@ INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../ -I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ -I../../miext/damage -I../../miext/cw \ -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) + $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ + `pkg-config --cflags-only-I libxml-2.0` #else #ifdef cygwinArchitecture INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ @@ -162,7 +164,8 @@ INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -I../../../../extras/Mesa/include \ -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) + $(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES) \ + `pkg-config --cflags-only-I libxml-2.0` #endif #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 6c6e477..b5f4acf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -28,8 +28,15 @@ #include "Keystroke.h" #include "Drawable.h" +#include <unistd.h> + +#include <libxml/parser.h> +#include <libxml/tree.h> + extern Bool nxagentWMIsRunning; extern Bool nxagentIpaq; +extern char *nxagentKeystrokeFile; +Bool nxagentKeystrokeFileParsed = False; #ifdef NX_DEBUG_INPUT int nxagentDebugInputDevices = 0; @@ -47,10 +54,369 @@ extern void nxagentDeactivateInputDevicesGrabs(); #undef DEBUG #undef DUMP + +/* this table is used to parse actions given on the command line or in the + * config file, therefore indices have to match the enum in Keystroke.h */ +char * nxagentSpecialKeystrokeNames[] = { + "end_marker", + "close_session", + "switch_all_screens", + "minimize", + "left", + "up", + "right", + "down", + "resize", + "defer", + "ignore", + "force_synchronization", + + "debug_tree", + "regions_on_screen", + "test_input", + "deactivate_input_devices_grab", + + "fullscreen", + "viewport_move_left", + "viewport_move_up", + "viewport_move_right", + "viewport_move_down", + NULL, +}; + +struct nxagentSpecialKeystrokeMap default_map[] = { + /* stroke, modifierMask, modifierAltMeta, keysym */ + {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_q}, + {KEYSTROKE_DEBUG_TREE, ControlMask, 1, XK_Q}, + {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_t}, + {KEYSTROKE_CLOSE_SESSION, ControlMask, 1, XK_T}, + {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_f}, + {KEYSTROKE_SWITCH_ALL_SCREENS, ControlMask, 1, XK_F}, + {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_m}, + {KEYSTROKE_MINIMIZE, ControlMask, 1, XK_M}, + {KEYSTROKE_LEFT, ControlMask, 1, XK_Left}, + {KEYSTROKE_LEFT, ControlMask, 1, XK_KP_Left}, + {KEYSTROKE_UP, ControlMask, 1, XK_Up}, + {KEYSTROKE_UP, ControlMask, 1, XK_KP_Up}, + {KEYSTROKE_RIGHT, ControlMask, 1, XK_Right}, + {KEYSTROKE_RIGHT, ControlMask, 1, XK_KP_Right}, + {KEYSTROKE_DOWN, ControlMask, 1, XK_Down}, + {KEYSTROKE_DOWN, ControlMask, 1, XK_KP_Down}, + {KEYSTROKE_RESIZE, ControlMask, 1, XK_r}, + {KEYSTROKE_RESIZE, ControlMask, 1, XK_R}, + {KEYSTROKE_DEFER, ControlMask, 1, XK_e}, + {KEYSTROKE_DEFER, ControlMask, 1, XK_E}, + {KEYSTROKE_IGNORE, ControlMask, 1, XK_BackSpace}, + {KEYSTROKE_IGNORE, 0, 0, XK_Terminate_Server}, + {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_j}, + {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, 1, XK_J}, + {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_a}, + {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, 1, XK_A}, + {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_x}, + {KEYSTROKE_TEST_INPUT, ControlMask, 1, XK_X}, + {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_y}, + {KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB, ControlMask, 1, XK_Y}, + {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_f}, + {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, 1, XK_F}, + {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_Left}, + {KEYSTROKE_VIEWPORT_MOVE_LEFT, ControlMask | ShiftMask, 1, XK_KP_Left}, + {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_Up}, + {KEYSTROKE_VIEWPORT_MOVE_UP, ControlMask | ShiftMask, 1, XK_KP_Up}, + {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_Right}, + {KEYSTROKE_VIEWPORT_MOVE_RIGHT, ControlMask | ShiftMask, 1, XK_KP_Right}, + {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_Down}, + {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, 1, XK_KP_Down}, + {KEYSTROKE_END_MARKER, 0, 0, 0}, +}; +struct nxagentSpecialKeystrokeMap *map = default_map; + +static int modifier_matches(unsigned int mask, int compare_alt_meta, unsigned int state) +{ + /* nxagentAltMetaMask needs special handling + * it seems to me its an and-ed mask of all possible meta and alt keys + * somehow... + * + * otherwise this function would be just a simple bitop + */ + int ret = 1; + + if (compare_alt_meta) { + if (! (state & nxagentAltMetaMask)) { + ret = 0; + } + + mask &= ~nxagentAltMetaMask; + } + + /* all modifiers except meta/alt have to match exactly, extra bits are evil */ + if ((mask & state) != mask) { + ret = 0; + } + + return ret; +} + +static int read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystrokeMap *ret) +{ + int successful = 0; + struct nxagentSpecialKeystrokeMap new = {0, 0, 0, 0}; + xmlAttr *attr; + + for (attr = node->properties; attr; attr = attr->next) + { + /* ignore attributes without data (which should never happen anyways) */ + if (attr->children->content == NULL) + { + char *aname = (attr->name)?(attr->name):"unknown"; + fprintf(stderr, "attribute %s with NULL value", aname); + continue; + } + if (strcmp((char *)attr->name, "action") == 0) + { + int i; + for (i = 0; nxagentSpecialKeystrokeNames[i] != NULL; i++) + { + if (strcmp(nxagentSpecialKeystrokeNames[i],(char *)attr->children->content) == 0) + { + /* this relies on the values of enum nxagentSpecialKeystroke and the + * indices of nxagentSpecialKeystrokeNames being in sync */ + new.stroke = i; + break; + } + } + continue; + } + else if (strcmp((char *)attr->name, "key") == 0) + { + new.keysym = XStringToKeysym((char *)attr->children->content); + /* NoSymbol is usually 0, but could there be weird implementations? */ + if (new.keysym == NoSymbol) + { + new.keysym = 0; + } + continue; + } + + /* ignore attributes with value="0" or "false", everything else is interpreted as true */ + if (strcmp((char *)attr->children->content, "0") == 0 || strcmp((char *)attr->children->content, "false") == 0) + continue; + + if (strcmp((char *)attr->name, "Mod1") == 0) + { + new.modifierMask |= Mod1Mask; + } + else if (strcmp((char *)attr->name, "Mod2") == 0) + { + new.modifierMask |= Mod2Mask; + } + else if (strcmp((char *)attr->name, "Mod3") == 0) + { + new.modifierMask |= Mod3Mask; + } + else if (strcmp((char *)attr->name, "Mod4") == 0) + { + new.modifierMask |= Mod4Mask; + } + else if (strcmp((char *)attr->name, "Control") == 0) + { + new.modifierMask |= ControlMask; + } + else if (strcmp((char *)attr->name, "Shift") == 0) + { + new.modifierMask |= ShiftMask; + } + else if (strcmp((char *)attr->name, "Lock") == 0) + { + new.modifierMask |= LockMask; + } + else if (strcmp((char *)attr->name, "AltMeta") == 0) + { + new.modifierAltMeta = 1; + } + } + + if (new.stroke != 0 && new.keysym != 0) + { + /* keysym and stroke are required, everything else is optional */ + successful = 1; + memcpy(ret, &new, sizeof(struct nxagentSpecialKeystrokeMap)); + } + return successful; +} + +/* + * searches a keystroke xml file + * + * search order: + * - '-keystrokefile' commandline parameter + * - $NXAGENT_KEYSTROKEFILE environment variable + * - $HOME/.nx/config/keystroke.cfg + * - /etc/nx/keystroke.cfg + * - hardcoded traditional NX default settings + */ +static void parse_keystroke_file(void) +{ + char *filename = NULL; + + char *homefile = "/.nx/config/keystroke.cfg"; + char *etcfile = "/etc/nx/keystroke.cfg"; + + if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0) + { + filename = strdup(nxagentKeystrokeFile); + if (filename == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + } + else if ((filename = getenv("NXAGENT_KEYSTROKEFILE")) != NULL && access(filename, R_OK) == 0) + { + filename = strdup(filename); + if (filename == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + } + else + { + char *homedir = getenv("HOME"); + filename = NULL; + if (homedir != NULL) + { + homedir = strdup(homedir); + if (homedir == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + filename = calloc(1, strlen(homefile) + strlen(homedir) + 1); + if (filename == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + strcpy(filename, homedir); + strcpy(filename + strlen(homedir), homefile); + if (homedir) + { + free(homedir); + } + } + + if (access(filename, R_OK) == 0) + { + /* empty */ + } + else if (access(etcfile, R_OK == 0)) + { + if (filename) + free(filename); + filename = strdup(etcfile); + if (filename == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + } + else + { + if (filename) + free(filename); + filename = NULL; + } + } + + /* now we know which file to read, if any */ + if (filename) + { + xmlDoc *doc = NULL; + xmlNode *root = NULL; + LIBXML_TEST_VERSION + doc = xmlReadFile(filename, NULL, 0); + if (doc != NULL) + { + xmlNode *cur = NULL; + root = xmlDocGetRootElement(doc); + + for (cur = root; cur; cur = cur->next) + { + if (cur->type == XML_ELEMENT_NODE && strcmp((char *)cur->name, "keystrokes") == 0) + { + xmlNode *bindings = NULL; + int num = 0; + int idx = 0; + + for (bindings = cur->children; bindings; bindings = bindings->next) + { + if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) + { + num++; + } + } + map = calloc((num + 1), sizeof(struct nxagentSpecialKeystrokeMap)); + if (map == NULL) + { + fprintf(stderr, "malloc failed"); + exit(EXIT_FAILURE); + } + + for (bindings = cur->children; bindings; bindings = bindings->next) + { + if (bindings->type == XML_ELEMENT_NODE && strcmp((char *)bindings->name, "keystroke") == 0) + { + int res = 0; + res = read_binding_from_xmlnode(bindings, &(map[idx])); + if (res) + idx++; + } + } + + map[idx].stroke = KEYSTROKE_END_MARKER; + } + } + + xmlFreeDoc(doc); + xmlCleanupParser(); + } + else + { + #ifdef DEBUG + fprintf("XML parsing for %s failed\n", filename); + #endif + } + free(filename); + } +} + +static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) +{ + KeySym keysym = XKeycodeToKeysym(nxagentDisplay, X->keycode, 0); + struct nxagentSpecialKeystrokeMap *cur = map; + + if (! nxagentKeystrokeFileParsed) + { + parse_keystroke_file(); + nxagentKeystrokeFileParsed = True; + } + + enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING; + + while ((cur++)->stroke != KEYSTROKE_END_MARKER) { + if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { + return cur->stroke; + } + } + + return ret; +} + int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) { KeySym sym; int index = 0; + enum nxagentSpecialKeystroke stroke = find_keystroke(X); *result = doNothing; @@ -87,257 +453,128 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) return 1; } - if ((X -> state & nxagentAltMetaMask) && - ((X -> state & (ControlMask | ShiftMask)) == ControlMask)) - { - switch (sym) - { + switch (stroke) { + case KEYSTROKE_DEBUG_TREE: #ifdef DEBUG_TREE - - case XK_q: - case XK_Q: - { - *result = doDebugTree; - - break; - } - - #endif /* DEBUG_TREE */ - - case XK_t: - case XK_T: - { - *result = doCloseSession; - - break; - } - case XK_f: - case XK_F: - { - if (nxagentOption(Rootless) == False) - { - *result = doSwitchAllScreens; - } - - break; - } - case XK_m: - case XK_M: - { - if (nxagentOption(Rootless) == False) - { - *result = doMinimize; - } - - break; - } - case XK_Left: - case XK_KP_Left: - { - if (nxagentOption(Rootless) == False && - nxagentOption(DesktopResize) == False) - { - *result = doViewportLeft; - } - - break; + *result = doDebugTree; + #endif + break; + case KEYSTROKE_CLOSE_SESSION: + *result = doCloseSession; + break; + case KEYSTROKE_SWITCH_ALL_SCREENS: + if (nxagentOption(Rootless) == False) { + *result = doSwitchAllScreens; } - case XK_Up: - case XK_KP_Up: - { - if (nxagentOption(Rootless) == False && - nxagentOption(DesktopResize) == False) - { - *result = doViewportUp; - } - - break; + break; + case KEYSTROKE_MINIMIZE: + if (nxagentOption(Rootless) == False) { + *result = doMinimize; } - case XK_Right: - case XK_KP_Right: - { - if (nxagentOption(Rootless) == False && - nxagentOption(DesktopResize) == False) - { - *result = doViewportRight; - } - - break; + break; + case KEYSTROKE_LEFT: + if (nxagentOption(Rootless) == False && + nxagentOption(DesktopResize) == False) { + *result = doViewportLeft; } - case XK_Down: - case XK_KP_Down: - { - if (nxagentOption(Rootless) == 0 && - nxagentOption(DesktopResize) == 0) - { - *result = doViewportDown; - } - - break; + break; + case KEYSTROKE_UP: + if (nxagentOption(Rootless) == False && + nxagentOption(DesktopResize) == False) { + *result = doViewportUp; } - case XK_R: - case XK_r: - { - if (nxagentOption(Rootless) == 0) - { - *result = doSwitchResizeMode; - } - - break; + break; + case KEYSTROKE_RIGHT: + if (nxagentOption(Rootless) == False && + nxagentOption(DesktopResize) == False) { + *result = doViewportRight; } - case XK_E: - case XK_e: - { - *result = doSwitchDeferMode; - - break; + break; + case KEYSTROKE_DOWN: + if (nxagentOption(Rootless) == False && + nxagentOption(DesktopResize) == False) { + *result = doViewportDown; } - case XK_BackSpace: - case XK_Terminate_Server: - { - /* - * Discard Ctrl-Alt-BackSpace key. - */ - - return 1; - - break; + break; + case KEYSTROKE_RESIZE: + if (nxagentOption(Rootless) == False) { + *result = doSwitchResizeMode; } - - case XK_J: - case XK_j: - { - nxagentForceSynchronization = 1; - - return 1; - } - + break; + case KEYSTROKE_DEFER: + *result = doSwitchDeferMode; + break; + case KEYSTROKE_IGNORE: + /* this is used e.g. to ignore C-A-Backspace aka XK_Terminate_Server */ + return 1; + break; + case KEYSTROKE_FORCE_SYNCHRONIZATION: + nxagentForceSynchronization = 1; + break; + case KEYSTROKE_REGIONS_ON_SCREEN: #ifdef DUMP - - case XK_A: - case XK_a: - { - /* - * Used to test the lazy encoding. - */ - - nxagentRegionsOnScreen(); - - return 1; - } - + nxagentRegionsOnScreen(); #endif - + break; + case KEYSTROKE_TEST_INPUT: + /* + * Used to test the input devices state. + */ #ifdef NX_DEBUG_INPUT - - case XK_X: - case XK_x: - { - /* - * Used to test the input devices state. - */ - - if (X -> type == KeyPress) - { - if (nxagentDebugInputDevices == 0) - { - fprintf(stderr, "Info: Turning input devices debug ON.\n"); - - nxagentDebugInputDevices = 1; - } - else - { - fprintf(stderr, "Info: Turning input devices debug OFF.\n"); - - nxagentDebugInputDevices = 0; - - nxagentLastInputDevicesDumpTime = 0; - } + if (X -> type == KeyPress) { + if (nxagentDebugInputDevices == 0) { + fprintf(stderr, "Info: Turning input devices debug ON.\n"); + nxagentDebugInputDevices = 1; + } else { + fprintf(stderr, "Info: Turning input devices debug OFF.\n"); + nxagentDebugInputDevices = 0; + nxagentLastInputDevicesDumpTime = 0; } - - return 1; } - - case XK_Y: - case XK_y: - { - /* - * Used to deactivate input devices grab. - */ - - if (X -> type == KeyPress) - { - nxagentDeactivateInputDevicesGrabs(); - } - - return 1; + return 1; + #endif + break; + case KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB: + #ifdef NX_DEBUG_INPUT + if (X->type == KeyPress) { + nxagentDeactivateInputDevicesGrab(); } - + return 1; #endif - } - } - else if ((X -> state & nxagentAltMetaMask) && - ((X -> state & (ControlMask | ShiftMask)) == (ControlMask | - ShiftMask))) - { - switch (sym) - { - case XK_f: - case XK_F: - { - if (nxagentOption(Rootless) == 0) - { - *result = doSwitchFullscreen; - } - - break; + break; + case KEYSTROKE_FULLSCREEN: + if (nxagentOption(Rootless) == 0) { + *result = doSwitchFullscreen; } - case XK_Left: - case XK_KP_Left: - { - if (nxagentOption(Rootless) == 0 && - nxagentOption(DesktopResize) == 0) - { - *result = doViewportMoveLeft; - } - - break; + break; + case KEYSTROKE_VIEWPORT_MOVE_LEFT: + if (nxagentOption(Rootless) == 0 && + nxagentOption(DesktopResize) == 0) { + *result = doViewportMoveLeft; } - case XK_Up: - case XK_KP_Up: - { - if (nxagentOption(Rootless) == 0 && - nxagentOption(DesktopResize) == 0) - { - *result = doViewportMoveUp; - } - - break; + break; + case KEYSTROKE_VIEWPORT_MOVE_UP: + if (nxagentOption(Rootless) == 0 && + nxagentOption(DesktopResize) == 0) { + *result = doViewportMoveUp; } - case XK_Right: - case XK_KP_Right: - { - if (nxagentOption(Rootless) == 0 && - nxagentOption(DesktopResize) == 0) - { - *result = doViewportMoveRight; - } - - break; + break; + case KEYSTROKE_VIEWPORT_MOVE_RIGHT: + if (nxagentOption(Rootless) == 0 && + nxagentOption(DesktopResize) == 0) { + *result = doViewportMoveRight; } - case XK_Down: - case XK_KP_Down: - { - if (nxagentOption(Rootless) == 0 && - nxagentOption(DesktopResize) == 0) - { - *result = doViewportMoveDown; - } - - break; + break; + case KEYSTROKE_VIEWPORT_MOVE_DOWN: + if (nxagentOption(Rootless) == 0 && + nxagentOption(DesktopResize) == 0) { + *result = doViewportMoveDown; } - } + break; + case KEYSTROKE_NOTHING: /* do nothing. difference to KEYSTROKE_IGNORE is the return value */ + case KEYSTROKE_END_MARKER: /* just to make gcc STFU */ + case KEYSTROKE_MAX: + break; } - return (*result == doNothing) ? 0 : 1; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h index ef71a88..ecfb2c4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.h @@ -24,4 +24,51 @@ extern int nxagentCheckSpecialKeystroke(XKeyEvent*, enum HandleEventResult*); unsigned int nxagentAltMetaMask; +/* keep this sorted, do not rely on any numerical value in this enum, and be aware + * that KEYSTROKE_MAX may be used in a malloc */ + +/* also be aware that if changing any numerical values, you also need to change values + * Keystroke.c nxagentSpecialKeystrokeNames */ +enum nxagentSpecialKeystroke { + /* 0 is used as end marker */ + KEYSTROKE_END_MARKER = 0, + KEYSTROKE_CLOSE_SESSION = 1, + KEYSTROKE_SWITCH_ALL_SCREENS = 2, + KEYSTROKE_MINIMIZE = 3, + KEYSTROKE_LEFT = 4, + KEYSTROKE_UP = 5, + KEYSTROKE_RIGHT = 6, + KEYSTROKE_DOWN = 7, + KEYSTROKE_RESIZE = 8, + KEYSTROKE_DEFER = 9, + KEYSTROKE_IGNORE = 10, + KEYSTROKE_FORCE_SYNCHRONIZATION = 11, + + /* stuff used for debugging, probably not useful for most people */ + KEYSTROKE_DEBUG_TREE = 12, + KEYSTROKE_REGIONS_ON_SCREEN = 13, + KEYSTROKE_TEST_INPUT = 14, + KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB = 15, + + KEYSTROKE_FULLSCREEN = 16, + KEYSTROKE_VIEWPORT_MOVE_LEFT = 17, + KEYSTROKE_VIEWPORT_MOVE_UP = 18, + KEYSTROKE_VIEWPORT_MOVE_RIGHT = 19, + KEYSTROKE_VIEWPORT_MOVE_DOWN = 20, + + KEYSTROKE_NOTHING = 21, + + /* insert more here, increment KEYSTROKE_MAX accordingly. + * then update string translation below */ + + KEYSTROKE_MAX=22, +}; + +struct nxagentSpecialKeystrokeMap { + enum nxagentSpecialKeystroke stroke; + unsigned int modifierMask; /* everything except alt/meta */ + int modifierAltMeta; /* modifier combination should include alt/meta */ + KeySym keysym; +}; + #endif /* __Keystroke_H__ */ -- 1.7.10.4

1 1

Bug#74: make nxagent keybindings configurable
by Alexander Wuerstlein 03 Dec '12

03 Dec '12

Package: nxagent The hardcoded default nxagent keybindings (e.g. Ctrl-Alt-t opens a terminal in Gnome or closes a nx/x2go session) collide with several more or less popular window managers or desktop environments. Since any hardcoded configuration will inevitably collide with some other configuration somewhere, the only sane way out of this is making the keybindings configurable, which the attached patch does.

1 0

Processed: your mail
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

Processing commands for control(a)bugs.x2go.org: > tag #65 pending Bug #65 [x2godesktopsharing] x2godesktopsharing 2nd bug Added tag(s) pending. > merge #65 #69 Bug #65 [x2godesktopsharing] x2godesktopsharing 2nd bug Bug #69 [x2godesktopsharing] x2godesktopsharing fails if pam_tmpdir.so is in use There is no source info for the package 'x2godesktopsharing' at version '3.0.1.5-0~74~quantal1' with architecture '' Unable to make a source version for version '3.0.1.5-0~74~quantal1' Marked as found in versions 3.0.1.5-0~74~quantal1. Added tag(s) moreinfo. Merged 65 69 > thanks Stopping processing here. Please contact me if you need assistance. -- 65: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=65 69: http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=69 X2Go Bug Tracking System Contact git-admin(a)x2go.org with problems

1 0

Bug#73: X2Go Client, httpbrokerclient: no session profiles returned from broker -> new session dialog opens
by Mike Gabriel 03 Dec '12

03 Dec '12

Package: x2goclient Version: 3.99.3.0 Severity: grave Hi Alex, If I launch X2Go Client with this command line: x2goclient --no-session-edit --broker-url=<broker-url> And my broker is configured to return no session profiles, then I get a warning about no session profiles being configured (which is ok) and then the new-session-profile dialog window opens. My expectation would be that on --no-session-edit, maybe even for the complete broker context, session editing would not be possible at all... Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Bug#72: X2Go Client, httpbrokerclient: authentication failures
by Mike Gabriel 03 Dec '12

03 Dec '12

Package: x2goclient Version: 3.99.3.0 Severity: normal Two observations on authentication failures against the broker server: (a) the x2goclient minimizes to systray (if configured in the settings file) -> better: remain visible till authentication has succeeded (b) run x2goclient from the command line in broker mode attempt authentication against broker with wrong password hit Ctrl-C on the cmdline restart x2goclient with the same command as before -> immediately an authentication failure gets reported, no chance to enter a username+password for authentication against the http broker -> better: allow authentication... About (b) I am a little bit confused... no idea why that happens... Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Bug#71: X2Go Client, httpbrokerclient: GUI bug on broker connection failures
by Mike Gabriel 03 Dec '12

03 Dec '12

Package: x2goclient Version: 3.99.1.0 Severity: minor On connection attempts that fail with ,,connection refused'' (due to a non-online broker http server) the authentication dialog window of x2goclient gets redrawn, but the authentication box in the middle moves more and more to the left (with each authentication attempt). Expected behaviour: the box should redraw in the center of the blue X2Go Client background. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Bug#65: Related to issue #69?
by Mike Gabriel 03 Dec '12

03 Dec '12

tag #65 moreinfo thanks Hi, just to check: is it possible that the reported issue (#65) is related to #69? Are you using pam_tmpdir.so on your machine? Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#69: Issue fixed in Vcs Git
by Mike Gabriel 03 Dec '12

03 Dec '12

tag #69 pending thanks We believe that the issue has been fixed in Git by this commit: http://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=commitdiff;h=55eb03e… The fix will be included in version 3.1.0.6 of x2godesktopsharing. Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#69: x2godesktopsharing fails if pam_tmpdir.so is in use
by Mike Gabriel 03 Dec '12

03 Dec '12

Package: x2godesktopsharing Version 3.1.0.5 Severity: normal X2Go Desktop Sharing fails if pam_tmpdir.so is in use on the X2Go Server. The issue is relevant for X2Go working properly on Debian Edu. For details, see below... Mike ----- Weitergeleitete Nachricht von schulz(a)math.uni-goettingen.de ----- Datum: Fri, 30 Nov 2012 20:04:51 +0100 Von: Jochen Schulz <schulz(a)math.uni-goettingen.de> Betreff: Re: [X2Go-User] x2godesktopsharing, what's the point? An: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Cc: x2go-user(a)lists.berlios.de Hi, >>> FYI: Alex and I have just fixed an issue with cross-user >>> x2godesktopsharing. A bugfix release is currently being prepared >>> (3.1.1.9). >> >> i am using x2godesktopsharing 3.0.1.5-0~74~precise1 and i tried using >> the feature but faild other than with the same user, which runs the >> original desktop or x2go-session. > > Import thing is that you have x2goserver 3.1.1.9 installed. Should be in > the stable Ubuntu ppa by now. i am using x2goserver 3.1.19, so this should be fine. > There are two approaches. > > 1. > Every member of the posix group x2godesktopsharing may share each > other's desktop. i tried this, but it changed nothing. i looked briefly into the code of x2godesktopsharing and it wants to connect to a socket which simple is not there. The socketname is for example /tmp/user/2001/x2godesktopsharing_@schul04@:0.0 when trying to connect to "schul04's" desktop with "schulz" and it is never created. Thats why x2godesktopsharing spits out a DENY, as it seems. any ideas? Jochen ----- Ende der weitergeleiteten Nachricht ----- -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Command Fieid in GUI/Pass parameters
by senrabdet＠aol.com 02 Dec '12

02 Dec '12

Hi All: We had a couple of quick questions: 1) Command Field in GUI: In the x2go GUI there is a "Command:" field. What is this for? It does not seem to be accessible if Gnome or KDE are selected. 2) Config File Does x2go use the ssh config file? If not, is there a way to get it to do so? We're looking for a way to pass parameters like we might do with ssh from the command line. Thanks, Ted

2 1

Bug#67: Bug when you mount more 1 folder at login
by Pascal Vibet - ADACIS 30 Nov '12

30 Nov '12

Package: x2goserver Version: 3.1.1.3-0~571~precise1_amd64 I want to mount 3 folder at login. Only the first one is mount at login. This is log file: cat ~/mounts.log SSHFS version 2.3 Server version: 3 Extension: posix-rename(a)openssh.com <1> Extension: statvfs(a)openssh.com <2> Extension: fstatvfs(a)openssh.com <2> Extension: hardlink(a)openssh.com <1> fuse: bad mount point `/tmp/.x2go-xxxxxxx/media/disk/disk/_home_xxxxxxx_folder2': No such file or directory fuse: bad mount point `/tmp/.x2go-xxxxxxx/media/disk/disk/disk/_home_xxxxxxx_folder3': No such file or directory The bug is in /usr/bin/x2gomountdirs, explication: the $mdir variable is initialize line: 87 my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; but in code bloc 162 for (my $i=0;$i<@dirs;$i++) 163 { 164 my $printspool=0; 165 my $mimeboxspool=0; 166 my $mntpath; 167 if(@dirs[$i]=~m/__PRINT_SPOOL_/) 168 { 169 @dirs[$i]=~s/__PRINT_SPOOL_//; 170 $printspool=1; 171 $mntpath=$spooldir; 172 syslog('debug', "mounting $spooldir, mount point type is print spool directory"); 173 } 174 elsif(@dirs[$i]=~m/__MIMEBOX_SPOOL_/) 175 { 176 @dirs[$i]=~s/__MIMEBOX_SPOOL_//; 177 $mimeboxspool=1; 178 $mntpath=$mimeboxdir; 179 syslog('debug', "mounting $mimeboxdir, mount point type is MIME box directory"); 180 } 181 else 182 { 183 my $p=@dirs[$i]; 184 if ($type ne "dir") 185 { 186 $p=~s/\/ramdrive\/mnt\///; 187 if ($p =~ m/CDROM/) 188 { 189 $mdir=$mdir."/cd"; 190 } 191 else 192 { 193 $mdir=$mdir."/rm"; 194 } 195 } 196 else 197 { 198 $mdir=$mdir."/disk"; 199 } 200 $p=~s/\//_/g; 201 $p=~s/ /_/g; 202 $p=~s/~_cygdrive_//; 203 $p=~s/~_windrive_//; 204 $p=~s/~//g; 205 mkdir("$mdir/$p"); 206 $mntpath="$mdir/$p"; 207 } if we have more than 1 folder to share, $mdir variable will became: first time: $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media/disk" second time: $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media/disk/disk"; third time: $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media/disk/disk/disk"; Solution is to fix $mdir variable in begin for loop. Add $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media" in line: 164 my $printspool=0; 165 my $mimeboxspool=0; 166 my $mntpath; => 167 $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media"; Regards --------------------------------- Pascal Vibet

3 2

Bug#66: pstree output after first startup
by Raphael Lechner 29 Nov '12

29 Nov '12

root@x2gothinclient:~# pstree -l init-+-acpid |-console-kit-dae---63*[{console-kit-da}] |-cron |-dbus-daemon |-6*[getty] |-logsave |-pulseaudio---2*[{pulseaudio}] |-rsyslogd---3*[{rsyslogd}] |-sshd---sshd---bash---pstree |-udevd---2*[udevd] |-x2gocdmanager `-x2gothinclientd---72*[sh] The number of [sh] processes are increased every 3 seconds and no login window is visible. Raphael

2 1

Bug#66: ThinClient is not reconnecting after terminating the session
by Raphael Lechner 29 Nov '12

29 Nov '12

Package: x2gothinclient Version: 1.0.1.8-0~x2go1+squeeze~main~321~build I have the X2Go Server running on Ubuntu 12.04 LTS and 4 Thinclients that are booting from PXE. All Clients have autologin enabled and most of the time the login works without problems, but probably I have found two issues. 1) After terminating the session with x2goterminate-session $session on the server side, the client tries to restart infinitely the GUI but nothing appears and the reconnect is not working. This is 100% reproducible on my machines. After some debugging I found that the x2gothinclientd process is producing many defuncted sh processes and it seems that the problem is located in the following lines of code:/usr/sbin/x2gothinclientd: local *IN, *OUT, *ERR; $x2goclient_pid = eval { open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); }; I changed this lines to: qx(su - x2goclient -c \"export DISPLAY=:0; ./etc/x2go/x2gothinclient_start\"); After that the reconnect is working perfectly. 2) Sometimes this problem exists also on the first autologin. After I have rebooted 4 Machines at the same time, then maybe on the 2-3 try I have one machine with this problem. (Without changing the x2gothinclientd). Please let me know if you need more information. Thank you! Raphael

1 0

emesene
by Helmer Teles 29 Nov '12

29 Nov '12

Hello dear x2go devs. There seems to be a problem with emesene and latest x2goserver/x2goagent. It works on virt-viewer vnc console Error output: hteles@Code5:~$ emesene Traceback (most recent call last): File "/usr/bin/emesene", line 34, in <module> emesene.main() File "/usr/share/emesene/emesene/emesene.py", line 861, in main main_method(Controller) File "/usr/share/emesene/emesene/gui/gtkui/__init__.py", line 29, in gtk_main import gtk File "/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/__init__.py", line 40, in <module> from gtk import _gtk ImportError: /usr/lib/i386-linux-gnu/libgdk-x11-2.0.so.0: undefined symbol: XRRFreeScreenResources dpkg versions: cups-x2go 3.0.0.4-0~62~precise1 x2goagent 2:3.5.0.16-0~278~precise1 x2goserver 3.1.1.6-0~610~precise1 x2goserver-extensions 3.1.1.6-0~610~precise1 No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 12.04.1 LTS Release: 12.04 Codename: precise root@Code5:~# regards, -- Helmer Teles Web Page : http://hteles.wordpress.com .-. G N U /v\ L I N U X // \\ --------- /( _ )\ May The Source Be ^^ ^^ With You...

2 3

Bug#61: Will be fixed in next release 3.99.3.1
by Mike Gabriel 29 Nov '12

29 Nov '12

tag #61 pending thanks The reported issue: http://bugs.x2go.org/61\ will be fixed in the next version of x2goclient (3.99.3.1). The commit is: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=76b7b5bbc335e23… Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#65: x2godesktopsharing 2nd bug
by Андрей Андреев 29 Nov '12

29 Nov '12

Package: x2godesktopsharing Version: 3.0.1.5-0~74~quantal1 Package: x2goserver Version: 3.1.1.9-0~623~quantal1 When I connect to desktop, I get a message "Access denied from user" all time. In the session of the user I get a notification of a successful connection to the desktop. Desktop does not boot. -- С уважением,Андрей.

1 0

Bug#64:
by Björn Hörnemann 29 Nov '12

29 Nov '12

Package: x2goserver Version: 3.1.1.9-0~623~precise1 After upgrade to x2goserver 3.1.1.9-0~623~precise1 (ppa:x2go/stable) went to login via x2goclient and had lost my unity-panels. Compiz had been crashed. -- Hauptstr. 48 c 96482 Ahorn Tel.: +49 9561 6753633

3 2

NEW: #x2go on IRC (freenode)
by Mike Gabriel 28 Nov '12

28 Nov '12

Hi guys, X2Go is now on Freenode IRC: The channel name is #x2go. Then channel has been made permanent... Let's come together, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

[PATCH] x2gopath: new helper to yield distro paths
by Jan Engelhardt 26 Nov '12

26 Nov '12

Distributions have different directory layouts and names, so files may not necessarily be located in <base>/lib/x2go at all times. Do not hardcode such paths and have the programs instead use the new x2gopath helper (obsoletes x2gobasepath). --- Patch is also retrievable from git://git.inai.de/x2goserver master .../share/x2gofeature.d/x2goserver-compat.features | 2 +- .../bin/x2goserver-run-extensions | 4 +-- .../man/man8/x2goserver-run-extensions.8 | 4 +-- .../x2gofeature.d/x2goserver-extensions.features | 2 +- .../x2gofeature.d/x2goserver-fmbindings.features | 2 +- .../x2gofeature.d/x2goserver-printing.features | 2 +- .../share/x2gofeature.d/x2goserver-pyhoca.features | 2 +- x2goserver-xsession/etc/Xsession | 4 ++- .../x2gofeature.d/x2goserver-xsession.features | 2 +- x2goserver/bin/x2gobasepath | 31 ++------------------ x2goserver/bin/x2gocmdexitmessage | 2 +- x2goserver/bin/x2gofeature | 4 +-- x2goserver/bin/x2gofeaturelist | 4 +-- x2goserver/bin/x2gopath | 19 ++++++++++++ x2goserver/bin/x2goresume-session | 2 +- x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gosetkeyboard | 2 +- x2goserver/bin/x2gostartagent | 2 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- x2goserver/bin/x2goversion | 2 +- x2goserver/man/man8/x2gopath.8 | 28 ++++++++++++++++++ x2goserver/sbin/x2gocleansessions | 2 +- x2goserver/sbin/x2golistsessions_root | 2 +- x2goserver/share/x2gofeature.d/x2goserver.features | 2 +- 25 files changed, 77 insertions(+), 55 deletions(-) create mode 100755 x2goserver/bin/x2gopath create mode 100644 x2goserver/man/man8/x2gopath.8 diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features index d180d95..f4a9376 100755 --- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features +++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 70636f6..f89515c 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -25,7 +25,7 @@ set -e test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit -1; } -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" @@ -33,7 +33,7 @@ X2GO_SESSION="$1" X2GO_MODALITY="$2" # scan extensions and execute them -find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do +find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension "$X2GO_SESSION" &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully" diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index e2c0c34..3fe1e4f 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -36,9 +36,9 @@ Calling X2Go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2go .PP The modality names all refer to a sub-directory of the path: - \fI<INSTALL_PREFIX>/lib/x2go/extensions\fR, + \fI<libexecdir>/x2go/extensions\fR, -where <INSTALL_PREFIX> mostly is /usr on commonly-used GNU/Linux systems. +where <libexecdir> is /usr/libexec/x2go or /usr/lib/x2go on commonly-used GNU/Linux systems. .PP In any of these sub-directories third-party X2Go extension packages can place scripts or binaries that will then get executed by the core X2Go server commands, either before or after the essential functionality (e.g. x2goagent startup, x2goagent suspension, x2goagent resumption, etc.) or on failure of that diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 2a21cad..7f89a5c 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features index c1d5827..52f6111 100755 --- a/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features +++ b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features @@ -20,7 +20,7 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features index eb64533..bbe195c 100755 --- a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features +++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index 2411c0e..8c3e4b5 100755 --- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index c241b41..9fd5104 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -8,6 +8,8 @@ set -e +X2GO_LIBEXEC_PATH="$(x2gopath libexec)"; + PROGNAME=XSession-x2go message () { @@ -110,7 +112,7 @@ if [ -n "$SESSIONFILES" ]; then set +e for SESSIONFILE in $SESSIONFILES; do - /usr/lib/x2go/x2gosyslog "$0" "info" "executing $SESSIONFILE" + "$X2GO_LIBEXEC_PATH/x2gosyslog" "$0" "info" "executing $SESSIONFILE" . $SESSIONFILE done set -e diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features index cc20f85..f4eb3dc 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath index 35f18bd..f6d8abc 100755 --- a/x2goserver/bin/x2gobasepath +++ b/x2goserver/bin/x2gobasepath @@ -1,30 +1,3 @@ -#!/usr/bin/perl +#!/bin/sh -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - -use strict; -use Cwd; -use Cwd q{abs_path}; -use File::Basename; - -my $dir = dirname($0); -my $base_path = abs_path("$dir/.."); - -print "$base_path"; +exec x2gopath base "$@"; diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage index a17bb9f..1e6b022 100755 --- a/x2goserver/bin/x2gocmdexitmessage +++ b/x2goserver/bin/x2gocmdexitmessage @@ -20,7 +20,7 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; X2GO_ROOT=${HOME}/.x2go MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index f379070..c2c851b 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -22,8 +22,8 @@ [ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` -X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; +X2GO_SHARE_PATH="$(x2gopath share)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist index 1258a77..44b3bfc 100755 --- a/x2goserver/bin/x2gofeaturelist +++ b/x2goserver/bin/x2gofeaturelist @@ -19,8 +19,8 @@ # # Copyright (C) 2011-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` -X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; +X2GO_SHARE_PATH="$(x2gopath share)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath new file mode 100755 index 0000000..6d43616 --- /dev/null +++ b/x2goserver/bin/x2gopath @@ -0,0 +1,19 @@ +#!/bin/sh + +base="${0%/*}"; +if test "$base" = "$0"; then + base="."; +fi; +base=$(readlink -f "$base/.."); +# The following section is subject to substitution by distro packaging tools. +case "$1" in +base) echo -n "$base";; +lib) echo -n "$base/lib/x2go";; +libexec) echo -n "$base/lib/x2go";; +share) echo -n "$base/share/x2go";; +xinerama) echo -n "/usr/lib/nx/X11/Xinerama";; +*) exit 1;; +esac; +if test -t 1; then + echo ""; +fi; diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index cddbf05..f4b5624 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -28,7 +28,7 @@ X2GO_KBD_LAYOUT="$5" X2GO_KBD_TYPE="$6" X2GO_SET_KBD="$7" -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_ROOT="${HOME}/.x2go" diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 27bb3b5..d8d24da 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -27,7 +27,7 @@ cmd=$5 sndsys=$6 X2GO_SESS_TYPE=$7 -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 949af5e..cb99b40 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -21,7 +21,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5499d15..fae66ab 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -20,7 +20,7 @@ # Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index f823c69..645c352 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -26,7 +26,7 @@ else SESSION_NAME="$X2GO_SESSION" fi -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index a661dfc..9819498 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -26,7 +26,7 @@ else SESSION_NAME="$X2GO_SESSION" fi -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index a1fea45..eee00db 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" diff --git a/x2goserver/man/man8/x2gopath.8 b/x2goserver/man/man8/x2gopath.8 new file mode 100644 index 0000000..a8d1cbb --- /dev/null +++ b/x2goserver/man/man8/x2gopath.8 @@ -0,0 +1,28 @@ +.TH x2gopath 8 "Feb 2012" "Version 3.1.0.x" "X2Go Server Tool" +.SH Name +.PP +x2gopath - Show X2Go Server installation paths +.SH Synopsis +.PP +\fBx2gopath\fP {\fBbase\fP|\fBlib\fP|\fBlibexec\fP|\fBshare\fP} +.SH Description +.PP +\fBx2gopath\fP displays the paths of the selected X2Go installation directory. +.TP +\fBbase\fP +The prefix under which X2Go was installed. This is generally \fB/usr\fP or +\fB/usr/local\fP. +.TP +\fBlib\fP +The location of X2Go architecture-dependent parts (e.g. libraries, +but also Perl modules). +.\" Possible examplares are /usr/lib64/x2go (traditional biarch) and +.\" /usr/lib/x86_64-gnu-linux/x2go (Debian-style multiarch) +.TP +\fBlibexec\fP +The location of private X2Go binaries. +.\" Possible examples are /usr/libexec/x2go and /usr/lib/x2go. +.TP +\fBshare\fP +The location of X2Go's data files. +.\" prefix + /share/x2go diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 3eb8722..b160dc4 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -24,7 +24,7 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path = `x2gopath libexec`; use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index c065777..0699d2d 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -41,7 +41,7 @@ sub check_stat return 1; } -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path = `x2gopath libexec`; my $uname; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index db4aaf2..1d23695 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -20,7 +20,7 @@ # Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011-2012 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` +X2GO_LIB_PATH="$(x2gopath libexec)"; $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -- 1.7.10.4

2 1

x2go & ubuntu 12.10 ... now that there is no Unity-2d
by brian mullan 25 Nov '12

25 Nov '12

I just tried installing x2goserver, x2goserver-xsession on a new Ubuntu 12.10 machine. Trying to connect with my x2goclient I got an error Failed to load session "gnome-fallback" I guess I had thought that the entry in x2go client for "Unity" meant that actual support for full Unity (not just Unity-2d) had been implemented. Since starting with Ubuntu 12.10 there is no longer support for Unity-2d are there any plans as to what the future holds with x2go ? I also am interested what plans there might be for the coming introduction of Wayland into Ubuntu as well as the other linux distro's I've heard that are going to be supporting Wayland? Thanks for any information. Brian

4 7

Bug#60: Fixed in x2goserver 3.1.1.9
by Mike Gabriel 23 Nov '12

23 Nov '12

reassign #60 x2goserver close #60 The issue has been fixed with x2goserver release 3.1.1.9. The issue was not in x2godesktopsharing so reassigning this bug to x2goserver. Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

[X2Go-Announcement] Bugfix X2Go release(s): x2goserver
by Mike Gabriel 23 Nov '12

23 Nov '12

Dear all, The X2Go Project has made three bugfix releases of X2Go Server this week, we are now at: - x2goserver (3.1.1.9) The new packages will be available within the next 24 hours in our Debian and Ubuntu repositories. Packagers of other distros may please update there archives, as well. The bugfix release(s) fix these issues: o x2gomountdirs failures in cases where users do not have xdg desktop files in their homes (esp. $XDG_CONFIG_HOME/user-dirs.dirs). o Detect Ubuntu distro versions by version number, not codename o fix x2godesktopsharing across different users light+love, Mike X2GOSERVER ========== x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.9): - Fix x2godesktopsharing, we had added to many quotation marks in x2gostartagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:32:11 +0100 x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low * New bugfix release (3.1.1.8): - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 12:01:01 +0100 x2goserver (3.1.1.7-0~x2go1) unstable; urgency=low * New upstream+bufix release (3.1.1.7): - Use DISTRIB_RELEASE to query Ubuntu release versions and detect Unity launch command. - Detect GNOME and UNITY startup commands via DISTRIB_RELEASE version number and by using the bc command for comparing versions. - Do not fail if source_environment() cannot find the file to be sourced. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 22 Nov 2012 18:11:15 +0100 -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Bug#61: Proxy configuration appears when changing the session command
by Mike Gabriel 23 Nov '12

23 Nov '12

Package: x2goclient Version: 3.99.3.0 Severity: important Hi Alex, When modifying the session startup command on existing session profiles, the hidden proxy configuration slot appears in the session profile settings window. The proxy configuration should only appear when the user activates the SSH/HTTP proxy part of the session profile. Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

Wheezy problems with gtk
by Moritz Struebe 22 Nov '12

22 Nov '12

Hi (Again Alex and ), I'm not sure how close you are following the state of wheezy. I currently testing it using it 64 and up to now found: eclipse must be started with -vmargs -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false gnome-control-center does not start at all As far as I can see both seems rather cairo then GTK-related. Should I file tracking bugs? Cheers Morty -- Dipl.-Ing. Moritz 'Morty' Struebe (Wissenschaftlicher Mitarbeiter) Lehrstuhl für Informatik 4 (Verteilte Systeme und Betriebssysteme) Friedrich-Alexander-Universität Erlangen-Nürnberg Martensstr. 1 91058 Erlangen Tel : +49 9131 85-25419 Fax : +49 9131 85-28732 eMail : struebe(a)informatik.uni-erlangen.de WWW : http://www4.informatik.uni-erlangen.de/~morty

3 4

Fixes for x2godesktopsharing
by Jan Engelhardt 21 Nov '12

21 Nov '12

The following changes since commit db0b079d5320b0bc6b718428c9831775b3ba39a7: Continue development... (2012-11-13 16:24:25 +0100) are available in the git repository at: git://git.inai.de/x2godesktopsharing master for you to fetch changes up to 34b7b52860118831b9c10c2e899233c03621dad9: build: resolve compile error under g++-4.7 (2012-11-20 11:50:58 +0100) ---------------------------------------------------------------- Jan Engelhardt (1): build: resolve compile error under g++-4.7 sharetray.cpp | 1 + 1 file changed, 1 insertion(+)

2 5

Bug#59: Replace icon(s) in x2goclient
by Mike Gabriel 20 Nov '12

20 Nov '12

retitle #59 Replace icon (flying X) in x2goclient with new license thanks The above issue report was actually (again, argggh) meant for the Debian BTS, but it actually also applies to upstream x2goclient. We have to make sure that the licenses of the X2Go icon set meets our own requirements and that the licenses do apply to DFSG. Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

2 1

Bug#59: Upstream has asked to replace the X2Go icon shipped with x2goclient due to license issue with the current icon
by Mike Gabriel 19 Nov '12

19 Nov '12

Package: x2goclient Version: 3.99.2.1-1 Severity: serious Debbugs-CC: heinz-m.graesing(a)obviously-nice.de Upstream X2Go (Heinz-M. Graesing) has asked to replace the X2Go icon shipped with the current version of x2goclient. Upstream will provide a new version of the application icon that shall be shipped with x2goclient in Debian wheezy. Also: the currently shipped icon is completely transparent + contours, so that the X2Go logo (a flying X) cannot be recognized when the user has a dark desktop theme configured. Greets, Mike -- DAS-NETZWERKTEAM mike gabriel, rothenstein 5, 24214 neudorf-bornstein fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel(a)das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x…

1 0

nx-libs 3.5.0.16 break make install
by Andreas Radke 14 Nov '12

14 Nov '12

The new 001_add-main-makefile.full+lite.patch breaks the build here when not running make install as root, e.g. when building a package with make DESTDIR="foo" install: make[1]: Leaving directory `/build/src/nx-libs-3.5.0.16/nx-X11' if test -f bin/Makefile; then make -C bin install; fi make[1]: Entering directory `/build/src/nx-libs-3.5.0.16/bin' install -d -o root -g root -m 755 /usr/local/lib/x2go/bin/ install: cannot create directory '/usr/local/lib/x2go': Permission denied make[1]: *** [install] Error 1 This seems to be the cause: +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 -Andy ArchLinux

3 5

x2go client for mac osx
by Ricardo Díaz Martín 14 Nov '12

14 Nov '12

Hi, Is there somebody with x2go client working in MAC OS X Leopard or Snow Leopard? I have try in two different mac box and I always get the same message info "Can't connect to X-Server. Please check your settings". In settings looks like all ok (path to X11.app in mac osx is ok and verify it got right permissions). X-Server in both macs are installed and running. I have try to connect to nomachine linux server and X works fine. Some tips? Regards, Ricardo Díaz

7 8

x2godesktopsharing versions mixed up
by Jan Engelhardt 13 Nov '12

13 Nov '12

3.0.1.5 is newer than 3.1.0.4? Suggestion to cut down on the amount of fields in a version tag? x2godesktopsharing-3.0.1.5.tar.gz 05-Nov-2012 13:08 142K x2godesktopsharing-3.1.0.4.tar.gz 08-Jun-2012 09:31 142K

2 1

x2goclient: qt paths
by Jan Engelhardt 13 Nov '12

13 Nov '12

2 1

x2goclient: resolve compile failure of sshproto.h
by Jan Engelhardt 13 Nov '12

13 Nov '12

This patch is still lingering around in the x2goclient package that is on build.opensuse.org.

2 1

[PATCH] Remove redundant tool "socket-sucker"
by Jan Engelhardt 12 Nov '12

12 Nov '12

There already exists a tool that does this, use it. --- This is a suggestion; the patch may not actually work, as socket-sucker only read 256 bytes (why 256?) while socat will read until EOF. debian/control | 1 + socket-sucker.c | 80 ------------------------------------------------------- x2go-session.in | 7 ++--- 3 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 socket-sucker.c diff --git a/debian/control b/debian/control index df11b2e..f0b2e36 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + socat, zenity, pyhoca-cli (>= 0.2.1.0-0~), libpam-x2go, diff --git a/socket-sucker.c b/socket-sucker.c deleted file mode 100644 index 403819b..0000000 --- a/socket-sucker.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright © 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Copyright © 2012 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - * - * Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Author libpam-freerdp (where we forked from): Ted Gould <ted(a)canonical.com> - */ - -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> - -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> - -#define BUFFER_SIZE 256 - -int -main (int argc, char * argv[]) -{ - int socket_fd = 0; - int servlen = 0; - struct sockaddr_un serv_addr; - - bzero((char *)&serv_addr, sizeof(serv_addr)); - - const char * home = getenv("HOME"); - if (home == NULL) { - return -1; - } - - serv_addr.sun_family = AF_UNIX; - - int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket"); - if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) { - return -1; - } - - servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family); - - if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - return -1; - } - - if (connect(socket_fd, (struct sockaddr *)&serv_addr, servlen) < 0) { - return -1; - } - - char buffer[BUFFER_SIZE + 2]; - int in = 0; - int out = 0; - - in = read(socket_fd, buffer, BUFFER_SIZE); - - if (in > 0) { - out = write(1, buffer, in); - } - - close(socket_fd); - - if (in > 0 && out > 0 && in == out) { - return 0; - } else { - return -1; - } -} - diff --git a/x2go-session.in b/x2go-session.in index 7466509..1b3c739 100755 --- a/x2go-session.in +++ b/x2go-session.in @@ -20,10 +20,11 @@ # Author lightdm-remote-session-freerdp (where we forked from): Ted Gould <ted(a)canonical.com> # -if [ -e ~/.x2go-socket ]; then - @libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go -- +socket="$HOME/.x2go-socket"; +if [ -e "$socket" ]; then + socat unix-connect:"$socket" - | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go -- else zenity --warning --text="Unable to locate X2GoSession/PyHoca socket" fi; -rm -f ~/.x2go-socket +rm -f "$socket" -- 1.7.10.4

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

x2go-dev