WebSVN – Kolibri OS – Diff – /programs/cmm/menu/menu.c


#define MEMSIZE 4096*40
 
#include "../lib/gui.h"
#include "../lib/io.h"
#include "../lib/collection.h"
#include "../lib/list_box.h"
#include "../lib/fs.h"
 
#define ITEM_H 19
#define SEP_H 4
 
llist menu1;
collection names;
collection hotkeys;
 
int selected, win_x, win_y;
 
int max_name_len;
int max_hotkey_len;
int menu_w, menu_h;
 
void GetWindowPosition()
{
	int position;
	shared_mem = memopen(#shared_name, 16, SHM_OPEN + SHM_WRITE);
	selected = ESDWORD[shared_mem     ];
	win_x    = ESDWORD[shared_mem +  4];
	win_y    = ESDWORD[shared_mem +  8];
	position = ESDWORD[shared_mem + 12];
	if (position == MENU_ALIGN_TOP_RIGHT) win_x -= menu1.w;
	if (position == MENU_ALIGN_BOT_LEFT) win_y -= menu1.h;
	if (position == MENU_ALIGN_BOT_RIGHT) {
		win_x -= menu1.w;
		win_y -= menu1.h;
	}
}
 
void GetMenuWidths()
{
	int i;
	for (i=0; i
		max_name_len = math.max(max_name_len, strlen(names.get(i)));
	}
	for (i=0; i
		max_hotkey_len = math.max(max_hotkey_len, strlen(hotkeys.get(i)));
	}
	max_name_len = max_name_len * 6;
	max_hotkey_len *= 6;
	if (max_hotkey_len) max_name_len += 12;
}
 
void GetMenuItems(dword current_name)
{
	dword next_name = strchr(current_name, '\n');
	dword hotkey = strchr(current_name, '|');
 
	ESBYTE[next_name] = '\0';
 
	if (hotkey) && (hotkey < next_name) {
		ESBYTE[hotkey] = '\0';
	} else {
		if (hotkey) && (!next_name) {
			ESBYTE[hotkey] = '\0';
		} else {
			hotkey = " ";
		}
	}
 
	hotkeys.add(hotkey+1);
	names.add(current_name);
 
	if (next_name) GetMenuItems(next_name+2);
}
 
int GetSeparatorsCount()
{
	int i, count=0;
	for (i=0; i
		if (streq(names.get(i), "-")) count++;
	}
	return count;
}
 
int MoveMouseToHandleSeparators(int _mouse_y)
{
	int i, item_y=menu1.y;
	int item_i=0;
	for (i=0; i
	{
		if (streq(names.get(i), "-")) {
			item_y += SEP_H;
		} else {
			item_y += ITEM_H;
			item_i++;
		}
		if (_mouse_y >= item_y) && (_mouse_y < item_y + ITEM_H) {
			return item_i * ITEM_H + menu1.y;
		}
	}
	return _mouse_y;
}
 
void main()
{
	proc_info Form;
 
	if (!param) die("'Menu component is for developers only' -I");
 
	GetMenuItems(#param);
	GetMenuWidths();
 
	menu_w = max_name_len + max_hotkey_len + 23;
	menu_h = GetSeparatorsCount() * SEP_H 
		+ calc(names.count - GetSeparatorsCount() * ITEM_H);
 
	menu1.count = names.count;
	menu1.SetFont(6, 9, 0x80);
	menu1.SetSizes(2,2, menu_w, menu_h, ITEM_H);
	menu1.cur_y = -1;
 
	GetWindowPosition();
 
	SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE);
	loop() switch(WaitEvent())
	{
		case evMouse:			
			GetProcessInfo(#Form, SelfInfo);
			if (!CheckActiveProcess(Form.ID)) exit();
			mouse.get();
			if (menu1.MouseOver(mouse.x, mouse.y)) {
				mouse.y = MoveMouseToHandleSeparators(mouse.y);
				if (menu1.ProcessMouse(mouse.x, mouse.y)) draw_list();
				if (mouse.lkm)&&(mouse.up) click();	
			} 
			break;
 
		case evKey:
			GetKeys();
			ProcessKeys();
			break;
 
		case evReDraw:
			DefineAndDrawWindow(win_x, win_y, menu1.w+4, menu1.h+4, 0x01, 0, 0, 0x01fffFFF);
			sc.get();
			Draw3DPopup(0,0,menu1.w+2,menu1.h+2);
			draw_list();
	}
}
 
void ProcessKeys()
{
	switch(key_scancode) 
	{
		case SCAN_CODE_ESC:
			exit();
 
		case SCAN_CODE_ENTER:
			click();
 
		case SCAN_CODE_DOWN:
			if (!menu1.KeyDown()) 
			|| (menu1.count - menu1.cur_y - GetSeparatorsCount() -1 < 0) menu1.KeyHome();
			draw_list();
			break;
 
		case SCAN_CODE_UP:
			if (!menu1.KeyUp()) menu1.KeyEnd();
			draw_list();
			break;
 
		default:
			if (menu1.ProcessKey(key_scancode)) draw_list();
	}
}
 
void draw_list()
{
	int i, item_y=menu1.y, item_i=0;
	dword name_color;
	dword hotkey_color;
 
	static dword inactive_background_color;
	static dword active_background_color;
	static dword active_top_border_color;
	static dword inactive_text_shadow_color;
	static bool skin_dark;
 
	static bool colors_set;
	if (!colors_set) {
		colors_set = true;
		inactive_background_color = MixColors(sc.work, 0xFFFfff,230);
		active_background_color = MixColors(sc.button, sc.work,230);
		active_top_border_color = MixColors(sc.work_graph, sc.button,240);
		inactive_text_shadow_color = MixColors(sc.work,0xFFFfff,120);
		skin_dark = skin_is_dark();
	}
 
	for (i=0; i
	{
		if (streq(names.get(i), "-")) {
			DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color);
			DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, sc.work_dark);
			DrawBar(menu1.x, item_y+2, menu1.w, 1, sc.work_light);
			DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color);
			//DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color);
			//DrawBar(13, item_y+1, menu1.w-24, 1, sc.work_dark);
			//DrawBar(13, item_y+2, menu1.w-24, 1, sc.work_light);
			item_y += SEP_H;
		} else {
			if (item_i==menu1.cur_y) {
				hotkey_color = name_color = sc.button_text;
				DrawBar(menu1.x, item_y+1,        menu1.w, ITEM_H-2, active_background_color);
				DrawBar(menu1.x, item_y,          menu1.w, 1, active_top_border_color);
				DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, sc.work_light);
			} else {
				name_color = sc.work_text;
				hotkey_color = sc.work_graph;
				DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color);
				if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80, 
					inactive_text_shadow_color, names.get(i));
			}
			WriteText(-strlen(hotkeys.get(i))*6 + 13 + max_name_len + max_hotkey_len, 
				item_y + menu1.text_y, 0x80, hotkey_color, hotkeys.get(i));
			WriteText(13, item_y + menu1.text_y, 0x80, name_color, names.get(i));
			item_y += ITEM_H;
			item_i++;		
		}
	}
	if (selected) WriteText(5, selected-1*ITEM_H + menu1.y + menu1.text_y, 0x80, 0xEE0000, "\x10");
}
 
