new file mode 100644

@@ -0,0 +1,295 @@

+#!/boot/home/config/bin/yab

+

+screenWidth = peek("desktopwidth")

+screenHeight = peek("desktopheight")

+halfscreen_width=screenWidth/2

+halfscreen_height=screenHeight/2

+window_width_half=400

+window open (halfscreen_width-window_width_half),(halfscreen_height-300) to  (halfscreen_width+window_width_half),(halfscreen_height+300), "Main", "Changes in yab 1.7.9"

+WINDOW SET "Main", "Flags", "Not-Resizable"

+

+

+x = peek("menuheight")

+tabview 0,0 to WINDOW GET "Main", "Width",(WINDOW GET "Main", "Height")-10, "Tab", "Bottom", "Main"

+TABVIEW ADD "Tab", "Columbox"

+TABVIEW ADD "Tab", "Textcontrol"

+TABVIEW ADD "Tab", "Textedit"

+TABVIEW ADD "Tab", "Texturl"

+TABVIEW ADD "Tab","Sound"

+

+// on the 1 Tab

+draw text 10,15 ,upper$("Demonstration Columnbox sorting"), "Tab1"

+x=0

+i=0

+d=0

+COLUMNBOX 10,40 TO (View GET "Tab", "width")-20,(View GET "Tab", "Height")-310, "testcolumn", true, "movable, resizable, popup, removable", "Tab1"

+COLUMNBOX COLUMN "testcolumn", "ID", 1, 20, 20, 20, "align-center"

+COLUMNBOX COLUMN "testcolumn", "Customer", 2, 100, 50, 150, "align-left"

+COLUMNBOX COLUMN "testcolumn", "Price", 3, 100, 50, 150, "align-right"

+COLUMNBOX ADD "testcolumn", 1, 1, 20,"1" 

+COLUMNBOX ADD "testcolumn", 2, 1, 20,"Harry" 

+COLUMNBOX ADD "testcolumn", 3, 1, 20,"33.33" 

+COLUMNBOX ADD "testcolumn", 1, 2, 20,"2" 

+COLUMNBOX ADD "testcolumn", 2, 2, 20,"Sally" 

+COLUMNBOX ADD "testcolumn", 3, 2, 20,"56.31" 

+COLUMNBOX ADD "testcolumn", 1, 3, 20,"3" 

+COLUMNBOX ADD "testcolumn", 2, 3, 20,"Wilhelm" 

+COLUMNBOX ADD "testcolumn", 3, 3, 20,"8.83" 

+COLUMNBOX ADD "testcolumn", 1, 4, 20,"4" 

+COLUMNBOX ADD "testcolumn", 2, 4, 20,"Shake" 

+COLUMNBOX ADD "testcolumn", 3, 4, 20,"18.83" 

+

+textedit 10,300 to (View GET "Tab", "width")-20,(View GET "Tab", "Height")-40, "ausgabe1", 1, "Tab1"

+textedit add "ausgabe1","COLUMNBOX 10,40 TO (View GET \"Tab\", \"width\")-20,(View GET \"Tab\", \"Height\")-310, \"testcolumn\", true, \"movable, resizable, popup, removable\", \"Tab1\"\n"

+textedit add "ausgabe1","COLUMNBOX COLUMN \"testcolumn\", \"ID\", 1, 20, 20, 20, \"align-center\"\n"

+textedit add "ausgabe1","COLUMNBOX COLUMN \"testcolumn\", \"Customer\", 2, 100, 50, 150, \"align-left\"\n"

+textedit add "ausgabe1","COLUMNBOX COLUMN \"testcolumn\", \"Price\", 3, 100, 50, 150, \"align-right\"\n"

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 1, 1, 20,\"1\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 2, 1, 20,\"Harry\"\n" 

+textedit add "ausgabe1","OLUMNBOX ADD \"testcolumn\", 3, 1, 20,\"33.33\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 1, 2, 20,\"2\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 2, 2, 20,\"Sally\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 3, 2, 20,\"56.31\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 1, 3, 20,\"3\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 2, 3, 20,\"Wilhelm\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 3, 3, 20,\"8.83\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 1, 4, 20,\"4\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 2, 4, 20,\"Shake\"\n" 

+textedit add "ausgabe1","COLUMNBOX ADD \"testcolumn\", 3, 4, 20,\"18.83\"\n" 

+// on the 2 Tab

+

+draw text 10,15 ,"TEXTCONTROL WITH / WITHOUT LABEL", "Tab2"

+textcontrol 10,20 to 300,40, "ID", "Label","with Label", "Tab2"

+textcontrol 10,50 to 300,70, "ID", "","without Label","Tab2"

+textcontrol 10,80 to 300,100, "ID", "Label1","with Label", "Tab2"

+textcontrol 10,110 to 300,130, "ID", "Label and Label","with Label","Tab2"

+textcontrol 10,140 to 300,160, "ID", "","without Label","Tab2"

+textcontrol 10,170 to 300,190, "ID-right", "Label and Label","with Label align right","Tab2"

