Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src CTWM is an extension to twm, that support multiple virtual s...
details: https://anonhg.NetBSD.org/src/rev/c48351b5930d
branches: trunk
changeset: 810559:c48351b5930d
user: youri <youri%NetBSD.org@localhost>
date: Thu Sep 03 22:24:02 2015 +0000
description:
CTWM is an extension to twm, that support multiple virtual screens,
and a lot of other goodies.
You can use and manage up to 32 virtual screens called workspaces.
You swap from one workspace to another by clicking on a button in an
optional panel of buttons (the workspace manager) or by invoking a function.
You can custom each workspace by choosing different colors, names
and pixmaps for the buttons and background root windows.
Main features are:
- Optional 3D window titles and border (ala Motif).
- Shaped, colored icons.
- Multiple icons for clients based on the icon name.
- Windows can belong to several workspaces.
- A map of your workspaces to move quickly windows between
different workspaces.
- Animations: icons, root backgrounds and buttons can be animated.
- Pinnable and sticky menus.
- etc...
See http://web.zephyrite.net/NetBSD/wm/index.html
ok mrg.
diffstat:
distrib/sets/lists/base/mi | 3 +-
distrib/sets/lists/xbase/mi | 88 ++++++++++++++++++++++++++++++++++++-
distrib/sets/lists/xetc/mi | 3 +-
etc/mtree/NetBSD.dist.Xorg | 3 +-
etc/mtree/NetBSD.dist.base | 3 +-
external/mit/Makefile | 3 +-
external/mit/ctwm/Makefile | 35 ++++++++++++++
external/mit/ctwm/bin/Makefile | 5 ++
external/mit/ctwm/bin/ctwm/Makefile | 57 +++++++++++++++++++++++
9 files changed, 194 insertions(+), 6 deletions(-)
diffs (truncated from 324 to 300 lines):
diff -r 04bf92861ec3 -r c48351b5930d distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Thu Sep 03 20:43:47 2015 +0000
+++ b/distrib/sets/lists/base/mi Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1113 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: mi,v 1.1114 2015/09/03 22:24:02 youri Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -84,6 +84,7 @@
./etc/X11/rstart/commands base-x11-root
./etc/X11/rstart/commands/x11r6 base-x11-root
./etc/X11/rstart/contexts base-x11-root
+./etc/X11/ctwm base-x11-root
./etc/X11/twm base-x11-root
./etc/X11/xdm base-x11-root
./etc/X11/xinit base-x11-root
diff -r 04bf92861ec3 -r c48351b5930d distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Thu Sep 03 20:43:47 2015 +0000
+++ b/distrib/sets/lists/xbase/mi Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.127 2015/08/23 18:28:40 mrg Exp $
+# $NetBSD: mi,v 1.128 2015/09/03 22:24:02 youri Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1015,6 +1015,7 @@
./usr/X11R6/man/cat1/sxpm.0 -unknown- .cat,x11
./usr/X11R6/man/cat1/texteroids.0 -unknown- .cat,x11
./usr/X11R6/man/cat1/twm.0 -unknown- .cat,x11
+./usr/X11R6/man/cat1/ctwm.0 -unknown- .cat,x11
./usr/X11R6/man/cat1/ucs2any.0 -unknown- .cat,x11
./usr/X11R6/man/cat1/viewres.0 -unknown- .cat,x11
./usr/X11R6/man/cat1/x11perf.0 -unknown- .cat,x11
@@ -1407,6 +1408,7 @@
./usr/X11R7/bin/startx -unknown- xorg
./usr/X11R7/bin/sxpm -unknown- xorg
./usr/X11R7/bin/twm -unknown- xorg
+./usr/X11R7/bin/ctwm -unknown- xorg
./usr/X11R7/bin/ucs2any -unknown- xorg
./usr/X11R7/bin/uxterm -unknown- xorg
./usr/X11R7/bin/viewres -unknown- xorg
@@ -1516,6 +1518,88 @@
./usr/X11R7/include/X11/pixmaps/NetBSD.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm base-x11-root xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Expand15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Iconify15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Lightning15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Menu15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Resize15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3D_Zoom15.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dcircle.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3ddimple.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3ddot.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dfeet.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dleopard.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dpie.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dpyramid.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/3dslant.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/IslandD.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/IslandW.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/LRom.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/LRom1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/arthur.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/audio_editor.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background2.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background3.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background4.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background5.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background6.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background7.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background8.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/background9.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball10.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball11.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball12.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball2.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball3.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball4.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball5.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball6.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball7.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball8.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ball9.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/cdrom1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/claude.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/clipboard.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/datebook.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/emacs.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/ghostview.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/hpterm.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/mail0.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/mail1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/nothing.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/nt1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/nt2.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/pixmap.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/postit.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/spider.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/term.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/unknown.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/unknown1.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/unread.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/welcome.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xarchie.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xcalc.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xcalc2.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xedit.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xftp.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xgopher.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xgrab.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xhpcalc.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xirc.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xmail.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xman.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xmosaic.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xnomail.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xrn-compose.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xrn.goodnews.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xrn.nonews.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xrn.xpm -unknown- xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/xterm.xpm -unknown- xorg
./usr/X11R7/include/drm base-x11-root obsolete
./usr/X11R7/include/fontconfig base-x11-root xorg
./usr/X11R7/include/freetype2 base-x11-root xorg
@@ -2687,6 +2771,7 @@
./usr/X11R7/man/html1/startx.html -unknown- html,xorg
./usr/X11R7/man/html1/sxpm.html -unknown- html,xorg
./usr/X11R7/man/html1/twm.html -unknown- html,xorg
+./usr/X11R7/man/html1/ctwm.html -unknown- html,xorg
./usr/X11R7/man/html1/ucs2any.html -unknown- html,xorg
./usr/X11R7/man/html1/viewres.html -unknown- html,xorg
./usr/X11R7/man/html1/x11perf.html -unknown- html,xorg
@@ -2828,6 +2913,7 @@
./usr/X11R7/man/man1/startx.1 -unknown- .man,xorg
./usr/X11R7/man/man1/sxpm.1 -unknown- .man,xorg
./usr/X11R7/man/man1/twm.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/ctwm.1 -unknown- .man,xorg
./usr/X11R7/man/man1/ucs2any.1 -unknown- .man,xorg
./usr/X11R7/man/man1/viewres.1 -unknown- .man,xorg
./usr/X11R7/man/man1/x11perf.1 -unknown- .man,xorg
diff -r 04bf92861ec3 -r c48351b5930d distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Thu Sep 03 20:43:47 2015 +0000
+++ b/distrib/sets/lists/xetc/mi Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.25 2015/08/23 18:28:41 mrg Exp $
+# $NetBSD: mi,v 1.26 2015/09/03 22:24:02 youri Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -23,6 +23,7 @@
./etc/X11/rstart/contexts/x -unknown- x11
./etc/X11/rstart/contexts/x11 -unknown- x11
./etc/X11/rstart/contexts/x11r6 -unknown- x11
+./etc/X11/ctwm/system.ctwmrc -unknown- xorg
./etc/X11/twm/system.twmrc -unknown- x11
./etc/X11/twm/system.twmrc -unknown- xorg
./etc/X11/xdm/GiveConsole -unknown- x11
diff -r 04bf92861ec3 -r c48351b5930d etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Thu Sep 03 20:43:47 2015 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.14 2014/03/20 09:05:28 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.15 2015/09/03 22:24:02 youri Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -19,6 +19,7 @@
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
+./usr/X11R7/include/X11/pixmaps/ctwm
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2
diff -r 04bf92861ec3 -r c48351b5930d etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Thu Sep 03 20:43:47 2015 +0000
+++ b/etc/mtree/NetBSD.dist.base Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.148 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: NetBSD.dist.base,v 1.149 2015/09/03 22:24:02 youri Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -23,6 +23,7 @@
./etc/X11/rstart/commands/x11r6
./etc/X11/rstart/contexts
./etc/X11/twm
+./etc/X11/ctwm
./etc/X11/xdm
./etc/X11/xinit
./etc/X11/xserver
diff -r 04bf92861ec3 -r c48351b5930d external/mit/Makefile
--- a/external/mit/Makefile Thu Sep 03 20:43:47 2015 +0000
+++ b/external/mit/Makefile Thu Sep 03 22:24:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/09/03 22:24:02 youri Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@
.if ${MKX11} != "no"
SUBDIR+= xorg
+SUBDIR+= .WAIT ctwm
.endif
.include <bsd.subdir.mk>
diff -r 04bf92861ec3 -r c48351b5930d external/mit/ctwm/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/ctwm/Makefile Thu Sep 03 22:24:02 2015 +0000
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+
+# Top level Makefile to cross build xorg inside the NetBSD tree.
+
+.include <bsd.own.mk>
+
+SUBDIR= bin
+
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
+BUILDTARGETS+= cleandir
+.endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+= obj
+.endif
+BUILDTARGETS+= do-build
+
+.ORDER: ${BUILDTARGETS}
+
+do-build:
+.for targ in dependall install
+ ${MAKEDIRTARGET} . ${targ}
+.endfor
+
+.for dir in tools lib
+do-${dir:S/\//-/g}:
+. for targ in dependall install
+ ${MAKEDIRTARGET} ${dir} ${targ}
+. endfor
+.endfor
+
+
+DISTRIBTARGETS= \
+ bin/ctwm
+
+.include <bsd.subdir.mk>
diff -r 04bf92861ec3 -r c48351b5930d external/mit/ctwm/bin/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/ctwm/bin/Makefile Thu Sep 03 22:24:02 2015 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+
+SUBDIR= ctwm
+
+.include <bsd.subdir.mk>
diff -r 04bf92861ec3 -r c48351b5930d external/mit/ctwm/bin/ctwm/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/ctwm/bin/ctwm/Makefile Thu Sep 03 22:24:02 2015 +0000
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+
+.include <bsd.own.mk>
+
+PROG= ctwm
+SRCS= add_window.c deftwmrc.c events.c gram.tab.c gc.c \
+ list.c util.c ctwm.c lex.c parse.c menus.c resize.c \
+ version.c iconmgr.c cursor.c icons.c workmgr.c windowbox.c \
+ clicktofocus.c vscreen.c session.c mwmhints.c gnome.c
+
+YHEADER=1
+
+CTWMCONFIGDIR= ${X11ETCDIR}/ctwm
+
+CTWMDIR= ${X11SRCDIR}/external/mit/ctwm/dist
+XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
+
+CPPFLAGS+= -I. -I${CTWMDIR}/src \
+ -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM \
+
+CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
+ -DM4CMD=\"m4\" \
+ -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+
+FILESDIR= ${XPMDIR}
+
+FILES= 3D_Expand15.xpm 3D_Iconify15.xpm 3D_Lightning15.xpm \
+ 3D_Menu15.xpm 3D_Resize15.xpm 3D_Zoom15.xpm 3dcircle.xpm \
+ 3ddimple.xpm 3ddot.xpm 3dfeet.xpm 3dleopard.xpm 3dpie.xpm \
+ 3dpyramid.xpm 3dslant.xpm IslandD.xpm IslandW.xpm LRom.xpm\
+ LRom1.xpm arthur.xpm audio_editor.xpm background1.xpm \
+ background2.xpm background3.xpm background4.xpm \
+ background5.xpm background6.xpm background7.xpm \
Home |
Main Index |
Thread Index |
Old Index