4e4f5951fed8f4d923dcbbc313b3596c62374091
tdreszer
  Mon Jun 25 12:13:22 2012 -0700
Next batch of many checkins as dictated by Jim.  Formatting space after if and limiting lines to 100 chars.  Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history.  None of these changes should affect executables in any way.  Only affect is to my sanity and Jim's.
diff --git src/lib/cheapcgi.c src/lib/cheapcgi.c
index dd05761..3b5ccc3 100644
--- src/lib/cheapcgi.c
+++ src/lib/cheapcgi.c
@@ -111,31 +111,32 @@
 /* Return IP address of client (or "unknown"). */
 {
 static char *dunno = "unknown";
 char *remoteAddr = getenv("REMOTE_ADDR");
 if (remoteAddr == NULL)
     remoteAddr = dunno;
 return remoteAddr;
 }
 
 char *cgiUserAgent()
 /* Return remote user agent (HTTP_USER_AGENT) or NULL if remote user agent is not known */
 {
 return getenv("HTTP_USER_AGENT");
 }
 
-enum browserType cgiClientBrowser(char **browserQualifier, enum osType *clientOs, char **clientOsQualifier)
+enum browserType cgiClientBrowser(char **browserQualifier, enum osType *clientOs,
+                                  char **clientOsQualifier)
 /* Return client browser type determined from (HTTP_USER_AGENT)
    Optionally requuest the additional info about the client */
 {
 // WARNING: The specifics of the HTTP_USER_AGENT vary widely.
 //          This has only been tested on a few cases.
 static enum browserType clientBrowser = btUnknown;
 static enum browserType clientOsType  = osUnknown;
 static char *clientBrowserExtra       = NULL;
 static char *clientOsExtra            = NULL;
 
 if (clientBrowser == btUnknown)
     {
     char *userAgent = cgiUserAgent();
     if (userAgent != NULL)
         {
@@ -1221,31 +1222,32 @@
 /* Prefix for shadow variable set with boolean variables. */
 {
 return "boolshad.";
 }
 #define BOOLSHAD_EXTRA "class='cbShadow'"
 
 boolean cgiBooleanDefined(char *name)
 /* Return TRUE if boolean variable is defined (by
  * checking for shadow. */
 {
 char buf[256];
 safef(buf, sizeof(buf), "%s%s", cgiBooleanShadowPrefix(), name);
 return cgiVarExists(buf);
 }
 
-static void cgiMakeCheckBox2Bool(char *name, boolean checked, boolean enabled, char *id, char *moreHtml)
+static void cgiMakeCheckBox2Bool(char *name, boolean checked, boolean enabled,
+                                 char *id, char *moreHtml)
 /* Make check box - designed to be called by the variously overloaded
  * cgiMakeCheckBox functions, and should NOT be called directly.
  * moreHtml: optional additional html like javascript call or mouseover msg (may be NULL)
  * id: button id (may be NULL)
  * Also make a shadow hidden variable and support 2 boolean states:
  *    checked/unchecked and enabled/disabled. */
 {
 char buf[256], idBuf[256];
 
 if(id)
     safef(idBuf, sizeof(idBuf), " id=\"%s\"", id);
 else
     idBuf[0] = 0;
 
 printf("<INPUT TYPE=CHECKBOX NAME=\"%s\"%s VALUE=on %s%s%s>", name, idBuf,
@@ -1291,67 +1293,68 @@
 cgiMakeCheckBox2Bool(name, checked, TRUE, NULL, NULL);
 }
 
 void cgiMakeCheckBoxJS(char *name, boolean checked, char *javascript)
 /* Make check box with javascript. */
 {
 cgiMakeCheckBox2Bool(name,checked,TRUE,NULL,javascript);
 }
 
 void cgiMakeCheckBoxIdAndJS(char *name, boolean checked, char *id, char *javascript)
 /* Make check box with ID and javascript. */
 {
 cgiMakeCheckBox2Bool(name,checked,TRUE,id,javascript);
 }
 
-void cgiMakeCheckBoxFourWay(char *name, boolean checked, boolean enabled, char *id, char *classes, char *moreHtml)
+void cgiMakeCheckBoxFourWay(char *name, boolean checked, boolean enabled, char *id,
+                            char *classes, char *moreHtml)
 /* Make check box - with fourWay functionality (checked/unchecked by enabled/disabled)
  * Also makes a shadow hidden variable that supports the 2 boolean states. */
 {
 char shadName[256];
 
 printf("<INPUT TYPE=CHECKBOX NAME='%s'", name);
 if(id)
     printf(" id='%s'", id);
 if(checked)
     printf(" CHECKED");
 if(!enabled)
     {
     if (findWordByDelimiter("disabled",' ', classes) == NULL) // fauxDisabled ?
         printf(" DISABLED");
     }
 if(classes)
     printf(" class='%s'",classes);
 if(moreHtml)
     printf(" %s",moreHtml);
 printf(">");
 
 // The hidden var needs to hold the 4way state
 safef(shadName, sizeof(shadName), "%s%s", cgiBooleanShadowPrefix(), name);
-cgiMakeHiddenVarWithExtra(shadName, ( enabled ? "0" : (checked ? "-1" : "-2")),BOOLSHAD_EXTRA); // Doesn't need enabled/checked!
+cgiMakeHiddenVarWithExtra(shadName, ( enabled ? "0" : (checked ? "-1" : "-2")),BOOLSHAD_EXTRA);
 }
 
 
 void cgiMakeHiddenBoolean(char *name, boolean on)
 /* Make hidden boolean variable. Also make a shadow hidden variable so we
  * can distinguish between variable not present and
  * variable set to false. */
 {
 char buf[256];
 cgiMakeHiddenVar(name, on ? "on" : "off");
 safef(buf, sizeof(buf), "%s%s", cgiBooleanShadowPrefix(), name);
-cgiMakeHiddenVarWithExtra(buf, "1",BOOLSHAD_EXTRA);  // shouldn't this be "0" or "off" ?   Probably any non-"on" will work.
+cgiMakeHiddenVarWithExtra(buf, "1",BOOLSHAD_EXTRA);
 }
 
 void cgiMakeTextArea(char *varName, char *initialVal, int rowCount, int columnCount)
 /* Make a text area with area rowCount X columnCount and with text: intialVal */
 {
 cgiMakeTextAreaDisableable(varName, initialVal, rowCount, columnCount, FALSE);
 }
 
 void cgiMakeTextAreaDisableable(char *varName, char *initialVal, int rowCount, int columnCount, boolean disabled)
 /* Make a text area that can be disabled. The rea has rowCount X
  * columnCount and with text: intialVal */
 {
 printf("<TEXTAREA NAME=\"%s\" ROWS=%d COLS=%d %s>%s</TEXTAREA>", varName,
        rowCount, columnCount, disabled ? "DISABLED" : "",
        (initialVal != NULL ? initialVal : ""));
@@ -1380,174 +1383,186 @@
  * is zero it's calculated from initialVal size. */
 {
 cgiMakeOnKeypressTextVar(varName, initialVal, charSize, NULL);
 }
 
 void cgiMakeTextVarWithExtraHtml(char *varName, char *initialVal, int width, char *extra)
 /* Make a text control filled with initial value. */
 {
 if (initialVal == NULL)
     initialVal = "";
 if(width==0)
     width=strlen(initialVal)*10;
 if(width==0)
     width = 100;
 
-printf("<INPUT TYPE=TEXT class='inputBox' NAME=\"%s\" style='width: %dpx' VALUE=\"%s\"", varName,width, initialVal);
+printf("<INPUT TYPE=TEXT class='inputBox' NAME=\"%s\" style='width: %dpx' VALUE=\"%s\"",
+       varName,width, initialVal);
 if (isNotEmpty(extra))
     printf(" %s",extra);
 printf(">\n");
 }
 
-
 void cgiMakeIntVar(char *varName, int initialVal, int maxDigits)
 /* Make a text control filled with initial value.  */
 {
 if (maxDigits == 0) maxDigits = 4;
 
 printf("<INPUT TYPE=TEXT NAME=\"%s\" SIZE=%d VALUE=%d>", varName,
 	maxDigits, initialVal);
 }
 
-void cgiMakeIntVarInRange(char *varName, int initialVal, char *title, int width, char *min, char *max)
+void cgiMakeIntVarInRange(char *varName, int initialVal, char *title, int width,
+                          char *min, char *max)
 /* Make a integer control filled with initial value.
    If min and/or max are non-NULL will enforce range
    Requires utils.js jQuery.js and inputBox class */
 {
 if(width==0)
     {
     if(max)
         width=strlen(max)*10;
     else
         {
         int sz=initialVal+1000;
         if(min)
             sz=atoi(min) + 1000;
         width = 10;
         while(sz/=10)
             width+=10;
         }
     }
 if (width < 65)
     width = 65;
 
-printf("<INPUT TYPE=TEXT class='inputBox' name=\"%s\" style='width: %dpx' value=%d",varName,width,initialVal);
-printf(" onChange='return validateInt(this,%s,%s);'",(min?min:"\"null\""),(max?max:"\"null\""));
+printf("<INPUT TYPE=TEXT class='inputBox' name=\"%s\" style='width: %dpx' value=%d",
+       varName,width,initialVal);
+printf(" onChange='return validateInt(this,%s,%s);'",
+       (min ? min : "\"null\""),(max ? max : "\"null\""));
 if(title)
     printf(" title='%s'",title);
 printf(">\n");
 }
-void cgiMakeIntVarWithLimits(char *varName, int initialVal, char *title, int width, int min, int max)
+
+void cgiMakeIntVarWithLimits(char *varName, int initialVal, char *title, int width,
+                             int min, int max)
 {
 char minLimit[20];
 char maxLimit[20];
 char *minStr=NULL;
 char *maxStr=NULL;
 if(min != NO_VALUE)
     {
     safef(minLimit,sizeof(minLimit),"%d",min);
     minStr = minLimit;
     }
 if(max != NO_VALUE)
     {
     safef(maxLimit,sizeof(maxLimit),"%d",max);
     maxStr = maxLimit;
     }
 cgiMakeIntVarInRange(varName,initialVal,title,width,minStr,maxStr);
 }
+
 void cgiMakeIntVarWithMin(char *varName, int initialVal, char *title, int width, int min)
 {
 char minLimit[20];
 char *minStr=NULL;
 if(min != NO_VALUE)
     {
     safef(minLimit,sizeof(minLimit),"%d",min);
     minStr = minLimit;
     }
 cgiMakeIntVarInRange(varName,initialVal,title,width,minStr,NULL);
 }
+
 void cgiMakeIntVarWithMax(char *varName, int initialVal, char *title, int width, int max)
 {
 char maxLimit[20];
 char *maxStr=NULL;
 if(max != NO_VALUE)
     {
     safef(maxLimit,sizeof(maxLimit),"%d",max);
     maxStr = maxLimit;
     }
 cgiMakeIntVarInRange(varName,initialVal,title,width,NULL,maxStr);
 }
 
 void cgiMakeDoubleVar(char *varName, double initialVal, int maxDigits)
 /* Make a text control filled with initial floating-point value.  */
 {
 if (maxDigits == 0) maxDigits = 4;
 
 printf("<INPUT TYPE=TEXT NAME=\"%s\" SIZE=%d VALUE=%g>", varName,
 	maxDigits, initialVal);
 }
 
-void cgiMakeDoubleVarInRange(char *varName, double initialVal, char *title, int width, char *min, char *max)
+void cgiMakeDoubleVarInRange(char *varName, double initialVal, char *title, int width,
+                             char *min, char *max)
 /* Make a floating point control filled with initial value.
    If min and/or max are non-NULL will enforce range
    Requires utils.js jQuery.js and inputBox class */
 {
 if(width==0)
     {
     if(max)
         width=strlen(max)*10;
     }
 if (width < 65)
     width = 65;
 
-printf("<INPUT TYPE=TEXT class='inputBox' name=\"%s\" style='width: %dpx' value=%g",varName,width,initialVal);
-printf(" onChange='return validateFloat(this,%s,%s);'",(min?min:"\"null\""),(max?max:"\"null\""));
+printf("<INPUT TYPE=TEXT class='inputBox' name=\"%s\" style='width: %dpx' value=%g",
+       varName,width,initialVal);
+printf(" onChange='return validateFloat(this,%s,%s);'",
+       (min ? min : "\"null\""),(max ? max : "\"null\""));
 if(title)
     printf(" title='%s'",title);
 printf(">\n");
 }
 
-void cgiMakeDoubleVarWithLimits(char *varName, double initialVal, char *title, int width, double min, double max)
+void cgiMakeDoubleVarWithLimits(char *varName, double initialVal, char *title, int width,
+                                double min, double max)
 {
 char minLimit[20];
 char maxLimit[20];
 char *minStr=NULL;
 char *maxStr=NULL;
 if((int)min != NO_VALUE)
     {
     safef(minLimit,sizeof(minLimit),"%g",min);
     minStr = minLimit;
     }
 if((int)max != NO_VALUE)
     {
     safef(maxLimit,sizeof(maxLimit),"%g",max);
     maxStr = maxLimit;
     }
 cgiMakeDoubleVarInRange(varName,initialVal,title,width,minStr,maxStr);
 }
 
 void cgiMakeDoubleVarWithMin(char *varName, double initialVal, char *title, int width, double min)
 {
 char minLimit[20];
 char *minStr=NULL;
 if((int)min != NO_VALUE)
     {
     safef(minLimit,sizeof(minLimit),"%g",min);
     minStr = minLimit;
     }
 cgiMakeDoubleVarInRange(varName,initialVal,title,width,minStr,NULL);
 }
+
 void cgiMakeDoubleVarWithMax(char *varName, double initialVal, char *title, int width, double max)
 {
 char maxLimit[20];
 char *maxStr=NULL;
 if((int)max != NO_VALUE)
     {
     safef(maxLimit,sizeof(maxLimit),"%g",max);
     maxStr = maxLimit;
     }
 cgiMakeDoubleVarInRange(varName,initialVal,title,width,NULL,maxStr);
 }
 
 void cgiMakeDropListClassWithStyleAndJavascript(char *name, char *menu[],
     int menuSize, char *checked, char *class, char *style,char *javascript)
 /* Make a drop-down list with names, text class, style and javascript. */
@@ -1575,32 +1590,31 @@
     }
 printf("</SELECT>\n");
 }
 
 void cgiMakeDropListClassWithStyle(char *name, char *menu[],
     int menuSize, char *checked, char *class, char *style)
 /* Make a drop-down list with names, text class and style. */
 {
     cgiMakeDropListClassWithStyleAndJavascript(name,menu,menuSize,checked,class,style,"");
 }
 
 void cgiMakeDropListClass(char *name, char *menu[],
 	int menuSize, char *checked, char *class)
 /* Make a drop-down list with names. */
 {
-    cgiMakeDropListClassWithStyle(name, menu, menuSize, checked,
-                                        class, NULL);
+cgiMakeDropListClassWithStyle(name, menu, menuSize, checked, class, NULL);
 }
 
 void cgiMakeDropList(char *name, char *menu[], int menuSize, char *checked)
 /* Make a drop-down list with names.
  * uses style "normalText" */
 {
     cgiMakeDropListClass(name, menu, menuSize, checked, "normalText");
 }
 
 char *cgiMultListShadowPrefix()
 /* Prefix for shadow variable set with multi-select inputs. */
 {
 return "multishad.";
 }
 
@@ -1676,36 +1690,41 @@
     {
     printf("<SELECT NAME=\"%s\">\n", name);
     }
 
 for (i=0; i<menuSize; ++i)
     {
     if (sameWord(values[i], checked))
         selString = " SELECTED";
     else
         selString = "";
     printf("<OPTION%s VALUE=\"%s\">%s</OPTION>\n", selString, values[i], menu[i]);
     }
 printf("</SELECT>\n");
 }
 
-char *cgiMakeSelectDropList(boolean multiple, char *name, struct slPair *valsAndLabels,char *selected, char *anyAll,char *extraClasses, char *extraHtml)
-// Returns allocated string of HTML defining a drop-down select (if multiple, REQUIRES ui-dropdownchecklist.js)
-// In valsAndLabels, val (pair->name) must be filled in but label (pair->val) may be NULL.
-// selected, if not NULL is a val found in the valsAndLabels (multiple then comma delimited list).  If null and anyAll not NULL, that will be selected
-// anyAll, if not NULL is the string for an initial option.  It can contain val and label, delimited by a comma
-// extraHtml, if not NULL contains id, javascript calls and style.  It does NOT contain class definitions
+char *cgiMakeSelectDropList(boolean multiple, char *name, struct slPair *valsAndLabels,
+                            char *selected, char *anyAll,char *extraClasses, char *extraHtml)
+// Returns allocated string of HTML defining a drop-down select
+// (if multiple, REQUIRES ui-dropdownchecklist.js)
+// valsAndLabels: val (pair->name) must be filled in but label (pair->val) may be NULL.
+// selected: if not NULL is a val found in the valsAndLabels (multiple then comma delimited list).
+//           If null and anyAll not NULL, that will be selected
+// anyAll: if not NULL is the string for an initial option. It can contain val and label,
+//         delimited by a comma
+// extraHtml: if not NULL contains id, javascript calls and style.
+//            It does NOT contain class definitions
 {
 struct dyString *output = dyStringNew(1024);
 boolean checked = FALSE;
 
 dyStringPrintf(output,"<SELECT name='%s'",name);
 if (multiple)
     dyStringAppend(output," MULTIPLE");
 if (extraClasses != NULL)
     dyStringPrintf(output," class='%s%s'",extraClasses,(multiple?" filterBy":""));
 else if (multiple)
     dyStringAppend(output," class='filterBy'");
 
 if (extraHtml != NULL)
     dyStringPrintf(output," %s",extraHtml);
 dyStringAppend(output,">\n");
@@ -1797,31 +1816,30 @@
     printf(" NAME='%s'", name);
 if (extra)
     printf("%s", extra);
 printf(">\n");
 for (i=0; i<count; ++i)
     {
     if (sameWord(values[i], selected))
         selString = " SELECTED";
     else
         selString = "";
     printf("<OPTION%s value='%s'>%s</OPTION>\n", selString, values[i], text[i]);
     }
 printf("</SELECT>\n");
 }
 
-
 void cgiMakeHiddenVarWithExtra(char *varName, char *string,char *extra)
 /* Store string in hidden input for next time around. */
 {
 printf("<INPUT TYPE=HIDDEN NAME='%s' VALUE='%s'", varName, string);
 if(extra)
     printf(" %s>\n",extra);
 else
     puts(">");
 }
 
 void cgiContinueHiddenVar(char *varName)
 /* Write CGI var back to hidden input for next time around. */
 {
 if (cgiVarExists(varName))
     cgiMakeHiddenVar(varName, cgiString(varName));
@@ -2074,69 +2092,19 @@
     hashFree(&cookieHash);
 cookieHash = NULL;
 cookieList = NULL;
 }
 
 void cgiDown(float lines)
 // Drop down a certain number of lines (may be fractional)
 {
 printf("<div style='height:%fem;'></div>\n",lines);
 }
 
 char *commonCssStyles()
 /* Returns a string of common CSS styles */
 {
 // Contents currently is OBSOLETE as these have been moved to HGStyle.css
-// However, don't loose this function call yet, as it may have future uses.
-return "";
-#ifdef OMIT
-static boolean commonStylesWritten = FALSE;
-if(commonStylesWritten)
+// TODO: remove all traces (from web.c, hgTracks, hgTables) as this funtion does nothing.
     return "";
-commonStylesWritten = TRUE;
-
-struct dyString *style = newDyString(256);
-
-dyStringPrintf(style,"\n<style type='text/css'>\n");
-dyStringPrintf(style,".ghost {background-color:%s;}\n",COLOR_BG_GHOST);
-dyStringPrintf(style,".pale {background-color:%s;}\n",COLOR_BG_PALE);
-
-// These are for dreagReorder: both in imageV2 and in hgTrackUi subtrack list
-dyStringPrintf(style,".trDrag {background-color:%s;}\n",COLOR_LTGREEN);
-dyStringPrintf(style,".dragHandle {cursor: s-resize;}\n");
-
-// These are for imageV2 sideButtons:
-dyStringPrintf(style,".btn  {border-style:outset; background-color:%s; border-color:%s;}\n",COLOR_LTGREY,COLOR_DARKGREY);
-dyStringPrintf(style,".btnN {border-width:1px 1px 1px 1px; margin:1px 1px 0px 1px;}\n"); // connect none
-dyStringPrintf(style,".btnU {border-width:0px 1px 1px 1px; margin:0px 1px 0px 1px;}\n"); // connect up
-dyStringPrintf(style,".btnD {border-width:1px 1px 0px 1px; margin:1px 1px 0px 1px;}\n"); // connect down
-dyStringPrintf(style,".btnL {border-width:0px 1px 0px 1px; margin:0px 1px 0px 1px;}\n"); // connect linear
-dyStringPrintf(style,".btnBlue {background-color:#91B3E6; border-color:%s;}\n",COLOR_BLUE_BUTTON);
-
-// Common boxes
-dyStringPrintf(style,".inputBox {border: 2px inset %s;}\n",COLOR_LTGREY);
-dyStringPrintf(style,".greenRoof {border-top: 3px groove %s;}\n",COLOR_DARKGREEN);
-//dyStringPrintf(style,".greenFloor {border-bottom: 3px ridge %s;}\n",COLOR_DARKGREEN);      // Unused
-//dyStringPrintf(style,".hiddenRoof {border-top: 0px solid %s;}\n",COLOR_BG_ALTDEFAULT);     // Doesn't work
-//dyStringPrintf(style,".hiddenFloor {border-bottom: 0px solid %s;}\n",COLOR_BG_ALTDEFAULT); // Doesn't work
-dyStringPrintf(style,".greenBox {border: 5px outset %s;}\n",COLOR_DARKGREEN); // Matrix
-dyStringPrintf(style,".blueBox {border: 4px inset %s;}\n",COLOR_DARKBLUE);    // cfg box
-dyStringPrintf(style,".redBox {border: 3px ridge %s; background:Beige; padding:10px; margin:10px; text-align:left;}\n",COLOR_RED); // Special alert
-
-// Experiments with squeezing giant matrices
-//dyStringPrintf(style,".slantUp {-moz-transform:rotate(-75deg); -moz-transform-origin: bottom left; -webkit-transform:rotate(-75deg); -webkit-transform-origin: bottom left; white-space:nowrap; position:relative;left: 16px; filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3)}\n");
-//dyStringPrintf(style,".slantDn {-moz-transform:rotate( 75deg); -moz-transform-origin: top left;    -webkit-transform:rotate( 75deg); -webkit-transform-origin: top left;    white-space:nowrap; position:relative;left: 16px; filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3)}\n");
-//dyStringPrintf(style,".rotate90 {-webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg);}\n");
-
-dyStringPrintf(style,".hintCol {font-size:70%%; line-height:80%%; border-style: hidden; background-color:%s;}\n",COLOR_BG_ALTDEFAULT);
-dyStringPrintf(style,".hintRow {font-size:70%%; line-height:80%%; border-style: hidden; background-color:%s;}\n",COLOR_BG_ALTDEFAULT);
-//dyStringPrintf(style,".halfVis {opacity: 0.5; filters.alpha.opacity=50;}\n");   // not ready for prime time because ff and ie can't agree
-
-// waitMask allows waiting on long running javascript using utils.js::waitOnFunction
-dyStringPrintf(style,".waitMask {display: none; cursor: wait; z-index: 9999; position: absolute; top: 0; left: 0; height: 100%%; width: 100%%; background-color: #fff; opacity: 0;}\n");
-dyStringPrintf(style,".inOutButton {height:24px; width:24px; border-style: outset;}\n"); // A [+][-] button can be toggled by waitOnFunction during long running scripts
-
-dyStringPrintf(style,"</style>\n");
-return dyStringCannibalize(&style);
-#endif///def OMIT
 }