2003-10-20  Joe English  <jenglish@users.sourceforge.net>
	* generic/layout.c: Quick and dirty hack to layout engine
	to overcome fundamental design flaws.  More comprehensive
	fix forthcoming...

2003-10-20  Pat Thoyts  <patthoyts@users.sourceforge.net>

### Build stuff section.
#

.SUFFIXES: .c .@OBJEXT@

.c.@OBJEXT@:
	@$(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -c $< -o $@

$(tile_LIB_FILE): $(tile_OBJECTS)
	-rm -f $(tile_LIB_FILE)
	$(SHLIB_LD) @SHLIB_LD_OUT@$@ $(SHLIB_LDFLAGS) \
		$(tile_OBJECTS) $(tile_LIBRARIES) $(SHLIB_LD_LIBS) \
		$(TCL_STUB_LIB_SPEC) $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC)

@@@ [style configure] -- make sure changes get propagated to ElementImpl's.

@@@ change TTK_LAYOUT_AROUND to TTK_LAYOUT_BORDER; update WidgetGeometry()
   to use TTK_LAYOUT_BORDER-tagged element to set internal padding.

~~ Layout engine:
    + Reimplement; the current design is subtly but fatally flawed.



~~ General:
    + Implement WorldChanged() proc -- handle font (later color) changes.
    + add fallback fallback "null" element 
    + Need per-engine cleanup procedures.
    + Rethink resource allocation (AllocateResource,DeallocateResources)

/* $Id: altTheme.c,v 1.6 2003/10/19 18:36:10 jenglish Exp $
 *
 * Copyright (c) 2003, Joe English
 *
 * Tk alternate theme, intended to eventually match the MSUE
 * and GTk's default theme.  (Still have a long way to go...)
 *
 * @@@ I need a good name for this theme.  Calling it "new"

static void
BorderElementDraw(
    void *clientData, void *elementRecord,
    Tk_Window tkwin, Drawable d,
    int x, int y, int width, int height,
    unsigned int state)
{
    int options = *(int*)clientData;
    BorderElement *bd = elementRecord;
    Tk_3DBorder border = NULL;
    int borderWidth = 2, relief = TK_RELIEF_FLAT;
    int defaultState = TK_BUTTON_DEFAULT_DISABLED;
    int inset = 0;
    XColor *extraColor;

    HThumbElementDraw
};

/*------------------------------------------------------------------------
 * Widget layouts:
 */

