From da9363f02af4415a382ce4ae85e23ef07d1a6818 Mon Sep 17 00:00:00 2001 From: saint Date: Sun, 21 Sep 2025 20:45:56 -0300 Subject: [PATCH 1/2] Fixed by going around the font problem --- mlvwm/functions.h | 2 +- mlvwm/mlvwm.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mlvwm/functions.h b/mlvwm/functions.h index e57848b..b8d0e2f 100644 --- a/mlvwm/functions.h +++ b/mlvwm/functions.h @@ -11,7 +11,7 @@ typedef struct builtin_func { char *label; - void (*action)(); + void (*action)(char *); } builtin_func; extern void ShadeWindow( MlvwmWindow * ); diff --git a/mlvwm/mlvwm.h b/mlvwm/mlvwm.h index 8aeb1bd..e271cfb 100644 --- a/mlvwm/mlvwm.h +++ b/mlvwm/mlvwm.h @@ -178,9 +178,8 @@ extern Atom _XA_WM_DESKTOP; extern void Done( int, char * ); #ifdef USE_LOCALE -#define DEFAULTFS "-adobe-*-*-r-*-*-12-*-*-*-p-*-*-*,\ --*-*-*-r-*-*-12-*-*-*-*-*-*-*" +#define DEFAULTFS "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1" #else -#define DEFAULTFONT "-adobe-*-*-r-*-*-12-*-*-*-p-*-*-*" +#define DEFAULTFONT "-misc-chicago kare-*-*-r-*-*-12-*-*-*-p-*-*-*" #endif #endif From afec56cf1fdfc91cb2212f0f6261cd6cfbfbc497 Mon Sep 17 00:00:00 2001 From: saint Date: Fri, 21 Nov 2025 08:15:53 -0300 Subject: [PATCH 2/2] Font problem more localized so it compiles. Issue 40 --- .gitignore | 1 + PKGBUILD | 38 ++++++++++++++++++++++++++++++++++++++ mlvwm/config.c | 2 +- mlvwm/mlvwm.h | 7 +++++-- 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 PKGBUILD diff --git a/.gitignore b/.gitignore index 311ffa8..77d2ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ mlvwm/mlvwm **/*.o mlvwm.* **/*.swp +.session.vim diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..acaab26 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,38 @@ +pkgname=mlvwm +pkgver=master +pkgrel=1 +pkgdesc='Unoffical package for Macintosh-Like Virtual Window Manager, it attempts to emulate the pre-Mac OS X Macintosh look and feel in its layout and window design.' +arch=('i686' 'x86_64') +url="http://www2u.biglobe.ne.jp/~y-miyata/mlvwm.html" +license=('mit') +depends=('libxpm') +makedepends=('imake') +source=(https://github.com/saintofvice/${pkgname}/archive/${pkgver}.zip) + +build() { + cd ${pkgname} + # https://github.com/morgant/mlvwm/issues/40 +# sed -i -e 's/void (\*action)()/void (\*action)(char \*)/g' mlvwm/functions.h +# sed -i -e '182d' mlvwm/mlvwm.h +# sed -i -e 's|#define DEFAULTFS.*|#define DEFAULTFS "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1"|' mlvwm/mlvwm.h +# sed -i -e 's|#define DEFAULTFONT.*|#define DEFAULTFONT "-misc-chicago kare-*-*-r-*-*-12-*-*-*-p-*-*-*"|' mlvwm/mlvwm.h + cd man && xmkmf && cd - + cd sample_rc && xmkmf && cd - + cd mlvwm && xmkmf && cd - + xmkmf + make + #make PREFIX="$pkgdir"/usr BINARY=$pkgname install man +} +package () { + cd ${pkgname} + sed -n '1,34 p'< mlvwm/mlvwm.c >license + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname/ + mkdir -p "$pkgdir"/usr/share/man/man1/ + mkdir -p "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/share/$pkgname + cp -R sample_rc/Mlvwmrc* "$pkgdir"/usr/share/$pkgname + install -m755 mlvwm/mlvwm "$pkgdir"/usr/bin/$pkgname + install -c -m444 man/mlvwm._man "$pkgdir"/usr/share/man/man1/mlvwm.1x + install -m644 license "$pkgdir"/usr/share/licenses/$pkgname/ +} + diff --git a/mlvwm/config.c b/mlvwm/config.c index ca120fb..c1926b5 100644 --- a/mlvwm/config.c +++ b/mlvwm/config.c @@ -31,7 +31,7 @@ struct configure key_modifiers[]= {0,0} }; -#define FALLBACK_FONT "-*-*-*-r-*-*-*-*-*-*-*-*-*-*" +#define FALLBACK_FONT "-*-*-*-*-*-*-12-120-*-*-*-*-iso8859-*" char *NoTitleStyle( styles *tmp_style, char *str ) { diff --git a/mlvwm/mlvwm.h b/mlvwm/mlvwm.h index e271cfb..f8b2e55 100644 --- a/mlvwm/mlvwm.h +++ b/mlvwm/mlvwm.h @@ -178,8 +178,11 @@ extern Atom _XA_WM_DESKTOP; extern void Done( int, char * ); #ifdef USE_LOCALE -#define DEFAULTFS "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1" +#define DEFAULTFS "-*-*-*-*-*-*-13-120-*-*-*-*-iso8859-*,\ +-*-*-*-*-*-*-12-120-*-*-*-*-iso8859-*,\ +-*-*-*-*-*-*-13-120-*-*-*-*-koi8-*,\ +-*-*-*-*-*-*-12-120-*-*-*-*-koi8-*" #else -#define DEFAULTFONT "-misc-chicago kare-*-*-r-*-*-12-*-*-*-p-*-*-*" +#define DEFAULTFONT "-*-*-*-*-*-*-12-120-*-*-*-*-iso8859-*" #endif #endif