f8f2c..55ae9 (2010-07-14 10:17)
(2010-07-26 19:05) 92d2d..abb3a
Author: Claes NästénDate: Wed Jul 14 19:11:39 +0200 2010
Subject: Set PEKWM_ETC_PATH, PEKWM_SCRIPT_PATH and PEKWM_THEME_PATH environment variables
In order to make configurations portable between pekwm installations set
the above mentioned environment variables and use them in the default
configuration.
TypeRules have also been moved over to a separate file included from the
main autoproperties files so that it can be updated without user having to
re-configure their copy.
-
Rename data/config.in to data/config
-
Rename data/menu.in to data/menu
| data/Makefile.am | |
| 2 | @@ -2,17 +2,9 @@ |
| 2 | |
| 3 | SUBDIRS = themes scripts |
| 4 | |
| 5 | CLEANFILES = config menu |
| 6 | EXTRA_DIST = autoproperties config.in keys menu.in mouse start vars |
| 7 | EXTRA_DIST = autoproperties autoproperties_typerules config keys menu mouse start vars |
| 8 | cfgdatadir = $(sysconfdir)/pekwm |
| 9 | cfgdata_DATA = autoproperties config keys menu mouse start vars |
| 10 | |
| 11 | all-local: config menu |
| 12 | |
| 13 | config: |
| 14 | @SED@ -e 's:<PREFIX>:$(pkgdatadir):g' -e "s:<THEME>:@THEME@:g" $@.in > $@ |
| 15 | menu: |
| 16 | @SED@ -e 's:<PREFIX>:$(pkgdatadir):g' -e "s:<THEME>:@THEME@:g" $@.in > $@ |
| 17 | cfgdata_DATA = autoproperties autoproperties_typerules config keys menu mouse start vars |
| 18 | |
| 19 | distclean-local: |
| 20 | rm -f *\~ .\#* |
| ... | |
| data/autoproperties | |
| 177 | @@ -177,50 +177,7 @@ |
| 177 | // End of autoproperties. ------------------------- |
| 178 | |
| 179 | TypeRules { |
| 180 | /* |
| 181 | Desktop windows such as nautilus window in gnome. These should |
| 182 | cover the root window and be below all other windows. Also they |
| 183 | should not be included in the menu and in snapping. |
| 184 | */ |
| 185 | Property = "DESKTOP" { |
| 186 | FrameGeometry = "0x0+0+0" |
| 187 | Titlebar = "False" |
| 188 | Border = "False" |
| 189 | Sticky = "True" |
| 190 | Skip = "FocusToggle Menus Snap" |
| 191 | Layer = "Desktop" |
| 192 | Focusable = "False" |
| 193 | DisallowedActions = "Move" |
| 194 | } |
| 195 | Property = "DOCK" { |
| 196 | Titlebar = "False" |
| 197 | Border = "False" |
| 198 | Sticky = "True" |
| 199 | Layer = "Dock" |
| 200 | Skip = "FocusToggle Menus" |
| 201 | Focusable = "False" |
| 202 | DisallowedActions = "Move" |
| 203 | } |
| 204 | Property = "TOOLBAR" { |
| 205 | Skip = "FocusToggle Menus Snap" |
| 206 | } |
| 207 | Property = "MENU" { |
| 208 | Titlebar = "False" |
| 209 | Border = "False" |
| 210 | Skip = "FocusToggle Menus Snap" |
| 211 | } |
| 212 | Property = "UTILITY" { |
| 213 | } |
| 214 | Property = "SPLASH" { |
| 215 | Titlebar = "False" |
| 216 | Border = "False" |
| 217 | Layer = "OnTop" |
| 218 | } |
| 219 | Property = "DIALOG" { |
| 220 | Layer = "OnTop" |
| 221 | } |
| 222 | Property = "NORMAL" { |
| 223 | } |
| 224 | INCLUDE = "$_PEKWM_ETC_PATH/autoproperties_typerules" |
| 225 | } |
| 226 | |
| 227 | /* |
| ... | |
| src/main.cc | |
| 78 | @@ -78,6 +78,10 @@ |
| 78 | setlocale(LC_CTYPE, ""); |
| 79 | Util::iconv_init(); |
| 80 | |
| 81 | setenv("PEKWM_ETC_PATH", SYSCONFDIR, 1); |
| 82 | setenv("PEKWM_SCRIPT_PATH", DATADIR "/pekwm/scripts", 1); |
| 83 | setenv("PEKWM_THEME_PATH", DATADIR "/pekwm/themes", 1); |
| 84 | |
| 85 | // build commandline |
| 86 | for (int i = 0; i < argc; ++i) { |
| 87 | command_line = command_line + argv[i] + " "; |
| ... | |