* doc/ttk_Geometry.3, doc/ttk_Theme.3, doc/ttk_button.n:

	* doc/ttk_checkbutton.n, doc/ttk_combobox.n, doc/ttk_dialog.n:
	* doc/ttk_entry.n, doc/ttk_frame.n, doc/ttk_image.n:
	* doc/ttk_intro.n, doc/ttk_label.n, doc/ttk_labelframe.n:
	* doc/ttk_menubutton.n, doc/ttk_notebook.n, doc/ttk_panedwindow.n:
	* doc/ttk_progressbar.n, doc/ttk_radiobutton.n, doc/ttk_scrollbar.n:
	* doc/ttk_separator.n, doc/ttk_sizegrip.n, doc/ttk_style.n:
	* doc/ttk_treeview.n, doc/ttk_widget.n,:
	* generic/ttk/ttk.decls, generic/ttk/ttkBlink.c:
	* generic/ttk/ttkButton.c, generic/ttk/ttkCache.c:
	* generic/ttk/ttkClamTheme.c, generic/ttk/ttkClassicTheme.c:
	* generic/ttk/ttkDecls.h, generic/ttk/ttkDefaultTheme.c:
	* generic/ttk/ttkElements.c, generic/ttk/ttkEntry.c:
	* generic/ttk/ttkFrame.c, generic/ttk/ttkImage.c:
	* generic/ttk/ttkInit.c, generic/ttk/ttkLabel.c:
	* generic/ttk/ttkLayout.c, generic/ttk/ttkManager.c:
	* generic/ttk/ttkManager.h, generic/ttk/ttkNotebook.c:
	* generic/ttk/ttkPanedwindow.c, generic/ttk/ttkProgress.c:
	* generic/ttk/ttkScale.c, generic/ttk/ttkScroll.c:
	* generic/ttk/ttkScrollbar.c, generic/ttk/ttkSeparator.c:
	* generic/ttk/ttkSquare.c, generic/ttk/ttkState.c:
	* generic/ttk/ttkStubInit.c, generic/ttk/ttkStubLib.c:
	* generic/ttk/ttkTagSet.c, generic/ttk/ttkTheme.c:
	* generic/ttk/ttkTheme.h, generic/ttk/ttkThemeInt.h:
	* generic/ttk/ttkTrace.c, generic/ttk/ttkTrack.c:
	* generic/ttk/ttkTreeview.c, generic/ttk/ttkWidget.c:
	* generic/ttk/ttkWidget.h:
	* library/demos/ttk_demo.tcl, library/demos/ttk_iconlib.tcl:
	* library/demos/ttk_repeater.tcl:
	* library/ttk/altTheme.tcl, library/ttk/aquaTheme.tcl:
	* library/ttk/button.tcl, library/ttk/clamTheme.tcl:
	* library/ttk/classicTheme.tcl, library/ttk/combobox.tcl:
	* library/ttk/cursors.tcl, library/ttk/defaults.tcl:
	* library/ttk/dialog.tcl, library/ttk/entry.tcl:
	* library/ttk/fonts.tcl, library/ttk/icons.tcl:
	* library/ttk/keynav.tcl, library/ttk/menubutton.tcl:
	* library/ttk/notebook.tcl, library/ttk/panedwindow.tcl:
	* library/ttk/progress.tcl, library/ttk/scale.tcl:
	* library/ttk/scrollbar.tcl, library/ttk/sizegrip.tcl:
	* library/ttk/treeview.tcl, library/ttk/ttk.tcl:
	* library/ttk/utils.tcl, library/ttk/winTheme.tcl:
	* library/ttk/xpTheme.tcl:
	* macosx/ttkMacOSXTheme.c:
	* tests/ttk/all.tcl, tests/ttk/bwidget.test, tests/ttk/combobox.test:
	* tests/ttk/entry.test, tests/ttk/image.test:
	* tests/ttk/labelframe.test, tests/ttk/layout.test:
	* tests/ttk/misc.test, tests/ttk/notebook.test:
	* tests/ttk/panedwindow.test, tests/ttk/progressbar.test:
	* tests/ttk/scrollbar.test, tests/ttk/treetags.test:
	* tests/ttk/treeview.test, tests/ttk/ttk.test, tests/ttk/validate.test:
	* win/ttkWinMonitor.c, win/ttkWinTheme.c, win/ttkWinXPTheme.c:
	First import of Ttk themed Tk widgets as branched from tile 0.7.8

	* generic/tkInt.h, generic/tkWindow.c: add Ttk_Init call, copy
	tk classic widgets to ::tk namespace.
	* library/tk.tcl: add source of ttk/ttk.tcl, define $::ttk::library.
	* unix/Makefile.in, win/Makefile.in: add Ttk build bits
	* win/configure, win/configure.in: check for uxtheme.h (XP theme).

1 files changed, 175 insertions, 0 deletions

