mikew@wyse.wyse.com (Mike Wexler) (11/12/88)
Submitted-by: Xstuff service <xstuff@EXPO.LCS.MIT.EDU>
Posting-number: Volume 2, Issue 13
Archive-name: x11.3/patch1
This patch fixes problems in the following files:
lib/Xaw/Command.c missing argument to HighlightRegion()
lib/Xmu/CvtStdSel.c workaround for Ultrix 2.3 bad include file
clients/xdm/Login.c workaround for Ultrix 2.3 compiler bug
doc/bugs/bug-report R3 instead of R3beta
fonts/bdf/75dpi/helvBO24.bdf bad width
server/ddx/dec/qvss/qvss_io.c workaround for 4.3 compiler bug
server/ddx/sun/sunIo.c missing -mono flag
fonts/bdf/75dpi/symb08.bdf remove "DEC" from FONTNAME_REGISTRY
fonts/bdf/75dpi/symb10.bdf remove "DEC" from FONTNAME_REGISTRY
fonts/bdf/75dpi/symb12.bdf remove "DEC" from FONTNAME_REGISTRY
fonts/bdf/75dpi/symb14.bdf remove "DEC" from FONTNAME_REGISTRY
fonts/bdf/75dpi/symb18.bdf remove "DEC" from FONTNAME_REGISTRY
fonts/bdf/75dpi/symb24.bdf remove "DEC" from FONTNAME_REGISTRY
lib/X/Imakefile add cursorfont.h to list of things installed
clients/xterm/main.c workaround for Ultrix 2.3 killpg bug
clients/xterm/button.c workaround for Ultrix 2.3 killpg bug
clients/xterm/misc.c workaround for Ultrix 2.3 killpg bug
fonts/bdf/misc/6x13.bdf make name be "6x13" instead of "fixed"
Watch out for the 6x13.bdf patch. It has imbedded carriage returns (^M) at
the end of each of the source file lines. You may have to edit it by hand.
*** lib/Xaw/Command.c.old
--- lib/Xaw/Command.c
***************
*** 1,5 ****
#ifndef lint
! static char Xrcsid[] = "$XConsortium: Command.c,v 1.45 88/10/19 09:39:35 swick Exp $";
#endif lint
/***********************************************************
--- 1,5 ----
#ifndef lint
! static char Xrcsid[] = "$XConsortium: Command.c,v 1.46 88/11/01 16:57:33 swick Exp $";
#endif lint
/***********************************************************
***************
*** 257,263 ****
CommandWidget cbw = (CommandWidget)w;
if (!ComWhighlighted) {
ComWhighlighted = TRUE;
! Redisplay(w, event, HighlightRegion());
}
}
--- 257,263 ----
CommandWidget cbw = (CommandWidget)w;
if (!ComWhighlighted) {
ComWhighlighted = TRUE;
! Redisplay(w, event, HighlightRegion(cbw));
}
}
***************
*** 271,277 ****
CommandWidget cbw = (CommandWidget)w;
if (ComWhighlighted) {
ComWhighlighted = FALSE;
! Redisplay(w, event, HighlightRegion());
}
}
--- 271,277 ----
CommandWidget cbw = (CommandWidget)w;
if (ComWhighlighted) {
ComWhighlighted = FALSE;
! Redisplay(w, event, HighlightRegion(cbw));
}
}
*** /tmp/,RCSt1a09459 Tue Nov 1 17:01:10 1988
--- lib/Xmu/CvtStdSel.c Tue Nov 1 17:00:45 1988
***************
*** 1,4 ****
! /* $XConsortium: CvtStdSel.c,v 1.6 88/10/22 10:20:20 jim Exp $
*
* Copyright 1988 by the Massachusetts Institute of Technology
*
--- 1,4 ----
! /* $XConsortium: CvtStdSel.c,v 1.7 88/11/01 17:00:44 jim Exp $
*
* Copyright 1988 by the Massachusetts Institute of Technology
*
***************
*** 41,46 ****
--- 41,49 ----
#ifdef USE_UNAME
+ #ifdef ultrix
+ #include <sys/limits.h> /* fixed in Ultrix 3.0 */
+ #endif
#include <sys/utsname.h>
struct utsname uts;
*** /tmp/,RCSt1a10012 Tue Nov 1 17:17:28 1988
--- clients/xdm/Login.c Tue Nov 1 17:14:01 1988
***************
*** 197,206 ****
EraseFail (w)
LoginWidget w;
{
XSetForeground (XtDisplay (w), w->login.failGC,
w->core.background_pixel);
XDrawString (XtDisplay (w), XtWindow (w), w->login.failGC,
! FAIL_X(w), FAIL_Y(w),
w->login.fail, strlen (w->login.fail));
w->login.failUp = 0;
XSetForeground (XtDisplay (w), w->login.failGC,
--- 197,209 ----
EraseFail (w)
LoginWidget w;
{
+ int x = FAIL_X(w);
+ int y = FAIL_Y(w);
+
XSetForeground (XtDisplay (w), w->login.failGC,
w->core.background_pixel);
XDrawString (XtDisplay (w), XtWindow (w), w->login.failGC,
! x, y,
w->login.fail, strlen (w->login.fail));
w->login.failUp = 0;
XSetForeground (XtDisplay (w), w->login.failGC,
***************
*** 235,242 ****
DrawFail (w)
LoginWidget w;
{
XDrawString (XtDisplay (w), XtWindow (w), w->login.failGC,
! FAIL_X(w), FAIL_Y(w),
w->login.fail, strlen (w->login.fail));
XorCursor (w);
ResetLogin (w);
--- 238,248 ----
DrawFail (w)
LoginWidget w;
{
+ int x = FAIL_X(w);
+ int y = FAIL_Y(w);
+
XDrawString (XtDisplay (w), XtWindow (w), w->login.failGC,
! x, y,
w->login.fail, strlen (w->login.fail));
XorCursor (w);
ResetLogin (w);
*** /tmp/,RCSt1a03689 Tue Nov 1 15:06:34 1988
--- doc/bugs/bug-report Fri Oct 28 15:00:34 1988
***************
*** 5,11 ****
VERSION:
! R3beta
CLIENT MACHINE and OPERATING SYSTEM:
[Sun 3/280 running SunOS 3.4, Microvax II running Ultrix 2.2, ...]
--- 5,11 ----
VERSION:
! R3
CLIENT MACHINE and OPERATING SYSTEM:
[Sun 3/280 running SunOS 3.4, Microvax II running Ultrix 2.2, ...]
*** /tmp/,RCSt1a03441 Tue Nov 1 14:57:40 1988
--- fonts/bdf/75dpi/helvBO24.bdf Tue Nov 1 14:57:19 1988
***************
*** 3243,3249 ****
STARTCHAR Edieresis
ENCODING 203
SWIDTH 667 0
! DWIDTH 4918 0
BBX 16 23 2 0
BITMAP
01CE
--- 3243,3249 ----
STARTCHAR Edieresis
ENCODING 203
SWIDTH 667 0
! DWIDTH 16 0
BBX 16 23 2 0
BITMAP
01CE
*** /tmp/,RCSt1a09660 Tue Nov 1 17:06:08 1988
--- server/ddx/dec/qvss/qvss_io.c Tue Nov 1 16:30:43 1988
***************
*** 21,27 ****
SOFTWARE.
******************************************************************/
! /* $XConsortium: qvss_io.c,v 1.83 88/10/13 19:32:35 rws Exp $ */
#include <stdio.h>
#include <sys/types.h>
--- 21,27 ----
SOFTWARE.
******************************************************************/
! /* $XConsortium: qvss_io.c,v 1.85 88/11/01 16:31:46 rws Exp $ */
#include <stdio.h>
#include <sys/types.h>
***************
*** 470,475 ****
--- 470,478 ----
int nowInCentiSecs, nowInMilliSecs, adjustCentiSecs;
struct timeval tp;
int needTime = 1;
+ #ifndef NO_EVENT_COMPRESSION
+ int j;
+ #endif
i = queue->head;
while (i != queue->tail)
***************
*** 554,564 ****
{
case VSE_KBTDOWN:
x.u.u.type = KeyPress;
! (qvKeyboard->processInputProc)(&x, qvKeyboard);
break;
case VSE_KBTUP:
x.u.u.type = KeyRelease;
! (qvKeyboard->processInputProc)(&x, qvKeyboard);
break;
default: /* hopefully BUTTON_RAW_TYPE */
ProcessLK201Input(&x, qvKeyboard);
--- 557,567 ----
{
case VSE_KBTDOWN:
x.u.u.type = KeyPress;
! (*qvKeyboard->processInputProc)(&x, qvKeyboard);
break;
case VSE_KBTUP:
x.u.u.type = KeyRelease;
! (*qvKeyboard->processInputProc)(&x, qvKeyboard);
break;
default: /* hopefully BUTTON_RAW_TYPE */
ProcessLK201Input(&x, qvKeyboard);
***************
*** 577,583 ****
}
else {
#ifndef NO_EVENT_COMPRESSION
! int j = (i == qLimit) ? 0 : i + 1;
/*
* to get here we knew that
*
--- 580,586 ----
}
else {
#ifndef NO_EVENT_COMPRESSION
! j = (i == qLimit) ? 0 : i + 1;
/*
* to get here we knew that
*
*** /tmp/,RCSt1a09207 Tue Nov 1 16:55:11 1988
--- server/ddx/sun/sunIo.c Tue Nov 1 09:10:31 1988
***************
*** 350,355 ****
--- 350,358 ----
if (++i >= argc) UseMsg ();
return 2;
}
+ if (strcmp (argv[i], "-mono") == 0) { /* -mono */
+ return 1;
+ }
return 0;
}
***************
*** 357,360 ****
--- 360,364 ----
ddxUseMsg()
{
ErrorF("-dev filename name of device to open\n");
+ ErrorF("-mono force monochrome-only screen\n");
}
*** /tmp/,RCSt1a05368 Tue Nov 1 15:51:17 1988
--- fonts/bdf/75dpi/symb08.bdf Tue Nov 1 15:48:35 1988
***************
*** 25,35 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-Adobe-Symbol-Medium-R-Normal--8-80-75-75-P-51-ADOBE-FONTSPECIFIC
SIZE 8 75 75
FONTBOUNDINGBOX 9 11 -1 -3
STARTPROPERTIES 23
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,35 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -Adobe-Symbol-Medium-R-Normal--8-80-75-75-P-51-ADOBE-FONTSPECIFIC
SIZE 8 75 75
FONTBOUNDINGBOX 9 11 -1 -3
STARTPROPERTIES 23
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a05373 Tue Nov 1 15:51:23 1988
--- fonts/bdf/75dpi/symb10.bdf Tue Nov 1 15:48:45 1988
***************
*** 25,36 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-Adobe-Symbol-Medium-R-Normal--10-100-75-75-P-61-ADOBE-FONTSPECIFIC
SIZE 10 75 75
FONTBOUNDINGBOX 11 14 -1 -4
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,36 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -Adobe-Symbol-Medium-R-Normal--10-100-75-75-P-61-ADOBE-FONTSPECIFIC
SIZE 10 75 75
FONTBOUNDINGBOX 11 14 -1 -4
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a05378 Tue Nov 1 15:51:28 1988
--- fonts/bdf/75dpi/symb12.bdf Tue Nov 1 15:48:54 1988
***************
*** 25,36 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-Adobe-Symbol-Medium-R-Normal--12-120-75-75-P-74-ADOBE-FONTSPECIFIC
SIZE 12 75 75
FONTBOUNDINGBOX 14 16 -1 -4
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,36 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -Adobe-Symbol-Medium-R-Normal--12-120-75-75-P-74-ADOBE-FONTSPECIFIC
SIZE 12 75 75
FONTBOUNDINGBOX 14 16 -1 -4
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a05383 Tue Nov 1 15:51:33 1988
--- fonts/bdf/75dpi/symb14.bdf Tue Nov 1 15:49:01 1988
***************
*** 25,36 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-ADOBE-Symbol-Medium-R-Normal--14-140-75-75-P-85-ADOBE-FONTSPECIFIC
SIZE 14 75 75
FONTBOUNDINGBOX 16 20 -1 -6
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,36 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -ADOBE-Symbol-Medium-R-Normal--14-140-75-75-P-85-ADOBE-FONTSPECIFIC
SIZE 14 75 75
FONTBOUNDINGBOX 16 20 -1 -6
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a05388 Tue Nov 1 15:51:38 1988
--- fonts/bdf/75dpi/symb18.bdf Tue Nov 1 15:49:08 1988
***************
*** 25,36 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-Adobe-Symbol-Medium-R-Normal--18-180-75-75-P-107-ADOBE-FONTSPECIFIC
SIZE 18 75 75
FONTBOUNDINGBOX 20 25 -1 -7
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,36 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -Adobe-Symbol-Medium-R-Normal--18-180-75-75-P-107-ADOBE-FONTSPECIFIC
SIZE 18 75 75
FONTBOUNDINGBOX 20 25 -1 -7
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a05393 Tue Nov 1 15:51:46 1988
--- fonts/bdf/75dpi/symb24.bdf Tue Nov 1 15:49:17 1988
***************
*** 25,36 ****
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT DEC-Adobe-Symbol-Medium-R-Normal--24-240-75-75-P-142-ADOBE-FONTSPECIFIC
SIZE 24 75 75
FONTBOUNDINGBOX 26 32 -1 -8
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY "DEC"
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
--- 25,36 ----
COMMENT CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
COMMENT
COMMENT
! FONT -Adobe-Symbol-Medium-R-Normal--24-240-75-75-P-142-ADOBE-FONTSPECIFIC
SIZE 24 75 75
FONTBOUNDINGBOX 26 32 -1 -8
STARTPROPERTIES 23
COMMENT Begin LogicalFontDescription
! FONTNAME_REGISTRY ""
FAMILY_NAME "Symbol"
FOUNDRY "Adobe"
WEIGHT_NAME "Medium"
*** /tmp/,RCSt1a03597 Tue Nov 1 15:03:39 1988
--- lib/X/Imakefile Tue Nov 1 09:05:26 1988
***************
*** 9,15 ****
AIDOBJS = BandAidLibraryObjects
#endif
SRCS = *.c $(AIDSRCS)
! HEADERS = Xlib.h Xresource.h Xutil.h
LINTLIBS =
OBJS1 =\
--- 9,15 ----
AIDOBJS = BandAidLibraryObjects
#endif
SRCS = *.c $(AIDSRCS)
! HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h
LINTLIBS =
OBJS1 =\
*** /tmp/,RCSt1a03322 Tue Nov 1 14:52:23 1988
--- clients/xterm/main.c Tue Nov 1 09:09:00 1988
***************
*** 2114,2120 ****
return;
}
! Cleanup(0);
}
/* VARARGS1 */
--- 2114,2131 ----
return;
}
! /*
! * Use pid instead of process group (which would have to get before
! * the wait call above) so that we don't accidentally hose other
! * applications. Otherwise, somebody could write a program which put
! * itself in somebody else's process group. Also, we call Exit instead
! * of Cleanup so that we don't do a killpg on -1 by accident. Some
! * operating systems seem to do very nasty things with that.
! */
! if (pid > 1) {
! killpg (pid, SIGHUP);
! }
! Exit (0);
}
/* VARARGS1 */
*** /tmp/,RCSt1a03329 Tue Nov 1 14:52:32 1988
--- clients/xterm/button.c Tue Nov 1 09:06:12 1988
***************
*** 1375,1384 ****
Redraw();
break;
case XMENU_RESUME:
#if !defined(SYSV) || defined(JOBCONTROL)
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGCONT);
#endif /* !defined(SYSV) || defined(JOBCONTROL) */
break;
--- 1375,1389 ----
Redraw();
break;
+ /*
+ * The following cases use the pid instead of the process group so that we
+ * don't get hosed by programs that change their process group
+ */
+
case XMENU_RESUME:
#if !defined(SYSV) || defined(JOBCONTROL)
if(screen->pid > 1)
! killpg (screen->pid, SIGCONT);
#endif /* !defined(SYSV) || defined(JOBCONTROL) */
break;
***************
*** 1385,1412 ****
case XMENU_SUSPEND:
#if !defined(SYSV) || defined(JOBCONTROL)
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGTSTP);
#endif /* !defined(SYSV) || defined(JOBCONTROL) */
break;
case XMENU_INTR:
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGINT);
break;
case XMENU_HANGUP:
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGHUP);
break;
case XMENU_TERM:
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGTERM);
break;
case XMENU_KILL:
if(screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGKILL);
break;
case XMENU_EXIT:
--- 1390,1417 ----
case XMENU_SUSPEND:
#if !defined(SYSV) || defined(JOBCONTROL)
if(screen->pid > 1)
! killpg (screen->pid, SIGTSTP);
#endif /* !defined(SYSV) || defined(JOBCONTROL) */
break;
case XMENU_INTR:
if(screen->pid > 1)
! killpg (screen->pid, SIGINT);
break;
case XMENU_HANGUP:
if(screen->pid > 1)
! killpg (screen->pid, SIGHUP);
break;
case XMENU_TERM:
if(screen->pid > 1)
! killpg (screen->pid, SIGTERM);
break;
case XMENU_KILL:
if(screen->pid > 1)
! killpg (screen->pid, SIGKILL);
break;
case XMENU_EXIT:
*** /tmp/,RCSt1a03335 Tue Nov 1 14:52:37 1988
--- clients/xterm/misc.c Tue Nov 1 09:15:50 1988
***************
*** 788,793 ****
--- 788,794 ----
Cleanup(i);
}
+
/*
* cleanup by sending SIGHUP to client processes
*/
***************
*** 798,806 ****
register TScreen *screen;
screen = &term->screen;
! if (screen->pid > 1)
! killpg(getpgrp(screen->pid), SIGHUP);
!
Exit (code);
}
--- 799,807 ----
register TScreen *screen;
screen = &term->screen;
! if (screen->pid > 1) {
! (void) killpg (screen->pid, SIGHUP);
! }
Exit (code);
}
*** /tmp/,RCSt1a03640 Tue Nov 1 15:04:54 1988
--- fonts/bdf/misc/6x13.bdf Tue Nov 1 09:02:21 1988
***************
*** 1,5 ****
STARTFONT 2.1
! FONT fixed
SIZE 13 78 78
FONTBOUNDINGBOX 6 13 0 -3
STARTPROPERTIES 3
--- 1,5 ----
STARTFONT 2.1
! FONT 6x13
SIZE 13 78 78
FONTBOUNDINGBOX 6 13 0 -3
STARTPROPERTIES 3
--
Mike Wexler(wyse!mikew) Phone: (408)433-1000 x1330
Moderator of comp.sources.x