+textcontrol 10,200 to 300,220, "ID-right1", "","without Label align right","Tab2"

+textcontrol 10,230 to 300,250, "ID-center", "Label and Label","with Label align center","Tab2"

+textcontrol 10,260 to 300,290, "ID-center1", "","without Label align center","Tab2"

+TEXTCONTROL SET "ID-right", "align", "right"

+TEXTCONTROL SET "ID-right1", "align", "right"

+TEXTCONTROL SET "ID-center", "align", "center"

+TEXTCONTROL SET "ID-center1", "align", "center"

+

+textedit 10,300 to (View GET "Tab", "width")-20,(View GET "Tab", "Height")-40, "ausgabe2", 1, "Tab2"

+textedit add "ausgabe2","textcontrol 10,20 to 300,40, \"ID\", \"Label\",\"with Label\", \"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,50 to 300,70, \"ID\", \"\",\"without Label\", \"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,80 to 300,100, \"ID\", \"Label1\",\"with Label\", \"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,110 to 300,130, \"ID\", \"Label and Label\",\"with Label\", \"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,140 to 300,160, \"ID\", \"\",\"without Label\", \"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,170 to 300,190, \"ID-right\", \"Label and Label\",\"with Label align right\",\"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,200 to 300,220, \"ID-right1\", \"\",\"without Label align right\",\"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,230 to 300,250, \"ID-center\", \"Label and Label\",\"with Label align center\",\"Tab2\"\n"

+textedit add "ausgabe2","textcontrol 10,260 to 300,290, \"ID-center1\", \"\",\"without Label align center\",\"Tab2\"\n"

+textedit add "ausgabe2","TEXTCONTROL SET \"ID-right\", \"align\", \"right\",\"Tab2\"\n"

+textedit add "ausgabe2","TEXTCONTROL SET \"ID-right1\", \"align\", \"right\",\"Tab2\"\n"

+textedit add "ausgabe2","TEXTCONTROL SET \"ID-center\", \"align\", \"center\",\"Tab2\"\n"

+textedit add "ausgabe2","TEXTCONTROL SET \"ID-center1\", \"align\", \"center\",\"Tab2\""

+

+// on the 3 Tab

+draw text 10,15 ,"TEXTEDIT align left/center/right", "Tab3"

+textedit 10,40 to (View GET "Tab", "width")-20,100, "test-left", 1, "Tab3"

+TEXTEDIT SET "test-left", "align", "left"

+textedit add "test-left","This is the test text align left\n"

+textedit 10,110 to (View GET "Tab", "width")-20,170, "test-center", 1, "Tab3"

+TEXTEDIT SET "test-center", "align", "center"

+textedit add "test-center","This is the test text  align center\n"

+textedit 10,180 to (View GET "Tab", "width")-20,240,"test-right", 1, "Tab3"

+TEXTEDIT SET "test-right", "align", "right"

+textedit add "test-right","This is the test text  align right\n"

+

+textedit 10,300 to (View GET "Tab", "width")-20,(View GET "Tab", "Height")-40, "ausgabe3", 1, "Tab3"

+textedit add "ausgabe3","textedit 10,40 to (View GET \"Tab\", \"width\")-20,100, \"test-left\", 1, \"Tab3\"\n"

+textedit add "ausgabe3","TEXTEDIT SET \"test-left\", \"align\", \"left\"\n"

+textedit add "ausgabe3","textedit add \"test-left\",\"This is the test text align left\\n\"\n"

+textedit add "ausgabe3","textedit 10,110 to (View GET \"Tab\", \"width\")-20,170, \"test-center\", 1, \"Tab3\"\n"

+textedit add "ausgabe3","TEXTEDIT SET \"test-center\", \"align\", \"center\"\n"

+textedit add "ausgabe3","textedit add \"test-center\",\"This is the test text  align center\\n\"\n"

+textedit add "ausgabe3","textedit 10,180 to (View GET \"Tab\", \"width\")-20,240,\"test-right\", 1, \"Tab3\"\n"

+textedit add "ausgabe3","TEXTEDIT SET \"test-right\", \"align\", \"right\"\n"

+textedit add "ausgabe3","textedit add \"test-right\",\"This is the test text  align right\\n\"\n"

+

+// on the 4 Tab

+draw text 10,15 ,"TEXTURL without duplication on mouseover", "Tab4"

+texturl 10,50, "email","mailto: xyz@ddd.de", "xyz@ddd.de",  "Tab4"

+texturl 10,90, "file","file://www.besly.de", "file://www.besly.de",  "Tab4"

+texturl 10,130, "https","https://software.besly.de", "https://software.besly.de",  "Tab4"

+texturl 10,170, "http","http://www.besly.de", "http://www.besly.de",  "Tab4"

+texturl 10,210, "ftp","ftp://www.besly.de", "ftp://www.besly.de",  "Tab4"

+

+textedit 10,300 to (View GET "Tab", "width")-20,(View GET "Tab", "Height")-40, "ausgabe5", 1, "Tab4"

