Changes and bugfixes

Author: ComputerNerd

Changelog

@@ -1,5 +1,9 @@
 Most recent changes are placed at the top
 
+20140725
+Fixed some minor bugs related to compression.
+Added clipboard support for saving as text.
+
 20140725
 Added new histogram based hue tile picking options
 Fixed a bug related to Yliluoma 1 where which row is not checked

callback_tilemap.cpp

@@ -250,7 +250,8 @@ void load_image_to_tilemap(Fl_Widget*,void*o){
 		h=loaded_image->h();
 		printf("image width: %d image height: %d\n",w,h);
 		uint32_t w8,h8;
-		uint32_t wt,ht,wr,hr;
+		uint32_t wt,ht;
+		int wr,hr;
 		wr=w%tilebitw;
 		hr=h%tilebith;
 		w8=w/currentProject->tileC->sizex;
@@ -262,7 +263,7 @@ void load_image_to_tilemap(Fl_Widget*,void*o){
 		if((currentProject->gameSystem==NES)&&(currentProject->subSystem=NES2x2)){
 			if((wr-8)>0)
 				++w8;
-			if((hr-8)>0)
+			if((int)(hr-8)>0)
 				++h8;
 		}
 		wt=w8*currentProject->tileC->sizex;

callbacks_palette.cpp

@@ -42,26 +42,42 @@ void save_palette(Fl_Widget*, void* start_end){
 		return;
 	uint8_t end = atoi(returned)+1;
 	int type=askSaveType();
-	if (load_file_generic("Save palette",true)==true){
+	int clipboard;
+	if(type){
+		clipboard=clipboardAsk();
+		if(clipboard==2)
+			return;
+	}else
+		clipboard=0;
+	bool pickedFile;
+	if(clipboard)
+		pickedFile=true;
+	else
+		pickedFile=load_file_generic("Save palette",true);
+	if(pickedFile){
 		FILE * myfile;
-		if (type){
+		if(clipboard)
+			myfile=0;//When file is null for the function saveBinAsText clipboard will be used
+		else if(type)
 			myfile = fopen(the_file.c_str(),"w");
-		}else
+		else
 			myfile = fopen(the_file.c_str(),"wb");
-		if (likely(myfile!=0)){
+		if (likely(myfile||clipboard)){
 			//save the palette
 			if (type){
 				char comment[512];
 				snprintf(comment,512,"Colors %d-%d",start,end-1);
+				int bits;
 				if(currentProject->gameSystem==sega_genesis){
 					start*=2;//Be sure to keep this in sync with the other if statment shortly below
 					end*=2;
-				}
-				if (saveBinAsText(currentProject->palDat+start,end-start,myfile,type,comment,"palDat")==false){
+					bits=16;
+				}else
+					bits=8;
+				if (saveBinAsText(currentProject->palDat+start,end-start,myfile,type,comment,"palDat",bits)==false){
 					fl_alert("Error: can not save file %s",the_file.c_str());
 					return;
 				}
-				fputs("};",myfile);
 			}else{
 				if(currentProject->gameSystem==sega_genesis){
 					start*=2;
@@ -72,9 +88,10 @@ void save_palette(Fl_Widget*, void* start_end){
 					return;
 				}
 			}
-			fclose(myfile);
+			if(myfile)
+				fclose(myfile);
 		}else
-			fl_alert("myfile.is_open() returned false that means there was an error in creating the file");
+			fl_alert("Cannot open file %s",the_file.c_str());
 	}
 }
 void update_palette(Fl_Widget* o, void* v){

classtilemap.cpp

@@ -243,16 +243,30 @@ bool tileMap::saveToFile(){
 	size_t fileSize;
 	int type,compression;
 	uint8_t* mapptr;
-	if (load_file_generic("Save tilemap to",true)){
-		type=askSaveType();
+	type=askSaveType();
+	int clipboard;
+	if(type){
+		clipboard=clipboardAsk();
+		if(clipboard==2)
+			return true;
+	}else
+		clipboard=0;
+	bool pickedFile;
+	if(clipboard)
+		pickedFile=true;
+	else
+		pickedFile=load_file_generic("Save tilemap to",true);
+	if(pickedFile){
 		compression=compressionAsk();
 		if(compression<0)
 			return true;
-		if(type){
+		if(clipboard)
+			myfile=0;
+		else if(type)
 			myfile = fopen(the_file.c_str(),"w");
-		}else
+		else
 			myfile = fopen(the_file.c_str(),"wb");
-		if (likely(myfile!=0)){
+		if (likely(myfile||clipboard)){
 			switch (currentProject->gameSystem){
 				case sega_genesis:
 					{uint16_t * TheMap;
@@ -302,26 +316,38 @@ bool tileMap::saveToFile(){
 			}
 			if(type){
 				char temp[2048];
-				snprintf(temp,2048,"Width %d Height %d %s",mapSizeW,mapSizeH*amt,typeToText(type));
-				if(!saveBinAsText(mapptr,fileSize,myfile,type,temp,"mapDat")){
+				snprintf(temp,2048,"Width %d Height %d %s",mapSizeW,mapSizeH*amt,typeToText(compression));
+				int bits;
+				if((currentProject->gameSystem==sega_genesis)&&(!compression))
+					bits=16;
+				else
+					bits=8;
+				if(!saveBinAsText(mapptr,fileSize,myfile,type,temp,"mapDat",bits)){
 					free(mapptr);
 					return false;
 				}
 			}else
 				fwrite(mapptr,1,fileSize,myfile);
 			free(mapptr);
-			fclose(myfile);
+			if(myfile)
+				fclose(myfile);
 			puts("File Saved");
 		}else
 			return false;
 	}
 	if (currentProject->gameSystem == NES){
-		if (load_file_generic("Save attributes to",true) == true) {
-			if(type){
+		if(clipboard)
+			fl_alert("Copy the data to clipboard and press okay after this tilemap attributes will be copied to clipboard");
+		else
+			pickedFile=load_file_generic("Save attributes to",true);
+		if(pickedFile){
+			if(clipboard)
+				myfile=0;
+			else if(type)
 				myfile = fopen(the_file.c_str(),"w");
-			}else
+			else
 				myfile = fopen(the_file.c_str(),"wb");
-			if (likely(myfile!=0)) {
+			if (likely(myfile||clipboard)) {
 				uint8_t * AttrMap = (uint8_t *)malloc((mapSizeW/4)*(mapSizeH*amt/4));
 				uint8_t * freeAttrMap=AttrMap;
 				for (y=0;y<mapSizeH*amt;y+=4){
@@ -333,13 +359,13 @@ bool tileMap::saveToFile(){
 				//AttrMap-=(mapSizeW/4)*(mapSizeH/4);
 				printf("%d %d\n",AttrMap,freeAttrMap);
 				if(type){
-					if(saveBinAsText(freeAttrMap,(mapSizeW/4)*(mapSizeH*amt/4),myfile,type,0,"mapDatAttr")==false)
+					if(saveBinAsText(freeAttrMap,(mapSizeW/4)*(mapSizeH*amt/4),myfile,type,0,"mapDatAttr",8)==false)
 						return false;
-					fputs("};",myfile);
 				}else
 					fwrite(freeAttrMap,1,(mapSizeW/4)*(mapSizeH*amt/4),myfile);		
 				free(freeAttrMap);
-				fclose(myfile);
+				if(myfile)
+					fclose(myfile);
 				puts("File Saved");
 			}else
 				return false;

filemisc.cpp

@@ -18,55 +18,96 @@
 #include <stdint.h>
 #include "gui.h"
 #include "filemisc.h"
+#include "includes.h"
+int clipboardAsk(void){
+	return fl_choice("File or clipboard?","File","Clipboard","Cancel");
+}
 int askSaveType(void){
 	return MenuPopup("How would you like the file saved?","Set if the file is saved as binary C header bex or asm",4,"Binary","C header","Asm","BEX");
 }
-bool saveBinAsText(void * ptr,size_t sizeBin,FILE * fp,int type,const char*comment,const char*label){
+bool saveBinAsText(void * ptr,size_t sizeBin,FILE * fp,int type,const char*comment,const char*label,int bits){
 	/*!
 	This function saves binary data as plain text useful for c headers each byte is seperated by a comma
+	To use the clipboard specify file as NULL
 	Returns True on sucess false on error
 	Type can be:
 	1 - c header
 	2 - asm
 	3 - bex
 	*/
-	uint8_t * dat=(uint8_t *)ptr;
+	uint8_t * dat8=(uint8_t *)ptr;
+	uint16_t * dat16=(uint16_t *)ptr;
+	uint32_t * dat32=(uint32_t *)ptr;
 	char endc=',';
+	std::string temp;
+	unsigned mask=(bits/8)-1;
+	char tmp[16];
+	if(mask){
+		if(sizeBin&mask){
+			fl_alert("Error filetype unaligned to %d bits",bits);
+			return false;
+		}
+		sizeBin/=mask+1;
+	}
 	if(comment){
 		switch(type){
 			case 1:
-				fputs("// ",fp);
+				temp.assign("// ");
 			break;
 			case 2:
-				fputs("; ",fp);
+				temp.assign("; ");
 			break;
 			case 3:
-				fputs("' ",fp);
+				temp.assign("' ");
 			break;
 		}
-		fputs(comment,fp);
-		fputc('\n',fp);
+		temp.append(comment);
+		temp.push_back('\n');
 	}
 	switch(type){
 		case 1:
-			fprintf(fp,"const uint8_t %s[]={\n",label);
+			temp.append("const uint");
+			snprintf(tmp,16,"%d",bits);
+			temp.append(tmp);
+			temp.append("_t ");
+			temp.append(label);
+			temp.append("[]={");
 		break;
 		case 2:
 		case 3:
-			fputs(label,fp);
-			fputs(":\n",fp);
+			temp.append(label);
+			temp.push_back(':');
 		break;
 	}
 	for (size_t x=0;x<sizeBin;++x){
 		if ((x&31)==0){
-			if (fputc('\n',fp)==0)
-				return false;
+			temp.push_back('\n');
 			switch(type){
 				case 2:
-					fputs("\tdc.b ",fp);
+					switch(bits){
+						case 8:
+							temp.append("\tdc.b ");
+						break;
+						case 16:
+							temp.append("\tdc.w ");
+						break;
+						case 32:
+							temp.append("\tdc.l ");
+						break;
+					}
 				break;
 				case 3:
-					fputs("\tdata ",fp);
+					switch(bits){
+						case 8:
+							temp.append("\tdata ");
+						break;
+						case 16:
+							temp.append("\tdataint ");
+						break;
+						case 32:
+							temp.append("\tdatalong ");
+						break;
+					}
 				break;
 			}
 		}
@@ -76,13 +117,26 @@ bool saveBinAsText(void * ptr,size_t sizeBin,FILE * fp,int type,const char*comme
 			endc=',';
 		if(x==(sizeBin-1))
 			endc='\n';
+		switch(bits){
+			case 8:
+				snprintf(tmp,16,"%u",*dat8++);
+			break;
+			case 16:
+				snprintf(tmp,16,"%u",*dat16++);
+			break;
+			case 32:
+				snprintf(tmp,16,"%u",*dat32++);
+			break;
+		}
+		temp.append(tmp);
 		if(endc)
-			fprintf(fp,"%d%c",*dat,endc);
-		else
-			fprintf(fp,"%d",*dat);
-		++dat;
+			temp.push_back(endc);
 	}
 	if(type==1)
-		fputs("};\n",fp);
+		temp.append("};\n");
+	if(fp)
+		fputs(temp.c_str(),fp);
+	else
+		Fl::copy(temp.c_str(),temp.length(),1);
 	return true;
 }

filemisc.h

@@ -14,5 +14,6 @@
    along with Retro Graphics Toolkit.  If not, see <http://www.gnu.org/licenses/>.
    Copyright Sega16 (or whatever you wish to call me) (2012-2014)
 */
+int clipboardAsk(void);
 int askSaveType(void);
-bool saveBinAsText(void * ptr,size_t sizeBin,FILE * fp,int type,const char*comment,const char*label);
+bool saveBinAsText(void * ptr,size_t sizeBin,FILE * fp,int type,const char*comment,const char*label,int bits);

make_win

@@ -1,5 +1,6 @@
 CC=i686-pc-mingw32-gcc
 CPP=i686-pc-mingw32-g++
+STRIP=i686-pc-mingw32-strip
 #to compile on windows you must compile fltk
 #I compiled fltk in a folder named fltk-1.3.2 which is in the Retro Graphics tookit directory
 #if that is not the case for you edit the makefile changing paths
@@ -18,6 +19,7 @@ all: $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	$(CPP) $(LDFLAGS) $(OBJECTS) $(LINKER) -o $@
+	$(STRIP) $(EXECUTABLE)
 .c.o:
 	$(CC) $(CFLAGS) $< -o $@
 .cpp.o: