[packages/XFree86.git] / XFree86-xdm-fixes.patch

diff -urN xc/programs/xdm~/Imakefile xc/programs/xdm/Imakefile
--- xc/programs/xdm~/Imakefile	Sat Jun 17 13:48:22 2000
+++ xc/programs/xdm/Imakefile	Thu Sep  7 18:17:08 2000
@@ -224,9 +224,9 @@
 		  '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
 		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
-		  '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
-		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
-		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
+		  '-DDEF_CHOOSER="$(BIN)/chooser"' \
+		  '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
+		  '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
 #endif
 
 ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
@@ -246,7 +246,7 @@
 #if BuildChooser
 SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
 NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
-InstallProgram(chooser,$(XDMDIR))
+InstallProgram(chooser,$(BINDIR))
 InstallAppDefaults(Chooser)
 #endif
 #if BuildBoth
diff -urN xc/programs/xdm~/config/Imakefile xc/programs/xdm/config/Imakefile
--- xc/programs/xdm~/config/Imakefile	Mon Jan 31 14:33:43 2000
+++ xc/programs/xdm/config/Imakefile	Thu Sep  7 18:17:08 2000
@@ -25,7 +25,11 @@
 #endif
 
 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
+#ifdef LinuxArchitecture
+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
+#else
+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
+#endif /* LinuxArchitecture */
 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
 
 LinkFile(Xservers,Xservers.$(SERVERSTYPE))
diff -urN xc/programs/xdm~/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
--- xc/programs/xdm~/config/Xres.cpp	Sat Mar 13 22:22:24 1999
+++ xc/programs/xdm/config/Xres.cpp	Thu Sep  7 18:23:11 2000
@@ -5,6 +5,13 @@
 xlogin*login.translations: #override BS
 	Ctrl<Key>R: abort-display()NLBS
 	<Key>F1: set-session-argument(failsafe) finish-field()NLBS
+	<Key>Delete: delete-character()NLBS
+	<Key>Left: move-backward-character()NLBS
+	<Key>Right: move-forward-character()NLBS
+	<Key>Home: move-to-begining()NLBS
+	<Key>End: move-to-end()NLBS
+	Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
+	<Key>KP_Enter: set-session-argument() finish-field()NLBS
 	Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
 	<Key>Return: set-session-argument() finish-field()
 #ifndef XPM
@@ -29,9 +36,7 @@
 /**/#endif
 #endif /* XPM */
 /**/#ifdef COLOR
-#ifndef XPM
-xlogin*greetColor: CadetBlue
-#else
+#ifdef XPM
 xlogin*borderWidth: 1
 xlogin*frameWidth: 5
 xlogin*innerFramesWidth: 2
@@ -40,6 +45,8 @@
 xlogin*background: grey
 !xlogin*foreground: darkgreen
 xlogin*greetColor: Blue3
+#else
+xlogin*greetColor: CadetBlue
 #endif /* XPM */
 xlogin*failColor: red
 *Foreground: black
@@ -76,6 +83,6 @@
 Chooser*allowShellResize:	false
 Chooser*viewport.forceBars:	true
 Chooser*label.font:		*-new century schoolbook-bold-i-normal-*-240-*
-Chooser*label.label:		XDMCP Host Menu  from CLIENTHOST
+Chooser*label.label:		XDMCP Host Menu from CLIENTHOST
 Chooser*list.font:		-*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
 Chooser*Command.font:		*-new century schoolbook-bold-r-normal-*-180-*
diff -urN xc/programs/xdm~/greeter/Imakefile xc/programs/xdm/greeter/Imakefile
--- xc/programs/xdm~/greeter/Imakefile	Wed Jun 14 14:43:32 2000
+++ xc/programs/xdm/greeter/Imakefile	Thu Sep  7 18:17:08 2000
@@ -76,8 +76,6 @@
 INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE)
  DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \
 	   $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES)
-
-SHLIBDIR = $(XDMDIR)
 
 SRCS = greet.c verify.c Login.c
 OBJS = greet.o verify.o Login.o
--- xc/programs/xdm/config/Imakefile~	Thu Nov  9 23:37:34 2000
+++ xc/programs/xdm/config/Imakefile	Thu Nov  9 23:38:18 2000
@@ -5,9 +5,7 @@
 
 all:: Xservers.ws xdm-config Xservers Xresources
 
-#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
-DEFAULTVT=vt05
-#endif
+DEFAULTVT=vt9
 
 #ifndef XdmPixmap
 # define XdmPixmap XFree86.xpm
