Attachment #447484 for bug #594176

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

Lines 144-150 Link Here

(-)tvision/classes/tdesktop.cc.old (-1 / +1 lines)
144	{	144	{
145	unsigned res1 = 2;	145	unsigned res1 = 2;
146	unsigned res2 = i/res1;	146	unsigned res2 = i/res1;
147	while( abs( res1 - res2 ) > 1 )	147	while(( res1 - res2 ) > 1 )
148	{	148	{
149	res1 = (res1 + res2)/2;	149	res1 = (res1 + res2)/2;
150	res2 = i/res1;	150	res2 = i/res1;




 if (firstXMatch!=-1)
   {// Return the closest y that match x
    i=indexMin=firstXMatch;
    minDif=res[i].y-y;
    while (++i<cant && res[i].x==x)
      {
       dif=res[i].y-y;
       if (dif<minDif)
         {
          minDif=dif;

   }
 // No x match, looks the one with minimum differences
 indexMin=0;
 minDif=((res[0].y-y)+(res[0].x-x));
 i=1;
 while (i<cant)
   {
    dif=((res[i].y-y)+(res[i].x-x));
    if (dif<minDif)
      {
       minDif=dif;

Lines 110-119 Link Here

(-)tvision/classes/tvtext1.cc.old (-4 / +4 lines)
110	char TCheckBoxes::button[] = " [ ] ";	110	char TCheckBoxes::button[] = " [ ] ";
111	char TCheckBoxes::obutton[] = " [ ] ";	111	char TCheckBoxes::obutton[] = " [ ] ";
112		112
113	TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; // ±þ²	113	TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ²
114	TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // ±þ²	114	TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ²
115	TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // ±þ²	115	TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ²
116	TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // ±þ²	116	TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ²
117		117
118	char TButton::shadows[] = "\xDC\xDB\xDF"; // ÜÛß	118	char TButton::shadows[] = "\xDC\xDB\xDF"; // ÜÛß
119	char TButton::oshadows[] = "\xDC\xDB\xDF"; // ÜÛß	119	char TButton::oshadows[] = "\xDC\xDB\xDF"; // ÜÛß




 else
   {
    unsigned target=fW*fH;
    int dif1=8*16-target;
    int dif2=10*20-target;
    if (dif1<dif2)
       nFont=&font8x16;
    else

       TScreenX11::leftPtr;
char   TScreenX11::busyCursorMap[]=
{
 (char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xfd, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xf9, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xf1, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xe1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
 (char) 0xc1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
 (char) 0x81, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0x01, (char) 0x9f, (char) 0x3b, (char) 0x1f,
 (char) 0x01, (char) 0xce, (char) 0x7b, (char) 0x1e,
 (char) 0xc1, (char) 0xef, (char) 0xfb, (char) 0x1e,
 (char) 0xc9, (char) 0xef, (char) 0xf1, (char) 0x18,
 (char) 0x9d, (char) 0xef, (char) 0xf1, (char) 0x18,
 (char) 0x9f, (char) 0xef, (char) 0xfe, (char) 0x18,
 (char) 0x3f, (char) 0x6f, (char) 0xff, (char) 0x1e,
 (char) 0x3f, (char) 0xcf, (char) 0x7f, (char) 0x1e,
 (char) 0xff, (char) 0x9f, (char) 0x3f, (char) 0x1f,
 (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
 (char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
 (char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f
};
char TScreenX11::busyCursorMask[]=
{
 (char) 0xfc, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xf8, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xf0, (char) 0xff, (char) 0xff, (char) 0x1f,
 (char) 0xe0, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0xc0, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0x80, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0x00, (char) 0x1f, (char) 0x00, (char) 0x1f,
 (char) 0x00, (char) 0x0e, (char) 0x00, (char) 0x1e,
 (char) 0x00, (char) 0x04, (char) 0x00, (char) 0x1c,
 (char) 0x00, (char) 0x04, (char) 0x00, (char) 0x10,
 (char) 0x80, (char) 0x07, (char) 0x00, (char) 0x10,
 (char) 0x08, (char) 0x07, (char) 0x00, (char) 0x10,
 (char) 0x0c, (char) 0x07, (char) 0x00, (char) 0x10,
 (char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x10,
 (char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x1c,
 (char) 0x3f, (char) 0x0f, (char) 0x00, (char) 0x1e,
 (char) 0xff, (char) 0x1f, (char) 0x00, (char) 0x1f,
 (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
 (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f
};

/* This is the function which creates cursors. On success it return

Return to bug 594176

Lines 381-390 Link Here

(-)tvision/classes/tdisplay.cc.old (-4 / +4 lines)
381	if (firstXMatch!=-1)	381	if (firstXMatch!=-1)
382	{// Return the closest y that match x	382	{// Return the closest y that match x
383	i=indexMin=firstXMatch;	383	i=indexMin=firstXMatch;
384	minDif=abs(res[i].y-y);	384	minDif=res[i].y-y;
385	while (++i<cant && res[i].x==x)	385	while (++i<cant && res[i].x==x)
386	{	386	{
387	dif=abs(res[i].y-y);	387	dif=res[i].y-y;
388	if (dif<minDif)	388	if (dif<minDif)
389	{	389	{
390	minDif=dif;	390	minDif=dif;
Lines 396-406 Link Here
396	}	396	}
397	// No x match, looks the one with minimum differences	397	// No x match, looks the one with minimum differences
398	indexMin=0;	398	indexMin=0;
399	minDif=abs(res[0].y-y)+abs(res[0].x-x);	399	minDif=((res[0].y-y)+(res[0].x-x));
400	i=1;	400	i=1;
401	while (i<cant)	401	while (i<cant)
402	{	402	{
403	dif=abs(res[i].y-y)+abs(res[i].x-x);	403	dif=((res[i].y-y)+(res[i].x-x));
404	if (dif<minDif)	404	if (dif<minDif)
405	{	405	{
406	minDif=dif;	406	minDif=dif;

Lines 2457-2464 Link Here

(-)tvision/classes/x11/x11src.cc.old (-42 / +42 lines)
2457	else	2457	else
2458	{	2458	{
2459	unsigned target=fW*fH;	2459	unsigned target=fW*fH;
2460	int dif1=abs(8*16-target);	2460	int dif1=8*16-target;
2461	int dif2=abs(10*20-target);	2461	int dif2=10*20-target;
2462	if (dif1<dif2)	2462	if (dif1<dif2)
2463	nFont=&font8x16;	2463	nFont=&font8x16;
2464	else	2464	else
Lines 2555-2603 Link Here
2555	TScreenX11::leftPtr;	2555	TScreenX11::leftPtr;
2556	char TScreenX11::busyCursorMap[]=	2556	char TScreenX11::busyCursorMap[]=
2557	{	2557	{
2558	0xff, 0xff, 0xff, 0x1f,	2558	(char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f,
2559	0xfd, 0xff, 0xff, 0x1f,	2559	(char) 0xfd, (char) 0xff, (char) 0xff, (char) 0x1f,
2560	0xf9, 0xff, 0xff, 0x1f,	2560	(char) 0xf9, (char) 0xff, (char) 0xff, (char) 0x1f,
2561	0xf1, 0xff, 0xff, 0x1f,	2561	(char) 0xf1, (char) 0xff, (char) 0xff, (char) 0x1f,
2562	0xe1, 0x7f, 0xc0, 0x1f,	2562	(char) 0xe1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
2563	0xc1, 0x7f, 0xc0, 0x1f,	2563	(char) 0xc1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
2564	0x81, 0x3f, 0x80, 0x1f,	2564	(char) 0x81, (char) 0x3f, (char) 0x80, (char) 0x1f,
2565	0x01, 0x9f, 0x3b, 0x1f,	2565	(char) 0x01, (char) 0x9f, (char) 0x3b, (char) 0x1f,
2566	0x01, 0xce, 0x7b, 0x1e,	2566	(char) 0x01, (char) 0xce, (char) 0x7b, (char) 0x1e,
2567	0xc1, 0xef, 0xfb, 0x1e,	2567	(char) 0xc1, (char) 0xef, (char) 0xfb, (char) 0x1e,
2568	0xc9, 0xef, 0xf1, 0x18,	2568	(char) 0xc9, (char) 0xef, (char) 0xf1, (char) 0x18,
2569	0x9d, 0xef, 0xf1, 0x18,	2569	(char) 0x9d, (char) 0xef, (char) 0xf1, (char) 0x18,
2570	0x9f, 0xef, 0xfe, 0x18,	2570	(char) 0x9f, (char) 0xef, (char) 0xfe, (char) 0x18,
2571	0x3f, 0x6f, 0xff, 0x1e,	2571	(char) 0x3f, (char) 0x6f, (char) 0xff, (char) 0x1e,
2572	0x3f, 0xcf, 0x7f, 0x1e,	2572	(char) 0x3f, (char) 0xcf, (char) 0x7f, (char) 0x1e,
2573	0xff, 0x9f, 0x3f, 0x1f,	2573	(char) 0xff, (char) 0x9f, (char) 0x3f, (char) 0x1f,
2574	0xff, 0x3f, 0x80, 0x1f,	2574	(char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
2575	0xff, 0x7f, 0xc0, 0x1f,	2575	(char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
2576	0xff, 0x7f, 0xc0, 0x1f,	2576	(char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
2577	0xff, 0xff, 0xff, 0x1f	2577	(char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f
2578	};	2578	};
2579	char TScreenX11::busyCursorMask[]=	2579	char TScreenX11::busyCursorMask[]=
2580	{	2580	{
2581	0xfc, 0xff, 0xff, 0x1f,	2581	(char) 0xfc, (char) 0xff, (char) 0xff, (char) 0x1f,
2582	0xf8, 0xff, 0xff, 0x1f,	2582	(char) 0xf8, (char) 0xff, (char) 0xff, (char) 0x1f,
2583	0xf0, 0xff, 0xff, 0x1f,	2583	(char) 0xf0, (char) 0xff, (char) 0xff, (char) 0x1f,
2584	0xe0, 0x3f, 0x80, 0x1f,	2584	(char) 0xe0, (char) 0x3f, (char) 0x80, (char) 0x1f,
2585	0xc0, 0x3f, 0x80, 0x1f,	2585	(char) 0xc0, (char) 0x3f, (char) 0x80, (char) 0x1f,
2586	0x80, 0x3f, 0x80, 0x1f,	2586	(char) 0x80, (char) 0x3f, (char) 0x80, (char) 0x1f,
2587	0x00, 0x1f, 0x00, 0x1f,	2587	(char) 0x00, (char) 0x1f, (char) 0x00, (char) 0x1f,
2588	0x00, 0x0e, 0x00, 0x1e,	2588	(char) 0x00, (char) 0x0e, (char) 0x00, (char) 0x1e,
2589	0x00, 0x04, 0x00, 0x1c,	2589	(char) 0x00, (char) 0x04, (char) 0x00, (char) 0x1c,
2590	0x00, 0x04, 0x00, 0x10,	2590	(char) 0x00, (char) 0x04, (char) 0x00, (char) 0x10,
2591	0x80, 0x07, 0x00, 0x10,	2591	(char) 0x80, (char) 0x07, (char) 0x00, (char) 0x10,
2592	0x08, 0x07, 0x00, 0x10,	2592	(char) 0x08, (char) 0x07, (char) 0x00, (char) 0x10,
2593	0x0c, 0x07, 0x00, 0x10,	2593	(char) 0x0c, (char) 0x07, (char) 0x00, (char) 0x10,
2594	0x1f, 0x06, 0x00, 0x10,	2594	(char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x10,
2595	0x1f, 0x06, 0x00, 0x1c,	2595	(char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x1c,
2596	0x3f, 0x0f, 0x00, 0x1e,	2596	(char) 0x3f, (char) 0x0f, (char) 0x00, (char) 0x1e,
2597	0xff, 0x1f, 0x00, 0x1f,	2597	(char) 0xff, (char) 0x1f, (char) 0x00, (char) 0x1f,
2598	0xff, 0x3f, 0x80, 0x1f,	2598	(char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
2599	0xff, 0x3f, 0x80, 0x1f,	2599	(char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
2600	0xff, 0x3f, 0x80, 0x1f	2600	(char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f
2601	};	2601	};
2602		2602
2603	/* This is the function which creates cursors. On success it return	2603	/* This is the function which creates cursors. On success it return