SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zap trailing whitespace and tabs

Browse source
This commit is contained in:
purplerain 2023-12-13 04:57:51 +00:00
parent 9c49429a7e
commit deeab190c1
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
76 changed files with 382 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/xedit/lisp/format.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/format.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/helper.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/helper.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/internal.h
View file

@ -11,7 +11,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/io.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/io.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

8
app/xedit/lisp/lisp.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -2596,7 +2596,7 @@ Lisp__New(LispObj *car, LispObj *cdr)
obj = objseg.freeobj;
objseg.freeobj = CDR(obj);
--objseg.nfree;
return (obj);
}
@ -2611,7 +2611,7 @@ LispNew(LispObj *car, LispObj *cdr)
objseg.freeobj = CDR(obj);
--objseg.nfree;
}
return (obj);
}
@ -3251,7 +3251,7 @@ LispImportSymbol(LispObj *symbol)
/* Continued from error, redefine variable */
LispDecrementAtomReference(atom);
atom->property = symbol->data.atom->property;
atom->a_object = atom->a_function = atom->a_builtin =
atom->a_property = atom->a_defsetf = atom->a_defstruct = 0;

2
app/xedit/lisp/lisp.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/lsp.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/math.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/math.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

30
app/xedit/lisp/mathimp.c
View file

