pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/mlvwm mlvwm: update to 0.9.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/45c3827447b4
branches: trunk
changeset: 451969:45c3827447b4
user: nia <nia%pkgsrc.org@localhost>
date: Tue May 04 14:09:52 2021 +0000
description:
mlvwm: update to 0.9.3
0.9.2 -> 0.9.3
Fix RestartSystem()/Done() to correctly restart into other window managers
Add RoundedScreenCorners configuration
Changed default font size to 12px
Changed default scroll bar width/height to 16px
Changed default menu bar height to 20px
More accurate sizing & styling of window title bars & controls, scroll bars, and resize handle
0.9.1 -> 0.9.2
Change sprintf() & strcat() to snprintf()
diffstat:
wm/mlvwm/DESCR | 24 +++++++++++-
wm/mlvwm/MESSAGE | 12 +----
wm/mlvwm/Makefile | 10 ++--
wm/mlvwm/distinfo | 14 +++---
wm/mlvwm/patches/patch-aa | 56 -----------------------------
wm/mlvwm/patches/patch-ab | 31 ----------------
wm/mlvwm/patches/patch-mlvwm_menus.c | 34 +++++++++++++++++
wm/mlvwm/patches/patch-sample__rc_Mlvwmrc | 59 +++++++++++++++++++++++++++++++
8 files changed, 130 insertions(+), 110 deletions(-)
diffs (288 lines):
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/DESCR
--- a/wm/mlvwm/DESCR Tue May 04 14:08:59 2021 +0000
+++ b/wm/mlvwm/DESCR Tue May 04 14:09:52 2021 +0000
@@ -1,2 +1,22 @@
-MLVWM (Macintosh Like Virtual Window Manager) is a Window manager for
-X11 designed to look and feel like the Macintosh 8 environment.
+MLVWM (Macintosh-Like Virtual Window Manager) is an X11 window manager with
+a classic MacOS appearance. Its primary features include:
+
+* Emulation of MacOS 7 & 8 menu bar & window decorations
+* Optional multiple virtual desktops
+* A main menu bar across the top of the screen, with:
+ * Configurable global and per-application menus
+ * Menu items trigger application functionality via keyboard shorcuts or
+ commands
+ * An icon menu which shows all windows and supports:
+ * Switching desktops
+ * Selecting, hiding, and showing windows
+ * A balloon help menu
+ * The ability to "swallow" small windows into the menu bar
+* Windows which support:
+ * Title bars with optional close, zoom, and shade buttons
+ * Resize handle
+ * Optional double-click to toggle window shade
+ * Drag as solid window or just outline
+* Balloon help which shows X window information
+* Global keyboard shortcuts
+* Numerous configuration options to tune functionality
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/MESSAGE
--- a/wm/mlvwm/MESSAGE Tue May 04 14:08:59 2021 +0000
+++ b/wm/mlvwm/MESSAGE Tue May 04 14:09:52 2021 +0000
@@ -1,14 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/09/04 06:57:08 xtraeme Exp $
-
-Before using mlvwm, you'll have to specify the configuration file:
+$NetBSD: MESSAGE,v 1.2 2021/05/04 14:09:52 nia Exp $
- $ mlvwm -f ${PREFIX}/share/examples/Mlvwmrc
-
- or
+Before using mlvwm, you'll have to copy the configuration file into place:
- $ cp ${PREFIX}/share/examples/Mlvwmrc ~/.mlvwmrc
-
-Enjoy.
+ $ cp ${PREFIX}/share/examples/mlvwm/Mlvwmrc ~/.mlvwmrc
===========================================================================
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/Makefile
--- a/wm/mlvwm/Makefile Tue May 04 14:08:59 2021 +0000
+++ b/wm/mlvwm/Makefile Tue May 04 14:09:52 2021 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:19 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2021/05/04 14:09:52 nia Exp $
#
-DISTNAME= mlvwm091
-PKGNAME= mlvwm-0.9.1
-PKGREVISION= 1
+DISTNAME= mlvwm-0.9.3
CATEGORIES= wm
-MASTER_SITES= http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=morgant/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www2u.biglobe.ne.jp/~y-miyata/mlvwm.html
COMMENT= Macintosh Like Virtual Window Manager
+LICENSE= mit
USE_IMAKE= yes
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/distinfo
--- a/wm/mlvwm/distinfo Tue May 04 14:08:59 2021 +0000
+++ b/wm/mlvwm/distinfo Tue May 04 14:09:52 2021 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/02 23:42:53 agc Exp $
+$NetBSD: distinfo,v 1.4 2021/05/04 14:09:52 nia Exp $
-SHA1 (mlvwm091.tar.gz) = 2dc7f1ea45297e42186bde67cc910c7e186f46dc
-RMD160 (mlvwm091.tar.gz) = f06fe9d0b29b9a4ce7ff57c8b7a95b848ecea508
-SHA512 (mlvwm091.tar.gz) = c768dc976226f46fad2e0a36c6125e257a162601127322cf5f87d1bc879d65f4c75f9b28ac9e0b70b653ba70c5049e384f6ca5698e52f5910c873a5608800d75
-Size (mlvwm091.tar.gz) = 88575 bytes
-SHA1 (patch-aa) = 51ee6f9eef7802bdbf18c15858b16cabf1cfac84
-SHA1 (patch-ab) = 2bb29f736493d7e9dd0b828a7edf459502f7883c
+SHA1 (mlvwm-0.9.3.tar.gz) = 363c5a64179a7a9b7e7a273237d61dfc68605b0b
+RMD160 (mlvwm-0.9.3.tar.gz) = e4b7b5461172497e41256d33163a3bf98b02d5ab
+SHA512 (mlvwm-0.9.3.tar.gz) = 3898ae2a073cd31d6f83e3a138b6c9d0468fcc94f3aba1f60a83549e1b5120f833e832be81ceeecd37363d694f838828e024fbc4fb349f4039d5440fe78cce77
+Size (mlvwm-0.9.3.tar.gz) = 92454 bytes
+SHA1 (patch-mlvwm_menus.c) = 0f64cbc336ede3ba489fe8159278d91864b27561
+SHA1 (patch-sample__rc_Mlvwmrc) = de79e74cbf2411e5905586c44ac03145982ddab0
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/patches/patch-aa
--- a/wm/mlvwm/patches/patch-aa Tue May 04 14:08:59 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/09/04 06:57:08 xtraeme Exp $
-
---- sample_rc/Mlvwmrc.orig 1999-01-23 13:37:52.000000000 +0100
-+++ sample_rc/Mlvwmrc 2005-09-04 08:52:13.000000000 +0200
-@@ -52,7 +52,7 @@
- Compatible
-
- # Set icon search path. It needs before "Style".
--IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
-+IconPath @PREFIX@/share/mlvwm
- IconMenuIcon label2.xpm
-
- # Balloon help Settings
-@@ -80,9 +80,9 @@
- Menu Apple, Icon label1.xpm, Stick
- "About this Workstation..." NonSelect, Gray, Action About
- "" NonSelect
--"Terminal" Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
--"Editor" Action Exec "mule" exec mule, Icon mini-edit.xpm
--"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-+"Terminal" Action Exec "kterm" exec kterm -ls
-+"Editor" Action Exec "mule" exec mule
-+"calculator" Action Exec "xcal" exec xcalc
- END
-
- Menu def-File, Label "File", Left
-@@ -190,15 +190,15 @@
-
- # Define the default window decoration
- Style
--"*" MiniIcon mini-cross.xpm, MaxmizeScale 90, MenuBar default
-+"*" MaxmizeScale 90, MenuBar default
- END
-
- Style
--"Emacs" MiniIcon mini-edit.xpm
--"xv" MiniIcon mini-xv.xpm, EnableScroll
--"XCalc" MiniIcon mini-calc.xpm
--"Xarchie" MiniIcon mini.xarchie.xpm
--"Xmag" MiniIcon mini.xmag.xpm
-+"Emacs"
-+"xv" EnableScroll
-+"XCalc"
-+"Xarchie"
-+"Xmag"
- "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
- "XMeter" NoWinList, Sticky, SkipSelect
- "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
-@@ -208,5 +208,5 @@
- END
-
- # Read other configuration
--Read Mlvwmrc-Xterm
--Read Mlvwmrc-Netscape
-+#Read Mlvwmrc-Xterm
-+#Read Mlvwmrc-Netscape
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/patches/patch-ab
--- a/wm/mlvwm/patches/patch-ab Tue May 04 14:08:59 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/02/23 03:03:10 obache Exp $
-
---- mlvwm/menus.c.orig 2000-06-25 13:26:52.000000000 +0000
-+++ mlvwm/menus.c
-@@ -505,7 +505,7 @@ Bool ChoiseMenu( MenuLabel *m, Window *e
- XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | ButtonPressMask|
- EnterWindowMask | PointerMotionMask | ButtonMotionMask,
- &Event );
--// XNextEvent( dpy, &Event );
-+/* XNextEvent( dpy, &Event ); */
- switch( Event.type ){
- case Expose:
- if( XFindContext( dpy, Event.xany.window, MenuContext,
-@@ -628,7 +628,7 @@ void press_menu( MenuLabel *m )
- XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | ButtonPressMask|
- EnterWindowMask | PointerMotionMask | ButtonMotionMask,
- &Event );
--// XNextEvent( dpy, &Event );
-+/* XNextEvent( dpy, &Event ); */
- switch( Event.type ){
- case Expose:
- if( mapped && Event.xany.window==mapped->PullWin &&
-@@ -789,7 +789,7 @@ void CreateMenuLabel( MenuLabel *ml )
- if( ml->flags&SWALLOW ){
- if( SwallowMenu( ml ) ){
- XSetWindowBorderWidth( dpy, ml->LabelWin, 0 );
--// XResizeWindow( dpy, ml->LabelWin, ml->LabelWidth, MENUB_H-2 );
-+/* XResizeWindow( dpy, ml->LabelWin, ml->LabelWidth, MENUB_H-2 ); */
- XReparentWindow( dpy, ml->LabelWin, Scr.MenuBar, 0, 0 );
- ml->LabelWidth += 6;
- }
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/patches/patch-mlvwm_menus.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/mlvwm/patches/patch-mlvwm_menus.c Tue May 04 14:09:52 2021 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-mlvwm_menus.c,v 1.1 2021/05/04 14:09:52 nia Exp $
+
+Replace C++ style comments with C style comments for compatibility
+with C89.
+
+--- mlvwm/menus.c.orig 2021-03-23 20:39:27.000000000 +0000
++++ mlvwm/menus.c
+@@ -508,7 +508,7 @@ Bool ChoiseMenu( MenuLabel *m, Window *e
+ XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | ButtonPressMask|
+ EnterWindowMask | PointerMotionMask | ButtonMotionMask,
+ &Event );
+-// XNextEvent( dpy, &Event );
++/* XNextEvent( dpy, &Event ); */
+ switch( Event.type ){
+ case Expose:
+ if( XFindContext( dpy, Event.xany.window, MenuContext,
+@@ -631,7 +631,7 @@ void press_menu( MenuLabel *m )
+ XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | ButtonPressMask|
+ EnterWindowMask | PointerMotionMask | ButtonMotionMask,
+ &Event );
+-// XNextEvent( dpy, &Event );
++/* XNextEvent( dpy, &Event ); */
+ switch( Event.type ){
+ case Expose:
+ if( mapped && Event.xany.window==mapped->PullWin &&
+@@ -792,7 +792,7 @@ void CreateMenuLabel( MenuLabel *ml )
+ if( ml->flags&SWALLOW ){
+ if( SwallowMenu( ml ) ){
+ XSetWindowBorderWidth( dpy, ml->LabelWin, 0 );
+-// XResizeWindow( dpy, ml->LabelWin, ml->LabelWidth, MENUB_H-2 );
++/* XResizeWindow( dpy, ml->LabelWin, ml->LabelWidth, MENUB_H-2 ); */
+ XReparentWindow( dpy, ml->LabelWin, Scr.MenuBar, 0, 0 );
+ ml->LabelWidth += 6;
+ }
diff -r c96a774e1491 -r 45c3827447b4 wm/mlvwm/patches/patch-sample__rc_Mlvwmrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/mlvwm/patches/patch-sample__rc_Mlvwmrc Tue May 04 14:09:52 2021 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-sample__rc_Mlvwmrc,v 1.1 2021/05/04 14:09:52 nia Exp $
+
+- Use pkgsrc icon search path.
+- Make this more friendly to NetBSD base X11.
+
+--- sample_rc/Mlvwmrc.orig 2019-08-01 17:02:29.000000000 +0000
++++ sample_rc/Mlvwmrc
+@@ -52,7 +52,7 @@ EdgeResistance 50 50
+ Compatible
+
+ # Set icon search path. It needs before "Style".
+-IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
++IconPath @PREFIX@/share/mlvwm
+ IconMenuIcon label2.xpm
+
+ # Balloon help Settings
+@@ -80,9 +80,9 @@ END
+ Menu Apple, Icon label1.xpm, Stick
+ "About this Workstation..." NonSelect, Gray, Action About
+ "" NonSelect
+-"Terminal" Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
+-"Editor" Action Exec "mule" exec mule, Icon mini-edit.xpm
+-"calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
++"Terminal" Action Exec "kterm" exec xterm
++"Editor" Action Exec "mule" exec xedit
++"calculator" Action Exec "xcal" exec xcalc
+ END
+
+ Menu def-File, Label "File", Left
+@@ -190,15 +190,15 @@ END
+
+ # Define the default window decoration
+ Style
+-"*" MiniIcon mini-cross.xpm, MaxmizeScale 90, MenuBar default
++"*" MaxmizeScale 90, MenuBar default
+ END
+
+ Style
+-"Emacs" MiniIcon mini-edit.xpm
+-"xv" MiniIcon mini-xv.xpm, EnableScroll
+-"XCalc" MiniIcon mini-calc.xpm
+-"Xarchie" MiniIcon mini.xarchie.xpm
+-"Xmag" MiniIcon mini.xmag.xpm
++"Emacs"
++"xv" EnableScroll
++"XCalc"
++"Xarchie"
++"Xmag"
+ "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
+ "XMeter" NoWinList, Sticky, SkipSelect
+ "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
+@@ -208,5 +208,5 @@ Style
+ END
+
+ # Read other configuration
+-Read Mlvwmrc-Xterm
+-Read Mlvwmrc-Netscape
++#Read Mlvwmrc-Xterm
++#Read Mlvwmrc-Netscape
Home |
Main Index |
Thread Index |
Old Index