Usenet 1994 January/usenetsourcesnewsgroupsinfomagicjanuary1994.iso/sources/x/volume18/X11R5-fix12/part05

Text File | 1992-07-20 | 16.7 KB | 461 lines

Newsgroups: comp.sources.x
Path: uunet!zaphod.mps.ohio-state.edu!mips!msi!dcmartin
From: [e-mail] (Bob Scheifler)
Subject: v18i041: X11R5 public fix #12, Part05/05
Message-ID: <[e-mail]>
Originator: dcmartin@fascet
Sender: [e-mail] (David C. Martin - Moderator)
Organization: Molecular Simulations, Inc.
References: <[e-mail]>
Date: Mon, 20 Jul 1992 15:57:24 GMT
Approved: [e-mail]
Lines: 447

Submitted-by: [e-mail] (Bob Scheifler)
Posting-number: Volume 18, Issue 41
Archive-name: X11R5-fix12/part05

#!/bin/sh
# this is part.05 (part 5 of a multipart archive)
# do not concatenate these parts, unpack them in order with /bin/sh
# file fix-12 continued
#
if test ! -r _shar_seq_.tmp; then
    echo 'Please unpack part 1 first!'
    exit 1
fi
(read Scheck
 if test "$Scheck" != 5; then
    echo Please unpack part "$Scheck" next!
    exit 1
 else
    exit 0
 fi
) < _shar_seq_.tmp || exit 1
if test ! -f _shar_wnt_.tmp; then
    echo 'x - still skipping fix-12'
