6764.08.patch

Marian Edu, 12/16/2022 08:49 AM

     **     CA  20211005          Set the matchedWidgetId when lookup is performed.
     **     SBI 20211024          Added containsWidget(int) method.
     **     ME  20220928          Rewrite trigger lookup, move some of the logic in EventList.
     **         20221003          Remove 'global anywhere' (derived), use scope self/anywhere on lookup.
     **     ME  20221003          Remove 'global anywhere' (derived), use scope self/anywhere on lookup.
     **     ME  20221026          Check function key code in isEventUniversal in case label key code was used.
     **/
     /*
-...
                                eventCode == Keyboard.KA_END_ERROR ||
                                eventCode == Keyboard.KA_STOP);
           if (!universal) {
              eventCode = Keyboard.eventCode(Keyboard.keyFunction(eventCode));
              return eventCode != -1 && isEventUniversal(eventCode);
+          }
           return universal;
+       }

     **         20221003          Build events bitmap and resolve function key code in lookupWorker, avoid looping
     **                           through widget's parents chain if there is no event registered for the code.
     **     HC  20221017          Fixed ANYWHERE event lookup.
     **     ME  20221026          Fixed addEvent/ctors in respect to ANYWHERE default.
     */
     /*
-...
+       }
        /**
         * Constructor that adds the given event definition.
         * Constructor that adds the given event definition - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
-...
         */
        public EventList(String[] event)
+       {
           addEvent(event, (GenericWidget[])null, false);
           addEvent(event, (GenericWidget[])null, true);
+       }
        /**
         * Constructor that adds the given event definition.
         * Constructor that adds the given event definition - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
         * @param    event
         *           An array of event names.
         * @param    anywhere
         *           <code>true</code> if the global ANYWHERE option is being set.
         *           ignored since all non-widget events are global ANYWHERE.
         */
        @Deprecated
        public EventList(String[] event, boolean anywhere)
+       {
           addEvent(event, (GenericWidget[])null, false);
           addEvent(event, (GenericWidget[])null, true);
+       }
        /**
         * Constructor that adds the given event definition.
         * Constructor that adds the given event definition - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
-...
         */
        public EventList(String event)
+       {
           addEvent(new String[] {event}, (GenericWidget[])null, false);
           addEvent(event, (GenericWidget[])null, true);
+       }
        /**
         * Constructor that adds the given event definition. If the ANYWHERE keyword was used, the
         * appropriate flag is set for this entry.
         * Constructor that adds the given event definition - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
         * @param    event
         *           The event name.
         * @param    anywhere
         *           <code>true</code> if the global ANYWHERE option is being set.
         *           ignored since all non-widget events are global ANYWHERE.
         */
        @Deprecated
        public EventList(String event, boolean anywhere)
+       {
           addEvent(new String[] {event}, (GenericWidget[])null, anywhere);
           addEvent(new String[] {event}, (GenericWidget[])null, true);
+       }
        /**
-...
+       }
        /**
         * Adds an event definition to the list.
         * Adds an event definition to the list - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
-...
         */
        public void addEvent(String[] event)
+       {
           addEvent(event, (GenericWidget[])null, false);
           addEvent(event, (GenericWidget[])null, true);
+       }
        /**
         * Adds an event definition to the list.
         * Adds an event definition to the list - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
         * @param    event
         *           An array of event names.
         * @param    anywhere
         *           <code>true</code> if the global ANYWHERE option is being set.
         *           ignored since all non-widget events are global ANYWHERE.
         */
        @Deprecated
        public void addEvent(String[] event, boolean anywhere)
+       {
           addEvent(event, (GenericWidget[])null, false);
           addEvent(event, (GenericWidget[])null, true);
+       }
        /**
         * Adds an event definition to the list.
         * Adds an event definition to the list - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
-...
         */
        public void addEvent(String event)
