=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/index.html'
--- src/com/goldencode/p2j/ui/client/driver/web/index.html	2016-05-27 18:49:09 +0000
+++ src/com/goldencode/p2j/ui/client/driver/web/index.html	2016-06-03 08:37:42 +0000
@@ -7,7 +7,7 @@
       <style type="text/css">
          .wait, .wait * { cursor: wait !important; }
          .hidden   {
-                      position: absolute;
+                      position: fixed;
                       bottom: 0;
                       left: 0;
                       width: 10px;
@@ -17,7 +17,7 @@
                       z-index: -1;
                       color: transparent;
                       background: transparent;
-                       overflow: hidden;
+                      overflow: hidden;
                       border: none;
                       padding: 0;
                       resize: none;

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js'
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js	2016-05-30 20:05:14 +0000
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js	2016-06-03 10:03:24 +0000
@@ -25,6 +25,7 @@
 ** 005 SBI 20151014 Implemented to set the current editors selection.
 ** 006 SBI 20160301 The CHUI editor code requires EOL's simulating.
 ** 007 SBI 20160523 Fixed copy/cut/paste work flow.
+**     SBI 20160603 Added Safari COMMAND+C processing.
 */
 
 "use strict";
@@ -306,11 +307,13 @@
                "writeClipboard",
                1000 + maxZIndex,
                document.body,
-               p2j.copyNotification,
-               "Press CTRL-C to close this dialog.",
+               p2j.prompts("copy"),
+               p2j.hints("copy"),
                function (evt)
                {
-                  if (evt.ctrlKey && ((evt.keyCode === keys.C) || (evt.keyCode === keys.INSERT)))
+                  if ((evt.metaKey && (evt.keyCode === keys.C) && p2j.isSafari) ||
+                      (evt.ctrlKey && (evt.keyCode === keys.C || evt.keyCode === keys.INSERT) &&
+                            !p2j.isSafari))
                   {
                      p2j.closeDialog();
                      p2j.clipboard.prepareCopy();

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js'
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js	2016-05-30 20:05:14 +0000
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js	2016-06-03 10:02:15 +0000
@@ -31,7 +31,7 @@
 **                  functions).  Can be used only when the P2J client runs embedded in a 
 **                  customer-specific application.
 ** 011 SBI 20160519 Added the Safari detection.
-**     SBI 20160523 Added createDialog function to open the modal dialog.
+**     SBI 20160603 Added createDialog function to open the modal dialog, added prompts and hints.
 */
 
 "use strict";
@@ -77,13 +77,45 @@
    /** The instance of the unique copy/cut/paste notification dialog. */
    var dialog;
    
-   /** The notification message for the copy action */
-   var copyNotification = "The application is requesting a COPY action." +
-                          " Press CTRL-C to complete the COPY action.";
-   
-   /** The notification message for the paste action */
-   var pasteNotification = "The application is requesting a PASTE action." +
-                           " Press CTRL-V to complete the PASTE action.";
+   /** The notification templates to prompt a user to do an action */
+   var prompts = {};
+   
+   /** The hint templates to help a user to perform an action */
+   var hints = {};
+   
+   /** The templates parameters */
+   var parameters = {};
+   
+   /** The notification template for the copy action */
+   prompts["copy"] = "The application is requesting a COPY action." +
+                     " Press {0} to complete the COPY action.";
+   
+   /** The hint for the copy action */
+   hints["copy"] = "Press {0} to complete the COPY action and to close this dialog.";
+   
+   /** copy template parameter */
+   parameters["copy"] = me.isSafari ? "COMMAND-C" : "CTRL-C";
+   
+   /** The notification template for the paste action */
+   prompts["paste"] = "The application is requesting a PASTE action." +
+                      " Press {0} to complete the PASTE action.";
+   
+   /** The hint for the paste action */
+   hints["paste"] = "Press {0} to complete the PASTE action and to close this dialog.";
+   
+   /** copy template parameter */
+   parameters["paste"] = me.isSafari ? "COMMAND-V" : "CTRL-V";
+   
+   /** The notification template for the cut action */
+   prompts["cut"] = "The application is requesting a CUT action." +
+                    " Press {0} to complete the CUT action.";
+   
+   /** The hint for the cut action */
+   hints["cut"] = "Press {0} to complete the CUT action and to close this dialog.";
+   
+   /** cut template parameter */
+   parameters["cut"] = me.isSafari ? "COMMAND-X" : "CTRL-X";
+   
    /** its properties define if copy, cut and paste commands are supported by this browser */
    var queryCommandSupported = {};
    
@@ -172,23 +204,41 @@
       
       Object.defineProperty(
             p2j,
-            "copyNotification",
+            "prompts",
             {
                get: function ()
                {
-                  // localization is possible here
-                  return copyNotification;
+                  return function(cmd)
+                  {
+                     var prompt;
+                     var template = prompts[cmd];
+                     if (template)
+                     {
+                        prompt = template.replace("{0}", parameters[cmd]);
+                     }
+                     
+                     return prompt;
+                  }
                }
             });
       
       Object.defineProperty(
             p2j,
-            "pasteNotification",
+            "hints",
             {
                get: function ()
                {
-                  // localization is possible here
-                  return pasteNotification;
+                  return function(cmd)
+                  {
+                     var hint;
+                     var template = hints[cmd];
+                     if (template)
+                     {
+                        hint = template.replace("{0}", parameters[cmd]);
+                     }
+                     
+                     return hint;
+                  }
                }
             });
       

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js'
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js	2016-05-30 20:05:14 +0000
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js	2016-06-03 10:01:07 +0000
@@ -31,6 +31,7 @@
 ** 012 SBI 20160119 Changed to support Chrome and IE.
 **     SBI 20160125 Fixed CTRL + CTRL + key, the permitted default actions are copy, paste and cut. 
 ** 013 SBI 20160523 Fixed copy/cut/paste work flow.
+**     SBI 20160603 Changed to process Safari COMMAND as it would be a CTRL key pressed.
 */
 
 "use strict";
@@ -116,8 +117,7 @@
       else if (evt.altKey)
       {
          // ALT keys are not used on VT100
-         evt.preventDefault();
-         evt.stopImmediatePropagation();
+         p2j.consumeEvent(evt);
       }
       else
       {
@@ -219,8 +219,7 @@
       }
       sendKeyCode(key);
       
-      evt.preventDefault();
-      evt.stopImmediatePropagation();
+      p2j.consumeEvent(evt);
    };
 
    /**
@@ -245,8 +244,7 @@
    {
       p2j.socket.sendKeyPair(keyCode, charCode);
       
-      evt.preventDefault();
-      evt.stopImmediatePropagation();
+      p2j.consumeEvent(evt);
    };
    
    /**
@@ -306,8 +304,7 @@
          }
          
          // stop event propagation
-         evt.preventDefault();
-         evt.stopImmediatePropagation();
+         p2j.consumeEvent(evt);
       };
 
       this.onkeydown = onkeydown;
@@ -525,7 +522,9 @@
       
       /**
        * Tests if the keys strokes can invoke the permitted default actions: cut (shift + del,
-       * ctrl + x), copy (ctrl + ins, ctrl + c) and paste (shift + ins, ctrl + v).
+       * ctrl + x), copy (ctrl + ins, ctrl + c) and paste (shift + ins, ctrl + v). For Safari,
+       * pressing COMMAND + C, COMMAND + X and COMMAND + V can invoke the system clipboard copy,
+       * cut and paste actions.
        * 
        * @param    {Event} evt
        *           The merged key stroke event that represents two pressed keys: a modifier and 
@@ -536,14 +535,25 @@
        */
       function permittedKeyStrokes(evt)
       {
-         if (evt.shiftKey && (evt.keyCode === keys.DELETE || evt.keyCode === keys.INSERT))
+         if (p2j.isSafari)
          {
-            return true;
+            if (evt.metaKey &&
+                (evt.keyCode === keys.X || evt.keyCode === keys.C || evt.keyCode === keys.V))
+            {
+               return true;
+            }
          }
-         else if ((evt.ctrlKey && (evt.keyCode === keys.X || evt.keyCode === keys.C ||
-                     evt.keyCode === keys.V || evt.keyCode === keys.INSERT)))
+         else
          {
-            return true;
+            if (evt.shiftKey && (evt.keyCode === keys.DELETE || evt.keyCode === keys.INSERT))
+            {
+               return true;
+            }
+            else if ((evt.ctrlKey && (evt.keyCode === keys.X || evt.keyCode === keys.C ||
+                        evt.keyCode === keys.V || evt.keyCode === keys.INSERT)))
+            {
+               return true;
+            }
          }
          
          return false;
@@ -556,11 +566,14 @@
        *           The browser code of the pressed key
        * 
        * @return   {Boolean}
-       *           True iff a key is from the following set: SHIFT, ALT, CTRL.
+       *           True iff a key is from the following set: SHIFT, ALT, CTRL, COMMAND.
        */
       function isModifier(key)
       {
-         return key === keys.SHIFT || key === keys.CTRL || key === keys.ALT;
+         return key === keys.SHIFT ||
+                key === keys.CTRL  ||
+                key === keys.ALT   ||
+                key === keys.LEFT_WINDOW || key === keys.RIGHT_WINDOW;
       }
       
       /**
@@ -592,6 +605,10 @@
             last.ctrlKey = true;
             last.ctrlCount++;
          }
+         if (evt.metaKey || evt.keyCode === keys.LEFT_WINDOW || evt.keyCode === keys.RIGHT_WINDOW)
+         {
+            last.metaKey = true;
+         }
       }
 
       this.onkeydown = onkeydown;
@@ -609,7 +626,6 @@
             return false;
          }
          var last = queue.peek();
-         
          if (last === undefined)
          {
             last = {
@@ -617,6 +633,7 @@
                   shiftKey  : evt.shiftKey,
                   altKey    : evt.altKey,
                   ctrlKey   : evt.ctrlKey,
+                  metaKey   : evt.metaKey,
                   charCode  : evt.charCode,
                   ctrlCount : (evt.ctrlKey || evt.keyCode === keys.CTRL) ? 1 : 0
                };
@@ -642,6 +659,7 @@
                      shiftKey  : evt.shiftKey,
                      altKey    : evt.altKey,
                      ctrlKey   : evt.ctrlKey,
+                     metaKey   : evt.metaKey,
                      charCode  : evt.charCode,
                      ctrlCount : last.ctrlCount
                   };
@@ -662,6 +680,7 @@
                          shiftKey  : evt.shiftKey,
                          altKey    : evt.altKey,
                          ctrlKey   : evt.ctrlKey,
+                         metaKey   : evt.metaKey,
                          charCode  : evt.charCode,
                          ctrlCount : (evt.ctrlKey || evt.keyCode === keys.CTRL) ? 1 : 0
                       };
@@ -789,6 +808,12 @@
             return false;
          }
          var lastKey = queue.pop();
+         
+         if (lastKey === undefined)
+         {
+            return false;
+         }
+         
          handleKeyPress(evt, lastKey);
       };
       
@@ -809,14 +834,17 @@
        *           The flag indicating the alt modifier is active or not.
        * @param    {Boolean} shift
        *           The flag indicating the shift modifier is active or not.
+       * @param    {Boolean} meta
+       *           The flag indicating the meta modifier is active or not.
        */
-      function handleTypedKey(evt, lastKey, printedCode, mappedCode, ctrl, alt, shift)
+      function handleTypedKey(evt, lastKey, printedCode, mappedCode, ctrl, alt, shift, meta)
       {
          // In general (printedCode === evt.charCode) is true but if the keys are permuted,
          // then we can rely on the lastKey that is merged with keys modifiers
          var charCode = evt.charCode > 0 ? evt.charCode : printedCode;
          var code = -1;
-         if (ctrl)
+         var metaToCtrl = p2j.isSafari && meta;
+         if (ctrl || metaToCtrl)
          {
             if (isAlphabeticCharacter(lastKey))
             {
@@ -832,7 +860,8 @@
                code = lastKey.keyCode;
                code = code | 1 << 11;
             }
-            if (lastKey.ctrlCount && lastKey.ctrlCount > 1) // CTRL + CTRL + key
+            // CTRL + CTRL + key
+            if (lastKey.ctrlCount && lastKey.ctrlCount > 1 || (lastKey.ctrlCount && metaToCtrl))
             {
                code = code | 1 << 11;
             }
@@ -896,14 +925,17 @@
        *           The flag indicating the alt modifier is active or not.
        * @param    {Boolean} shift
        *           The flag indicating the shift modifier is active or not.
+       * @param    {Boolean} meta
+       *           The flag indicating the meta modifier is active or not.
        */
-      function handleNonTypedKey(evt, lastKey, mappedCode, ctrl, alt, shift)
+      function handleNonTypedKey(evt, lastKey, mappedCode, ctrl, alt, shift, meta)
       {
          // In general (lastKey.keyCode === evt.keyCode) is true but if the keys are permuted,
          // then we can rely on the lastKey that is merged with keys modifiers
          var code = mappedCode === undefined ? lastKey.keyCode : mappedCode;
+         var metaToCtrl = p2j.isSafari && meta;
          
-         if (ctrl)
+         if (ctrl || metaToCtrl)
          {
             if (lastKey.keyCode === keys.PAUSE)
             {
@@ -913,7 +945,8 @@
             {
                code = code | 1 << 11;
             }
-            if (lastKey.ctrlCount && lastKey.ctrlCount > 1) // CTRL + CTRL + key
+            // CTRL + CTRL + key
+            if (lastKey.ctrlCount && lastKey.ctrlCount > 1 || (lastKey.ctrlCount && metaToCtrl))
             {
                code = code | 1 << 11;
             }
@@ -950,6 +983,7 @@
           var ctrl  = lastKey.ctrlKey  || evt.ctrlKey;
           var alt   = lastKey.altKey   || evt.altKey;
           var shift = lastKey.shiftKey || evt.shiftKey;
+          var meta  = lastKey.metaKey  || evt.metaKey;
           // in general (lastKey.keyCode === evt.keyCode) is true but if the keys are permuted,
           // then we can rely on the lastKey that is merged with keys modifiers
           var mappedCode  = p2j.keymap.xlate[lastKey.keyCode];
@@ -958,12 +992,12 @@
           if (printedCode === -1)
           {
              //  a non printed key is pressed 
-             handleNonTypedKey(evt, lastKey, mappedCode, ctrl, alt, shift);
+             handleNonTypedKey(evt, lastKey, mappedCode, ctrl, alt, shift, meta);
           }
           else
           {
              // a printed key is pressed
-             handleTypedKey(evt, lastKey, printedCode, mappedCode, ctrl, alt, shift);
+             handleTypedKey(evt, lastKey, printedCode, mappedCode, ctrl, alt, shift, meta);
           }
       }
       
@@ -982,10 +1016,12 @@
             return false;
          }
          var lastKey = findKeyEventByKeyCode(evt.keyCode);
+         
          if (lastKey === undefined)
          {
-            return;
+            return false;
          }
+         
          handleKeyPress(evt, lastKey);
       };
 
@@ -1005,9 +1041,12 @@
          {
             var evt = queue[pos];
             // modifier key down events are merged
-            if (evt.keyCode === keyCode || (evt.altKey && keyCode == keys.ALT)
-                     || (evt.shiftKey && keyCode == keys.SHIFT)
-                     || (evt.ctrlKey && keyCode == keys.CTRL))
+            if ((evt.keyCode === keyCode)               ||
+                (evt.altKey   && keyCode == keys.ALT)   ||
+                (evt.shiftKey && keyCode == keys.SHIFT) ||
+                (evt.ctrlKey  && keyCode == keys.CTRL)  ||
+                (evt.metaKey  && keyCode === keys.LEFT_WINDOW) ||
+                (evt.metaKey  && keyCode === keys.RIGHT_WINDOW))
             {
                queue.splice(pos, 1);
                return evt;

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js'
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js	2016-04-05 19:31:13 +0000
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js	2016-06-03 10:00:55 +0000
@@ -20,6 +20,7 @@
 ** 008 SBI 20151011 Added SHIFT + DEL key label to return 639 as its key code.
 ** 009 SBI 20160120 Chrome and IE support.
 **     SBI 20160212 Fixes for copy/paste and cut default actions.
+** 010 SBI 20160603 Changed to process Safari COMMAND as it would be a CTRL key pressed.
 */
 
 "use strict";
@@ -795,7 +796,7 @@
    {
       var ctrlCode = -1;
       
-      if (evt.ctrlKey)
+      if (evt.ctrlKey || (p2j.isSafari && evt.metaKey))
       {         
          if (code === 50 || code === 64) //'2'
          {

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.mouse.js'
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.mouse.js	2016-05-30 20:05:14 +0000
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.mouse.js	2016-06-03 10:06:34 +0000
@@ -26,8 +26,8 @@
 ** 008 HC  20160406 Overhaul of window-activation logic.
 ** 009 SBI 20160505 Fixed MousePopupable to catch "click" and "contextmenu" events depending on
 **                  the popup activation button.
-**     SBI 20160523 Added system action listeners to handle mouse clicks on the copy, cut, paste
-**                  system menu items.
+**     SBI 20160603 Added system action listeners to handle mouse clicks on the copy, cut, paste
+**                  system menu items, added Safari copy, cut and paste support.
 */
 
 "use strict";
@@ -1339,6 +1339,46 @@
                {
                   console.debug("document.execCommand(" + osOp + ")");
                }
+               else
+               {
+                  var dialogCloseHandler;
+                  if (osOp === "cut")
+                  {
+                     dialogCloseHandler = function(evt)
+                     {
+                        if ((evt.metaKey  && (evt.keyCode === keys.X) && p2j.isSafari) ||
+                              (((evt.shiftKey && (evt.keyCode === keys.DELETE)) ||
+                                ( evt.ctrlKey && (evt.keyCode === keys.X))
+                               ) && !p2j.isSafari))
+                        {
+                           p2j.closeDialog();
+                           p2j.clipboard.prepareCopy();
+                        }
+                     }
+                  }
+                  else
+                  {
+                     dialogCloseHandler = function(evt)
+                     {
+                        if ((evt.metaKey && (evt.keyCode === keys.C) && p2j.isSafari) ||
+                            (evt.ctrlKey &&
+                             (evt.keyCode === keys.C || evt.keyCode === keys.INSERT) &&
+                                    !p2j.isSafari))
+                        {
+                           p2j.closeDialog();
+                           p2j.clipboard.prepareCopy();
+                        }
+                     }
+                  }
+                  var maxZIndex = p2j.getMaxZIndex();
+                  p2j.createDialog(
+                        "writeClipboard",
+                        1000 + maxZIndex,
+                        document.body,
+                        p2j.prompts(osOp),
+                        p2j.hints(osOp),
+                        dialogCloseHandler);
+               }
             }
             else if (osOp === "paste")
             {
@@ -1355,12 +1395,14 @@
                         "readClipboard",
                         1000 + maxZIndex,
                         document.body,
-                        p2j.pasteNotification,
-                        "Press CTRL-V to close this dialog.",
+                        p2j.prompts("paste"),
+                        p2j.hints("paste"),
                         function (evt)
                         {
-                           if ((evt.shiftKey && (evt.keyCode === keys.INSERT)) ||
-                               (evt.ctrlKey && (evt.keyCode === keys.V)))
+                           if ((evt.metaKey  && (evt.keyCode === keys.V) && p2j.isSafari) ||
+                               (((evt.shiftKey && (evt.keyCode === keys.INSERT)) ||
+                                 ( evt.ctrlKey && (evt.keyCode === keys.V))
+                                ) && !p2j.isSafari))
                            {
                               p2j.closeDialog();
                               p2j.clipboard.preparePaste();