INSTALL | 6
Imakefile | 13
MANIFEST | 6
Tekproc.c | 38
VTPrsTbl.c | 38
VTparse.def | 5
VTparse.h | 5
aclocal.m4 | 35
button.c | 120 -
charproc.c | 389 +++--
configure | 3299 ++++++++++++++++++++++----------------------
configure.in | 31
ctlseqs.ms | 74
ctlseqs.txt | 92 -
debian/changelog | 6
doublechr.c | 6
fontutils.c | 97 -
graphics.c | 1491 ++++++++------------
graphics.h | 78 -
graphics_regis.c | 3482 +++++++++++++++++++++++++++++++++++++++++++++++
graphics_regis.h | 48
graphics_sixel.c | 640 ++++++++
graphics_sixel.h | 48
input.c | 10
main.c | 89 -
menu.c | 353 ++--
menu.h | 12
misc.c | 202 +-
package/debian/changelog | 6
package/freebsd/Makefile | 2
package/xterm.spec | 4
ptyx.h | 43
resize.c | 8
screen.c | 20
trace.c | 5
util.c | 28
version.h | 6
xstrings.c | 18
xterm.h | 42
xterm.log.html | 72
xterm.man | 8
xtermcap.c | 22
xtermcfg.hin | 4
43 files changed, 7879 insertions(+), 3122 deletions(-)
New commits:
commit 2c2e9fd563e446a0039b281d837965ea687b368f
Author: Sven Joachim <svenj...@gmx.de>
Date: Mon May 5 17:57:28 2014 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 84d93d0..523d699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (304-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sven Joachim <svenj...@gmx.de> Mon, 05 May 2014 17:54:47 +0200
+
xterm (303-1) unstable; urgency=low
* New upstream release.
commit 7c49ea6ca1f85fff688378d401441558bba22588
Author: Sven Joachim <svenj...@gmx.de>
Date: Mon May 5 17:51:41 2014 +0200
Imported Upstream version 304
diff --git a/INSTALL b/INSTALL
index 2554ca2..2eab615 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.149 2013/08/04 19:33:14 tom Exp $
+-- $XTermId: INSTALL,v 1.150 2014/04/11 19:36:41 Ross.Combs Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2012,2013 by Thomas E. Dickey
--
@@ -482,6 +482,10 @@ The options (in alphabetic order):
Compile-in code to support SCO-style function keys.
+ --enable-regis-graphics enable support for ReGIS graphics
+
+ Compile-in code to support experimental ReGIS graphics
+
--enable-sixel-graphics enable support for sixel-graphics
Compile-in code to support experimental sixel-graphics
diff --git a/Imakefile b/Imakefile
index 81b6ce8..0c2b20e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.109 2013/06/23 22:32:37 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
#if !HasPutenv
PUTENVDEF = -DNOPUTENV
#endif
+#ifdef RegisXTerm
+ SIXELDEF = -DOPT_REGIS_GRAPHICS=1
+#endif
#ifdef SixelXTerm
SIXELDEF = -DOPT_SIXEL_GRAPHICS=1
#endif
@@ -182,9 +185,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
MAINSRC = main.c
MAINOBJ = main.o
+#ifdef RegisXTerm
+ SIXELSRC = graphics_regis.c
+ SIXELOBJ = graphics_regis.o
+#endif
#ifdef SixelXTerm
- SIXELSRC = graphics.c
- SIXELOBJ = graphics.o
+ SIXELSRC = graphics_sixel.c
+ SIXELOBJ = graphics_sixel.o
#endif
#ifdef TraceXTerm
TRACESRC = trace.c
diff --git a/MANIFEST b/MANIFEST
index 7cc89db..c140bba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-303, version xterm-303
+MANIFEST for xterm-304, version xterm-304
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
@@ -49,6 +49,10 @@ fontutils.h interface of fontutils.c
gen-pc-fkeys.pl script to generate extended function-key
terminfo
graphics.c graphics support functions for 'xterm'
graphics.h interface of graphics.c
+graphics_regis.c support for ReGIS
+graphics_regis.h interface of graphics_regis.c
+graphics_sixel.c support for Sixels
+graphics_sixel.h interface of graphics_sixel.c
input.c VT100 key-symbol and function-key translation
install-sh install-script (needed by configure)
keysym2ucs.c lookup-table for UTF-8 to keysyms
diff --git a/Tekproc.c b/Tekproc.c
index 3961c6b..5289bc0 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.194 2012/09/07 09:08:44 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.196 2014/04/12 00:55:22 tom Exp $ */
/*
- * Copyright 2001-2011,2012 by Thomas E. Dickey
+ * Copyright 2001-2012,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -144,7 +144,7 @@
#define input() Tinput(tw)
#define unput(c) *Tpushback++ = (Char) c
/* *INDENT-OFF* */
-static struct Tek_Char {
+static const struct Tek_Char {
int hsize; /* in Tek units */
int vsize; /* in Tek units */
int charsperline;
@@ -187,8 +187,8 @@ static char defaultTranslations[] = "\
~Meta<Btn3Down>: gin-press(r)";
/* *INDENT-OFF* */
static XtActionsRec actionsList[] = {
- { "string", HandleStringEvent },
- { "insert", HandleKeyPressed }, /* alias for insert-seven-bit */
+ { "string", HandleStringEvent },
+ { "insert", HandleKeyPressed }, /* alias for
insert-seven-bit */
{ "insert-seven-bit", HandleKeyPressed },
{ "insert-eight-bit", HandleEightBitKeyPressed },
{ "gin-press", HandleGINInput },
@@ -1080,7 +1080,7 @@ static void
TCursorBack(TekWidget tw)
{
TekScreen *tekscr = TekScreenOf(tw);
- struct Tek_Char *t;
+ const struct Tek_Char *t;
int x, l;
x = (tekscr->cur_X -=
@@ -1103,7 +1103,7 @@ static void
TCursorForward(TekWidget tw)
{
TekScreen *tekscr = TekScreenOf(tw);
- struct Tek_Char *t;
+ const struct Tek_Char *t;
int l;
if ((tekscr->cur_X +=
@@ -1123,7 +1123,7 @@ static void
TCursorUp(TekWidget tw)
{
TekScreen *tekscr = TekScreenOf(tw);
- struct Tek_Char *t;
+ const struct Tek_Char *t;
int l;
t = &TekChar[tekscr->cur.fontsize];
@@ -1143,7 +1143,7 @@ static void
TCursorDown(TekWidget tw)
{
TekScreen *tekscr = TekScreenOf(tw);
- struct Tek_Char *t;
+ const struct Tek_Char *t;
int l;
t = &TekChar[tekscr->cur.fontsize];
@@ -1334,7 +1334,7 @@ TekRun(void)
#define SHORT_DASHED_LENGTH 2
#define LONG_DASHED_LENGTH 2
-static int dash_length[TEKNUMLINES] =
+static const int dash_length[TEKNUMLINES] =
{
DOTTED_LENGTH,
DOT_DASHED_LENGTH,
@@ -1342,16 +1342,16 @@ static int dash_length[TEKNUMLINES] =
LONG_DASHED_LENGTH,
};
-static unsigned char dotted[DOTTED_LENGTH] =
+static _Xconst char dotted[DOTTED_LENGTH] =
{3, 1};
-static unsigned char dot_dashed[DOT_DASHED_LENGTH] =
+static _Xconst char dot_dashed[DOT_DASHED_LENGTH] =
{3, 4, 3, 1};
-static unsigned char short_dashed[SHORT_DASHED_LENGTH] =
+static _Xconst char short_dashed[SHORT_DASHED_LENGTH] =
{4, 4};
-static unsigned char long_dashed[LONG_DASHED_LENGTH] =
+static _Xconst char long_dashed[LONG_DASHED_LENGTH] =
{4, 7};
-static unsigned char *dashes[TEKNUMLINES] =
+static _Xconst char *dashes[TEKNUMLINES] =
{
dotted,
dot_dashed,
@@ -1608,7 +1608,7 @@ TekRealize(Widget gw,
tekscr->linepat[i] = XCreateGC(XtDisplay(tw), TWindow(tekscr),
(GCForeground | GCLineStyle), &gcv);
XSetDashes(XtDisplay(tw), tekscr->linepat[i], 0,
- (char *) dashes[i], dash_length[i]);
+ dashes[i], dash_length[i]);
}
TekBackground(tw, screen);
@@ -1728,7 +1728,7 @@ TekSetFontSize(TekWidget tw, Bool fromMenu, int newitem)
}
void
-ChangeTekColors(TekWidget tw, TScreen * screen, ScrnColors * pNew)
+ChangeTekColors(TekWidget tw, TScreen *screen, ScrnColors * pNew)
{
TekScreen *tekscr = TekScreenOf(tw);
int i;
@@ -1817,7 +1817,7 @@ TekReverseVideo(TekWidget tw)
}
static void
-TekBackground(TekWidget tw, TScreen * screen)
+TekBackground(TekWidget tw, TScreen *screen)
{
TekScreen *tekscr = TekScreenOf(tw);
@@ -1937,7 +1937,7 @@ TekCopy(TekWidget tw)
void
HandleGINInput(Widget w,
XEvent * event GCC_UNUSED,
- String * param_list,
+ String *param_list,
Cardinal *nparamsp)
{
XtermWidget xw = term;
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index 9f67957..41e7901 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,7 +1,7 @@
-/* $XTermId: VTPrsTbl.c,v 1.73 2013/08/21 23:50:44 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.79 2014/05/02 23:32:27 tom Exp $ */
/*
- * Copyright 1999-2012,2013 by Thomas E. Dickey
+ * Copyright 1999-2013,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -1946,8 +1946,8 @@ CASE_CSI_IGNORE,
CASE_CSI_IGNORE,
CASE_CSI_IGNORE,
/* Agrave Aacute Acircumflex Atilde */
-CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_SL,
+CASE_SR,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Adiaeresis Aring AE Ccedilla */
@@ -3110,7 +3110,7 @@ CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_GRAPHICS_ATTRIBUTES,
/* T U V W */
CASE_GROUND_STATE,
CASE_GROUND_STATE,
@@ -3270,7 +3270,7 @@ CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_GRAPHICS_ATTRIBUTES,
/* Ocircumflex Otilde Odiaeresis multiply */
CASE_GROUND_STATE,
CASE_GROUND_STATE,
@@ -3917,12 +3917,12 @@ CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Eth Ntilde Ograve Oacute */
-CASE_RM_TITLE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
-/* Ocircumflex Otilde Odiaeresis multiply */
CASE_GROUND_STATE,
+/* Ocircumflex Otilde Odiaeresis multiply */
+CASE_RM_TITLE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
@@ -7446,14 +7446,14 @@ CASE_ESC_IGNORE,
CASE_ESC_IGNORE,
CASE_ESC_IGNORE,
/* degree plusminus twosuperior threesuperior */
+CASE_GSETS_PERCENT,
CASE_GROUND_STATE,
-CASE_GROUND_STATE,
-CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_GSETS_PERCENT,
+CASE_GSETS_PERCENT,
/* acute mu paragraph periodcentered */
CASE_GROUND_STATE,
-CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_GSETS_PERCENT,
+CASE_GSETS_PERCENT,
CASE_GROUND_STATE,
/* cedilla onesuperior masculine guillemotright */
CASE_GROUND_STATE,
@@ -7462,18 +7462,18 @@ CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* onequarter onehalf threequarters questiondown */
CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_GSETS_PERCENT,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Agrave Aacute Acircumflex Atilde */
-CASE_GSETS_PERCENT,
CASE_GROUND_STATE,
-CASE_GSETS_PERCENT,
+CASE_GROUND_STATE,
+CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Adiaeresis Aring AE Ccedilla */
CASE_GROUND_STATE,
-CASE_GSETS_PERCENT,
-CASE_GSETS_PERCENT,
+CASE_GROUND_STATE,
+CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Egrave Eacute Ecircumflex Ediaeresis */
CASE_GROUND_STATE,
@@ -7482,7 +7482,7 @@ CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Igrave Iacute Icircumflex Idiaeresis */
CASE_GROUND_STATE,
-CASE_GSETS_PERCENT,
+CASE_GROUND_STATE,
CASE_GROUND_STATE,
CASE_GROUND_STATE,
/* Eth Ntilde Ograve Oacute */
diff --git a/VTparse.def b/VTparse.def
index 820c6b4..b52a2f4 100644
--- a/VTparse.def
+++ b/VTparse.def
@@ -1,10 +1,10 @@
-# $XTermId: VTparse.def,v 1.47 2013/08/19 00:39:14 tom Exp $
+# $XTermId: VTparse.def,v 1.49 2014/04/25 21:36:12 tom Exp $
#
# vile:confmode rs=lf
# -----------------------------------------------------------------------------
# this file is part of xterm
#
-# Copyright 1996-2012,2013 by Thomas E. Dickey
+# Copyright 1996-2013,2014 by Thomas E. Dickey
#
# All Rights Reserved
#
@@ -199,3 +199,4 @@ CASE_ANSI_RC
CASE_ESC_COLON
CASE_SCS_PERCENT
CASE_GSETS_PERCENT
+CASE_GRAPHICS_ATTRIBUTES
diff --git a/VTparse.h b/VTparse.h
index 5ee7a8e..f49a805 100644
--- a/VTparse.h
+++ b/VTparse.h
@@ -1,7 +1,7 @@
-/* $XTermId: VTparse.h,v 1.62 2013/08/19 00:39:54 tom Exp $ */
+/* $XTermId: VTparse.h,v 1.64 2014/04/25 21:37:35 tom Exp $ */
/*
- * Copyright 2002-2012,2013 by Thomas E. Dickey
+ * Copyright 2002-2013,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -281,5 +281,6 @@ extern Const PARSE_T scs_pct_table[];
#define CASE_ESC_COLON 158
#define CASE_SCS_PERCENT 159
#define CASE_GSETS_PERCENT 160
+#define CASE_GRAPHICS_ATTRIBUTES 161
#endif /* included_VTparse_h */
diff --git a/aclocal.m4 b/aclocal.m4
index 3a1f086..358972b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,8 @@
-dnl $XTermId: aclocal.m4,v 1.372 2013/11/20 00:24:55 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.373 2014/04/14 19:16:55 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997-2012,2013 by Thomas E. Dickey
+dnl Copyright 1997-2013,2014 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -1294,7 +1294,7 @@ AC_TRY_LINK([
[cf_cv_input_method=no])])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
+dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07
dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It
dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -1323,7 +1323,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
make an error
#endif
],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
],[])
ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
@@ -1450,6 +1450,30 @@ AC_SUBST(MAKE_UPPER_TAGS)
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
+dnl -----------
+dnl Checks for libraries. At least one UNIX system, Apple Macintosh
+dnl Rhapsody 5.5, does not have -lm. We cannot use the simpler
+dnl AC_CHECK_LIB(m,sin), because that fails for C++.
+AC_DEFUN([CF_MATH_LIB],
+[
+AC_CACHE_CHECK(if -lm needed for math functions,
+ cf_cv_need_libm,[
+ AC_TRY_LINK([
+ #include <stdio.h>
+ #include <math.h>
+ ],
+ [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+ [cf_cv_need_libm=no],
+ [cf_cv_need_libm=yes])])
+if test "$cf_cv_need_libm" = yes
+then
+ifelse($1,,[
+ CF_ADD_LIB(m)
+],[$1=-lm])
+fi
+])
+dnl ---------------------------------------------------------------------------
dnl CF_MIXEDCASE_FILENAMES version: 6 updated: 2013/10/08 17:47:05
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
@@ -3727,7 +3751,7 @@ then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
+dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3805,6 +3829,7 @@ sco*) #(vi
;;
solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
+ cf_cv_xopen_source=broken
;;
*)
CF_TRY_XOPEN_SOURCE
diff --git a/button.c b/button.c
index 8b39e3b..7dc6e86 100644
--- a/button.c
+++ b/button.c
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.465 2013/11/27 00:43:43 tom Exp $ */
+/* $XTermId: button.c,v 1.467 2014/04/22 00:50:10 tom Exp $ */
/*
- * Copyright 1999-2012,2013 by Thomas E. Dickey
+ * Copyright 1999-2013,2014 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -134,8 +134,8 @@ static const CELL zeroCELL =
{0, 0};
#if OPT_DEC_LOCATOR
-static Bool SendLocatorPosition(XtermWidget xw, XButtonEvent * event);
-static void CheckLocatorPosition(XtermWidget xw, XButtonEvent * event);
+static Bool SendLocatorPosition(XtermWidget xw, XButtonEvent *event);
+static void CheckLocatorPosition(XtermWidget xw, XButtonEvent *event);
#endif /* OPT_DEC_LOCATOR */
/* Multi-click handling */
@@ -151,20 +151,20 @@ static Char *SaveText(TScreen *screen, int row, int scol,
int ecol,
Char *lp, int *eol);
static int Length(TScreen *screen, int row, int scol, int ecol);
static void ComputeSelect(XtermWidget xw, CELL *startc, CELL *endc, Bool
extend);
-static void EditorButton(XtermWidget xw, XButtonEvent * event);
-static void EndExtend(XtermWidget w, XEvent * event, String *params, Cardinal
+static void EditorButton(XtermWidget xw, XButtonEvent *event);
+static void EndExtend(XtermWidget w, XEvent *event, String *params, Cardinal
num_params, Bool use_cursor_loc);
static void ExtendExtend(XtermWidget xw, const CELL *cell);
static void PointToCELL(TScreen *screen, int y, int x, CELL *cell);
static void ReHiliteText(XtermWidget xw, CELL *first, CELL *last);
static void SaltTextAway(XtermWidget xw, CELL *cellc, CELL *cell);
-static void SelectSet(XtermWidget xw, XEvent * event, String *params, Cardinal
num_params);
+static void SelectSet(XtermWidget xw, XEvent *event, String *params, Cardinal
num_params);
static void SelectionReceived PROTO_XT_SEL_CB_ARGS;
static void StartSelect(XtermWidget xw, const CELL *cell);
-static void TrackDown(XtermWidget xw, XButtonEvent * event);
+static void TrackDown(XtermWidget xw, XButtonEvent *event);
static void TrackText(XtermWidget xw, const CELL *first, const CELL *last);
static void _OwnSelection(XtermWidget xw, String *selections, Cardinal count);
-static void do_select_end(XtermWidget xw, XEvent * event, String *params,
+static void do_select_end(XtermWidget xw, XEvent *event, String *params,
Cardinal *num_params, Bool use_cursor_loc);
#define MOUSE_LIMIT (255 - 32)
@@ -249,7 +249,7 @@ EmitMousePositionSeparator(TScreen *screen, Char line[],
unsigned count)
}
Bool
-SendMousePosition(XtermWidget xw, XEvent * event)
+SendMousePosition(XtermWidget xw, XEvent *event)
{
TScreen *screen = TScreenOf(xw);
XButtonEvent *my_event = (XButtonEvent *) event;
@@ -352,7 +352,7 @@ SendMousePosition(XtermWidget xw, XEvent * event)
}
static Bool
-SendLocatorPosition(XtermWidget xw, XButtonEvent * event)
+SendLocatorPosition(XtermWidget xw, XButtonEvent *event)
{
ANSI reply;
TScreen *screen = TScreenOf(xw);
@@ -673,7 +673,7 @@ InitLocatorFilter(XtermWidget xw)
}
static void
-CheckLocatorPosition(XtermWidget xw, XButtonEvent * event)
+CheckLocatorPosition(XtermWidget xw, XButtonEvent *event)
{
ANSI reply;
TScreen *screen = TScreenOf(xw);
@@ -726,7 +726,7 @@ CheckLocatorPosition(XtermWidget xw, XButtonEvent * event)
#if OPT_READLINE
static int
-isClick1_clean(TScreen *screen, XButtonEvent * event)
+isClick1_clean(TScreen *screen, XButtonEvent *event)
{
int delta;
@@ -755,7 +755,7 @@ isClick1_clean(TScreen *screen, XButtonEvent * event)
}
static int
-isDoubleClick3(TScreen *screen, XButtonEvent * event)
+isDoubleClick3(TScreen *screen, XButtonEvent *event)
{
int delta;
@@ -794,7 +794,7 @@ isDoubleClick3(TScreen *screen, XButtonEvent * event)
}
static int
-CheckSecondPress3(TScreen *screen, XEvent * event)
+CheckSecondPress3(TScreen *screen, XEvent *event)
{
int delta;
@@ -863,13 +863,13 @@ rowOnCurrentLine(TScreen *screen,
}
static int
-eventRow(TScreen *screen, XEvent * event) /* must be XButtonEvent */
+eventRow(TScreen *screen, XEvent *event) /* must be XButtonEvent */
{
return (event->xbutton.y - screen->border) / FontHeight(screen);
}
static int
-eventColBetween(TScreen *screen, XEvent * event) /* must be XButtonEvent
*/
+eventColBetween(TScreen *screen, XEvent *event) /* must be
XButtonEvent */
{
/* Correct by half a width - we are acting on a boundary, not on a cell. */
return ((event->xbutton.x - OriginX(screen) + (FontWidth(screen) - 1) / 2)
@@ -913,7 +913,7 @@ ReadLineDelete(TScreen *screen, CELL *cell1, CELL *cell2)
}
static void
-readlineExtend(TScreen *screen, XEvent * event)
+readlineExtend(TScreen *screen, XEvent *event)
{
int ldelta1, ldelta2;
@@ -939,7 +939,7 @@ readlineExtend(TScreen *screen, XEvent * event)
/* ^XM-G<line+' '><col+' '> */
void
DiredButton(Widget w,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params GCC_UNUSED, /* selections */
Cardinal *num_params GCC_UNUSED)
{
@@ -970,7 +970,7 @@ DiredButton(Widget w,
#if OPT_READLINE
void
ReadLineButton(Widget w,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params GCC_UNUSED, /* selections */
Cardinal *num_params GCC_UNUSED)
{
@@ -1027,7 +1027,7 @@ ReadLineButton(Widget w,
/* repeats <ESC>n or <ESC>p */
void
ViButton(Widget w,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params GCC_UNUSED, /* selections */
Cardinal *num_params GCC_UNUSED)
{
@@ -1066,7 +1066,7 @@ ViButton(Widget w,
/*ARGSUSED*/
void
HandleSelectExtend(Widget w,
- XEvent * event, /* must be XMotionEvent */
+ XEvent *event, /* must be XMotionEvent */
String *params GCC_UNUSED,
Cardinal *num_params GCC_UNUSED)
{
@@ -1102,7 +1102,7 @@ HandleSelectExtend(Widget w,
void
HandleKeyboardSelectExtend(Widget w,
- XEvent * event GCC_UNUSED, /* must be XButtonEvent
*/
+ XEvent *event GCC_UNUSED, /* must be XButtonEvent
*/
String *params GCC_UNUSED,
Cardinal *num_params GCC_UNUSED)
{
@@ -1118,7 +1118,7 @@ HandleKeyboardSelectExtend(Widget w,
static void
do_select_end(XtermWidget xw,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params, /* selections */
Cardinal *num_params,
Bool use_cursor_loc)
@@ -1143,7 +1143,7 @@ do_select_end(XtermWidget xw,
void
HandleSelectEnd(Widget w,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params, /* selections */
Cardinal *num_params)
{
@@ -1157,7 +1157,7 @@ HandleSelectEnd(Widget w,
void
HandleKeyboardSelectEnd(Widget w,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params, /* selections */
Cardinal *num_params)
{
@@ -1174,7 +1174,7 @@ HandleKeyboardSelectEnd(Widget w,
*/
void
HandleCopySelection(Widget w,
- XEvent * event,
+ XEvent *event,
String *params, /* list of targets */
Cardinal *num_params)
{
@@ -1375,7 +1375,7 @@ sameItem(const char *actual, const char *wanted)
* Handle the eightBitSelectTypes or utf8SelectTypes resource values.
*/
static Bool
-overrideTargets(Widget w, String value, Atom ** resultp)
+overrideTargets(Widget w, String value, Atom **resultp)
{
Bool override = False;
XtermWidget xw;
@@ -1679,7 +1679,7 @@ xtermGetSelection(Widget w,
Time ev_time,
String *params, /* selections in precedence order */
Cardinal num_params,
- Atom * targets)
+ Atom *targets)
{
Atom selection;
int cutbuffer;
@@ -2077,8 +2077,8 @@ removeControls(XtermWidget xw, char *value)
static void
SelectionReceived(Widget w,
XtPointer client_data,
- Atom * selection GCC_UNUSED,
- Atom * type,
+ Atom *selection GCC_UNUSED,
+ Atom *type,
XtPointer value,
unsigned long *length,
int *format)
@@ -2228,7 +2228,7 @@ SelectionReceived(Widget w,
void
HandleInsertSelection(Widget w,
- XEvent * event, /* assumed to be XButtonEvent* */
+ XEvent *event, /* assumed to be XButtonEvent* */
String *params, /* selections in precedence order */
Cardinal *num_params)
{
@@ -2290,7 +2290,7 @@ EvalSelectUnit(XtermWidget xw,
static void
do_select_start(XtermWidget xw,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
CELL *cell)
{
TScreen *screen = TScreenOf(xw);
@@ -2313,7 +2313,7 @@ do_select_start(XtermWidget xw,
/* ARGSUSED */
void
HandleSelectStart(Widget w,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
String *params GCC_UNUSED,
Cardinal *num_params GCC_UNUSED)
{
@@ -2339,7 +2339,7 @@ HandleSelectStart(Widget w,
/* ARGSUSED */
void
HandleKeyboardSelectStart(Widget w,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
String *params GCC_UNUSED,
Cardinal *num_params GCC_UNUSED)
{
@@ -2354,7 +2354,7 @@ HandleKeyboardSelectStart(Widget w,
}
static void
-TrackDown(XtermWidget xw, XButtonEvent * event)
+TrackDown(XtermWidget xw, XButtonEvent *event)
{
TScreen *screen = TScreenOf(xw);
CELL cell;
@@ -2431,7 +2431,7 @@ StartSelect(XtermWidget xw, const CELL *cell)
static void
EndExtend(XtermWidget xw,
- XEvent * event, /* must be XButtonEvent */
+ XEvent *event, /* must be XButtonEvent */
String *params, /* selections */
Cardinal num_params,
Bool use_cursor_loc)
@@ -2524,7 +2524,7 @@ EndExtend(XtermWidget xw,
void
HandleSelectSet(Widget w,
- XEvent * event,
+ XEvent *event,
String *params,
Cardinal *num_params)
{
@@ -2539,7 +2539,7 @@ HandleSelectSet(Widget w,
/* ARGSUSED */
static void
SelectSet(XtermWidget xw,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
String *params,
Cardinal num_params)
{
@@ -2560,7 +2560,7 @@ SelectSet(XtermWidget xw,
/* ARGSUSED */
static void
do_start_extend(XtermWidget xw,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
String *params GCC_UNUSED,
Cardinal *num_params GCC_UNUSED,
Bool use_cursor_loc)
@@ -2661,7 +2661,7 @@ ExtendExtend(XtermWidget xw, const CELL *cell)
void
HandleStartExtend(Widget w,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
String *params, /* unused */
Cardinal *num_params) /* unused */
{
@@ -2675,7 +2675,7 @@ HandleStartExtend(Widget w,
void
HandleKeyboardStartExtend(Widget w,
- XEvent * event, /* must be XButtonEvent* */
+ XEvent *event, /* must be XButtonEvent* */
String *params, /* unused */
Cardinal *num_params) /* unused */
{
@@ -3784,7 +3784,7 @@ CompleteSelection(XtermWidget xw, String *args, Cardinal
len)
static Bool
_ConvertSelectionHelper(Widget w,
- Atom * type,
+ Atom *type,
XtPointer *value,
unsigned long *length,
int *format,
@@ -3842,9 +3842,9 @@ SaveConvertedLength(XtPointer *target, unsigned long
source)
static Boolean
ConvertSelection(Widget w,
- Atom * selection,
- Atom * target,
- Atom * type,
+ Atom *selection,
+ Atom *target,
+ Atom *type,
XtPointer *value,
unsigned long *length,
int *format)
@@ -4002,7 +4002,7 @@ ConvertSelection(Widget w,
}
static void
-LoseSelection(Widget w, Atom * selection)
+LoseSelection(Widget w, Atom *selection)
{
TScreen *screen;
Atom *atomP;
@@ -4043,8 +4043,8 @@ LoseSelection(Widget w, Atom * selection)
/* ARGSUSED */
static void
SelectionDone(Widget w GCC_UNUSED,
- Atom * selection GCC_UNUSED,
- Atom * target GCC_UNUSED)
+ Atom *selection GCC_UNUSED,
+ Atom *target GCC_UNUSED)
{
/* empty proc so Intrinsics know we want to keep storage */
}
@@ -4294,7 +4294,7 @@ SaveText(TScreen *screen,
/* Position: 32 - 255. */
static int
-BtnCode(XButtonEvent * event, int button)
+BtnCode(XButtonEvent *event, int button)
{
int result = (int) (32 + (KeyState(event->state) << 2));
@@ -4320,7 +4320,7 @@ static unsigned
EmitButtonCode(TScreen *screen,
Char *line,
unsigned count,
- XButtonEvent * event,
+ XButtonEvent *event,
int button)
{
int value;
@@ -4372,7 +4372,7 @@ FirstBitN(int bits)
#define EMIT_BUTTON(button) EmitButtonCode(screen, line, count, event, button)
static void
-EditorButton(XtermWidget xw, XButtonEvent * event)
+EditorButton(XtermWidget xw, XButtonEvent *event)
{
TScreen *screen = TScreenOf(xw);
int pty = screen->respond;
@@ -4512,7 +4512,7 @@ EditorButton(XtermWidget xw, XButtonEvent * event)
#if OPT_FOCUS_EVENT
void
-SendFocusButton(XtermWidget xw, XFocusChangeEvent * event)
+SendFocusButton(XtermWidget xw, XFocusChangeEvent *event)
{
TScreen *screen = TScreenOf(xw);
@@ -4539,7 +4539,7 @@ SendFocusButton(XtermWidget xw, XFocusChangeEvent * event)
* Get the event-time, needed to process selections.
*/
static Time
-getEventTime(XEvent * event)
+getEventTime(XEvent *event)
{
Time result;
@@ -4558,7 +4558,7 @@ getEventTime(XEvent * event)
static char *
getSelectionString(XtermWidget xw,
Widget w,
- XEvent * event,
+ XEvent *event,
String *params,
Cardinal *num_params,
CELL *start, CELL *finish)
@@ -4972,7 +4972,7 @@ freeArgv(char *blob, char **argv)
void
HandleExecFormatted(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
String *params, /* selections */
Cardinal *num_params)
{
@@ -5004,7 +5004,7 @@ HandleExecFormatted(Widget w,
void
HandleExecSelectable(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
String *params, /* selections */
Cardinal *num_params)
{
@@ -5030,8 +5030,8 @@ HandleExecSelectable(Widget w,
}
executeCommand(argv);
freeArgv(blob, argv);
- free(data);
}
+ free(data);
}
}
}
@@ -5039,7 +5039,7 @@ HandleExecSelectable(Widget w,
void
HandleInsertFormatted(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
String *params, /* selections */
Cardinal *num_params)
{
@@ -5068,7 +5068,7 @@ HandleInsertFormatted(Widget w,
void
HandleInsertSelectable(Widget w,
- XEvent * event GCC_UNUSED,
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1whlly-0002ci...@moszumanska.debian.org
