kill the .in's for xml. we're not installing the xsd to the filesystem anymore anyways. kill the openbox-kde and openbox-gnome, we're going to have to do it different. put the full path to the openbox binary in the openbox-*-session files by using .in's
Dana Jansens danakj@orodu.net
9 files changed,
514 insertions(+),
30 deletions(-)
M
Makefile.am
→
Makefile.am
@@ -32,9 +32,7 @@ tools/gnome-panel-control/gnome-panel-control
bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ - data/xsession/openbox-kde-session \ - data/xsession/openbox-gnome \ - data/xsession/openbox-kde + data/xsession/openbox-kde-session noinst_PROGRAMS = \ tools/themetoxml/themetoxml@@ -377,19 +375,23 @@ data/menu.xml
edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ - -e 's!@xsddir\@!$(xsddir)!' + -e 's!@bindir\@!$(bindir)!' -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +data/xsession/openbox-gnome-session: Makefile data \ + $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/rc.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ + @chmod +x $@ -data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data +data/xsession/openbox-kde-session: Makefile data \ + $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ + @chmod +x $@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop \@@ -406,8 +408,8 @@ version.h.in \
data/rc.xsd \ data/menu.xsd \ data/themerc.xsd \ - data/rc.xml.in \ - data/menu.xml.in \ + data/xsession/openbox-gnome-session.in \ + data/xsession/openbox-kde-session.in \ render/obrender-3.0.pc.in \ parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \
A
data/rc.xml
@@ -0,0 +1,491 @@
+<?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/" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://openbox.org/"> + +<resistance> + <strength>10</strength> + <screen_edge_strength>20</screen_edge_strength> + <edges_hit_layers_below>no</edges_hit_layers_below> +</resistance> + +<focus> + <focusNew>yes</focusNew> + <focusLast>no</focusLast> + <followMouse>no</followMouse> + <focusDelay>0</focusDelay> + <raiseOnFocus>no</raiseOnFocus> +</focus> + +<placement> + <policy>Smart</policy> + <!-- 'Smart' or 'UnderMouse' --> +</placement> + +<theme> + <name>Clearlooks</name> + <titleLayout>NLIMC</titleLayout> + <titleNumber>yes</titleNumber> + <!-- + avaible characters are NDSLIMC, each can occur at most once. + N: client menu + L: window label (AKA title). + I: iconify + M: maximize + C: close + S: shade + D: omnipresent (on all desktops). + --> + <keepBorder>yes</keepBorder> + <animateIconify>yes</animateIconify> + <font place="ActiveWindow"> + <name>sans</name> + <size>7</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>7</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>8</size> + <!-- font size in points --> + <weight>bold</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>bold</weight> + <!-- 'bold' or 'normal' --> + <slant>normal</slant> + <!-- 'italic' or 'normal' --> + </font> + <font place="OnScreenDisplay"> + <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 --> + <number>4</number> + <firstdesk>1</firstdesk> + <names> + <name>desktop one</name> + <name>desktop two</name> + <name>desktop three</name> + <name>desktop four</name> + </names> +</desktops> + +<resize> + <drawContents>yes</drawContents> + <popupShow>Nonpixel</popupShow> + <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) --> + <popupPosition>Center</popupPosition> + <!-- 'Center' or 'Top' --> +</resize> + +<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> + <showDelay>300</showDelay> + <moveButton>Middle</moveButton> +</dock> + +<keyboard> + <chainQuitKey>C-g</chainQuitKey> + + <keybind key="A-F10"> + <action name="MaximizeFull"/> + </keybind> + <keybind key="A-F5"> + <action name="UnmaximizeFull"/> + </keybind> + <keybind key="A-F12"> + <action name="ToggleShade"/> + </keybind> + <keybind key="C-A-Left"> + <action name="DesktopLeft"><wrap>no</wrap></action> + </keybind> + <keybind key="C-A-Right"> + <action name="DesktopRight"><wrap>no</wrap></action> + </keybind> + <keybind key="C-A-Up"> + <action name="DesktopUp"><wrap>no</wrap></action> + </keybind> + <keybind key="C-A-Down"> + <action name="DesktopDown"><wrap>no</wrap></action> + </keybind> + <keybind key="S-A-Left"> + <action name="SendToDesktopLeft"><wrap>no</wrap></action> + </keybind> + <keybind key="S-A-Right"> + <action name="SendToDesktopRight"><wrap>no</wrap></action> + </keybind> + <keybind key="S-A-Up"> + <action name="SendToDesktopUp"><wrap>no</wrap></action> + </keybind> + <keybind key="S-A-Down"> + <action name="SendToDesktopDown"><wrap>no</wrap></action> + </keybind> + <keybind key="C-A-d"> + <action name="ToggleShowDesktop"/> + </keybind> + <keybind key="A-F4"> + <action name="Close"/> + </keybind> + <keybind key="A-Tab"> + <action name="NextWindow"/> + </keybind> + <keybind key="A-S-Tab"> + <action name="PreviousWindow"/> + </keybind> + <keybind key="C-A-Tab"> + <action name="NextWindow"><panels>yes</panels></action> + </keybind> + <keybind key="C-A-S-Tab"> + <action name="PreviousWindow"><panels>yes</panels></action> + </keybind> + <keybind key="A-F7"> + <action name="Move"/> + </keybind> + <keybind key="A-F8"> + <action name="Resize"/> + </keybind> + <keybind key="A-F9"> + <action name="Iconify"/> + </keybind> + <keybind key="A-space"> + <action name="ShowMenu"><menu>client-menu</menu></action> + </keybind> +</keyboard> + +<mouse> + <dragThreshold>3</dragThreshold> + <doubleClickTime>200</doubleClickTime> + + <context name="Frame"> + <mousebind button="A-Left" action="Drag"> + <action name="Move"/> + </mousebind> + <mousebind button="A-Left" action="Click"> + <action name="Raise"/> + </mousebind> + <mousebind button="A-Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="A-Middle" action="Drag"> + <action name="Resize"/> + </mousebind> + <mousebind button="A-Middle" action="Click"> + <action name="Lower"/> + </mousebind> + <mousebind button="A-Right" action="Press"> + <action name="ShowMenu"><menu>client-menu</menu></action> + </mousebind> + <mousebind button="A-Up" action="Click"> + <action name="DesktopPrevious"/> + </mousebind> + <mousebind button="A-Down" action="Click"> + <action name="DesktopNext"/> + </mousebind> + <mousebind button="C-A-Up" action="Click"> + <action name="SendToDesktopPrevious"/> + </mousebind> + <mousebind button="C-A-Down" action="Click"> + <action name="SendToDesktopNext"/> + </mousebind> + </context> + <context name="Titlebar"> + <mousebind button="Left" action="Drag"> + <action name="Move"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="Raise"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="DoubleClick"> + <action name="ToggleShade"/> + </mousebind> + <mousebind button="Middle" action="Press"> + <action name="Lower"/> + </mousebind> + <mousebind button="Up" action="Click"> + <action name="Shade"/> + </mousebind> + <mousebind button="Down" action="Click"> + <action name="Unshade"/> + </mousebind> + <mousebind button="Right" action="Press"> + <action name="ShowMenu"><menu>client-menu</menu></action> + </mousebind> + </context> + <context name="Handle"> + <mousebind button="Left" action="Drag"> + <action name="Move"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="Raise"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Middle" action="Press"> + <action name="Lower"/> + </mousebind> + </context> + <context name="BLCorner"> + <mousebind button="Left" action="Drag"> + <action name="Resize"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + </context> + <context name="BRCorner"> + <mousebind button="Left" action="Drag"> + <action name="Resize"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + </context> + <context name="TLCorner"> + <mousebind button="Left" action="Drag"> + <action name="Resize"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + </context> + <context name="TRCorner"> + <mousebind button="Left" action="Drag"> + <action name="Resize"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </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"/> + </mousebind> + <mousebind button="Right" action="Press"> + <action name="Focus"/> + </mousebind> + </context> + <context name="Icon"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Right" action="Press"> + <action name="ShowMenu"><menu>client-menu</menu></action> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="ShowMenu"><menu>client-menu</menu></action> + </mousebind> + </context> + <context name="AllDesktops"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="ToggleOmnipresent"/> + </mousebind> + </context> + <context name="Shade"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="ToggleShade"/> + </mousebind> + </context> + <context name="Iconify"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="Iconify"/> + </mousebind> + </context> + <context name="Maximize"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Middle" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Right" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="ToggleMaximizeFull"/> + </mousebind> + <mousebind button="Middle" action="Click"> + <action name="ToggleMaximizeVert"/> + </mousebind> + <mousebind button="Right" action="Click"> + <action name="ToggleMaximizeHorz"/> + </mousebind> + </context> + <context name="Close"> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + </mousebind> + <mousebind button="Left" action="Click"> + <action name="Close"/> + </mousebind> + </context> + <context name="Desktop"> + <mousebind button="Up" action="Press"> + <action name="DesktopPrevious"/> + </mousebind> + <mousebind button="Down" action="Press"> + <action name="DesktopNext"/> + </mousebind> + <mousebind button="A-Up" action="Press"> + <action name="DesktopPrevious"/> + </mousebind> + <mousebind button="A-Down" action="Press"> + <action name="DesktopNext"/> + </mousebind> + <mousebind button="Left" action="Press"> + <action name="Focus"/> + <action name="Raise"/> + </mousebind> + <mousebind button="Middle" action="Press"> + <action name="ShowMenu"><menu>client-list-menu</menu></action> + </mousebind> + <mousebind button="Right" action="Press"> + <action name="ShowMenu"><menu>root-menu</menu></action> + </mousebind> + </context> + <context name="MoveResize"> + <mousebind button="Up" action="Press"> + <action name="DesktopPrevious"/> + </mousebind> + <mousebind button="Down" action="Press"> + <action name="DesktopNext"/> + </mousebind> + <mousebind button="A-Up" action="Press"> + <action name="DesktopPrevious"/> + </mousebind> + <mousebind button="A-Down" action="Press"> + <action name="DesktopNext"/> + </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/) --> + <file>menu.xml</file> + <hideDelay>250</hideDelay> + <middle>no</middle> + <submenuShowDelay>0</submenuShowDelay> + <applicationIcons>yes</applicationIcons> +</menu> + +<!-- this section is commented out.. remove this and the ending comment if you + want to use it --> +<applications> + <!-- the name or the class can be set, or both. this is used to match + windows when they appear + + role can optionally be set, and only as much as you provide will be + checked to see if it matches, eg. if you set role="abc" and the window's + role is actually "abcde" it would match. + --> + <application name="first element of window's WM_CLASS property (see xprop)" + class="second element of window's WM_CLASS property (see xprop)" + role="the window's WM_WINDOW_ROLE property (see xprop)"> + + <!-- each element can be left out or set to 'default' to specify to not + change that attribute of the window --> + + <decor>yes</decor> + + <shade>no</shade> + + <position> + <!-- the position is only used if both an x and y coordinate are provided + (and not set to 'default') --> + <x>center</x> + <!-- a number or 'center' to center on screen --> + <y>200</y> + <!-- a number or 'center' to center on screen --> + <monitor>1</monitor> + <!-- specifies the monitor in a xinerama setup. + 1 is the first head, or 'mouse' for wherever the mouse is --> + </position> + + <focus>yes</focus> + <!-- if the window should try be given focus when it appears --> + + <desktop>1</desktop> + <!-- 1 is the first desktop, 'all' for all desktops --> + + <layer>normal</layer> + <!-- 'above', 'normal', or 'below' --> + + <iconic>no</iconic> + + <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> + + <maximized>true</maximized> + <!-- 'Horizontal', 'Vertical' or boolean (yes/no/on/off/true/false) --> + </application> +</applications> + --> + +</openbox_config>
D
data/xsession/openbox-gnome
@@ -1,4 +0,0 @@
-#!/bin/sh - -# A temporary script to be replaced by a real program.. -exec openbox --restart-binary openbox-gnome "$@"
D
data/xsession/openbox-gnome-session
@@ -1,5 +0,0 @@
-#!/bin/sh - -# Run GNOME with Openbox as its window manager -export WINDOW_MANAGER=openbox-gnome -exec gnome-session "$@"
A
data/xsession/openbox-gnome-session.in
@@ -0,0 +1,5 @@
+#!/bin/sh + +# Run GNOME with Openbox as its window manager +export WINDOW_MANAGER="@bindir@/openbox" +exec gnome-session "$@"
D
data/xsession/openbox-kde
@@ -1,4 +0,0 @@
-#!/bin/sh - -# A temporary script to be replaced by a real program.. -exec openbox --restart-binary openbox-kde "$@"
D
data/xsession/openbox-kde-session
@@ -1,5 +0,0 @@
-#!/bin/sh - -# Run KDE with Openbox as its window manager -export KDEWM=openbox-kde -exec startkde "$@"
A
data/xsession/openbox-kde-session.in
@@ -0,0 +1,5 @@
+#!/bin/sh + +# Run KDE with Openbox as its window manager +export KDEWM="@bindir@/openbox" +exec startkde "$@"