summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h34
1 files changed, 18 insertions, 16 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 627ec58..80e5858 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.77 2007/01/18 23:56:43 nijtmans Exp $
+ * RCS: $Id: tkInt.h,v 1.78 2007/06/24 16:07:34 dkf Exp $
*/
#ifndef _TKINT
@@ -192,7 +192,8 @@ typedef struct TkDisplay {
* corresponding to the "Meta" key. If no such
* modifier, then this is zero. */
enum {LU_IGNORE, LU_CAPS, LU_SHIFT} lockUsage;
- /* Indicates how to interpret lock modifier */
+ /* Indicates how to interpret lock
+ * modifier. */
int numModKeyCodes; /* Number of entries in modKeyCodes array
* below. */
KeyCode *modKeyCodes; /* Pointer to an array giving keycodes for all
@@ -503,7 +504,7 @@ typedef struct TkDisplay {
*/
#ifdef TK_USE_INPUT_METHODS
- XIM inputMethod; /* Input method for this display */
+ XIM inputMethod; /* Input method for this display. */
#if TK_XIM_SPOT
XFontSet inputXfs; /* XFontSet cached for over-the-spot XIM. */
#endif
@@ -511,14 +512,16 @@ typedef struct TkDisplay {
Tcl_HashTable winTable; /* Maps from X window ids to TkWindow ptrs. */
int refCount; /* Reference count of how many Tk applications
- * are using this display. Used to clean up
- * the display when we no longer have any Tk
- * applications using it. */
+ * are using this display. Used to clean up
+ * the display when we no longer have any Tk
+ * applications using it. */
+
/*
* The following field were all added for Tk8.3
*/
+
int mouseButtonState; /* Current mouse button state for this
- * display */
+ * display. */
Window mouseButtonWindow; /* Window the button state was set in, added
* in Tk 8.4. */
Window warpWindow;
@@ -534,8 +537,8 @@ typedef struct TkDisplay {
TkCaret caret; /* Information about the caret for this
* display. This is not a pointer. */
- int iconDataSize; /* Size of default iconphoto image data */
- unsigned char *iconDataPtr; /* Default iconphoto image data, if set */
+ int iconDataSize; /* Size of default iconphoto image data. */
+ unsigned char *iconDataPtr; /* Default iconphoto image data, if set. */
} TkDisplay;
/*
@@ -620,7 +623,7 @@ typedef struct TkMainInfo {
Tcl_HashTable nameTable; /* Hash table mapping path names to TkWindow
* structs for all windows related to this
* main window. Managed by tkWindow.c. */
- long deletionEpoch; /* Incremented by window deletions */
+ long deletionEpoch; /* Incremented by window deletions. */
Tk_BindingTable bindingTable;
/* Used in conjunction with "bind" command to
* bind events to Tcl commands. */
@@ -854,7 +857,7 @@ typedef struct TkStateMap {
*/
typedef struct TkpClipMask {
- int type; /* One of TKP_CLIP_PIXMAP or TKP_CLIP_REGION */
+ int type; /* TKP_CLIP_PIXMAP or TKP_CLIP_REGION. */
union {
Pixmap pixmap;
TkRegion region;
@@ -1171,19 +1174,18 @@ MODULE_SCOPE int TkParsePadAmount(Tcl_Interp *interp,
MODULE_SCOPE int TkpAlwaysShowSelection(Tk_Window tkwin);
MODULE_SCOPE void TkpDrawCharsInContext(Display * display,
Drawable drawable, GC gc, Tk_Font tkfont,
- const char * source, int numBytes, int rangeStart,
+ 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,
+ const char *source, int numBytes, int rangeStart,
int rangeLength, int maxLength, int flags,
- int * lengthPtr);
+ 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);
MODULE_SCOPE void TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
- Tcl_UniChar c,
- struct TkFontAttributes *faPtr);
+ Tcl_UniChar c, struct TkFontAttributes *faPtr);
/*
* Unsupported commands.