Dyalog · sloorush · Dec 9, 2024 · Dec 12, 2024 · Dec 12, 2024 · Dec 13, 2024
diff --git a/EWC/Handler.aplf b/EWC/Handler.aplf
@@ -1,5 +1,10 @@
  r←con Handler payload;ns;Event;ID;Info;events;fns;fn;event;reqfn;info;sns;i;code;conn;coni;sock;z;m;msg;sessionspace;form;hr;CALLER;app;new;old;token;TID;URL
- 'R'Log'#',(⍕con),': ',payload
+ ⎕TRAP←0 'S'
+ :If payload≡'{"Event":{"EventName":"Ping","ID":""}}'
+     'K'Log payload
+ :Else
+     'R'Log'#',(⍕con),': ',payload
+ :EndIf
  i←(2⊃SESSIONS)⍳con
  :If i>≢1⊃SESSIONS
      'W'Log'Message received from closed session #',⍕con
@@ -84,6 +89,8 @@
                          new←hr.Posn,hr.Size-HRBorder
                          :If old≢new
                              ∆NQ form 'Configure',new
+                         :Else
+                             'W' Log '*** Ignoring unchanged DeviceCapabilities'
                          :EndIf
                      :EndIf
                  :EndFor

diff --git a/EWC/Init.aplf b/EWC/Init.aplf
@@ -1,4 +1,4 @@
- {prefix}Init args;mode;z;i;t;fn;folder;⎕TRAP;DPR_FORM;_EWC
+ {prefix}Init args;mode;z;i;t;fn;folder;⎕TRAP;DPR_FORM;_EWC;dc
  ⎕IO←⎕ML←1
 
  ⎕TRAP←0 'S'
@@ -112,7 +112,7 @@
  allocateTokens
  DQTOKENS←⍬      ⍝ No tokens currently being DQ's
 
- HRBorder←40 17  ⍝ Additional space required for HR chrome
+ HRBorder←39 16  ⍝ Additional space required for HR chrome
  MENUOffset←23 0 ⍝ Space to allow for menu
  NOIDQ←0         ⍝ Allow interactive DQ by default
  WGID←0
@@ -130,8 +130,11 @@
      (⍕z)⎕SIGNAL 11
  :EndIf
 
- :If 4≤⍴devCaps←'.' ⎕WG 'DevCaps'
-     DPR←100÷⍨4⊃devCaps
+ :If 4≤⍴dc←'.' ⎕WG 'DevCaps'
+     DPR←100÷⍨4⊃dc
+     'devCaps' ⎕NS ''
+     devCaps.ScreenSize←⊃dc
+     devCaps.DPR←DPR
  :Else
      DPR←1
  :EndIf
diff --git a/EWC/Log.aplf b/EWC/Log.aplf
@@ -11,6 +11,7 @@ mode Log msg
 ⍝ N: Explicit NQ
 ⍝ P: ProcessEvent
 ⍝ G: WG
+⍝ K: Keep-Alive
 
 →(mode∊LOGMODES)↓0
 ⎕←((,'ZI2,<:>,ZI2,<.>,ZI3' ⎕FMT 1 3⍴¯3↑⎕TS),' ',mode,':') msg
diff --git a/EWC/MakeHR.aplf b/EWC/MakeHR.aplf
@@ -1,10 +1,11 @@
-err←MakeHR (home name modal);ns;count;maxtries;ok;cb;dpr;conn;z;v
+err←MakeHR (home name modal);ns;count;maxtries;ok;cb;dpr;conn;z;v;url
 ns←home⍎name
 home.⎕EX '_EWC.conn'
 cb←(⍕⎕THIS),'.HRCallbacks'
 dpr←DPR
 defaultPosnSize ns
