brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doubles are %f or %g, not %d re-created fair copy accordingly

Browse Source 
2008-06-10  Thomas Thurman  <tthurman@gnome.org>

        * test/tokentest/tokentest.c (draw_string_to_spec): doubles are
	  %f or %g, not %d
        * test/tokentest/tokentest.ini: re-created fair copy accordingly


svn path=/trunk/; revision=3754
This commit is contained in:
Thomas Thurman 2008-06-10 13:57:23 +00:00 committed by Thomas James Alexander Thurman
parent 941e4bf967
commit 09501c9fab
3 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-10 Thomas Thurman <tthurman@gnome.org>
* test/tokentest/tokentest.c (draw_string_to_spec): doubles are
%f or %g, not %d
* test/tokentest/tokentest.ini: re-created fair copy accordingly
2008-06-10 Thomas Thurman <tthurman@gnome.org>
* test/tokentest: A preliminary attempt at a test for the

2
test/tokentest/tokentest.c
View File

@ -164,7 +164,7 @@ GString *draw_spec_to_string(MetaDrawSpec *spec)
break;
case POS_TOKEN_DOUBLE:
g_string_append_printf (result, "(double %d)", t.d.d.val);
g_string_append_printf (result, "(double %g)", t.d.d.val);
break;
case POS_TOKEN_OPERATOR:

94
test/tokentest/tokentest.ini
View File

