Path: utzoo!utgpu!jarvis.csri.toronto.edu!cs.utexas.edu!usc!apple!oliveb!pyramid!prls!mips!rimulac!beldar
From: beldar@mips.COM (Gardner Cohen)
Newsgroups: comp.windows.x
Subject: Re: Xconsole
Message-ID: <34527@mips.mips.COM>
Date: 16 Jan 90 16:29:20 GMT
References: <6284@ubc-cs.UUCP> <9001161108.AA04262@poseur.jpl.nasa.gov>
Sender: news@mips.COM
Lines: 169

earle@POSEUR.JPL.NASA.GOV (Greg Earle - Sun JPL on-site Software Support) writes:

   [Sorry that this sounds arrogant, but sheesh ... ]
   If you had looked at line 189 in console.c for more than 5 seconds, you would
   have realized...

Of course, the same thing has happened to two other files.

Here's a set of patches to fix that, also deal with newlines embedded
in several strings, and switch to the new include file hierarchy.

These changes have been tested on a Decstation 3100 under ultrix 3.1,
uws 2.1.

I also have diffs to make xconsole work with mips computers running
riscos 4.0.

I hope my diffs don't get word wrapped!

*** console.c.orig	Tue Jan 16 08:07:30 1990
--- console.c	Tue Jan 16 08:15:03 1990
***************
*** 30,37 ****
  /** Author:  Roman J. Budzianowski - Project Athena, MIT **/
  
  #if ( !defined(lint) && !defined(SABER))
! static char *rcsid_console_c = "$Header:
! /afs/athena.mit.edu/astaff/project/xdm/xconsole/RCS/console.c,v 2.0
  89/10/31 11:35:25 roman Exp Locker: roman $";
  #endif lint
  
--- 30,37 ----
  /** Author:  Roman J. Budzianowski - Project Athena, MIT **/
  
  #if ( !defined(lint) && !defined(SABER))
! static char *rcsid_console_c = "$Header: \
! /afs/athena.mit.edu/astaff/project/xdm/xconsole/RCS/console.c,v 2.0 \
  89/10/31 11:35:25 roman Exp Locker: roman $";
  #endif lint
  
***************
*** 40,51 ****
  #include <X11/Xlib.h>
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
  #include <X11/Form.h>
  #include <X11/Command.h>
  #include <X11/Label.h>
- #include <X11/Shell.h>
  #include <X11/AsciiText.h>
  
  #include "console.h"
  
  extern ConsoleRec theConsole;
--- 40,59 ----
  #include <X11/Xlib.h>
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
+ #ifdef X11R3
  #include <X11/Form.h>
  #include <X11/Command.h>
  #include <X11/Label.h>
  #include <X11/AsciiText.h>
+ #else
+ #include <X11/Xaw/Form.h>
+ #include <X11/Xaw/Command.h>
+ #include <X11/Xaw/Label.h>
+ #include <X11/Xaw/AsciiText.h>
+ #endif
  
+ #include <X11/Shell.h>
+ 
  #include "console.h"
  
  extern ConsoleRec theConsole;
***************
*** 185,192 ****
     Debug("creating console.");
  
    
! XtAddEventHandler(console->shell,StructureNotifyMask,False,HandleMap,(ca
! ddr_t)console);
  
     frame = XtCreateWidget("consoleFrame", formWidgetClass, console->shell, args, 0);
  
--- 193,199 ----
     Debug("creating console.");
  
    
! XtAddEventHandler(console->shell,StructureNotifyMask,False,HandleMap,(caddr_t)console);
  
     frame = XtCreateWidget("consoleFrame", formWidgetClass, console->shell, args, 0);
  
*** console.h.orig	Tue Jan 16 08:15:25 1990
--- console.h	Tue Jan 16 08:14:42 1990
***************
*** 51,56 ****
--- 51,60 ----
  void ConsoleDown();
  void HandleAllEvents();
  
+ #ifdef X11R3
  #include <X11/Text.h>
+ #else
+ #include <X11/Xaw/Text.h>
+ #endif
  XtTextPosition GetPosition();
  #endif _CONSOLE
*** main.c.orig	Tue Jan 16 08:07:29 1990
--- main.c	Tue Jan 16 08:06:14 1990
***************
*** 22,29 ****
   */
  
  #if ( !defined(lint) && !defined(SABER))
!   static char rcs_version[] = "$Header:
! /afs/athena.mit.edu/astaff/project/xdm/xconsole/RCS/main.c,v 2.0
  89/10/31 11:34:37 roman Exp Locker: roman $";
  #endif
  
--- 22,29 ----
   */
  
  #if ( !defined(lint) && !defined(SABER))
!   static char rcs_version[] = "$Header: \
! /afs/athena.mit.edu/astaff/project/xdm/xconsole/RCS/main.c,v 2.0 \
  89/10/31 11:34:37 roman Exp Locker: roman $";
  #endif
  
***************
*** 176,183 ****
  
     if(pipe(signalpipe)==0)
      
! XtAppAddInput(theConsole.appContext,signalpipe[0],XtInputReadMask,Handle
! Signal,NULL);
     else
       SystemError("xconsole: cannot create pipe for signal handling");
       
--- 176,182 ----
  
     if(pipe(signalpipe)==0)
      
! XtAppAddInput(theConsole.appContext,signalpipe[0],XtInputReadMask,HandleSignal,NULL);
     else
       SystemError("xconsole: cannot create pipe for signal handling");
       
*** XConsole.ad.orig	Tue Jan 16 08:07:30 1990
--- XConsole.ad	Tue Jan 16 08:06:27 1990
***************
*** 40,47 ****
  XConsole*closeWindow.horizDistance: 452
  
  XConsole*closeWindow.internalHeight: 2
! XConsole*closeWindow.font: -adobe-new century
! schoolbook-bold-r-normal--14-140-75-75-*
  
  XConsole*Command*resize: false
  
--- 40,46 ----
  XConsole*closeWindow.horizDistance: 452
  
  XConsole*closeWindow.internalHeight: 2
! XConsole*closeWindow.font: -adobe-new century schoolbook-bold-r-normal--14-140-75-75-*
  
  XConsole*Command*resize: false
  
-- 
Gardner Cohen     beldar@mips.com   (408) 991-6567