-'HR' ns.⎕WC 'HTMLRenderer' ('Caption' ns.Caption) ('URL' ('localhost:',⍕PORT)) ('Size' (dpr×ns.Size+HRBorder))('Coord' ns.Coord)('Posn' (dpr×ns.Posn))('Event' ('Close' 'Configure') cb)('Visible' (~modal))
+url←('localhost:',⍕PORT)
+'HR' ns.⎕WC 'HTMLRenderer' ('Caption' ns.Caption) ('URL' url) ('Size' (dpr×ns.Size+HRBorder))('Coord' ns.Coord)('Posn' (dpr×ns.Posn))('Event' ('Close' 'Configure') cb)('Visible' (~modal))
 'D' Log 'Created HTMLRenderer ',(⍕ns),'.HR'
 
 :If SHOWDEVTOOLS
@@ -24,8 +25,11 @@ count←ok←0 ⋄ maxtries←200
     :EndIf
     ⎕Dl 0.1 ⍝ Allow Handler to process connection
 :Until (count>maxtries)∨ok←2=home.⎕NC '_EWC.conn'
-err←(~ok)/'Unable to initialise HTMLRenderer'
-:If ~ok ⋄ ∘∘∘ ⋄ :EndIf
+err←(~ok)/'HTMLRenderer was directed to ',url,' but client did not connect'
+:If ~ok
+    ⎕←err
+    ∘∘∘
+:EndIf
 
 :If 2=ns.⎕NC 'Visible'
     v←ns.Visible

diff --git a/EWC/WaitForWG.aplf b/EWC/WaitForWG.aplf
@@ -40,6 +40,6 @@ AGAIN:
          ('Property not supported by EWC: ',⍕m/t) ⎕SIGNAL 6
      :EndIf
      :If ~∧/ok
-         ('Not returned: ',,⍕(~ok)/,⊆Props) ⎕SIGNAL 11
+         ('Not returned: ',,⍕(~ok)/,⊆Props) ⎕SIGNAL 6
      :EndIf
  :EndIf
diff --git a/EWC/classes/button/Defaults.apla b/EWC/classes/button/Defaults.apla
@@ -149,7 +149,7 @@
   'ChildList'
   'EventList'
   'PropList'
-  'Css'
+  'CSS'
   'CssStyle'
  )
  ''

diff --git a/EWC/classes/button/PropList.apla b/EWC/classes/button/PropList.apla
@@ -44,6 +44,6 @@
  'ChildList'
  'EventList'
  'PropList'
- 'Css'
+ 'CSS'
  'CssClass'
 )
diff --git a/EWC/classes/button/Supported.apla b/EWC/classes/button/Supported.apla
@@ -10,6 +10,7 @@
  'State'
  'Align'
  'Attach'
- 'Css'
+ 'CSS'
  'CssClass'
+ 'Active'
 )
diff --git a/EWC/classes/div/ClassName.apla b/EWC/classes/div/ClassName.apla
@@ -0,0 +1 @@
+'Div'
diff --git a/EWC/classes/div/Defaults.apla b/EWC/classes/div/Defaults.apla
@@ -0,0 +1,11 @@
+(
+ 'Div'
+ 38 119
+ 21 239
+ ''
+ ''
+ ⍬
+ ⍬
+ ⍬
+ ⍬
+ )
diff --git a/EWC/classes/div/Dynamic.apla b/EWC/classes/div/Dynamic.apla
@@ -0,0 +1 @@
+⍬
diff --git a/EWC/classes/div/PropList.apla b/EWC/classes/div/PropList.apla
@@ -0,0 +1,11 @@
+(
+ 'Type'
+ 'Posn'
+ 'Size'
+ 'HTML'
+ 'CSS'
+ 'MethodList'
+ 'ChildList'
+ 'EventList'
+ 'PropList'
+)
diff --git a/EWC/classes/div/Supported.apla b/EWC/classes/div/Supported.apla
@@ -0,0 +1,11 @@
+(
+ 'Type'
+ 'Posn'
+ 'Size'
+ 'HTML'
+ 'CSS'
+ 'MethodList'
+ 'ChildList'
+ 'EventList'
+ 'PropList'
+)
diff --git a/EWC/classes/div/methodlist.apla b/EWC/classes/div/methodlist.apla
@@ -0,0 +1,2 @@
+(
+)
diff --git a/EWC/classes/edit/Supported.apla b/EWC/classes/edit/Supported.apla
@@ -18,4 +18,5 @@
  'Border'
  'SelText'
  'CSS'
+ 'Active'
 )
diff --git a/EWC/classes/edit/SupportedEvents.apla b/EWC/classes/edit/SupportedEvents.apla
@@ -1,5 +1,6 @@
 (
  'GotFocus'
+ 'LostFocus'
  'Change'
  'KeyPress'
  'MouseDown'

diff --git a/EWC/classes/font/Defaults.apla b/EWC/classes/font/Defaults.apla
@@ -45,4 +45,5 @@
   'EventList'
   'PropList'
  )
+ ''
 )
diff --git a/EWC/classes/font/PropList.apla b/EWC/classes/font/PropList.apla
@@ -16,4 +16,5 @@
  'ChildList'
  'EventList'
  'PropList'
+ 'CSS'
 )
diff --git a/EWC/classes/font/Supported.apla b/EWC/classes/font/Supported.apla
@@ -6,4 +6,5 @@
  'Underline'
  'Italic'
  'Rotate'
+ 'CSS'
 )
diff --git a/EWC/classes/link/Defaults.apla b/EWC/classes/link/Defaults.apla
@@ -1,7 +1,19 @@
 (
   'Link'
-  ''        ⍝ Href
-   ⍬        ⍝ Label
-   '_blank' ⍝ Target
-   0        ⍝ Download
+  ''         ⍝ Href
+  ⍬          ⍝ Label
+  '_blank'   ⍝ Target
+  0          ⍝ Download
+  'None'     ⍝ Event
+  ('Select') ⍝ EventList 
+  (          ⍝ PropList
+   'Type'
+   'Href'
+   'Label'
+   'Target'
+   'Download'
+   'Event'
+   'EventList'
+   'PropList'
+  )
 )
diff --git a/EWC/classes/link/PropList.apla b/EWC/classes/link/PropList.apla
@@ -4,4 +4,7 @@
   'Label'
   'Target'
   'Download'
+  'Event'
+  'EventList'
+  'PropList'
 )
diff --git a/EWC/classes/link/Supported.apla b/EWC/classes/link/Supported.apla
@@ -1,4 +1,8 @@
 (
   'Type'
   'Href'
+  'Label'
+  'Target'
+  'Download'
+  'Event'
 )
diff --git a/EWC/classes/link/SupportedEvents.apla b/EWC/classes/link/SupportedEvents.apla
@@ -0,0 +1,3 @@
+(
+ 'Select'
+)
diff --git a/EWC/classes/menu/Defaults.apla b/EWC/classes/menu/Defaults.apla
@@ -14,6 +14,7 @@
   ''
   ''
  )
+ ''
  ⍬
  'None'
  17771087

diff --git a/EWC/classes/menu/PropList.apla b/EWC/classes/menu/PropList.apla
@@ -10,6 +10,7 @@
  'FCol'
  'BCol'
  'BtnPix'
+ 'CSS'
  'Data'
  'EdgeStyle'
  'Handle'

diff --git a/EWC/classes/menu/Supported.apla b/EWC/classes/menu/Supported.apla
@@ -1,4 +1,5 @@
 (
  'Type'
  'Caption'
+ 'CSS'
 )
diff --git a/EWC/classes/menubar/Defaults.apla b/EWC/classes/menubar/Defaults.apla
@@ -3,6 +3,7 @@
  1
  0 0
  ''
+ ''
  ⍬
  'None'
  ''

diff --git a/EWC/classes/menubar/PropList.apla b/EWC/classes/menubar/PropList.apla
@@ -3,6 +3,7 @@
  'Visible'
  'Event'
  'FontObj'
+ 'CSS'
  'Data'
  'EdgeStyle'
  'MDIMenu'

