87b7884a455030761304f18056a4e8a265b8cfaa
Merge parents 79e1e2a 953048f
kate
  Fri Jan 8 09:35:47 2021 -0800
Resolving merge conflict

diff --cc src/hg/hgTracks/hgTracks.c
index c4ac532,bee8a93..dc97251
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@@ -8622,45 -8626,42 +8624,56 @@@
  	hPrintf("<CENTER>");
  	}
  
  
      /* Make line that says position. */
  	{
  	char buf[256];
  	char *survey = cfgOptionEnv("HGDB_SURVEY", "survey");
  	char *surveyLabel = cfgOptionEnv("HGDB_SURVEY_LABEL", "surveyLabel");
  	    char *javascript = "document.location = '/cgi-bin/hgTracks?db=' + document.TrackForm.db.options[document.TrackForm.db.selectedIndex].value;";
  	    if (containsStringNoCase(database, "zoo"))
  		{
  		hPuts("Organism ");
  		printAssemblyListHtmlExtra(database, "change", javascript);
  		}
+         if (sameString(virtModeType, "default"))
+             {
+             hButtonMaybePressed("hgTracksConfigMultiRegionPage", "multi-region", 
+                     "Configure view in multi-region display mode",
+                     "popUpHgt.hgTracks('multi-region config'); return false;", FALSE);
+             }
+         else
+             {
+             hButtonWithMsg("hgt.exitMultiRegion", "exit multi-region", "Exit multi-region display mode");
+             }
+         hPrintf(" ");
  
 +        /* Multi-region button on position line */
 +        if (sameString(virtModeType, "default"))
 +            {
 +            hButtonMaybePressed("hgTracksConfigMultiRegionPage", "multi-region",
 +                    "Configure view in multi-region display mode",
 +                    "popUpHgt.hgTracks('multi-region config'); return false;", FALSE);
 +            }
 +        else
 +            {
 +            hButtonWithMsg("hgt.exitMultiRegion", "exit multi-region", 
 +                                "Exit multi-region display mode");
 +            }
 +        hPrintf(" ");
 +
  	if (virtualSingleChrom()) // DISGUISE VMODE
  	    safef(buf, sizeof buf, "%s", windowsSpanPosition());
  	else
  	    safef(buf, sizeof buf, "%s:%ld-%ld", virtChromName, virtWinStart+1, virtWinEnd);
  	
  	position = cloneString(buf);
          char *pressedClass = "", *showVirtRegions = "";
          if (differentString(virtModeType, "default"))
              {
              pressedClass = "pressed";
              showVirtRegions = "show multi-region position ranges and ";
              }
  	hPrintf("<span class='positionDisplay %s' id='positionDisplay' "
                  "title='click to %s copy position to input box'>%s</span>", 
                          pressedClass, showVirtRegions, addCommasToPos(database, position));