Over the years, the default values given in src/defaults.c and
WindowMaker/Defaults/WindowMaker have diverged. Since the values from the
former are overwritten by those from the latter, these are what users are
used to.
With the removal of W/D/WindowMaker from the source, we update the config
values in src/defaults.c to these values.
We also take the opportunity to remove the unused macro DEF_INFO_TEXT_FONT.
---
src/defaults.c | 82 ++++++++++++++++++++++++++++----------------------------
src/wconfig.h.in | 40 ++++++++++++++++++++-------
2 files changed, 72 insertions(+), 50 deletions(-)
diff --git a/src/defaults.c b/src/defaults.c
index 19d230c..db097d6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -383,13 +383,13 @@ WDefaultEntry optionList[] = {
&wPreferences.icon_path, getPathList, NULL, NULL, NULL},
{"ColormapMode", "auto", seColormapModes,
&wPreferences.colormap_mode, getEnum, NULL, NULL, NULL},
- {"AutoFocus", "NO", NULL,
+ {"AutoFocus", "YES", NULL,
&wPreferences.auto_focus, getBool, NULL, NULL, NULL},
{"RaiseDelay", "0", NULL,
&wPreferences.raise_delay, getInt, NULL, NULL, NULL},
{"CirculateRaise", "NO", NULL,
&wPreferences.circ_raise, getBool, NULL, NULL, NULL},
- {"Superfluous", "NO", NULL,
+ {"Superfluous", "YES", NULL,
&wPreferences.superfluous, getBool, NULL, NULL, NULL},
{"AdvanceToNewWorkspace", "NO", NULL,
&wPreferences.ws_advance, getBool, NULL, NULL, NULL},
@@ -407,13 +407,13 @@ WDefaultEntry optionList[] = {
&wPreferences.save_session_on_exit, getBool, NULL, NULL, NULL},
{"WrapMenus", "NO", NULL,
&wPreferences.wrap_menus, getBool, NULL, NULL, NULL},
- {"ScrollableMenus", "NO", NULL,
+ {"ScrollableMenus", "YES", NULL,
&wPreferences.scrollable_menus, getBool, NULL, NULL, NULL},
- {"MenuScrollSpeed", "medium", seSpeeds,
+ {"MenuScrollSpeed", "fast", seSpeeds,
&wPreferences.menu_scroll_speed, getEnum, NULL, NULL, NULL},
- {"IconSlideSpeed", "medium", seSpeeds,
+ {"IconSlideSpeed", "fast", seSpeeds,
&wPreferences.icon_slide_speed, getEnum, NULL, NULL, NULL},
- {"ShadeSpeed", "medium", seSpeeds,
+ {"ShadeSpeed", "fast", seSpeeds,
&wPreferences.shade_speed, getEnum, NULL, NULL, NULL},
{"BounceAppIconsWhenUrgent", "YES", NULL,
&wPreferences.bounce_appicons_when_urgent, getBool, NULL, NULL,
NULL},
@@ -445,7 +445,7 @@ WDefaultEntry optionList[] = {
&wPreferences.ignore_focus_click, getBool, NULL, NULL, NULL},
{"UseSaveUnders", "NO", NULL,
&wPreferences.use_saveunders, getBool, NULL, NULL, NULL},
- {"OpaqueMove", "NO", NULL,
+ {"OpaqueMove", "YES", NULL,
&wPreferences.opaque_move, getBool, NULL, NULL, NULL},
{"OpaqueResize", "NO", NULL,
&wPreferences.opaque_resize, getBool, NULL, NULL, NULL},
@@ -453,7 +453,7 @@ WDefaultEntry optionList[] = {
&wPreferences.opaque_move_resize_keyboard, getBool, NULL, NULL,
NULL},
{"DisableAnimations", "NO", NULL,
&wPreferences.no_animations, getBool, NULL, NULL, NULL},
- {"DontLinkWorkspaces", "NO", NULL,
+ {"DontLinkWorkspaces", "YES", NULL,
&wPreferences.no_autowrap, getBool, NULL, NULL, NULL},
{"WindowSnapping", "NO", NULL,
&wPreferences.window_snapping, getBool, NULL, NULL, NULL},
@@ -479,15 +479,15 @@ WDefaultEntry optionList[] = {
&wPreferences.no_window_over_dock, getBool, updateUsableArea, NULL,
NULL},
{"NoWindowOverIcons", "NO", NULL,
&wPreferences.no_window_over_icons, getBool, updateUsableArea,
NULL, NULL},
- {"WindowPlaceOrigin", "(0, 0)", NULL,
+ {"WindowPlaceOrigin", "(64, 0)", NULL,
&wPreferences.window_place_origin, getCoord, NULL, NULL, NULL},
- {"ResizeDisplay", "corner", seGeomDisplays,
+ {"ResizeDisplay", "center", seGeomDisplays,
&wPreferences.size_display, getEnum, NULL, NULL, NULL},
- {"MoveDisplay", "corner", seGeomDisplays,
+ {"MoveDisplay", "floating", seGeomDisplays,
&wPreferences.move_display, getEnum, NULL, NULL, NULL},
{"DontConfirmKill", "NO", NULL,
&wPreferences.dont_confirm_kill, getBool, NULL, NULL, NULL},
- {"WindowTitleBalloons", "NO", NULL,
+ {"WindowTitleBalloons", "YES", NULL,
&wPreferences.window_balloon, getBool, NULL, NULL, NULL},
{"MiniwindowTitleBalloons", "NO", NULL,
&wPreferences.miniwin_title_balloon, getBool, NULL, NULL, NULL},
@@ -527,11 +527,11 @@ WDefaultEntry optionList[] = {
/* WorkspaceBack must come after WorkspaceSpecificBack or
* WorkspaceBack won't know WorkspaceSpecificBack was also
* specified and 2 copies of wmsetbg will be launched */
- {"WorkspaceBack", "(solid, black)", NULL,
+ {"WorkspaceBack", "(solid, \"rgb:50/50/75\")", NULL,
NULL, getWSBackground, setWorkspaceBack, NULL, NULL},
{"SmoothWorkspaceBack", "NO", NULL,
NULL, getBool, NULL, NULL, NULL},
- {"IconBack", "(solid, gray)", NULL,
+ {"IconBack", "(dgradient, \"rgb:a6/a6/b6\")", NULL,
NULL, getTexture, setIconTile, NULL, NULL},
{"TitleJustify", "center", seJustifications,
&wPreferences.title_justification, getEnum, setJustify, NULL, NULL},
@@ -569,7 +569,7 @@ WDefaultEntry optionList[] = {
NULL, getColor, setHightlightText, NULL, NULL},
{"ClipTitleColor", "black", (void *)CLIP_NORMAL,
NULL, getColor, setClipTitleColor, NULL, NULL},
- {"CClipTitleColor", "\"#454045\"", (void *)CLIP_COLLAPSED,
+ {"CClipTitleColor", "\"rgb:61/61/61\"", (void *)CLIP_COLLAPSED,
NULL, getColor, setClipTitleColor, NULL, NULL},
{"FTitleColor", "white", (void *)WS_FOCUSED,
NULL, getColor, setWTitleColor, NULL, NULL},
@@ -579,21 +579,21 @@ WDefaultEntry optionList[] = {
NULL, getColor, setWTitleColor, NULL, NULL},
{"FTitleBack", "(solid, black)", NULL,
NULL, getTexture, setFTitleBack, NULL, NULL},
- {"PTitleBack", "(solid, \"#616161\")", NULL,
+ {"PTitleBack", "(solid, gray40)", NULL,
NULL, getTexture, setPTitleBack, NULL, NULL},
- {"UTitleBack", "(solid, gray)", NULL,
+ {"UTitleBack", "(solid, \"rgb:aa/aa/aa\")", NULL,
NULL, getTexture, setUTitleBack, NULL, NULL},
- {"ResizebarBack", "(solid, gray)", NULL,
+ {"ResizebarBack", "(solid, \"rgb:aa/aa/aa\")", NULL,
NULL, getTexture, setResizebarBack, NULL, NULL},
{"MenuTitleColor", "white", NULL,
NULL, getColor, setMenuTitleColor, NULL, NULL},
{"MenuTextColor", "black", NULL,
NULL, getColor, setMenuTextColor, NULL, NULL},
- {"MenuDisabledColor", "\"#616161\"", NULL,
+ {"MenuDisabledColor", "gray50", NULL,
NULL, getColor, setMenuDisabledColor, NULL, NULL},
{"MenuTitleBack", "(solid, black)", NULL,
NULL, getTexture, setMenuTitleBack, NULL, NULL},
- {"MenuTextBack", "(solid, gray)", NULL,
+ {"MenuTextBack", "(solid, \"rgb:aa/aa/aa\")", NULL,
NULL, getTexture, setMenuTextBack, NULL, NULL},
{"IconTitleColor", "white", NULL,
NULL, getColor, setIconTitleColor, NULL, NULL},
@@ -616,21 +616,21 @@ WDefaultEntry optionList[] = {
/* keybindings */
- {"RootMenuKey", "None", (void *)WKBD_ROOTMENU,
+ {"RootMenuKey", "F12", (void *)WKBD_ROOTMENU,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"WindowListKey", "None", (void *)WKBD_WINDOWLIST,
+ {"WindowListKey", "F11", (void *)WKBD_WINDOWLIST,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"WindowMenuKey", "None", (void *)WKBD_WINDOWMENU,
+ {"WindowMenuKey", "Control+Escape", (void *)WKBD_WINDOWMENU,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"DockRaiseLowerKey", "None", (void*)WKBD_DOCKRAISELOWER,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"ClipRaiseLowerKey", "None", (void *)WKBD_CLIPRAISELOWER,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"MiniaturizeKey", "None", (void *)WKBD_MINIATURIZE,
+ {"MiniaturizeKey", "Mod1+M", (void *)WKBD_MINIATURIZE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"MinimizeAllKey", "None", (void *)WKBD_MINIMIZEALL,
NULL, getKeybind, setKeyGrab, NULL, NULL },
- {"HideKey", "None", (void *)WKBD_HIDE,
+ {"HideKey", "Mod1+H", (void *)WKBD_HIDE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"HideOthersKey", "None", (void *)WKBD_HIDE_OTHERS,
NULL, getKeybind, setKeyGrab, NULL, NULL},
@@ -668,9 +668,9 @@ WDefaultEntry optionList[] = {
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"OmnipresentKey", "None", (void *)WKBD_OMNIPRESENT,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"RaiseKey", "\"Meta+Up\"", (void *)WKBD_RAISE,
+ {"RaiseKey", "Mod1+Up", (void *)WKBD_RAISE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"LowerKey", "\"Meta+Down\"", (void *)WKBD_LOWER,
+ {"LowerKey", "Mod1+Down", (void *)WKBD_LOWER,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"RaiseLowerKey", "None", (void *)WKBD_RAISELOWER,
NULL, getKeybind, setKeyGrab, NULL, NULL},
@@ -680,17 +680,17 @@ WDefaultEntry optionList[] = {
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"WorkspaceMapKey", "None", (void *)WKBD_WORKSPACEMAP,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"FocusNextKey", "None", (void *)WKBD_FOCUSNEXT,
+ {"FocusNextKey", "Mod1+Tab", (void *)WKBD_FOCUSNEXT,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"FocusPrevKey", "None", (void *)WKBD_FOCUSPREV,
+ {"FocusPrevKey", "Mod1+Shift+Tab", (void *)WKBD_FOCUSPREV,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"GroupNextKey", "None", (void *)WKBD_GROUPNEXT,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"GroupPrevKey", "None", (void *)WKBD_GROUPPREV,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"NextWorkspaceKey", "None", (void *)WKBD_NEXTWORKSPACE,
+ {"NextWorkspaceKey", "Mod1+Control+Right", (void *)WKBD_NEXTWORKSPACE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"PrevWorkspaceKey", "None", (void *)WKBD_PREVWORKSPACE,
+ {"PrevWorkspaceKey", "Mod1+Control+Left", (void *)WKBD_PREVWORKSPACE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"LastWorkspaceKey", "None", (void *)WKBD_LASTWORKSPACE,
NULL, getKeybind, setKeyGrab, NULL, NULL},
@@ -698,25 +698,25 @@ WDefaultEntry optionList[] = {
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"PrevWorkspaceLayerKey", "None", (void *)WKBD_PREVWSLAYER,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace1Key", "None", (void *)WKBD_WORKSPACE1,
+ {"Workspace1Key", "Mod1+1", (void *)WKBD_WORKSPACE1,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace2Key", "None", (void *)WKBD_WORKSPACE2,
+ {"Workspace2Key", "Mod1+2", (void *)WKBD_WORKSPACE2,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace3Key", "None", (void *)WKBD_WORKSPACE3,
+ {"Workspace3Key", "Mod1+3", (void *)WKBD_WORKSPACE3,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace4Key", "None", (void *)WKBD_WORKSPACE4,
+ {"Workspace4Key", "Mod1+4", (void *)WKBD_WORKSPACE4,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace5Key", "None", (void *)WKBD_WORKSPACE5,
+ {"Workspace5Key", "Mod1+5", (void *)WKBD_WORKSPACE5,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace6Key", "None", (void *)WKBD_WORKSPACE6,
+ {"Workspace6Key", "Mod1+6", (void *)WKBD_WORKSPACE6,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace7Key", "None", (void *)WKBD_WORKSPACE7,
+ {"Workspace7Key", "Mod1+7", (void *)WKBD_WORKSPACE7,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace8Key", "None", (void *)WKBD_WORKSPACE8,
+ {"Workspace8Key", "Mod1+8", (void *)WKBD_WORKSPACE8,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace9Key", "None", (void *)WKBD_WORKSPACE9,
+ {"Workspace9Key", "Mod1+9", (void *)WKBD_WORKSPACE9,
NULL, getKeybind, setKeyGrab, NULL, NULL},
- {"Workspace10Key", "None", (void *)WKBD_WORKSPACE10,
+ {"Workspace10Key", "Mod1+0", (void *)WKBD_WORKSPACE10,
NULL, getKeybind, setKeyGrab, NULL, NULL},
{"MoveToWorkspace1Key", "None", (void *)WKBD_MOVE_WORKSPACE1,
NULL, getKeybind, setKeyGrab, NULL, NULL},
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 85d0cf5..6566e12 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -136,7 +136,18 @@
/* pixmap path */
#define DEF_PIXMAP_PATHS \
- "(\"~/pixmaps\",\"~/GNUstep/Library/WindowMaker/Pixmaps\",\""PIXMAPDIR"\")"
+ "(" \
+ "\"~/GNUstep/Library/WindowMaker/Pixmaps\"," \
+ "\"~/GNUstep/Library/WindowMaker/Backgrounds\"," \
+ "\"~/GNUstep/Library/WindowMaker/CachedPixmaps\"," \
+ "\"~/pixmaps\"," \
+ "\""PKGDATADIR"/Pixmaps\"," \
+ "\""PKGDATADIR"/Backgrounds\"," \
+ "\"/usr/include/X11/pixmaps\"," \
+ "\"/usr/local/share/pixmaps\"," \
+ "\"/usr/share/pixmaps\"," \
+ "\""PIXMAPDIR"\"" \
+ ")"
#ifdef USER_MENU
#define GLOBAL_USER_MENU_PATH PKGDATADIR"/UserMenus"
@@ -146,7 +157,19 @@
/* icon path */
#define DEF_ICON_PATHS \
-
"(\"~/pixmaps\",\"~/GNUstep/Library/Icons\",\"/usr/include/X11/pixmaps/\",\""PIXMAPDIR"\")"
+ "(" \
+ "\"~/GNUstep/Library/WindowMaker/Icons\"," \
+ "\"~/GNUstep/Library/WindowMaker/Pixmaps\"," \
+ "\"~/GNUstep/Library/WindowMaker/CachedPixmaps\"," \
+ "\"~/pixmaps\"," \
+ "\""PKGDATADIR"/Icons\"," \
+ "\""PKGDATADIR"/Pixmaps\"," \
+ "\"/usr/include/X11/pixmaps\"," \
+ "\"/usr/local/share/pixmaps\"," \
+ "\"/usr/share/icons\"," \
+ "\"/usr/share/pixmaps\"," \
+ "\""PIXMAPDIR"\"" \
+ ")"
/* window title to use for untitled windows */
#define DEF_WINDOW_TITLE "Untitled"
@@ -155,13 +178,12 @@
#define DEF_FRAME_COLOR "white"
/* default fonts */
-#define DEF_TITLE_FONT "\"sans-serif:bold:pixelsize=12\""
-#define DEF_MENU_TITLE_FONT "\"sans-serif:bold:pixelsize=12\""
-#define DEF_MENU_ENTRY_FONT "\"sans-serif:pixelsize=12\""
-#define DEF_ICON_TITLE_FONT "\"sans-serif:pixelsize=9\""
-#define DEF_CLIP_TITLE_FONT "\"sans-serif:bold:pixelsize=10\""
-#define DEF_INFO_TEXT_FONT "\"sans-serif:pixelsize=12\""
-#define DEF_WORKSPACE_NAME_FONT "\"sans-serif:pixelsize=24\""
+#define DEF_TITLE_FONT "\"Sans:bold:pixelsize=12\""
+#define DEF_MENU_TITLE_FONT "\"Sans:bold:pixelsize=12\""
+#define DEF_MENU_ENTRY_FONT "\"Sans:pixelsize=12\""
+#define DEF_ICON_TITLE_FONT "\"Sans:pixelsize=9\""
+#define DEF_CLIP_TITLE_FONT "\"Sans:bold:pixelsize=10\""
+#define DEF_WORKSPACE_NAME_FONT "\"Sans:pixelsize=24\""
/* line width of the move/resize frame */
#define DEF_FRAME_THICKNESS 1
--
2.7.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