@ -3212,7 +3212,7 @@ ndivide_xi_xr(n_number *num, LispObj *div, int fun, int flo)
mpi_init(quo);
if (NRTYPE(num) == N_FIXNUM)
mpi_seti(quo, NRFI(num));
else
else
mpi_set(quo, NRBI(num));
rem = XALLOC(mpr);
@ -3240,7 +3240,7 @@ ndivide_xi_xr(n_number *num, LispObj *div, int fun, int flo)
NIFRD(num) = mpi_geti(mpr_den(rem));
}
mpr_clear(rem);
XFREE(rem);
XFREE(rem);
}
else {
if (mpi_fiti(mpr_den(rem)) && mpi_geti(mpr_den(rem)) == 1) {
@ -4217,7 +4217,7 @@ rop_fi_br_as_xr(n_real *real, mpr *ratio, int nop)
mpi_clear(&iop);
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static void
@ -4362,7 +4362,7 @@ rdiv_bi_bi(n_real *real, mpi *bignum)
RCLEAR_BI(real);
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE int
@ -4511,7 +4511,7 @@ rop_bi_br_md_xr(n_real *real, mpr *bigratio, int nop)
RCLEAR_BI(real);
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -4688,7 +4688,7 @@ rop_fr_bi_as_xr(n_real *real, mpi *bignum, int nop)
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static void
@ -4706,7 +4706,7 @@ rop_fr_bi_md_xr(n_real *real, mpi *bignum, int nop)
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -4917,7 +4917,7 @@ rop_fr_br_asmd_xr(n_real *real, mpr *bigratio, int nop)
RBR(real) = bigr;
RTYPE(real) = N_BIGRATIO;
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -4984,7 +4984,7 @@ rop_br_fi_asmd_xr(n_real *real, long fixnum, int nop)
mpr_divi(bigratio, bigratio, fixnum);
break;
}
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -5043,7 +5043,7 @@ rop_br_bi_as_xr(n_real *real, mpi *bignum, int nop)
else
mpi_sub(RBRN(real), RBRN(real), &iop);
mpi_clear(&iop);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -5114,7 +5114,7 @@ rop_br_fr_asmd_xr(n_real *real, long num, long den, int nop)
break;
}
mpr_clear(&rop);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
@ -5163,28 +5163,28 @@ static INLINE void
radd_br_br(n_real *real, mpr *bigratio)
{
mpr_add(RBR(real), RBR(real), bigratio);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
rsub_br_br(n_real *real, mpr *bigratio)
{
mpr_sub(RBR(real), RBR(real), bigratio);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
rmul_br_br(n_real *real, mpr *bigratio)
{
mpr_mul(RBR(real), RBR(real), bigratio);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE void
rdiv_br_br(n_real *real, mpr *bigratio)
{
mpr_div(RBR(real), RBR(real), bigratio);
rbr_canonicalize(real);
rbr_canonicalize(real);
}
static INLINE int

2
app/xedit/lisp/modules/lisp.lsp
View file

@ -10,7 +10,7 @@
;;
;; The above copyright notice and this permission notice shall be included in
;; all copies or substantial portions of the Software.
;;
;;
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/modules/progmodes/patch.lsp
View file

@ -39,7 +39,7 @@
(syntoken "^(\\d+d\\d+|\\d+a\\d+,\\d+)$" :property *prop-keyword*)
(syntoken "^<.*" :property *prop-constant*)
(syntoken "^>.*" :property *prop-preprocessor*)
;; context diff
(syntoken "^\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*"
:property *prop-string*)

2
app/xedit/lisp/modules/psql.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/modules/x11.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/modules/xaw.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

8
app/xedit/lisp/modules/xt.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -1464,7 +1464,7 @@ LispConvertResources(LispObj *list, Widget widget,
{
char c1;
short c2;
int c4;
int c4;
#ifdef LONG64
long c8;
#endif
@ -1652,7 +1652,7 @@ bcmp_action_resource(_Xconst void *string, _Xconst void *resource)
{
return (strcmp((String)string,
XrmQuarkToString((*(ResourceInfo**)resource)->qname)));
}
}
static ResourceInfo *
GetResourceInfo(char *name, ResourceList *rlist, ResourceList *plist)
@ -1693,7 +1693,7 @@ bcmp_action_resource_list(_Xconst void *wc, _Xconst void *list)
static ResourceList *
FindResourceList(WidgetClass wc)
{
{
ResourceList **list;
if (!resource_list)

2
app/xedit/lisp/mp/mp.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/mp/mp.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/mp/mpi.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/mp/mpr.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/package.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/package.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/pathname.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/pathname.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/private.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

6
app/xedit/lisp/read.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -238,7 +238,7 @@ const LispCharInfo LispChars[256] = {
{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}
};
Atom_id Sand, Sor, Snot;
@ -1619,7 +1619,7 @@ LispReadFunction(read_info *info)
if (info->discard)
return (function);
if (INVALIDP(function))
if (INVALIDP(function))
READ_ERROR_INVARG();
else if (CONSP(function)) {
if (CAR(function) != Olambda)

2
app/xedit/lisp/read.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/regex.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/regex.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/require.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/require.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/stream.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/stream.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/string.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/string.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/struct.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/struct.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/test/hello.lsp
View file

@ -10,7 +10,7 @@
;;
;; The above copyright notice and this permission notice shall be included in
;; all copies or substantial portions of the Software.
;;
;;
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/test/list.lsp
View file

@ -902,7 +902,7 @@
(eql-test 0 #'list-length '())
(eql-test 0 #'list-length nil)
(defun circular-list (&rest elements)
(let ((cycle (copy-list elements)))
(let ((cycle (copy-list elements)))
(nconc cycle cycle)))
(eq-test nil #'list-length (circular-list 'a 'b))
(eq-test nil #'list-length (circular-list 'a))

2
app/xedit/lisp/test/math.lsp
View file

@ -337,7 +337,7 @@
;; fixratio fixnum
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(test 23502480199/57 #'+ 1/57 412324214)
(test -1608505/39 #'- 11/39 41244)
(test -1608505/39 #'- 11/39 41244)
(test 241844976595/3121 #'* 45245/3121 5345231)
(test 4231/30211050 #'/ 4231/67890 445)
(bool-test nil #'< 43123/12 -3432)

2
app/xedit/lisp/test/psql-1.lsp
View file

@ -1,7 +1,7 @@
;; Postgresql C library interface, example program 1, using the xedit
;; lisp interface
;; Test the C version of libpq, the PostgreSQL frontend library.
;; Test the C version of libpq, the PostgreSQL frontend library.
(require "psql")
(defun exit-nicely (conn)

2
app/xedit/lisp/test/stream.lsp
View file

@ -676,7 +676,7 @@ more text" #'get-output-stream-string os)
;; write-char - function
(equal-eval "a b"
'(with-output-to-string (s)
'(with-output-to-string (s)
(write-char #\a s)
(write-char #\Space s)
(write-char #\b s)))

2
app/xedit/lisp/test/widgets.lsp
View file

@ -10,7 +10,7 @@
;;
;; The above copyright notice and this permission notice shall be included in
;; all copies or substantial portions of the Software.
;;
;;
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/time.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/time.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/write.c
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/write.h
View file

@ -10,7 +10,7 @@
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
app/xedit/lisp/xedit.c
View file

@ -1168,7 +1168,7 @@ Xedit_Insert(LispBuiltin *builtin)
text = ARGUMENT(0);
CHECK_STRING(text);
block.firstPos = 0;
block.format = FMT8BIT;
block.length = STRLEN(text);

26
app/xgamma/xgamma.c
View file

@ -1,24 +1,24 @@
/*
* Copyright 1999 The XFree86 Project
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*
* Written by David Bateman
*/
@ -77,7 +77,7 @@ Syntax(const char *errmsg)
* whether or not the given string is an abbreviation of the arg.
*/
static Bool
static Bool
isabbreviation(const char *arg, const char *s, size_t minslen)
{
size_t arglen;
@ -205,7 +205,7 @@ main(int argc, char *argv[])
}
/* Fail if the extension version in the server is too old */
if (MajorVersion < MINMAJOR ||
if (MajorVersion < MINMAJOR ||
(MajorVersion == MINMAJOR && MinorVersion < MINMINOR)) {
fprintf(stderr,
"Xserver is running an old XFree86-VidModeExtension version"

2
app/xinput/src/list.c
View file

@ -315,7 +315,7 @@ list_xi2(Display *display,
else
printf("+ ");
}
print_info_xi2(display, dev, format);
for (j = 0; j < ndevices; j++)
{

0
app/xlockmore/etc/xlockmore.desktop Normal file → Executable file
View file

62
app/xmag/Scale.c
View file

@ -196,7 +196,7 @@ ScaleClassRec scaleClassRec = {
WidgetClass scaleWidgetClass = (WidgetClass) &scaleClassRec;
/*
* Private Procedures
@ -208,7 +208,7 @@ ClassInitialize(void)
{
}
static void
GetGC(ScaleWidget sw)
@ -226,7 +226,7 @@ GetGC(ScaleWidget sw)
&values);
}
static void
@ -244,7 +244,7 @@ GetInitialScaleValues(ScaleWidget sw)
sw->scale.scale_x = sw->scale.scale_y = 1.0;
}
static void
GetRectangleBuffer(ScaleWidget sw, Cardinal buffer_size)
@ -264,7 +264,7 @@ GetRectangleBuffer(ScaleWidget sw, Cardinal buffer_size)
sw->scale.buffer_size = buffer_size;
}
/* ARGSUSED */
static void
@ -335,7 +335,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
}
}
static void
BuildTable(ScaleWidget sw)
@ -372,7 +372,7 @@ BuildTable(ScaleWidget sw)
}
}
static void
FlushRectangles(ScaleWidget sw, Drawable drawable, GC gc)
@ -383,7 +383,7 @@ FlushRectangles(ScaleWidget sw, Drawable drawable, GC gc)
sw->scale.nrectangles = 0;
}
static void
FillRectangle(ScaleWidget sw, Drawable drawable, GC gc,
@ -401,7 +401,7 @@ FillRectangle(ScaleWidget sw, Drawable drawable, GC gc,
++sw->scale.nrectangles;
}
static void
ScaleImage(ScaleWidget sw, Drawable drawable, Position img_x, Position img_y,
@ -488,7 +488,7 @@ ScaleImage(ScaleWidget sw, Drawable drawable, Position img_x, Position img_y,
}
}
static int
FindPixel(ScaleWidget sw, Position x, Position y,
@ -524,7 +524,7 @@ FindPixel(ScaleWidget sw, Position x, Position y,
return (0);
}
int
SWGetImagePixel(Widget w, Position x, Position y,
@ -541,7 +541,7 @@ SWGetImagePixel(Widget w, Position x, Position y,
return FindPixel(sw, x, y, img_x, img_y, img_pixel);
}
/* ARGSUSED */
static void
@ -594,7 +594,7 @@ Redisplay(Widget w, XEvent *event, Region region)
}
}
static void
TryResize(ScaleWidget sw)
@ -619,7 +619,7 @@ TryResize(ScaleWidget sw)
}
}
static void
Precision(ScaleWidget sw)
@ -633,7 +633,7 @@ Precision(ScaleWidget sw)
* sw->scale.precision;
}
static void
Proportional(ScaleWidget sw)
@ -670,7 +670,7 @@ Proportional(ScaleWidget sw)
XtWarning("can not preserve aspect ratio");
}
static void
GetScaledSize(ScaleWidget sw)
@ -681,7 +681,7 @@ GetScaledSize(ScaleWidget sw)
max(myrint(sw->scale.scale_y * sw->scale.image->height), 1);
}
static void
GetScaleValues(ScaleWidget sw)
@ -699,7 +699,7 @@ GetScaleValues(ScaleWidget sw)
/ (float) sw->scale.image->height;
}
static void
Unscale(ScaleWidget sw)
@ -711,7 +711,7 @@ Unscale(ScaleWidget sw)
BuildTable(sw);
}
static void
Autoscale(ScaleWidget sw)
@ -727,7 +727,7 @@ Autoscale(ScaleWidget sw)
BuildTable(sw);
}
static void
PositionImage(ScaleWidget sw)
@ -752,7 +752,7 @@ PositionImage(ScaleWidget sw)
*****/
}
static void
Resize(Widget w)
@ -764,7 +764,7 @@ Resize(Widget w)
PositionImage(sw);
}
static void
Realize(Widget wid, Mask *vmask, XSetWindowAttributes *attr)
@ -774,7 +774,7 @@ Realize(Widget wid, Mask *vmask, XSetWindowAttributes *attr)
(Visual *) sw->scale.visual, *vmask, attr);
}
static void
Destroy(Widget w)
@ -793,7 +793,7 @@ Destroy(Widget w)
XDestroyImage(sw->scale.image);
}
/* ARGSUSED */
static Boolean
@ -938,7 +938,7 @@ SetValues(Widget current, Widget request, Widget new,
return(redisplay);
}
void
SWUnscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
@ -950,7 +950,7 @@ SWUnscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
XClearArea(XtDisplay(w), XtWindow(w), 0, 0, 0, 0, True);
}
void
SWAutoscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
@ -962,7 +962,7 @@ SWAutoscale(Widget w, XEvent *event, String *params, Cardinal *num_params)
XClearArea(XtDisplay(w), XtWindow(w), 0, 0, 0, 0, True);
}
void
SWInitialSize(Widget w, XEvent *event, String *params, Cardinal *num_params)
@ -981,7 +981,7 @@ SWInitialSize(Widget w, XEvent *event, String *params, Cardinal *num_params)
XClearArea(XtDisplay(w), XtWindow(w), 0, 0, 0, 0, True);
}
void
SWSetImage(Widget w, XImage *image)
@ -994,7 +994,7 @@ SWSetImage(Widget w, XImage *image)
XtSetValues(w, wargs, n);
}
void
@ -1003,7 +1003,7 @@ RequestSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
SWRequestSelection(w, event->xbutton.time);
}
void
GrabSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
@ -1011,7 +1011,7 @@ GrabSelection(Widget w, XEvent *event, String *params, Cardinal *num_params)
SWGrabSelection(w, event->xbutton.time);
}
Pixmap
SWGetPixmap(Widget w)

64
app/xmag/xmag.c
View file

@ -56,7 +56,7 @@ from The Open Group.
#define max(a, b) ((a) > (b) ? (a) : (b))
#endif
/* highlight interval (in milliseconds) */
#define HLINTERVAL 100
@ -101,7 +101,7 @@ typedef struct {
Widget scaleShell, scaleInstance, pixShell, pixLabel, cmapWinList [2];
} hlStruct, *hlPtr;
/* global variables */
static XtAppContext app;
@ -179,7 +179,7 @@ static XrmOptionDescRec optionDesc[] = {
{"-title", "*title", XrmoptionSepArg, (XtPointer)NULL},
};
/* action table */
@ -195,7 +195,7 @@ static XtActionsRec actions_table[] = {
{"select-region", SelectRegionAP}
};
/*
* Error() -- Error handler: Catch a bad match in magnifying an
@ -228,7 +228,7 @@ CloseAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
XtDestroyWidget(w);
}
/*
* SetCmapPropsAP() -- Put the scale widget first in WM_COLORMAP_WINDOWS
@ -248,7 +248,7 @@ SetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
}
}
/*
* UnsetCmapPropsAP() -- Put the shell first in WM_COLORMAP_WINDOWS
@ -268,7 +268,7 @@ UnsetCmapPropsAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
}
}
/*
* NewAP() -- Create an additional xmag dialog. THIS IS A COPY OF NewEH
@ -280,7 +280,7 @@ NewAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
StartRootPtrGrab(True, NULL);
}
/*
* ReplaceAP() -- Replace this particular xmag dialog.
@ -295,7 +295,7 @@ ReplaceAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
StartRootPtrGrab(False, data);
}
/*
* PopupPixelAP() -- Show pixel information.
@ -343,7 +343,7 @@ PopupPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
UpdatePixelAP(w, event, NULL, NULL);
}
/*
* UpdatePixelAP() -- Update pixel information.
@ -379,7 +379,7 @@ UpdatePixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
}
}
/*
* PopdownPixelAP() -- Remove pixel info.
@ -399,7 +399,7 @@ PopdownPixelAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
XtPopdown(data->pixShell);
}
static void /* ARGSUSED */
SelectRegionAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
@ -419,7 +419,7 @@ SelectRegionAP(Widget w, XEvent *event, String *params, Cardinal *num_params)
******/
}
/*
* CheckPoints() -- Change the cursor for the correct quadrant.
@ -445,7 +445,7 @@ CheckPoints(Position *x1, Position *x2, Position *y1, Position *y2)
if (*y2 < *y1) { tmp = *y1; *y1 = *y2; *y2 = tmp; }
}
/*
* HighlightTO() -- Timer to highlight the selection box
@ -481,7 +481,7 @@ HighlightTO(XtPointer closure, XtIntervalId *id) /* ARGSUSED */
XtAppAddTimeOut(app, HLINTERVAL, HighlightTO, (XtPointer)data);
}
/*
* CloseCB() -- Delete this xmag dialog. If its the only one on the screen
@ -496,7 +496,7 @@ CloseCB(Widget w, XtPointer clientData, XtPointer callData)
XtDestroyWidget(shell);
}
/*
* ReplaceCB() -- Replace this particular xmag dialog.
@ -508,7 +508,7 @@ ReplaceCB(Widget w, XtPointer clientData, XtPointer callData)
StartRootPtrGrab(False, data);
}
/*
* NewCB() -- Create an additional xmag dialog.
@ -519,7 +519,7 @@ NewCB(Widget w, XtPointer clientData, XtPointer callData)
StartRootPtrGrab(True, NULL);
}
/*
* SelectCB() -- Own the primary selection.
@ -531,7 +531,7 @@ SelectCB(Widget w, XtPointer clientData, XtPointer callData)
SWGrabSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
}
/*
* PasteCB() -- Paste from the primary selection into xmag.
@ -543,7 +543,7 @@ PasteCB(Widget w, XtPointer clientData, XtPointer callData)
SWRequestSelection(data->scaleInstance, XtLastTimestampProcessed(dpy));
}
/*
* SetupGC() -- Graphics context for magnification selection.
@ -558,7 +558,7 @@ SetupGC(void)
&selectGCV);
}
/*
* FindWindow() -- Determine window the pointer is over.
@ -589,7 +589,7 @@ FindWindow(int x, int y) /* Location of cursor */
return findW;
}
/*
* ResizeEH() -- Event Handler for resize of selection box.
@ -628,7 +628,7 @@ ResizeEH(Widget w, XtPointer closure, XEvent *event,
}
}
/*
* DragEH() -- Event Handler for dragging selection box.
@ -689,7 +689,7 @@ DragEH(Widget w, XtPointer closure, XEvent *event,
}
/*
* StartRootPtrGrab() -- Bring up the selection box.
@ -727,7 +727,7 @@ StartRootPtrGrab(int new, /* do we create a new scale instance? */
(void) XtAppAddTimeOut(app, HLINTERVAL, HighlightTO, (XtPointer)hlData);
}
/*
* CreateRoot() -- Create a root window widget. If the user specified x and y
@ -837,7 +837,7 @@ GetImageAndAttributes(Window w, int x, int y, int width, int height,
}
}
/*
* Get_XColors() Get the XColors of all pixels in image - returns # of colors
@ -889,7 +889,7 @@ Get_XColors(XWindowAttributes *win_info, XColor **colors)
return(ncolors);
}
#define Intensity(cptr) (3.0*cptr->red+0.59*cptr->green+0.11*cptr->blue)
@ -943,7 +943,7 @@ GetMinIntensity(hlPtr data)
return BlackPixel(dpy, scr);
}
static Widget pane1, pane2, pane3, cclose, replace, new, select_w, paste;
@ -1027,7 +1027,7 @@ PopupNewScale(hlPtr data)
}
}
/*
* RedoOldScale() -- If the visual, depth, or colormap has changed, unrealize
@ -1071,7 +1071,7 @@ RedoOldScale(hlPtr data)
XtManageChild(data->scaleInstance);
}
/*
* InitCursors() -- Create our cursors for area selection.
@ -1085,7 +1085,7 @@ InitCursors(void)
llAngle = XCreateFontCursor(dpy, XC_ll_angle);
}
/*
* ParseSourceGeom() -- Determine dimensions of area to magnify from resources.
@ -1103,7 +1103,7 @@ ParseSourceGeom(void)
/* mag */
}
/*
* Main program.

8
app/xmessage/makeform.c
View file

@ -51,7 +51,7 @@ typedef struct _ButtonRecord {
Widget widget;
} ButtonRecord;
static void
static void
unquote_pairs (ButtonRecord *br, int n)
{
int i;
@ -80,7 +80,7 @@ unquote_pairs (ButtonRecord *br, int n)
* sets brptr to point to parsed table
* returns 0 if successful, -1 if not
*/
static int
static int
parse_name_and_exit_code_list (char *buttonlist, ButtonRecord **brptr)
{
char *cp;
@ -197,7 +197,7 @@ parse_name_and_exit_code_list (char *buttonlist, ButtonRecord **brptr)
}
/* ARGSUSED */
static void
static void
handle_button (Widget w, XtPointer closure, XtPointer client_data)
{
ButtonRecord *br = (ButtonRecord *) closure;
@ -207,7 +207,7 @@ handle_button (Widget w, XtPointer closure, XtPointer client_data)
exit (br->exitstatus);
}
Widget
Widget
make_queryform(Widget parent, /* into whom widget should be placed */
char *msgstr, /* message string */
int msglen, /* characters in msgstr */

2
app/xmessage/readfile.c
View file

@ -38,7 +38,7 @@ from the X Consortium.
#include "readfile.h"
/*
* get_data_from_file - read data from a file into a single buffer; meant
* get_data_from_file - read data from a file into a single buffer; meant
* for small files containing messages.
*/
static char *

8
app/xmessage/readfile.h
View file

@ -1,7 +1,7 @@
/* $XFree86: xc/programs/xmessage/readfile.h,v 1.1 2003/04/14 23:03:13 herrb Exp $ */
/*
* Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
*
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
@ -9,10 +9,10 @@
* modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -20,7 +20,7 @@
* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
* Except as contained in this notice, the name of the XFree86 Project
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written

10
app/xmessage/xmessage.c
View file

@ -59,7 +59,7 @@ static struct _QueryResources {
#define offset(field) XtOffsetOf(struct _QueryResources, field)
static XtResource resources[] = {
{ "file", "File", XtRString, sizeof (char *),
{ "file", "File", XtRString, sizeof (char *),
offset(file), XtRString, (XtPointer) NULL },
{ "buttons", "Buttons", XtRString, sizeof (char *),
offset(button_list), XtRString, (XtPointer) "okay:0" },
@ -100,7 +100,7 @@ static String fallback_resources[] = {
* usage
*/
static void
static void
usage (FILE *outf)
{
static const char *options[] = {
@ -136,7 +136,7 @@ exit_action(Widget w, XEvent *event, String *params, Cardinal *num_params)
if(event->type == ClientMessage
&& event->xclient.data.l[0] != wm_delete_window)
return;
if (*num_params == 1)
exit_status = atoi(params[0]);
exit(exit_status);
@ -146,7 +146,7 @@ int default_exitstatus = -1; /* value of button named by -default */
/* ARGSUSED */
static void
default_exit_action(Widget w, XEvent *event, String *params,
default_exit_action(Widget w, XEvent *event, String *params,
Cardinal *num_params)
{
if (default_exitstatus >= 0)
@ -160,7 +160,7 @@ detab (char **messagep, int *lengthp)
{
int i, n, col, psize;
char *p;
/* count how many tabs there are */
n = 0;
for (i = 0; i < *lengthp; i++)

8
app/xmessage/xmessage.h
View file

@ -1,7 +1,7 @@
/* $XFree86: xc/programs/xmessage/xmessage.h,v 1.2 2003/09/13 21:33:11 dawes Exp $ */
/*
* Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
*
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
@ -9,10 +9,10 @@
* modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -20,7 +20,7 @@
* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
* Except as contained in this notice, the name of the XFree86 Project
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written

24
app/xmodmap/exec.c
View file

@ -111,7 +111,7 @@ mapping_busy_pointer(int timeout)
"%s: please release the following buttons within %d seconds:\n",
ProgramName, timeout);
for (i = 0; i < 5; i++) {
if (mask & masks[i])
if (mask & masks[i])
fprintf (stderr, " Button%d\n", i+1);
}
sleep (timeout);
@ -124,7 +124,7 @@ mapping_busy_pointer(int timeout)
* and deals with retransmissions due to the keyboard being busy.
*/
int
int
UpdateModifierMapping(XModifierKeymap *map)
{
int retries, timeout;
@ -160,7 +160,7 @@ UpdateModifierMapping(XModifierKeymap *map)
* AddModifier - this adds a keycode to the modifier list
*/
int
int
AddModifier(XModifierKeymap **mapp, KeyCode keycode, int modifier)
{
if (keycode) {
@ -177,7 +177,7 @@ AddModifier(XModifierKeymap **mapp, KeyCode keycode, int modifier)
* DeleteModifier - this removes a keycode from the modifier list
*/
int
int
RemoveModifier(XModifierKeymap **mapp, KeyCode keycode, int modifier)
{
if (keycode) {
@ -194,7 +194,7 @@ RemoveModifier(XModifierKeymap **mapp, KeyCode keycode, int modifier)
* ClearModifier - this removes all entries from the modifier list
*/
int
int
ClearModifier(XModifierKeymap **mapp, int modifier)
{
int i;
@ -231,7 +231,7 @@ PrintModifierMapping(XModifierKeymap *map, FILE *fp)
int keysyms_per_keycode = GetKeysymsPerKeycode();
fprintf (fp,
"%s: up to %d keys per modifier, (keycodes in parentheses):\n\n",
"%s: up to %d keys per modifier, (keycodes in parentheses):\n\n",
ProgramName, map->max_keypermod);
for (int i = 0; i < 8; i++) {
fprintf(fp, "%-10s", modifier_table[i].name);
@ -247,7 +247,7 @@ PrintModifierMapping(XModifierKeymap *map, FILE *fp)
} while ( !ks && index < keysyms_per_keycode);
nm = XKeysymToString(ks);
fprintf (fp, "%s %s (0x%0x)", (j > 0 ? "," : ""),
fprintf (fp, "%s %s (0x%0x)", (j > 0 ? "," : ""),
(nm ? nm : "BadKey"), map->modifiermap[k]);
}
k++;
@ -276,8 +276,8 @@ PrintKeyTable(Bool exprs, FILE *fp)
return;
}
if (!exprs) {
fprintf (fp,
"There are %d KeySyms per KeyCode; KeyCodes range from %d to %d.\n\n",
fprintf (fp,
"There are %d KeySyms per KeyCode; KeyCodes range from %d to %d.\n\n",
keysyms_per_keycode, min_keycode, max_keycode);
fprintf (fp, " KeyCode\tKeysym (Keysym)\t...\n");
fprintf (fp, " Value \tValue (Name) \t...\n\n");
@ -301,7 +301,7 @@ PrintKeyTable(Bool exprs, FILE *fp)
else
s = "NoSymbol";
if (!exprs)
fprintf (fp, "0x%04x (%s)\t",
fprintf (fp, "0x%04x (%s)\t",
(unsigned int)ks, s ? s : "no name");
else if (s)
fprintf (fp, " %s", s);
@ -329,7 +329,7 @@ PrintPointerMap(FILE *fp)
fprintf (fp, " Button Code\n");
/* " ### ###\n" */
for (i = 0; i < count; i++) {
fprintf (fp, " %3u %3u\n",
fprintf (fp, " %3u %3u\n",
i+1, (unsigned int) pmap[i]);
}
fprintf (fp, "\n");
@ -341,7 +341,7 @@ PrintPointerMap(FILE *fp)
* SetPointerMap - set the pointer map
*/
int
int
SetPointerMap(unsigned char *map, int n)
{
unsigned char defmap[MAXBUTTONCODES];

90
app/xmodmap/handle.c
View file

@ -48,7 +48,7 @@ static XModifierKeymap *map = NULL;
/*
* The routines in this file manipulate a queue of intructions. Instead of
* executing each line as it is entered, we build up a list of actions to
* executing each line as it is entered, we build up a list of actions to
* take and execute them all at the end. This allows us to find all errors
* at once, and to preserve the context in which we are looking up keysyms.
*/
@ -148,7 +148,7 @@ badheader(void)
#define badmsgn(what,s,len) badmsg (what, copy_to_scratch (s, len))
void
void
initialize_map (void)
{
map = XGetModifierMapping (dpy);
@ -157,7 +157,7 @@ initialize_map (void)
static void do_keycode ( char *line, int len );
static void do_keysym ( char *line, int len );
static void finish_keycodes ( const char *line, int len, KeyCode *keycodes,
static void finish_keycodes ( const char *line, int len, KeyCode *keycodes,
int count );
static void do_add ( char *line, int len );
static void do_remove ( char *line, int len );
@ -189,7 +189,7 @@ static struct dt {
* and trailing whitespace removed) and builds up the work queue.
*/
void
void
handle_line(char *line, /* string to parse */
int len) /* length of line */
{
@ -221,9 +221,9 @@ handle_line(char *line, /* string to parse */
/*
* the following routines are useful for parsing
*/
*/
static int
static int
skip_word (const char *s, int len)
{
register int n;
@ -232,7 +232,7 @@ skip_word (const char *s, int len)
return (n + skip_space (s+n, len-n));
}
static int
static int
skip_chars(const char *s, int len)
{
register int i;
@ -245,7 +245,7 @@ skip_chars(const char *s, int len)
return (i);
}
static int
static int
skip_space(const char *s, int len)
{
register int i;
@ -259,7 +259,7 @@ skip_space(const char *s, int len)
}
static int
static int
skip_until_char(const char *s, int len, char c)
{
register int i;
@ -302,7 +302,7 @@ add_to_work_queue(union op *p) /* this can become a macro someday */
return;
}
static Bool
static Bool
parse_number(const char *str, unsigned long *val)
{
const char *fmt = "%ld";
@ -324,7 +324,7 @@ parse_number(const char *str, unsigned long *val)
return (sscanf (str, fmt, val) == 1);
}
static Bool
static Bool
parse_keysym(const char *line, int n, char **name, KeySym *keysym)
{
*name = copy_to_scratch (line, n);
@ -348,7 +348,7 @@ parse_keysym(const char *line, int n, char **name, KeySym *keysym)
* listed.
*/
static void
static void
do_keycode(char *line, int len)
{
int dummy;
@ -396,7 +396,7 @@ do_keycode(char *line, int len)
* The left keysyms has to be checked for validity and evaluated.
*/
static void
static void
do_keysym(char *line, int len)
{
int n;
@ -437,17 +437,17 @@ do_keysym(char *line, int len)
finish_keycodes (line, len, keycodes, n);
}
static void
static void
finish_keycodes(const char *line, int len, KeyCode *keycodes, int count)
{
int n;
KeySym *kslist;
union op *uop;
struct op_keycode *opk;
n = skip_until_char (line, len, '=');
line += n, len -= n;
if (len < 1 || *line != '=') { /* = minimum */
badmsg0 ("keycode command (missing keysym list),");
return;
@ -501,7 +501,7 @@ struct modtab modifier_table[] = { /* keep in order so it can be index */
{ "ctrl", 4, 2 },
{ NULL, 0, 0 }};
static int
static int
parse_modifier(char *line, int n)
{
register int i;
@ -529,7 +529,7 @@ parse_modifier(char *line, int n)
* is not important. There should also be an alias Ctrl for control.
*/
static void
static void
do_add(char *line, int len)
{
int n;
@ -593,7 +593,7 @@ do_add(char *line, int len)
/*
* make_add - stick a single add onto the queue
*/
static void
static void
make_add(int modifier, KeySym keysym)
{
union op *uop;
@ -633,7 +633,7 @@ make_add(int modifier, KeySym keysym)
* is not important. There should also be an alias Ctrl for control.
*/
static void
static void
do_remove(char *line, int len)
{
int n;
@ -708,7 +708,7 @@ do_remove(char *line, int len)
if (verbose) {
int j;
char *tmpname = XKeysymToString (kslist[i]);
printf ("! Keysym %s (0x%lx) corresponds to keycode(s)",
printf ("! Keysym %s (0x%lx) corresponds to keycode(s)",
tmpname ? tmpname : "?", (long) kslist[i]);
for (j = 0; j < num_kcs; j++)
printf(" 0x%x", kcs[j]);
@ -751,7 +751,7 @@ do_remove(char *line, int len)
/*
* make_remove - stick a single remove onto the queue
*/
static void
static void
make_remove(int modifier, KeyCode keycode)
{
union op *uop;
@ -790,7 +790,7 @@ make_remove(int modifier, KeyCode keycode)
* ^
*/
static void
static void
do_clear(char *line, int len)
{
int n;
@ -831,7 +831,7 @@ do_clear(char *line, int len)
}
#ifndef HAVE_STRNCASECMP
static int
static int
strncasecmp(const char *a, const char *b, int n)
{
int i;
@ -858,7 +858,7 @@ strncasecmp(const char *a, const char *b, int n)
* ^
*/
static void
static void
do_pointer(char *line, int len)
{
int n;
@ -914,15 +914,15 @@ do_pointer(char *line, int len)
line += n, len -= n;
}
}
if (i > 0 && i != nbuttons) {
if (i < nbuttons) {
fprintf (stderr,
fprintf (stderr,
"Warning: Only changing the first %d of %d buttons.\n",
i, nbuttons);
}
else { /* i > nbuttons */
fprintf (stderr,
else { /* i > nbuttons */
fprintf (stderr,
"Warning: Not changing %d extra buttons beyond %d.\n",
i - nbuttons, nbuttons);
}
@ -958,7 +958,7 @@ do_pointer(char *line, int len)
* and adding it to the list.
*/
static int
static int
get_keysym_list(const char *line, int len, int *np, KeySym **kslistp)
{
int havesofar, maxcanhave;
@ -1036,7 +1036,7 @@ get_keysym_list(const char *line, int len, int *np, KeySym **kslistp)
* 8 by map->max_keypermod keycodes.
*/
static void
static void
check_special_keys(KeyCode keycode, int n, KeySym *kslist)
{
int i; /* iterator variable */
@ -1094,7 +1094,7 @@ check_special_keys(KeyCode keycode, int n, KeySym *kslist)
* print_work_queue - disassemble the work queue and print it on stdout
*/
void
void
print_work_queue(void)
{
union op *op;
@ -1106,7 +1106,7 @@ print_work_queue(void)
return;
}
static void
static void
print_opcode(union op *op)
{
int i;
@ -1170,7 +1170,7 @@ static int exec_clear ( struct op_clearmodifier *opcm );
static int exec_pointer ( struct op_pointer *opp );
int
int
execute_work_queue (void)
{
union op *op;
@ -1204,7 +1204,7 @@ execute_work_queue (void)
while (XCheckTypedEvent (dpy, MappingNotify, &event)) ;
XRefreshKeyboardMapping (&event.xmapping);
} else {
fprintf (stderr, "%s: unknown event %ld\n",
fprintf (stderr, "%s: unknown event %ld\n",
ProgramName, (long) event.type);
}
}
@ -1234,7 +1234,7 @@ execute_work_queue (void)
if (exec_pointer (&op->pointer) < 0) errors++;
break;
default:
fprintf (stderr, "%s: unknown opcode %d\n",
fprintf (stderr, "%s: unknown opcode %d\n",
ProgramName, op->generic.type);
break;
}
@ -1247,7 +1247,7 @@ execute_work_queue (void)
return (errors > 0 ? -1 : 0);
}
static int
static int
exec_keycode(struct op_keycode *opk)
{
if (!opk->target_keycode) {
@ -1283,13 +1283,13 @@ exec_keycode(struct op_keycode *opk)
XChangeKeyboardMapping (dpy, opk->target_keycode, 1,
&dummy, 1);
} else {
XChangeKeyboardMapping (dpy, opk->target_keycode, opk->count,
XChangeKeyboardMapping (dpy, opk->target_keycode, opk->count,
opk->keysyms, 1);
}
return (0);
}
static int
static int
exec_add(struct op_addmodifier *opam)
{
int i;
@ -1311,7 +1311,7 @@ exec_add(struct op_addmodifier *opam)
return (status);
}
static int
static int
exec_remove(struct op_removemodifier *oprm)
{
int i;
@ -1325,34 +1325,34 @@ exec_remove(struct op_removemodifier *oprm)
return (status);
}
static int
static int
exec_clear(struct op_clearmodifier *opcm)
{
return (ClearModifier (&map, opcm->modifier));
}
static int
static int
exec_pointer(struct op_pointer *opp)
{
return (SetPointerMap (opp->button_codes, opp->count));
}
void
void
print_modifier_map(void)
{
PrintModifierMapping (map, stdout);
return;
}
void
void
print_key_table(Bool exprs)
{
PrintKeyTable (exprs, stdout);
return;
}
void
void
print_pointer_map(void)
{
PrintPointerMap (stdout);

44
app/xmodmap/man/xmodmap.man
View file

@ -20,16 +20,16 @@
.\" DEALINGS IN THE SOFTWARE.
.\"
.\" Copyright 1988, 1989, 1990, 1998 The Open Group
.\"
.\"
.\" 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.
.\"
.\"
.\" The above copyright notice and this permission notice shall be included
.\" in all copies or substantial portions of the Software.
.\"
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@ -37,12 +37,12 @@
.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
.\" OTHER DEALINGS IN THE SOFTWARE.
.\"
.\"
.\" Except as contained in this notice, the name of The Open Group shall
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
.\"
.de EX \"Begin example
.ne 5
.if n .sp 1
@ -64,10 +64,10 @@ xmodmap - utility for modifying keymaps and pointer button mappings in X
[-options ...] [filename]
.SH DESCRIPTION
.PP
The \fIxmodmap\fP program is used to edit and display the
keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client
applications to convert event keycodes into keysyms. It is usually run from
the user's session startup script to configure the keyboard according to
The \fIxmodmap\fP program is used to edit and display the
keyboard \fImodifier map\fP and \fIkeymap table\fP that are used by client
applications to convert event keycodes into keysyms. It is usually run from
the user's session startup script to configure the keyboard according to
personal tastes.
.SH OPTIONS
.PP
@ -83,7 +83,7 @@ unhandled argument is given to
.I xmodmap.
.TP 8
.B \-grammar
This option indicates that a help message describing the expression grammar
This option indicates that a help message describing the expression grammar
used in files and with \-e expressions should be printed on the standard error.
.TP 8
.B \-version
@ -92,7 +92,7 @@ This option indicates that
should print its version information and exit.
.TP 8
.B \-verbose
This option indicates that
This option indicates that
.I xmodmap
should print logging information as it parses its input.
.TP 8
@ -100,7 +100,7 @@ should print logging information as it parses its input.
This option turns off the verbose logging. This is the default.
.TP 8
.B \-n
This option indicates that
This option indicates that
.I xmodmap
should not change the mappings, but should display what it would do, like
\fImake(__appmansuffix__)\fP does when given this option.
@ -148,8 +148,8 @@ Keysyms matching Unicode characters may be specified as "U0020" to "U007E"
and "U00A0" to "U10FFFF" for all possible Unicode characters.
.TP 8
.B keycode \fINUMBER\fP = \fIKEYSYMNAME ...\fP
The list of keysyms is assigned to the indicated keycode
(which may be specified in decimal, hex or octal and can be determined by
The list of keysyms is assigned to the indicated keycode
(which may be specified in decimal, hex or octal and can be determined by
running the
.I xev
program). Up to eight keysyms may be attached to a key, however the last four
@ -170,7 +170,7 @@ if the same keysym is bound to multiple keys, the expression is executed
for each matching keycode.
.TP 8
.B clear \fIMODIFIERNAME\fP
This removes all entries in the modifier map for the given modifier, where
This removes all entries in the modifier map for the given modifier, where
valid name are:
.BR Shift ,
.BR Lock ,
@ -179,7 +179,7 @@ valid name are:
.BR Mod2 ,
.BR Mod3 ,
.BR Mod4 ,
and \fBMod5\fP (case
and \fBMod5\fP (case
does not matter in modifier names, although it does matter for all other
names). For example, ``clear Lock'' will remove
all any keys that were bound to the shift lock modifier.
@ -199,7 +199,7 @@ remove keys from a modifier without having to worry about whether or not they
have been reassigned.
.TP 8
.B "pointer = default"
This sets the pointer map back to its default settings (button 1 generates a
This sets the pointer map back to its default settings (button 1 generates a
code of 1, button 2 generates a 2, etc.).
.TP 8
.B pointer = \fINUMBER ...\fP
@ -222,12 +222,12 @@ This could be done on a 3 button pointer as follows:
% xmodmap -e "pointer = 3 2 1"
.EE
.PP
Many applications support the notion of Meta keys (similar to Control
Many applications support the notion of Meta keys (similar to Control
keys except that Meta is held down instead of Control). However,
some servers do not have a Meta keysym in the default keymap table, so one
needs to be added by hand.
The following command will attach Meta to the Multi-language key (sometimes
labeled Compose Character). It also takes advantage of the fact that
labeled Compose Character). It also takes advantage of the fact that
applications that need a Meta key simply need to get the keycode and don't
require the keysym to be in the first column of the keymap table. This
means that applications that are looking for a Multi_key (including the
@ -245,7 +245,7 @@ In that case the following may be useful:
One of the more simple, yet convenient, uses of \fIxmodmap\fP is to set the
keyboard's "rubout" key to generate an alternate keysym. This frequently
involves exchanging Backspace with Delete to be more comfortable to the user.
If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal
If the \fIttyModes\fP resource in \fIxterm\fP is set as well, all terminal
emulator windows will use the same key for erasing characters:
.EX
% xmodmap -e "keysym BackSpace = Delete"
@ -279,13 +279,13 @@ add Lock = Caps_Lock
add Control = Control_L
.EE
.PP
This example can be run again to swap the keys back to their previous
This example can be run again to swap the keys back to their previous
assignments.
.PP
The \fIkeycode\fP command is useful for assigning the same keysym to
multiple keycodes. Although unportable, it also makes it possible to write
scripts that can reset the keyboard to a known state. The following script
sets the backspace key to generate Delete (as shown above), flushes all
sets the backspace key to generate Delete (as shown above), flushes all
existing caps lock bindings, makes the CapsLock
key be a control key, make F5 generate Escape, and makes Break/Reset be a
shift lock.

4
app/xmodmap/pf.c
View file

@ -50,7 +50,7 @@ void process_file (const char *filename) /* NULL means use stdin */
if (!filename) {
fp = stdin;
inputFilename = "stdin";
inputFilename = "stdin";
} else {
fp = fopen (filename, "r");
if (!fp) {
@ -96,7 +96,7 @@ void process_line (const char *line)
fprintf(stderr, "%s: Could not allocate %d bytes\n", ProgramName, len);
Exit(-1);
}
for (i = 0; i < len; i++) { /* look for blank lines */
register char c = buffer[i];
if (!(isspace(c) || c == '\n')) break;

2
app/xmodmap/wq.h
View file

@ -29,7 +29,7 @@ from The Open Group.
#ifndef _WQ_H
#define _WQ_H
/*
/*
* Input is parsed and a work queue is built that is executed later. This
* allows us to swap keys as well as ensure that we don't mess up the keyboard
* by doing a partial rebind.

6
app/xmodmap/xmodmap.c
View file

@ -104,7 +104,7 @@ asprintf(char ** ret, const char *format, ...)
}
#endif /* HAVE_ASPRINTF */
static const char help_message[] =
static const char help_message[] =
"\nwhere options include:\n"
" -display host:dpy X server to use\n"
" -verbose, -quiet turn logging on or off\n"
@ -146,7 +146,7 @@ unknown_arg(const char *arg)
usage(1);
}
static const char grammar_message[] =
static const char grammar_message[] =
" pointer = default reset pointer buttons to default\n"
" pointer = NUMBER ... set pointer button codes\n"
" keycode NUMBER = [KEYSYM ...] map keycode to given keysyms\n"
@ -167,7 +167,7 @@ static const char grammar_message[] =
"\n";
static void
static void
_X_NORETURN
grammar_usage(void)
{

2
app/xmodmap/xmodmap.h
View file

@ -51,7 +51,7 @@ extern void print_pointer_map(void);
extern int UpdateModifierMapping(XModifierKeymap *map);
extern int AddModifier(XModifierKeymap **mapp, KeyCode keycode, int modifier);
extern int RemoveModifier(XModifierKeymap **mapp, KeyCode keycode,
extern int RemoveModifier(XModifierKeymap **mapp, KeyCode keycode,
int modifier);
extern int ClearModifier(XModifierKeymap **mapp, int modifier);
extern void PrintModifierMapping(XModifierKeymap *map, FILE *fp);

8
app/xmore/printdialogprivates.h
View file

@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/CoreP.h>
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/Label.h>
#include <X11/Xaw/DialogP.h>
#include <X11/Xaw/XawInit.h>
@ -72,10 +72,10 @@ typedef struct _PrintDialogPart {
Pixmap icon; /* icon bitmap */
XtCallbackList ok_callback,
cancel_callback;
/* private */
Widget iconW; /* widget to display the icon */
struct
{
Widget form,
@ -143,7 +143,7 @@ typedef struct _PrintDialogPart {
XpuMediumSourceSizeList paperlist;
int num_papers;
String *widget_paperlist;
XpuResolutionList resolutionlist;
int num_resolutions;
String *widget_resolutionlist;

20
app/xmore/xmore.c
View file

@ -26,17 +26,17 @@ in this Software without prior written authorization from The Open Group.
*/
/* Force ANSI C prototypes from X11 headers */
#ifndef FUNCPROTO
#ifndef FUNCPROTO
#define FUNCPROTO 15
#endif /* !FUNCPROTO */
#include <X11/StringDefs.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <X11/Intrinsic.h>
#include <X11/Shell.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/List.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/Cardinals.h>
#include "xmore.h"
@ -140,7 +140,7 @@ int main( int argc, char *argv[] )
XtSetLanguageProc(NULL, NULL, NULL);
toplevel = XtOpenApplication(&app, "XMore",
options, XtNumber(options),
options, XtNumber(options),
&argc, argv, fallback_resources,
sessionShellWidgetClass, NULL, ZERO);
@ -150,9 +150,9 @@ int main( int argc, char *argv[] )
exit(EXIT_FAILURE);
}
XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources,
XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources,
XtNumber(resources), NULL, 0);
XtAppAddActions(app, actions, XtNumber(actions));
viewFileName = argv[1];
@ -175,11 +175,11 @@ int main( int argc, char *argv[] )
XtSetArg(args[n], XtNlabel, "Quit"); n++;
quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form, args, n);
XtAddCallback(quitbutton, XtNcallback, quitXtProc, NULL);
XtRealizeWidget(toplevel);
XtAppMainLoop(app);
return EXIT_SUCCESS;
}

4
app/xmore/xmore.xml
View file

@ -27,7 +27,7 @@ manual volume numbers.
<cmdsynopsis>
<command>xmore</command>
<arg><option><replaceable>filename</replaceable></option></arg>
<arg><option><replaceable>filename</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@ -52,7 +52,7 @@ manual volume numbers.
<simplelist type="inline">
<!-- specific references -->
<!-- none -->
<member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
<member><citerefentry><refentrytitle>xman</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
</simplelist>

26
app/xrandr/keystone.5c
View file

@ -143,7 +143,7 @@ extend namespace Nichrome {
Widget::configure (&quad, geometry);
quad.callback (&quad);
}
protected void init (&quad_t quad,
&nichrome_t nichrome,
void (&quad_t) callback) {
@ -348,7 +348,7 @@ rescale (m_t m, real limit)
for (int i = 0; i < 3; i++)
m[j,i] *= scale;
return m;
}
string
@ -495,14 +495,14 @@ output_t[*] get_outputs () {
int geom = 2;
if (words[geom] == "primary")
geom++;
if (File::sscanf (words[geom], "%dx%d+%d+%d",
&(int width), &(int height),
if (File::sscanf (words[geom], "%dx%d+%d+%d",
&(int width), &(int height),
&(int x), &(int y)) == 4)
{
outputs[dim(outputs)] = (output_t) {
name = words[0],
geometry = {
x = x, y = y, width = width, height = height
geometry = {
x = x, y = y, width = width, height = height
}
};
}
@ -523,7 +523,7 @@ void main ()
File::fprintf (stderr, "%s: No enabled outputs\n", argv[0]);
exit (1);
}
if (dim (argv) > 1) {
int i;
for (i = 0; i < dim (outputs); i++)
@ -539,19 +539,19 @@ void main ()
}
else
target_output = outputs[0];
real target_width = target_output.geometry.width;
real target_height = target_output.geometry.height;
real screen_width = 0;
real screen_height = 0;
for (int i = 0; i < dim (outputs); i++)
{
screen_width = max (screen_width,
screen_width = max (screen_width,
outputs[i].geometry.x +
outputs[i].geometry.width);
screen_height = max (screen_height,
screen_height = max (screen_height,
outputs[i].geometry.y +
outputs[i].geometry.height);
}
@ -602,7 +602,7 @@ void main ()
}
&button_t doit = Button::new (&nichrome, "doit", doit_func);
void show_func (&widget_t widget, bool state)
{
if (m_available)
@ -619,7 +619,7 @@ void main ()
max_error(m_r, m_f);
}
}
&button_t show = Button::new (&nichrome, "show", show_func);
&button_t quit = Button::new (&nichrome, "quit",
void func (&widget_t w, bool state) {

188
app/xrandr/xrandr.c
View file

@ -1,4 +1,4 @@
/*
/*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
* Copyright © 2002 Hewlett Packard Company, Inc.
* Copyright © 2006 Intel Corporation
@ -61,16 +61,16 @@ static const char *filter_names[2] = {
"nearest"};
static const char *direction[5] = {
"normal",
"left",
"inverted",
"normal",
"left",
"inverted",
"right",
"\n"};
static const char *reflections[5] = {
"normal",
"x",
"y",
"normal",
"x",
"y",
"xy",
"\n"};
@ -170,7 +170,7 @@ static void _X_NORETURN _X_ATTRIBUTE_PRINTF(1,2)
fatal (const char *format, ...)
{
va_list ap;
va_start (ap, format);
fprintf (stderr, "%s: ", program_name);
vfprintf (stderr, format, ap);
@ -183,7 +183,7 @@ static void _X_ATTRIBUTE_PRINTF(1,2)
warning (const char *format, ...)
{
va_list ap;
va_start (ap, format);
fprintf (stderr, "%s: ", program_name);
vfprintf (stderr, format, ap);
@ -342,22 +342,22 @@ struct _output_prop {
struct _output {
struct _output *next;
changes_t changes;
output_prop_t *props;
name_t output;
XRROutputInfo *output_info;
name_t crtc;
crtc_t *crtc_info;
crtc_t *current_crtc_info;
name_t mode;
double refresh;
XRRModeInfo *mode_info;
name_t addmode;
relation_t relation;
@ -392,7 +392,7 @@ typedef enum _umode_action {
struct _umode {
struct _umode *next;
umode_action_t action;
XRRModeInfo mode;
name_t output;
@ -567,7 +567,7 @@ mode_refresh (const XRRModeInfo *mode_info)
/* the field rate is what is typically reported by monitors */
vTotal /= 2;
}
if (mode_info->hTotal && vTotal)
rate = ((double) mode_info->dotClock /
((double) mode_info->hTotal * (double) vTotal));
@ -581,7 +581,7 @@ static double
mode_hsync (const XRRModeInfo *mode_info)
{
double rate;
if (mode_info->hTotal)
rate = (double) mode_info->dotClock / (double) mode_info->hTotal;
else
@ -755,7 +755,7 @@ find_output (name_t *name)
for (output = all_outputs; output; output = output->next)
{
name_kind_t common = name->kind & output->output.kind;
if ((common & name_xid) && name->xid == output->output.xid)
break;
if ((common & name_string) && !strcmp (name->string, output->output.string))
@ -794,10 +794,10 @@ find_crtc (name_t *name)
for (int c = 0; c < num_crtcs; c++)
{
name_kind_t common;
crtc = &crtcs[c];
common = name->kind & crtc->crtc.kind;
if ((common & name_xid) && name->xid == crtc->crtc.xid)
break;
if ((common & name_string) && !strcmp (name->string, crtc->crtc.string))
@ -836,7 +836,7 @@ find_mode (name_t *name, double refresh)
if ((name->kind & name_string) && !strcmp (name->string, mode->name))
{
double dist;
if (refresh)
dist = fabs (mode_refresh (mode) - refresh);
else
@ -919,12 +919,12 @@ preferred_mode (output_t *output)
XRROutputInfo *output_info = output->output_info;
XRRModeInfo *best = NULL;
int bestDist = 0;
for (int m = 0; m < output_info->nmode; m++)
{
XRRModeInfo *mode_info = find_mode_by_xid (output_info->modes[m]);
int dist;
if (m < output_info->npreferred)
dist = 0;
else if (output_info->mm_height)
@ -998,7 +998,7 @@ output_rotations (output_t *output)
Bool found = False;
Rotation rotation = RR_Rotate_0;
XRROutputInfo *output_info = output->output_info;
for (int c = 0; c < output_info->ncrtc; c++)
{
crtc_t *crtc = find_crtc_by_xid (output_info->crtcs[c]);
@ -1020,7 +1020,7 @@ output_can_use_rotation (output_t *output, Rotation rotation)
XRROutputInfo *output_info = output->output_info;
/* make sure all of the crtcs can use this rotation.
* yes, this is not strictly necessary, but it is
* yes, this is not strictly necessary, but it is
* simpler,and we expect most drivers to either
* support rotation everywhere or nowhere
*/
@ -1138,18 +1138,18 @@ set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
if (output_info->connection != RR_Disconnected && !output_info->nmode)
warning ("Output %s is not disconnected but has no modes\n",
output_info->name);
/* set output name and info */
if (!(output->output.kind & name_xid))
set_name_xid (&output->output, xid);
if (!(output->output.kind & name_string))
set_name_string (&output->output, output_info->name);
output->output_info = output_info;
/* set crtc name and info */
if (!(output->changes & changes_crtc))
set_name_xid (&output->crtc, output_info->crtc);
if (output->crtc.kind == name_xid && output->crtc.xid == None)
output->crtc_info = NULL;
else
@ -1171,7 +1171,7 @@ set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
if (!(output->changes & changes_mode))
{
crtc_t *crtc = NULL;
if (output_info->crtc)
crtc = find_crtc_by_xid(output_info->crtc);
if (crtc && crtc->crtc_info)
@ -1294,7 +1294,7 @@ set_output_info (output_t *output, RROutput xid, XRROutputInfo *output_info)
if (!(output->changes & changes_primary))
output->primary = output_is_primary(output);
}
static void
get_screen (Bool current)
{
@ -1306,7 +1306,7 @@ get_screen (Bool current)
XRRGetScreenSizeRange (dpy, root, &minWidth, &minHeight,
&maxWidth, &maxHeight);
if (current)
res = XRRGetScreenResourcesCurrent (dpy, root);
else
@ -1320,7 +1320,7 @@ get_crtcs (void)
num_crtcs = res->ncrtc;
crtcs = calloc (num_crtcs, sizeof (crtc_t));
if (!crtcs) fatal ("out of memory\n");
for (int c = 0; c < res->ncrtc; c++)
{
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo (dpy, res, res->crtcs[c]);
@ -1519,7 +1519,7 @@ crtc_disable (crtc_t *crtc)
{
if (verbose)
printf ("crtc %d: disable\n", crtc->crtc.index);
if (dryrun)
return RRSetConfigSuccess;
return XRRSetCrtcConfig (dpy, res, crtc->crtc.xid, CurrentTime,
@ -1544,10 +1544,10 @@ static Status
crtc_revert (crtc_t *crtc)
{
XRRCrtcInfo *crtc_info = crtc->crtc_info;
if (verbose)
printf ("crtc %d: revert\n", crtc->crtc.index);
if (dryrun)
return RRSetConfigSuccess;
@ -1583,7 +1583,7 @@ crtc_apply (crtc_t *crtc)
printf (" \"%s\"", crtc->outputs[o]->output.string);
printf ("\n");
}
if (dryrun)
s = RRSetConfigSuccess;
else
@ -1661,7 +1661,7 @@ panic (Status s, crtc_t *crtc)
{
int c = crtc->crtc.index;
const char *message;
switch (s) {
case RRSetConfigSuccess: message = "succeeded"; break;
case BadAlloc: message = "out of memory"; break;
@ -1670,7 +1670,7 @@ panic (Status s, crtc_t *crtc)
case RRSetConfigInvalidTime: message = "invalid time"; break;
default: message = "unknown failure"; break;
}
fprintf (stderr, "%s: Configure crtc %d %s\n", program_name, c, message);
revert ();
exit (1);
@ -1680,7 +1680,7 @@ static void
apply (void)
{
Status s;
/*
* Hold the server grabbed while messing with
* the screen so that apps which notice the resize
@ -1689,7 +1689,7 @@ apply (void)
*/
if (grab_server)
XGrabServer (dpy);
/*
* Turn off any crtcs which are to be disabled or which are
* larger than the target size
@ -1700,22 +1700,22 @@ apply (void)
XRRCrtcInfo *crtc_info = crtc->crtc_info;
/* if this crtc is already disabled, skip it */
if (crtc_info->mode == None)
if (crtc_info->mode == None)
continue;
/*
/*
* If this crtc is to be left enabled, make
* sure the old size fits then new screen
*/
if (crtc->mode_info)
if (crtc->mode_info)
{
XRRModeInfo *old_mode = find_mode_by_xid (crtc_info->mode);
int x, y, w, h;
box_t bounds;
if (!old_mode)
if (!old_mode)
panic (RRSetConfigFailed, crtc);
/* old position and size information */
mode_geometry (old_mode, crtc_info->rotation,
&crtc->current_transform.transform,
@ -1727,7 +1727,7 @@ apply (void)
h = bounds.y2 - bounds.y1;
/* if it fits, skip it */
if (x + w <= fb_width && y + h <= fb_height)
if (x + w <= fb_width && y + h <= fb_height)
continue;
crtc->changing = True;
}
@ -1740,7 +1740,7 @@ apply (void)
* Set the screen size
*/
screen_apply ();
/*
* Set crtcs
*/
@ -1748,7 +1748,7 @@ apply (void)
for (int c = 0; c < res->ncrtc; c++)
{
crtc_t *crtc = &crtcs[c];
s = crtc_apply (crtc);
if (s != RRSetConfigSuccess)
panic (s, crtc);
@ -1885,7 +1885,7 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
int c;
int l;
output_t *other;
for (c = 0; c < output->output_info->ncrtc; c++)
if (output->output_info->crtcs[c] == crtc->crtc.xid)
break;
@ -1907,7 +1907,7 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
if (output->output_info->clones[l] == other->output.xid)
break;
/* not on the list, can't clone */
if (l == output->output_info->nclone)
if (l == output->output_info->nclone)
return False;
}
@ -1975,15 +1975,15 @@ set_positions (void)
name_t relation_name;
if (!(output->changes & changes_relation)) continue;
if (output->mode_info == NULL) continue;
init_name (&relation_name);
set_name_string (&relation_name, output->relative_to);
relation = find_output (&relation_name);
if (!relation) fatal ("cannot find output \"%s\"\n", output->relative_to);
if (relation->mode_info == NULL)
if (relation->mode_info == NULL)
{
output->x = 0;
output->y = 0;
@ -1994,13 +1994,13 @@ set_positions (void)
/*
* Make sure the dependent object has been set in place
*/
if ((relation->changes & changes_relation) &&
if ((relation->changes & changes_relation) &&
!(relation->changes & changes_position))
{
keep_going = True;
continue;
}
switch (output->relation) {
case relation_left_of:
output->y = relation->y;
@ -2039,7 +2039,7 @@ set_positions (void)
for (output = all_outputs; output; output = output->next)
{
if (output->mode_info == NULL) continue;
if (output->x < min_x) min_x = output->x;
if (output->y < min_y) min_y = output->y;
}
@ -2061,15 +2061,15 @@ static void
set_screen_size (void)
{
Bool fb_specified = fb_width != 0 && fb_height != 0;
for (output_t *output = all_outputs; output; output = output->next)
{
XRRModeInfo *mode_info = output->mode_info;
int x, y, w, h;
box_t bounds;
if (!mode_info) continue;
mode_geometry (mode_info, output->rotation,
&output->transform.transform,
&bounds);
@ -2101,7 +2101,7 @@ set_screen_size (void)
if (pan && pan->top + pan->height > fb_height)
fb_height = pan->top + pan->height;
}
}
}
if (fb_width > maxWidth || fb_height > maxHeight)
fatal ("screen cannot be larger than %dx%d (desired size %dx%d)\n",
@ -2117,7 +2117,7 @@ set_screen_size (void)
if (fb_height < minHeight) fb_height = minHeight;
}
}
static void
disable_outputs (output_t *outputs)
@ -2140,10 +2140,10 @@ pick_crtcs_score (output_t *outputs)
int my_score;
int score;
crtc_t *best_crtc;
if (!outputs)
return 0;
output = outputs;
outputs = outputs->next;
/*
@ -2155,7 +2155,7 @@ pick_crtcs_score (output_t *outputs)
return best_score;
best_crtc = NULL;
/*
/*
* Now score with this output any valid crtc
*/
for (int c = 0; c < output->output_info->ncrtc; c++)
@ -2165,12 +2165,12 @@ pick_crtcs_score (output_t *outputs)
crtc = find_crtc_by_xid (output->output_info->crtcs[c]);
if (!crtc)
fatal ("cannot find crtc 0x%lx\n", output->output_info->crtcs[c]);
/* reset crtc allocation for following outputs */
disable_outputs (outputs);
if (!check_crtc_for_output (crtc, output))
continue;
my_score = 1000;
/* slight preference for existing connections */
if (crtc == output->current_crtc_info)
@ -2597,7 +2597,7 @@ main (int argc, char **argv)
int action_requested = False;
Rotation current_rotation;
XEvent event;
XRRScreenChangeNotifyEvent *sce;
XRRScreenChangeNotifyEvent *sce;
char *display_name = NULL;
SizeID current_size;
short current_rate;
@ -2750,7 +2750,7 @@ main (int argc, char **argv)
config_output = add_output ();
set_name (&config_output->output, argv[i], name_string|name_xid);
}
setit_1_2 = True;
action_requested = True;
continue;
@ -3086,7 +3086,7 @@ main (int argc, char **argv)
{
umode_t *m = calloc (1, sizeof (umode_t));
double clock;
++i;
if (i + 9 >= argc)
argerr ("failed to parse '%s' as a mode specification\n", argv[i]);
@ -3107,11 +3107,11 @@ main (int argc, char **argv)
m->mode.modeFlags = 0;
while (i < argc) {
int f;
for (f = 0; mode_flags[f].string; f++)
if (!strcasecmp (mode_flags[f].string, argv[i]))
break;
if (!mode_flags[f].string)
break;
m->mode.modeFlags |= mode_flags[f].flag;
@ -3172,10 +3172,10 @@ main (int argc, char **argv)
continue;
}
if (!strcmp("--setprovideroutputsource", argv[i]))
{
{
if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
set_name (&provider_name, argv[i], name_string|name_xid|name_index);
if (++i>=argc)
if (++i>=argc)
set_name_xid (&output_source_provider_name, 0);
else
set_name (&output_source_provider_name, argv[i], name_string|name_xid|name_index);
@ -3184,10 +3184,10 @@ main (int argc, char **argv)
continue;
}
if (!strcmp("--setprovideroffloadsink", argv[i]))
{
{
if (++i >= argc) argerr ("%s requires an argument\n", argv[i-1]);
set_name (&provider_name, argv[i], name_string|name_xid|name_index);
if (++i>=argc)
if (++i>=argc)
set_name_xid (&offload_sink_provider_name, 0);
else
set_name (&offload_sink_provider_name, argv[i], name_string|name_xid|name_index);
@ -3267,7 +3267,7 @@ main (int argc, char **argv)
}
if (!action_requested)
query = True;
if (verbose)
if (verbose)
{
query = True;
if (setit && !setit_1_2)
@ -3311,12 +3311,12 @@ main (int argc, char **argv)
get_screen (True);
get_crtcs();
get_outputs();
for (umode_t *m = umodes; m; m = m->next)
{
XRRModeInfo *e;
output_t *o;
switch (m->action) {
case umode_create:
XRRCreateMode (dpy, root, &m->mode);
@ -3358,7 +3358,7 @@ main (int argc, char **argv)
get_screen (True);
get_crtcs();
get_outputs();
for (output_t *output = all_outputs; output; output = output->next)
{
for (output_prop_t *prop = output->props; prop; prop = prop->next)
@ -3377,7 +3377,7 @@ main (int argc, char **argv)
XRRPropertyInfo *propinfo;
type = AnyPropertyType;
if (XRRGetOutputProperty (dpy, output->output.xid, name,
0, 100, False, False,
AnyPropertyType,
@ -3481,7 +3481,7 @@ main (int argc, char **argv)
* Assign outputs to crtcs
*/
set_crtcs ();
/*
* Mark changing crtcs
*/
@ -3538,13 +3538,13 @@ main (int argc, char **argv)
fb_height_mm = DisplayHeightMM (dpy, screen);
}
}
/*
* Set panning
*/
set_panning ();
/*
/*
* Set gamma on crtc's that belong to the outputs.
*/
set_gamma ();
@ -3553,7 +3553,7 @@ main (int argc, char **argv)
* Now apply all of the changes
*/
apply ();
if (!monitorit) {
XSync (dpy, False);
exit (0);
@ -3623,7 +3623,7 @@ main (int argc, char **argv)
{
#define ModeShown 0x80000000
get_screen (current);
get_crtcs ();
get_outputs ();
@ -3661,7 +3661,7 @@ main (int argc, char **argv)
printf (" (0x%x)", (int)cur_mode->id);
if (output->rotation != RR_Rotate_0 || verbose)
{
printf (" %s",
printf (" %s",
rotation_name (output->rotation));
if (output->rotation & (RR_Reflect_X|RR_Reflect_Y))
printf (" %s", reflection_name (output->rotation));
@ -3972,7 +3972,7 @@ main (int argc, char **argv)
sc = XRRGetScreenInfo (dpy, root);
if (sc == NULL)
if (sc == NULL)
exit (1);
current_size = XRRConfigCurrentConfiguration (sc, &current_rotation);
@ -4033,7 +4033,7 @@ main (int argc, char **argv)
if (version) {
int major_version, minor_version;
XRRQueryVersion (dpy, &major_version, &minor_version);
printf("Server reports RandR version %d.%d\n",
printf("Server reports RandR version %d.%d\n",
major_version, minor_version);
}
@ -4087,7 +4087,7 @@ main (int argc, char **argv)
}
}
if (verbose) {
if (verbose) {
printf("Setting size to %d, rotation to %s\n", size, direction[rot]);
printf ("Setting reflection on ");
@ -4137,8 +4137,8 @@ main (int argc, char **argv)
sce = (XRRScreenChangeNotifyEvent *) &event;
printf("Got a screen change notify event!\n");
printf(" window = %d\n root = %d\n size_index = %d\n rotation %d\n",
(int) sce->window, (int) sce->root,
printf(" window = %d\n root = %d\n size_index = %d\n rotation %d\n",
(int) sce->window, (int) sce->root,
sce->size_index, sce->rotation);
printf(" timestamp = %ld, config_timestamp = %ld\n",
sce->timestamp, sce->config_timestamp);
@ -4147,7 +4147,7 @@ main (int argc, char **argv)
sce->width, sce->height, sce->mwidth, sce->mheight);
printf("Display width %d, height %d\n",
DisplayWidth(dpy, screen), DisplayHeight(dpy, screen));
printf("Display widthmm %d, heightmm %d\n",
printf("Display widthmm %d, heightmm %d\n",
DisplayWidthMM(dpy, screen), DisplayHeightMM(dpy, screen));
spo = sce->subpixel_order;
if ((spo < 0) || (spo > 5))
@ -4156,7 +4156,7 @@ main (int argc, char **argv)
seen_screen = True;
break;
default:
if (event.type != ConfigureNotify)
if (event.type != ConfigureNotify)
printf("unknown event received, type = %d!\n", event.type);
}
}

0
app/xterm/uxterm.desktop Normal file → Executable file
View file

0
app/xterm/xterm.desktop Normal file → Executable file
View file

6
lib/mesa/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
View file

@ -373,7 +373,11 @@ CopyPropFwdVisitor::visit(AluInstr *instr)
auto ii = dest->uses().begin();
auto ie = dest->uses().end();
while(ii != ie) {
/** libc++ seems to invalidate the end iterator too if a std::set is
* made empty by an erase operation,
* https://gitlab.freedesktop.org/mesa/mesa/-/issues/7931
*/
while(ii != ie && !dest->uses().empty()) {
auto i = *ii;
++ii;
/* SSA can always be propagated, registers only in the same block