Mitigate future merge conflict headaches.

1 files changed, 210 insertions, 185 deletions

diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 4a108db..06e0a64 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -9,6 +9,7 @@
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
  * Copyright (c) 2015 Kevin Walzer/WordTech Commununications LLC.
  * Copyright (c) 2018 Marc Culler
+ *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
@@ -17,7 +18,6 @@
 #include "tkScrollbar.h"
 #include "tkMacOSXPrivate.h"
 
-
 #define MIN_SCROLLBAR_VALUE		0
 
 /*
@@ -27,18 +27,21 @@
 
 #define MIN_SLIDER_LENGTH	5
 
-/*Borrowed from ttkMacOSXTheme.c to provide appropriate scaling.*/
+/*
+ * Borrowed from ttkMacOSXTheme.c to provide appropriate scaling.
+ */
+
 #ifdef __LP64__
-#define RangeToFactor(maximum) (((double) (INT_MAX >> 1)) / (maximum))
+#define RangeToFactor(maximum)	(((double) (INT_MAX >> 1)) / (maximum))
 #else
-#define RangeToFactor(maximum) (((double) (LONG_MAX >> 1)) / (maximum))
+#define RangeToFactor(maximum)	(((double) (LONG_MAX >> 1)) / (maximum))
 #endif /* __LP64__ */
 
 /*
  * Apple reversed the scroll direction with the release of OSX 10.7 Lion.
  */
 
-#define SNOW_LEOPARD_STYLE (NSAppKitVersionNumber < 1138)
+#define SNOW_LEOPARD_STYLE	(NSAppKitVersionNumber < 1138)
 
 /*
  * Declaration of an extended scrollbar structure with Mac specific additions.
@@ -50,7 +53,7 @@ typedef struct MacScrollbar {
     GC copyGC;			/* Used for copying from pixmap onto screen. */
     Bool buttonDown;            /* Is the mouse button down? */
     Bool mouseOver;             /* Is the pointer over the scrollbar. */
-    HIThemeTrackDrawInfo info;  /* Controls how the scrollbar is drawn. */
+    HIThemeTrackDrawInfo info;	/* Controls how the scrollbar is drawn. */
 } MacScrollbar;
 
 /* Used to initialize a MacScrollbar's info field. */
