summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/cf/Imake.cf8
-rw-r--r--config/cf/Imake.rules13
-rw-r--r--config/imake/imakemdep.h4
-rw-r--r--doc/man/general/Imakefile4
-rw-r--r--doc/specs/programs/Imakefile32
-rw-r--r--lib/Xaw/TextSink.c14
-rw-r--r--lib/Xss/Imakefile4
-rw-r--r--programs/Imakefile4
-rw-r--r--programs/Xserver/hw/sun/Imakefile2
-rw-r--r--programs/Xserver/hw/xfree86/CHANGELOG25
-rw-r--r--programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c5
-rw-r--r--programs/Xserver/xkb/xkbInit.c20
-rw-r--r--programs/fstobdf/chars.c33
-rw-r--r--programs/xcalc/math.c9
-rw-r--r--programs/xdm/Imakefile4
-rw-r--r--programs/xdm/chooser.c4
-rw-r--r--programs/xfs/os/waitfor.c4
-rw-r--r--programs/xload/Imakefile28
18 files changed, 139 insertions, 78 deletions
diff --git a/config/cf/Imake.cf b/config/cf/Imake.cf
index 3387efb75..87325649a 100644
--- a/config/cf/Imake.cf
+++ b/config/cf/Imake.cf
@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.54 2000/04/17 16:29:44 eich Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.55 2000/05/18 23:21:30 dawes Exp $
#if defined(clipper) || defined(__clipper__)
# undef clipper
@@ -332,6 +332,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.54 2000/04/17 16:29:44 eich Exp $
# undef sgi
# define SGIArchitecture
# undef mips
+# undef __mips
# define MipsArchitecture
# ifdef _SVR4
# undef _SVR4
@@ -607,6 +608,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# endif
# undef __sparc__
# endif
+# if defined(mips) || defined(__mips__)
+# define MipsArchitecture
+# undef mips
+# undef __mips__
+# endif
/* for compatibility with 3.3.x */
# ifdef PpcArchitecture
# define PowerPCArchitecture
diff --git a/config/cf/Imake.rules b/config/cf/Imake.rules
index cb5b83bf4..d33f1f07d 100644
--- a/config/cf/Imake.rules
+++ b/config/cf/Imake.rules
@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
-XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.74 2000/05/18 00:33:15 dawes Exp $
+XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.75 2000/06/13 02:28:26 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -1139,6 +1139,17 @@ install:: LibraryTargetName(libname) @@\
/*
+ * InstallDriverSDKLibraryModule - rule to install Driver SDK library module.
+ * (only used for XFree86). This is a no-op
+ * rule so that Imakefiles on non-XFree86 systems
+ * continue to build Makefiles correctly.
+ */
+#ifndef InstallDriverSDKLibraryModule
+#define InstallDriverSDKLibraryModule(lib,dlib,dir)
+#endif
+
+
+/*
* MergeIntoInstalledLibrary - generate rules to merge one library into another
*/
#ifndef MergeIntoInstalledLibrary
diff --git a/config/imake/imakemdep.h b/config/imake/imakemdep.h
index 133b3e6df..a5d5d8c15 100644
--- a/config/imake/imakemdep.h
+++ b/config/imake/imakemdep.h
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.37 2000/05/18 00:33:17 dawes Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.38 2000/06/13 02:28:27 dawes Exp $ */
/*
@@ -215,7 +215,7 @@ in this Software without prior written authorization from The Open Group.
* all colons). One way to tell if you need this is to see whether or not
* your Makefiles have no tabs in them and lots of @@ strings.
*/
-#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__)
+#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi)
#define FIXUP_CPP_WHITESPACE
#endif
#ifdef WIN32
diff --git a/doc/man/general/Imakefile b/doc/man/general/Imakefile
index ad316cf9c..3ce898ffc 100644
--- a/doc/man/general/Imakefile
+++ b/doc/man/general/Imakefile
@@ -1,15 +1,17 @@
XCOMM $TOG: Imakefile /main/7 1997/12/16 11:12:34 barstow $
-XCOMM $XFree86$
+XCOMM $XFree86: xc/doc/man/general/Imakefile,v 1.5 1999/03/21 13:21:25 dawes Exp $
MANDIR = $(MISCMANDIR)
MANSUFFIX = $(MISCMANSUFFIX)
CppManTarget(X,NullParameter)
+CppManTarget(Consortium,NullParameter)
CppManTarget(Standards,NullParameter)
CppManTarget(XProjectTeam,NullParameter)
CppManTarget(security,NullParameter)
InstallManPage(X,$(MANDIR))
+InstallManPageLong(Consortium,$(MANDIR),XConsortium)
InstallManPageLong(Standards,$(MANDIR),XStandards)
InstallManPageLong(XProjectTeam,$(MANDIR),XProjectTeam)
InstallManPageLong(security,$(MANDIR),Xsecurity)
diff --git a/doc/specs/programs/Imakefile b/doc/specs/programs/Imakefile
index 250a18120..72f1feb13 100644
--- a/doc/specs/programs/Imakefile
+++ b/doc/specs/programs/Imakefile
@@ -1,8 +1,18 @@
-XCOMM $XConsortium: Imakefile /main/6 1995/12/20 15:03:27 gildea $
+XCOMM $XConsortium: Imakefile /main/10 1996/02/08 01:54:18 gildea $
+XCOMM $XFree86$
/* does not include manual pages under util (not X programs)
or any of the library function manual pages under doc/man */
+#ifdef XFree86Version
+XFREE86_MANUALS = \
+ $(TOP)/programs/Xserver/hw/XFree86/XFree86.man \
+ $(TOP)/programs/Xserver/hw/XFree86/XF86Config.man \
+ $(TOP)/programs/Xserver/hw/XFree86/xf86config/xf86conf.man \
+ $(TOP)/programs/Xserver/hw/XFree86/xf86cfg/xf86cfg.man \
+ $(TOP)/programs/Xserver/hw/XFree86/SuperProbe/SuperProbe.man
+#endif
+
MANUALS = \
$(TOP)/doc/man/general/X.man \
$(TOP)/doc/man/general/Standards.man \
@@ -19,12 +29,15 @@ MANUALS = \
$(TOP)/programs/iceauth/iceauth.man \
$(TOP)/config/imake/imake.man \
$(TOP)/programs/Xserver/hw/sun/kbd_mode.man \
+ $(TOP)/programs/Xserver/hw/xfree86/etc/kbd_mode.man \
$(TOP)/config/util/lndir.man \
- $(TOP)/config/util/makestrs.man \
$(TOP)/config/makedepend/mkdepend.man \
+ $(TOP)/config/util/makeg.man \
+ $(TOP)/config/util/makestrs.man \
$(TOP)/config/util/mkdirhier.man \
$(TOP)/programs/mkfontdir/mkfontdir.man \
$(TOP)/programs/oclock/oclock.man \
+ $(TOP)/programs/Xserver/hw/xfree86/reconfig/reconfig.man \
$(TOP)/programs/xterm/resize.man \
$(TOP)/programs/rstart/rstart.man \
$(TOP)/programs/rstart/rstartd.man \
@@ -32,9 +45,10 @@ MANUALS = \
$(TOP)/programs/rgb/showrgb.man \
$(TOP)/programs/smproxy/smproxy.man \
$(TOP)/programs/xinit/startx.man \
+ $(TOP)/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man \
$(TOP)/programs/twm/twm.man \
- $(TOP)/programs/x11perf/x11pcomp.man \
$(TOP)/programs/x11perf/x11perf.man \
+ $(TOP)/programs/x11perf/x11pcomp.man \
$(TOP)/programs/xauth/xauth.man \
$(TOP)/programs/xclipboard/xclipboard.man \
$(TOP)/programs/xclock/xclock.man \
@@ -44,17 +58,8 @@ MANUALS = \
$(TOP)/programs/Xserver/hw/dec/ws/Xdec.man \
$(TOP)/programs/xdm/xdm.man \
$(TOP)/programs/xdpyinfo/xdpyinfo.man \
- $(TOP)/programs/Xserver/hw/xfree86/XF86Conf.man \
- $(TOP)/programs/Xserver/hw/xfree86/XF86_Acc.man \
- $(TOP)/programs/Xserver/hw/xfree86/XF86_Mono.man \
- $(TOP)/programs/Xserver/hw/xfree86/XF86_SVGA.man \
- $(TOP)/programs/Xserver/hw/xfree86/XF86_VGA16.man \
- $(TOP)/programs/Xserver/hw/xfree86/etc/kbd_mode.man \
- $(TOP)/programs/Xserver/hw/xfree86/reconfig/reconfig.man \
- $(TOP)/programs/Xserver/hw/xfree86/xf86config/xf86config.man \
- $(TOP)/programs/Xserver/hw/xfree86/SuperProbe/SuperProbe.man \
+ $(XFREE86_MANUALS) \
$(TOP)/programs/xfd/xfd.man \
- $(TOP)/programs/Xserver/hw/xfree86/XFree86.man \
$(TOP)/programs/xfs/xfs.man \
$(TOP)/programs/xhost/xhost.man \
$(TOP)/programs/Xserver/hw/hp/Xhp.man \
@@ -81,7 +86,6 @@ MANUALS = \
$(TOP)/programs/xset/xset.man \
$(TOP)/programs/xsetroot/xsetroot.man \
$(TOP)/programs/xsm/xsm.man \
- $(TOP)/programs/xsm/xsmclient.man \
$(TOP)/programs/xstdcmap/xstdcmap.man \
$(TOP)/programs/Xserver/hw/sun/Xsun.man \
$(TOP)/programs/xterm/xterm.man \
diff --git a/lib/Xaw/TextSink.c b/lib/Xaw/TextSink.c
index 411cddbd8..71d89d88f 100644
--- a/lib/Xaw/TextSink.c
+++ b/lib/Xaw/TextSink.c
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.13 1999/08/15 13:00:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.14 1999/08/28 09:00:27 dawes Exp $ */
/*
* Author: Chris Peterson, MIT X Consortium.
@@ -1150,7 +1150,7 @@ DestroyTextPropertyList(XawTextPropertyList *list)
XawTextProperty *
_XawTextSinkGetProperty(XawTextPropertyList *list, XrmQuark property)
{
- if (property != NULLQUARK && list) {
+ if (property != NULLQUARK && list && list->properties) {
XawTextProperty **ptr = (XawTextProperty**)
bsearch((void*)property, list->properties, list->num_properties,
sizeof(XawTextProperty*), bcmp_qident);
@@ -1482,13 +1482,14 @@ XawTextSinkConvertPropertyList(String name, String spec, Screen *screen,
Colormap colormap, int depth)
{
XrmQuark qname = XrmStringToQuark(name);
- XawTextPropertyList **ptr = (XawTextPropertyList**)
- bsearch((void*)qname, prop_lists, num_prop_lists,
- sizeof(XawTextPropertyList*), bcmp_qident);
+ XawTextPropertyList **ptr = NULL;
XawTextPropertyList *propl, *prev = NULL;
XawTextProperty *def_prop = NULL;
String str, tok, tmp;
+ if (prop_lists) ptr = (XawTextPropertyList**)
+ bsearch((void*)qname, prop_lists, num_prop_lists,
+ sizeof(XawTextPropertyList*), bcmp_qident);
if (ptr) {
propl = *ptr;
while (propl) {
@@ -1718,7 +1719,8 @@ CvtStringToPropertyList(Display *dpy, XrmValue *args, Cardinal *num_args,
name = (String)(fromVal[0].addr);
if (w) {
- XawTextPropertyList **ptr = (XawTextPropertyList**)
+ XawTextPropertyList **ptr = NULL;
+ if (prop_lists) ptr = (XawTextPropertyList**)
bsearch((void*)XrmStringToQuark(name), prop_lists, num_prop_lists,
sizeof(XawTextPropertyList*), bcmp_qident);
diff --git a/lib/Xss/Imakefile b/lib/Xss/Imakefile
index bf4ddeaaa..369659c02 100644
--- a/lib/Xss/Imakefile
+++ b/lib/Xss/Imakefile
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.0 1996/01/16 15:01:38 dawes Exp $
+XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.1 1998/12/20 11:57:06 dawes Exp $
#define DoNormalLib NormalLibXss
#define DoSharedLib SharedLibXss
#define DoExtraLib SharedLibXss
#define DoDebugLib DebugLibXss
#define DoProfileLib ProfileLibXss
#define LibName Xss
-#define SoRev SOSSREV
+#define SoRev SOXSSREV
#define LibHeaders NO
#include <Threads.tmpl>
diff --git a/programs/Imakefile b/programs/Imakefile
index 06d10f6e3..11edca038 100644
--- a/programs/Imakefile
+++ b/programs/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/85 1998/02/26 17:14:44 kaleb $
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/programs/Imakefile,v 3.27 2000/02/23 20:29:39 dawes Exp $
+XCOMM $XFree86: xc/programs/Imakefile,v 3.28 2000/02/26 05:35:07 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
@@ -43,7 +43,9 @@ SCREENSAVESRCDIR = beforelight
XDMSRCDIR = xdm
XFINDPROXYSRCDIR = xfindproxy
XFWPSRCDIR = xfwp
+#if BuildXF86VidModeExt
XGAMMASRCDIR = xgamma
+#endif
XHOSTSRCDIR = xhost
#if BuildPlugin
XRXSRCDIR = xrx
diff --git a/programs/Xserver/hw/sun/Imakefile b/programs/Xserver/hw/sun/Imakefile
index 48f160cdb..28c3849b3 100644
--- a/programs/Xserver/hw/sun/Imakefile
+++ b/programs/Xserver/hw/sun/Imakefile
@@ -45,7 +45,7 @@ OBJS2 = sunGX.o
OBJS = $(OBJS1) $(OBJS2)
INCLUDES = -I. -I../.. -I../../mi -I../../mfb -I../../cfb -I../../cfb32 \
- -I../../include -I$(XINCLUDESRC) -I$(FONTINCSRC)
+ -I../../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC)
LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
../mfb/llib-lmfb.ln ../mi/llib-lmi.ln ../cfb/llib-lcfb.ln
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 3c2862347..142c6446b 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,25 @@
-XFree86 4.0d (14 June 2000)
+XFree86 4.0d (15 June 2000)
+ 295. Fix a buffer overflow with the -xkbmap X server flag (#A.91,
+ Trevor Johnson).
+ 294. Fix a rectangle fill problem that shows up with an AGP SiS 6326
+ (A.81, A.83, Milivoj Savin).
+ 293. Fix a problem in xcalc when the current locale uses a character
+ other than "." for the decimal point (#A.63, Stanislav Brabec).
+ 292. Allow some more parameters in linux.cf and lnxLib.rules to be
+ redefined (#A.60, Stanislav Brabec).
+ 291. Fix a typo in lib/Xss/Imakefile (#A.59, Stanislav Brabec).
+ 290. Fix an xfs crash that shows up when many clients connect (#A.48,
+ Remy Card).
+ 289. Fix some man page build problems (#A.43, Ian Collier).
+ 288. Fix xedit core dump (in Xaw) on Solaris, related to the bsearch()
+ usage (#A.42, Ian Collier).
+ 287. Add xkb mappings for the keycodes generated by the SysRq and Break
+ keys, which are different from the keycodes generated when used as
+ PrtScn and Pause (#A.29, Eric W. Biederman).
+ 286. Fix problems when building on Solaris 2.6/sparc and Irix 6.5.5
+ (#A.21, A.28, Sullivan N. Beck).
+ 285. Fix a core dump in fstobdf when using 16 bit fonts (#A.25,
+ Morten Storgaard Nielsen).
284. Clean up some of the messages printed by the neomagic driver
(David Dawes).
283. Add support for the 2360 (256ZX) to the neomagic driver, and enable
@@ -10568,4 +10589,4 @@ XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1183 2000/06/14 21:57:46 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1184 2000/06/15 01:26:20 dawes Exp $
diff --git a/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c b/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c
index 313d8551c..1a978b6bb 100644
--- a/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c
+++ b/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.15 2000/02/18 12:19:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.16 2000/03/31 20:13:35 dawes Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -164,6 +164,7 @@ SiSSetupForFillRectSolid(ScrnInfoPtr pScrn, int color, int rop,
SISPtr pSiS = SISPTR(pScrn);
sisSETFGCOLOR(color);
+ sisSETBGCOLOR(color);
sisSETROP(XAACopyROP[rop]);
sisSETPITCH(pScrn->displayWidth * pScrn->bitsPerPixel / 8,
pScrn->displayWidth * pScrn->bitsPerPixel / 8);
@@ -182,7 +183,7 @@ SiSSubsequentFillRectSolid(ScrnInfoPtr pScrn, int x, int y, int w, int h)
int destaddr, op;
destaddr = y * pScrn->displayWidth + x;
- op = sisCMDBLT | sisSRCFG | sisTOP2BOTTOM | sisLEFT2RIGHT;
+ op = sisCMDBLT | sisSRCBG | sisTOP2BOTTOM | sisLEFT2RIGHT;
if (pSiS->ClipEnabled) op |= sisCLIPINTRN | sisCLIPENABL;
destaddr *= (pScrn->bitsPerPixel / 8);
diff --git a/programs/Xserver/xkb/xkbInit.c b/programs/Xserver/xkb/xkbInit.c
index 8c79acaee..e55cf4c12 100644
--- a/programs/Xserver/xkb/xkbInit.c
+++ b/programs/Xserver/xkb/xkbInit.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.15 1998/10/04 09:39:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.16 2000/04/04 19:25:24 dawes Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -926,8 +926,13 @@ XkbProcessArguments(argc,argv,i)
}
else if (strncmp(argv[i], "-xkbmap", 7) == 0) {
if(++i < argc) {
- XkbInitialMap= argv[i];
- return 2;
+ if (strlen(argv[i]) < PATH_MAX) {
+ XkbInitialMap= argv[i];
+ return 2;
+ } else {
+ ErrorF("-xkbmap pathname too long\n");
+ return -1;
+ }
}
else {
return -1;
@@ -935,8 +940,13 @@ XkbProcessArguments(argc,argv,i)
}
else if (strncmp(argv[i], "-xkbdb", 7) == 0) {
if(++i < argc) {
- XkbDB= argv[i];
- return 2;
+ if (strlen(argv[i]) < PATH_MAX) {
+ XkbDB= argv[i];
+ return 2;
+ } else {
+ ErrorF("-xkbdb pathname too long\n");
+ return -1;
+ }
}
else {
return -1;
diff --git a/programs/fstobdf/chars.c b/programs/fstobdf/chars.c
index eef9ea509..32260f343 100644
--- a/programs/fstobdf/chars.c
+++ b/programs/fstobdf/chars.c
@@ -39,7 +39,9 @@ in this Software without prior written authorization from The Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/fstobdf/chars.c,v 3.3 1998/10/04 09:40:05 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/chars.c,v 3.4 1999/02/19 21:27:08 hohndel Exp $ */
+
+/* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */
#include <stdio.h>
#include <X11/Xlib.h>
@@ -159,19 +161,22 @@ EmitCharacters(FILE *outFile,
unsigned char *glyph;
unsigned char *glyphs;
unsigned int nChars;
- int firstChar;
- int lastChar;
- int ch;
+ int firstCharLow;
+ int firstCharHigh;
+ int lastCharLow;
+ int lastCharHigh;
+ int chLow;
+ int chHigh;
FSBitmapFormat format;
nChars = 0;
format = BYTE_ORDER | BIT_ORDER | SCANLINE_UNIT |
SCANLINE_PAD | EXTENTS;
- firstChar = (fontHeader->char_range.min_char.high << 8)
- + fontHeader->char_range.min_char.low;
- lastChar = (fontHeader->char_range.max_char.high << 8)
- + fontHeader->char_range.max_char.low;
+ firstCharLow = fontHeader->char_range.min_char.low;
+ firstCharHigh = fontHeader->char_range.min_char.high;
+ lastCharLow = fontHeader->char_range.max_char.low;
+ lastCharHigh = fontHeader->char_range.max_char.high;
(void) FSQueryXExtents16(fontServer, fontID, True, (FSChar2b *) 0, 0,
&extents);
@@ -180,10 +185,12 @@ EmitCharacters(FILE *outFile,
charInfo = extents;
/* calculate the actual number of chars */
- for (ch = 0; ch <= (lastChar - firstChar); ch++) {
+ for (chHigh = 0; chHigh <= (lastCharHigh-firstCharHigh); chHigh++) {
+ for (chLow = 0; chLow <= (lastCharLow-firstCharLow); chLow++) {
if ((charInfo->width != 0) || (charInfo->left != charInfo->right))
nChars++;
charInfo++;
+ }
}
fprintf(outFile, "CHARS %u\n", nChars);
@@ -192,19 +199,19 @@ EmitCharacters(FILE *outFile,
* actually emit the characters
*/
charInfo = extents;
- encoding = firstChar;
glyph = glyphs;
- for (ch = 0; ch <= (lastChar - firstChar); ch++) {
+ for (chHigh = firstCharHigh; chHigh <= lastCharHigh; chHigh++) {
+ for (chLow = firstCharLow; chLow <= lastCharLow; chLow++) {
int bpr;
bpr = GLWIDTHBYTESPADDED((charInfo->right - charInfo->left),
SCANLINE_PAD_BYTES);
+ encoding=(chHigh << 8)+chLow;
if ((charInfo->width != 0) || (charInfo->right != charInfo->left))
EmitBitmap(outFile, fontHeader, charInfo, encoding, bpr, glyph);
glyph += (charInfo->descent + charInfo->ascent) * bpr;
-
charInfo++;
- encoding++;
+ }
}
FSFree((char *) extents);
FSFree((char *) glyphs);
diff --git a/programs/xcalc/math.c b/programs/xcalc/math.c
index 1e864eef4..6e81dfb21 100644
--- a/programs/xcalc/math.c
+++ b/programs/xcalc/math.c
@@ -1,5 +1,5 @@
/* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $
- * $XFree86: contrib/programs/xcalc/math.c,v 3.0 1994/06/05 07:59:43 dawes Exp $
+ * $XFree86: xc/programs/xcalc/math.c,v 1.1 2000/02/13 03:26:19 dawes Exp $
*
* math.c - mathematics functions for a hand calculator under X
*
@@ -26,6 +26,7 @@
#include <setjmp.h>
#include "xcalc.h"
#include <errno.h>
+#include <X11/Xlocale.h>
#ifdef _CRAY /* kludge around Cray STDC compiler */
double (*log_p)() = log;
@@ -402,7 +403,11 @@ decf()
strcpy(dispstr,"0");
}
if (!Dpoint) {
- strcat(dispstr,".");
+#ifndef X_LOCALE
+ strcat(dispstr, localeconv()->decimal_point);
+#else
+ strcat(dispstr, ".");
+#endif
DrawDisplay();
Dpoint++;
}
diff --git a/programs/xdm/Imakefile b/programs/xdm/Imakefile
index 2fac8e2cf..05b47fcba 100644
--- a/programs/xdm/Imakefile
+++ b/programs/xdm/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/83 1997/10/05 20:42:43 kaleb $
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.33 2000/05/31 07:15:10 eich Exp $
+XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.34 2000/06/14 00:16:14 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
@@ -80,7 +80,7 @@ PAM_LIBRARIES = -lpam DlLibrary
PAM_DEFINES = -DUSE_PAM
#endif
-#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture)
+#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture)
SYS_LIBRARIES3 = -lresolv
#endif
#if SystemV || defined(SequentArchitecture)
diff --git a/programs/xdm/chooser.c b/programs/xdm/chooser.c
index 7c0e55c51..058eee492 100644
--- a/programs/xdm/chooser.c
+++ b/programs/xdm/chooser.c
@@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/xdm/chooser.c,v 3.17 1998/10/04 09:40:54 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/chooser.c,v 3.19 2000/05/31 07:15:11 eich Exp $ */
/*
* Chooser - display a menu of names and let the user select one
@@ -218,7 +218,7 @@ static int pingTry;
static XdmcpBuffer directBuffer, broadcastBuffer;
static XdmcpBuffer buffer;
-#if ((defined(SVR4) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
+#if ((defined(SVR4) && !defined(sun) && !defined(__sgi) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF)
/* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
diff --git a/programs/xfs/os/waitfor.c b/programs/xfs/os/waitfor.c
index 25770febc..8c667a6b3 100644
--- a/programs/xfs/os/waitfor.c
+++ b/programs/xfs/os/waitfor.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* $NCDId: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $
*
*/
-/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.9 1999/03/07 11:41:08 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.10 1999/08/21 13:48:52 dawes Exp $ */
#include <X11/Xos.h> /* strings, time, etc */
@@ -205,7 +205,7 @@ WaitForSomething(int *pClientsReady)
while (clientsReadable.fds_bits[i]) {
curclient = ffs(clientsReadable.fds_bits[i]) - 1;
conn = ConnectionTranslation[curclient + (i << 5)];
- FD_CLR (curclient, &clientsReadable);
+ clientsReadable.fds_bits[i] &= ~(((fd_mask)1L) << curclient);
client = clients[conn];
if (!client)
continue;
diff --git a/programs/xload/Imakefile b/programs/xload/Imakefile
index c983b9bfe..d68e59cd8 100644
--- a/programs/xload/Imakefile
+++ b/programs/xload/Imakefile
@@ -1,31 +1,21 @@
XCOMM $XConsortium: Imakefile /main/30 1996/03/09 09:37:57 kaleb $
-XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.1 2000/02/13 03:26:31 dawes Exp $
+XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.2 2000/04/05 18:14:08 dawes Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
+
#ifdef i386MachArchitecture
SYS_LIBRARIES = -lsys
-#endif
-#ifdef SVR4Architecture
-#ifdef SGIArchitecture
+#elif defined(SGIArchitecture) && !defined(MipsN32Architecture)
SYS_LIBRARIES = -lmld
-#else
-#ifdef SonyArchitecture
+#elif defined(SonyArchitecture)
SYS_LIBRARIES = -lmld
-#else
- SYS_LIBRARIES = -lelf
-#endif
-#endif
-#endif
-#if defined(SunArchitecture) && SystemV4
+#elif defined(SunArchitecture) && SystemV4
SYS_LIBRARIES = -lkvm -lelf
-#endif
-#ifdef SGIArchitecture
- SYS_LIBRARIES = -lmld
-#endif
-#ifdef OsfArchitecture
+#elif defined(SVR4Architecture)
+ SYS_LIBRARIES = -lelf
+#elif defined(OsfArchitecture)
SYS_LIBRARIES = -lld
-#endif
-#if defined(i386BsdArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
+#elif defined(i386BsdArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture)
SYS_LIBRARIES = -lutil -lkvm
#endif
SRCS = xload.c get_load.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 20:45:17 +0000