pd/src desire.tk, 1.1.2.425, 1.1.2.426 defaults.ddrc, 1.1.2.1, 1.1.2.2 - Pd-cvs

30 Aug 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20413
Modified Files:
      Tag: devel_0_39
    desire.tk defaults.ddrc 
Log Message:
moved font stuff from look(Thing:*) to look(View:*)
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.425
retrieving revision 1.1.2.426
diff -C2 -d -r1.1.2.425 -r1.1.2.426
*** desire.tk	30 Aug 2006 03:35:24 -0000	1.1.2.425
--- desire.tk	30 Aug 2006 03:58:36 -0000	1.1.2.426
***************
*** 503,518 ****
  #to get to these ones.
- #!@#$ Thing->View
- #set look(Thing:fontsize) 12
- #set look(Thing:fontfamily) courier
- #set look(Thing:fontstyle) normal
- #set look(Thing:fontitalic) 0
- #set look(Thing:fontstring2) "-*-courier-medium--normal--%d-*"
- #set look(Thing:fontstring) [format -*-courier-medium--normal--%d-* $look(Thing:fontsize)]
- #set look(Thing:fontwidth) [font measure $look(Thing:fontstring) W]
- #set look(Thing:fontheight) [font metrics $look(Thing:fontstring) -linespace]
- #set look(Thing:fontpady) 3
- #set look(Thing:fontpadx) 5
- 
  #!@#$ View->Box
  #set look(View:iowidth) 7
--- 503,506 ----
***************
*** 911,916 ****
    global look
    set fstring ""
!   set name $look(Thing:fontfamily); set style $look(Thing:fontstyle)
!   set italic $look(Thing:fontitalic); set size $look(Thing:fontsize)
    if {$style == "bold"} {
      set fstring "*-$name-bold"
--- 899,904 ----
    global look
    set fstring ""
!   set name   $look(View:fontfamily); set style $look(View:fontstyle)
!   set italic $look(View:fontitalic); set size  $look(View:fontsize)
    if {$style == "bold"} {
      set fstring "*-$name-bold"
***************
*** 919,935 ****
    }
    if {$italic} {
!     if {$name == "Helvetica" || $name == "Courier"} {
!       set look(Thing:fontstring) "$fstring-o-normal--$size-*"
!       set look(Thing:fontstring2)"$fstring-o-normal--%d-*"
!     } else {
!       set look(Thing:fontstring) "$fstring-i-normal--$size-*"
!       set look(Thing:fontstring2) "$fstring-i-normal--%d-*"
!     }
    } else {
!     set look(Thing:fontstring) "$fstring-r-normal--$size-*"
!     set look(Thing:fontstring2) "$fstring-r-normal--%d-*"
    }
!   set look(Thing:fontwidth) [font measure $look(Thing:fontstring) W]
!   set look(Thing:fontheight) [font metrics $look(Thing:fontstring) -linespace]
  }
  #-----------------------------------------------------------------------------------#
--- 907,918 ----
    }
    if {$italic} {
!     if {$name == "Helvetica" || $name == "Courier"} {set ital o} else {set ital i}
    } else {
!     set ital r
    }
!   set look(View:fontstring)  "$fstring-$ital-normal--$size-*"
!   set look(View:fontstring2) "$fstring-$ital-normal--%d-*"
!   set look(View:fontwidth)  [font measure $look(View:fontstring) W]
!   set look(View:fontheight) [font metrics $look(View:fontstring) -linespace]
  }
  #-----------------------------------------------------------------------------------#
***************
*** 5035,5043 ****
      	set no_max_label 0
      	bind all <KeyPress-F1> help
!     	set @size $look(Thing:fontsize)
! 	set @font $look(Thing:fontfamily)
! 	set @style $look(Thing:fontstyle)
! 	set @italic $look(Thing:fontitalic)
! 	set @fstr $look(Thing:fontstring)
    puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic"
    set bold 0
--- 5018,5026 ----
      	set no_max_label 0
      	bind all <KeyPress-F1> help
!     	set @size   $look(View:fontsize)
! 	set @font   $look(View:fontfamily)
! 	set @style  $look(View:fontstyle)
! 	set @italic $look(View:fontitalic)
! 	set @fstr   $look(View:fontstring)
    puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic"
    set bold 0
***************
*** 5743,5750 ****
    			$self font_get_xlfd $@$str2 $@font $@style $@size
    			#puts " fontstring::: $@str "
! 				set look(Thing:fontsize) $@size
! 				set look(Thing:fontfamily) $@font
! 				set look(Thing:fontstyle) $@style
! 				set look(Thing:fontitalic) $@italic
    			#set look($class:$name) $look($class:$name)
    			#puts "  $class:$name ::: $look($class:$name)"
--- 5726,5733 ----
    			$self font_get_xlfd $@$str2 $@font $@style $@size
    			#puts " fontstring::: $@str "
! 				set look(View:fontsize) $@size
! 				set look(View:fontfamily) $@font
! 				set look(View:fontstyle) $@style
! 				set look(View:fontitalic) $@italic
    			#set look($class:$name) $look($class:$name)
    			#puts "  $class:$name ::: $look($class:$name)"
***************
*** 5921,5928 ****
    global look
    $self font_get_xlfd .$self $@font $@style $@size
! 	set look(Thing:fontsize) $@size
! 	set look(Thing:fontfamily) $@font
! 	set look(Thing:fontstyle) $@style
! 	set look(Thing:fontitalic) $@italic
    puts "	font :: $@font"
    puts "	size :: $@size"
--- 5904,5911 ----
    global look
    $self font_get_xlfd .$self $@font $@style $@size
! 	set look(View:fontsize) $@size
! 	set look(View:fontfamily) $@font
! 	set look(View:fontstyle) $@style
! 	set look(View:fontitalic) $@italic
    puts "	font :: $@font"
    puts "	size :: $@size"
Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** defaults.ddrc	30 Aug 2006 02:17:52 -0000	1.1.2.1
--- defaults.ddrc	30 Aug 2006 03:58:37 -0000	1.1.2.2
***************
*** 33,37 ****
      bg #ccebff
    }
!   Thing {
      fontfamily courier
      fontheight 13
--- 33,39 ----
      bg #ccebff
    }
!   View {
!     bg #ffffff
!     fg #000000
      fontfamily courier
      fontheight 13
***************
*** 44,51 ****
      fontstyle normal
      fontwidth 7
-   }
-   View {
-     bg #ffffff
-     fg #000000
      frame1 #99cccc
      frame2 #668888
--- 46,49 ----