TK_BEGIN_LAYOUT(TileLayout)
    TK_LAYOUT_DRAW("Tile.background")
    TK_LAYOUT_AROUND("Tile.border",
	TK_LAYOUT_INSIDE("Tile.padding",
            TK_LAYOUT_INSIDE("Tile.highlight",
	        TK_LAYOUT_LEFT("Tile.indicator")
	        TK_LAYOUT_HFILL("Tile.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(ButtonLayout)
    TK_LAYOUT_DRAW("Button.background")
    TK_LAYOUT_AROUND("Button.border",
        TK_LAYOUT_AROUND("Button.highlight", 
	    TK_LAYOUT_INSIDE("Button.padding",
	        TK_LAYOUT_HFILL("Button.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(CheckbuttonLayout)
    TK_LAYOUT_DRAW("Checkbutton.background")
    TK_LAYOUT_AROUND("Checkbutton.border",
        TK_LAYOUT_INSIDE("Checkbutton.padding",
            TK_LAYOUT_LEFT("Checkbutton.indicator")
            TK_LAYOUT_INSIDE("Checkbutton.highlight",
                TK_LAYOUT_HFILL("Checkbutton.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(RadiobuttonLayout)
    TK_LAYOUT_DRAW("Radiobutton.background")
    TK_LAYOUT_AROUND("Radiobutton.border",
        TK_LAYOUT_INSIDE("Radiobutton.padding",
	    TK_LAYOUT_LEFT("Radiobutton.indicator")
            TK_LAYOUT_AROUND("Radiobutton.highlight",
	        TK_LAYOUT_HFILL("Radiobutton.compound"))))
TK_END_LAYOUT

/*------------------------------------------------------------------------
 * AltTheme_Init --
 * 	Install alternate theme.
 */
int AltTheme_Init(Tcl_Interp *interp)
{

/*
 * layout.c --
 *
 * Generic layout processing.
 *
 * Copyright (c) 2003 Joe English.  Freely redistributable.
 *
 * $Id: layout.c,v 1.4 2003/10/19 18:36:10 jenglish Exp $
 */

#include <tk.h>
#include "tkTheme.h"

#define MAX(a,b) (a > b ? a : b)
#define MIN(a,b) (a < b ? a : b)

    *widthPtr = *heightPtr = diameter;
    return diameter;
}

/*
 * adjustPadding --
 * 	Adjust x, y, width and height according to the specified padding.

 */
void adjustPadding(
    TTK_Padding *p, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr)
{
    *xPtr += p->left;
    *yPtr += p->top;
    *widthPtr -= (p->left + p->right);
    *heightPtr -= (p->top + p->bottom);
}

/*
 * Build a layout tree from a layout specification:
 */
static TTK_LayoutNode *NewLayoutNode(
    TTKLayoutOp opcode, TTK_Element element, const char *name)
{
    TTK_LayoutNode *node = (TTK_LayoutNode*)ckalloc(sizeof(TTK_LayoutNode));

    node->opcode = opcode;
    node->element = element;
    node->state = 0u;
    node->name = name;
    node->next = node->child = 0;
    /* parcel uninitialized */

    return node;

TTK_BuildLayout(
    TTK_LayoutSpec spec,
    TTK_Theme theme,
    Tk_OptionTable optionTable)
{
    TTK_LayoutNode *first = 0, *last = 0, *node;

    for ( ; spec->opcode != TTKLayoutEND ; ++spec)
    {


	TTK_Element element = 
	    TTK_GetElement(theme, spec->elementName, optionTable);
	if (!element) continue;	/* @@@ error? */

	node = NewLayoutNode(spec->opcode, element, spec->elementName);

	if (last) {
	    last->next = node;
	    last = node;
	} else {
	    last = first = node;
	}

	switch (spec->opcode) {
	    case TTKLayoutINSIDE:
	    case TTKLayoutAROUND:
		node->child = TTK_BuildLayout(spec+1, theme, optionTable);
		while (spec->opcode != TTKLayoutEND)
		    ++spec;
		break;

	    case TTKLayoutHFILL:
	    case TTKLayoutVFILL:
	    case TTKLayoutDRAW:
	    case TTKLayoutTOP:
	    case TTKLayoutLEFT:
	    case TTKLayoutBOTTOM:
	    case TTKLayoutRIGHT:
		break;

	    case TTKLayoutEND:
		/* can't happen */
		break;
	}
    } /* for */

    return first;
}

/*
 * TTK_LayoutReqSize --
 * 	Compute minimum requested width & height of a layout tree
 */
void TTK_LayoutReqSize(
    TTK_Layout layout,
    char *recordPtr,
    Tk_Window tkwin,
    int *widthPtr,
    int *heightPtr)
{
    int width = 0, height = 0;
    unsigned int orient = 0x3;	/* @@@ Quick hack */ 

    for ( ; layout != 0; layout = layout->next)
    {
	int elementWidth, elementHeight;
	TTK_Padding padding;

	TTK_ElementGeometry(layout->element, recordPtr, tkwin, layout->state,
			&elementWidth, &elementHeight, &padding);

	switch (layout->opcode)
	{
	    case TTKLayoutDRAW:
		width = MAX(elementWidth, width);
		height = MAX(elementHeight, height);
		break;
	    case TTKLayoutTOP:
	    case TTKLayoutBOTTOM:
	    case TTKLayoutVFILL:
		orient = 0x1;
		width = MAX(width, elementWidth);
		height += elementHeight;
		break;
	    case TTKLayoutLEFT:
	    case TTKLayoutRIGHT:
	    case TTKLayoutHFILL:
		orient = 0x2;
		width += elementWidth;
		height = MAX(height, elementHeight);
		break;
	    case TTKLayoutAROUND:
	    case TTKLayoutINSIDE:
	    {
		int subWidth = 0, subHeight = 0;
		TTK_LayoutReqSize(layout->child, recordPtr, tkwin,
			&subWidth, &subHeight);

		subWidth += padding.left + padding.right;
		subHeight += padding.top + padding.bottom;

		if (orient & 0x1)

		    height += subHeight;
	    	else
		    height = MAX(height, subHeight);

		if (orient & 0x2)

		    width += subWidth;
	    	else
		    width = MAX(width, subWidth);

		break;
	    }
	    case TTKLayoutEND:
		/* can't happen */
		break;
	}
    }
    *widthPtr = width;
    *heightPtr = height;
}

void TTK_LayoutGeometry(TTK_Layout layout,
	char *recordPtr, Tk_Window tkwin, 
	int x, int y, int width, int height, unsigned int state)
{
    TTK_Box cavity = makeBox(x, y, width, height);

    for ( ; layout; layout = layout->next)
    {
	int elementWidth, elementHeight;
	TTK_Padding padding;


	TTK_ElementGeometry(layout->element, recordPtr, tkwin, state,
		    &elementWidth, &elementHeight, &padding);

	switch (layout->opcode)
	{
	    case TTKLayoutHFILL:
	    case TTKLayoutVFILL:
	    case TTKLayoutDRAW:
		layout->parcel = cavity;
		break;
	    case TTKLayoutTOP:
		layout->parcel = packTop(&cavity, elementHeight);
		break;
	    case TTKLayoutLEFT:
		layout->parcel = packLeft(&cavity, elementWidth);
		break;
	    case TTKLayoutBOTTOM:
		layout->parcel = packBottom(&cavity, elementHeight);
		break;
	    case TTKLayoutRIGHT:
		layout->parcel = packRight(&cavity, elementWidth);
		break;
	    case TTKLayoutAROUND:
	    case TTKLayoutINSIDE:

		layout->parcel = cavity;




		cavity = padBox(cavity, padding);
		TTK_LayoutGeometry(layout->child,recordPtr,tkwin,
			cavity.x, cavity.y, cavity.w, cavity.h, state);
		continue;
	    case TTKLayoutEND:
		/* can't happen */
		break;
	}
    }
}

void TTK_LayoutDraw(
    TTK_Layout layout, char *recordPtr, Tk_Window tkwin,
    Drawable d, unsigned int state)
{
    for (; layout ; layout = layout->next) 
    {

	if (layout->child && layout->opcode == TTKLayoutAROUND)
	    TTK_LayoutDraw(layout->child, recordPtr, tkwin, d, state);

	TTK_DrawElement(layout->element, recordPtr, tkwin, d,
		layout->parcel.x, layout->parcel.y, 
		layout->parcel.w, layout->parcel.h, 
		state);

	if (layout->child && layout->opcode != TTKLayoutAROUND)
	    TTK_LayoutDraw(layout->child, recordPtr, tkwin, d, state);
    }
}

TTK_LayoutNode *TTK_LayoutIdentify(TTK_Layout layout, int x, int y)
{
    TTK_LayoutNode *closest = NULL;

/* ----------------------------------------------------------------------
 *
 * Widget specifications
 *
 * ----------------------------------------------------------------------
 */

TK_BEGIN_LAYOUT(VerticalStepScrollbarLayout)
    TK_LAYOUT_DRAW("Scrollbar.background")
    TK_LAYOUT_AROUND("Scrollbar.border",
	TK_LAYOUT_DRAW("Scrollbar.trough")
	TK_LAYOUT_BOTTOM("Scrollbar.downarrow")
	TK_LAYOUT_BOTTOM("Scrollbar.uparrow")
	TK_LAYOUT_VFILL("Scrollbar.vthumb")   )
TK_END_LAYOUT

TK_BEGIN_LAYOUT(HorizontalStepScrollbarLayout)
    TK_LAYOUT_DRAW("Scrollbar.background")
    TK_LAYOUT_AROUND("Scrollbar.border",
	TK_LAYOUT_DRAW("Scrollbar.trough")
	TK_LAYOUT_RIGHT("Scrollbar.rightarrow")
	TK_LAYOUT_RIGHT("Scrollbar.leftarrow")
	TK_LAYOUT_HFILL("Scrollbar.hthumb")   )
TK_END_LAYOUT


int DLLEXPORT
StepTheme_Init(Tcl_Interp *interp)
{
    TTK_Theme themePtr = NULL;

/* $Id: tkElements.c,v 1.7 2003/10/19 18:36:10 jenglish Exp $
 *
 * Copyright (c) 2003, Joe English
 *
 * Default implementation for themed elements.
 *
 * Implements the "classic" Motif-like Tk look.
 * Also provides default fallback elements for other themes.

    HThumbElementDraw
};

/*------------------------------------------------------------------------
 * Layouts:
 */

TK_BEGIN_LAYOUT(TileLayout)
    TK_LAYOUT_DRAW("Tile.background")
    TK_LAYOUT_DRAW("Tile.border")
TK_END_LAYOUT

TK_BEGIN_LAYOUT(ButtonLayout)
    TK_LAYOUT_DRAW("Button.background")
    TK_LAYOUT_AROUND("Button.highlight", 
        TK_LAYOUT_AROUND("Button.border",
	    TK_LAYOUT_INSIDE("Button.padding",
	        TK_LAYOUT_HFILL("Button.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(CheckbuttonLayout)
    TK_LAYOUT_DRAW("Checkbutton.background")
    TK_LAYOUT_AROUND("Checkbutton.highlight",
        TK_LAYOUT_AROUND("Checkbutton.border",
	    TK_LAYOUT_INSIDE("Checkbutton.padding",
	        TK_LAYOUT_LEFT("Checkbutton.indicator")
	        TK_LAYOUT_HFILL("Checkbutton.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(RadiobuttonLayout)
    TK_LAYOUT_DRAW("Radiobutton.background")
    TK_LAYOUT_AROUND("Radiobutton.highlight",
        TK_LAYOUT_AROUND("Radiobutton.border",


            TK_LAYOUT_INSIDE("Radiobutton.padding",
	        TK_LAYOUT_LEFT("Radiobutton.indicator")
	        TK_LAYOUT_HFILL("Radiobutton.compound"))))
TK_END_LAYOUT

TK_BEGIN_LAYOUT(VerticalScrollbarLayout)
    TK_LAYOUT_DRAW("Scrollbar.background")
    TK_LAYOUT_AROUND("Scrollbar.border",
	TK_LAYOUT_DRAW("Scrollbar.trough")
	TK_LAYOUT_TOP("Scrollbar.uparrow")
	TK_LAYOUT_BOTTOM("Scrollbar.downarrow")
	TK_LAYOUT_VFILL("Scrollbar.vthumb")   )
TK_END_LAYOUT

TK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
    TK_LAYOUT_DRAW("Scrollbar.background")
    TK_LAYOUT_AROUND("Scrollbar.border",
	TK_LAYOUT_DRAW("Scrollbar.trough")
	TK_LAYOUT_LEFT("Scrollbar.leftarrow")
	TK_LAYOUT_RIGHT("Scrollbar.rightarrow")
	TK_LAYOUT_HFILL("Scrollbar.hthumb")   )
TK_END_LAYOUT

/*----------------------------------------------------------------------
 * RegisterElements --
 *
 *	Register all elements and layouts defined in this package.
 */
void RegisterElements(Tcl_Interp *interp)

/*
 * tkTheme.h --
 *      Declarations for Tk style engine.
 *
 * Copyright (c) 2003 Joe English.  Freely redistributable.
 *
 * $Id: tkTheme.h,v 1.8 2003/10/19 18:13:08 jenglish Exp $
 */

#ifndef TKTHEME_H
#define TKTHEME_H 1

#ifndef WIN32
#define NO_PRIVATE_HEADERS 1

TTK_RegisterElementSpec(
	TTK_Theme style, const char *elementName,
	TTK_ElementSpec *, void *clientData);

/*
 * Layout specifications:
 */

typedef enum
{
    TTKLayoutDRAW,	/* draw current element; don't adjust parcel */
    TTKLayoutTOP,	/* pack at top of current parcel */
    TTKLayoutLEFT,	/* pack at left of current parcel */
    TTKLayoutBOTTOM,	/* pack at bottom of current parcel */
    TTKLayoutRIGHT,	/* pack at right of current parcel */
    TTKLayoutHFILL,	/* fill remaining parcel, horizontally */


    TTKLayoutVFILL,	/* fill remaining parcel, vertically */

    TTKLayoutINSIDE,	/* subsequent elements drawn inside current element */
    TTKLayoutAROUND,	/* draw this element around subsequent elements */
    TTKLayoutEND,	/* end of INSIDE, AROUND, or overall layout */

} TTKLayoutOp;


typedef struct
{
    TTKLayoutOp		opcode;
    const char *	elementName;
} TTKLayoutInstruction, *TTKLayout, *TTK_LayoutSpec;

#define TK_BEGIN_LAYOUT(name) \
	static TTKLayoutInstruction name[] = {
#define TK_LAYOUT_DRAW(el)  	{ TTKLayoutDRAW, el },
#define TK_LAYOUT_TOP(el)   	{ TTKLayoutTOP, el },
#define TK_LAYOUT_LEFT(el)   	{ TTKLayoutLEFT, el },
#define TK_LAYOUT_BOTTOM(el)   	{ TTKLayoutBOTTOM, el },
#define TK_LAYOUT_RIGHT(el)   	{ TTKLayoutRIGHT, el },
#define TK_LAYOUT_HFILL(el)   	{ TTKLayoutHFILL, el },
#define TK_LAYOUT_VFILL(el)   	{ TTKLayoutVFILL, el },


#define TK_LAYOUT_INSIDE(el, children) \
	{ TTKLayoutINSIDE, el }, children { TTKLayoutEND, 0 },
#define TK_LAYOUT_AROUND(el, children) \
	{ TTKLayoutAROUND, el }, children { TTKLayoutEND, 0 },
#define TK_END_LAYOUT 		{ TTKLayoutEND, 0 } };


/*
 * Layout instances:
 */
typedef struct TTK_LayoutNode_ TTK_LayoutNode, *TTK_Layout;

struct TTK_LayoutNode_
{
    TTKLayoutOp		opcode;
    TTK_Element 	element;
    const char		*name;
    unsigned int 	state;
    TTK_Box 		parcel;
    TTK_LayoutNode	*next, *child;
};