summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-07-09 09:32:17 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-07-09 09:32:17 +0000
commit08c1c87561d250c9b97ba90c8479536d585c4a99 (patch)
tree8b959407e57fdc88b36b9aec7a7ab2b1754d78f2 /x11-terms/mrxvt/files
parentRemove old versions. (diff)
downloadgentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.tar.gz
gentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.tar.bz2
gentoo-2-08c1c87561d250c9b97ba90c8479536d585c4a99.zip
Remove old versions.
(Portage version: 2.1.1_pre2-r6) (Signed Manifest commit)
Diffstat (limited to 'x11-terms/mrxvt/files')
-rw-r--r--x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r11
-rw-r--r--x11-terms/mrxvt/files/digest-mrxvt-0.4.11
-rw-r--r--x11-terms/mrxvt/files/digest-mrxvt-0.4.23
-rw-r--r--x11-terms/mrxvt/files/digest-mrxvt-0.5.03
-rw-r--r--x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch221
-rw-r--r--x11-terms/mrxvt/files/noflicker-0.4.2.patch159
-rw-r--r--x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch53
7 files changed, 0 insertions, 441 deletions
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1 b/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1
deleted file mode 100644
index 579a5967d027..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.3.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 880bc53d17af9f177cc68d7ce1abd1a2 mrxvt-0.3.13.tar.gz 497798
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.1 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.1
deleted file mode 100644
index 5e645e803175..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd41f496e11d2a318e2fa59aca056793 mrxvt-0.4.1.tar.gz 504370
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.2 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.2
deleted file mode 100644
index 701f387b5efa..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e930a35ca2892f854b3d34e1ee0b6d0 mrxvt-0.4.2.tgz 508718
-RMD160 205a5df674ea37639108d60d4bc78373749ce58e mrxvt-0.4.2.tgz 508718
-SHA256 a6d348670641b043aa3cb7b55c2f3ebb4fbb521f8134b67e0821991b959f1830 mrxvt-0.4.2.tgz 508718
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.5.0 b/x11-terms/mrxvt/files/digest-mrxvt-0.5.0
deleted file mode 100644
index 2d91d1bf0392..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ee0e6f5d7afaddfd399ae174f6adfcef mrxvt-0.5.0.tar.gz 592847
-RMD160 d197767075577ada0679ce1ab0c2c3dd9f900e22 mrxvt-0.5.0.tar.gz 592847
-SHA256 0c99edffab6293913c40c2d538d6f72059fed28571cf967350bdc87b553fbead mrxvt-0.5.0.tar.gz 592847
diff --git a/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch b/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch
deleted file mode 100644
index 9adf02874660..000000000000
--- a/x11-terms/mrxvt/files/mrxvt-0.3.13-xdefaults.patch
+++ /dev/null
@@ -1,221 +0,0 @@
---- xdefaults.c.orig 2005-02-04 04:57:51.000000000 +0900
-+++ xdefaults.c 2005-02-18 17:36:49.168153000 +0900
-@@ -58,7 +58,7 @@
- # ifndef USE_XGETDEFAULT
- void rxvt_get_xdefaults (rxvt_t*, FILE*, const char*);
- # else
--char* get_xdefault_resource (XrmDatabase database, char *name, char *subClass, char *fullClass, char *resource);
-+char* get_xdefault_resource (XrmDatabase database, const char *name, char *subClass, char *fullClass, char *resource);
- # endif
- #endif
- /*--------------------------------------------------------------------*
-@@ -100,7 +100,7 @@
- {(flag), -1, NULL, (opt), NULL, (desc), (multiple)}
-
- /* convenient macros */
--#define optList_strlen(i) \
-+#define optList_STRLEN(i) \
- (optList[i].flag ? 0 : (optList[i].arg ? STRLEN(optList[i].arg) : 1))
- #define optList_isBool(i) \
- (optList[i].flag & Opt_Boolean)
-@@ -735,7 +735,7 @@
- int len = 0;
-
- if (!optList_isBool(i)) {
-- len = optList_strlen(i);
-+ len = optList_STRLEN(i);
- if (len > 0)
- len++; /* account for space */
- }
-@@ -750,7 +750,7 @@
- }
- fprintf(stderr, " [-%s%s", (optList_isBool(i) ?
- "/+" : ""), optList[i].opt);
-- if (optList_strlen(i))
-+ if (optList_STRLEN(i))
- fprintf(stderr, " %s]", optList[i].arg);
- else
- fprintf(stderr, "]");
-@@ -1002,7 +1002,7 @@
- if (entry < optList_size()) {
- if (optList_isReverse(entry))
- flag = (flag == On) ? Off : On;
-- if (optList_strlen(entry)) { /* string value */
-+ if (optList_STRLEN(entry)) { /* string value */
- const char *str = argv[++i];
-
- DBG_MSG(2, (stderr, "string (%s,%s) = ",
-@@ -1437,86 +1437,97 @@
- #ifdef USE_XGETDEFAULT
- /* INTPROTO */
- char*
--get_xdefault_resource(XrmDatabase database, char *name, char *subClass, char *fullClass, char *resource)
-+get_xdefault_resource(XrmDatabase database, const char *name, char *subClass, char *fullClass, char *resource)
- {
-- char *resourceClass;
-- char *str_class;
-- char *str_name;
-- char *generic_return_str_type = NULL;
-- char *return_str_type = NULL;
-- int i;
--
-- Bool foundGeneric;
-- Bool found;
--
-- XrmValue return_value;
-- static char *invalidPrefix = "! invalid name !";
--
-- int prefix_len = strlen(invalidPrefix);
-- if (strlen(name) > prefix_len) {
-- prefix_len = strlen(name);
-- }
-- if (strlen(subClass) > prefix_len) {
-- prefix_len = strlen(subClass);
-- }
-- if (strlen(fullClass) > prefix_len) {
-- prefix_len = strlen(fullClass);
-- }
-- str_class = malloc(prefix_len + strlen(resource) + 1);
-- str_name = malloc(prefix_len + strlen(resource) + 1);
-- sprintf(str_name, "%s.%s", name, resource);
--
-- /* translate resource to class */
-- resourceClass = malloc(strlen(resource) + 1);
-- resourceClass[0] = toupper(resource[0]);
-- for (i = 1; i < strlen(resource); i++) {
-- if (resource[i - 1] == '.') {
-- resourceClass[i] = toupper(resource[i]);
-- } else {
-- resourceClass[i] = resource[i];
-- }
-- }
-- resourceClass[strlen(resource)] = 0;
-+ char* resourceClass;
-+ char* str_class;
-+ char* str_name;
-+ char* generic_return_str_type = NULL;
-+ char* return_str_type = NULL;
-+ int len, i;
-+ Bool foundGeneric;
-+ Bool found;
-+ XrmValue return_value;
-+
-+ static char* invalidPrefix = "! invalid name !";
-+ int prefix_len = STRLEN(invalidPrefix);
-+ /* find the maximal prefix_len */
-+ if (STRLEN(name) > prefix_len) {
-+ prefix_len = STRLEN(name);
-+ }
-+ if (STRLEN(subClass) > prefix_len) {
-+ prefix_len = STRLEN(subClass);
-+ }
-+ if (STRLEN(fullClass) > prefix_len) {
-+ prefix_len = STRLEN(fullClass);
-+ }
-+
-+ /* allocate memory for str_class and str_name */
-+ len = prefix_len + STRLEN(resource) + 2;
-+ str_class = malloc(len);
-+ str_name = malloc(len);
-+
-+ snprintf(str_name, len-1, "%s.%s", name, resource);
-+ str_name[len-1] = (char) 0;
-+
-+ /* translate resource to class */
-+ resourceClass = malloc(STRLEN(resource) + 1);
-+ resourceClass[0] = toupper(resource[0]);
-+ for (i = 1; i < STRLEN(resource); i++) {
-+ if (resource[i - 1] == '.') {
-+ resourceClass[i] = toupper(resource[i]);
-+ }
-+ else {
-+ resourceClass[i] = resource[i];
-+ }
-+ }
-+ resourceClass[STRLEN(resource)] = 0;
-
-- /*
-- ** We need to get resources with two different class names. If
-+ /*
-+ ** We need to get resources with two different class names. If
- ** both subClass and fullClass exist, then subClass takes
- ** precedence.
-- **
-- ** The original algorithm for this was to get null-prefix resource
-- ** (i.e. *resource) as well as the subClass resource. If they
-+ **
-+ ** The original algorithm for this was to get null-prefix resource
-+ ** (i.e. *resource) as well as the subClass resource. If they
- ** matched, then the fullClass was used. Unfortunately this has
- ** a weakness; with the following database:
-- ** *resource: value1
-- ** subClass.resource: value1
-- ** fullClass.resource: value2
-- ** the value used will be 'value2' instead of 'value1'. This is
-+ ** *resource: value1
-+ ** subClass.resource: value1
-+ ** fullClass.resource: value2
-+ ** the value used will be 'value2' instead of 'value1'. This is
- ** incorrect.
-- **
-- ** However, we can cheat. XrmGetResource returns string pointers
-+ **
-+ ** However, we can cheat. XrmGetResource returns string pointers
- ** that are actually pointing to the internal string in the
- ** database. Thus, if the *pointer* returned when looking for
- ** the generic resource is the same as that for the subClass,
- ** then they found the same thing.
-- **
-- ** Note that XGetDefault *cannot* be used, as we may be getting
-+ **
-+ ** Note that XGetDefault *cannot* be used, as we may be getting
- ** multi-level resources, something that it does not support.
-- */
-- sprintf(str_class, "%s.%s", invalidPrefix, resourceClass);
-- foundGeneric = XrmGetResource(database, str_name, str_class, &generic_return_str_type, &return_value);
--
-- sprintf(str_class, "%s.%s", subClass, resourceClass);
-- found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value);
--
-- if (!found || (foundGeneric && found && generic_return_str_type == return_str_type) ) {
-- /* Subclass returned nothing or the same physical thing as the the generic. Try fullClass. */
-- sprintf(str_class, "%s.%s", fullClass, resourceClass);
-- found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value);
-- }
--
-- free(str_class);
-- free(str_name);
-- return found ? (char *) return_value.addr : NULL;
-+ */
-+ snprintf(str_class, len-1, "%s.%s", invalidPrefix, resourceClass);
-+ str_name[len-1] = (char) 0;
-+ foundGeneric = XrmGetResource(database, str_name, str_class, &generic_return_str_type, &return_value);
-+
-+ snprintf(str_class, len-1, "%s.%s", subClass, resourceClass);
-+ str_name[len-1] = (char) 0;
-+ found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value);
-+
-+ if (!found ||
-+ (foundGeneric && found && generic_return_str_type == return_str_type) ) {
-+ /* Subclass returned nothing or the same physical thing as the the generic. Try fullClass. */
-+ snprintf(str_class, len-1, "%s.%s", fullClass, resourceClass);
-+ str_name[len-1] = (char) 0;
-+ found = XrmGetResource(database, str_name, str_class, &return_str_type, &return_value);
-+ }
-+
-+ /* free memory */
-+ free(str_class);
-+ free(str_name);
-+
-+ return found ? (char *) return_value.addr : NULL;
- }
- #endif /* USE_XGETDEFAULT */
-
-@@ -1619,7 +1630,6 @@
- for (entry = 0; entry < optList_size(); entry++) {
- int s;
- char* p;
-- char* p0;
- register int i;
- register int loop = optList[entry].multiple ? MAX_PAGES : 1;
-
diff --git a/x11-terms/mrxvt/files/noflicker-0.4.2.patch b/x11-terms/mrxvt/files/noflicker-0.4.2.patch
deleted file mode 100644
index 9ce42c0a9c27..000000000000
--- a/x11-terms/mrxvt/files/noflicker-0.4.2.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -ru /tmp/mrxvt-0.4.2/src/command.c ./src/command.c
---- /tmp/mrxvt-0.4.2/src/command.c 2005-06-24 17:16:26.000000000 -0500
-+++ ./src/command.c 2005-12-21 12:57:21.000000000 -0600
-@@ -36,6 +36,12 @@
- /*
- ** $Id: noflicker-0.4.2.patch,v 1.1 2006/02/03 14:01:29 nelchael Exp $
- */
-+/* Modified 2005-12-21 by Gautam Iyer <gautam@math.uchicago.edu>
-+ *
-+ * 1. Eliminated the "BadMatch" XError sometimes generated
-+ * 2. Eliminated "flicker" seen when using a transparent shaded terminal
-+ * while changing desktop pages.
-+ */
-
- #include "../config.h"
- #include "rxvt.h"
-@@ -3740,10 +3746,22 @@
- }
- #endif
-
--#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
-+#ifdef TRANSPARENT
-+ /*
-+ * Check to see if the previous position we grabbed the background is
-+ * different from the current window position. If yes, then update
-+ * everything.
-+ */
- if (r->Options & Opt_transparent) {
-- rxvt_check_our_parents(r);
-- r->h->want_full_refresh = 1;
-+ if( !r->bgGrabbed
-+ || r->prevPos.x != ev->x
-+ || r->prevPos.y != ev->y
-+ || r->prevPos.width != ev->width
-+ || r->prevPos.height != ev->height
-+ ) {
-+ rxvt_check_our_parents(r);
-+ r->h->want_full_refresh = 1;
-+ }
- }
- #endif
- }
-@@ -3782,7 +3800,9 @@
- if (ev->atom != r->h->xa[XA_XROOTPMAPID])
- return ;
-
-- if ((r->Options & Opt_transparent) && rxvt_check_our_parents(r)) {
-+ if (r->Options & Opt_transparent) {
-+ r->bgGrabbed = False;
-+ rxvt_check_our_parents(r);
- r->h->want_full_refresh = 1;
- }
- #endif /* TRANSPARENT */
-@@ -4549,6 +4569,14 @@
- 0, 0, &sx, &sy, &cr);
- nw = r->szHint.width;
- nh = r->szHint.height;
-+
-+#if DEBUG_LEVEL
-+ if( sx + nw <= 0 || sx >= (int) rootw || sy + nh <= 0 || sy >= (int) rooth) {
-+ DBG_MSG( 1, (stderr, "Possible error: grabbing offscreen (%d, %d, %u, %u)\n",
-+ sx, sy, nw, nh));
-+ }
-+#endif
-+
- *nx = *ny = 0;
- if (sx < 0) {
- nw += sx;
-@@ -4707,8 +4735,14 @@
- rootpixmap = *((Pixmap*) prop);
- XFree(prop);
- }
-+ else r->bgGrabbed = False;
-+
-+ /*
-+ * Use "while" instead of "if" so we can break out if transparency
-+ * updates don't need to be performed.
-+ */
-+ while (have_pixmap) {
-
-- if (have_pixmap) {
- /*
- ** Copy XROOT pixmap transparency
- */
-@@ -4716,13 +4750,21 @@
- XImage* imagetw;
-
- /*
-- ** handle BadMatch - usually because we're outside the
-- ** pixmap. may need a delay here?
-- */
-- r->h->allowedxerror = -1;
-+ * Calling get_parent_ximage when the terminal window is off
-+ * screen is pointless and generates a "Bad Match" XError while
-+ * calling XGetImage.
-+ */
-+
-+ if ( r->szHint.x + r->szHint.width <= 0
-+ || r->szHint.x >= (int) wrootattr.width
-+ || r->szHint.y + r->szHint.height <= 0
-+ || r->szHint.y >= (int) wrootattr.height
-+ )
-+ /* We're off screen. Don't update */
-+ break;
-+
- imagetw = get_parent_ximage (r, rootpixmap,
- wrootattr.width, wrootattr.height, &nx, &ny);
-- r->h->allowedxerror = 0;
-
- if (NULL == imagetw) {
- if (r->h->am_transparent && r->h->am_pixmap_trans) {
-@@ -4746,10 +4788,18 @@
- if ((!r->h->am_transparent || !r->h->am_pixmap_trans) &&
- retvt)
- */
-- if (retvt)
-+ if (retvt) {
-+ r->bgGrabbed = True;
-+ r->prevPos.x = r->szHint.x;
-+ r->prevPos.y = r->szHint.y;
-+ r->prevPos.width = r->szHint.width;
-+ r->prevPos.height = r->szHint.height;
-+
- have_changed = 1;
-+ }
- r->h->am_transparent = r->h->am_pixmap_trans = 1;
- }
-+ break;
- }
-
- /*
-diff -ru /tmp/mrxvt-0.4.2/src/init.c ./src/init.c
---- /tmp/mrxvt-0.4.2/src/init.c 2005-10-07 20:07:45.000000000 -0500
-+++ ./src/init.c 2005-12-21 12:57:21.000000000 -0600
-@@ -1927,6 +1927,10 @@
- r->szHint.x = 0;
- r->szHint.y = 0;
-
-+#ifdef TRANSPARENT
-+ r->bgGrabbed = False;
-+#endif
-+
- /* Parse geometry */
- if (r->h->rs[Rs_geometry])
- flags = XParseGeometry(r->h->rs[Rs_geometry], &x, &y, &w, &h);
-diff -ru /tmp/mrxvt-0.4.2/src/rxvtlib.h ./src/rxvtlib.h
---- /tmp/mrxvt-0.4.2/src/rxvtlib.h 2005-06-23 20:54:07.000000000 -0500
-+++ ./src/rxvtlib.h 2005-12-21 12:57:21.000000000 -0600
-@@ -757,6 +757,10 @@
- unsigned long Options;
- unsigned long Options2;
- XSizeHints szHint;
-+#ifdef TRANSPARENT
-+ XRectangle prevPos; /* previous onscreen position */
-+ Bool bgGrabbed; /* weather the bg was succesfully grabbed at prevPos */
-+#endif
-
- /* hotkeys */
- hotkeys_t* hotkeys;
diff --git a/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch b/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch
deleted file mode 100644
index a0b45f0c238f..000000000000
--- a/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ru /tmp/mrxvt-0.4.2-orig/src/screen.c ./src/screen.c
---- /tmp/mrxvt-0.4.2-orig/src/screen.c 2005-06-23 23:26:55.000000000 -0500
-+++ ./src/screen.c 2005-12-22 14:33:46.000000000 -0600
-@@ -3278,7 +3278,7 @@
- }
- } /* if (wbyte) */
- #else
-- {
-+ { /* } for correct % bouncing*/
- #endif
- if (!fprop) {
- /* single stepping - `normal' mode */
-@@ -3380,8 +3380,20 @@
- if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_BD) &&
- r->PixColors[fore] != r->PixColors[Color_BD] &&
- r->PixColors[back] != r->PixColors[Color_BD]) {
-- gcvalue.foreground = r->PixColors[Color_BD];
-- gcmask |= GCForeground;
-+# ifdef XFT_SUPPORT
-+ /*
-+ * XFT won't use the colors from the GC, so we need to set
-+ * fore. Setting fore even when we're not using XFT
-+ * shouldn't make a difference, but why take a chance :)
-+ */
-+ if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt )
-+ fore = Color_BD;
-+ else
-+# endif
-+ {
-+ gcvalue.foreground = r->PixColors[Color_BD];
-+ gcmask |= GCForeground;
-+ }
- if (!(r->Options2 & Opt2_veryBold))
- rend &= ~RS_Bold; /* we've taken care of it */
- }
-@@ -3390,8 +3402,15 @@
- if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_UL) &&
- r->PixColors[fore] != r->PixColors[Color_UL] &&
- r->PixColors[back] != r->PixColors[Color_UL]) {
-- gcvalue.foreground = r->PixColors[Color_UL];
-- gcmask |= GCForeground;
-+# ifdef XFT_SUPPORT
-+ if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt )
-+ fore = Color_UL;
-+ else
-+# endif
-+ {
-+ gcvalue.foreground = r->PixColors[Color_UL];
-+ gcmask |= GCForeground;
-+ }
- rend &= ~RS_Uline; /* we've taken care of it */
- }
- }