+textedit add "ausgabe5","texturl 10,50, \"email\",\"mailto: xyz@ddd.de\", \"xyz@ddd.de\",  \"Tab4\"\n"

+textedit add "ausgabe5","texturl 10,90, \"file\",\"file://www.besly.de\", \"file://www.besly.de\",  \"Tab4\"\n"

+textedit add "ausgabe5","texturl 10,130, \"https\",\"https://www.besly.de\", \"https://www.besly.de\",  \"Tab4\"\n"

+textedit add "ausgabe5","texturl 10,170, \"https\",\"http://www.besly.de\", \"http://www.besly.de\",  \"Tab4\"\n"

+textedit add "ausgabe5","texturl 10,210, \"ftp\",\"ftp://www.besly.de\", \"ftp://www.besly.de\",  \"Tab4\"\n"

+

+// on the 5 Tab

+//Sound

+

+Button 20,10 to 200,30, "start","Playsound Start","Tab5"

+Button 20,40 to 200,60, "stop","Playsound Stop","Tab5"

+Button 20,70 to 200,90, "pause","Playsound Pause / Continue","Tab5"

+

+Button 20,100 to 200,120, "start_Media","MediaSound Start","Tab5"

+Button 20,130 to 200,150, "stop_Media","MediaSound Stop","Tab5"

+//tooltip "start_Media", "testetxt"

+//tooltipnew "start_Media" , "testetxt" ,"lowcolor", 255,255,255

+textedit 10,300 to (View GET "Tab", "width")-20,(View GET "Tab", "Height")-40, "ausgabe9", 1, "Tab5"

+//textedit 10,200 to 460,380, "ausgabe9", 3, "Tab5"

+textedit add "ausgabe9","case \"start|\"\n"

+textedit add "ausgabe9","  ID= SOUND PLAY \"yab_testsong.mp3\", 1\n"

+textedit add "ausgabe9","  IF sound is playing, you get 1 back, so you can use for the stop command. \n"				

+textedit add "ausgabe9","break\n"

+textedit add "ausgabe9","case \"stop|\n"

+textedit add "ausgabe9","  SOUND STOP ID\n"		

+textedit add "ausgabe9","break \n"

+textedit add "ausgabe9","case \"pause|\"\n"

+textedit add "ausgabe9","  SOUND WAIT ID \n Sound wait works, but with my soundcard i get a brumm signal. maybe on other soundcard is nothing or is a Haiku problem.\n"

+textedit add "ausgabe9","break\n"

+textedit add "ausgabe9","MEDIASOUND you must wait a little before you hear the stream\"\n"	

+textedit add "ausgabe9","  ID = MEDIASOUND play \"https://swr-edge-10b8-fra-dtag-cdn.cast.addradio.de/swr/swr3/live/mp3/128/stream.mp3\"\n"				

+textedit add "ausgabe9","break\n"

+textedit add "ausgabe9","case \"stop|\n"

+textedit add "ausgabe9","  MEDIASOUND STOP ID\n"		

+textedit add "ausgabe9","break \n"

+textedit add "ausgabe9","//If you click MEDIASOUND STOP  twice, the program breaks, because there is a little bug in my code. I'am working on this issue. \n"

+

+//-------------------------------------

+	dim mouse$(1)

+	dim part$(1)

+	inloop = true

+	while(inloop)

+

+		msg$ = message$

+

+		if (split(msg$, part$(), ":|") > 2) then

+			PartTwo$ = part$(2)

+			PartThree$ = part$(3)

+	         fi

+

+		if (msg$ <> "") print msg$

+			switch (msg$)

+

+				case "Main:_QuitRequested|":

+					window close "Main"

+					//window close "View"

+				break

+

+				case "Quit|"

+					window close "Main"

+				break

+

+				case "View:Spiel:Beenden|"

+				        window close "Main"

+				break

+				case ":_Select:"+PartThree$+"|"

+					eintragnummer=val(PartThree$)

+					print eintragnummer					

+				         rechte_seite(eintragnummer)				

+				break

+				case "tabdel|"

+				       tabview remove "Tab",1

+					//print old_tab

+				break

+				case "tabadd|"					

+				        TABVIEW ADD "Tab", "Textcontrol"

+					//draw text 10,15 ,"TEXTCONTROL WITH / WITHOUT LABEL", "Tab2"

+				break

+				case "start|"

+					ID=SOUND PLAY "yab_testsong.mp3", 1

+					

+					print "------"	

+					print ID

+					print "------"					

+				break

+				case "stop|"

+					IF (ID=1) THEN

+						SOUND STOP ID

+						ID=0

+						//print "ID:"+str$(ID)

+					ELSE

+						print "Nothing to do"

+					ENDIF				

+								

+				break 

+				case "pause|"

+					SOUND WAIT ID // 2

+				break 

+

+				case "start_Media|"

+					//ID = MEDIASOUND play "02 - Let Her Go.mp3"

+					NEW_ID = MEDIASOUND play "https://swr-edge-10b8-fra-dtag-cdn.cast.addradio.de/swr/swr3/live/mp3/128/stream.mp3"

