Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src Pull up following revision(s) (requested by nia in ticket...



details:   https://anonhg.NetBSD.org/src/rev/7f72c2da9293
branches:  netbsd-9
changeset: 964142:7f72c2da9293
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 08 16:04:07 2020 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1099):

        external/mit/ctwm/libexec/Makefile: revision 1.1
        external/mit/ctwm/bin/ctwm/Makefile: revision 1.6
        external/mit/ctwm/bin/ctwm/Makefile: revision 1.7
        external/mit/ctwm/bin/ctwm/Makefile: revision 1.8
        external/mit/ctwm/libexec/ctwm_app_menu: revision 1.1
        distrib/sets/lists/xbase/mi: revision 1.157
        external/mit/ctwm/Makefile: revision 1.2
        external/mit/ctwm/Makefile: revision 1.3
        external/mit/ctwm/Makefile: revision 1.4
        external/mit/ctwm/Makefile: revision 1.5
        external/mit/ctwm/etc/system.ctwmrc: revision 1.1
        external/mit/ctwm/etc/Makefile: revision 1.1
        external/mit/ctwm/etc/Makefile: revision 1.2

add a script for dynamically generating a menu in the ctwm desktop
this parses the files in /usr/pkg/share/applications and provides a
submenu for launching applications.

TODO: make /usr/pkg configurable somehow?

move the new ctwmrc here so it doesn't conflict with the upstream one

revert; use system.ctwmrc from xsrc until I understand why the build fails

unbreak. bsd.files.mk needs to have an includes target, see also
share/wscons/fonts/Makefile

diffstat:

 distrib/sets/lists/xbase/mi             |    3 +-
 external/mit/ctwm/Makefile              |    4 +-
 external/mit/ctwm/bin/ctwm/Makefile     |    7 +-
 external/mit/ctwm/etc/Makefile          |   10 +
 external/mit/ctwm/etc/system.ctwmrc     |  383 ++++++++++++++++++++++++++++++++
 external/mit/ctwm/libexec/Makefile      |    9 +
 external/mit/ctwm/libexec/ctwm_app_menu |   53 ++++
 7 files changed, 461 insertions(+), 8 deletions(-)

diffs (truncated from 525 to 300 lines):

diff -r 758f3c132288 -r 7f72c2da9293 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Thu Oct 08 15:43:15 2020 +0000
+++ b/distrib/sets/lists/xbase/mi       Thu Oct 08 16:04:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152 2019/06/20 12:09:28 uki Exp $
+# $NetBSD: mi,v 1.152.2.1 2020/10/08 16:04:07 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1260,6 +1260,7 @@
 ./usr/X11R7/lib/xorg/protocol.txt                      -unknown-       xorg
 ./usr/X11R7/libexec                                    base-x11-root   xorg
 ./usr/X11R7/libexec/chooser                            -unknown-       xorg
+./usr/X11R7/libexec/ctwm_app_menu                      -unknown-       xorg
 ./usr/X11R7/man                                                base-x11-root   xorg
 ./usr/X11R7/man/cat1                                   base-x11-root   xorg
 ./usr/X11R7/man/cat1/appres.0                          -unknown-       .cat,xorg
diff -r 758f3c132288 -r 7f72c2da9293 external/mit/ctwm/Makefile
--- a/external/mit/ctwm/Makefile        Thu Oct 08 15:43:15 2020 +0000
+++ b/external/mit/ctwm/Makefile        Thu Oct 08 16:04:07 2020 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+#      $NetBSD: Makefile,v 1.1.18.1 2020/10/08 16:04:07 martin Exp $
 
 # Top level Makefile to cross build xorg inside the NetBSD tree.
 
 .include <bsd.own.mk>
 
