WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/Menu.ob07

     disBackColor = backColor;
     disForeColor = 808080H;
     disSelBackColor = 0E4E4E4H;
     disSelForeColor = disForeColor;
+	SHIFT* = 256;
+	CTRL*  = 512;
         selItem, cliItem: INTEGER;
         font: G.tFont;
         canvas: G.tCanvas;
-        items: List.tList;
         click: PROCEDURE (menu: tMenu; id: INTEGER);
-        key: PROCEDURE (menu: tMenu; key: INTEGER): BOOLEAN
+        items: List.tList
     END;
         text: ARRAY 32 OF WCHAR;
         menu*: tMenu;
         main: tMain
     END;
+    tShortcut = POINTER TO RECORD (List.tItem)
+    	key, MenuItem: INTEGER
+    END;
-    tClick = PROCEDURE (menu: tMenu; id: INTEGER);
-    tKey = PROCEDURE (menu: tMenu; key: INTEGER): BOOLEAN;
+    tClick = PROCEDURE (menu: tMenu; id: INTEGER);
     tProc = PROCEDURE;
 VAR
-VAR
+	MenuItem*: INTEGER;
     stack: ARRAY maxLEVEL + 1, 2500 OF INTEGER;
     TIDs: ARRAY maxLEVEL + 1 OF INTEGER;
+    resetTimer: tProc;
-    resetTimer: tProc;
+    _open: PROCEDURE (m: tMenu; x, y: INTEGER);
-    _open: PROCEDURE (m: tMenu; x, y: INTEGER);
+    shortcuts: List.tList;
 (*
     backColor, foreColor, selBackColor, selForeColor,
         m.active := FALSE
     END
 END close;
+PROCEDURE SetItem* (id: INTEGER);
+BEGIN
+	MenuItem := id
+END SetItem;
 PROCEDURE click (m: tMenu; i: INTEGER);
 VAR
     item: List.tItem;
 	    IF (item # NIL) & item(tItem).enabled & (item(tItem).child = NIL) THEN
 	    	id := item(tItem).id
 	    END
     END;
     IF id # -1 THEN
-	    m.click(m, id);
+    	SetItem(id);
 	    p := m.parent;
 	   	WHILE p # NIL DO
 	   		p.child := NIL;
 	   		close(p);
 	   		p := p.parent
     END
     RETURN res
 END submenu;
+PROCEDURE getShortcut (key: INTEGER): BOOLEAN;
+VAR
+	item: tShortcut;
+	res: INTEGER;
+BEGIN
+	item := shortcuts.first(tShortcut);
+	WHILE (item # NIL) & (item.key # key) DO
+		item := item.next(tShortcut)
+	END;
+	IF item # NIL THEN
+		res := item.MenuItem
+	ELSE
+		res := 0
+	END;
+	SetItem(res)
+	RETURN res # 0
+END getShortcut;
 PROCEDURE [stdcall] window (m: tMenu);
 VAR
     x, y: INTEGER;
         |0:
         |1:
             draw_window(m)
         |2:
         	K.getKBState(shift, ctrl);
-            key := K.GetKey();
+            key := K.GetKey() DIV 65536;
-            IF ~shift & ~ ctrl THEN
+		    IF shift THEN
+		    	INC(key, SHIFT)
+		    END;
+		    IF ctrl THEN
+		    	INC(key, CTRL)
+		    END;
-	            IF key DIV 65536 = 72 THEN
+        	CASE key OF
+            |72:
-	                m.selItem := (m.selItem - 1) MOD m.items.count
+                m.selItem := (m.selItem - 1) MOD m.items.count
-	            ELSIF key DIV 65536 = 80 THEN
+            |80:
-	                m.selItem := (m.selItem + 1) MOD m.items.count
+                m.selItem := (m.selItem + 1) MOD m.items.count
-	            ELSIF key DIV 65536 = 28 THEN
+            |28:
-	                IF m.selItem >= 0 THEN
+                IF m.selItem >= 0 THEN
-	                    click(m, m.selItem)
+                    click(m, m.selItem)
-	                END;
+                END;
-	                m.cliItem := -1
+                m.cliItem := -1
-	            ELSIF key DIV 65536 = 77 THEN
+            |77:
-	                IF ~submenu(m, TRUE) THEN
+                IF ~submenu(m, TRUE) THEN
-	                	click(m, -(getMainID(m) + 1))
+                	click(m, -(getMainID(m) + 1))
-	                END;
+                END;
-	                m.cliItem := -1
+                m.cliItem := -1
-	            ELSIF key DIV 65536 = 75 THEN
+            |75:
-	            	IF m.parent # NIL THEN
+            	IF m.parent # NIL THEN
-	                	escape(m)
+                	escape(m)
-	            	ELSE
+            	ELSE
-	            		click(m, -(getMainID(m) - 1))
+            		click(m, -(getMainID(m) - 1))
-	                END;
+                END;
-	                m.cliItem := -1
+                m.cliItem := -1
-	            ELSIF key DIV 65536 = 1 THEN
+            |1:
-	            	escape(m)
+            	escape(m)
-	            ELSE
+            ELSE
-	                IF m.key(m, key) THEN
+	            IF getShortcut(key) THEN
-	                	IF m.parent # NIL THEN
-	                		temp := m.parent.tid;
-	                		m.parent.tid := 0;
-	                		K.ExitID(temp)
-	                	END;
-	                    exit(m)
-	                END
-                END
-            ELSE
-                IF m.key(m, key) THEN
-                	IF m.parent # NIL THEN
+	            	IF m.parent # NIL THEN
-                		temp := m.parent.tid;
+	            		temp := m.parent.tid;
-                		m.parent.tid := 0;
+	            		m.parent.tid := 0;
-                		K.ExitID(temp)
+	            		K.ExitID(temp)
-                	END;
+	            	END;
     item := getItem(m, id)
     RETURN (item # NIL) & item.enabled
 END isEnabled;
-PROCEDURE create* (items: List.tList; click: tClick; key: tKey): tMenu;
+PROCEDURE create* (items: List.tList): tMenu;
 VAR
     m: tMenu;
     maxLength: INTEGER;
     m.active := FALSE;
     m.parent := NIL;
     m.child := NIL;
     m.mainID := 0;
     m.items  := items;
-    m.click := click;
-    m.key := key;
     maxLength := 0;
     item := items.first(tItem);
     WHILE item # NIL DO
         maxLength := MAX(maxLength, LENGTH(item.text));
         item := item.next(tItem)
     G.SetFont(m.canvas, m.font);
     RETURN m
 END create;
+PROCEDURE AddShortcut* (key, MenuItem: INTEGER);
+VAR
+	item: tShortcut;
+BEGIN
+	NEW(item);
+	item.key := key;
+	item.MenuItem := MenuItem;
+	List.append(shortcuts, item)
+END AddShortcut;
 PROCEDURE init* (_resetTimer: tProc);
 VAR
+	i: INTEGER;
+BEGIN
-	i: INTEGER;
+	SetItem(0);
-BEGIN
+	shortcuts := List.create(NIL);
 	resetTimer := _resetTimer;
 	_open := open;
 	FOR i := 0 TO maxLEVEL DO

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/Menu.ob07 – Rev 9628 → 9648