+				break

+				case "stop_Media|"

+					IF (NEW_ID=1) THEN

+						MEDIASOUND STOP NEW_ID

+						NEW_ID=0

+						//print "NEW_ID:"+str$(NEW_ID)

+					ELSE

+						print "Nothing to do"

+					ENDIF						

+				break

+				

+				default

+				break

+			end switch	

+			if(window count<1) inloop = false

+		    sleep 0.1

+ mmsg$ = MOUSE MESSAGE$

+                        if (mmsg$<>"" and mmsg$<>old_mmsg$) then

+                                //print mmsg$

+                                //old_mmsg$= mmsg$ 

+                                nx = split(mmsg$, mouse$(), ":")

+                                Viewname$=mouse$(1)

+                                //print Viewname$

+                                Xmouse  = val(mouse$(2))

+                                Ymouse  = val(mouse$(3))

+                                BLmouse= val(mouse$(4))

+                                BCmouse= val(mouse$(5))

+                                BRmouse= val(mouse$(6))

+                                casestring$=Viewname$+":"+mouse$(4)+":"+mouse$(5)+":"+mouse$(6)

+                                print casestring$

+                        endif

+	wend

+

+sub baummenu(x,i,d)

+fileload$="hilfe.csv"

+	auslesen=open(fileload$, "r")

+	

+	while (not EOF(auslesen))

+	line input #auslesen b$

+	TEXTEDIT ADD "ausgabe", b$+"\n"

+	dim elements$(1)

+	

+	numElements = split(b$, elements$(),";")

+	for i = 1 to numElements

+			x=x+1

+			dim d$(x)

+			d$(x) = elements$(i)

+			

+	//print d$(x)

+	next i

+	wend

+	close(auslesen)

+

+anzahlspalten=numElements

+anzahlzeilen=x/anzahlspalten

+eintraege=anzahlspalten*anzahlzeilen

+name_baummenu$=d$(0)

+treebox 0,50 to 147,250, name_baummenu$, 3, "Tab1"

+for treezeilen=1 to anzahlzeilen*anzahlspalten step anzahlspalten

+	

+		          if (d$(treezeilen+2)="") then

+				treebox add name_baummenu$, d$(treezeilen+1)

+			

+			else

+				treebox add name_baummenu$, d$(treezeilen+1), d$(treezeilen+2),true		

+			endif

+		

+	print treezeilen

+next treezeilen

+

+end sub

deleted file mode 100644

@@ -1,22 +0,0 @@

-#!/boot/home/config/bin/yab

-# mimetype "application/x-vnd.Pang.yab"

-

-doc See Ping.yab for more information.

-

-window open 400,100 to 600,300, "Pang", "Pang"

-

-dim msg$(1)

-while(not finished)

-	n = token(message$, msg$(), ":|")

-	for i = 1 to n 

-		if(instr(msg$(i), "Quit")) finished = true

-		if(instr(msg$(i), "_Scripting") and n>=i+2) then

-			x = val(msg$(i+1)) 

-			y = val(msg$(i+2))- 200

-			draw flush "Pang"

-			draw circle x,y, 8, "Pang"

-		endif

-	next i

-wend

-

-window close "Pang"

new file mode 100644

Binary files /dev/null and b/Examples/yab_testsong.mp3 differ

@@ -54,7 +54,7 @@ OPT = -O

 ##

 ## set libtrary name

 ##

-YABLIBRARY := libyab_1.7.8.so

+YABLIBRARY := libyab_1.7.9.so

 ##

 #

@@ -70,13 +70,13 @@ GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT)

 ## find out if we need to change the library to libyab_x86.so and use gcc instead of ld

 ifeq ($(USEDARCH), x86)

 	LD = gcc

-	YABLIBRARY:=libyab_x86_1.7.8.so

+	YABLIBRARY:=libyab_x86_1.7.9.so

 else

 	LD = ld

 endif

 ifeq ($(SYSTEMARCH),x86_64)

 	LD=gcc

-	YABLIBRARY:=libyab_1.7.8.so

+	YABLIBRARY:=libyab_1.7.9.so

 endif

 #