void click()
{
	ESDWORD[shared_mem] = menu1.cur_y + 1;
	ExitProcess();
}
 
void exit()
{
	ESDWORD[shared_mem] = 0;
	ExitProcess();
}

Rev 7798	Rev 7806
1	#define MEMSIZE 4096*40	1	#define MEMSIZE 4096*40
2		2
3	#include "../lib/gui.h"	3	#include "../lib/gui.h"
4	#include "../lib/io.h"	4	#include "../lib/io.h"
5	#include "../lib/collection.h"	5	#include "../lib/collection.h"
6	#include "../lib/list_box.h"	6	#include "../lib/list_box.h"
7	#include "../lib/fs.h"	7	#include "../lib/fs.h"
8		8
9	#define ITEM_H 19	9	#define ITEM_H 19
10	#define SEP_H 4	10	#define SEP_H 4
11		11
12	llist menu1;	12	llist menu1;
13	collection names;	13	collection names;
14	collection hotkeys;	14	collection hotkeys;
15		15
16	int selected, win_x, win_y;	16	int selected, win_x, win_y;
17		17
18	int max_name_len;	18	int max_name_len;
19	int max_hotkey_len;	19	int max_hotkey_len;
20	int menu_w, menu_h;	20	int menu_w, menu_h;
21		21
22	void GetWindowPosition()	22	void GetWindowPosition()
23	{	23	{
24	int position;	24	int position;
25	shared_mem = memopen(#shared_name, 16, SHM_OPEN + SHM_WRITE);	25	shared_mem = memopen(#shared_name, 16, SHM_OPEN + SHM_WRITE);
26	selected = ESDWORD[shared_mem ];	26	selected = ESDWORD[shared_mem ];
27	win_x = ESDWORD[shared_mem + 4];	27	win_x = ESDWORD[shared_mem + 4];
28	win_y = ESDWORD[shared_mem + 8];	28	win_y = ESDWORD[shared_mem + 8];
29	position = ESDWORD[shared_mem + 12];	29	position = ESDWORD[shared_mem + 12];
30	if (position == MENU_ALIGN_TOP_RIGHT) win_x -= menu1.w;	30	if (position == MENU_ALIGN_TOP_RIGHT) win_x -= menu1.w;
31	if (position == MENU_ALIGN_BOT_LEFT) win_y -= menu1.h;	31	if (position == MENU_ALIGN_BOT_LEFT) win_y -= menu1.h;
32	if (position == MENU_ALIGN_BOT_RIGHT) {	32	if (position == MENU_ALIGN_BOT_RIGHT) {
33	win_x -= menu1.w;	33	win_x -= menu1.w;
34	win_y -= menu1.h;	34	win_y -= menu1.h;
35	}	35	}
36	}	36	}
37		37
38	void GetMenuWidths()	38	void GetMenuWidths()
39	{	39	{
40	int i;	40	int i;
41	for (i=0; i	41	for (i=0; i
42	max_name_len = math.max(max_name_len, strlen(names.get(i)));	42	max_name_len = math.max(max_name_len, strlen(names.get(i)));
43	}	43	}
44	for (i=0; i	44	for (i=0; i
45	max_hotkey_len = math.max(max_hotkey_len, strlen(hotkeys.get(i)));	45	max_hotkey_len = math.max(max_hotkey_len, strlen(hotkeys.get(i)));
46	}	46	}
47	max_name_len = max_name_len * 6;	47	max_name_len = max_name_len * 6;
48	max_hotkey_len *= 6;	48	max_hotkey_len *= 6;
49	if (max_hotkey_len) max_name_len += 12;	49	if (max_hotkey_len) max_name_len += 12;
50	}	50	}
51		51
52	void GetMenuItems(dword current_name)	52	void GetMenuItems(dword current_name)
53	{	53	{
54	dword next_name = strchr(current_name, '\n');	54	dword next_name = strchr(current_name, '\n');
55	dword hotkey = strchr(current_name, '\|');	55	dword hotkey = strchr(current_name, '\|');
56		56
57	ESBYTE[next_name] = '\0';	57	ESBYTE[next_name] = '\0';
58		58
59	if (hotkey) && (hotkey < next_name) {	59	if (hotkey) && (hotkey < next_name) {
60	ESBYTE[hotkey] = '\0';	60	ESBYTE[hotkey] = '\0';
61	} else {	61	} else {
62	if (hotkey) && (!next_name) {	62	if (hotkey) && (!next_name) {
63	ESBYTE[hotkey] = '\0';	63	ESBYTE[hotkey] = '\0';
64	} else {	64	} else {
65	hotkey = " ";	65	hotkey = " ";
66	}	66	}
67	}	67	}
68		68
69	hotkeys.add(hotkey+1);	69	hotkeys.add(hotkey+1);
70	names.add(current_name);	70	names.add(current_name);
71		71
72	if (next_name) GetMenuItems(next_name+2);	72	if (next_name) GetMenuItems(next_name+2);
73	}	73	}
74		74
75	int GetSeparatorsCount()	75	int GetSeparatorsCount()
76	{	76	{
77	int i, count=0;	77	int i, count=0;
78	for (i=0; i	78	for (i=0; i
79	if (streq(names.get(i), "-")) count++;	79	if (streq(names.get(i), "-")) count++;
80	}	80	}
81	return count;	81	return count;
82	}	82	}
83		83
84	int MoveMouseToHandleSeparators(int _mouse_y)	84	int MoveMouseToHandleSeparators(int _mouse_y)
85	{	85	{
86	int i, item_y=menu1.y;	86	int i, item_y=menu1.y;
87	int item_i=0;	87	int item_i=0;
88	for (i=0; i	88	for (i=0; i
89	{	89	{
90	if (streq(names.get(i), "-")) {	90	if (streq(names.get(i), "-")) {
91	item_y += SEP_H;	91	item_y += SEP_H;
92	} else {	92	} else {
93	item_y += ITEM_H;	93	item_y += ITEM_H;
94	item_i++;	94	item_i++;
95	}	95	}
96	if (_mouse_y >= item_y) && (_mouse_y < item_y + ITEM_H) {	96	if (_mouse_y >= item_y) && (_mouse_y < item_y + ITEM_H) {
97	return item_i * ITEM_H + menu1.y;	97	return item_i * ITEM_H + menu1.y;
98	}	98	}
99	}	99	}
100	return _mouse_y;	100	return _mouse_y;
101	}	101	}
102		102
103	void main()	103	void main()
104	{	104	{
105	proc_info Form;	105	proc_info Form;
106		106
107	if (!param) die("'Menu component is for developers only' -I");	107	if (!param) die("'Menu component is for developers only' -I");
108		108
109	GetMenuItems(#param);	109	GetMenuItems(#param);
110	GetMenuWidths();	110	GetMenuWidths();
111		111
112	menu_w = max_name_len + max_hotkey_len + 23;	112	menu_w = max_name_len + max_hotkey_len + 23;
113	menu_h = GetSeparatorsCount() * SEP_H	113	menu_h = GetSeparatorsCount() * SEP_H
114	+ calc(names.count - GetSeparatorsCount() * ITEM_H);	114	+ calc(names.count - GetSeparatorsCount() * ITEM_H);
115		115
116	menu1.count = names.count;	116	menu1.count = names.count;
117	menu1.SetFont(6, 9, 0x80);	117	menu1.SetFont(6, 9, 0x80);
118	menu1.SetSizes(2,2, menu_w, menu_h, ITEM_H);	118	menu1.SetSizes(2,2, menu_w, menu_h, ITEM_H);
119	menu1.cur_y = -1;	119	menu1.cur_y = -1;
120		120
121	GetWindowPosition();	121	GetWindowPosition();
122		122
123	SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE);	123	SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE);
124	loop() switch(WaitEvent())	124	loop() switch(WaitEvent())
125	{	125	{
126	case evMouse:	126	case evMouse:
127	GetProcessInfo(#Form, SelfInfo);	127	GetProcessInfo(#Form, SelfInfo);
128	if (!CheckActiveProcess(Form.ID)) exit();	128	if (!CheckActiveProcess(Form.ID)) exit();
129	mouse.get();	129	mouse.get();
130	if (menu1.MouseOver(mouse.x, mouse.y)) {	130	if (menu1.MouseOver(mouse.x, mouse.y)) {
131	mouse.y = MoveMouseToHandleSeparators(mouse.y);	131	mouse.y = MoveMouseToHandleSeparators(mouse.y);
132	if (menu1.ProcessMouse(mouse.x, mouse.y)) draw_list();	132	if (menu1.ProcessMouse(mouse.x, mouse.y)) draw_list();
133	if (mouse.lkm)&&(mouse.up) click();	133	if (mouse.lkm)&&(mouse.up) click();
134	}	134	}
135	break;	135	break;
136		136
137	case evKey:	137	case evKey:
138	GetKeys();	138	GetKeys();
139	ProcessKeys();	139	ProcessKeys();
140	break;	140	break;
141		141
142	case evReDraw:	142	case evReDraw:
143	DefineAndDrawWindow(win_x, win_y, menu1.w+4, menu1.h+4, 0x01, 0, 0, 0x01fffFFF);	143	DefineAndDrawWindow(win_x, win_y, menu1.w+4, menu1.h+4, 0x01, 0, 0, 0x01fffFFF);
144	system.color.get();	144	sc.get();
145	Draw3DPopup(0,0,menu1.w+2,menu1.h+2);	145	Draw3DPopup(0,0,menu1.w+2,menu1.h+2);
146	draw_list();	146	draw_list();
147	}	147	}
148	}	148	}
149		149
150	void ProcessKeys()	150	void ProcessKeys()
151	{	151	{
152	switch(key_scancode)	152	switch(key_scancode)
153	{	153	{
154	case SCAN_CODE_ESC:	154	case SCAN_CODE_ESC:
155	exit();	155	exit();
156		156
157	case SCAN_CODE_ENTER:	157	case SCAN_CODE_ENTER:
158	click();	158	click();
159		159
160	case SCAN_CODE_DOWN:	160	case SCAN_CODE_DOWN:
161	if (!menu1.KeyDown())	161	if (!menu1.KeyDown())
162	\|\| (menu1.count - menu1.cur_y - GetSeparatorsCount() -1 < 0) menu1.KeyHome();	162	\|\| (menu1.count - menu1.cur_y - GetSeparatorsCount() -1 < 0) menu1.KeyHome();
163	draw_list();	163	draw_list();
164	break;	164	break;
165		165
166	case SCAN_CODE_UP:	166	case SCAN_CODE_UP:
167	if (!menu1.KeyUp()) menu1.KeyEnd();	167	if (!menu1.KeyUp()) menu1.KeyEnd();
168	draw_list();	168	draw_list();
169	break;	169	break;
170		170
171	default:	171	default:
172	if (menu1.ProcessKey(key_scancode)) draw_list();	172	if (menu1.ProcessKey(key_scancode)) draw_list();
173	}	173	}
174	}	174	}
175		175
176	void draw_list()	176	void draw_list()
177	{	177	{
178	int i, item_y=menu1.y, item_i=0;	178	int i, item_y=menu1.y, item_i=0;
179	dword name_color;	179	dword name_color;
180	dword hotkey_color;	180	dword hotkey_color;
181		181
182	static dword inactive_background_color;	182	static dword inactive_background_color;
183	static dword active_background_color;	183	static dword active_background_color;
184	static dword active_top_border_color;	184	static dword active_top_border_color;
185	static dword inactive_text_shadow_color;	185	static dword inactive_text_shadow_color;
186	static bool skin_dark;	186	static bool skin_dark;
187		187
188	static bool colors_set;	188	static bool colors_set;
189	if (!colors_set) {	189	if (!colors_set) {
190	colors_set = true;	190	colors_set = true;
191	inactive_background_color = MixColors(system.color.work, 0xFFFfff,230);	191	inactive_background_color = MixColors(sc.work, 0xFFFfff,230);
192	active_background_color = MixColors(system.color.work_button, system.color.work,230);	192	active_background_color = MixColors(sc.button, sc.work,230);
193	active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240);	193	active_top_border_color = MixColors(sc.work_graph, sc.button,240);
194	inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,120);	194	inactive_text_shadow_color = MixColors(sc.work,0xFFFfff,120);
195	skin_dark = skin_is_dark();	195	skin_dark = skin_is_dark();
196	}	196	}
197		197
198	for (i=0; i	198	for (i=0; i
199	{	199	{
200	if (streq(names.get(i), "-")) {	200	if (streq(names.get(i), "-")) {
201	DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color);	201	DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color);
202	DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, system.color.work_dark);	202	DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, sc.work_dark);
203	DrawBar(menu1.x, item_y+2, menu1.w, 1, system.color.work_light);	203	DrawBar(menu1.x, item_y+2, menu1.w, 1, sc.work_light);
204	DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color);	204	DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color);
205	//DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color);	205	//DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color);
206	//DrawBar(13, item_y+1, menu1.w-24, 1, system.color.work_dark);	206	//DrawBar(13, item_y+1, menu1.w-24, 1, sc.work_dark);
207	//DrawBar(13, item_y+2, menu1.w-24, 1, system.color.work_light);	207	//DrawBar(13, item_y+2, menu1.w-24, 1, sc.work_light);
208	item_y += SEP_H;	208	item_y += SEP_H;
209	} else {	209	} else {
210	if (item_i==menu1.cur_y) {	210	if (item_i==menu1.cur_y) {
211	hotkey_color = name_color = system.color.work_button_text;	211	hotkey_color = name_color = sc.button_text;
212	DrawBar(menu1.x, item_y+1, menu1.w, ITEM_H-2, active_background_color);	212	DrawBar(menu1.x, item_y+1, menu1.w, ITEM_H-2, active_background_color);
213	DrawBar(menu1.x, item_y, menu1.w, 1, active_top_border_color);	213	DrawBar(menu1.x, item_y, menu1.w, 1, active_top_border_color);
214	DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, system.color.work_light);	214	DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, sc.work_light);
215	} else {	215	} else {
216	name_color = system.color.work_text;	216	name_color = sc.work_text;
217	hotkey_color = system.color.work_graph;	217	hotkey_color = sc.work_graph;
218	DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color);	218	DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color);
219	if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80,	219	if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80,
220	inactive_text_shadow_color, names.get(i));	220	inactive_text_shadow_color, names.get(i));
221	}	221	}
222	WriteText(-strlen(hotkeys.get(i))*6 + 13 + max_name_len + max_hotkey_len,	222	WriteText(-strlen(hotkeys.get(i))*6 + 13 + max_name_len + max_hotkey_len,
223	item_y + menu1.text_y, 0x80, hotkey_color, hotkeys.get(i));	223	item_y + menu1.text_y, 0x80, hotkey_color, hotkeys.get(i));
224	WriteText(13, item_y + menu1.text_y, 0x80, name_color, names.get(i));	224	WriteText(13, item_y + menu1.text_y, 0x80, name_color, names.get(i));
225	item_y += ITEM_H;	225	item_y += ITEM_H;
226	item_i++;	226	item_i++;
227	}	227	}
228	}	228	}
229	if (selected) WriteText(5, selected-1*ITEM_H + menu1.y + menu1.text_y, 0x80, 0xEE0000, "\x10");	229	if (selected) WriteText(5, selected-1*ITEM_H + menu1.y + menu1.text_y, 0x80, 0xEE0000, "\x10");
230	}	230	}
231		231
232	void click()	232	void click()
233	{	233	{
234	ESDWORD[shared_mem] = menu1.cur_y + 1;	234	ESDWORD[shared_mem] = menu1.cur_y + 1;
235	ExitProcess();	235	ExitProcess();
236	}	236	}
237		237
238	void exit()	238	void exit()
239	{	239	{
240	ESDWORD[shared_mem] = 0;	240	ESDWORD[shared_mem] = 0;
241	ExitProcess();	241	ExitProcess();
242	}	242	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/menu/menu.c – Rev 7798 → 7806