Author: qboosh Date: Wed May 24 06:30:55 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 8.5a4
---- Files affected:
SOURCES:
tk-pil.patch (1.1 -> 1.2) , tk-unix-3d-borders.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/tk-pil.patch
diff -u SOURCES/tk-pil.patch:1.1 SOURCES/tk-pil.patch:1.2
--- SOURCES/tk-pil.patch:1.1 Mon Jun 7 16:54:56 1999
+++ SOURCES/tk-pil.patch Wed May 24 08:30:50 2006
@@ -1,6 +1,6 @@
---- tk8.0-8.0.5.orig/generic/tkImgBmap.c Mon Sep 14 13:23:12 1998
-+++ tk8.0-8.0.5/generic/tkImgBmap.c Fri Nov 27 17:07:29 1998
-@@ -479,6 +479,21 @@
+--- tk8.5a4/generic/tkImgBmap.c.orig 2006-02-27 11:36:08.000000000 +0100
++++ tk8.5a4/generic/tkImgBmap.c 2006-05-24 01:18:02.354822500 +0200
+@@ -491,6 +491,21 @@
char *data = NULL;
Tcl_DString buffer;
@@ -21,12 +21,11 @@
+
pi.string = string;
if (string == NULL) {
- if ((interp != NULL) && Tcl_IsSafe(interp)) {
-@@ -1066,3 +1081,95 @@
- return buffer;
+ if ((interp != NULL) && Tcl_IsSafe(interp)) {
+@@ -1081,6 +1096,98 @@
}
}
-+
+
+/* ==================================================================== */
+/* The pilbitmap booster patch -- code section */
+/* ==================================================================== */
@@ -118,3 +117,7 @@
+}
+
+/* ==================================================================== */
++
+
+ /*
+ *----------------------------------------------------------------------
================================================================
Index: SOURCES/tk-unix-3d-borders.patch
diff -u SOURCES/tk-unix-3d-borders.patch:1.1
SOURCES/tk-unix-3d-borders.patch:1.2
--- SOURCES/tk-unix-3d-borders.patch:1.1 Mon Sep 22 19:34:27 2003
+++ SOURCES/tk-unix-3d-borders.patch Wed May 24 08:30:50 2006
@@ -1,6 +1,5 @@
-diff -ru --exclude=CVS tk-virgin/unix/tkUnix3d.c tk/unix/tkUnix3d.c
---- tk-virgin/unix/tkUnix3d.c 2003-08-18 15:43:37.000000000 -0500
-+++ tk/unix/tkUnix3d.c 2003-08-19 13:46:04.000000000 -0500
+--- tk8.5a4/unix/tkUnix3d.c.orig 2005-11-13 22:00:17.000000000 +0100
++++ tk8.5a4/unix/tkUnix3d.c 2006-05-24 01:21:30.399824500 +0200
@@ -26,6 +26,7 @@
typedef struct {
TkBorder info;
@@ -17,7 +16,7 @@
return (TkBorder *) borderPtr;
}
-@@ -80,6 +82,9 @@
+@@ -79,6 +81,9 @@
if (unixBorderPtr->solidGC != None) {
Tk_FreeGC(display, unixBorderPtr->solidGC);
}
@@ -27,15 +26,15 @@
}
/*
*--------------------------------------------------------------
-@@ -124,6 +129,7 @@
- * exterior. */
+@@ -121,6 +126,7 @@
+ * should appear higher than exterior. */
{
TkBorder *borderPtr = (TkBorder *) border;
+ UnixBorder *unixBorderPtr = ((UnixBorder *)borderPtr);
GC left, right;
Display *display = Tk_Display(tkwin);
-@@ -132,13 +138,34 @@
+@@ -129,13 +135,34 @@
}
if (relief == TK_RELIEF_RAISED) {
@@ -46,7 +45,7 @@
+ half++;
+ }
+
- XFillRectangle(display, drawable,
+ XFillRectangle(display, drawable,
(leftBevel) ? borderPtr->lightGC : borderPtr->darkGC,
x, y, (unsigned) width, (unsigned) height);
+ XFillRectangle(display, drawable,
@@ -61,7 +60,7 @@
+ half++;
+ }
+
- XFillRectangle(display, drawable,
+ XFillRectangle(display, drawable,
- (leftBevel) ? borderPtr->darkGC : borderPtr->lightGC,
+ (leftBevel) ? borderPtr->darkGC : borderPtr->bgGC,
x, y, (unsigned) width, (unsigned) height);
@@ -71,30 +70,28 @@
} else if (relief == TK_RELIEF_RIDGE) {
int half;
-@@ -244,8 +271,8 @@
- bottomGC = borderPtr->lightGC;
- break;
- case TK_RELIEF_RAISED:
-- topGC = bottomGC =
-- (topBevel) ? borderPtr->lightGC : borderPtr->darkGC;
+@@ -239,7 +266,8 @@
+ bottomGC = borderPtr->lightGC;
+ break;
+ case TK_RELIEF_RAISED:
+- topGC = bottomGC = (topBevel? borderPtr->lightGC : borderPtr->darkGC);
+ topGC = (topBevel) ? borderPtr->lightGC : borderPtr->darkGC,
+ bottomGC = (topBevel) ? borderPtr->bgGC : unixBorderPtr->blackGC;
- break;
- case TK_RELIEF_RIDGE:
- topGC = borderPtr->lightGC;
-@@ -263,8 +290,9 @@
+ break;
+ case TK_RELIEF_RIDGE:
+ topGC = borderPtr->lightGC;
+@@ -256,7 +284,9 @@
(unsigned) width, (unsigned) height);
- return;
- case TK_RELIEF_SUNKEN:
-- topGC = bottomGC =
-- (topBevel) ? borderPtr->darkGC : borderPtr->lightGC;
+ return;
+ case TK_RELIEF_SUNKEN:
+- topGC = bottomGC = (topBevel? borderPtr->darkGC : borderPtr->lightGC);
+ bottomGC = (topBevel) ? unixBorderPtr->blackGC : borderPtr->lightGC;
+ topGC = (topBevel) ? borderPtr->darkGC
+ : borderPtr->bgGC;
- break;
+ break;
}
-@@ -283,7 +311,10 @@
+@@ -275,7 +305,10 @@
x1Delta = (leftIn) ? 1 : -1;
x2Delta = (rightIn) ? -1 : 1;
halfway = y + height/2;
@@ -106,7 +103,7 @@
halfway++;
}
bottom = y + height;
-@@ -412,6 +443,9 @@
+@@ -403,6 +436,9 @@
gcValues.foreground = borderPtr->darkColorPtr->pixel;
borderPtr->darkGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
@@ -116,16 +113,7 @@
/*
* Compute the light shadow color
*/
-@@ -440,7 +474,7 @@
- tmp2 = (MAX_INTENSITY + b)/2;
- lightColor.blue = (tmp1 > tmp2) ? tmp1 : tmp2;
- }
--
-+
- /*
- * Allocate the light shadow color and its GC
- */
-@@ -448,6 +482,7 @@
+@@ -439,6 +475,7 @@
borderPtr->lightColorPtr = Tk_GetColorByValue(tkwin, &lightColor);
gcValues.foreground = borderPtr->lightColorPtr->pixel;
borderPtr->lightGC = Tk_GetGC(tkwin, GCForeground, &gcValues);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/tk-pil.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/tk-unix-3d-borders.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
