MAME SVN History

199869 Revisions

r34614 Monday 26th January, 2015 at 09:18:37 UTC by Fabio Priuli
ui: slight improvement on device input ordering + small cleanup. nw. the ordering is still not optimal, imho, but at least if you launch SMS with a lphaser and a paddle you don't get anymore their input mixed in the menu. I will probably get back to this after next release.

[src/emu/ui]

inputmap.c sliders.c

trunk/src/emu/ui/inputmap.c
r243125	r243126
154	154	void ui_menu_input_specific::populate()
155	155	{
156	156	input_item_data *itemlist = NULL;
157		ioport_field *field;
158		ioport_port *port;
159	157	int suborder[SEQ_TYPE_TOTAL];
160	158	astring tempstring;
	159	int port_count = 0;
161	160
162	161	/* create a mini lookup table for sort order based on sequence type */
163	162	suborder[SEQ_TYPE_STANDARD] = 0;
r243125	r243126
165	164	suborder[SEQ_TYPE_INCREMENT] = 2;
166	165
167	166	/* iterate over the input ports and add menu items */
168		for (port = machine().ioport().first_port(); port != NULL; port = port->next())
169		for (field = port->first_field(); field != NULL; field = field->next())
	167	for (ioport_port *port = machine().ioport().first_port(); port != NULL; port = port->next())
	168	{
	169	port_count++;
	170	for (ioport_field *field = port->first_field(); field != NULL; field = field->next())
170	171	{
171	172	const char *name = field->name();
172	173
r243125	r243126
182	183	{
183	184	sortorder = (field->type() << 2) \| (field->player() << 12);
184	185	if (strcmp(field->device().tag(), ":"))
185		sortorder \|= 0x10000;
	186	sortorder \|= (port_count & 0xfff) * 0x10000;
186	187	}
187	188	else
188	189	sortorder = field->type() \| 0xf000;
r243125	r243126
212	213	}
213	214	}
214	215	}
	216	}
215	217
216	218	/* sort and populate the menu in a standard fashion */
217	219	populate_and_sort(itemlist);

trunk/src/emu/ui/sliders.c
r243125	r243126
130	130
131	131	void ui_menu_sliders::populate()
132	132	{
133		const slider_state *curslider;
134	133	astring tempstring;
135	134
136		/* add all sliders */
137		for (curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
	135	/* add UI sliders */
	136	for (const slider_state *curslider = machine().ui().get_slider_list(); curslider != NULL; curslider = curslider->next)
138	137	{
139	138	INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
140	139	UINT32 flags = 0;
r243125	r243126
148	147	break;
149	148	}
150	149
151		/* add all sliders */
152		for (curslider = (slider_state*)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
	150	/* add OSD sliders */
	151	for (const slider_state curslider = (slider_state)machine().osd().get_slider_list(); curslider != NULL; curslider = curslider->next)
153	152	{
154	153	INT32 curval = (*curslider->update)(machine(), curslider->arg, &tempstring, SLIDER_NOCHANGE);
155	154	UINT32 flags = 0;

199869 Revisions