@@ -26,10 +26,10 @@ resource app_signature "application/x-vnd.yab-app";

 resource app_version {

 	major  = 1,

 	middle = 7,

-	minor  = 8,

+	minor  = 9,

 	variety = B_APPV_FINAL,

-	internal = 4,

+	internal = 1,

 	short_info = "Yab BASIC programming language",

 	long_info = "Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more."

Binary files a/YAB.rdef.rsrc and b/YAB.rdef.rsrc differ

@@ -945,7 +945,7 @@ void YabInterface::Launch(const char* strg)

 	status_t t = be_roster->Launch(ref);

 	if(t != B_OK)

 	{

-		if(tst.FindFirst("http://") != B_ERROR || tst.FindFirst("file://") != B_ERROR || tst.FindFirst("www.") != B_ERROR)

+		if(tst.FindFirst("http://")  != B_ERROR || tst.FindFirst("https://") != B_ERROR || tst.FindFirst("file://") != B_ERROR || tst.FindFirst("www.") != B_ERROR)

 		{

 			char *link = tst.LockBuffer( tst.Length()+1 );

                		status_t result = be_roster->Launch( "text/html", 1, &link );

@@ -5481,7 +5481,7 @@ void YabInterface::FileBox(BRect frame, const char* id, bool hasHScrollbar, cons

 			msg2->AddPointer("source", myColumnList);

 			myColumnList->SetInvocationMessage(msg1);

 			myColumnList->SetSelectionMessage(msg2);

-			myColumnList->SetSortingEnabled(false);

+			myColumnList->SetSortingEnabled(true);

 			myColumnList->SetSelectionMode(B_SINGLE_SELECTION_LIST);

 			rgb_color rgb = {195,195,195,255};

 			myColumnList->SetColor(B_COLOR_SELECTION, rgb);

@@ -8998,8 +8998,10 @@ void YabInterface::Canvas(BRect frame, const char* id, const char* view)

 	}

 	Error(view, "VIEW");

 }

-int YabInterface::Sound(const char* filename) //Reactivate Sound Lorglas 2020.01.02

+int YabInterface::Sound(const char* filename, int status) //Reactivate Sound Lorglas 2020.01.02

 {

+	

+	//printf("%s - %d",filename, status);

 	entry_ref ref; 

 	BEntry entry(filename, true); 

 	//Check, if filename is ok

@@ -9007,10 +9009,10 @@ int YabInterface::Sound(const char* filename) //Reactivate Sound Lorglas 2020.01

 		if (entry.GetRef(&ref) == B_OK) 

 		//delete playing fplayer, because we get no ID back from fplayer. So if we didn't deleting fplayer, a second sound will be played and the first one can't be stopped

 			delete fPlayer;

-			fPlayer = new BFileGameSound(&ref, false);

-			fPlayer->StartPlaying();

-			

-	return 1;	

+	

+	  		fPlayer = new BFileGameSound(&ref, status);			

+			fPlayer->StartPlaying();	

+			return 1;

 }

 void YabInterface::SoundStop(int32) //Reactivate Sound Lorglas 2020.01.02

@@ -10923,19 +10925,19 @@ void yi_Canvas(double x1, double y1, double x2, double y2, const char* id, const

 	yab->Canvas(BRect(x1,y1,x2,y2), id,view);

 }

-int yi_Sound(const char* filename, YabInterface* yab) //Reactivate Sound Lorglas 2020.01.02

+int yi_Sound(const char* filename, int status, YabInterface* yab) //Reactivate Sound Lorglas 2020.01.02

 {

-	return yab->Sound(filename);

+	return yab->Sound(filename, status);

 }

 void yi_SoundStop(int id, YabInterface* yab) //Reactivate Sound Lorglas 2020.01.02

 {

-	yab->SoundStop(id);

+	return yab->SoundStop(id);

 }

 void yi_SoundWait(int id, YabInterface* yab) //Reactivate Sound Lorglas 2020.01.03

 {

-	yab->SoundWait(id);

+	return yab->SoundWait(id);

 }

 int yi_MediaSound(const char* filename, YabInterface* yab)

@@ -215,7 +215,7 @@

 		void Screenshot(BRect frame, const char* bitmap);

 		int BitmapSave(const char* id, const char* filename, const char* type);

 		void Canvas(BRect frame, const char* id, const char* view);

-		int Sound(const char* filename);

+		int Sound(const char* filename, int status);

 		void SoundStop(int32 id); 

 		void SoundWait(int32 id);

 		int MediaSound(const char* filename);

@@ -495,7 +495,7 @@ extern void yi_BitmapRemove(const char* bitmap,YabInterface* yab);

 extern void yi_Screenshot(double x1, double y1, double x2, double y2, const char* bitmap, YabInterface* yab);

 extern int yi_BitmapSave(const char* id, const char* filename, const char* type, YabInterface* yab);

 extern void yi_Canvas(double x1, double y1, double x2, double y2, const char* id, const char* view, YabInterface *yab);

-extern int yi_Sound(const char* filename, YabInterface* yab);

+extern int yi_Sound(const char* filename, int status, YabInterface* yab);

 extern void yi_SoundStop(int id, YabInterface* yab);

 extern void yi_SoundWait(int id, YabInterface* yab);

 extern int yi_MediaSound(const char* filename, YabInterface* yab);

@@ -1,31 +1,24 @@

 /*

 Open Tracker License

-

 Terms and Conditions

-

 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.

-

 Permission is hereby granted, free of charge, to any person obtaining a copy of

 this software and associated documentation files (the "Software"), to deal in

 the Software without restriction, including without limitation the rights to

 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

 of the Software, and to permit persons to whom the Software is furnished to do

 so, subject to the following conditions:

-

 The above copyright notice and this permission notice applies to all licensees

 and shall be included in all copies or substantial portions of the Software.

-

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,

 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

 AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION

 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

 Except as contained in this notice, the name of Be Incorporated shall not be

 used in advertising or otherwise to promote the sale, use or other dealings in

 this Software without prior written authorization from Be Incorporated.

-

 Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks

 of Be Incorporated in the United States and other countries. Other brand product

 names are registered trademarks or trademarks of their respective holders.

@@ -66,8 +59,6 @@ inline bool operator!=(const rgb_color c1, const rgb_color c2)

 // Color creation.

-#ifndef HAIKU

-

 inline rgb_color make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha=255)

 {

 	rgb_color c;

@@ -78,13 +69,11 @@ inline rgb_color make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha=255)

 	return c;

 }

-#endif

-

 // Mix two colors together, ignoring their relative alpha channels.

 // If amount is 0, the result is color1; if 255, the result is color2;

 // if another value, it is somewhere in-between.  The resulting alpha

 // channel is mixed exactly like the other color channels.

-//rgb_color mix_color(rgb_color color1, rgb_color color2, uint8 amount);

+rgb_color mix_color(rgb_color color1, rgb_color color2, uint8 amount);

 // Blend two colors together, weighting by their relative alpha channels.

 // The resulting color is the same as mix_color(), except that the amount

@@ -47,6 +47,7 @@ All rights reserved.

 #include <typeinfo>

+#include <algorithm>

 #include <stdio.h>

 #include <stdlib.h>

@@ -62,70 +63,22 @@ All rights reserved.

 #include <Region.h>

 #include <ScrollBar.h>

 #include <String.h>

+#include <SupportDefs.h>

 #include <Window.h>

-#include "ColorTools.h"

+#include <column/ObjectListPrivate.h>

+

 #include "ObjectList.h"

+

 #define DOUBLE_BUFFERED_COLUMN_RESIZE 1

 #define SMART_REDRAW 1

 #define DRAG_TITLE_OUTLINE 1

 #define CONSTRAIN_CLIPPING_REGION 1

 #define LOWER_SCROLLBAR 0

-namespace BPrivate {

-

-static const unsigned char kResizeCursorData[] = {

-	16, 1, 8, 8,

-	0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,

-	0x1a, 0x58, 0x2a, 0x54, 0x4a, 0x52, 0x8a, 0x51,

-	0x8a, 0x51, 0x4a, 0x52, 0x2a, 0x54, 0x1a, 0x58,

-	0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0,

-

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0,

-	0x1b, 0xd8, 0x3b, 0xdc, 0x7b, 0xde, 0xfb, 0xdf,

-	0xfb, 0xdf, 0x7b, 0xde, 0x3b, 0xdc, 0x1b, 0xd8,

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0

-};

-

-static const unsigned char kMaxResizeCursorData[] = {

-	16, 1, 8, 8,

-	0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,

-	0x1a, 0x40, 0x2a, 0x40, 0x4a, 0x40, 0x8a, 0x40,

-	0x8a, 0x40, 0x4a, 0x40, 0x2a, 0x40, 0x1a, 0x40,

-	0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0,

-

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0,

-	0x1b, 0xc0, 0x3b, 0xc0, 0x7b, 0xc0, 0xfb, 0xc0,

-	0xfb, 0xc0, 0x7b, 0xc0, 0x3b, 0xc0, 0x1b, 0xc0,

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0

-};

-static const unsigned char kMinResizeCursorData[] = {

-	16, 1, 8, 8,

-	0x03, 0xc0, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,

-	0x02, 0x58, 0x02, 0x54, 0x02, 0x52, 0x02, 0x51,

-	0x02, 0x51, 0x02, 0x52, 0x02, 0x54, 0x02, 0x58,

-	0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x03, 0xc0,

-

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0,

-	0x03, 0xd8, 0x03, 0xdc, 0x03, 0xde, 0x03, 0xdf,

-	0x03, 0xdf, 0x03, 0xde, 0x03, 0xdc, 0x03, 0xd8,

-	0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0

-};

-

-static const unsigned char kColumnMoveCursorData[] = {

-	16, 1, 8, 8,

-	0x01, 0x80, 0x02, 0x40, 0x04, 0x20, 0x08, 0x10,

-	0x1e, 0x78, 0x2a, 0x54, 0x4e, 0x72, 0x80, 0x01,

-	0x80, 0x01, 0x4e, 0x72, 0x2a, 0x54, 0x1e, 0x78,

-	0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01, 0x80,

-

-	0x01, 0x80, 0x03, 0xc0, 0x07, 0xe0, 0x0f, 0xf0,

-	0x1f, 0xf8, 0x3b, 0xdc, 0x7f, 0xfe, 0xff, 0xff,

-	0xff, 0xff, 0x7f, 0xfe, 0x3b, 0xdc, 0x1f, 0xf8,

-	0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01, 0x80

-};

+namespace BPrivate {

 static const unsigned char kDownSortArrow8x8[] = {

 	0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,

@@ -171,31 +124,17 @@ static const unsigned char kUpSortArrow8x8Invert[] = {

 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff

 };

-static const float kTintedLineTint = 0.7 * B_NO_TINT + 0.3 * B_DARKEN_1_TINT;

-

-static const float kTitleHeight = 16.0;

-static const float kLatchWidth = 0.0; //5.0;

-

+static const float kTintedLineTint = 1.04;

-static const rgb_color kColor[B_COLOR_TOTAL] =

-{

-    {236, 236, 236, 255},           // B_COLOR_BACKGROUND

-    {  0,   0,   0, 255},           // B_COLOR_TEXT

-    {148, 148, 148, 255},           // B_COLOR_ROW_DIVIDER

-    {190, 190, 190, 255},           // B_COLOR_SELECTION

-    {  0,   0,   0, 255},           // B_COLOR_SELECTION_TEXT

-    {200, 200, 200, 255},           // B_COLOR_NON_FOCUS_SELECTION

-    {180, 180, 180, 180},           // B_COLOR_EDIT_BACKGROUND

-    {  0,   0,   0, 255},           // B_COLOR_EDIT_TEXT

-    {215, 215, 215, 255},           // B_COLOR_HEADER_BACKGROUND

-    {  0,   0,   0, 255},           // B_COLOR_HEADER_TEXT

-    {  0,   0,   0, 255},           // B_COLOR_SEPARATOR_LINE

-    {  0,   0,   0, 255},           // B_COLOR_SEPARATOR_BORDER

-};

+static const float kMinTitleHeight = 16.0;

+static const float kMinRowHeight = 16.0;

+static const float kTitleSpacing = 1.4;

+static const float kRowSpacing = 1.4;

+static const float kLatchWidth = 15.0;

 static const int32 kMaxDepth = 1024;

 static const float kLeftMargin = kLatchWidth;

-static const float kRightMargin = kLatchWidth;

+static const float kRightMargin = 8;

 static const float kOutlineLevelIndent = kLatchWidth;

 static const float kColumnResizeAreaWidth = 10.0;

 static const float kRowDragSensitivity = 5.0;

@@ -237,6 +176,8 @@ public:

 			void				SetEditMode(bool state)

 									{ fEditMode = state; }

+			float				MarginWidth() const;

+

 private:

 			void				GetTitleRect(BColumn* column, BRect* _rect);

 			int32				FindColumn(BPoint where, float* _leftEdge);

@@ -294,6 +235,7 @@ private:

 			BCursor*			fColumnMoveCursor;

 };

+

 class OutlineView : public BView {

 	typedef BView _inherited;

 public:

@@ -367,6 +309,7 @@ private:

 			float				fItemsHeight;

 			BRowContainer		fRows;

 			BRect				fVisibleRect;

+								

 #if DOUBLE_BUFFERED_COLUMN_RESIZE

 			BBitmap*			fDrawBuffer;

@@ -418,6 +361,7 @@ private:

 	friend class RecursiveOutlineIterator;

 };

+

 class RecursiveOutlineIterator {

 public:

 								RecursiveOutlineIterator(

@@ -486,6 +430,20 @@ BColumn::MouseUp(BColumnListView* /*parent*/, BRow* /*row*/, BField* /*field*/)

 // #pragma mark -

+BRow::BRow()

+	:

+	fChildList(NULL),

+	fIsExpanded(false),

+	fHeight(std::max(kMinRowHeight,

+		ceilf(be_plain_font->Size() * kRowSpacing))),

+	fNextSelected(NULL),

+	fPrevSelected(NULL),

+	fParent(NULL),

+	fList(NULL)

+{

+}

+

+

 BRow::BRow(float height)

 	:

 	fChildList(NULL),

@@ -547,9 +505,7 @@ BRow::SetField(BField* field, int32 logicalFieldIndex)

 	if (NULL != fList) {

 		ValidateField(field, logicalFieldIndex);

-		BRect inv;

-		fList->GetRowRect(this, &inv);

-		fList->Invalidate(inv);

+		Invalidate();

 	}

 	fFields.AddItem(field, logicalFieldIndex);

@@ -570,6 +526,21 @@ BRow::IsExpanded() const

 }

