[PD-cvs] pd/src g_editor.c, 1.20.6.1, 1.20.6.2 g_text.c, 1.15.6.1, 1.15.6.2 u_main.tk, 1.25.6.3, 1.25.6.4

Hans-Christoph Steiner eighthave at users.sourceforge.net
Tue Nov 6 03:28:14 CET 2007


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

Modified Files:
      Tag: branch-v0-40-extended
	g_editor.c g_text.c u_main.tk 
Log Message:

- fixed new bug in new font panel where it would go to 8pt on cancel

- added cursor variables to u_main.tk and stuck them in the cursorlist struct
  so that the mouse cursors can be changed at runtime

- increased the height of atom boxes one pixel to prevent text hitting the
  outlet

- removed a bit of random cruft that made it in


Index: g_editor.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v
retrieving revision 1.20.6.1
retrieving revision 1.20.6.2
diff -C2 -d -r1.20.6.1 -r1.20.6.2
*** g_editor.c	4 Nov 2007 18:00:20 -0000	1.20.6.1
--- g_editor.c	6 Nov 2007 02:28:12 -0000	1.20.6.2
***************
*** 742,756 ****
  
  static char *cursorlist[] = {
! #ifdef MSW
!     "right_ptr",        /* CURSOR_RUNMODE_NOTHING */
! #else
!     "left_ptr",         /* CURSOR_RUNMODE_NOTHING */
! #endif
!     "arrow",            /* CURSOR_RUNMODE_CLICKME */
!     "sb_v_double_arrow", /* CURSOR_RUNMODE_THICKEN */
!     "plus",             /* CURSOR_RUNMODE_ADDPOINT */
!     "hand2",            /* CURSOR_EDITMODE_NOTHING */
!     "circle",           /* CURSOR_EDITMODE_CONNECT */
!     "X_cursor"          /* CURSOR_EDITMODE_DISCONNECT */
  };
  
--- 742,752 ----
  
  static char *cursorlist[] = {
!     "$cursor_runmode_nothing",
!     "$cursor_runmode_clickme",
!     "$cursor_runmode_thicken",
!     "$cursor_runmode_addpoint",
!     "$cursor_editmode_nothing",
!     "$cursor_editmode_connect",
!     "$cursor_editmode_disconnect"
  };
  

Index: g_text.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_text.c,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.2
diff -C2 -d -r1.15.6.1 -r1.15.6.2
*** g_text.c	4 Nov 2007 18:00:20 -0000	1.15.6.1
--- g_text.c	6 Nov 2007 02:28:12 -0000	1.15.6.2
***************
*** 953,957 ****
          int fontwidth = sys_fontwidth(font), fontheight = sys_fontheight(font);
          width = (x->te_width > 0 ? x->te_width : 6) * fontwidth + 2;
!         height = fontheight + 2; /* borrowed from TMARGIN, etc, in g_rtext.c */
      }
          /* if we're invisible we don't know our size so we just lie about
--- 953,957 ----
          int fontwidth = sys_fontwidth(font), fontheight = sys_fontheight(font);
          width = (x->te_width > 0 ? x->te_width : 6) * fontwidth + 2;
!         height = fontheight + 3; /* borrowed from TMARGIN, etc, in g_rtext.c */
      }
          /* if we're invisible we don't know our size so we just lie about

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.25.6.3
retrieving revision 1.25.6.4
diff -C2 -d -r1.25.6.3 -r1.25.6.4
*** u_main.tk	4 Nov 2007 21:16:48 -0000	1.25.6.3
--- u_main.tk	6 Nov 2007 02:28:12 -0000	1.25.6.4
***************
*** 15,26 ****
  if { $tcl_platform(platform) == "windows" }  {
      set pd_nt 1
! 	 set defaultFontFamily {Bitstream Vera Sans Mono}
      font create menuFont -family Tahoma -size 11
  } elseif { $tcl_platform(os) == "Darwin" } {  
      set pd_nt 2
! 	 set defaultFontFamily Monaco
  } else { 
      set pd_nt 0
! 	 set defaultFontFamily {Bitstream Vera Sans Mono}
[...4057 lines suppressed...]
*** 4428,4436 ****
  
      pd [concat pd startup-dialog $pd_nort [pdtk_encodedialog $pd_flags] \
!     [pdtk_encodedialog $pd_startup0] [pdtk_encodedialog $pd_startup1] \
!     [pdtk_encodedialog $pd_startup2] [pdtk_encodedialog $pd_startup3] \
!     [pdtk_encodedialog $pd_startup4] [pdtk_encodedialog $pd_startup5] \
!     [pdtk_encodedialog $pd_startup6] [pdtk_encodedialog $pd_startup7] \
!     [pdtk_encodedialog $pd_startup8] [pdtk_encodedialog $pd_startup9] \;]
  
  }
--- 4453,4461 ----
  
      pd [concat pd startup-dialog $pd_nort [pdtk_encodedialog $pd_flags] \
!             [pdtk_encodedialog $pd_startup0] [pdtk_encodedialog $pd_startup1] \
!             [pdtk_encodedialog $pd_startup2] [pdtk_encodedialog $pd_startup3] \
!             [pdtk_encodedialog $pd_startup4] [pdtk_encodedialog $pd_startup5] \
!             [pdtk_encodedialog $pd_startup6] [pdtk_encodedialog $pd_startup7] \
!             [pdtk_encodedialog $pd_startup8] [pdtk_encodedialog $pd_startup9] \;]
  
  }





More information about the Pd-cvs mailing list