This is an automated email generated because a ref change occurred in the git repository for project wmaker-crm.git.
The branch, next has been updated via 83f0b764e607306feb7b17026a11034e5cf84785 (commit) via 3140c09240080491d58a9fa554fd5b6e23f3186d (commit) from 8fba9945e01aec2e0d58bdbe99c84b4390decabf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 83f0b764e607306feb7b17026a11034e5cf84785 Author: Doug Torrance <dtorra...@piedmont.edu> Date: Wed, 22 Mar 2017 01:48:45 -0400 URL: <http://repo.or.cz/wmaker-crm.git/83f0b764e607306f> WINGs: Set widget background pixmaps before realization. Previously, when WMSetWidgetBackgroundPixmap() was called prior to WMRealizeWidget(), no background pixmap was actually set. This is because while the CWBackPixmap bit is correctly set to 1, the CWBackPixel bit remains set to 1. When XCreateWindow() is finally called during realization, the background pixel takes precendence over the background pixmap. We fix this by setting CWBackPixel to 0 when setting CWBackPixmap to 1 and vice versa. --- WINGs/wview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WINGs/wview.c b/WINGs/wview.c index 610e640a1a1d..0667458bc91a 100644 --- a/WINGs/wview.c +++ b/WINGs/wview.c @@ -490,6 +490,7 @@ void W_SetViewBackgroundColor(W_View * view, WMColor * color) view->backColor = WMRetainColor(color); view->attribFlags |= CWBackPixel; + view->attribFlags &= ~CWBackPixmap; view->attribs.background_pixel = W_PIXEL(color); if (view->flags.realized) { XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color)); @@ -504,6 +505,7 @@ void W_SetViewBackgroundPixmap(W_View *view, WMPixmap *pix) view->backImage = WMRetainPixmap(pix); view->attribFlags |= CWBackPixmap; + view->attribFlags &= ~CWBackPixel; view->attribs.background_pixmap = pix->pixmap; if (view->flags.realized) { XSetWindowBackgroundPixmap(view->screen->display, view->window, pix->pixmap); commit 3140c09240080491d58a9fa554fd5b6e23f3186d Author: Doug Torrance <dtorra...@piedmont.edu> Date: Wed, 22 Mar 2017 01:29:38 -0400 URL: <http://repo.or.cz/wmaker-crm.git/3140c09240080491> wmaker: Consistent configuration options. The default configuration options are given in two places in the source code: - src/default.c - WindowMaker/Defaults/WindowMaker.in The defaults are initially set in the former, but are then overwritten by the latter. Ideally, the default options in these two locations should coincide. However, there are currently several issues. - Many of the options are missing from WindowMaker/Defaults/WindowMaker.in - Many of the options have conflicting defaults between the two locations. - A number of options given in WindowMaker/Defaults/WindowMaker.in no longer exist. In this patch, we bring the defaults in the two locations in line with one another. We have given preference to the defaults in W/D/WindowMaker, as these are the one users have been used to. Some of the paths in IconPath and PixmapPath have been removed. In particular, the various system pixmap paths (/usr/include/X11/pixmaps, /usr/share/pixmaps, and /usr/local/share/pixmaps) have been removed in favor of PIXMAPDIR, which is specified by the user at build. Also, /usr/share/icons has been removed from IconPath. The root of this directory will contain very few icons, as the icons themselves are located in subdirectories corresponding to XDG icon themes. We add a comment to src/defaults.c to remind future developers who add or remove options to change the default values in both locations. We also take the opportunity to remove the unused DEF_INFO_TEXT_FONT macro. --- WindowMaker/Defaults/Makefile.am | 3 +- WindowMaker/Defaults/WindowMaker.in | 390 ++++++++++++++++++---------- src/defaults.c | 86 +++--- src/wconfig.h.in | 33 ++- 4 files changed, 321 insertions(+), 191 deletions(-) rewrite WindowMaker/Defaults/WindowMaker.in (99%) diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am index 182385c1fe95..1556fbf9634f 100644 --- a/WindowMaker/Defaults/Makefile.am +++ b/WindowMaker/Defaults/Makefile.am @@ -12,7 +12,8 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in chmod 644 WMWindowAttributes WindowMaker: $(srcdir)/WindowMaker.in - $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \ + $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ + -e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \ > WindowMaker ; \ chmod 644 WindowMaker diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in dissimilarity index 99% index c68feeffcc03..79a3624fa4ed 100644 --- a/WindowMaker/Defaults/WindowMaker.in +++ b/WindowMaker/Defaults/WindowMaker.in @@ -1,139 +1,251 @@ -{ - 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; -} +{ + ColormapSize = 4; + DisableDithering = NO; + IconSize = 64; + ModifierKey = Mod1; + FocusMode = manual; + NewStyle = new; + DisableDock = NO; + DisableClip = NO; + DisableDrawers = NO; + ClipMergedInDock = NO; + DisableMiniwindows = NO; + EnableWorkspacePager = NO; + IconPosition = blh; + IconificationStyle = Zoom; + DisableWSMouseActions = NO; + MouseLeftButtonAction = SelectWindows; + MouseMiddleButtonAction = OpenWindowListMenu; + MouseRightButtonAction = OpenApplicationsMenu; + MouseBackwardButtonAction = None; + MouseForwardButtonAction = None; + MouseWheelAction = None; + MouseWheelTiltAction = None; + PixmapPath = ( + "~/GNUstep/Library/WindowMaker/Pixmaps", + "~/GNUstep/Library/WindowMaker/Backgrounds", + "~/GNUstep/Library/WindowMaker/CachedPixmaps", + "~/pixmaps", + "#pkgdatadir#/Pixmaps", + "#pkgdatadir#/Backgrounds", + "#pixmapdir#" + ); + IconPath = ( + "~/GNUstep/Library/Icons", + "~/GNUstep/Library/WindowMaker/Pixmaps", + "~/GNUstep/Library/WindowMaker/CachedPixmaps", + "~/pixmaps", + "#pkgdatadir#/Icons", + "#pkgdatadir#/Pixmaps", + "#pixmapdir#" + ); + ColormapMode = auto; + AutoFocus = YES; + RaiseDelay = 0; + CirculateRaise = NO; + Superfluous = YES; + AdvanceToNewWorkspace = NO; + CycleWorkspaces = NO; + WorkspaceNameDisplayPosition = center; + WorkspaceBorder = None; + WorkspaceBorderSize = 0; + StickyIcons = NO; + SaveSessionOnExit = NO; + WrapMenus = NO; + ScrollableMenus = YES; + MenuScrollSpeed = fast; + IconSlideSpeed = fast; + ShadeSpeed = fast; + BounceAppIconsWhenUrgent = YES; + RaiseAppIconsWhenBouncing = NO; + DoNotMakeAppIconsBounce = NO; + DoubleClickTime = 250; + ClipAutoraiseDelay = 600; + ClipAutolowerDelay = 1000; + ClipAutoexpandDelay = 600; + ClipAutocollapseDelay = 1000; + WrapAppiconsInDock = YES; + AlignSubmenus = NO; + ViKeyMenus = NO; + OpenTransientOnOwnerWorkspace = NO; + WindowPlacement = auto; + IgnoreFocusClick = NO; + UseSaveUnders = NO; + OpaqueMove = YES; + OpaqueResize = NO; + OpaqueMoveResizeKeyboard = NO; + DisableAnimations = NO; + DontLinkWorkspaces = YES; + WindowSnapping = NO; + SnapEdgeDetect = 1; + SnapCornerDetect = 10; + SnapToTopMaximizesFullscreen = NO; + DragMaximizedWindow = Move; + MoveHalfMaximizedWindowsBetweenScreens = NO; + AlternativeHalfMaximized = NO; + PointerWithHalfMaxWindows = NO; + HighlightActiveApp = YES; + AutoArrangeIcons = NO; + NoWindowOverDock = NO; + NoWindowOverIcons = NO; + WindowPlaceOrigin = (64, 0); + ResizeDisplay = center; + MoveDisplay = floating; + DontConfirmKill = NO; + WindowTitleBalloons = YES; + MiniwindowTitleBalloons = NO; + MiniwindowPreviewBalloons = NO; + AppIconBalloons = NO; + HelpBalloons = NO; + EdgeResistance = 30; + ResizeIncrement = 0; + Attraction = NO; + DisableBlinking = NO; + SingleClickLaunch = NO; + StrictWindozeCycle = YES; + SwitchPanelOnlyOpen = NO; + MiniPreviewSize = 128; + IgnoreGtkHints = NO; + MenuStyle = normal; + WidgetColor = (solid, gray); + WorkspaceSpecificBack = (); + WorkspaceBack = (solid, "rgb:50/50/75"); + SmoothWorkspaceBack = NO; + IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61"); + TitleJustify = center; + WindowTitleFont = "Sans:bold:pixelsize=12"; + WindowTitleExtendSpace = 0; + WindowTitleMinHeight = 0; + WindowTitleMaxHeight = 0x7fffffff; + MenuTitleExtendSpace = 0; + MenuTitleMinHeight = 0; + MenuTitleMaxHeight = 0x7fffffff; + MenuTextExtendSpace = 0; + MenuTitleFont = "Sans:bold:pixelsize=12"; + MenuTextFont = "Sans:pixelsize=12"; + IconTitleFont = "Sans:pixelsize=9"; + ClipTitleFont = "Sans:bold:pixelsize=10"; + ShowClipTitle = YES; + LargeDisplayFont = "Sans:pixelsize=24"; + HighlightColor = white; + HighlightTextColor = black; + ClipTitleColor = black; + CClipTitleColor = "rgb:61/61/61"; + FTitleColor = white; + PTitleColor = white; + UTitleColor = black; + FTitleBack = (solid, black); + PTitleBack = (solid, gray40); + UTitleBack = (solid, "rgb:aa/aa/aa"); + ResizebarBack = (solid, "rgb:aa/aa/aa"); + MenuTitleColor = white; + MenuTextColor = black; + MenuDisabledColor = gray50; + MenuTitleBack = (solid, black); + MenuTextBack = (solid, "rgb:aa/aa/aa"); + IconTitleColor = white; + IconTitleBack = black; + SwitchPanelImages = (swtile.png, swback.png, 30, 40); + ModifierKeyLabels = ("Shift+", "Control+", "Mod1+", "Mod2+", "Mod3+", "Mod4+", "Mod5+"); + FrameBorderWidth = 1; + FrameBorderColor = black; + FrameFocusedBorderColor = black; + FrameSelectedBorderColor = white; + WorkspaceMapBack = (solid, black); + RootMenuKey = F12; + WindowListKey = F11; + WindowMenuKey = "Control+Escape"; + DockRaiseLowerKey = None; + ClipRaiseLowerKey = None; + MiniaturizeKey = "Mod1+M"; + MinimizeAllKey = None; + HideKey = "Mod1+H"; + HideOthersKey = None; + MoveResizeKey = None; + CloseKey = None; + MaximizeKey = None; + VMaximizeKey = None; + HMaximizeKey = None; + LHMaximizeKey = None; + RHMaximizeKey = None; + THMaximizeKey = None; + BHMaximizeKey = None; + LTCMaximizeKey = None; + RTCMaximizeKey = None; + LBCMaximizeKey = None; + RBCMaximizeKey = None; + MaximusKey = None; + KeepOnTopKey = None; + KeepAtBottomKey = None; + OmnipresentKey = None; + RaiseKey = "Mod1+Up"; + LowerKey = "Mod1+Down"; + RaiseLowerKey = None; + ShadeKey = None; + SelectKey = None; + WorkspaceMapKey = None; + FocusNextKey = "Mod1+Tab"; + FocusPrevKey = "Mod1+Shift+Tab"; + GroupNextKey = None; + GroupPrevKey = None; + NextWorkspaceKey = "Mod1+Control+Right"; + PrevWorkspaceKey = "Mod1+Control+Left"; + LastWorkspaceKey = None; + NextWorkspaceLayerKey = None; + PrevWorkspaceLayerKey = None; + 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"; + MoveToWorkspace1Key = None; + MoveToWorkspace2Key = None; + MoveToWorkspace3Key = None; + MoveToWorkspace4Key = None; + MoveToWorkspace5Key = None; + MoveToWorkspace6Key = None; + MoveToWorkspace7Key = None; + MoveToWorkspace8Key = None; + MoveToWorkspace9Key = None; + MoveToWorkspace10Key = None; + MoveToNextWorkspaceKey = None; + MoveToPrevWorkspaceKey = None; + MoveToLastWorkspaceKey = None; + MoveToNextWorkspaceLayerKey = None; + MoveToPrevWorkspaceLayerKey = None; + WindowShortcut1Key = None; + WindowShortcut2Key = None; + WindowShortcut3Key = None; + WindowShortcut4Key = None; + WindowShortcut5Key = None; + WindowShortcut6Key = None; + WindowShortcut7Key = None; + WindowShortcut8Key = None; + WindowShortcut9Key = None; + WindowShortcut10Key = None; + WindowRelaunchKey = None; + ScreenSwitchKey = None; + RunKey = None; + NormalCursor = (builtin, left_ptr); + ArrowCursor = (builtin, top_left_arrow); + MoveCursor = (builtin, fleur); + ResizeCursor = (builtin, sizing); + TopLeftResizeCursor = (builtin, top_left_corner); + TopRightResizeCursor = (builtin, top_right_corner); + BottomLeftResizeCursor = (builtin, bottom_left_corner); + BottomRightResizeCursor = (builtin, bottom_right_corner); + VerticalResizeCursor = (builtin, sb_v_double_arrow); + HorizontalResizeCursor = (builtin, sb_h_double_arrow); + WaitCursor = (builtin, watch); + QuestionCursor = (builtin, question_arrow); + TextCursor = (builtin, xterm); + SelectCursor = (builtin, cross); + DialogHistoryLines = 500; + CycleActiveHeadOnly = NO; + CycleIgnoreMinimized = NO; +} diff --git a/src/defaults.c b/src/defaults.c index 19d230cbad3d..7aee170bc6ea 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -313,8 +313,10 @@ static WOptionEnumeration seDragMaximizedWindow[] = { }; /* - * ALL entries in the tables bellow, NEED to have a default value + * ALL entries in the tables below NEED to have a default value * defined, and this value needs to be correct. + * + * Also add the default key/value pair to WindowMaker/Defaults/WindowMaker.in */ /* these options will only affect the window manager on startup @@ -383,13 +385,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 +409,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 +447,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 +455,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 +481,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 +529,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\", \"rgb:51/55/61\")", NULL, NULL, getTexture, setIconTile, NULL, NULL}, {"TitleJustify", "center", seJustifications, &wPreferences.title_justification, getEnum, setJustify, NULL, NULL}, @@ -569,7 +571,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 +581,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 +618,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 +670,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 +682,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 +700,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 85d0cf51b06b..b66d011dfea7 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -136,7 +136,15 @@ /* 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\"," \ + "\""PIXMAPDIR"\"" \ + ")" #ifdef USER_MENU #define GLOBAL_USER_MENU_PATH PKGDATADIR"/UserMenus" @@ -146,7 +154,15 @@ /* icon path */ #define DEF_ICON_PATHS \ - "(\"~/pixmaps\",\"~/GNUstep/Library/Icons\",\"/usr/include/X11/pixmaps/\",\""PIXMAPDIR"\")" + "(" \ + "\"~/GNUstep/Library/Icons\"," \ + "\"~/GNUstep/Library/WindowMaker/Pixmaps\"," \ + "\"~/GNUstep/Library/WindowMaker/CachedPixmaps\"," \ + "\"~/pixmaps\"," \ + "\""PKGDATADIR"/Icons\"," \ + "\""PKGDATADIR"/Pixmaps\"," \ + "\""PIXMAPDIR"\"" \ + ")" /* window title to use for untitled windows */ #define DEF_WINDOW_TITLE "Untitled" @@ -155,13 +171,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 ----------------------------------------------------------------------- Summary of changes: WINGs/wview.c | 2 + WindowMaker/Defaults/Makefile.am | 3 +- WindowMaker/Defaults/WindowMaker.in | 390 ++++++++++++++++++---------- src/defaults.c | 86 +++--- src/wconfig.h.in | 33 ++- 5 files changed, 323 insertions(+), 191 deletions(-) rewrite WindowMaker/Defaults/WindowMaker.in (99%) repo.or.cz automatic notification. Contact project admin crma...@gmail.com if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive no reply. -- wmaker-crm.git ("The Window Maker window manager") -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.