diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFrame.c | 989 | ||||
| -rw-r--r-- | generic/tkInt.h | 5 | ||||
| -rw-r--r-- | generic/tkWindow.c | 3 |
3 files changed, 937 insertions, 60 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 9c6f84b..55dfc8f 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -1,8 +1,8 @@ /* * tkFrame.c -- * - * This module implements "frame" and "toplevel" widgets for - * the Tk toolkit. Frames are windows with a background color + * This module implements "frame", "labelframe" and "toplevel" widgets + * for the Tk toolkit. Frames are windows with a background color * and possibly a 3-D effect, but not much else in the way of * attributes. * @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFrame.c,v 1.9 2001/08/29 23:22:24 hobbs Exp $ + * RCS: @(#) $Id: tkFrame.c,v 1.10 2001/09/26 21:36:19 pspjuth Exp $ */ #include "default.h" @@ -24,7 +24,7 @@ */ enum FrameType { - TYPE_FRAME, TYPE_TOPLEVEL + TYPE_FRAME, TYPE_TOPLEVEL, TYPE_LABELFRAME }; /* @@ -90,9 +90,63 @@ typedef struct { * windows this is NULL. */ int flags; /* Various flags; see below for * definitions. */ + Tcl_Obj *padXPtr; /* Value of -padx option: specifies how many + * pixels of extra space to leave on left and + * right of child area. */ + int padX; /* Integer value corresponding to padXPtr. */ + Tcl_Obj *padYPtr; /* Value of -padx option: specifies how many + * pixels of extra space to leave above and + * below child area. */ + int padY; /* Integer value corresponding to padYPtr. */ } Frame; /* + * A data structure of the following type is kept for each labelframe + * widget managed by this file: + */ + +typedef struct { + Frame frame; /* A pointer to the generic frame structure. + * This must be the first element of the + * Labelframe. */ + + /* + * Labelframe specific configuration settings. + */ + + Tcl_Obj *textPtr; /* Value of -text option: specifies text to + * display in button. */ + Tk_Font tkfont; /* Value of -font option: specifies font + * to use for display text. */ + XColor *textColorPtr; /* Value of -fg option: specifies foreground + * color in normal mode. */ + int labelAnchor; /* Value of -labelanchor option: specifies + * where to place the label. */ + Tk_Window labelWin; /* Value of -labelwidget option: Window to + * use as label for the frame. */ + + /* + * Labelframe specific fields for use with configuration settings above. + */ + + GC textGC; /* GC for drawing text in normal mode. */ + Tk_TextLayout textLayout; /* Stored text layout information. */ + XRectangle labelBox; /* The label's actual size and position. */ + int labelReqWidth; /* The label's requested width. */ + int labelReqHeight; /* The label's requested height. */ + int labelTextX, labelTextY; /* Position of the text to be drawn. */ + +} Labelframe; + +/* + * The following macros define how many extra pixels to leave + * around a label's text. + */ + +#define LABELSPACING 1 +#define LABELMARGIN 4 + +/* * Flag bits for frames: * * REDRAW_PENDING: Non-zero means a DoWhenIdle handler @@ -106,21 +160,34 @@ typedef struct { #define GOT_FOCUS 4 /* + * The following enum is used to define a type for the -labelanchor option + * of the Labelframe widget. These values are used as indices into the + * string table below. + */ + +enum labelanchor { + LABELANCHOR_E, LABELANCHOR_EN, LABELANCHOR_ES, + LABELANCHOR_N, LABELANCHOR_NE, LABELANCHOR_NW, + LABELANCHOR_S, LABELANCHOR_SE, LABELANCHOR_SW, + LABELANCHOR_W, LABELANCHOR_WN, LABELANCHOR_WS +}; + +static char *labelAnchorStrings[] = { + "e", "en", "es", "n", "ne", "nw", "s", "se", "sw", "w", "wn", "ws", + (char *) NULL +}; + +/* * Information used for parsing configuration options. There are - * one common table used by both, one frame table and one toplevel table. + * one common table used by all and one table for each widget class. */ static Tk_OptionSpec commonOptSpec[] = { {TK_OPTION_BORDER, "-background", "background", "Background", DEF_FRAME_BG_COLOR, -1, Tk_Offset(Frame, border), TK_OPTION_NULL_OK, (ClientData) DEF_FRAME_BG_MONO, 0}, - {TK_OPTION_SYNONYM, "-bd", (char *) NULL, (char *) NULL, - (char *) NULL, 0, -1, 0, (ClientData) "-borderwidth", 0}, {TK_OPTION_SYNONYM, "-bg", (char *) NULL, (char *) NULL, (char *) NULL, 0, -1, 0, (ClientData) "-background", 0}, - {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", - DEF_FRAME_BORDER_WIDTH, -1, Tk_Offset(Frame, borderWidth), - 0, 0, 0}, {TK_OPTION_STRING, "-colormap", "colormap", "Colormap", DEF_FRAME_COLORMAP, -1, Tk_Offset(Frame, colormapName), TK_OPTION_NULL_OK, 0, 0}, @@ -142,9 +209,12 @@ static Tk_OptionSpec commonOptSpec[] = { {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", "HighlightThickness", DEF_FRAME_HIGHLIGHT_WIDTH, -1, Tk_Offset(Frame, highlightWidth), 0, 0, 0}, - {TK_OPTION_RELIEF, "-relief", "relief", "Relief", - DEF_FRAME_RELIEF, -1, Tk_Offset(Frame, relief), - 0, 0, 0}, + {TK_OPTION_PIXELS, "-padx", "padX", "Pad", + DEF_FRAME_PADX, Tk_Offset(Frame, padXPtr), + Tk_Offset(Frame, padX), 0, 0, 0}, + {TK_OPTION_PIXELS, "-pady", "padY", "Pad", + DEF_FRAME_PADY, Tk_Offset(Frame, padYPtr), + Tk_Offset(Frame, padY), 0, 0, 0}, {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus", DEF_FRAME_TAKE_FOCUS, -1, Tk_Offset(Frame, takeFocus), TK_OPTION_NULL_OK, 0, 0}, @@ -159,25 +229,72 @@ static Tk_OptionSpec commonOptSpec[] = { }; static Tk_OptionSpec frameOptSpec[] = { + {TK_OPTION_SYNONYM, "-bd", (char *) NULL, (char *) NULL, + (char *) NULL, 0, -1, 0, (ClientData) "-borderwidth", 0}, + {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", + DEF_FRAME_BORDER_WIDTH, -1, Tk_Offset(Frame, borderWidth), + 0, 0, 0}, {TK_OPTION_STRING, "-class", "class", "Class", DEF_FRAME_CLASS, -1, Tk_Offset(Frame, className), 0, 0, 0}, + {TK_OPTION_RELIEF, "-relief", "relief", "Relief", + DEF_FRAME_RELIEF, -1, Tk_Offset(Frame, relief), + 0, 0, 0}, {TK_OPTION_END, (char *) NULL, (char *) NULL, (char *) NULL, (char *) NULL, 0, 0, 0, (ClientData) commonOptSpec, 0} }; static Tk_OptionSpec toplevelOptSpec[] = { + {TK_OPTION_SYNONYM, "-bd", (char *) NULL, (char *) NULL, + (char *) NULL, 0, -1, 0, (ClientData) "-borderwidth", 0}, + {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", + DEF_FRAME_BORDER_WIDTH, -1, Tk_Offset(Frame, borderWidth), + 0, 0, 0}, {TK_OPTION_STRING, "-class", "class", "Class", DEF_TOPLEVEL_CLASS, -1, Tk_Offset(Frame, className), 0, 0, 0}, {TK_OPTION_STRING, "-menu", "menu", "Menu", DEF_TOPLEVEL_MENU, -1, Tk_Offset(Frame, menuName), TK_OPTION_NULL_OK, 0, 0}, + {TK_OPTION_RELIEF, "-relief", "relief", "Relief", + DEF_FRAME_RELIEF, -1, Tk_Offset(Frame, relief), + 0, 0, 0}, {TK_OPTION_STRING, "-screen", "screen", "Screen", DEF_TOPLEVEL_SCREEN, -1, Tk_Offset(Frame, screenName), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_STRING, "-use", "use", "Use", - DEF_FRAME_USE, -1, Tk_Offset(Frame, useThis), + DEF_TOPLEVEL_USE, -1, Tk_Offset(Frame, useThis), + TK_OPTION_NULL_OK, 0, 0}, + {TK_OPTION_END, (char *) NULL, (char *) NULL, (char *) NULL, + (char *) NULL, 0, 0, 0, (ClientData) commonOptSpec, 0} +}; + +static Tk_OptionSpec labelframeOptSpec[] = { + {TK_OPTION_SYNONYM, "-bd", (char *) NULL, (char *) NULL, + (char *) NULL, 0, -1, 0, (ClientData) "-borderwidth", 0}, + {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", + DEF_LABELFRAME_BORDER_WIDTH, -1, Tk_Offset(Frame, borderWidth), + 0, 0, 0}, + {TK_OPTION_STRING, "-class", "class", "Class", + DEF_LABELFRAME_CLASS, -1, Tk_Offset(Frame, className), + 0, 0, 0}, + {TK_OPTION_SYNONYM, "-fg", "foreground", (char *) NULL, + (char *) NULL, 0, -1, 0, (ClientData) "-foreground", 0}, + {TK_OPTION_FONT, "-font", "font", "Font", + DEF_LABELFRAME_FONT, -1, Tk_Offset(Labelframe, tkfont), 0, 0, 0}, + {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground", + DEF_LABELFRAME_FG, -1, Tk_Offset(Labelframe, textColorPtr), 0, 0, 0}, + {TK_OPTION_STRING_TABLE, "-labelanchor", "labelAnchor", "LabelAnchor", + DEF_LABELFRAME_LABELANCHOR, -1, Tk_Offset(Labelframe, labelAnchor), + 0, (ClientData) labelAnchorStrings, 0}, + {TK_OPTION_WINDOW, "-labelwidget", "labelWidget", "LabelWidget", + (char *) NULL, -1, Tk_Offset(Labelframe, labelWin), + TK_OPTION_NULL_OK, 0, 0}, + {TK_OPTION_RELIEF, "-relief", "relief", "Relief", + DEF_LABELFRAME_RELIEF, -1, Tk_Offset(Frame, relief), + 0, 0, 0}, + {TK_OPTION_STRING, "-text", "text", "Text", + DEF_LABELFRAME_TEXT, Tk_Offset(Labelframe, textPtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_END, (char *) NULL, (char *) NULL, (char *) NULL, (char *) NULL, 0, 0, 0, (ClientData) commonOptSpec, 0} @@ -187,7 +304,7 @@ static Tk_OptionSpec toplevelOptSpec[] = { * Class names for widgets, indexed by FrameType. */ -static char *classNames[] = {"Frame", "Toplevel"}; +static char *classNames[] = {"Frame", "Toplevel", "Labelframe"}; /* * The following table maps from FrameType to the option template for @@ -196,36 +313,69 @@ static char *classNames[] = {"Frame", "Toplevel"}; static Tk_OptionSpec *optionSpecs[] = { frameOptSpec, - toplevelOptSpec + toplevelOptSpec, + labelframeOptSpec, }; /* * Forward declarations for procedures defined later in this file: */ +static void ComputeFrameGeometry _ANSI_ARGS_((Frame *framePtr)); static int ConfigureFrame _ANSI_ARGS_((Tcl_Interp *interp, Frame *framePtr, int objc, Tcl_Obj *CONST objv[])); static int CreateFrame _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST argv[], enum FrameType type, char *appName)); static void DestroyFrame _ANSI_ARGS_((char *memPtr)); +static void DestroyFramePartly _ANSI_ARGS_((Frame *framePtr)); static void DisplayFrame _ANSI_ARGS_((ClientData clientData)); static void FrameCmdDeletedProc _ANSI_ARGS_(( ClientData clientData)); static void FrameEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); +static void FrameLostSlaveProc _ANSI_ARGS_(( + ClientData clientData, Tk_Window tkwin)); +static void FrameRequestProc _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin)); +static void FrameStructureProc _ANSI_ARGS_(( + ClientData clientData, XEvent *eventPtr)); static int FrameWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); +static void FrameWorldChanged _ANSI_ARGS_(( + ClientData instanceData)); static void MapFrame _ANSI_ARGS_((ClientData clientData)); + +/* + * The structure below defines frame class behavior by means of procedures + * that can be invoked from generic window code. + */ + +static Tk_ClassProcs frameClass = { + sizeof(Tk_ClassProcs), /* size */ + FrameWorldChanged /* worldChangedProc */ +}; + +/* + * The structure below defines the official type record for the + * labelframe's geometry manager: + */ + +static Tk_GeomMgr frameGeomType = { + "labelframe", /* name */ + FrameRequestProc, /* requestProc */ + FrameLostSlaveProc /* lostSlaveProc */ +}; + /* *-------------------------------------------------------------- * - * Tk_FrameObjCmd, Tk_ToplevelObjCmd -- + * Tk_FrameObjCmd, Tk_ToplevelObjCmd, Tk_LabelframeObjCmd -- * - * These procedures are invoked to process the "frame" and - * "toplevel" Tcl commands. See the user documentation for - * details on what they do. + * These procedures are invoked to process the "frame", + * "toplevel" and "labelframe" Tcl commands. See the user + * documentation for details on what they do. * * Results: * A standard Tcl result. @@ -258,6 +408,17 @@ Tk_ToplevelObjCmd(clientData, interp, objc, objv) return CreateFrame(clientData, interp, objc, objv, TYPE_TOPLEVEL, (char *) NULL); } + +int +Tk_LabelframeObjCmd(clientData, interp, objc, objv) + ClientData clientData; /* Either NULL or pointer to option table. */ + Tcl_Interp *interp; /* Current interpreter. */ + int objc; /* Number of arguments. */ + Tcl_Obj *CONST objv[]; /* Argument objects. */ +{ + return CreateFrame(clientData, interp, objc, objv, TYPE_LABELFRAME, + (char *) NULL); +} /* *-------------------------------------------------------------- @@ -470,24 +631,35 @@ CreateFrame(clientData, interp, objc, objv, type, appName) * in the widget record from the special options. */ - framePtr = (Frame *) ckalloc(sizeof(Frame)); - memset((void *) framePtr, 0, (sizeof(Frame))); + if (type == TYPE_LABELFRAME) { + framePtr = (Frame *) ckalloc(sizeof(Labelframe)); + memset((void *) framePtr, 0, (sizeof(Labelframe))); + } else { + framePtr = (Frame *) ckalloc(sizeof(Frame)); + memset((void *) framePtr, 0, (sizeof(Frame))); + } framePtr->tkwin = new; framePtr->display = Tk_Display(new); framePtr->interp = interp; framePtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(new), FrameWidgetObjCmd, (ClientData) framePtr, FrameCmdDeletedProc); - framePtr->optionTable = optionTable; - framePtr->type = type; - framePtr->colormap = colormap; - framePtr->relief = TK_RELIEF_FLAT; - framePtr->cursor = None; + framePtr->optionTable = optionTable; + framePtr->type = type; + framePtr->colormap = colormap; + framePtr->relief = TK_RELIEF_FLAT; + framePtr->cursor = None; + + if (framePtr->type == TYPE_LABELFRAME) { + Labelframe *labelframePtr = (Labelframe *) framePtr; + labelframePtr->labelAnchor = LABELANCHOR_NW; + labelframePtr->textGC = None; + } /* * Store backreference to frame widget in window structure. */ - Tk_SetClassProcs(new, NULL, (ClientData) framePtr); + Tk_SetClassProcs(new, &frameClass, (ClientData) framePtr); mask = ExposureMask | StructureNotifyMask | FocusChangeMask; if (type == TYPE_TOPLEVEL) { @@ -505,7 +677,7 @@ CreateFrame(clientData, interp, objc, objv, type, appName) } else { Tcl_AppendResult(interp, "A window cannot have both the -use ", "and the -container option set.", (char *) NULL); - return TCL_ERROR; + goto error; } } if (type == TYPE_TOPLEVEL) { @@ -610,7 +782,7 @@ FrameWidgetObjCmd(clientData, interp, objc, objv) c = arg[1]; if (((c == 'c') && (strncmp(arg, "-class", length) == 0) && (length >= 2)) - || ((c == 'c') && (framePtr->type == TYPE_TOPLEVEL) + || ((c == 'c') && (strncmp(arg, "-colormap", length) == 0) && (length >= 3)) || ((c == 'c') @@ -620,7 +792,7 @@ FrameWidgetObjCmd(clientData, interp, objc, objv) && (strncmp(arg, "-screen", length) == 0)) || ((c == 'u') && (framePtr->type == TYPE_TOPLEVEL) && (strncmp(arg, "-use", length) == 0)) - || ((c == 'v') && (framePtr->type == TYPE_TOPLEVEL) + || ((c == 'v') && (strncmp(arg, "-visual", length) == 0))) { Tcl_AppendResult(interp, "can't modify ", arg, " option after widget is created", (char *) NULL); @@ -662,7 +834,14 @@ DestroyFrame(memPtr) char *memPtr; /* Info about frame widget. */ { register Frame *framePtr = (Frame *) memPtr; + register Labelframe *labelframePtr = (Labelframe *) memPtr; + if (framePtr->type == TYPE_LABELFRAME) { + Tk_FreeTextLayout(labelframePtr->textLayout); + if (labelframePtr->textGC != None) { + Tk_FreeGC(framePtr->display, labelframePtr->textGC); + } + } if (framePtr->colormap != None) { Tk_FreeColormap(framePtr->display, framePtr->colormap); } @@ -672,6 +851,47 @@ DestroyFrame(memPtr) /* *---------------------------------------------------------------------- * + * DestroyFramePartly -- + * + * This procedure is invoked to clean up everything that needs + * tkwin to be defined when deleted. During the destruction + * process tkwin is always set to NULL and this procedure must + * be called before that happens. + * + * Results: + * None. + * + * Side effects: + * Some things associated with the frame are freed up. + * + *---------------------------------------------------------------------- + */ + +static void +DestroyFramePartly(framePtr) + Frame *framePtr; /* Info about frame widget. */ +{ + register Labelframe *labelframePtr = (Labelframe *) framePtr; + + if (framePtr->type == TYPE_LABELFRAME && labelframePtr->labelWin != NULL) { + Tk_DeleteEventHandler(labelframePtr->labelWin, StructureNotifyMask, + FrameStructureProc, (ClientData) framePtr); + Tk_ManageGeometry(labelframePtr->labelWin, (Tk_GeomMgr *) NULL, + (ClientData) NULL); + if (framePtr->tkwin != Tk_Parent(labelframePtr->labelWin)) { + Tk_UnmaintainGeometry(labelframePtr->labelWin, framePtr->tkwin); + } + Tk_UnmapWindow(labelframePtr->labelWin); + labelframePtr->labelWin = NULL; + } + + Tk_FreeConfigOptions((char *) framePtr, framePtr->optionTable, + framePtr->tkwin); +} + +/* + *---------------------------------------------------------------------- + * * ConfigureFrame -- * * This procedure is called to process an objv/objc list, plus @@ -700,6 +920,8 @@ ConfigureFrame(interp, framePtr, objc, objv) { Tk_SavedOptions savedOptions; char *oldMenuName; + Tk_Window oldWindow; + Labelframe *labelframePtr = (Labelframe *) framePtr; /* * Need the old menubar name for the menu code to delete it. @@ -711,7 +933,10 @@ ConfigureFrame(interp, framePtr, objc, objv) oldMenuName = ckalloc(strlen(framePtr->menuName) + 1); strcpy(oldMenuName, framePtr->menuName); } - + + if (framePtr->type == TYPE_LABELFRAME) { + oldWindow = labelframePtr->labelWin; + } if (Tk_SetOptions(interp, (char *) framePtr, framePtr->optionTable, objc, objv, framePtr->tkwin, &savedOptions, (int *) NULL) != TCL_OK) { @@ -738,7 +963,7 @@ ConfigureFrame(interp, framePtr, objc, objv) if (oldMenuName != NULL) { ckfree(oldMenuName); } - + if (framePtr->border != NULL) { Tk_SetBackgroundFromBorder(framePtr->tkwin, framePtr->border); } else { @@ -748,20 +973,391 @@ ConfigureFrame(interp, framePtr, objc, objv) if (framePtr->highlightWidth < 0) { framePtr->highlightWidth = 0; } - Tk_SetInternalBorder(framePtr->tkwin, - framePtr->borderWidth + framePtr->highlightWidth); + if (framePtr->padX < 0) { + framePtr->padX = 0; + } + if (framePtr->padY < 0) { + framePtr->padY = 0; + } + + /* + * If a -labelwidget is specified, check that it is valid and set + * up geometry management for it. + */ + + if (framePtr->type == TYPE_LABELFRAME) { + if (oldWindow != labelframePtr->labelWin) { + if (oldWindow != NULL) { + Tk_DeleteEventHandler(oldWindow, StructureNotifyMask, + FrameStructureProc, (ClientData) framePtr); + Tk_ManageGeometry(oldWindow, (Tk_GeomMgr *) NULL, + (ClientData) NULL); + Tk_UnmaintainGeometry(oldWindow, framePtr->tkwin); + Tk_UnmapWindow(oldWindow); + } + if (labelframePtr->labelWin != NULL) { + Tk_Window ancestor, parent, sibling = NULL; + + /* + * Make sure that the frame is either the parent of the + * window used as label or a descendant of that + * parent. Also, don't allow a top-level window to be + * managed inside the frame. + */ + + parent = Tk_Parent(labelframePtr->labelWin); + for (ancestor = framePtr->tkwin; ; + ancestor = Tk_Parent(ancestor)) { + if (ancestor == parent) { + break; + } + sibling = ancestor; + if (Tk_IsTopLevel(ancestor)) { + badWindow: + Tcl_AppendResult(interp, "can't use ", + Tk_PathName(labelframePtr->labelWin), + " as label in this frame", (char *) NULL); + labelframePtr->labelWin = NULL; + return TCL_ERROR; + } + } + if (Tk_IsTopLevel(labelframePtr->labelWin)) { + goto badWindow; + } + if (labelframePtr->labelWin == framePtr->tkwin) { + goto badWindow; + } + Tk_CreateEventHandler(labelframePtr->labelWin, + StructureNotifyMask, FrameStructureProc, + (ClientData) framePtr); + Tk_ManageGeometry(labelframePtr->labelWin, &frameGeomType, + (ClientData) framePtr); + + /* + * If the frame is not parent to the label, make + * sure the label is above its sibling in the stacking + * order. + */ + + if (sibling != NULL) { + Tk_RestackWindow(labelframePtr->labelWin, Above, sibling); + } + } + } + } + + FrameWorldChanged((ClientData) framePtr); + + return TCL_OK; +} + +/* + *--------------------------------------------------------------------------- + * + * FrameWorldChanged -- + * + * This procedure is called when the world has changed in some + * way and the widget needs to recompute all its graphics contexts + * and determine its new geometry. + * + * Results: + * None. + * + * Side effects: + * Frame will be relayed out and redisplayed. + * + *--------------------------------------------------------------------------- + */ + +static void +FrameWorldChanged(instanceData) + ClientData instanceData; /* Information about widget. */ +{ + Frame *framePtr = (Frame *) instanceData; + Labelframe *labelframePtr = (Labelframe *) framePtr; + Tk_Window tkwin = framePtr->tkwin; + XGCValues gcValues; + GC gc; + int anyTextLabel, anyWindowLabel; + int bWidthLeft, bWidthRight, bWidthTop, bWidthBottom; + char *labelText; + + anyTextLabel = (framePtr->type == TYPE_LABELFRAME) && + (labelframePtr->textPtr != NULL) && + (labelframePtr->labelWin == NULL); + anyWindowLabel = (framePtr->type == TYPE_LABELFRAME) && + (labelframePtr->labelWin != NULL); + + if (framePtr->type == TYPE_LABELFRAME) { + /* + * The textGC is needed even in the labelWin case, so it's + * always created for a labelframe. + */ + + gcValues.font = Tk_FontId(labelframePtr->tkfont); + gcValues.foreground = labelframePtr->textColorPtr->pixel; + gcValues.graphics_exposures = False; + gc = Tk_GetGC(tkwin, GCForeground | GCFont | GCGraphicsExposures, + &gcValues); + if (labelframePtr->textGC != None) { + Tk_FreeGC(framePtr->display, labelframePtr->textGC); + } + labelframePtr->textGC = gc; + + /* + * Calculate label size. + */ + + labelframePtr->labelReqWidth = labelframePtr->labelReqHeight = 0; + + if (anyTextLabel) { + labelText = Tcl_GetString(labelframePtr->textPtr); + Tk_FreeTextLayout(labelframePtr->textLayout); + labelframePtr->textLayout = Tk_ComputeTextLayout(labelframePtr->tkfont, + labelText, -1, 0, TK_JUSTIFY_CENTER, 0, + &labelframePtr->labelReqWidth, &labelframePtr->labelReqHeight); + labelframePtr->labelReqWidth += 2 * LABELSPACING; + labelframePtr->labelReqHeight += 2 * LABELSPACING; + } else if (anyWindowLabel) { + labelframePtr->labelReqWidth = Tk_ReqWidth(labelframePtr->labelWin); + labelframePtr->labelReqHeight = Tk_ReqHeight(labelframePtr->labelWin); + } + + /* + * Make sure label size is at least as big as the border. + * This simplifies later calculations and gives a better + * appearance with thick borders. + */ + + if ((labelframePtr->labelAnchor >= LABELANCHOR_N) && + (labelframePtr->labelAnchor <= LABELANCHOR_SW)) { + if (labelframePtr->labelReqHeight < framePtr->borderWidth) { + labelframePtr->labelReqHeight = framePtr->borderWidth; + } + } else { + if (labelframePtr->labelReqWidth < framePtr->borderWidth) { + labelframePtr->labelReqWidth = framePtr->borderWidth; + } + } + } + + /* + * Calculate individual border widths. + */ + + bWidthBottom = bWidthTop = bWidthRight = bWidthLeft = + framePtr->borderWidth + framePtr->highlightWidth; + + bWidthLeft += framePtr->padX; + bWidthRight += framePtr->padX; + bWidthTop += framePtr->padY; + bWidthBottom += framePtr->padY; + + if (anyTextLabel || anyWindowLabel) { + switch (labelframePtr->labelAnchor) { + case LABELANCHOR_E: + case LABELANCHOR_EN: + case LABELANCHOR_ES: + bWidthRight += labelframePtr->labelReqWidth - + framePtr->borderWidth; + break; + case LABELANCHOR_N: + case LABELANCHOR_NE: + case LABELANCHOR_NW: + bWidthTop += labelframePtr->labelReqHeight - framePtr->borderWidth; + break; + case LABELANCHOR_S: + case LABELANCHOR_SE: + case LABELANCHOR_SW: + bWidthBottom += labelframePtr->labelReqHeight - + framePtr->borderWidth; + break; + default: + bWidthLeft += labelframePtr->labelReqWidth - framePtr->borderWidth; + break; + } + } + + Tk_SetInternalBorderEx(tkwin, bWidthLeft, bWidthRight, bWidthTop, + bWidthBottom); + + ComputeFrameGeometry(framePtr); + + /* + * A labelframe should request size for its label. + */ + + if (framePtr->type == TYPE_LABELFRAME) { + int minwidth = labelframePtr->labelReqWidth; + int minheight = labelframePtr->labelReqHeight; + int padding = framePtr->highlightWidth; + if (framePtr->borderWidth > 0) { + padding += framePtr->borderWidth + LABELMARGIN; + } + padding *= 2; + if ((labelframePtr->labelAnchor >= LABELANCHOR_N) && + (labelframePtr->labelAnchor <= LABELANCHOR_SW)) { + minwidth += padding; + minheight += framePtr->borderWidth + framePtr->highlightWidth; + } else { + minheight += padding; + minwidth += framePtr->borderWidth + framePtr->highlightWidth; + } + Tk_SetMinimumRequestSize(tkwin, minwidth, minheight); + } + if ((framePtr->width > 0) || (framePtr->height > 0)) { - Tk_GeometryRequest(framePtr->tkwin, framePtr->width, - framePtr->height); + Tk_GeometryRequest(tkwin, framePtr->width, framePtr->height); } - if (Tk_IsMapped(framePtr->tkwin)) { + if (Tk_IsMapped(tkwin)) { if (!(framePtr->flags & REDRAW_PENDING)) { Tcl_DoWhenIdle(DisplayFrame, (ClientData) framePtr); } framePtr->flags |= REDRAW_PENDING; } - return TCL_OK; +} + +/* + *---------------------------------------------------------------------- + * + * ComputeFrameGeometry -- + * + * This procedure is called to compute various geometrical + * information for a frame, such as where various things get + * displayed. It's called when the window is reconfigured. + * + * Results: + * None. + * + * Side effects: + * Display-related numbers get changed in *framePtr. + * + *---------------------------------------------------------------------- + */ + +static void +ComputeFrameGeometry(framePtr) + register Frame *framePtr; /* Information about widget. */ +{ + int otherWidth, otherHeight, otherWidthT, otherHeightT, padding; + int maxWidth, maxHeight; + Tk_Window tkwin; + Labelframe *labelframePtr = (Labelframe *) framePtr; + + /* + * We have nothing to do here unless there is a label. + */ + + if (framePtr->type != TYPE_LABELFRAME) return; + if ((labelframePtr->textPtr == NULL) && + (labelframePtr->labelWin == NULL)) return; + + tkwin = framePtr->tkwin; + + /* + * Calculate the available size for the label + */ + + labelframePtr->labelBox.width = labelframePtr->labelReqWidth; + labelframePtr->labelBox.height = labelframePtr->labelReqHeight; + + padding = framePtr->highlightWidth; + if (framePtr->borderWidth > 0) { + padding += framePtr->borderWidth + LABELMARGIN; + } + padding *= 2; + + maxHeight = Tk_Height(tkwin); + maxWidth = Tk_Width(tkwin); + + if ((labelframePtr->labelAnchor >= LABELANCHOR_N) && + (labelframePtr->labelAnchor <= LABELANCHOR_SW)) { + maxWidth -= padding; + if (maxWidth < 1) maxWidth = 1; + } else { + maxHeight -= padding; + if (maxHeight < 1) maxHeight = 1; + } + if (labelframePtr->labelBox.width > maxWidth) { + labelframePtr->labelBox.width = maxWidth; + } + if (labelframePtr->labelBox.height > maxHeight) { + labelframePtr->labelBox.height = maxHeight; + } + + /* + * Calculate label and text position. + * The text's position is based on the requested size (= the text's + * real size) to get proper alignment if the text does not fit. + */ + + otherWidth = Tk_Width(tkwin) - labelframePtr->labelBox.width; + otherHeight = Tk_Height(tkwin) - labelframePtr->labelBox.height; + otherWidthT = Tk_Width(tkwin) - labelframePtr->labelReqWidth; + otherHeightT = Tk_Height(tkwin) - labelframePtr->labelReqHeight; + padding = framePtr->highlightWidth; + + switch (labelframePtr->labelAnchor) { + case LABELANCHOR_E: + case LABELANCHOR_EN: + case LABELANCHOR_ES: + labelframePtr->labelTextX = otherWidthT - padding; + labelframePtr->labelBox.x = otherWidth - padding; + break; + case LABELANCHOR_N: + case LABELANCHOR_NE: + case LABELANCHOR_NW: + labelframePtr->labelTextY = padding; + labelframePtr->labelBox.y = padding; + break; + case LABELANCHOR_S: + case LABELANCHOR_SE: + case LABELANCHOR_SW: + labelframePtr->labelTextY = otherHeightT - padding; + labelframePtr->labelBox.y = otherHeight - padding; + break; + default: + labelframePtr->labelTextX = padding; + labelframePtr->labelBox.x = padding; + break; + } + + if (framePtr->borderWidth > 0) { + padding += framePtr->borderWidth + LABELMARGIN; + } + + switch (labelframePtr->labelAnchor) { + case LABELANCHOR_NW: + case LABELANCHOR_SW: + labelframePtr->labelTextX = padding; + labelframePtr->labelBox.x = padding; + break; + case LABELANCHOR_N: + case LABELANCHOR_S: + labelframePtr->labelTextX = otherWidthT / 2; + labelframePtr->labelBox.x = otherWidth / 2; + break; + case LABELANCHOR_NE: + case LABELANCHOR_SE: + labelframePtr->labelTextX = otherWidthT - padding; + labelframePtr->labelBox.x = otherWidth - padding; + break; + case LABELANCHOR_EN: + case LABELANCHOR_WN: + labelframePtr->labelTextY = padding; + labelframePtr->labelBox.y = padding; + break; + case LABELANCHOR_E: + case LABELANCHOR_W: + labelframePtr->labelTextY = otherHeightT / 2; + labelframePtr->labelBox.y = otherHeight / 2; + break; + default: + labelframePtr->labelTextY = otherHeightT - padding; + labelframePtr->labelBox.y = otherHeight - padding; + break; + } } /* @@ -787,8 +1383,9 @@ DisplayFrame(clientData) { register Frame *framePtr = (Frame *) clientData; register Tk_Window tkwin = framePtr->tkwin; - void (* drawFunction) _ANSI_ARGS_((Tk_Window, Drawable, Tk_3DBorder, - int, int, int, int, int, int)) = Tk_Fill3DRectangle; + int bdX1, bdY1, bdX2, bdY2, hlWidth; + Pixmap pixmap; + TkRegion clipRegion = NULL; framePtr->flags &= ~REDRAW_PENDING; if ((framePtr->tkwin == NULL) || !Tk_IsMapped(tkwin) @@ -796,15 +1393,13 @@ DisplayFrame(clientData) return; } - if (framePtr->border != NULL) { - drawFunction(tkwin, Tk_WindowId(tkwin), - framePtr->border, framePtr->highlightWidth, - framePtr->highlightWidth, - Tk_Width(tkwin) - 2*framePtr->highlightWidth, - Tk_Height(tkwin) - 2*framePtr->highlightWidth, - framePtr->borderWidth, framePtr->relief); - } - if (framePtr->highlightWidth != 0) { + /* + * Highlight shall always be drawn if it exists, so do that first. + */ + + hlWidth = framePtr->highlightWidth; + + if (hlWidth != 0) { GC fgGC, bgGC; bgGC = Tk_GCForColor(framePtr->highlightBgColorPtr, @@ -812,13 +1407,179 @@ DisplayFrame(clientData) if (framePtr->flags & GOT_FOCUS) { fgGC = Tk_GCForColor(framePtr->highlightColorPtr, Tk_WindowId(tkwin)); - TkpDrawHighlightBorder(tkwin, fgGC, bgGC, framePtr->highlightWidth, + TkpDrawHighlightBorder(tkwin, fgGC, bgGC, hlWidth, Tk_WindowId(tkwin)); } else { - TkpDrawHighlightBorder(tkwin, bgGC, bgGC, framePtr->highlightWidth, + TkpDrawHighlightBorder(tkwin, bgGC, bgGC, hlWidth, Tk_WindowId(tkwin)); } } + + /* + * If -background is set to "", no interior is drawn. + */ + + if (framePtr->border == NULL) return; + + if (framePtr->type != TYPE_LABELFRAME) { + /* + * There is no label so there is just a simple rectangle to draw. + */ + + noLabel: + Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), + framePtr->border, hlWidth, hlWidth, + Tk_Width(tkwin) - 2 * hlWidth, + Tk_Height(tkwin) - 2 * hlWidth, + framePtr->borderWidth, framePtr->relief); + } else { + Labelframe *labelframePtr = (Labelframe *) framePtr; + + if ((labelframePtr->textPtr == NULL) && + (labelframePtr->labelWin == NULL)) { + goto noLabel; + } + + /* + * In order to avoid screen flashes, this procedure redraws the + * frame into off-screen memory, then copies it back on-screen + * in a single operation. This means there's no point in time + * where the on-screen image has been cleared. + */ + + pixmap = Tk_GetPixmap(framePtr->display, Tk_WindowId(tkwin), + Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin)); + + /* + * Clear the pixmap. + */ + + Tk_Fill3DRectangle(tkwin, pixmap, framePtr->border, 0, 0, + Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); + + /* + * Calculate how the label affects the border's position. + */ + + bdX1 = bdY1 = hlWidth; + bdX2 = Tk_Width(tkwin) - hlWidth; + bdY2 = Tk_Height(tkwin) - hlWidth; + + switch (labelframePtr->labelAnchor) { + case LABELANCHOR_E: + case LABELANCHOR_EN: + case LABELANCHOR_ES: + bdX2 -= (labelframePtr->labelBox.width - framePtr->borderWidth) + / 2; + break; + case LABELANCHOR_N: + case LABELANCHOR_NE: + case LABELANCHOR_NW: + /* + * Since the glyphs of the text tend to be in the lower part + * we favor a lower border position by rounding up. + */ + + bdY1 += (labelframePtr->labelBox.height - framePtr->borderWidth +1) + / 2; + break; + case LABELANCHOR_S: + case LABELANCHOR_SE: + case LABELANCHOR_SW: + bdY2 -= (labelframePtr->labelBox.height - framePtr->borderWidth) + / 2; + break; + default: + bdX1 += (labelframePtr->labelBox.width - framePtr->borderWidth) + / 2; + break; + } + + /* + * Draw border + */ + + Tk_Draw3DRectangle(tkwin, pixmap, framePtr->border, bdX1, bdY1, + bdX2 - bdX1, bdY2 - bdY1, framePtr->borderWidth, + framePtr->relief); + + if (labelframePtr->labelWin == NULL) { + /* + * Clear behind the label + */ + + Tk_Fill3DRectangle(tkwin, pixmap, + framePtr->border, labelframePtr->labelBox.x, + labelframePtr->labelBox.y, labelframePtr->labelBox.width, + labelframePtr->labelBox.height, 0, TK_RELIEF_FLAT); + + /* + * Draw label. + * If there is not room for the entire label, use clipping to + * get a nice appearance. + */ + + if ((labelframePtr->labelBox.width < labelframePtr->labelReqWidth) + || (labelframePtr->labelBox.height < + labelframePtr->labelReqHeight)) { + clipRegion = TkCreateRegion(); + TkUnionRectWithRegion(&labelframePtr->labelBox, clipRegion, + clipRegion); + TkSetRegion(framePtr->display, labelframePtr->textGC, + clipRegion); + } + + Tk_DrawTextLayout(framePtr->display, pixmap, + labelframePtr->textGC, labelframePtr->textLayout, + labelframePtr->labelTextX + LABELSPACING, + labelframePtr->labelTextY + LABELSPACING, 0, -1); + + if (clipRegion != NULL) { + XSetClipMask(framePtr->display, labelframePtr->textGC, None); + TkDestroyRegion(clipRegion); + } + } else { + /* + * Reposition and map the window (but in different ways depending + * on whether the frame is the window's parent). + */ + + if (framePtr->tkwin == Tk_Parent(labelframePtr->labelWin)) { + if ((labelframePtr->labelBox.x != Tk_X(labelframePtr->labelWin)) + || (labelframePtr->labelBox.y != + Tk_Y(labelframePtr->labelWin)) + || (labelframePtr->labelBox.width != + Tk_Width(labelframePtr->labelWin)) + || (labelframePtr->labelBox.height != + Tk_Height(labelframePtr->labelWin))) { + Tk_MoveResizeWindow(labelframePtr->labelWin, + labelframePtr->labelBox.x, labelframePtr->labelBox.y, + labelframePtr->labelBox.width, + labelframePtr->labelBox.height); + } + Tk_MapWindow(labelframePtr->labelWin); + } else { + Tk_MaintainGeometry(labelframePtr->labelWin, framePtr->tkwin, + labelframePtr->labelBox.x, labelframePtr->labelBox.y, + labelframePtr->labelBox.width, + labelframePtr->labelBox.height); + } + } + + + /* + * Everything's been redisplayed; now copy the pixmap onto the screen + * and free up the pixmap. + */ + + XCopyArea(framePtr->display, pixmap, Tk_WindowId(tkwin), + labelframePtr->textGC, hlWidth, hlWidth, + (unsigned) (Tk_Width(tkwin) - 2 * hlWidth), + (unsigned) (Tk_Height(tkwin) - 2 * hlWidth), + hlWidth, hlWidth); + Tk_FreePixmap(framePtr->display, pixmap); + } + } /* @@ -847,8 +1608,10 @@ FrameEventProc(clientData, eventPtr) { register Frame *framePtr = (Frame *) clientData; - if (((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) - || (eventPtr->type == ConfigureNotify)) { + if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) { + goto redraw; + } else if (eventPtr->type == ConfigureNotify) { + ComputeFrameGeometry(framePtr); goto redraw; } else if (eventPtr->type == DestroyNotify) { if (framePtr->menuName != NULL) { @@ -874,8 +1637,7 @@ FrameEventProc(clientData, eventPtr) * DestroyFrame, we must free all options now. */ - Tk_FreeConfigOptions((char *) framePtr, framePtr->optionTable, - framePtr->tkwin); + DestroyFramePartly(framePtr); Tk_DeleteEventHandler(framePtr->tkwin, ExposureMask|StructureNotifyMask|FocusChangeMask, @@ -960,8 +1722,7 @@ FrameCmdDeletedProc(clientData) * before setting tkwin to NULL. */ - Tk_FreeConfigOptions((char *) framePtr, framePtr->optionTable, - framePtr->tkwin); + DestroyFramePartly(framePtr); framePtr->tkwin = NULL; Tk_DestroyWindow(tkwin); @@ -1054,3 +1815,115 @@ TkInstallFrameMenu(tkwin) framePtr->menuName); } } + +/* + *-------------------------------------------------------------- + * + * FrameStructureProc -- + * + * This procedure is invoked whenever StructureNotify events + * occur for a window that's managed as label for the frame. + * This procudure's only purpose is to clean up when windows + * are deleted. + * + * Results: + * None. + * + * Side effects: + * The window is disassociated from the frame when it is + * deleted. + * + *-------------------------------------------------------------- + */ + +static void +FrameStructureProc(clientData, eventPtr) + ClientData clientData; /* Pointer to record describing frame. */ + XEvent *eventPtr; /* Describes what just happened. */ +{ + Labelframe *labelframePtr = (Labelframe *) clientData; + + if (eventPtr->type == DestroyNotify) { + /* + * This should only happen in a labelframe but it doesn't + * hurt to be careful. + */ + + if (labelframePtr->frame.type == TYPE_LABELFRAME) { + labelframePtr->labelWin = NULL; + FrameWorldChanged((ClientData) labelframePtr); + } + } +} + +/* + *-------------------------------------------------------------- + * + * FrameRequestProc -- + * + * This procedure is invoked whenever a window that's associated + * with a frame changes its requested dimensions. + * + * Results: + * None. + * + * Side effects: + * The size and location on the screen of the window may change. + * depending on the options specified for the frame. + * + *-------------------------------------------------------------- + */ + +static void +FrameRequestProc(clientData, tkwin) + ClientData clientData; /* Pointer to record for frame. */ + Tk_Window tkwin; /* Window that changed its desired + * size. */ +{ + Frame *framePtr = (Frame *) clientData; + + FrameWorldChanged((ClientData) framePtr); +} + +/* + *-------------------------------------------------------------- + * + * FrameLostSlaveProc -- + * + * This procedure is invoked by Tk whenever some other geometry + * claims control over a slave that used to be managed by us. + * + * Results: + * None. + * + * Side effects: + * Forgets all frame-related information about the slave. + * + *-------------------------------------------------------------- + */ + +static void +FrameLostSlaveProc(clientData, tkwin) + ClientData clientData; /* Frame structure for slave window that + * was stolen away. */ + Tk_Window tkwin; /* Tk's handle for the slave window. */ +{ + Frame *framePtr = (Frame *) clientData; + Labelframe *labelframePtr = (Labelframe *) clientData; + + /* + * This should only happen in a labelframe but it doesn't + * hurt to be careful. + */ + + if (labelframePtr->frame.type == TYPE_LABELFRAME) { + Tk_DeleteEventHandler(labelframePtr->labelWin, StructureNotifyMask, + FrameStructureProc, (ClientData) labelframePtr); + if (framePtr->tkwin != Tk_Parent(labelframePtr->labelWin)) { + Tk_UnmaintainGeometry(labelframePtr->labelWin, framePtr->tkwin); + } + Tk_UnmapWindow(labelframePtr->labelWin); + labelframePtr->labelWin = NULL; + } + FrameWorldChanged((ClientData) framePtr); +} diff --git a/generic/tkInt.h b/generic/tkInt.h index ce68146..440c339 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.39 2001/09/26 20:25:17 pspjuth Exp $ + * RCS: $Id: tkInt.h,v 1.40 2001/09/26 21:36:19 pspjuth Exp $ */ #ifndef _TKINT @@ -965,6 +965,9 @@ EXTERN int Tk_ImageObjCmd _ANSI_ARGS_((ClientData clientData, EXTERN int Tk_LabelObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); +EXTERN int Tk_LabelframeObjCmd _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *CONST objv[])); EXTERN int Tk_ListboxObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); diff --git a/generic/tkWindow.c b/generic/tkWindow.c index c4d7ab4..c9481c5 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.38 2001/09/26 20:25:17 pspjuth Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.39 2001/09/26 21:36:19 pspjuth Exp $ */ #include "tkPort.h" @@ -139,6 +139,7 @@ static TkCmd commands[] = { {"entry", NULL, Tk_EntryObjCmd, 1, 0}, {"frame", NULL, Tk_FrameObjCmd, 1, 0}, {"label", NULL, Tk_LabelObjCmd, 1, 0}, + {"labelframe", NULL, Tk_LabelframeObjCmd, 1, 0}, {"listbox", NULL, Tk_ListboxObjCmd, 1, 0}, {"menubutton", NULL, Tk_MenubuttonObjCmd, 1, 0}, {"message", NULL, Tk_MessageObjCmd, 1, 0}, |