[PD-cvs] pd/src s_main.c,1.20.2.3,1.20.2.4

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28832

Modified Files:
      Tag: branch-v0-39-2-extended
	s_main.c 
Log Message:
handtunedC the fontsizes on Debian and Mac OS X 10.4

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -d -r1.20.2.3 -r1.20.2.4
*** s_main.c	8 Jan 2007 02:07:17 -0000	1.20.2.3
--- s_main.c	8 Jan 2007 05:50:30 -0000	1.20.2.4
***************
*** 105,110 ****
  
  static t_fontinfo sys_fontlist[] = {
!     {8, 5, 9, 0, 0, 0}, {10, 7, 13, 0, 0, 0}, {12, 9, 16, 0, 0, 0},
!     {16, 10, 20, 0, 0, 0}, {24, 15, 25, 0, 0, 0}, {36, 25, 45, 0, 0, 0}};
  #define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist))
  
--- 105,110 ----
  
  static t_fontinfo sys_fontlist[] = {
!     {8, 5, 9, 8, 5, 9}, {10, 7, 13, 10, 7, 14}, {12, 9, 16, 12, 8, 16},
!     {16, 10, 20, 16, 10, 18},{24, 15, 25, 24, 15, 29},{36, 25, 45, 36, 23, 43}};
  #define NFONT (sizeof(sys_fontlist)/sizeof(*sys_fontlist))
  
***************
*** 143,149 ****
  int sys_hostfontsize(int fontsize)
  {
- //    return (sys_findfont(fontsize)->fi_hostfontsize);
  	return (0 - fontsize);
- //	return 12;
  }
  
--- 143,147 ----
***************
*** 200,206 ****
          }
              /* j is now the "real" font index for the desired font index i. */
!         sys_fontlist[i].fi_hostfontsize = atom_getintarg(3 * j + 1, argc, argv);
!         sys_fontlist[i].fi_width = atom_getintarg(3 * j + 2, argc, argv);
!         sys_fontlist[i].fi_height = atom_getintarg(3 * j + 3, argc, argv);
      }
  #if 0
--- 198,204 ----
          }
              /* j is now the "real" font index for the desired font index i. */
! //        sys_fontlist[i].fi_hostfontsize = atom_getintarg(3 * j + 1, argc, argv);
! //        sys_fontlist[i].fi_width = atom_getintarg(3 * j + 2, argc, argv);
! //        sys_fontlist[i].fi_height = atom_getintarg(3 * j + 3, argc, argv);
      }
  #if 0