Attachment #72786 for bug #87685

Lines 18-24 Link Here

(-)jfbuild_src_20051009.orig/include/editor.h (-1 / +1 lines)
18		18
19	extern short temppicnum, tempcstat, templotag, temphitag, tempextra;	19	extern short temppicnum, tempcstat, templotag, temphitag, tempextra;
20	extern char tempshade, temppal, tempxrepeat, tempyrepeat;	20	extern char tempshade, temppal, tempxrepeat, tempyrepeat;
21	extern char somethingintab;	21	static char somethingintab;
22		22
23	extern char buildkeys[NUMBUILDKEYS];	23	extern char buildkeys[NUMBUILDKEYS];
24		24

Lines 27-33 Link Here

(-)jfbuild_src_20051009.orig/Makefile (-1 / +1 lines)
27	# Debugging options	27	# Debugging options
28	# RELEASE - 1 = no debugging	28	# RELEASE - 1 = no debugging
29	# EFENCE - 1 = compile with Electric Fence for malloc() debugging	29	# EFENCE - 1 = compile with Electric Fence for malloc() debugging
30	RELEASE?=0	30	RELEASE?=1
31	EFENCE?=0	31	EFENCE?=0
32		32
33	# SDK locations - adjust to match your setup	33	# SDK locations - adjust to match your setup

Lines 86-92 Link Here

(-)jfbuild_src_20051009.orig/src/build.c (-1 / +1 lines)
86		86
87	short temppicnum, tempcstat, templotag, temphitag, tempextra;	87	short temppicnum, tempcstat, templotag, temphitag, tempextra;
88	char tempshade, temppal, tempvis, tempxrepeat, tempyrepeat;	88	char tempshade, temppal, tempvis, tempxrepeat, tempyrepeat;
89	char somethingintab = 255;	89	static char somethingintab = 255;
90		90
91	static char boardfilename[BMAX_PATH], selectedboardfilename[BMAX_PATH];	91	static char boardfilename[BMAX_PATH], selectedboardfilename[BMAX_PATH];
92	static struct _directoryitem {	92	static struct _directoryitem {




	}
}


unsigned long crc32(unsigned char *blk, unsigned long len)
{
	unsigned long crc;
	
	crc32init(&crc);
	crc32block(&crc, blk, len);
	return crc32finish(&crc);
}

void crc32init(unsigned long *crcvar)
{
	if (!crcvar) return;

Lines 24-29 Link Here

(-)jfbuild_src_20051009.orig/src/sdlayer.c (-5 / +28 lines)
24	// undefine to restrict windowed resolutions to conventional sizes	24	// undefine to restrict windowed resolutions to conventional sizes
25	#define ANY_WINDOWED_SIZE	25	#define ANY_WINDOWED_SIZE
26		26
		27	// fix for mousewheel
		28	#define MWHEELTICKS 10
		29	static unsigned long mwheelup, mwheeldown;
		30
27	int _buildargc = 1;	31	int _buildargc = 1;
28	char **_buildargv = NULL;	32	char **_buildargv = NULL;
29	extern long app_main(long argc, char *argv[]);	33	extern long app_main(long argc, char *argv[]);
Lines 486-493 Link Here
486	initprintf("Initialising mouse\n");	490	initprintf("Initialising mouse\n");
487		491
488	// grab input	492	// grab input
489	grabmouse(1);
490	moustat=1;	493	moustat=1;
		494	grabmouse(1);
491		495
492	return 0;	496	return 0;
493	}	497	}
Lines 1363-1376 Link Here
1363	case SDL_BUTTON_LEFT: j = 0; break;	1367	case SDL_BUTTON_LEFT: j = 0; break;
1364	case SDL_BUTTON_RIGHT: j = 1; break;	1368	case SDL_BUTTON_RIGHT: j = 1; break;
1365	case SDL_BUTTON_MIDDLE: j = 2; break;	1369	case SDL_BUTTON_MIDDLE: j = 2; break;
1366	default: j = -1; break;	1370	default: j = ev.button.button; break;
1367	}	1371	}
1368	if (j<0) break;	1372	if (j<0) break;
1369		1373
1370	if (ev.button.state == SDL_PRESSED)	1374	if (ev.button.state == SDL_PRESSED) {
		1375	if (ev.button.button == SDL_BUTTON_WHEELUP) {
		1376	mwheelup = totalclock;
		1377	}
		1378	if (ev.button.button == SDL_BUTTON_WHEELDOWN) {
		1379	mwheeldown = totalclock;
		1380	}
1371	mouseb \|= (1<<j);	1381	mouseb \|= (1<<j);
1372	else	1382	}
1373	mouseb &= ~(1<<j);	1383	else {
		1384	if (j < 4) mouseb &= ~(1<<j);
		1385	}
1374		1386
1375	if (mousepresscallback)	1387	if (mousepresscallback)
1376	mousepresscallback(j+1, ev.button.state == SDL_PRESSED);	1388	mousepresscallback(j+1, ev.button.state == SDL_PRESSED);
Lines 1435-1440 Link Here
1435		1447
1436	sampletimer();	1448	sampletimer();
1437		1449
		1450	if (moustat) {
		1451	if ((mwheelup) && (mwheelup <= (totalclock - MWHEELTICKS))) {
		1452	mouseb &= ~16;
		1453	mwheelup = 0;
		1454	}
		1455	if ((mwheeldown) && (mwheeldown <= (totalclock - MWHEELTICKS))) {
		1456	mouseb &= ~32;
		1457	mwheeldown = 0;
		1458	}
		1459	}
		1460
1438	#ifdef HAVE_GTK2	1461	#ifdef HAVE_GTK2
1439	if (gtkenabled) update_startwin();	1462	if (gtkenabled) update_startwin();
1440	#endif	1463	#endif

Return to bug 87685

Lines 73-88 Link Here

(-)jfbuild_src_20051009.orig/src/crc32.c (-10 lines)
73	}	73	}
74	}	74	}
75		75
76
77	unsigned long crc32(unsigned char *blk, unsigned long len)
78	{
79	unsigned long crc;
80
81	crc32init(&crc);
82	crc32block(&crc, blk, len);
83	return crc32finish(&crc);
84	}
85
86	void crc32init(unsigned long *crcvar)	76	void crc32init(unsigned long *crcvar)
87	{	77	{
88	if (!crcvar) return;	78	if (!crcvar) return;