@@ -69,33 +72,35 @@ HIThemeTrackDrawInfo defaultInfo = {
 
 const Tk_ClassProcs tkpScrollbarProcs = {
     sizeof(Tk_ClassProcs),	/* size */
-    NULL,					/* worldChangedProc */
-    NULL,					/* createProc */
-    NULL					/* modalProc */
+    NULL,			/* worldChangedProc */
+    NULL,			/* createProc */
+    NULL			/* modalProc */
 };
 
+/*
+ * Information on scrollbar layout, metrics, and draw info.
+ */
 
-/* Information on scrollbar layout, metrics, and draw info.*/
 typedef struct ScrollbarMetrics {
     SInt32 width, minThumbHeight;
     int minHeight, topArrowHeight, bottomArrowHeight;
     NSControlSize controlSize;
 } ScrollbarMetrics;
 
-
 static ScrollbarMetrics metrics = {
-  15, 54, 26, 14, 14, kControlSizeNormal /* kThemeScrollBarMedium */
+    15, 54, 26, 14, 14, kControlSizeNormal /* kThemeScrollBarMedium */
 };
 
-
 /*
  * Declarations of static functions defined later in this file:
  */
 
-static void ScrollbarEventProc(ClientData clientData, XEvent *eventPtr);
-static int ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr);
-static void UpdateControlValues(TkScrollbar  *scrollPtr);
-
+static void		ScrollbarEventProc(ClientData clientData,
+			    XEvent *eventPtr);
+static int		ScrollbarEvent(TkScrollbar *scrollPtr,
+			    XEvent *eventPtr);
+static void		UpdateControlValues(TkScrollbar *scrollPtr);
+
 /*
  *----------------------------------------------------------------------
  *
@@ -114,10 +119,9 @@ static void UpdateControlValues(TkScrollbar  *scrollPtr);
 
 TkScrollbar *
 TkpCreateScrollbar(
-		   Tk_Window tkwin)
+    Tk_Window tkwin)
 {
-
-    MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar));
+    MacScrollbar *scrollPtr = ckalloc(sizeof(MacScrollbar));
 
     scrollPtr->troughGC = NULL;
     scrollPtr->copyGC = NULL;
@@ -125,15 +129,15 @@ TkpCreateScrollbar(
     scrollPtr->buttonDown = false;
 
     Tk_CreateEventHandler(tkwin,
-			  ExposureMask        |
-			  StructureNotifyMask |
-			  FocusChangeMask     |
-			  ButtonPressMask     |
-			  ButtonReleaseMask   |
-			  EnterWindowMask     |
-			  LeaveWindowMask     |
-			  VisibilityChangeMask,
-			  ScrollbarEventProc, scrollPtr);
+	    ExposureMask        |
+	    StructureNotifyMask |
+	    FocusChangeMask     |
+	    ButtonPressMask     |
+	    ButtonReleaseMask   |
+	    EnterWindowMask     |
+	    LeaveWindowMask     |
+	    VisibilityChangeMask,
+	    ScrollbarEventProc, scrollPtr);
 
     return (TkScrollbar *) scrollPtr;
 }
@@ -144,8 +148,8 @@ TkpCreateScrollbar(
  * TkpDisplayScrollbar --
  *
  *	This procedure redraws the contents of a scrollbar window. It is
- *	invoked as a do-when-idle handler, so it only runs when there's
- *	nothing else for the application to do.
+ *	invoked as a do-when-idle handler, so it only runs when there's nothing
+ *	else for the application to do.
  *
  * Results:
  *	None.
@@ -158,9 +162,9 @@ TkpCreateScrollbar(
 
 void
 TkpDisplayScrollbar(
-		    ClientData clientData)	/* Information about window. */
+    ClientData clientData)	/* Information about window. */
 {
-    register TkScrollbar *scrollPtr = (TkScrollbar *) clientData;
+    register TkScrollbar *scrollPtr = clientData;
     MacScrollbar *msPtr = (MacScrollbar *) scrollPtr;
     register Tk_Window tkwin = scrollPtr->tkwin;
     TkWindow *winPtr = (TkWindow *) tkwin;
@@ -169,23 +173,31 @@ TkpDisplayScrollbar(
     scrollPtr->flags &= ~REDRAW_PENDING;
 
     if (tkwin == NULL || !Tk_IsMapped(tkwin)) {
-  	return;
+	return;
     }
 
-    MacDrawable *macWin =  (MacDrawable *) winPtr->window;
+    MacDrawable *macWin = (MacDrawable *) winPtr->window;
     NSView *view = TkMacOSXDrawableView(macWin);
-    if (!view ||
-	macWin->flags & TK_DO_NOT_DRAW ||
-	!TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, 1, &dc)) {
-      return;
+
+    if ((view == NULL)
+	    || (macWin->flags & TK_DO_NOT_DRAW)
+	    || !TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, 1, &dc)) {
+	return;
     }
 
     CGFloat viewHeight = [view bounds].size.height;
-    CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
-			    .ty = viewHeight};
+    CGAffineTransform t = {
+	.a = 1, .b = 0,
+	.c = 0, .d = -1,
+	.tx = 0, .ty = viewHeight
+    };
+
     CGContextConcatCTM(dc.context, t);
 
