Attachment #547350 for bug #639492

View | Details | Raw Unified | Return to bug 639492
Collapse All | Expand All

Lines 142-149 TBackground *TDeskTop::initBackground( TRect r ) Link Here

(-)a/classes/tdesktop.cc (-2 / +2 lines)
142	static	142	static
143	unsigned iSqr( unsigned i )	143	unsigned iSqr( unsigned i )
144	{	144	{
145	unsigned res1 = 2;	145	int res1 = 2;
146	unsigned res2 = i/res1;	146	int res2 = i/res1;
147	while( abs( res1 - res2 ) > 1 )	147	while( abs( res1 - res2 ) > 1 )
148	{	148	{
149	res1 = (res1 + res2)/2;	149	res1 = (res1 + res2)/2;

Lines 360-369 void TDisplay::setArgv(int aArgc, char aArgv, char aEnvir) Link Here

(-)a/classes/tdisplay.cc (-3 / +3 lines)
360	environment=aEnvir;	360	environment=aEnvir;
361	}	361	}
362		362
363	Boolean TDisplay::searchClosestRes(TScreenResolution *res, unsigned x,	363	Boolean TDisplay::searchClosestRes(TScreenResolution *res, int x,
364	unsigned y, unsigned cant, unsigned &pos)	364	int y, unsigned cant, unsigned &pos)
365	{	365	{
366	unsigned i, minDif, indexMin, dif;	366	int i, minDif, indexMin, dif;
367	int firstXMatch=-1;	367	int firstXMatch=-1;
368	// Look for an exact match of width	368	// Look for an exact match of width
369	for (i=0; i<cant && res[i].x<x; i++)	369	for (i=0; i<cant && res[i].x<x; i++)

Lines 2536-2542 TScreenFont256 *TScreenX11::ChooseClosestFont(unsigned fW, unsigned fH) Link Here

(-)a/classes/x11/x11src.cc (-1 / +1 lines)
2536	nFont=&font10x20;	2536	nFont=&font10x20;
2537	else	2537	else
2538	{	2538	{
2539	unsigned target=fW*fH;	2539	int target=fW*fH;
2540	int dif1=abs(8*16-target);	2540	int dif1=abs(8*16-target);
2541	int dif2=abs(10*20-target);	2541	int dif2=abs(10*20-target);
2542	if (dif1<dif2)	2542	if (dif1<dif2)

Lines 30-36 struct TScreenFont256 Link Here

(-)a/include/tv/screen.h (-2 / +2 lines)
30		30
31	struct TScreenResolution	31	struct TScreenResolution
32	{	32	{
33	unsigned x,y;	33	int x,y;
34	};	34	};
35		35
36	// Type for the callback called when the driver needs a new font.	36	// Type for the callback called when the driver needs a new font.
Lines 152-158 public: Link Here
152	static Boolean setDontMoveHiddenCursor(Boolean value);	152	static Boolean setDontMoveHiddenCursor(Boolean value);
153	static Boolean getDontMoveHiddenCursor() { return opts1 & DontMoveHiddenCursor ? True : False; };	153	static Boolean getDontMoveHiddenCursor() { return opts1 & DontMoveHiddenCursor ? True : False; };
154	// Helper to look for the closest resolution from a list	154	// Helper to look for the closest resolution from a list
155	static Boolean searchClosestRes(TScreenResolution *res, unsigned x, unsigned y,	155	static Boolean searchClosestRes(TScreenResolution *res, int x, int y,
156	unsigned cant, unsigned &pos);	156	unsigned cant, unsigned &pos);
157	// Returns the default palette	157	// Returns the default palette
158	static const TScreenColor *getDefaultPalette() { return PC_BIOSPalette; }	158	static const TScreenColor *getDefaultPalette() { return PC_BIOSPalette; }

Return to bug 639492