This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 831ab835cf40cebcd007e66a8412d5ac17d4cffc Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Oct 10 13:08:08 2018 +0200 do not start openbox any more. Xinerama issue should be fixed in x2goagent. --- debian/changelog | 1 + debian/control | 1 - debian/x2gothinclient-displaymanager.install | 1 - displaymanager/etc/openbox2go.xml | 621 --------------------------- displaymanager/sbin/x2gothinclientd | 3 - 5 files changed, 1 insertion(+), 626 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ddf63a..f235a80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -152,6 +152,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low * fix Xorg checking in x2gothinclientd. * remove nomedeset option from x2go-tce.cfg. This option prevent loading of drm and disabling advanced graphic functions. * add openbox dependency. + * do not start openbox any more. Xinerama issue should be fixed in x2goagent. [ Martti Pitkänen ] * debian/po: diff --git a/debian/control b/debian/control index 3f96655..c60298c 100644 --- a/debian/control +++ b/debian/control @@ -80,7 +80,6 @@ Depends: plymouth-themes-all, pulseaudio-x11 | pulseaudio, dbus-x11, - openbox, dbus-user-session, syslinux, x2gothinclient-displaymanager | x2gothinclient-minidesktop, diff --git a/debian/x2gothinclient-displaymanager.install b/debian/x2gothinclient-displaymanager.install index d15c788..21c09e3 100644 --- a/debian/x2gothinclient-displaymanager.install +++ b/debian/x2gothinclient-displaymanager.install @@ -1,3 +1,2 @@ management/share/etc/x2gothinclient-displaymanager_* etc/x2go/ displaymanager/sbin/x2gothinclientd usr/sbin/ -displaymanager/etc/openbox2go.xml etc/x2go/ diff --git a/displaymanager/etc/openbox2go.xml b/displaymanager/etc/openbox2go.xml deleted file mode 100644 index 6571453..0000000 --- a/displaymanager/etc/openbox2go.xml +++ /dev/null @@ -1,621 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- Do not edit this file, it will be overwritten on install. - Copy the file to $HOME/.config/openbox/ instead. --> - -<openbox_config xmlns="http://openbox.org/3.4/rc" - xmlns:xi="http://www.w3.org/2001/XInclude"> - -<resistance> - <strength>10</strength> - <screen_edge_strength>20</screen_edge_strength> -</resistance> - -<focus> - <focusNew>yes</focusNew> - <!-- always try to focus new windows when they appear. other rules do - apply --> - <followMouse>no</followMouse> - <!-- move focus to a window when you move the mouse into it --> - <focusLast>yes</focusLast> - <!-- focus the last used window when changing desktops, instead of the one - under the mouse pointer. when followMouse is enabled --> - <underMouse>no</underMouse> - <!-- move focus under the mouse, even when the mouse is not moving --> - <focusDelay>200</focusDelay> - <!-- when followMouse is enabled, the mouse must be inside the window for - this many milliseconds (1000 = 1 sec) before moving focus to it --> - <raiseOnFocus>no</raiseOnFocus> - <!-- when followMouse is enabled, and a window is given focus by moving the - mouse into it, also raise the window --> -</focus> - -<placement> - <policy>Smart</policy> - <!-- 'Smart' or 'UnderMouse' --> - <center>yes</center> - <!-- whether to place windows in the center of the free area found or - the top left corner --> - <monitor>Primary</monitor> - <!-- with Smart placement on a multi-monitor system, try to place new windows - on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where - the active window is, 'Primary' - only on the primary monitor --> - <primaryMonitor>1</primaryMonitor> - <!-- The monitor where Openbox should place popup dialogs such as the - focus cycling popup, or the desktop switch popup. It can be an index - from 1, specifying a particular monitor. Or it can be one of the - following: 'Mouse' - where the mouse is, or - 'Active' - where the active window is --> -</placement> - -<theme> - <name>Clearlooks</name> - <titleLayout>NLIMC</titleLayout> - <!-- - available characters are NDSLIMC, each can occur at most once. - N: window icon - L: window label (AKA title). - I: iconify - M: maximize - C: close - S: shade (roll up/down) - D: omnipresent (on all desktops). - --> - <keepBorder>yes</keepBorder> - <animateIconify>yes</animateIconify> - <font place="ActiveWindow"> - <name>sans</name> - <size>8</size> - <!-- font size in points --> - <weight>bold</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> - <font place="InactiveWindow"> - <name>sans</name> - <size>8</size> - <!-- font size in points --> - <weight>bold</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> - <font place="MenuHeader"> - <name>sans</name> - <size>9</size> - <!-- font size in points --> - <weight>normal</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> - <font place="MenuItem"> - <name>sans</name> - <size>9</size> - <!-- font size in points --> - <weight>normal</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> - <font place="ActiveOnScreenDisplay"> - <name>sans</name> - <size>9</size> - <!-- font size in points --> - <weight>bold</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> - <font place="InactiveOnScreenDisplay"> - <name>sans</name> - <size>9</size> - <!-- font size in points --> - <weight>bold</weight> - <!-- 'bold' or 'normal' --> - <slant>normal</slant> - <!-- 'italic' or 'normal' --> - </font> -</theme> - -<desktops> - <!-- this stuff is only used at startup, pagers allow you to change them - during a session - - these are default values to use when other ones are not already set - by other applications, or saved in your session - - use obconf if you want to change these without having to log out - and back in --> - <number>1</number> - <firstdesk>1</firstdesk> - <names> - <!-- set names up here if you want to, like this: - <name>desktop 1</name> - <name>desktop 2</name> - --> - </names> - <popupTime>875</popupTime> - <!-- The number of milliseconds to show the popup for when switching - desktops. Set this to 0 to disable the popup. --> -</desktops> - -<resize> - <drawContents>yes</drawContents> - <popupShow>Nonpixel</popupShow> - <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) --> - <popupPosition>Center</popupPosition> - <!-- 'Center', 'Top', or 'Fixed' --> - <popupFixedPosition> - <!-- these are used if popupPosition is set to 'Fixed' --> - - <x>10</x> - <!-- positive number for distance from left edge, negative number for - distance from right edge, or 'Center' --> - <y>10</y> - <!-- positive number for distance from top edge, negative number for - distance from bottom edge, or 'Center' --> - </popupFixedPosition> -</resize> - -<!-- You can reserve a portion of your screen where windows will not cover when - they are maximized, or when they are initially placed. - Many programs reserve space automatically, but you can use this in other - cases. --> -<margins> - <top>0</top> - <bottom>0</bottom> - <left>0</left> - <right>0</right> -</margins> - -<dock> - <position>TopLeft</position> - <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating --> - <floatingX>0</floatingX> - <floatingY>0</floatingY> - <noStrut>no</noStrut> - <stacking>Above</stacking> - <!-- 'Above', 'Normal', or 'Below' --> - <direction>Vertical</direction> - <!-- 'Vertical' or 'Horizontal' --> - <autoHide>no</autoHide> - <hideDelay>300</hideDelay> - <!-- in milliseconds (1000 = 1 second) --> - <showDelay>300</showDelay> - <!-- in milliseconds (1000 = 1 second) --> - <moveButton>Middle</moveButton> - <!-- 'Left', 'Middle', 'Right' --> -</dock> - -<keyboard> -</keyboard> - -<mouse> - <dragThreshold>1</dragThreshold> - <!-- number of pixels the mouse must move before a drag begins --> - <doubleClickTime>500</doubleClickTime> - <!-- in milliseconds (1000 = 1 second) --> - <screenEdgeWarpTime>400</screenEdgeWarpTime> - <!-- Time before changing desktops when the pointer touches the edge of the - screen while moving a window, in milliseconds (1000 = 1 second). - Set this to 0 to disable warping --> - <screenEdgeWarpMouse>false</screenEdgeWarpMouse> - <!-- Set this to TRUE to move the mouse pointer across the desktop when - switching due to hitting the edge of the screen --> - - <context name="Frame"> - <mousebind button="A-Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="A-Left" action="Click"> - <action name="Unshade"/> - </mousebind> - <mousebind button="A-Left" action="Drag"> - <action name="Move"/> - </mousebind> - - <mousebind button="A-Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="A-Right" action="Drag"> - <action name="Resize"/> - </mousebind> - - <mousebind button="A-Middle" action="Press"> - <action name="Lower"/> - <action name="FocusToBottom"/> - <action name="Unfocus"/> - </mousebind> - - <mousebind button="A-Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="A-Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - <mousebind button="C-A-Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="C-A-Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - <mousebind button="A-S-Up" action="Click"> - <action name="SendToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="A-S-Down" action="Click"> - <action name="SendToDesktop"><to>next</to></action> - </mousebind> - </context> - - <context name="Titlebar"> - <mousebind button="Left" action="Drag"> - <action name="Move"/> - </mousebind> - <mousebind button="Left" action="DoubleClick"> - </mousebind> - - <mousebind button="Up" action="Click"> - <action name="if"> - <shaded>no</shaded> - <then> - <action name="Shade"/> - <action name="FocusToBottom"/> - <action name="Unfocus"/> - <action name="Lower"/> - </then> - </action> - </mousebind> - <mousebind button="Down" action="Click"> - <action name="if"> - <shaded>yes</shaded> - <then> - <action name="Unshade"/> - <action name="Raise"/> - </then> - </action> - </mousebind> - </context> - - <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - - <mousebind button="Middle" action="Press"> - <action name="Lower"/> - <action name="FocusToBottom"/> - <action name="Unfocus"/> - </mousebind> - - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - </context> - - <context name="Top"> - <mousebind button="Left" action="Drag"> - <action name="Resize"><edge>top</edge></action> - </mousebind> - </context> - - <context name="Left"> - <mousebind button="Left" action="Drag"> - <action name="Resize"><edge>left</edge></action> - </mousebind> - </context> - - <context name="Right"> - <mousebind button="Left" action="Drag"> - <action name="Resize"><edge>right</edge></action> - </mousebind> - </context> - - <context name="Bottom"> - <mousebind button="Left" action="Drag"> - <action name="Resize"><edge>bottom</edge></action> - </mousebind> - - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - </context> - - <context name="TRCorner BRCorner TLCorner BLCorner"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Left" action="Drag"> - <action name="Resize"/> - </mousebind> - </context> - - <context name="Client"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="Middle" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - </context> - - <context name="Icon"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - </context> - - <context name="AllDesktops"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Left" action="Click"> - <action name="ToggleOmnipresent"/> - </mousebind> - </context> - - <context name="Shade"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="Left" action="Click"> - <action name="ToggleShade"/> - </mousebind> - </context> - - <context name="Iconify"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="Left" action="Click"> - <action name="Iconify"/> - </mousebind> - </context> - - <context name="Maximize"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Middle" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Left" action="Click"> - </mousebind> - <mousebind button="Middle" action="Click"> - </mousebind> - <mousebind button="Right" action="Click"> - </mousebind> - </context> - - <context name="Close"> - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - <action name="Unshade"/> - </mousebind> - <mousebind button="Left" action="Click"> - <action name="Close"/> - </mousebind> - </context> - - <context name="Desktop"> - <mousebind button="Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - - <mousebind button="A-Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="A-Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - <mousebind button="C-A-Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="C-A-Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - - <mousebind button="Left" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - <mousebind button="Right" action="Press"> - <action name="Focus"/> - <action name="Raise"/> - </mousebind> - </context> - - <context name="Root"> - <!-- Menus --> - <mousebind button="Middle" action="Press"> - </mousebind> - <mousebind button="Right" action="Press"> - </mousebind> - </context> - - <context name="MoveResize"> - <mousebind button="Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - <mousebind button="A-Up" action="Click"> - <action name="GoToDesktop"><to>previous</to></action> - </mousebind> - <mousebind button="A-Down" action="Click"> - <action name="GoToDesktop"><to>next</to></action> - </mousebind> - </context> -</mouse> - -<menu> - <!-- You can specify more than one menu file in here and they are all loaded, - just don't make menu ids clash or, well, it'll be kind of pointless --> - - <!-- default menu file (or custom one in $HOME/.config/openbox/) --> - <!-- system menu files on Debian systems --> - <file>/var/lib/openbox/debian-menu.xml</file> - <file>menu.xml</file> - <hideDelay>200</hideDelay> - <!-- if a press-release lasts longer than this setting (in milliseconds), the - menu is hidden again --> - <middle>no</middle> - <!-- center submenus vertically about the parent entry --> - <submenuShowDelay>100</submenuShowDelay> - <!-- time to delay before showing a submenu after hovering over the parent - entry. - if this is a negative value, then the delay is infinite and the - submenu will not be shown until it is clicked on --> - <submenuHideDelay>400</submenuHideDelay> - <!-- time to delay before hiding a submenu when selecting another - entry in parent menu - if this is a negative value, then the delay is infinite and the - submenu will not be hidden until a different submenu is opened --> - <showIcons>yes</showIcons> - <!-- controls if icons appear in the client-list-(combined-)menu --> - <manageDesktops>yes</manageDesktops> - <!-- show the manage desktops section in the client-list-(combined-)menu --> -</menu> - -<applications> -<application title="X2Go Client" type="normal"> -<decor>no</decor> -</application> -<!-- - # this is an example with comments through out. use these to make your - # own rules, but without the comments of course. - # you may use one or more of the name/class/role/title/type rules to specify - # windows to match - - <application name="the window's _OB_APP_NAME property (see obxprop)" - class="the window's _OB_APP_CLASS property (see obxprop)" - groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)" - groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)" - role="the window's _OB_APP_ROLE property (see obxprop)" - title="the window's _OB_APP_TITLE property (see obxprop)" - type="the window's _OB_APP_TYPE property (see obxprob).. - (if unspecified, then it is 'dialog' for child windows)"> - # you may set only one of name/class/role/title/type, or you may use more - # than one together to restrict your matches. - - # the name, class, role, and title use simple wildcard matching such as those - # used by a shell. you can use * to match any characters and ? to match - # any single character. - - # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock, - # or desktop - - # when multiple rules match a window, they will all be applied, in the - # order that they appear in this list - - - # each rule element can be left out or set to 'default' to specify to not - # change that attribute of the window - - <decor>yes</decor> - # enable or disable window decorations - - <shade>no</shade> - # make the window shaded when it appears, or not - - <position force="no"> - # the position is only used if both an x and y coordinate are provided - # (and not set to 'default') - # when force is "yes", then the window will be placed here even if it - # says you want it placed elsewhere. this is to override buggy - # applications who refuse to behave - <x>center</x> - # a number like 50, or 'center' to center on screen. use a negative number - # to start from the right (or bottom for <y>), ie -50 is 50 pixels from - # the right edge (or bottom). use 'default' to specify using value - # provided by the application, or chosen by openbox, instead. - <y>200</y> - <monitor>1</monitor> - # specifies the monitor in a xinerama setup. - # 1 is the first head, or 'mouse' for wherever the mouse is - </position> - - <size> - # the size to make the window. - <width>20</width> - # a number like 20, or 'default' to use the size given by the application. - # you can use fractions such as 1/2 or percentages such as 75% in which - # case the value is relative to the size of the monitor that the window - # appears on. - <height>30%</height> - </size> - - <focus>yes</focus> - # if the window should try be given focus when it appears. if this is set - # to yes it doesn't guarantee the window will be given focus. some - # restrictions may apply, but Openbox will try to - - <desktop>1</desktop> - # 1 is the first desktop, 'all' for all desktops - - <layer>normal</layer> - # 'above', 'normal', or 'below' - - <iconic>no</iconic> - # make the window iconified when it appears, or not - - <skip_pager>no</skip_pager> - # asks to not be shown in pagers - - <skip_taskbar>no</skip_taskbar> - # asks to not be shown in taskbars. window cycling actions will also - # skip past such windows - - <fullscreen>yes</fullscreen> - # make the window in fullscreen mode when it appears - - <maximized>true</maximized> - # 'Horizontal', 'Vertical' or boolean (yes/no) - </application> - - # end of the example ---> -</applications> - -</openbox_config> - diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd index c2806ef..ca1b9d3 100755 --- a/displaymanager/sbin/x2gothinclientd +++ b/displaymanager/sbin/x2gothinclientd @@ -176,9 +176,6 @@ elsif ($pid == 0 ) # set screen background to X2Go default blue on all detected screens `DISPLAY=:0 xsetroot -solid "#246ed8"`; - #start openbox - qx(su - x2gothinclient -c \"export DISPLAY=:0; /usr/bin/openbox --config-file /etc/x2go/openbox2go.xml 1>/dev/null 2>/dev/null&\"); - } # test if pulseaudio is running, if not launch it... -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git