1d2631fb31
- Patch #322 - 2016/01/02 * fix regression due to incorrect fix for compiler warning when allocating storage for /etc/shells (reports by Ashish Shukla, Debian #809646). - Patch #321 - 2015/12/31 * add resource keepClipboard, escape sequence and action keep-clipboard. * add optional feature to capture text copied to clipboard at the time of copying rather than at the time the clipboard contents are requested for pasting (patch by Milan Mehner). * improve a special case where the -e option was used to pass a single-quoted command via luit, by wrapping it in a “sh -c” (report by Keith Hedger). * minor fix for type-cleanliness when allocating storage for /etc/shells (Tobias Stoeckmann). * fix a typo in manual page (Dan Church). * fix minor file-descriptor leak; after calling openpty, the slave's file descriptor is not needed (report by Juha Nurmela). * editorial change to ctlseqs.ms (report by David Gomboc). * minor updates for autoconf macros. * update config.guess, config.sub - vttest 20140305 * save/restore color enable-flag for menu 11.6 in a couple of places so that the ISO-6429 tests do not reset it unexpectedly. * amend the REP test to not reset colors if it happens to be run via the menu entry for BCE-related tests. - vttest 20140116 * cosmetic changes (suggested by Itay Chamiel): OBS-URL: https://build.opensuse.org/request/show/357555 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=134
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From: Egbert Eich <eich@suse.de>
|
|
Date: Tue Jun 3 18:17:07 2014 +0200
|
|
Subject: [PATCH]Fix number of colormap entries for DirectColor and TrueColor visuals
|
|
Patch-mainline: to be upstreamed
|
|
Git-commit: 071525466531009223f1c21a40aa2e081d5ef99a
|
|
Git-repo:
|
|
References: bnc#
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
|
|
DirectColor and TrueColor have a decomposed colormap,
|
|
therefore the colormap_size field in the XVisualInfo
|
|
structure is meant per sub-field (take a look at the output
|
|
of xdpyinfo).
|
|
With 3 sub-fields there are colormap_size^3 entires.
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
|
---
|
|
xterm-299/misc.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/misc.c b/misc.c
|
|
--- a/misc.c
|
|
+++ b/misc.c
|
|
@@ -2227,16 +2227,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
|
|
}
|
|
|
|
static void
|
|
getColormapInfo(XtermWidget xw, unsigned *typep, unsigned *sizep)
|
|
{
|
|
if (getVisualInfo(xw)) {
|
|
*typep = (unsigned) xw->visInfo->class;
|
|
*sizep = (unsigned) xw->visInfo->colormap_size;
|
|
+ if (*typep > 3)
|
|
+ *sizep = (*sizep)*(*sizep)*(*sizep);
|
|
} else {
|
|
*typep = 0;
|
|
*sizep = 0;
|
|
}
|
|
}
|
|
|
|
#define MAX_COLORTABLE 4096
|
|
|