-SUBDIR=                bin
+SUBDIR=                bin etc libexec
 
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=  cleandir
diff -r 758f3c132288 -r 7f72c2da9293 external/mit/ctwm/bin/ctwm/Makefile
--- a/external/mit/ctwm/bin/ctwm/Makefile       Thu Oct 08 15:43:15 2020 +0000
+++ b/external/mit/ctwm/bin/ctwm/Makefile       Thu Oct 08 16:04:07 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2018/03/18 11:40:41 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.5.4.1 2020/10/08 16:04:07 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -44,10 +44,7 @@
                        xedit.xpm xftp.xpm xgopher.xpm xgrab.xpm xhpcalc.xpm \
                        xirc.xpm xmail.xpm xman.xpm xmosaic.xpm xnomail.xpm \
                        xrn-compose.xpm xrn.goodnews.xpm xrn.nonews.xpm xrn.xpm \
-                       xterm.xpm system.ctwmrc
-
-FILESDIR_system.ctwmrc = ${CTWMCONFIGDIR}
-
+                       xterm.xpm
 
 LDADD+=        -lXpm  -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff -r 758f3c132288 -r 7f72c2da9293 external/mit/ctwm/etc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/ctwm/etc/Makefile    Thu Oct 08 16:04:07 2020 +0000
