The default values for all of the various Window Maker configuration options are given in src/defaults.c. Many are also given in WindowMaker/Defaults/WindowMaker.
In many cases, these default options do not agree. For example, src/defaults.c gives the default value of OpaqueMove as NO, but W/D/WindowMaker has it as YES. There also some options in W/D/WindowMaker which have no longer exist, e.g., PopupSwitchMenu. It is apparent that it is difficult to maintain these defaults in both locations. Also, a global W/D/WindowMaker file is only necessary for system administrators or distribution package maintainers who would like to change the default values for all of their users. Everyone else will just use WPrefs or edit ~/GNUstep/Defaults/WindowMaker. The only advantage I see to having a W/D/WindowMaker in the source tree is to serve as an example. But there are other sources of documentation, e.g.: http://windowmaker.org/chap4.php We still need this file to exist, otherwise an error dialog appears. I propose that we instead ship a very minimal W/D/WindowMaker and keep the default config values in one location: src/defaults.c. --- .gitignore | 1 - WindowMaker/Defaults/Makefile.am | 9 +-- WindowMaker/Defaults/WindowMaker | 1 + WindowMaker/Defaults/WindowMaker.in | 139 ------------------------------------ 4 files changed, 3 insertions(+), 147 deletions(-) create mode 100644 WindowMaker/Defaults/WindowMaker delete mode 100644 WindowMaker/Defaults/WindowMaker.in diff --git a/.gitignore b/.gitignore index 98a0197..fa96fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -112,7 +112,6 @@ WindowMaker/plmenu.zh_TW WindowMaker/Defaults/WMRootMenu WindowMaker/Defaults/WMState WindowMaker/Defaults/WMWindowAttributes -WindowMaker/Defaults/WindowMaker WindowMaker/IconSets/Default.iconset # Some text editors generate backup files diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am index 182385c..2f49a9a 100644 --- a/WindowMaker/Defaults/Makefile.am +++ b/WindowMaker/Defaults/Makefile.am @@ -2,20 +2,15 @@ defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL wpexecbindir = @wprefs_bindir@ -EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in +EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WMState.in -CLEANFILES = WMWindowAttributes WindowMaker WMState WMRootMenu +CLEANFILES = WMWindowAttributes WMState WMRootMenu WMWindowAttributes: $(srcdir)/WMWindowAttributes.in $(AM_V_GEN)sed -e "s:#extension#:@ICONEXT@:" \ $(srcdir)/WMWindowAttributes.in > WMWindowAttributes ; \ chmod 644 WMWindowAttributes -WindowMaker: $(srcdir)/WindowMaker.in - $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \ - > WindowMaker ; \ - chmod 644 WindowMaker - WMState: $(srcdir)/WMState.in $(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \ chmod 644 WMState diff --git a/WindowMaker/Defaults/WindowMaker b/WindowMaker/Defaults/WindowMaker new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/WindowMaker/Defaults/WindowMaker @@ -0,0 +1 @@ +{} diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in deleted file mode 100644 index c68feef..0000000 --- a/WindowMaker/Defaults/WindowMaker.in +++ /dev/null @@ -1,139 +0,0 @@ -{ - SmoothWorkspaceBack = NO; - PopupSwitchMenu = NO; - MenuStyle = normal; - DisableMiniwindows = NO; - DisableWorkspacePager = NO; - OpenTransientOnOwnerWorkspace = NO; - EdgeResistance = 30; - WorkspaceBorderSize = 0; - WorkspaceBorder = None; - IconificationStyle = Zoom; - IconPath = ( - "~/GNUstep/Library/Icons", - "#pkgdatadir#/Icons", - "#pkgdatadir#/Pixmaps", - "/usr/include/X11/pixmaps", - "~/GNUstep/Library/WindowMaker/Pixmaps", - "~/GNUstep/Library/WindowMaker/CachedPixmaps", - "/usr/share/icons", - "/usr/local/share/pixmaps", - "/usr/share/pixmaps" - ); - PixmapPath = ( - "~/GNUstep/Library/WindowMaker/Pixmaps", - "~/GNUstep/Library/WindowMaker/Backgrounds", - "~/GNUstep/Library/WindowMaker/CachedPixmaps", - "#pkgdatadir#/Pixmaps", - "#pkgdatadir#/Backgrounds", - "/usr/include/X11/pixmaps", - "/usr/local/share/pixmaps", - "/usr/share/pixmaps" - ); - WindowTitleBalloons = YES; - IconSize = 64; - FocusMode = manual; - DisableWSMouseActions = NO; - MouseLeftButtonAction = SelectWindows; - MouseMiddleButtonAction = OpenWindowListMenu; - MouseRightButtonAction = OpenApplicationsMenu; - MouseWheelAction = None; - ColormapSize = 4; - DisableDithering = NO; - ModifierKey = Mod1; - NewStyle = "new"; - DisableDock = NO; - DisableClip = NO; - DisableDrawers = NO; - Superfluous = YES; - StickyIcons = NO; - SaveSessionOnExit = NO; - ColormapMode = auto; - RaiseDelay = 0; - AutoFocus = YES; - WindowPlacement = auto; - WindowPlaceOrigin = (64, 0); - UseSaveUnders = NO; - DisableSound = NO; - DisableAnimations = NO; - DontLinkWorkspaces = YES; - AutoArrangeIcons = NO; - AdvanceToNewWorkspace = NO; - CycleWorkspaces = NO; - ResizeDisplay = center; - MoveDisplay = floating; - OpaqueMove = YES; - IconPosition = "blh"; - WrapMenus = NO; - ScrollableMenus = YES; - MenuScrollSpeed = fast; - IconSlideSpeed = fast; - ShadeSpeed = fast; - DoubleClickTime = 250; - AlignSubmenus = NO; - NoWindowOverIcons = NO; - IgnoreFocusClick = NO; - CloseKey = None; - MaximizeKey = None; - VMaximizeKey = None; - RaiseLowerKey = None; - DontConfirmKill = NO; - ShadeKey = None; - NextWorkspaceKey = "Mod1+Control+Right"; - PrevWorkspaceKey = "Mod1+Control+Left"; - RootMenuKey = F12; - WindowListKey = F11; - WindowMenuKey = "Control+Escape"; - RaiseKey = "Mod1+Up"; - LowerKey = "Mod1+Down"; - FocusNextKey = "Mod1+Tab"; - FocusPrevKey = "Mod1+Shift+Tab"; - Workspace1Key = "Mod1+1"; - Workspace2Key = "Mod1+2"; - Workspace3Key = "Mod1+3"; - Workspace4Key = "Mod1+4"; - Workspace5Key = "Mod1+5"; - Workspace6Key = "Mod1+6"; - Workspace7Key = "Mod1+7"; - Workspace8Key = "Mod1+8"; - Workspace9Key = "Mod1+9"; - Workspace10Key = "Mod1+0"; - HideKey = "Mod1+H"; - SelectKey = None; - MiniaturizeKey = "Mod1+M"; - NextWorkspaceLayerKey = None; - PrevWorkspaceLayerKey = None; - ConstrainWindowSize = NO; - DockRaiseLowerKey = None; - ClipRaiseLowerKey = None; - TitleJustify = center; - WindowTitleFont = "Sans:bold:pixelsize=12"; - MenuTitleFont = "Sans:bold:pixelsize=12"; - MenuTextFont = "Sans:pixelsize=12"; - IconTitleFont = "Sans:pixelsize=9"; - ClipTitleFont = "Sans:bold:pixelsize=10"; - LargeDisplayFont = "Sans:pixelsize=24"; - HighlightColor = white; - HighlightTextColor = black; - ClipTitleColor = black; - CClipTitleColor = "rgb:61/61/61"; - FTitleColor = white; - PTitleColor = white; - UTitleColor = black; - MenuTitleColor = white; - MenuTextColor = black; - MenuDisabledColor = gray50; - WorkspaceBack = (solid, "rgb:50/50/75"); - MenuTextColor = black; - FTitleBack = (solid, black); - UTitleBack = (solid, "rgb:aa/aa/aa"); - ResizebarBack = (solid, "rgb:aa/aa/aa"); - PTitleBack = (solid, gray40); - MenuTitleBack = (solid, black); - MenuTextBack = (solid, "rgb:aa/aa/aa"); - IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); - ClipAutocollapseDelay = 1000; - ClipAutolowerDelay = 1000; - ClipAutoexpandDelay = 600; - ClipAutoraiseDelay = 600; -} -- 2.7.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
