From c083a49763deaf600880213a8253499e4adfbafc Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Mon, 28 Apr 2003 20:31:29 +0000
Subject: Compile greek input support into the binary, but disable it by
 default via the app-resource file. Point this out in the MESSAGE.

Hint from Geoff Wing in private mail.
---
 x11/rxvt/MESSAGE    |  8 ++++----
 x11/rxvt/Makefile   | 14 ++------------
 x11/rxvt/files/Rxvt | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'x11')

diff --git a/x11/rxvt/MESSAGE b/x11/rxvt/MESSAGE
index f4ff70ecc41..2746d6afe0a 100644
--- a/x11/rxvt/MESSAGE
+++ b/x11/rxvt/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/03/27 07:14:25 wiz Exp $
+$NetBSD: MESSAGE,v 1.5 2003/04/28 20:31:29 martin Exp $
 
-The multibyte character encoding support is compiled in, but
-by default disabled. To enable it, please edit the file 
-${PREFIX}/lib/X11/app-defaults/Rxvt.
+The multibyte character encoding support and greek input method are
+compiled in, but by default disabled. To enable this features, please
+edit the file  ${PREFIX}/lib/X11/app-defaults/Rxvt.
 ===========================================================================
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 5fee30d4fa5..82666ad06f7 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/04/18 23:07:17 martin Exp $
+# $NetBSD: Makefile,v 1.40 2003/04/28 20:31:29 martin Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -35,21 +35,11 @@ CONFIGURE_ARGS+=	--enable-utmp \
 			--enable-24bit \
 			--enable-keepscrolling \
 			--enable-mousewheel \
+			--enable-greek \
 			--enable-slipwheeling \
 			--enable-languages \
 			--with-encoding=noenc
 
-# Note: greek support could not be enabled, as the resource file handling
-# to disable it at runtime is documented but does not seem to work.
-# If you want to check if this works, try building with this config
-# option:
-#
-#			--enable-greek
-#
-# and then map greektoggle_key to "nothing" via app-resources.
-# Note: the "AltGR" (Mode shift) key *is* used on most keyboard types
-# outside the ASCII-only region for inputing normal characters!
-
 CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11
 CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
 
diff --git a/x11/rxvt/files/Rxvt b/x11/rxvt/files/Rxvt
index b7c52297f6b..cea93a8c477 100644
--- a/x11/rxvt/files/Rxvt
+++ b/x11/rxvt/files/Rxvt
@@ -1,4 +1,4 @@
-! $NetBSD: Rxvt,v 1.2 2003/03/27 07:14:26 wiz Exp $
+! $NetBSD: Rxvt,v 1.3 2003/04/28 20:31:29 martin Exp $
 !
 ! This is a default Rxvt app defaults file that just disables
 ! default multibyte character encodings.
@@ -13,3 +13,16 @@ Rxvt.multichar_encoding:	noenc
 ! Rxvt.multichar_encoding:	big5
 ! Rxvt.multichar_encoding:	gb
 ! Rxvt.multichar_encoding:	kr
+
+! To avoid interfering with keyboard layouts where Mode_switch is needed
+! for non-greek input, map the toggle key to some impossible to input
+! symbol by default:
+!
+Rxvt.greektoggle_key: Greek_OMEGAaccent
+!
+! If you'd like to enable greek input mode, comment the line above
+! and uncomment the one below, maybe replacing Mode_switch with some
+! other (normally unused) keyboard symbol.
+!
+! Rxvt.greektoggle_key: Mode_switch
+
-- 
cgit v1.2.3