Fix two emu problems:

1. Decorations disabled by default.
2. No-decoration case not properly handled in menus, resulting in seg fault.

2 files changed, 86 insertions, 0 deletions

diff --git a/x11/emu/files/patch-a b/x11/emu/files/patch-a
new file mode 100644
index 000000000000..3b3b431d5100
--- /dev/null
+++ b/x11/emu/files/patch-a
@@ -0,0 +1,56 @@
+*** client/aux_wdg.c.orig	Wed May 22 03:05:00 1996
+--- client/aux_wdg.c	Wed May 22 03:15:09 1996
+***************
+*** 186,192 ****
+  	  XtSetArg(args[i], XtNheight, o_height);	i++;
+  	  XtSetValues((Widget)self, args, i);
+  #else
+! 	  XtMakeResizeRequest(self, o_width, o_height, NULL, NULL);
+  #endif 
+  
+  	  if (Mmapped) {
+--- 186,192 ----
+  	  XtSetArg(args[i], XtNheight, o_height);	i++;
+  	  XtSetValues((Widget)self, args, i);
+  #else
+! 	  XtMakeResizeRequest((Widget)self, o_width, o_height, NULL, NULL);
+  #endif 
+  
+  	  if (Mmapped) {
+***************
+*** 253,258 ****
+--- 253,259 ----
+  Export void
+  flip_decorations(TermWidget term, String str)
+  {
++ #ifdef DECORATIONS
+       if (strcmp(str, "MBar") == 0) {
+  	  /*
+  	   * The Menubar
+***************
+*** 291,297 ****
+  	       /*
+  		* Update the thumb
+  		*/
+! 	       ScrollbarAdjust(NULL, 0., 0.);
+  	  }
+       }
+  
+--- 292,298 ----
+  	       /*
+  		* Update the thumb
+  		*/
+! 	       ScrollbarAdjust(SBar, 0.0, 0.0);
+  	  }
+       }
+  
+***************
+*** 299,304 ****
+--- 300,306 ----
+        * call the layout routine by hand 
+        */
+       do_layout(term, (Widget)Canvas, WidthOf(Canvas), HeightOf(Canvas));
++ #endif	/* DECORATIONS */
+  }
+  
+  /*
diff --git a/x11/emu/files/patch-b b/x11/emu/files/patch-b
new file mode 100644
index 000000000000..2d3236ff2001
--- /dev/null
+++ b/x11/emu/files/patch-b
@@ -0,0 +1,30 @@
+*** client/Imakefile.orig	Wed May 22 03:07:51 1996
+--- client/Imakefile	Wed May 22 03:16:11 1996
+***************
+*** 11,22 ****
+  
+  #ifdef USE_MOTIF
+  TOOLKIT_LIBS = XmClientDepLibs
+! EXTRA_DEFINES = -DMOTIF
+  EXTRA_SRCS = aux_motif.c
+  EXTRA_OBJS = aux_motif.o
+  
+  #else
+  TOOLKIT_LIBS = XawClientDepLibs
+  EXTRA_SRCS = aux_athena.c
+  EXTRA_OBJS = aux_athena.o
+  #endif
+--- 11,23 ----
+  
+  #ifdef USE_MOTIF
+  TOOLKIT_LIBS = XmClientDepLibs
+! EXTRA_DEFINES = -DMOTIF -DDECORATIONS
+  EXTRA_SRCS = aux_motif.c
+  EXTRA_OBJS = aux_motif.o
+  
+  #else
+  TOOLKIT_LIBS = XawClientDepLibs
++ EXTRA_DEFINES = -DDECORATIONS
+  EXTRA_SRCS = aux_athena.c
+  EXTRA_OBJS = aux_athena.o
+  #endif