diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2006-01-12 13:38:21 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2006-01-12 13:38:21 (GMT) |
| commit | 68f17ab967c493970c0fd1277ecf5abe9dd8e9a6 (patch) | |
| tree | 0cfd856549587ccb0a9b07a805eb0ea603345f54 /generic | |
| parent | 2dcb9465893d9ea49455671e6ad778eaba85342f (diff) | |
| download | tk-68f17ab967c493970c0fd1277ecf5abe9dd8e9a6.zip tk-68f17ab967c493970c0fd1277ecf5abe9dd8e9a6.tar.gz tk-68f17ab967c493970c0fd1277ecf5abe9dd8e9a6.tar.bz2 | |
TIP#260 implementation
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCanvText.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 2cfa782..9a8782e 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvText.c,v 1.20 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.21 2006/01/12 13:38:22 dkf Exp $ */ #include <stdio.h> @@ -56,6 +56,8 @@ typedef struct TextItem { char *text; /* Text for item (malloc-ed). */ int width; /* Width of lines for word-wrap, pixels. Zero * means no word-wrap. */ + int underline; /* Index of character to put underline beneath + * or -1 for no underlining. */ /* * Fields whose values are derived from the current values of the @@ -124,6 +126,8 @@ static Tk_ConfigSpec configSpecs[] = { NULL, 0, TK_CONFIG_NULL_OK, &tagsOption}, {TK_CONFIG_STRING, "-text", NULL, NULL, "", Tk_Offset(TextItem, text), 0}, + {TK_CONFIG_INT, "-underline", NULL, NULL, + "-1", Tk_Offset(TextItem, underline), 0}, {TK_CONFIG_PIXELS, "-width", NULL, NULL, "0", Tk_Offset(TextItem, width), TK_CONFIG_DONT_SET_DEFAULT}, {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0} @@ -257,6 +261,7 @@ CreateText( textPtr->disabledStipple = None; textPtr->text = NULL; textPtr->width = 0; + textPtr->underline = -1; textPtr->numChars = 0; textPtr->numBytes = 0; @@ -866,6 +871,8 @@ DisplayCanvText( Tk_DrawTextLayout(display, drawable, textPtr->gc, textPtr->textLayout, drawableX, drawableY, 0, -1); } + Tk_UnderlineTextLayout(display, drawable, textPtr->gc, textPtr->textLayout, + drawableX, drawableY, textPtr->underline); if (stipple != None) { XSetTSOrigin(display, textPtr->gc, 0, 0); |