Commit	Line	Data
772dc80c JR	1	diff -urN xc/programs/xdm~/Imakefile xc/programs/xdm/Imakefile
	2	--- xc/programs/xdm~/Imakefile Sat Jun 17 13:48:22 2000
	3	+++ xc/programs/xdm/Imakefile Thu Sep 7 18:17:08 2000
	4	@@ -224,9 +224,9 @@
	5	'-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
	6	'-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
	7	'-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
	8	- '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
	9	- '-DDEF_AUTH_DIR="$(XDMDIR)"' \
	10	- '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
	11	+ '-DDEF_CHOOSER="$(BIN)/chooser"' \
	12	+ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
	13	+ '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
	14	#endif
	15
	16	ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
	17	@@ -246,7 +246,7 @@
	18	#if BuildChooser
	19	SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
	20	NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
	21	-InstallProgram(chooser,$(XDMDIR))
	22	+InstallProgram(chooser,$(BINDIR))
	23	InstallAppDefaults(Chooser)
	24	#endif
	25	#if BuildBoth
	26	diff -urN xc/programs/xdm~/config/Imakefile xc/programs/xdm/config/Imakefile
	27	--- xc/programs/xdm~/config/Imakefile Mon Jan 31 14:33:43 2000
	28	+++ xc/programs/xdm/config/Imakefile Thu Sep 7 18:17:08 2000
	29	@@ -25,7 +25,11 @@
	30	#endif
	31
	32	CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
	33	-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
	34	+#ifdef LinuxArchitecture
	35	+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
	36	+#else
	37	+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
	38	+#endif /* LinuxArchitecture */
	39	CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
	40
	41	LinkFile(Xservers,Xservers.$(SERVERSTYPE))
	42	diff -urN xc/programs/xdm~/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
	43	--- xc/programs/xdm~/config/Xres.cpp Sat Mar 13 22:22:24 1999
	44	+++ xc/programs/xdm/config/Xres.cpp Thu Sep 7 18:23:11 2000
	45	@@ -5,6 +5,13 @@
	46	xlogin*login.translations: #override BS
	47	Ctrl<Key>R: abort-display()NLBS
	48	<Key>F1: set-session-argument(failsafe) finish-field()NLBS
	49	+ <Key>Delete: delete-character()NLBS
	50	+ <Key>Left: move-backward-character()NLBS
	51	+ <Key>Right: move-forward-character()NLBS
	52	+ <Key>Home: move-to-begining()NLBS
	53	+ <Key>End: move-to-end()NLBS
	54	+ Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
	55	+ <Key>KP_Enter: set-session-argument() finish-field()NLBS
	56	Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
	57	<Key>Return: set-session-argument() finish-field()
	58	#ifndef XPM
	59	@@ -29,9 +36,7 @@
	60	/**/#endif
	61	#endif /* XPM */
	62	/**/#ifdef COLOR
	63	-#ifndef XPM
	64	-xlogin*greetColor: CadetBlue
65	-#else
66	+#ifdef XPM
67	xlogin*borderWidth: 1
68	xlogin*frameWidth: 5
69	xlogin*innerFramesWidth: 2
70	@@ -40,6 +45,8 @@
71	xlogin*background: grey
72	!xlogin*foreground: darkgreen
73	xlogin*greetColor: Blue3
74	+#else
75	+xlogin*greetColor: CadetBlue
76	#endif /* XPM */
77	xlogin*failColor: red
78	*Foreground: black
79	@@ -76,6 +83,6 @@
80	Chooser*allowShellResize: false
81	Chooser*viewport.forceBars: true
82	Chooserlabel.font: -new century schoolbook-bold-i-normal--240-
83	-Chooser*label.label: XDMCP Host Menu from CLIENTHOST
84	+Chooser*label.label: XDMCP Host Menu from CLIENTHOST
85	Chooserlist.font: ---medium-r-normal---230---c--iso8859-1
86	ChooserCommand.font: -new century schoolbook-bold-r-normal--180-
87	diff -urN xc/programs/xdm~/greeter/Imakefile xc/programs/xdm/greeter/Imakefile
88	--- xc/programs/xdm~/greeter/Imakefile Wed Jun 14 14:43:32 2000
89	+++ xc/programs/xdm/greeter/Imakefile Thu Sep 7 18:17:08 2000
90	@@ -76,8 +76,6 @@
91	INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE)
92	DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \
93	$(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES)
94	-
95	-SHLIBDIR = $(XDMDIR)
96
97	SRCS = greet.c verify.c Login.c
98	OBJS = greet.o verify.o Login.o
b8f1fa46 JR	99	--- xc/programs/xdm/config/Imakefile~ Thu Nov 9 23:37:34 2000
	100	+++ xc/programs/xdm/config/Imakefile Thu Nov 9 23:38:18 2000
	101	@@ -5,9 +5,7 @@
	102
	103	all:: Xservers.ws xdm-config Xservers Xresources
	104
	105	-#if defined(i386Architecture) && (defined(NetBSDArchitecture) \|\| defined(OpenBSDArchitecture))
	106	-DEFAULTVT=vt05
	107	-#endif
	108	+DEFAULTVT=vt9
	109
	110	#ifndef XdmPixmap
	111	# define XdmPixmap XFree86.xpm