+bool

+BRow::IsSelected() const

+{

+	return fPrevSelected != NULL;

+}

+

+

+void

+BRow::Invalidate()

+{

+	if (fList != NULL)

+		fList->InvalidateRow(this);

+}

+

+

 void

 BRow::ValidateFields() const

 {

@@ -584,26 +555,25 @@ BRow::ValidateField(const BField* field, int32 logicalFieldIndex) const

 	// The Fields may be moved by the user, but the logicalFieldIndexes

 	// do not change, so we need to map them over when checking the

 	// Field types.

-	BColumn* col = NULL;

+	BColumn* column = NULL;

 	int32 items = fList->CountColumns();

 	for (int32 i = 0 ; i < items; ++i) {

-		col = fList->ColumnAt(i);

-		if( col->LogicalFieldNum() == logicalFieldIndex )

+		column = fList->ColumnAt(i);

+		if(column->LogicalFieldNum() == logicalFieldIndex )

 			break;

 	}

-	if (NULL == col) {

+	if (column == NULL) {

 		BString dbmessage("\n\n\tThe parent BColumnListView does not have "

-		                  "\n\ta BColumn at the logical field index ");

-		dbmessage << logicalFieldIndex << ".\n\n";

-		printf(dbmessage.String());

+			"\n\ta BColumn at the logical field index ");

+		dbmessage << logicalFieldIndex << ".\n";

+		puts(dbmessage.String());

 	} else {

-		if (!col->AcceptsField(field)) {

+		if (!column->AcceptsField(field)) {

 			BString dbmessage("\n\n\tThe BColumn of type ");

-			dbmessage << typeid(*col).name() << "\n\tat logical field index "

-			          << logicalFieldIndex << "\n\tdoes not support the "

-				          "field type "

-			          << typeid(*field).name() << ".\n\n";

+			dbmessage << typeid(*column).name() << "\n\tat logical field index "

+				<< logicalFieldIndex << "\n\tdoes not support the field type "

+				<< typeid(*field).name() << ".\n\n";

 			debugger(dbmessage.String());

 		}

 	}

@@ -776,9 +746,10 @@ BColumnListView::BColumnListView(BRect rect, const char* name,

 	fSelectionMessage(NULL),

 	fSortingEnabled(true),

 	fLatchWidth(kLatchWidth),

-	fBorderStyle(border)

+	fBorderStyle(border),

+	fShowingHorizontalScrollBar(showHorizontalScrollbar)

 {

-	_Init(showHorizontalScrollbar);

+	_Init();

 }

@@ -790,9 +761,10 @@ BColumnListView::BColumnListView(const char* name, uint32 flags,

 	fSelectionMessage(NULL),

 	fSortingEnabled(true),

 	fLatchWidth(kLatchWidth),

-	fBorderStyle(border)

+	fBorderStyle(border),

+	fShowingHorizontalScrollBar(showHorizontalScrollbar)

 {

-	_Init(showHorizontalScrollbar);

+	_Init();

 }

@@ -836,6 +808,7 @@ BColumnListView::Invoke(BMessage* message)

 void

 BColumnListView::ItemInvoked()

 {

+	

 	Invoke();

 }

@@ -972,7 +945,9 @@ BColumnListView::SetSortingEnabled(bool enabled)

 {

 	fSortingEnabled = enabled;

 	fSortColumns.MakeEmpty();

-	fTitleView->Invalidate();	// Erase sort indicators

+	fTitleView->Invalidate();

+	// erase sort indicators

+	

 }

@@ -996,16 +971,20 @@ BColumnListView::SetSortColumn(BColumn* column, bool add, bool ascending)

 		fSortColumns.AddItem(column);

 	column->fSortAscending = ascending;

-	fTitleView->Invalidate();

 	fOutlineView->StartSorting();

+	fTitleView->Invalidate();

+	

+	

 }

 void

 BColumnListView::ClearSortColumns()

 {

+	

 	fSortColumns.MakeEmpty();

-	fTitleView->Invalidate();	// Erase sort indicators

+	fTitleView->Invalidate();

+		// erase sort indicators

 }

@@ -1065,7 +1044,7 @@ BColumnListView::AddColumn(BColumn* column, int32 logicalFieldIndex)

 	column->fList = this;

 	column->fFieldID = logicalFieldIndex;

-	// sanity check.  If there is already a field with this ID, remove it.

+	// sanity check -- if there is already a field with this ID, remove it.

 	for (int32 index = 0; index < fColumns.CountItems(); index++) {

 		BColumn* existingColumn = (BColumn*) fColumns.ItemAt(index);

 		if (existingColumn && existingColumn->fFieldID == logicalFieldIndex) {

@@ -1124,7 +1103,7 @@ BColumnListView::ColumnAt(BPoint point) const

 	float left = MAX(kLeftMargin, LatchWidth());

 	for (int i = 0; BColumn* column = (BColumn*)fColumns.ItemAt(i); i++) {

-		if (!column->IsVisible())

+		if (column == NULL || !column->IsVisible())

 			continue;

 		float right = left + column->Width();

@@ -1149,7 +1128,7 @@ void

 BColumnListView::SetColumnVisible(int32 index, bool isVisible)

 {

 	BColumn* column = ColumnAt(index);

-	if (column)

+	if (column != NULL)

 		column->SetVisible(isVisible);

 }

@@ -1158,7 +1137,7 @@ bool

 BColumnListView::IsColumnVisible(int32 index) const

 {

 	BColumn* column = ColumnAt(index);

-	if (column)

+	if (column != NULL)

 		return column->IsVisible();

 	return false;

@@ -1303,6 +1282,60 @@ BColumnListView::UpdateRow(BRow* row)

 }

+bool

+BColumnListView::SwapRows(int32 index1, int32 index2, BRow* parentRow1,

+	BRow* parentRow2)

+{

+	BRow* row1 = NULL;

+	BRow* row2 = NULL;

+

+	BRowContainer* container1 = NULL;

+	BRowContainer* container2 = NULL;

+

+	if (parentRow1 == NULL)

+		container1 = fOutlineView->RowList();