diff --git a/EWC/classes/menubar/Supported.apla b/EWC/classes/menubar/Supported.apla
@@ -1,4 +1,5 @@
 (
  'Type'
  'Visible'
+ 'CSS'
 )
diff --git a/EWC/classes/ribbon/Defaults.apla b/EWC/classes/ribbon/Defaults.apla
@@ -7,4 +7,17 @@
  192 192 192
  ''
  ⍬
+ (
+ 'Type'
+ 'Visible'
+ 'Size'
+ 'FCol'
+ 'BCol'
+ 'TitleBCol'
+ 'ImageListObj'
+ 'Data'
+ 'PropList'
+ )
+ 120
+ 120
 )
diff --git a/EWC/classes/ribbon/PropList.apla b/EWC/classes/ribbon/PropList.apla
@@ -7,4 +7,7 @@
  'TitleBCol'
  'ImageListObj'
  'Data'
+ 'PropList'
+ 'BodyHeight'
+ 'MaxButtonWidth'
 )
diff --git a/EWC/classes/ribbon/Supported.apla b/EWC/classes/ribbon/Supported.apla
@@ -7,4 +7,7 @@
  'TitleBCol'
  'ImageListObj'
  'Data'
+ 'PropList'
+ 'BodyHeight'
+ 'MaxButtonWidth'
 )
diff --git a/EWC/classes/ribbonbutton/Defaults.apla b/EWC/classes/ribbonbutton/Defaults.apla
@@ -8,4 +8,16 @@
  ''
  0
  ⍬
+ (
+ 'Type'
+ 'Caption'
+ 'Icon'
+ 'Size'
+ 'Border'
+ 'Event'
+ 'ImageListObj'
+ 'ImageIndex'
+ 'Data'
+ 'PropList'
+ )
 )
diff --git a/EWC/classes/ribbonbutton/PropList.apla b/EWC/classes/ribbonbutton/PropList.apla
@@ -8,4 +8,5 @@
  'ImageListObj'
  'ImageIndex'
  'Data'
+ 'PropList'
 )
diff --git a/EWC/classes/ribbonbuttongroup/Defaults.apla b/EWC/classes/ribbonbuttongroup/Defaults.apla
@@ -7,4 +7,15 @@
  ''
  0
  ⍬
+ (
+ 'Type'
+ 'Captions'
+ 'Icons'
+ 'Border'
+ 'Event'
+ 'ImageListObj'
+ 'ImageIndex'
+ 'Data'
+ 'PropList'
+ )
 )
diff --git a/EWC/classes/ribbonbuttongroup/PropList.apla b/EWC/classes/ribbonbuttongroup/PropList.apla
@@ -7,4 +7,5 @@
  'ImageListObj'
  'ImageIndex'
  'Data'
+ 'PropList'
 )
diff --git a/EWC/classes/ribbondropdownbutton/Defaults.apla b/EWC/classes/ribbondropdownbutton/Defaults.apla
@@ -4,4 +4,14 @@
  ''
  0 0
  ⍬
+ ⍬
+ 0
+ (
+ 'Type'
+ 'Caption'
+ 'Icon'
+ 'Event'
+ 'Data'
+ 'PropList'
+ )
 )
diff --git a/EWC/classes/ribbondropdownbutton/PropList.apla b/EWC/classes/ribbondropdownbutton/PropList.apla
@@ -4,4 +4,7 @@
  'Icon'
  'Event'
  'Data'
+ 'ImageListObj'
+ 'ImageIndex'
+ 'PropList'
 )
diff --git a/EWC/classes/ribbondropdownbutton/Supported.apla b/EWC/classes/ribbondropdownbutton/Supported.apla
@@ -4,4 +4,6 @@
  'Icon'
  'Event'
  'Data'
+ 'ImageListObj'
+ 'ImageIndex'
 )
-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    (
+     'Div'
+119
+239
+     ''
+     ''
+     ⍬
+     ⍬
+     ⍬
+     ⍬
+     )