diff --git a/generic/ttk/ttkTrack.c b/generic/ttk/ttkTrack.c
new file mode 100644
index 0000000..4a6337e
--- /dev/null
+++ b/generic/ttk/ttkTrack.c
@@ -0,0 +1,175 @@
+/* $Id: ttkTrack.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+ * Copyright (c) 2004, Joe English
+ *
+ * TrackElementState() -- helper routine for widgets
+ * like scrollbars in which individual elements may
+ * be active or pressed instead of the widget as a whole.
+ *
+ * Usage:
+ * 	TrackElementState(&recordPtr->core);
+ *
+ * Registers an event handler on the widget that tracks pointer
+ * events and updates the state of the element under the
+ * mouse cursor.
+ *
+ * The "active" element is the one under the mouse cursor,
+ * and is normally set to the ACTIVE state unless another element
+ * is currently being pressed.
+ *
+ * The active element becomes "pressed" on <ButtonPress> events,
+ * and remains "active" and "pressed" until the corresponding
+ * <ButtonRelease> event.
+ *
+ * TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>)
+ * TODO: Deal with grabs -- possible to get a Press event w/no corresponding Release.
+ *
+ */
+
+#include <tk.h>
+#include "ttkTheme.h"
+#include "ttkWidget.h"
+
+typedef struct 
+{
+    WidgetCore		*corePtr;	/* Widget to track */
+    Ttk_LayoutNode	*activeElement;	/* element under the mouse cursor */
+    Ttk_LayoutNode	*pressedElement; /* currently pressed element */
+} ElementStateTracker;
+
+/*
+ * ActivateElement(es, node) --
+ * 	Make 'node' the active element if non-NULL.
+ * 	Deactivates the currently active element if different.
+ *
+ * 	The active element has TTK_STATE_ACTIVE set _unless_
+ * 	another element is 'pressed'
+ */
+static void ActivateElement(ElementStateTracker *es, Ttk_LayoutNode *node)
+{
+    if (es->activeElement == node) {
+	/* No change */
+	return;
+    }
+
+    if (!es->pressedElement) {
+	if (es->activeElement) {
+	    /* Deactivate old element */
+	    Ttk_ChangeElementState(es->activeElement, 0,TTK_STATE_ACTIVE);
+	} 
+	if (node) {
+	    /* Activate new element */
+	    Ttk_ChangeElementState(node, TTK_STATE_ACTIVE,0);
+	}
+	TtkRedisplayWidget(es->corePtr);
+    }
+
+    es->activeElement = node;
+}
+
+/* ReleaseElement --
+ * 	Releases the currently pressed element, if any.
+ */
+static void ReleaseElement(ElementStateTracker *es)
+{
+    if (!es->pressedElement)
+	return;
+
+    Ttk_ChangeElementState(
+	es->pressedElement, 0,TTK_STATE_PRESSED|TTK_STATE_ACTIVE);
+    es->pressedElement = 0;
+
+    /* Reactivate element under the mouse cursor:
+     */
+    if (es->activeElement)
+	Ttk_ChangeElementState(es->activeElement, TTK_STATE_ACTIVE,0);
+
+    TtkRedisplayWidget(es->corePtr);
+}
+
+/* PressElement --
+ * 	Presses the specified element.
+ */
+static void PressElement(ElementStateTracker *es, Ttk_LayoutNode *node)
+{
+    if (es->pressedElement) {
+	ReleaseElement(es);
+    }
+
+    if (node) {
+	Ttk_ChangeElementState(
+	    node, TTK_STATE_PRESSED|TTK_STATE_ACTIVE, 0);
+    }
+
+    es->pressedElement = node;
+    TtkRedisplayWidget(es->corePtr);
+}
+
+/* ElementStateEventProc --
+ * 	Event handler for tracking element states.
+ */
+
+static const unsigned ElementStateMask =
+      ButtonPressMask 
+    | ButtonReleaseMask 
+    | PointerMotionMask 
+    | LeaveWindowMask 
+    | EnterWindowMask
+    | StructureNotifyMask
+    ;
+
+static void
+ElementStateEventProc(ClientData clientData, XEvent *ev)
+{
+    ElementStateTracker *es = (ElementStateTracker *)clientData;
+    Ttk_LayoutNode *node;
+
+    switch (ev->type)
+    {
+	case MotionNotify :
+	    node = Ttk_LayoutIdentify(
+		es->corePtr->layout,ev->xmotion.x,ev->xmotion.y);
+	    ActivateElement(es, node);
+	    break;
+	case LeaveNotify:
+	    ActivateElement(es, 0);
+	    break;
+	case EnterNotify:
+	    node = Ttk_LayoutIdentify(
+		es->corePtr->layout,ev->xcrossing.x,ev->xcrossing.y);
+	    ActivateElement(es, node);
+	    break;
+	case ButtonPress:
+	    node = Ttk_LayoutIdentify(
+		es->corePtr->layout, ev->xbutton.x, ev->xbutton.y);
+	    if (node) 
+		PressElement(es, node);
+	    break;
+	case ButtonRelease:
+	    ReleaseElement(es);
+	    break;
+	case DestroyNotify:
+	    /* Unregister this event handler and free client data. 
+	     */
+	    Tk_DeleteEventHandler(es->corePtr->tkwin,
+		    ElementStateMask, ElementStateEventProc, es);
+	    ckfree((ClientData)es);
+	    break;
+    }
+}
+
+/*
+ * TrackElementState --
+ * 	Register an event handler to manage the 'pressed'
+ * 	and 'active' states of individual widget elements.
+ */
+
+void TrackElementState(WidgetCore *corePtr)
+{
+    ElementStateTracker *es = (ElementStateTracker*)ckalloc(sizeof(*es));
+    es->corePtr = corePtr;
+    es->activeElement = es->pressedElement = 0;
+    Tk_CreateEventHandler(corePtr->tkwin,
+	    ElementStateMask,ElementStateEventProc,es);
+}
+
+