@ -68,7 +68,7 @@ width `min` height=(str width)(min)(str height)
((3 `max` (width-title_width)) / 2)-1=( ( (int 3)(max)( (str width)(subtract)(str title_width) ) )(divide)(int 2) )(subtract)(int 1)
# Esco
((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67=( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -1717986918) )(multiply)(double -687194767)
((height - (ButtonIPad + 1) * 2) * 0.4) * 0.67=( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.4) )(multiply)(double 0.67)
# Atlanta, Bright, Carved2, Chiro, Clearlooks, Clearlooks-2.0-blend, Clearlooks-Pinstripe, Clearlooks2-Squared, Clearlooks2-Squared-Berries, ClearlooksWithACherryOnTop, Crux, Gilouche, GiloucheIM, Metabox, Mista, Outcrop, Quiet-Environment, Quiet-Environment-v2, Quiet-Graphite, Quiet-Graphite-v2, Quiet-Human, Quiet-Purple-2K6, Quiet-Purple-2K6-v2, River, Sandwish, Simple, SmoothGNOME, TangoDance, Tetelestai-Modern
((height - title_height) / 2) `max` 0=( ( (str height)(subtract)(str title_height) )(divide)(int 2) )(max)(int 0)
@ -179,13 +179,13 @@ width `min` height=(str width)(min)(str height)
(ButtonIPad+1) + 1=( (str ButtonIPad)(add)(int 1) )(add)(int 1)
# Esco
(height - (ButtonIPad + 1) * 2) * 0.4=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -1717986918)
(height - (ButtonIPad + 1) * 2) * 0.4=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.4)
# Esco
(height - (ButtonIPad + 1) * 2) * 0.4 + 1=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -1717986918)(add)(int 1)
(height - (ButtonIPad + 1) * 2) * 0.4 + 1=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.4)(add)(int 1)
# Esco
(height - (ButtonIPad + 1) * 2) * 0.67=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -687194767)
(height - (ButtonIPad + 1) * 2) * 0.67=( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.67)
# AgingGorilla, Crux, Gorilla, Sandwish, Soft Squares, Tactile, ThinMC
(height - object_height) / 2=( (str height)(subtract)(str object_height) )(divide)(int 2)
@ -227,7 +227,7 @@ width `min` height=(str width)(min)(str height)
(height-(ArrowSpacer*2)) `max` MinArrowSize=( (str height)(subtract)( (str ArrowSpacer)(multiply)(int 2) ) )(max)(str MinArrowSize)
# Outcrop
(height-1)-(title_height /1.5)=( (str height)(subtract)(int 1) )(subtract)( (str title_height)(divide)(double 0) )
(height-1)-(title_height /1.5)=( (str height)(subtract)(int 1) )(subtract)( (str title_height)(divide)(double 1.5) )
# Clearlooks-2.0-blend, Gilouche, GiloucheIM, TangoDance
(height-10)/2=( (str height)(subtract)(int 10) )(divide)(int 2)
@ -272,7 +272,7 @@ width `min` height=(str width)(min)(str height)
(title_height + 6)/2+1=( (str title_height)(add)(int 6) )(divide)(int 2)(add)(int 1)
# Esco
(width - (ButtonIPad + 1) * 2) * 0.67=( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -687194767)
(width - (ButtonIPad + 1) * 2) * 0.67=( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.67)
# AgingGorilla, Crux, Gorilla, Quiet-Environment, Quiet-Environment-v2, Quiet-Graphite, Quiet-Graphite-v2, Quiet-Human, Quiet-Purple-2K6, Quiet-Purple-2K6-v2, Sandwish, Soft Squares, Tactile, ThinMC
(width - object_width) / 2=( (str width)(subtract)(str object_width) )(divide)(int 2)
@ -350,79 +350,79 @@ width `min` height=(str width)(min)(str height)
0+2={2==}(int 0)(add)(int 2)
# Amiga
0.125 * height=(double 0)(multiply)(str height)
0.125 * height=(double 0.125)(multiply)(str height)
# Amiga
0.125 * width=(double 0)(multiply)(str width)
0.125 * width=(double 0.125)(multiply)(str width)
# Amiga, AmigaRelief
0.25 * height=(double 0)(multiply)(str height)
0.25 * height=(double 0.25)(multiply)(str height)
# Amiga, AmigaRelief
0.25 * width=(double 0)(multiply)(str width)
0.25 * width=(double 0.25)(multiply)(str width)
# AmigaRelief
0.3 * height=(double 858993459)(multiply)(str height)
0.3 * height=(double 0.3)(multiply)(str height)
# AmigaRelief
0.3 * width=(double 858993459)(multiply)(str width)
0.3 * width=(double 0.3)(multiply)(str width)
# Amiga, AmigaRelief
0.35 * height=(double 1717986918)(multiply)(str height)
0.35 * height=(double 0.35)(multiply)(str height)
# Amiga, AmigaRelief
0.35 * width=(double 1717986918)(multiply)(str width)
0.35 * width=(double 0.35)(multiply)(str width)
# Amiga, AmigaRelief
0.375 * height=(double 0)(multiply)(str height)
0.375 * height=(double 0.375)(multiply)(str height)
# Amiga, AmigaRelief
0.375 * width=(double 0)(multiply)(str width)
0.375 * width=(double 0.375)(multiply)(str width)
# Amiga, AmigaRelief
0.4 * height=(double -1717986918)(multiply)(str height)
0.4 * height=(double 0.4)(multiply)(str height)
# Amiga, AmigaRelief
0.4 * width=(double -1717986918)(multiply)(str width)
0.4 * width=(double 0.4)(multiply)(str width)
# Amiga, AmigaRelief
0.5 * height=(double 0)(multiply)(str height)
0.5 * height=(double 0.5)(multiply)(str height)
# Amiga, AmigaRelief
0.5 * width=(double 0)(multiply)(str width)
0.5 * width=(double 0.5)(multiply)(str width)
# Amiga, AmigaRelief
0.525 * height=(double -858993459)(multiply)(str height)
0.525 * height=(double 0.525)(multiply)(str height)
# AmigaRelief
0.525 * width=(double -858993459)(multiply)(str width)
0.525 * width=(double 0.525)(multiply)(str width)
# AmigaRelief
0.6 * height=(double 858993459)(multiply)(str height)
0.6 * height=(double 0.6)(multiply)(str height)
# AmigaRelief
0.6 * width=(double 858993459)(multiply)(str width)
0.6 * width=(double 0.6)(multiply)(str width)
# AmigaRelief
0.625 * height=(double 0)(multiply)(str height)
0.625 * height=(double 0.625)(multiply)(str height)
# AmigaRelief
0.625 * width=(double 0)(multiply)(str width)
0.625 * width=(double 0.625)(multiply)(str width)
# AmigaRelief
0.65 * height=(double -858993459)(multiply)(str height)
0.65 * height=(double 0.65)(multiply)(str height)
# AmigaRelief
0.7 * height=(double 1717986918)(multiply)(str height)
0.7 * height=(double 0.7)(multiply)(str height)
# AmigaRelief
0.7 * width=(double 1717986918)(multiply)(str width)
0.7 * width=(double 0.7)(multiply)(str width)
# AmigaRelief
0.75 * height=(double 0)(multiply)(str height)
0.75 * height=(double 0.75)(multiply)(str height)
# AmigaRelief
0.75 * width=(double 0)(multiply)(str width)
0.75 * width=(double 0.75)(multiply)(str width)
# 4DWM, AgingGorilla, Almond, Amiga, AmigaRelief, Aquarius, Atlanta, Bentham, Bright, Carved2, Chiro, Clearbox-in, Clearbox-look-2, Clearbox-out, Clearlooks, Clearlooks-2.0-blend, Clearlooks-Pinstripe, Clearlooks-RedExit, Clearlooks2-Squared, Clearlooks2-Squared-Berries, ClearlooksWithACherryOnTop, EasyListening, Esco, Firey 1.0, Firey Dark, Gilouche, GiloucheIM, Gorilla, MWM, Maemo, MetaGrip, Metabox, Outcrop, Quiet-Environment, Quiet-Environment-v2, Quiet-Graphite, Quiet-Graphite-v2, Quiet-Human, Quiet-Purple-2K6, Quiet-Purple-2K6-v2, Redmond, River, Shiny, Shiny-Tango, Silverado, Simple, Simplebox, SmoothGNOME, Soft Squares, Tactile, TangoDance, Tetelestai-Modern, Vista Basic, W2k, boxx, c2, pOS
1={1==}(int 1)
@ -560,16 +560,16 @@ ArrowSpacer `min` (width-MinArrowSize)/2=(str ArrowSpacer)(min)( (str width)(sub
ButtonIPad=(str ButtonIPad)
# Esco
ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33=(str ButtonIPad)(add)( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 1374389535)
ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33=(str ButtonIPad)(add)( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.33)
# Esco
ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1=(str ButtonIPad)(add)( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 1374389535)(add)(int 1)
ButtonIPad + (height - (ButtonIPad + 1) * 2) * 0.33 + 1=(str ButtonIPad)(add)( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.33)(add)(int 1)
# Esco
ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33=(str ButtonIPad)(add)( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 1374389535)
ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33=(str ButtonIPad)(add)( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.33)
# Esco
ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1=(str ButtonIPad)(add)( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 1374389535)(add)(int 1)
ButtonIPad + (width - (ButtonIPad + 1) * 2) * 0.33 + 1=(str ButtonIPad)(add)( (str width)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.33)(add)(int 1)
# Carved2, Chiro, Esco, River, c2
ButtonIPad + 1=(str ButtonIPad)(add)(int 1)
@ -752,10 +752,10 @@ height - ButtonIPad=(str height)(subtract)(str ButtonIPad)
height - ButtonIPad + 1=(str height)(subtract)(str ButtonIPad)(add)(int 1)
# Esco
height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4)=(str height)(subtract)(str ButtonIPad)(subtract)( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -1717986918) )
height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4)=(str height)(subtract)(str ButtonIPad)(subtract)( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.4) )
# Esco
height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1=(str height)(subtract)(str ButtonIPad)(subtract)( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double -1717986918) )(subtract)(int 1)
height - ButtonIPad - ((height - (ButtonIPad + 1) * 2) * 0.4) - 1=(str height)(subtract)(str ButtonIPad)(subtract)( ( (str height)(subtract)( (str ButtonIPad)(add)(int 1) )(multiply)(int 2) )(multiply)(double 0.4) )(subtract)(int 1)
# Atlanta, Carved2, Esco, Metabox, Redmond, SmoothGNOME, Tetelestai-Modern
height - ButtonIPad - 1=(str height)(subtract)(str ButtonIPad)(subtract)(int 1)
@ -1037,7 +1037,7 @@ height-top_height-2=(str height)(subtract)(str top_height)(subtract)(int 2)
height-top_height-bottom_height+1=(str height)(subtract)(str top_height)(subtract)(str bottom_height)(add)(int 1)
# Sloth
height/1.5=(str height)(divide)(double 0)
height/1.5=(str height)(divide)(double 1.5)
# 4DWM, Aquarius, Bentham, Clearbox-in, Clearbox-out, MWM, Simplebox, Sloth , Tetelestai-Modern
height/2=(str height)(divide)(int 2)
@ -1238,7 +1238,7 @@ title_height -7=(str title_height)(subtract)(int 7)
title_height / 2 - 5=(str title_height)(divide)(int 2)(subtract)(int 5)
# Outcrop
title_height /1.5=(str title_height)(divide)(double 0)
title_height /1.5=(str title_height)(divide)(double 1.5)
# Outcrop
title_height /2=(str title_height)(divide)(int 2)
@ -1529,16 +1529,16 @@ width - title_width - mini_icon_width - IconTitleSpacing * 3=(str width)(subtrac
width - title_width - mini_icon_width - IconTitleSpacing * 3 - 18=(str width)(subtract)(str title_width)(subtract)(str mini_icon_width)(subtract)(str IconTitleSpacing)(multiply)(int 3)(subtract)(int 18)
# Outcrop
width -(width /3.6)=(str width)(subtract)( (str width)(divide)(double -858993459) )
width -(width /3.6)=(str width)(subtract)( (str width)(divide)(double 3.6) )
# Outcrop
width -(width /3.6) +1=(str width)(subtract)( (str width)(divide)(double -858993459) )(add)(int 1)
width -(width /3.6) +1=(str width)(subtract)( (str width)(divide)(double 3.6) )(add)(int 1)
# Outcrop
width -(width /3.6) +2=(str width)(subtract)( (str width)(divide)(double -858993459) )(add)(int 2)
width -(width /3.6) +2=(str width)(subtract)( (str width)(divide)(double 3.6) )(add)(int 2)
# Outcrop
width -(width /3.6) -1=(str width)(subtract)( (str width)(divide)(double -858993459) )(subtract)(int 1)
width -(width /3.6) -1=(str width)(subtract)( (str width)(divide)(double 3.6) )(subtract)(int 1)
# Alphacube 0.9b Metacity Color, Alphacube 0.9b Metacity Light, Alphacube 0.9b Metacity Simple
width -7=(str width)(subtract)(int 7)
@ -1547,10 +1547,10 @@ width -7=(str width)(subtract)(int 7)
width / 2=(str width)(divide)(int 2)
# Outcrop
width / 3.4=(str width)(divide)(double 858993459)
width / 3.4=(str width)(divide)(double 3.4)
# Outcrop
width / 3.4 -1=(str width)(divide)(double 858993459)(subtract)(int 1)
width / 3.4 -1=(str width)(divide)(double 3.4)(subtract)(int 1)
# Outcrop
width /2=(str width)(divide)(int 2)
@ -1565,10 +1565,10 @@ width /2-1=(str width)(divide)(int 2)(subtract)(int 1)
width /2-2=(str width)(divide)(int 2)(subtract)(int 2)
# Outcrop
width /3.4 +1=(str width)(divide)(double 858993459)(add)(int 1)
width /3.4 +1=(str width)(divide)(double 3.4)(add)(int 1)
# Outcrop
width /3.4 +2=(str width)(divide)(double 858993459)(add)(int 2)
width /3.4 +2=(str width)(divide)(double 3.4)(add)(int 2)
# Mista
width `min` object_width=(str width)(min)(str object_width)