+       {
           addEvent(new String[] {event}, (GenericWidget[])null, false);
           addEvent(new String[] {event}, (GenericWidget[])null, true);
+       }
        /**
         * Adds an event definition to the list.
         * Adds an event definition to the list - global anywhere.
         * <p>
         * Event names are case-insensitive on input and stored uppercased.
+        *
         * @param    event
         *           The event name.
         * @param    anywhere
         *           <code>true</code> if the global ANYWHERE option is being set.
         *           ignored since all non-widget events are global ANYWHERE.
         */
        @Deprecated
        public void addEvent(String event, boolean anywhere)
+       {
           addEvent(new String[] {event}, (GenericWidget[])null, anywhere);
           addEvent(new String[] {event}, (GenericWidget[])null, true);
+       }
        /**

     **     EVL 20221007          Adding runtime support for SESSION:LOAD-ICON.
     **     TJD 20220504          Java 11 compatibility related minor changes
     **     SBI 20221110          Added getSupportedHelperApplications().
     **     ME  20221110          Avoid NPE on client when invalid code used in apply.
     **     HC  20221114          Improved URL handling of the HTML browser whitelist.
     **     EVL 20221118          Adding support for new non-blocking mode in SESSION:SET-WAIT-STATE.
     **     EVL 20221121          Typo fix for setWaitState().
-...
              return;
+          }
           if (eventCode == -1)
+          {
              // not valid event code, it will throw error on the client
              return;
+          }
           ScreenBuffer sb[] = null;
           LogicalTerminal lt = locate();

              cur = src;
+          }
           boolean defaultHelp = true;
           boolean defaultHelp = action == Keyboard.KA_HELP;
           boolean foundGo = false;
           boolean exceptionalExit = false;
-...
           if (key > 0 && key != KeyInput.CHAR_UNDEFINED && evt.id() != EventType.KEY_RELEASED)
+          {
              tr = invokeTriggers(src, key, evt.isRealKey());
              if (tr.executed)
+             {
                 evt.setTriggerFired();
                 // if trigger was set for a key that maps to endkey/end-error (ESC)
                 // consume it and do not handle it like stop
                 if (exceptionalExit)
+                {
                    evt.consume();
                    return;
+                }
+             }
              if (tr.consume)
+             {
                 evt.consume();
                 if (foundGo)
+                {
                    subGoPending();
                    leaveSent = false;
+                }
                 return;
+             }
+          }
           else
+          {
              tr = invokeTriggers(src, action, evt.isRealKey());
+          }
           if (tr.executed)
+          {
              evt.setTriggerFired();
              // reset default help behavior if trigger registered
              defaultHelp = false;
+          }
           if (tr.consume)
+          {
              evt.consume();
              if (foundGo)
+             {
                 subGoPending();
                 leaveSent = false;
+             }
              return;
+          }
           // other high level events
           if ((tr == null || !tr.executed) && key != action &&
               action != Keyboard.SE_ENTRY)
           if ((tr == null || !tr.consume))
+          {
              Widget target = src;
              Browse brws = (Browse) src.parent(Browse.class);
              tr = invokeTriggers(target, event.other(), action, false);
              if (tr.executed)
+             {
                 evt.setTriggerFired();
+             }
              if (action == Keyboard.KA_HELP)
+             {
                 // if there was no widget-level trigger, try the frame
                 // TODO: this needs to be more generic because surely there are
                 //       other events that bubble
                 if (!tr.executed && !(target instanceof Frame))
+                {
                    if (brws != null && target != brws)
+                   {
                       // in this case, try the browse too
                       tr = invokeTriggers(brws, event.other(), action, false);
+                   }
                    if (!tr.executed)
+                   {
                       // TODO: check if child frames/parent frame bubbling works
                       // TODO: check if the window needs to be supported
                       Widget<?> frm = UiUtils.locateFrame(target);
                       if (frm != null)
+                      {
                          tr = invokeTriggers(frm, event.other(), action, false);
+                      }
+                   }
+                }
                 if (tr.executed)
+                {
                    // execution of a HELP trigger is implicitly RETURN NO-APPLY
                    tr.consume = true;
                    defaultHelp = false;
              // universal events slip into parent frame only unless consumed
              if (EventDefinition.isEventUniversal(key))
+             {
                 Widget<?> srcFrame = UiUtils.locateFrame(src);
                 if (srcFrame != null)
+                {
                    // use specificWidget as it doesn't need to go up the parents chain
                    tr = invokeTriggers(srcFrame, null, -1, key, true, true, null, null);
+                }
+             }
              // let widget perform "hard" check if necessary
              if (action == Keyboard.SE_LEAVE && src instanceof FillIn)
              if (key != action && action == Keyboard.SE_LEAVE && src instanceof FillIn)
+             {
                 src.processKeyEvent(evt);
                 if (evt.isConsumed())
                 if (tr != null && evt.isConsumed())
                    tr.consume = true;
+             }
              if (tr.consume)
+             {
                 evt.consume();
                 if (foundGo)
+                {
                    subGoPending();
                    leaveSent = false;
+                }
                 return;
+             }
+          }
           // check for possible ANY-KEY
           if ((tr == null || !tr.executed) && evt != null && evt.isRealKey() && evt.id() != EventType.KEY_RELEASED)
+          {
              tr = invokeTriggers(src, key, true);
              if (tr.consume)
+             {
                 evt.consume();
                 if (foundGo)
+                {
                    subGoPending();
                    leaveSent = false;
+                }
                 return;
+             }
+          }
              if (tr != null && tr.consume)
+             {
                 evt.consume();
                 if (foundGo)
+                {
                    subGoPending();
                    leaveSent = false;
+                }
                 return;
+             }
+          }
           // disable all following logic if this is a drop-down portion of a
           // combo-box
           if (src instanceof ScrollableList)
-...
           // a standard input key (A, B, and so on)
           // HELP action
           if (isGoPending == 0 && action == Keyboard.KA_HELP && defaultHelp)
           if (isGoPending == 0 && defaultHelp)
+          {
              requestHelp();
+          }
-...
                                             Integer   eventX,
                                             Integer   eventY)
+       {
           return invokeTriggers(widget, other, resourceId, evtCode, isKey, false, eventX, eventY);
+       }
        /**
         * Check active <code>EventList</code> instance for triggers defined
         * for this event and widget pair and activate the first one found.
         * <p>
         * Triggers are searched either for a specific widget, or, if no widget is
         * enabled (in focus), for the session window. The latter is also performed
         * if the specific widget happens to be the session window.
         * <p>
         * The specific search is done in the following order:
         * <ul>
         *  <li>trigger for the specified widget and event;
         *  <li>trigger for the specified event anywhere within the frame;
         *  <li>trigger for the specified event anywhere globally.
         * </ul>
         * <p>
         * The search for the session window is a one step process.
         * <p>
         * The first found trigger, if any, gets activated.
+        *
         * @param   widget
         *          event source.
         * @param   other
         *          a companion widget (for ENTER/LEAVE events).
         * @param   resourceId
         *          When not set to -1, is a valid resource ID (for non-widget events).
         * @param   evtCode
         *          event code.
         * @param   isKey
         *          This flags marks reals keys typed by user.
         * @param   specificWidget
         *          This flags checks only for the triggers on specific widget.
         * @param   eventX
         *          The value of LAST-EVENT:X attribute; <code>null</code> if not used.
         * @param   eventY
         *          The value of LAST-EVENT:Y attribute; <code>null</code> if not used.
+        *
         * @return  Execution and event consume flags for an executed trigger.
         */
        private TriggerResult invokeTriggers(Widget    widget,
                                             Widget    other,
                                             long      resourceId,
                                             int       evtCode,
                                             boolean   isKey,
                                             boolean   specificWidget,
                                             Integer   eventX,
                                             Integer   eventY)
+       {
           // this method must not be called for mouse events on virtual widgets; for key presses,
           // this is allowed because ANY-KEY triggers need to be reached.
-...
+          {
              Widget container = UiUtils.locateContainer(widget);
              currentEventList.lookup(container != null && container != frame ? UiUtils.getWidgetIdAsInt(container) : frameId, widgetId, true, isKey, result);
              currentEventList.lookup(container != null && container != frame ? UiUtils.getWidgetIdAsInt(container) : frameId, widgetId, true, isKey, specificWidget, result);
+          }
           // activate trigger

Project

General

Profile

FWD » Core Development » User Interface

6764.08.patch