@@ -0,0 +1,10 @@
+#      $NetBSD: Makefile,v 1.2.2.2 2020/10/08 16:04:07 martin Exp $
+
+FILESDIR=      ${X11ETCDIR}/ctwm
+FILESMODE=     644
+FILES=         system.ctwmrc
+
+realall:       ${FILES}
+
+.include <bsd.prog.mk>
+.include <bsd.files.mk>
diff -r 758f3c132288 -r 7f72c2da9293 external/mit/ctwm/etc/system.ctwmrc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/ctwm/etc/system.ctwmrc       Thu Oct 08 16:04:07 2020 +0000
@@ -0,0 +1,383 @@
+#
+# $NetBSD: system.ctwmrc,v 1.1.2.2 2020/10/08 16:04:07 martin Exp $
+#
+# ctwmrc by nia
+#
+# An attempt to strike a usability balance that makes keys and buttons
+# do the thing users of various operating systems expect them to do.
+#
+# Most things should be possible to accomplish with only the keyboard.
+#
+# Also, mostly inoffensive colours (avoiding potentially inaccessible
+# combinations like red-green).
+#
+
+# don't use the default buttons or key bindings, we define our own
+NoDefaults
+
+ShowWorkSpaceManager
+ShowIconManager
+
+# 3D icon managers do not seemingly honor IconManagerHighlight,
+# which makes them slightly less useful
+#UseThreeDIconManagers
+#UseThreeDWMap
+UseThreeDBorders
+#UseThreeDMenus
+UseThreeDTitles
+
+ThreeDBorderWidth         3
+
+# TODO: we can use syscmd() in combination with xdpyinfo to detect
+# HiDPI screens and set appropiate fonts.
+#
+# need some good scaled bitmap fonts imported - terminus or spleen
+# would be good candidates
+MenuFont         "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+TitleFont        "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
+IconManagerFont  "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+IconFont         "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
+ResizeFont       "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*"
+WorkSpaceFont    "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+
+RestartPreviousState
+
+DecorateTransients
+
+# hide window contents while altering windows for performance
+NoOpaqueMove
+NoOpaqueResize
+
+SloppyFocus
+
+AutoOccupy
+AutoRelativeResize
+
+CenterFeedbackWindow
+
+NoGrabServer
+
+RaiseOnClick
+
+DontMoveOff
+MoveOffResistance        150
+
+ConstrainedMoveTime       0
+
+IgnoreLockModifier
+
+# Not actually that random.
+# Means that windows do not have to be placed by hand with a mouse,
+# which helps if you are using a keyboard only.
+RandomPlacement          "on"
+
+MoveDelta                 3
+ClearShadowContrast       50
+DarkShadowContrast        50
+MovePackResistance        100
+
+RaiseWhenAutoUnSqueeze
+ShortAllWindowsMenus
+
+#BeNiceToColorMap
+
+NoStackMode
+
+StayUpMenus
+WarpToDefaultMenuEntry
+MenuShadowDepth      1
+
+NoTitleFocus
+
+# warp through all windows in the current workspace
+WindowRing
+WarpRingOnScreen
+
+NoTitleHighlight
+
+TitleButtonShadowDepth    1
+TitleShadowDepth          1
+TitleButtonBorderWidth    0
+TitlePadding              0
+TitleJustification        "left"
+ButtonIndent              0
+FramePadding             0
+
+LeftTitleButton           ":xpm:dot"      = f.menu "titleops"
+RightTitleButton          ":xpm:resize"   = f.resize
+RightTitleButton          ":xpm:cross"    = f.delete
+
+BorderWidth               4
+BorderShadowDepth         2
+BorderResizeCursors
+
+MaxIconTitleWidth         120
+NoIconManagerFocus
+IconManagerShadowDepth    1
+IconManagerGeometry       "200x-1-1+0" 1
+IconifyByUnmapping
+
+ReallyMoveInWorkspaceManager
+MapWindowCurrentWorkSpace {  "black" "firebrick" }
+DontToggleWorkSpaceManagerState
+DontWarpCursorInWMap
+NoShowOccupyAll        
+ReverseCurrentWorkspace        
+StartInMapState
+WMgrHorizButtonIndent     0
+WMgrVertButtonIndent      0
+WorkSpaceManagerGeometry  "70x270-4-4" 1
+
+WorkSpaces 
+{
+    "1"    { "lavender" "black" "darkslateblue" "white" }
+    "2"    { "lavender" "black" "darkslateblue" "white" }
+    "3"    { "lavender" "black" "darkslateblue" "white" }
+    "4"    { "lavender" "black" "darkslateblue" "white" }
+    "5"    { "lavender" "black" "darkslateblue" "white" }
+}
+
+Color
+{
+  BorderColor           "steelblue"
+
+  BorderTileBackground  "lavender"
+  BorderTileForeground  "lavender"
+
+  DefaultBackground     "grey70"
+  DefaultForeground     "black"
+
+  TitleBackground       "lavender"
+  TitleForeground       "black" 
+
+  MenuBackground        "lavender"
+  MenuForeground        "black"
+  MenuTitleBackground   "darkorange"
+  MenuTitleForeground   "black"
+  MenuShadowColor      "gray15"
+
+  IconBackground        "black"
+  IconForeground        "white"
+  IconBorderColor       "gray45"
+
+  IconManagerBackground "lavender"
+  IconManagerForeground "black"
+  IconManagerHighlight  "firebrick"
+
+  MapWindowBackground   "lavender"
+  MapWindowForeground   "black"        
+}
+
+Monochrome
+{
+    BorderColor                "black"
+
+    BorderTileForeground       "black"
+    BorderTileBackground       "white"
+
+    TitleForeground            "black"
+    TitleBackground            "white"
+
+    MenuForeground             "black"
+    MenuBackground             "white"
+    MenuTitleForeground        "black"
+    MenuTitleBackground        "white"
+
+    MapWindowForeground        "white"
+    MapWindowBackground        "white"
+}
+
+menu "NetBSD"
+{
+    "NetBSD"                   f.title
+    ""                         f.separator
+    " Terminal"                        !"uxterm &"
+    " Calculator"              !"xcalc &"
+    " Clock"                   !"xclock -digital &"
+    " XEyes"                   !"xeyes &"
+    ""                         f.separator
+    " Applications"            f.menu "appmenu"
+    ""                         f.separator
+    " Restart CTWM"            f.twmrc
+    " Quit"                    f.quit
+}
+
+syscmd(/usr/X11R7/libexec/ctwm_app_menu)
+
+menu "titleops"
+{
+    "Window"       f.title
+    ""             f.separator
+    " Iconify"     f.iconify
+    " Resize"      f.resize
+    " Move"        f.move
+    ""             f.separator
+    " Occupy ..."  f.occupy
+    " Occupy All"  f.occupyall
+    ""             f.separator
+    " Raise"       f.raise
+    " Lower"       f.lower
+    ""             f.separator
+    " Zoom"        f.fullzoom
+    " Zoom-V"      f.zoom
+    " Zoom-H"      f.horizoom
+    ""             f.separator
+    " Kill"        f.destroy
+    " Close"       f.delete
+}
+



Home | Main Index | Thread Index | Old Index