[PD-cvs] pd/src s_main.c,1.7.4.17.2.22,1.7.4.17.2.22.2.1

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	s_main.c 
Log Message:
removed #ifdef DESIRE


Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.22
retrieving revision 1.7.4.17.2.22.2.1
diff -C2 -d -r1.7.4.17.2.22 -r1.7.4.17.2.22.2.1
*** s_main.c	23 Nov 2006 20:15:50 -0000	1.7.4.17.2.22
--- s_main.c	30 Nov 2006 03:55:48 -0000	1.7.4.17.2.22.2.1
***************
*** 5,9 ****
  /* IOhannes :
   * hacked the code to add advanced multidevice-support
!  * 1311:forum::für::umläute:2001
   */
  
--- 5,9 ----
  /* IOhannes :
   * hacked the code to add advanced multidevice-support
!  * 1311:forum::fr::uml�te:2001
   */
  
***************
*** 178,189 ****
  }
  
- #ifdef DESIRE
  /* in DesireData you *shouldn't* use sys_fontwidth nor sys_fontheight */
! int sys_fontwidth(int fontsize)  {return 42;}
! int sys_fontheight(int fontsize) {return 42;}
! #else
! int sys_fontwidth(int fontsize)  {return (sys_findfont(fontsize)->fi_width);}
! int sys_fontheight(int fontsize) {return (sys_findfont(fontsize)->fi_height);}
! #endif
  
  int sys_defaultfont;
--- 178,184 ----
  }
  
  /* in DesireData you *shouldn't* use sys_fontwidth nor sys_fontheight */
! int sys_fontwidth(int fontsize)  {return -666;}
! int sys_fontheight(int fontsize) {return -666;}
  
  int sys_defaultfont;
***************
*** 218,222 ****
  open(), read(), etc, calls to be served somehow from the GUI too. */
  
- #ifdef DESIRE
  /* for DesireData this should be eventually nuked */
  void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
--- 213,216 ----
***************
*** 245,315 ****
      sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
  }
- #else
- void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
- {
-     char *cwd = atom_getsymbolarg(0, argc, argv)->s_name;
-     t_namelist *nl;
-     unsigned int i, j;
-     if (argc != 2 + 3 * NHOSTFONT) bug("glob_initfromgui");
-     for (i = 0; i < NFONT; i++)
-     {
-         int wantheight = sys_fontlist[i].fi_maxheight;
-         for (j = 0; j < NHOSTFONT-1; j++)
-         {
-             if (atom_getintarg(3 * (j + 1) + 3, argc, argv) > wantheight)
-                     break;
-         }
-             /* 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
-     for (i = 0; i < 6; i++)
-         fprintf(stderr, "font %d %d %d %d %d\n",
-             sys_fontlist[i].fi_fontsize,
-             sys_fontlist[i].fi_maxheight,
-             sys_fontlist[i].fi_hostfontsize,
-             sys_fontlist[i].fi_width,
-             sys_fontlist[i].fi_height);
- #endif
-         /* load dynamic libraries specified with "-lib" args */
-     for  (nl = sys_externlist; nl; nl = nl->nl_next)
-         if (!sys_load_lib(cwd, nl->nl_string, 0))
-             post("%s: can't load library", nl->nl_string);
- 
-         /* open patches specifies with "-open" args */
-     for  (nl = sys_openlist; nl; nl = nl->nl_next)
-         openit(cwd, nl->nl_string);
-     namelist_free(sys_openlist);
-     sys_openlist = 0;
-         /* send messages specified with "-send" args */
-     for  (nl = sys_messagelist; nl; nl = nl->nl_next)
-     {
-         t_binbuf *b = binbuf_new();
-         binbuf_text(b, nl->nl_string, strlen(nl->nl_string));
-         binbuf_eval(b, 0, 0, 0);
-         binbuf_free(b);
-     }
-     namelist_free(sys_messagelist);
-     sys_messagelist = 0;
-     sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
- }
- #endif
  
  static void sys_afterargparse(void);
  
- #ifdef DESIRE
  EXTERN t_hash *class_table;
- #endif
  
  /* this is called from main() in s_entry.c */
  int sys_main(int argc, char **argv)
  {
! 	int defeat_presets = 0, i;
! 
! #ifdef DESIRE
      class_table = hash_new(127);
- #endif
  
      /* jsarlo { */
--- 239,252 ----
      sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
  }
  
  static void sys_afterargparse(void);
  
  EXTERN t_hash *class_table;
  
  /* this is called from main() in s_entry.c */
  int sys_main(int argc, char **argv)
  {
!     int defeat_presets = 0, i;
      class_table = hash_new(127);
  
      /* jsarlo { */