else
echo 'x - continuing file fix-12'
sed 's/^X//' << 'SHAR_EOF' >> 'fix-12' &&
! /******************************************************************
!
!               Copyright 1991, 1992 Sony Corporation
!
! Permission to use, copy, modify, distribute, and sell this software
! and its documentation for any purpose is hereby granted without fee,
! provided that the above copyright notice appear in all copies and
! that both that copyright notice and this permission notice appear
! in supporting documentation, and that the name of Sony not be used
! in advertising or publicity pertaining to distribution of the
! software without specific, written prior permission.
! Sony makes no representations about the suitability of this software
! for any purpose.  It is provided "as is" without express or implied
! warranty.
!
! SONY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
! ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
! SHALL SONY BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
! DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
! OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
! TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
! PERFORMANCE OF THIS SOFTWARE.
!
!   Author: Masaki Takeuchi       Sony Corporation
!
! ******************************************************************/
X
X  #include "Xlibint.h"
X  #include "Xlcint.h"
*** /tmp/d17492    Sun May  3 18:50:08 1992
--- mit/lib/X/Ximp/XimpTxtEsc.c    Sun May  3 18:50:05 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpTxtEsc.c,v 1.1 91/07/09 17:37:28 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpTxtEsc.c,v 1.2 92/04/14 13:30:02 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 29,35 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 29,35 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
***************
*** 112,118 ****
X          break;
X
X          if (char_length < 2)
!         width += XTextWidth(font, xchar_buf, tmp_len);
X              else
X          width += XTextWidth16(font, xchar2b_buf, tmp_len);
X
--- 112,118 ----
X          break;
X
X          if (char_length < 2)
!         width += XTextWidth(font, (char *)xchar_buf, tmp_len);
X              else
X          width += XTextWidth16(font, xchar2b_buf, tmp_len);
X
*** /tmp/d17514    Sun May  3 18:50:19 1992
--- mit/lib/X/Ximp/XimpTxtExt.c    Sun May  3 18:50:16 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpTxtExt.c,v 1.3 91/10/10 20:41:43 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpTxtExt.c,v 1.4 92/04/14 13:30:06 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 29,35 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 29,35 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
***************
*** 117,123 ****
X          break;
X
X          if (char_length < 2)
!         XTextExtents(font, xchar_buf, tmp_len, &direction,
X                   &tmp_ascent, &tmp_descent, &tmp_overall);
X              else
X          XTextExtents16(font, xchar2b_buf, tmp_len, &direction,
--- 117,123 ----
X          break;
X
X          if (char_length < 2)
!         XTextExtents(font, (char *)xchar_buf, tmp_len, &direction,
X                   &tmp_ascent, &tmp_descent, &tmp_overall);
X              else
X          XTextExtents16(font, xchar2b_buf, tmp_len, &direction,
*** /tmp/d17536    Sun May  3 18:50:30 1992
--- mit/lib/X/Ximp/XimpTxtPer.c    Sun May  3 18:50:28 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpTxtPer.c,v 1.3 91/10/10 20:41:46 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpTxtPer.c,v 1.4 92/04/14 13:30:08 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 29,35 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 29,35 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17558    Sun May  3 18:50:42 1992
--- mit/lib/X/Ximp/XimpTxtPr.c    Sun May  3 18:50:39 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpTxtPr.c,v 1.2 91/10/07 17:50:45 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpTxtPr.c,v 1.3 92/04/14 13:30:11 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 28,34 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 28,34 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17580    Sun May  3 18:50:54 1992
--- mit/lib/X/Ximp/XimpWPer.c    Sun May  3 18:50:52 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpWPer.c,v 1.1 91/07/09 17:37:39 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpWPer.c,v 1.2 92/04/14 13:30:27 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 29,35 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 29,35 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17602    Sun May  3 18:51:06 1992
--- mit/lib/X/Ximp/XimpWPrTxt.c    Sun May  3 18:51:03 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpWPrTxt.c,v 1.2 91/10/07 17:50:54 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpWPrTxt.c,v 1.3 92/04/14 13:30:30 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 28,34 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 28,34 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17624    Sun May  3 18:51:17 1992
--- mit/lib/X/Ximp/XimpWTxtPr.c    Sun May  3 18:51:14 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpWTxtPr.c,v 1.2 91/10/07 17:50:57 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpWTxtPr.c,v 1.3 92/04/14 13:30:33 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 28,34 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 28,34 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17646    Sun May  3 18:51:29 1992
--- mit/lib/X/Ximp/XimpXConv.c    Sun May  3 18:51:26 1992
***************
*** 1,7 ****
! /* $XConsortium: XimpXConv.c,v 1.2 91/07/30 14:27:58 rws Exp $ */
X  /*
!  * Copyright 1990, 1991 by TOSHIBA Corp.
!  * Copyright 1990, 1991 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
--- 1,7 ----
! /* $XConsortium: XimpXConv.c,v 1.3 92/04/14 13:30:36 rws Exp $ */
X  /*
!  * Copyright 1990, 1991, 1992 by TOSHIBA Corp.
!  * Copyright 1990, 1991, 1992 by SORD Computer Corp.
X   *
X   * Permission to use, copy, modify, distribute, and sell this software and its
X   * documentation for any purpose is hereby granted without fee, provided that
***************
*** 29,35 ****
X
X  /******************************************************************
X
!               Copyright 1991, by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 29,35 ----
X
X  /******************************************************************
X
!               Copyright 1991, 1992 by FUJITSU LIMITED
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
*** /tmp/d17668    Sun May  3 18:51:41 1992
--- mit/lib/X/Ximp/Ximpint.c    Sun May  3 18:51:38 1992
***************
*** 1,7 ****
! /* $XConsortium: Ximpint.c,v 1.3 91/10/10 20:41:48 rws Exp $ */
X  /******************************************************************
X
!               Copyright 1991, by Fuji Xerox Co.,Ltd.
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
--- 1,7 ----
! /* $XConsortium: Ximpint.c,v 1.4 92/04/14 13:30:39 rws Exp $ */
X  /******************************************************************
X
!               Copyright 1991, 1992 by Fuji Xerox Co.,Ltd.
X
X  Permission to use, copy, modify, distribute, and sell this software
X  and its documentation for any purpose is hereby granted without fee,
***************
*** 178,184 ****
X      int i;
X      unsigned char c;
X
!     count = XLookupString(event, buffer, nbytes, &symbol, status);
X      if (keysym) *keysym = symbol;
X      if ((nbytes == 0) || (symbol == NoSymbol)) {
X      return(count);
--- 178,184 ----
X      int i;
X      unsigned char c;
X
!     count = XLookupString(event, (char *)buffer, nbytes, &symbol, status);
X      if (keysym) *keysym = symbol;
X      if ((nbytes == 0) || (symbol == NoSymbol)) {
X      return(count);
***************
*** 223,229 ****
X      int i;
X      unsigned char c;
X
!     count = XLookupString(event, look, nbytes, &symbol, status);
X      if (keysym) *keysym = symbol;
X      if ((nbytes == 0) || (symbol == NoSymbol)) {
X      return(count);
--- 223,229 ----
X      int i;
X      unsigned char c;
X
!     count = XLookupString(event, (char *)look, nbytes, &symbol, status);
X      if (keysym) *keysym = symbol;
X      if ((nbytes == 0) || (symbol == NoSymbol)) {
X      return(count);
SHAR_EOF
echo 'File fix-12 is complete' &&
chmod 0644 fix-12 ||
echo 'restore of fix-12 failed'
Wc_c="`wc -c < 'fix-12'`"
test 212132 -eq "$Wc_c" ||
    echo 'fix-12: original size 212132, current size' "$Wc_c"
rm -f _shar_wnt_.tmp
fi
rm -f _shar_seq_.tmp
echo You have unpacked the last part
exit 0
--
---
Senior Systems Scientist        mail: [e-mail]
Molecular Simulations, Inc.        uucp: uunet!dcmartin
796 North Pastoria Avenue        at&t: 408/522-9236