Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
(object Petal
version 35)
(object Design "<Top Level>"
is_unit TRUE
file_name "c:\wserv\des\wsv4.mdl"
is_loaded TRUE
defaults (object defaults
rightMargin 0.25
leftMargin 0.25
topMargin 0.25
bottomMargin 0.5
pageOverlap 0.25
clipIconLabels TRUE
autoResize FALSE
snapToGrid TRUE
gridX 0
gridY 0
defaultFont (object Font
size 12
face "helvetica"
bold FALSE
italics FALSE
underline FALSE
strike FALSE
color 0
default_color TRUE)
showMessageNum 3)
root_category (object Class_Category "<Top Level>"
exportControl "Public"
global TRUE
subsystem "<Top Level>"
logical_models (list unit_reference_list
(object Class "Main"
documentation "Top level windows server, recieves commands from clients, events from the O/S and timer completions."
fields (list has_relationship_list
(object Has_Relationship
supplier "Client"
supplier_cardinality (value cardinality "n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "WsrvClient"
supplier_cardinality (value cardinality "1")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "System"
supplier_cardinality (value cardinality "1")
client_cardinality (value cardinality "1")))
cardinality (value Cardinality "1"))
(object Class "BackedUpWindow"
fields (list has_relationship_list
(object Has_Relationship
supplier "Backup Bitmap"))
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Window"))
collaborators (list association_list
(object Association
supplier "Bitmap")))
(object Class_Utility "$UNNAMED$0")
(object Class "Owner"
fields (list has_relationship_list
(object Has_Relationship
supplier "Bitmap"
supplier_cardinality (value cardinality "n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "Clock"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "Font"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))))
(object Class "GCB"
collaborators (list association_list
(object Association
supplier "Font"
supplier_cardinality (value cardinality "1")
client_cardinality (value cardinality "n"))
(object Association
supplier "Backup Bitmap"
supplier_cardinality (value cardinality "0..1")
client_cardinality (value cardinality "n")))
used_nodes (list uses_relationship_list
(object Uses_Relationship
supplier "Drawable")))
(object Class "Bitmap"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Drawable"))
collaborators (list association_list
(object Association
supplier "System Bitmaps"
supplier_cardinality (value cardinality "n")
client_cardinality (value cardinality "1"))))
(object Class "Font"
cardinality (value Cardinality "1..n"))
(object Class "$UNNAMED$1")
(object Class "System"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Owner")))
(object Class "System Bitmaps"
collaborators (list association_list
(object Association
supplier "Main"
supplier_cardinality (value cardinality "n")
client_cardinality (value cardinality "0"))
(object Association
supplier "Bitmap"))
cardinality (value Cardinality "1"))
(object Class "Drawable"
fields (list has_relationship_list
(object Has_Relationship
supplier "Window"))
used_nodes (list uses_relationship_list
(object Uses_Relationship
supplier "GCB"
supplier_cardinality (value cardinality "1")
client_cardinality (value cardinality "n"))))
(object Class "$UNNAMED$2")
(object Class "Window"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier
|Normal
|Window
|
)
(object Inheritance_Relationship
supplier "Drawable")))
(object Class "Normal
Window
")
(object Class "Clock"
fields (list has_relationship_list
(object Has_Relationship
supplier "GCB"))
used_nodes (list uses_relationship_list
(object Uses_Relationship
supplier "GCB")))
(object Class "System Clocks")
(object Class "WsrvClient"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Client")))
(object Class_Utility "$UNNAMED$3")
(object Class_Utility "$UNNAMED$4")
(object Parameterized_Class "$UNNAMED$5")
(object Instantiated_Class_Utility "$UNNAMED$6")
(object Instantiated_Class "$UNNAMED$7")
(object Parameterized_Class "$UNNAMED$8")
(object Class "Client"
fields (list has_relationship_list
(object Has_Relationship
supplier "GCB"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "Window"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1")))
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Owner")))
(object Metaclass "$UNNAMED$9")
(object Class_Utility "$UNNAMED$10")
(object Class "Backup Bitmap"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "Bitmap")))
(object Class "$UNNAMED$11")
(object Class "$UNNAMED$12")
(object Class "$UNNAMED$13")
(object Class "$UNNAMED$14")
(object Class_Category "$UNNAMED$15"
exportControl "Public"
logical_models (list unit_reference_list)
logical_presentations (list unit_reference_list))
(object Class_Category "$UNNAMED$16"
exportControl "Public"
logical_models (list unit_reference_list)
logical_presentations (list unit_reference_list)))
logical_presentations (list unit_reference_list
(object ClassDiagram "Main"
title "Main"
zoom 72
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list
(object ClassView "Class" "Main" @1
location (1053, 177)
label (object ItemLabel
location (944, 87)
nlines 2
max_width 255
justify 0
label "Main")
width 370
height 270
annotation 8)
(object ClassView "Class" "BackedUpWindow" @2
location (468, 1946)
label (object ItemLabel
location (361, 1859)
nlines 2
max_width 248
justify 0
label "BackedUpWindow")
width 360
height 260
annotation 8)
(object ClassView "Class" "Owner" @3
location (1204, 559)
label (object ItemLabel
location (1101, 476)
nlines 2
max_width 238
justify 0
label "Owner")
width 345
height 250
annotation 8)
(object ClassView "Class" "GCB" @4
location (1594, 1447)
label (object ItemLabel
location (1490, 1363)
nlines 2
max_width 240
justify 0
label "GCB")
annotation 8)
(object ClassView "Class" "Bitmap" @5
location (991, 1575)
label (object ItemLabel
location (887, 1491)
nlines 2
max_width 240
justify 0
label "Bitmap")
annotation 8)
(object ClassView "Class" "Font" @6
location (2195, 1345)
label (object ItemLabel
location (2091, 1261)
nlines 2
max_width 240
justify 0
label "Font")
annotation 8)
(object ClassView "Class" "System" @7
location (1802, 714)
label (object ItemLabel
location (1698, 630)
nlines 2
max_width 240
justify 0
label "System")
annotation 8)
(object ClassView "Class" "Drawable" @8
location (880, 1170)
label (object ItemLabel
location (776, 1086)
nlines 2
max_width 240
justify 0
label "Drawable")
annotation 8)
(object ClassView "Class" "Window" @9
location (467, 1407)
label (object ItemLabel
location (363, 1323)
nlines 2
max_width 240
justify 0
label "Window")
annotation 8)
(object ClassView "Class" "Clock" @10
location (1430, 988)
label (object ItemLabel
location (1326, 904)
nlines 2
max_width 240
justify 0
label "Clock")
annotation 8)
(object HasView ""
client @3
supplier @10)
(object ClassView "Class" "WsrvClient" @11
location (275, 680)
label (object ItemLabel
location (171, 596)
nlines 2
max_width 240
justify 0
label "WsrvClient")
annotation 8)
(object HasView ""
client @1
supplier @11)
(object HasView ""
client @10
supplier @4)
(object ClassView "Class" "Client" @12
location (759, 557)
label (object ItemLabel
location (655, 473)
nlines 2
max_width 240
justify 0
label "Client")
annotation 8)
(object HasView ""
client @12
supplier @9)
(object AssociationView ""
client @4
supplier @6)
(object HasView ""
client @12
supplier @4)
(object ClassView "Class" "Backup Bitmap" @13
location (991, 1968)
label (object ItemLabel
location (881, 1877)
nlines 2
max_width 256
justify 0
label "Backup Bitmap")
width 372
height 272
annotation 8)
(object AssociationView ""
client @4
supplier @13)
(object HasView ""
client @2
supplier @13)
(object InheritView ""
client @9
supplier @8)
(object InheritView ""
client @5
supplier @8)
(object InheritView ""
client @2
supplier @9)
(object InheritView ""
client @13
supplier @5)
(object InheritView ""
client @11
supplier @12)
(object InheritView ""
client @7
supplier @3)
(object HasView ""
client @3
supplier @5)
(object InheritView ""
client @12
supplier @3)
(object HasView ""
client @3
supplier @6)
(object HasView ""
client @1
supplier @7)
(object UsesView ""
client @4
supplier @8)
(object HasView ""
client @1
supplier @12)))))
root_subsystem (object SubSystem "<Top Level>"
physical_models (list unit_reference_list)
physical_presentations (list unit_reference_list
(object Module_Diagram "Main"
title "Main"
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list))))
process_structure (object Processes
ProcsNDevs (list
(object Process_Diagram ""
title ""
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list))))
properties (object Properties))