-    /*Draw a 3D rectangle to provide a base for the native scrollbar.*/
+    /*
+     * Draw a 3D rectangle to provide a base for the native scrollbar.
+     */
+
     if (scrollPtr->highlightWidth != 0) {
     	GC fgGC, bgGC;
 
@@ -196,32 +208,37 @@ TkpDisplayScrollbar(
     	    fgGC = bgGC;
     	}
     	TkpDrawHighlightBorder(tkwin, fgGC, bgGC, scrollPtr->highlightWidth,
-    			       (Pixmap) macWin);
+    		(Pixmap) macWin);
     }
 
     Tk_Draw3DRectangle(tkwin, (Pixmap) macWin, scrollPtr->bgBorder,
-    		       scrollPtr->highlightWidth, scrollPtr->highlightWidth,
-    		       Tk_Width(tkwin) - 2*scrollPtr->highlightWidth,
-    		       Tk_Height(tkwin) - 2*scrollPtr->highlightWidth,
-    		       scrollPtr->borderWidth, scrollPtr->relief);
+	    scrollPtr->highlightWidth, scrollPtr->highlightWidth,
+	    Tk_Width(tkwin) - 2*scrollPtr->highlightWidth,
+	    Tk_Height(tkwin) - 2*scrollPtr->highlightWidth,
+	    scrollPtr->borderWidth, scrollPtr->relief);
     Tk_Fill3DRectangle(tkwin, (Pixmap) macWin, scrollPtr->bgBorder,
-    		       scrollPtr->inset, scrollPtr->inset,
-    		       Tk_Width(tkwin) - 2*scrollPtr->inset,
-    		       Tk_Height(tkwin) - 2*scrollPtr->inset, 0, TK_RELIEF_FLAT);
+	    scrollPtr->inset, scrollPtr->inset,
+	    Tk_Width(tkwin) - 2*scrollPtr->inset,
+	    Tk_Height(tkwin) - 2*scrollPtr->inset, 0, TK_RELIEF_FLAT);
+
+    /*
+     * Update values and then draw the native scrollbar over the rectangle.
+     */
 
