diff options
| author | das <das> | 2006-03-22 00:21:15 (GMT) |
|---|---|---|
| committer | das <das> | 2006-03-22 00:21:15 (GMT) |
| commit | b09b9e482352356dc8519c1f78b6161becebb0cb (patch) | |
| tree | fedd23bf410c6a013f190bd8aa27dbf9999214f1 /generic/tkInt.h | |
| parent | 8248f036bffb1641313e93c3b0727d55e5026b01 (diff) | |
| download | tk-b09b9e482352356dc8519c1f78b6161becebb0cb.zip tk-b09b9e482352356dc8519c1f78b6161becebb0cb.tar.gz tk-b09b9e482352356dc8519c1f78b6161becebb0cb.tar.bz2 | |
* generic/tkFont.c: implementation of ATSUI text rendering
* generic/tkInt.h: in TkAqua provided by Benjamin
* generic/tkTextDisp.c: Riefenstahl. [Patch 638966]
* library/demos/unicodeout.tcl:
* macosx/tkMacOSXFont.h (new file):
* macosx/tkMacOSXFont.c:
* tests/font.test:
* unix/tkUnixFont.c:
* win/tkWinFont.c:
* generic/tkFont.c: moved MODULE_SCOPE declarations of
* generic/tkFont.h: font helper procs into header files.
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXFont.h:
* macosx/tkMacOSXMenubutton.c:
* macosx/Wish.xcode/project.pbxproj: add new tkMacOSXFont.h file,
* macosx/Wish.xcodeproj/project.pbxproj: turn off dead code stripping
as it interferes with -sectcreate (rdar://4486223).
* macosx/Wish.xcode/default.pbxuser: add TCLLIBPATH=/Library/Tcl
* macosx/Wish.xcodeproj/default.pbxuser: env var setting to tktest.
* unix/configure.in: fix detection of symbols build when enabling
TkAqua debug code; filter nm output of libtclstub better to avoid
error on intel macs [Bug 1415789].
* unix/configure: autoconf-2.59
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 0b4ca96..21808a0 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: $Id: tkInt.h,v 1.70 2006/03/16 17:32:28 dgp Exp $ + * RCS: $Id: tkInt.h,v 1.71 2006/03/22 00:21:16 das Exp $ */ #ifndef _TKINT @@ -881,6 +881,14 @@ extern TkDisplay *tkDisplayList; #define TK_GRAB_ANCESTOR 2 #define TK_GRAB_EXCLUDED 3 +/* + * An additional flag for TkpMeasureCharsInContext(). Coordinate with + * the other flags for this routine, but don't make public until + * TkpMeasureCharsInContext() is made public, too. + */ + +#define TK_ISOLATE_END 32 + /* * The macro below is used to modify a "char" value (e.g. by casting it to an * unsigned character) so that it can be used safely with macros such as @@ -1156,6 +1164,18 @@ MODULE_SCOPE void TkPrintPadAmount(Tcl_Interp *interp, MODULE_SCOPE int TkParsePadAmount(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *pad1Ptr, int *pad2Ptr); +MODULE_SCOPE void TkpDrawCharsInContext(Display * display, + Drawable drawable, GC gc, Tk_Font tkfont, + CONST char * source, int numBytes, int rangeStart, + int rangeLength, int x, int y); +MODULE_SCOPE int TkpMeasureCharsInContext(Tk_Font tkfont, + CONST char * source, int numBytes, int rangeStart, + int rangeLength, int maxLength, int flags, + int * lengthPtr); +MODULE_SCOPE void TkUnderlineCharsInContext(Display *display, + Drawable drawable, GC gc, Tk_Font tkfont, + CONST char *string, int numBytes, int x, int y, + int firstByte, int lastByte); /* * Unsupported commands. |