-    /* Update values and then draw the native scrollbar over the rectangle.*/
     UpdateControlValues(scrollPtr);
 
     if (SNOW_LEOPARD_STYLE) {
-	HIThemeDrawTrack (&(msPtr->info), 0, dc.context, kHIThemeOrientationInverted);
+	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
+		kHIThemeOrientationInverted);
     } else {
-	HIThemeDrawTrack (&(msPtr->info), 0, dc.context, kHIThemeOrientationNormal);
+	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
+		kHIThemeOrientationNormal);
     }
     TkMacOSXRestoreDrawingContext(&dc);
 
     scrollPtr->flags &= ~REDRAW_PENDING;
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -240,44 +257,41 @@ TkpDisplayScrollbar(
  *----------------------------------------------------------------------
  */
 
-
-
 extern void
 TkpComputeScrollbarGeometry(
     register TkScrollbar *scrollPtr)
-                           /* Scrollbar whose geometry may have
-                           * changed. */
+				/* Scrollbar whose geometry may have
+				 * changed. */
 {
-
-   /*
-    * The code below is borrowed from tkUnixScrlbr.c but has been adjusted to
-    * account for some differences between macOS and X11. The Unix scrollbar
-    * has an arrow button on each end.  On macOS 10.6 (Snow Leopard) the
-    * scrollbars by default have both arrow buttons at the bottom or right.
-    * (There is a preferences setting to use the Unix layout, but we are not
-    * supporting that!)  On more recent versions of macOS there are no arrow
-    * buttons at all. The case of no arrow buttons can be handled as a special
-    * case of having both buttons at the end, but where scrollPtr->arrowLength
-    * happens to be zero.  To adjust for having both arrows at the same end we
-    * shift the scrollbar up by the arrowLength.
-    */
+    /*
+     * The code below is borrowed from tkUnixScrlbr.c but has been adjusted to
+     * account for some differences between macOS and X11. The Unix scrollbar
+     * has an arrow button on each end.  On macOS 10.6 (Snow Leopard) the
+     * scrollbars by default have both arrow buttons at the bottom or right.
+     * (There is a preferences setting to use the Unix layout, but we are not
+     * supporting that!)  On more recent versions of macOS there are no arrow
+     * buttons at all. The case of no arrow buttons can be handled as a special
+     * case of having both buttons at the end, but where scrollPtr->arrowLength
+     * happens to be zero.  To adjust for having both arrows at the same end we
+     * shift the scrollbar up by the arrowLength.
+     */
 
     int fieldLength;
 
     if (scrollPtr->highlightWidth < 0) {
-       scrollPtr->highlightWidth = 0;
+	scrollPtr->highlightWidth = 0;
     }
     scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
     if ([NSApp macMinorVersion] == 6) {
-      scrollPtr->arrowLength = scrollPtr->width;
+	scrollPtr->arrowLength = scrollPtr->width;
     } else {
-      scrollPtr->arrowLength = 0;
+	scrollPtr->arrowLength = 0;
     }
     fieldLength = (scrollPtr->vertical ? Tk_Height(scrollPtr->tkwin)
-           : Tk_Width(scrollPtr->tkwin))
-           - 2*(scrollPtr->arrowLength + scrollPtr->inset);
+	    : Tk_Width(scrollPtr->tkwin))
+	    - 2*(scrollPtr->arrowLength + scrollPtr->inset);
     if (fieldLength < 0) {
-       fieldLength = 0;
+	fieldLength = 0;
     }
     scrollPtr->sliderFirst = fieldLength*scrollPtr->firstFraction;
     scrollPtr->sliderLast = fieldLength*scrollPtr->lastFraction;
@@ -289,16 +303,16 @@ TkpComputeScrollbarGeometry(
      */
 
     if (scrollPtr->sliderFirst > fieldLength - MIN_SLIDER_LENGTH) {
-       scrollPtr->sliderFirst = fieldLength - MIN_SLIDER_LENGTH;
+	scrollPtr->sliderFirst = fieldLength - MIN_SLIDER_LENGTH;
     }
     if (scrollPtr->sliderFirst < 0) {
-       scrollPtr->sliderFirst = 0;
+	scrollPtr->sliderFirst = 0;
     }
     if (scrollPtr->sliderLast < scrollPtr->sliderFirst + MIN_SLIDER_LENGTH) {
-       scrollPtr->sliderLast = scrollPtr->sliderFirst + MIN_SLIDER_LENGTH;
+	scrollPtr->sliderLast = scrollPtr->sliderFirst + MIN_SLIDER_LENGTH;
     }
     if (scrollPtr->sliderLast > fieldLength) {
-       scrollPtr->sliderLast = fieldLength;
+	scrollPtr->sliderLast = fieldLength;
     }
     scrollPtr->sliderFirst += -scrollPtr->arrowLength + scrollPtr->inset;
     scrollPtr->sliderLast += scrollPtr->inset;
@@ -310,20 +324,20 @@ TkpComputeScrollbarGeometry(
      * be redisplayed.
      */
 
-      if (scrollPtr->vertical) {
-       Tk_GeometryRequest(scrollPtr->tkwin,
-              scrollPtr->width + 2*scrollPtr->inset,
-              2*(scrollPtr->arrowLength + scrollPtr->borderWidth
-              + scrollPtr->inset) + metrics.minThumbHeight);
+    if (scrollPtr->vertical) {
+	Tk_GeometryRequest(scrollPtr->tkwin,
+		scrollPtr->width + 2*scrollPtr->inset,
+		2*(scrollPtr->arrowLength + scrollPtr->borderWidth
+		+ scrollPtr->inset) + metrics.minThumbHeight);
     } else {
-       Tk_GeometryRequest(scrollPtr->tkwin,
-              2*(scrollPtr->arrowLength + scrollPtr->borderWidth
-              + scrollPtr->inset) + metrics.minThumbHeight,
-              scrollPtr->width + 2*scrollPtr->inset);
+	Tk_GeometryRequest(scrollPtr->tkwin,
+		2*(scrollPtr->arrowLength + scrollPtr->borderWidth
+		+ scrollPtr->inset) + metrics.minThumbHeight,
+		scrollPtr->width + 2*scrollPtr->inset);
     }
     Tk_SetInternalBorder(scrollPtr->tkwin, scrollPtr->inset);
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -342,9 +356,9 @@ TkpComputeScrollbarGeometry(
 
 void
 TkpDestroyScrollbar(
-		    TkScrollbar *scrollPtr)
+    TkScrollbar *scrollPtr)
 {
-    MacScrollbar *macScrollPtr = (MacScrollbar *)scrollPtr;
+    MacScrollbar *macScrollPtr = (MacScrollbar *) scrollPtr;
 
     if (macScrollPtr->troughGC != None) {
 	Tk_FreeGC(scrollPtr->display, macScrollPtr->troughGC);
@@ -353,15 +367,15 @@ TkpDestroyScrollbar(
 	Tk_FreeGC(scrollPtr->display, macScrollPtr->copyGC);
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
  * TkpConfigureScrollbar --
  *
- *	This procedure is called after the generic code has finished
- *	processing configuration options, in order to configure platform
- *	specific options.  There are no such option on the Mac, however.
+ *	This procedure is called after the generic code has finished processing
+ *	configuration options, in order to configure platform specific options.
+ *	There are no such option on the Mac, however.
  *
  * Results:
  *	None.
@@ -374,11 +388,11 @@ TkpDestroyScrollbar(
 
 void
 TkpConfigureScrollbar(
-		      register TkScrollbar *scrollPtr)
+    register TkScrollbar *scrollPtr)
 {
-
+    /* empty */
 }
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -403,29 +417,28 @@ TkpScrollbarPosition(
 				/* Scrollbar widget record. */
     int x, int y)		/* Coordinates within scrollPtr's window. */
 {
-
-   /*
-   * The code below is borrowed from tkUnixScrlbr.c and needs no adjustment
-   * since it does not involve the arrow buttons.
-   */
+    /*
+     * The code below is borrowed from tkUnixScrlbr.c and needs no adjustment
+     * since it does not involve the arrow buttons.
+     */
 
     int length, width, tmp;
     register const int inset = scrollPtr->inset;
 
     if (scrollPtr->vertical) {
-  	length = Tk_Height(scrollPtr->tkwin);
-  	width = Tk_Width(scrollPtr->tkwin);
+	length = Tk_Height(scrollPtr->tkwin);
+	width = Tk_Width(scrollPtr->tkwin);
     } else {
-  	tmp = x;
-  	x = y;
-  	y = tmp;
-  	length = Tk_Width(scrollPtr->tkwin);
-  	width = Tk_Height(scrollPtr->tkwin);
+	tmp = x;
+	x = y;
+	y = tmp;
+	length = Tk_Width(scrollPtr->tkwin);
+	width = Tk_Height(scrollPtr->tkwin);
     }
 
     if (x < inset || x >= width - inset ||
-	y < inset || y >= length - inset) {
-  	return OUTSIDE;
+	    y < inset || y >= length - inset) {
+	return OUTSIDE;
     }
 
     /*
@@ -436,31 +449,34 @@ TkpScrollbarPosition(
      */
 
     if (y < scrollPtr->sliderFirst + scrollPtr->arrowLength) {
-  	return TOP_GAP;
-      }
-      if (y < scrollPtr->sliderLast) {
-  	return SLIDER;
-      }
-      if (y < length - (2*scrollPtr->arrowLength + inset)) {
-  	return BOTTOM_GAP;
-      }
-      /* On systems newer than 10.6 we have already returned. */
-      if (y < length - (scrollPtr->arrowLength + inset)) {
-  	return TOP_ARROW;
-      }
-      return BOTTOM_ARROW;
-}
+	return TOP_GAP;
+    }
+    if (y < scrollPtr->sliderLast) {
+	return SLIDER;
+    }
+    if (y < length - (2*scrollPtr->arrowLength + inset)) {
+	return BOTTOM_GAP;
+    }
 
+    /*
+     * On systems newer than 10.6 we have already returned.
+     */
+
+    if (y < length - (scrollPtr->arrowLength + inset)) {
+	return TOP_ARROW;
+    }
+    return BOTTOM_ARROW;
+}
+
 /*
  *--------------------------------------------------------------
  *
  * UpdateControlValues --
  *
- *	This procedure updates the Macintosh scrollbar control to
- *	display the values defined by the Tk scrollbar. This is the
- *	key interface to the Mac-native  scrollbar; the Unix bindings
- *	drive scrolling in the Tk window and all the Mac scrollbar has
- *	to do is redraw itself.
+ *	This procedure updates the Macintosh scrollbar control to display the
+ *	values defined by the Tk scrollbar. This is the key interface to the
+ *	Mac-native scrollbar; the Unix bindings drive scrolling in the Tk
+ *	window and all the Mac scrollbar has to do is redraw itself.
  *
  * Results:
  *	None.
@@ -473,20 +489,21 @@ TkpScrollbarPosition(
 
 static void
 UpdateControlValues(
-		    TkScrollbar *scrollPtr)		/* Scrollbar data struct. */
+    TkScrollbar *scrollPtr)		/* Scrollbar data struct. */
 {
-    MacScrollbar *msPtr = (MacScrollbar *)scrollPtr;
+    MacScrollbar *msPtr = (MacScrollbar *) scrollPtr;
     Tk_Window tkwin = scrollPtr->tkwin;
     MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
     double dViewSize;
-    HIRect  contrlRect;
+    HIRect contrlRect;
     short width, height;
 
     NSView *view = TkMacOSXDrawableView(macWin);
     CGFloat viewHeight = [view bounds].size.height;
     NSRect frame;
+
     frame = NSMakeRect(macWin->xOff, macWin->yOff, Tk_Width(tkwin),
-		       Tk_Height(tkwin));
+	    Tk_Height(tkwin));
     frame = NSInsetRect(frame, scrollPtr->inset, scrollPtr->inset);
     frame.origin.y = viewHeight - (frame.origin.y + frame.size.height);
 
@@ -503,9 +520,9 @@ UpdateControlValues(
 
     msPtr->info.bounds = contrlRect;
     if (scrollPtr->vertical) {
-      msPtr->info.attributes &= ~kThemeTrackHorizontal;
+	msPtr->info.attributes &= ~kThemeTrackHorizontal;
     } else {
-      msPtr->info.attributes |= kThemeTrackHorizontal;
+	msPtr->info.attributes |= kThemeTrackHorizontal;
     }
 
     /*
@@ -518,69 +535,73 @@ UpdateControlValues(
      * the view area.
      */
 
-    double maximum = 100,  factor;
-    factor = RangeToFactor(maximum);
-    dViewSize = (scrollPtr->lastFraction - scrollPtr->firstFraction)
-	* factor;
-    msPtr->info.max =  MIN_SCROLLBAR_VALUE +
-	factor - dViewSize;
+    double maximum = 100, factor = RangeToFactor(maximum);
+
+    dViewSize = (scrollPtr->lastFraction - scrollPtr->firstFraction) * factor;
+    msPtr->info.max = MIN_SCROLLBAR_VALUE + factor - dViewSize;
     msPtr->info.trackInfo.scrollbar.viewsize = dViewSize;
     if (scrollPtr->vertical) {
-      if (SNOW_LEOPARD_STYLE) {
-	msPtr->info.value = factor * scrollPtr->firstFraction;
-      } else {
-	msPtr->info.value = msPtr->info.max - factor * scrollPtr->firstFraction;
-      }
+	if (SNOW_LEOPARD_STYLE) {
+	    msPtr->info.value = factor * scrollPtr->firstFraction;
+	} else {
+	    msPtr->info.value = msPtr->info.max -
+		    factor * scrollPtr->firstFraction;
+	}
     } else {
-	 msPtr->info.value =  MIN_SCROLLBAR_VALUE + factor * scrollPtr->firstFraction;
+	msPtr->info.value = MIN_SCROLLBAR_VALUE +
+		factor * scrollPtr->firstFraction;
     }
 
-    if((scrollPtr->firstFraction <= 0.0 && scrollPtr->lastFraction >= 1.0)
-       || height <= metrics.minHeight) {
+    if ((scrollPtr->firstFraction <= 0.0 && scrollPtr->lastFraction >= 1.0)
+	    || height <= metrics.minHeight) {
     	msPtr->info.enableState = kThemeTrackHideTrack;
     } else {
         msPtr->info.enableState = kThemeTrackActive;
-    	msPtr->info.attributes = kThemeTrackShowThumb |  kThemeTrackThumbRgnIsNotGhost;
+    	msPtr->info.attributes =
+		kThemeTrackShowThumb | kThemeTrackThumbRgnIsNotGhost;
     }
-
 }
-
+
 /*
  *--------------------------------------------------------------
  *
  * ScrollbarEvent --
  *
- *	This procedure is invoked in response to <ButtonPress>, <ButtonRelease>,
- *      <EnterNotify>, and <LeaveNotify> events. The Scrollbar appearance is
- *      modified for each event.
+ *	This procedure is invoked in response to <ButtonPress>,
+ *      <ButtonRelease>, <EnterNotify>, and <LeaveNotify> events.  The
+ *      Scrollbar appearance is modified for each event.
  *
  *--------------------------------------------------------------
  */
 
 static int
-ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr)
+ScrollbarEvent(
+    TkScrollbar *scrollPtr,
+    XEvent *eventPtr)
 {
-    MacScrollbar *msPtr = (MacScrollbar *)scrollPtr;
-
-    /* The pressState does not indicate whether the moused button was
-     * pressed at some location in the Scrollbar.  Rather, it indicates
-     * that the scrollbar should appear as if it were pressed in that
-     * location. The standard Mac behavior is that once the button is
-     * pressed inside the Scrollbar the appearance should not change until
-     * the button is released, even if the mouse moves outside of the
-     * scrollbar.  However, if the mouse lies over the scrollbar but the
-     * button is not pressed then the appearance should be the same as if
-     * the button had been pressed on the slider, i.e. kThemeThumbPressed.
-     * See the file Appearance.r, or HIToolbox.bridgesupport on 10.14.
+    MacScrollbar *msPtr = (MacScrollbar *) scrollPtr;
+
+    /*
+     * The pressState does not indicate whether the moused button was pressed
+     * at some location in the Scrollbar.  Rather, it indicates that the
+     * scrollbar should appear as if it were pressed in that location. The
+     * standard Mac behavior is that once the button is pressed inside the
+     * Scrollbar the appearance should not change until the button is released,
+     * even if the mouse moves outside of the scrollbar.  However, if the mouse
+     * lies over the scrollbar but the button is not pressed then the
+     * appearance should be the same as if the button had been pressed on the
+     * slider, i.e. kThemeThumbPressed.  See the file Appearance.r, or
+     * HIToolbox.bridgesupport on 10.14.
      */
 
     if (eventPtr->type == ButtonPress) {
 	msPtr->buttonDown = true;
 	UpdateControlValues(scrollPtr);
+
 	int where = TkpScrollbarPosition(scrollPtr,
-					 eventPtr->xbutton.x,
-					 eventPtr->xbutton.y);
-	switch(where) {
+		eventPtr->xbutton.x, eventPtr->xbutton.y);
+
+	switch (where) {
 	case OUTSIDE:
 	    msPtr->info.trackInfo.scrollbar.pressState = 0;
 	    break;
@@ -591,14 +612,20 @@ ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr)
 	    msPtr->info.trackInfo.scrollbar.pressState = kThemeThumbPressed;
 	    break;
 	case BOTTOM_GAP:
-	    msPtr->info.trackInfo.scrollbar.pressState = kThemeBottomTrackPressed;
+	    msPtr->info.trackInfo.scrollbar.pressState =
+		    kThemeBottomTrackPressed;
 	    break;
 	case TOP_ARROW:
-	    /* This looks wrong and the docs say it is wrong but it works. */
-	    msPtr->info.trackInfo.scrollbar.pressState = kThemeTopInsideArrowPressed;
+	    /*
+	     * This looks wrong and the docs say it is wrong but it works.
+	     */
+
+	    msPtr->info.trackInfo.scrollbar.pressState =
+		    kThemeTopInsideArrowPressed;
 	    break;
 	case BOTTOM_ARROW:
-	    msPtr->info.trackInfo.scrollbar.pressState = kThemeBottomOutsideArrowPressed;
+	    msPtr->info.trackInfo.scrollbar.pressState =
+		    kThemeBottomOutsideArrowPressed;
 	    break;
 	}
     }
@@ -622,9 +649,7 @@ ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr)
     }
     return TCL_OK;
 }
-
-
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -645,8 +670,8 @@ ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr)
 
 static void
 ScrollbarEventProc(
-		   ClientData clientData,	/* Information about window. */
-		   XEvent *eventPtr)		/* Information about event. */
+    ClientData clientData,	/* Information about window. */
+    XEvent *eventPtr)		/* Information about event. */
 {
     TkScrollbar *scrollPtr = clientData;
 
@@ -668,7 +693,7 @@ ScrollbarEventProc(
 	TkScrollbarEventProc(clientData, eventPtr);
     }
 }
-
+
 /*
  * Local Variables:
  * mode: objc