Broke apart src/emu/ui/filemngr.?, moved src/emu/uiswlist.? ==>

src/emu/ui/swlist.?
This commit is contained in:
Nathan Woods 2014-01-20 18:59:37 +00:00
parent 7414640ce8
commit 7cc05c4256
15 changed files with 1334 additions and 1213 deletions

10
.gitattributes vendored
View File

@ -2506,8 +2506,14 @@ src/emu/timer.c svneol=native#text/plain
src/emu/timer.h svneol=native#text/plain
src/emu/ui.c svneol=native#text/plain
src/emu/ui.h svneol=native#text/plain
src/emu/ui/bbcontrl.c svneol=native#text/plain
src/emu/ui/bbcontrl.h svneol=native#text/plain
src/emu/ui/filemngr.c svneol=native#text/plain
src/emu/ui/filemngr.h svneol=native#text/plain
src/emu/ui/filesel.c svneol=native#text/plain
src/emu/ui/filesel.h svneol=native#text/plain
src/emu/ui/imginfo.c svneol=native#text/plain
src/emu/ui/imginfo.h svneol=native#text/plain
src/emu/ui/mainmenu.c svneol=native#text/plain
src/emu/ui/mainmenu.h svneol=native#text/plain
src/emu/ui/menu.c svneol=native#text/plain
@ -2516,6 +2522,8 @@ src/emu/ui/miscmenu.c svneol=native#text/plain
src/emu/ui/miscmenu.h svneol=native#text/plain
src/emu/ui/selgame.c svneol=native#text/plain
src/emu/ui/selgame.h svneol=native#text/plain
src/emu/ui/swlist.c svneol=native#text/plain
src/emu/ui/swlist.h svneol=native#text/plain
src/emu/ui/tapectrl.c svneol=native#text/plain
src/emu/ui/tapectrl.h svneol=native#text/plain
src/emu/uigfx.c svneol=native#text/plain
@ -2523,8 +2531,6 @@ src/emu/uigfx.h svneol=native#text/plain
src/emu/uiinput.c svneol=native#text/plain
src/emu/uiinput.h svneol=native#text/plain
src/emu/uismall.png -text svneol=unset#image/png
src/emu/uiswlist.c svneol=native#text/plain
src/emu/uiswlist.h svneol=native#text/plain
src/emu/validity.c svneol=native#text/plain
src/emu/validity.h svneol=native#text/plain
src/emu/video.c svneol=native#text/plain

View File

@ -13,8 +13,8 @@
#include "drivenum.h"
#include "ui.h"
#include "zippath.h"
#include "ui/filemngr.h"
#include "uiswlist.h"
#include "ui/filesel.h"
#include "ui/swlist.h"
//**************************************************************************
// DEVICE CONFIG IMAGE INTERFACE

View File

@ -144,12 +144,15 @@ EMUOBJS = \
$(EMUOBJ)/ui.o \
$(EMUOBJ)/uigfx.o \
$(EMUOBJ)/uiinput.o \
$(EMUOBJ)/uiswlist.o \
$(EMUOBJ)/ui/swlist.o \
$(EMUOBJ)/ui/menu.o \
$(EMUOBJ)/ui/mainmenu.o \
$(EMUOBJ)/ui/miscmenu.o \
$(EMUOBJ)/ui/selgame.o \
$(EMUOBJ)/ui/filemngr.o \
$(EMUOBJ)/ui/filesel.o \
$(EMUOBJ)/ui/imginfo.o \
$(EMUOBJ)/ui/bbcontrl.o \
$(EMUOBJ)/ui/tapectrl.o \
$(EMUOBJ)/validity.o \
$(EMUOBJ)/video.o \

View File

@ -9,7 +9,7 @@
#include "zippath.h"
#include "floppy.h"
#include "formats/imageutl.h"
#include "ui/filemngr.h"
#include "ui/filesel.h"
// device type definition

193
src/emu/ui/bbcontrl.c Normal file
View File

@ -0,0 +1,193 @@
/***************************************************************************
ui/bbcontrl.c
MESS's "bit banger" control
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
#include "emu.h"
#include "ui/menu.h"
#include "ui/bbcontrl.h"
#include "imagedev/bitbngr.h"
/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
#define BITBANGERCMD_SELECT ((void *) 0x0000)
#define BITBANGERCMD_MODE ((void *) 0x0001)
#define BITBANGERCMD_BAUD ((void *) 0x0002)
#define BITBANGERCMD_TUNE ((void *) 0x0003)
/***************************************************************************
IMPLEMENTATION
***************************************************************************/
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_mess_bitbanger_control::ui_menu_mess_bitbanger_control(running_machine &machine, render_container *container) : ui_menu(machine, container)
{
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_mess_bitbanger_control::~ui_menu_mess_bitbanger_control()
{
}
//-------------------------------------------------
// bitbanger_count - returns the number of bitbanger
// devices in the machine
//-------------------------------------------------
int ui_menu_mess_bitbanger_control::bitbanger_count()
{
bitbanger_device_iterator iter(machine().root_device());
return iter.count();
}
//-------------------------------------------------
// populate - populates the main bitbanger control menu
//-------------------------------------------------
void ui_menu_mess_bitbanger_control::populate()
{
int count = bitbanger_count();
UINT32 flags = 0, mode_flags = 0, baud_flags = 0, tune_flags = 0;
if( count > 0 )
{
if( index == (count-1) )
flags |= MENU_FLAG_LEFT_ARROW;
else
flags |= MENU_FLAG_RIGHT_ARROW;
}
if ((device != NULL) && (device->exists()))
{
bitbanger_device *bitbanger = downcast<bitbanger_device *>(&device->device());
if (bitbanger->inc_mode(TRUE))
mode_flags |= MENU_FLAG_RIGHT_ARROW;
if (bitbanger->dec_mode(TRUE))
mode_flags |= MENU_FLAG_LEFT_ARROW;
if (bitbanger->inc_baud(TRUE))
baud_flags |= MENU_FLAG_RIGHT_ARROW;
if (bitbanger->dec_baud(TRUE))
baud_flags |= MENU_FLAG_LEFT_ARROW;
if (bitbanger->inc_tune(TRUE))
tune_flags |= MENU_FLAG_RIGHT_ARROW;
if (bitbanger->dec_tune(TRUE))
tune_flags |= MENU_FLAG_LEFT_ARROW;
// name of bitbanger file
item_append(device->device().name(), device->filename(), flags, BITBANGERCMD_SELECT);
item_append("Device Mode:", bitbanger->mode_string(), mode_flags, BITBANGERCMD_MODE);
item_append("Baud:", bitbanger->baud_string(), baud_flags, BITBANGERCMD_BAUD);
item_append("Baud Tune:", bitbanger->tune_string(), tune_flags, BITBANGERCMD_TUNE);
item_append("Protocol:", "8-1-N", 0, NULL);
}
else
{
// no tape loaded
item_append("No Bitbanger Image loaded", NULL, flags, NULL);
}
}
//-------------------------------------------------
// handle
//-------------------------------------------------
void ui_menu_mess_bitbanger_control::handle()
{
// do we have to load the device?
if (device == NULL)
{
bitbanger_device_iterator iter(machine().root_device());
device = iter.byindex(index);
reset((ui_menu_reset_options)0);
}
// get the bitbanger
bitbanger_device *bitbanger = downcast<bitbanger_device *>(device);
// rebuild the menu
reset(UI_MENU_RESET_REMEMBER_POSITION);
populate();
// process the menu
const ui_menu_event *event = process(UI_MENU_PROCESS_LR_REPEAT);
if (event != NULL)
{
switch(event->iptkey)
{
case IPT_UI_LEFT:
if (event->itemref==BITBANGERCMD_SELECT)
{
// left arrow - rotate left through cassette devices
if (index > 0)
index--;
else
index = bitbanger_count() - 1;
device = NULL;
}
else if (event->itemref==BITBANGERCMD_MODE)
{
bitbanger->dec_mode(FALSE);
}
else if (event->itemref==BITBANGERCMD_BAUD)
{
bitbanger->dec_baud(FALSE);
}
else if (event->itemref==BITBANGERCMD_TUNE)
{
bitbanger->dec_tune(FALSE);
}
break;
case IPT_UI_RIGHT:
if (event->itemref==BITBANGERCMD_SELECT)
{
// right arrow - rotate right through cassette devices
if (index < bitbanger_count() - 1)
index++;
else
index = 0;
device = NULL;
}
else if (event->itemref==BITBANGERCMD_MODE)
{
bitbanger->inc_mode(FALSE);
}
else if (event->itemref==BITBANGERCMD_BAUD)
{
bitbanger->inc_baud(FALSE);
}
else if (event->itemref==BITBANGERCMD_TUNE)
{
bitbanger->inc_tune(FALSE);
}
break;
}
}
}

30
src/emu/ui/bbcontrl.h Normal file
View File

@ -0,0 +1,30 @@
/***************************************************************************
ui/bbcontrl.h
MESS's "bit banger" control
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
#pragma once
#ifndef __UI_BBCONTRL_H__
#define __UI_BBCONTRL_H__
class ui_menu_mess_bitbanger_control : public ui_menu {
public:
ui_menu_mess_bitbanger_control(running_machine &machine, render_container *container);
virtual ~ui_menu_mess_bitbanger_control();
virtual void populate();
virtual void handle();
private:
int index;
device_image_interface *device;
int bitbanger_count();
};
#endif // __UI_BBCONTRL_H__

File diff suppressed because it is too large Load Diff

View File

@ -14,14 +14,6 @@
#ifndef __UI_FILEMNGR_H__
#define __UI_FILEMNGR_H__
class ui_menu_image_info : public ui_menu {
public:
ui_menu_image_info(running_machine &machine, render_container *container);
virtual ~ui_menu_image_info();
virtual void populate();
virtual void handle();
};
class ui_menu_file_manager : public ui_menu {
public:
astring current_directory;
@ -35,113 +27,4 @@ public:
virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
};
class ui_menu_mess_bitbanger_control : public ui_menu {
public:
ui_menu_mess_bitbanger_control(running_machine &machine, render_container *container);
virtual ~ui_menu_mess_bitbanger_control();
virtual void populate();
virtual void handle();
private:
int index;
device_image_interface *device;
int bitbanger_count();
};
class ui_menu_confirm_save_as : public ui_menu {
public:
ui_menu_confirm_save_as(running_machine &machine, render_container *container, bool *yes);
virtual ~ui_menu_confirm_save_as();
virtual void populate();
virtual void handle();
private:
bool *yes;
};
class ui_menu_file_create : public ui_menu {
public:
ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *image, astring &current_directory, astring &current_file);
virtual ~ui_menu_file_create();
virtual void populate();
virtual void handle();
virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
private:
device_image_interface *image;
astring &current_directory, &current_file;
const image_device_format *current_format;
//int confirm_save_as_yes;
char filename_buffer[1024];
};
class ui_menu_file_selector : public ui_menu {
public:
enum { R_EMPTY, R_SOFTLIST, R_CREATE, R_FILE };
ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *image, astring &current_directory, astring &current_file, bool has_empty, bool has_softlist, bool has_create, int *result);
virtual ~ui_menu_file_selector();
virtual void populate();
virtual void handle();
virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
private:
enum file_selector_entry_type {
SELECTOR_ENTRY_TYPE_EMPTY,
SELECTOR_ENTRY_TYPE_CREATE,
SELECTOR_ENTRY_TYPE_SOFTWARE_LIST,
SELECTOR_ENTRY_TYPE_DRIVE,
SELECTOR_ENTRY_TYPE_DIRECTORY,
SELECTOR_ENTRY_TYPE_FILE
};
struct file_selector_entry {
file_selector_entry *next;
file_selector_entry_type type;
const char *basename;
const char *fullpath;
};
device_image_interface *image;
astring &current_directory, &current_file;
bool has_empty, has_softlist, has_create;
int *result;
file_selector_entry *entrylist;
char filename_buffer[1024];
int compare_entries(const file_selector_entry *e1, const file_selector_entry *e2);
file_selector_entry *append_entry(file_selector_entry_type entry_type, const char *entry_basename, const char *entry_fullpath);
file_selector_entry *append_dirent_entry(const osd_directory_entry *dirent);
void append_entry_menu_item(const file_selector_entry *entry);
};
class ui_menu_select_format : public ui_menu {
public:
ui_menu_select_format(running_machine &machine, render_container *container,
class floppy_image_format_t **formats, int ext_match, int total_usable, int *result);
virtual ~ui_menu_select_format();
virtual void populate();
virtual void handle();
private:
floppy_image_format_t **formats;
int ext_match, total_usable;
int *result;
};
class ui_menu_select_rw : public ui_menu {
public:
enum { READONLY, READWRITE, WRITE_OTHER, WRITE_DIFF };
ui_menu_select_rw(running_machine &machine, render_container *container,
bool can_in_place, int *result);
virtual ~ui_menu_select_rw();
virtual void populate();
virtual void handle();
private:
bool can_in_place;
int *result;
};
#endif /* __UI_FILEMNGR_H__ */

865
src/emu/ui/filesel.c Normal file
View File

@ -0,0 +1,865 @@
/***************************************************************************
ui/filesel.c
MESS's clunky built-in file manager
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
TODO
- Support image creation arguments
- Restrict empty slot if image required
***************************************************************************/
#include "emu.h"
#include "ui.h"
#include "zippath.h"
#include "ui/menu.h"
#include "ui/filesel.h"
#include "ui/swlist.h"
#include "imagedev/floppy.h"
/***************************************************************************
CONSTANTS
***************************************************************************/
// conditional compilation to enable chosing of image formats - this is not
// yet fully implemented
#define ENABLE_FORMATS 0
// time (in seconds) to display errors
#define ERROR_MESSAGE_TIME 5
// itemrefs for key menu items
#define ITEMREF_NEW_IMAGE_NAME ((void *) 0x0001)
#define ITEMREF_CREATE ((void *) 0x0002)
#define ITEMREF_FORMAT ((void *) 0x0003)
#define ITEMREF_NO ((void *) 0x0004)
#define ITEMREF_YES ((void *) 0x0005)
/***************************************************************************
MENU HELPERS
***************************************************************************/
//-------------------------------------------------
// input_character - inputs a typed character
// into a buffer
//-------------------------------------------------
static void input_character(char *buffer, size_t buffer_length, unicode_char unichar, int (*filter)(unicode_char))
{
size_t buflen = strlen(buffer);
if ((unichar == 8) && (buflen > 0))
{
*(char *)utf8_previous_char(&buffer[buflen]) = 0;
}
else if ((unichar > ' ') && ((filter == NULL) || (*filter)(unichar)))
{
buflen += utf8_from_uchar(&buffer[buflen], buffer_length - buflen, unichar);
buffer[buflen] = 0;
}
}
//-------------------------------------------------
// extra_text_draw_box - generically adds header
// or footer text
//-------------------------------------------------
static void extra_text_draw_box(render_container *container, float origx1, float origx2, float origy, float yspan, const char *text, int direction)
{
float text_width, text_height;
float width, maxwidth;
float x1, y1, x2, y2, temp;
// get the size of the text
ui_draw_text_full(container,text, 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_WORD,
DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &text_width, &text_height);
width = text_width + (2 * UI_BOX_LR_BORDER);
maxwidth = MAX(width, origx2 - origx1);
// compute our bounds
x1 = 0.5f - 0.5f * maxwidth;
x2 = x1 + maxwidth;
y1 = origy + (yspan * direction);
y2 = origy + (UI_BOX_TB_BORDER * direction);
if (y1 > y2)
{
temp = y1;
y1 = y2;
y2 = temp;
}
// draw a box
ui_draw_outlined_box(container,x1, y1, x2, y2, UI_BACKGROUND_COLOR);
// take off the borders
x1 += UI_BOX_LR_BORDER;
x2 -= UI_BOX_LR_BORDER;
y1 += UI_BOX_TB_BORDER;
y2 -= UI_BOX_TB_BORDER;
// draw the text within it
ui_draw_text_full(container,text, x1, y1, text_width, JUSTIFY_LEFT, WRAP_WORD,
DRAW_NORMAL, ARGB_WHITE, ARGB_BLACK, NULL, NULL);
}
//-------------------------------------------------
// extra_text_render - generically adds header
// and footer text
//-------------------------------------------------
void extra_text_render(render_container *container, float top, float bottom,
float origx1, float origy1, float origx2, float origy2,
const char *header, const char *footer)
{
header = ((header != NULL) && (header[0] != '\0')) ? header : NULL;
footer = ((footer != NULL) && (footer[0] != '\0')) ? footer : NULL;
if (header != NULL)
extra_text_draw_box(container, origx1, origx2, origy1, top, header, -1);
if (footer != NULL)
extra_text_draw_box(container, origx1, origx2, origy2, bottom, footer, +1);
}
/***************************************************************************
CONFIRM SAVE AS MENU
***************************************************************************/
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_confirm_save_as::ui_menu_confirm_save_as(running_machine &machine, render_container *container, bool *_yes) : ui_menu(machine, container)
{
yes = _yes;
*yes = false;
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_confirm_save_as::~ui_menu_confirm_save_as()
{
}
//-------------------------------------------------
// populate
//-------------------------------------------------
void ui_menu_confirm_save_as::populate()
{
item_append("File Already Exists - Override?", NULL, MENU_FLAG_DISABLE, NULL);
item_append(MENU_SEPARATOR_ITEM, NULL, MENU_FLAG_DISABLE, NULL);
item_append("No", NULL, 0, ITEMREF_NO);
item_append("Yes", NULL, 0, ITEMREF_YES);
}
//-------------------------------------------------
// handle - confirm save as menu
//-------------------------------------------------
void ui_menu_confirm_save_as::handle()
{
// process the menu
const ui_menu_event *event = process(0);
// process the event
if ((event != NULL) && (event->iptkey == IPT_UI_SELECT))
{
if (event->itemref == ITEMREF_YES)
*yes = true;
// no matter what, pop out
ui_menu::stack_pop(machine());
}
}
/***************************************************************************
FILE CREATE MENU
***************************************************************************/
//-------------------------------------------------
// is_valid_filename_char - tests to see if a
// character is valid in a filename
//-------------------------------------------------
static int is_valid_filename_char(unicode_char unichar)
{
// this should really be in the OSD layer
static const char valid_filename_char[] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00-0f
0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 10-1f
1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, // !"#$%&'()*+,-./
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // 0123456789:;<=>?
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // @ABCDEFGHIJKLMNO
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, // PQRSTUVWXYZ[\]^_
0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // `abcdefghijklmno
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, // pqrstuvwxyz{|}~
};
return (unichar < ARRAY_LENGTH(valid_filename_char)) && valid_filename_char[unichar];
}
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_file_create::ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *_image, astring &_current_directory, astring &_current_file) : ui_menu(machine, container), current_directory(_current_directory), current_file(_current_file)
{
image = _image;
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_file_create::~ui_menu_file_create()
{
}
//-------------------------------------------------
// custom_render - perform our special rendering
//-------------------------------------------------
void ui_menu_file_create::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2)
{
extra_text_render(container, top, bottom, origx1, origy1, origx2, origy2,
current_directory,
NULL);
}
//-------------------------------------------------
// populate - populates the file creator menu
//-------------------------------------------------
void ui_menu_file_create::populate()
{
astring buffer;
const image_device_format *format;
const char *new_image_name;
// append the "New Image Name" item
if (get_selection() == ITEMREF_NEW_IMAGE_NAME)
{
buffer.cat(filename_buffer).cat("_");
new_image_name = buffer;
}
else
{
new_image_name = filename_buffer;
}
item_append("New Image Name:", new_image_name, 0, ITEMREF_NEW_IMAGE_NAME);
// do we support multiple formats?
format = image->device_get_creatable_formats();
if (ENABLE_FORMATS && (format != NULL))
{
item_append("Image Format:", current_format->m_description, 0, ITEMREF_FORMAT);
current_format = format;
}
// finish up the menu
item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL);
item_append("Create", NULL, 0, ITEMREF_CREATE);
customtop = ui_get_line_height(machine()) + 3.0f * UI_BOX_TB_BORDER;
}
//-------------------------------------------------
// handle - file creator menu
//-------------------------------------------------
void ui_menu_file_create::handle()
{
// process the menu
const ui_menu_event *event = process(0);
// process the event
if (event != NULL)
{
// handle selections
switch(event->iptkey)
{
case IPT_UI_SELECT:
if ((event->itemref == ITEMREF_CREATE) || (event->itemref == ITEMREF_NEW_IMAGE_NAME))
{
astring tmp_file(filename_buffer);
if (tmp_file.find(".") != -1 && tmp_file.find(".") < tmp_file.len() - 1)
{
current_file.cpy(filename_buffer);
ui_menu::stack_pop(machine());
}
else
ui_popup_time(1, "Please enter a file extension too");
}
break;
case IPT_SPECIAL:
if (get_selection() == ITEMREF_NEW_IMAGE_NAME)
{
input_character(
filename_buffer,
ARRAY_LENGTH(filename_buffer),
event->unichar,
is_valid_filename_char);
reset(UI_MENU_RESET_REMEMBER_POSITION);
}
break;
}
}
}
/***************************************************************************
FILE SELECTOR MENU
***************************************************************************/
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_file_selector::ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *_image, astring &_current_directory, astring &_current_file, bool _has_empty, bool _has_softlist, bool _has_create, int *_result) : ui_menu(machine, container), current_directory(_current_directory), current_file(_current_file)
{
image = _image;
has_empty = _has_empty;
has_softlist = _has_softlist;
has_create = _has_create;
result = _result;
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_file_selector::~ui_menu_file_selector()
{
}
//-------------------------------------------------
// custom_render - perform our special rendering
//-------------------------------------------------
void ui_menu_file_selector::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2)
{
extra_text_render(container, top, bottom,
origx1, origy1, origx2, origy2,
current_directory,
NULL);
}
//-------------------------------------------------
// compare_file_selector_entries - sorting proc
// for file selector entries
//-------------------------------------------------
int ui_menu_file_selector::compare_entries(const file_selector_entry *e1, const file_selector_entry *e2)
{
int result;
const char *e1_basename = (e1->basename != NULL) ? e1->basename : "";
const char *e2_basename = (e2->basename != NULL) ? e2->basename : "";
if (e1->type < e2->type)
{
result = -1;
}
else if (e1->type > e2->type)
{
result = 1;
}
else
{
result = mame_stricmp(e1_basename, e2_basename);
if (result == 0)
{
result = strcmp(e1_basename, e2_basename);
if (result == 0)
{
if (e1 < e2)
result = -1;
else if (e1 > e2)
result = 1;
}
}
}
return result;
}
//-------------------------------------------------
// append_entry - appends a new
// file selector entry to an entry list
//-------------------------------------------------
ui_menu_file_selector::file_selector_entry *ui_menu_file_selector::append_entry(
file_selector_entry_type entry_type, const char *entry_basename, const char *entry_fullpath)
{
file_selector_entry *entry;
file_selector_entry **entryptr;
// allocate a new entry
entry = (file_selector_entry *) m_pool_alloc(sizeof(*entry));
memset(entry, 0, sizeof(*entry));
entry->type = entry_type;
entry->basename = (entry_basename != NULL) ? pool_strdup(entry_basename) : entry_basename;
entry->fullpath = (entry_fullpath != NULL) ? pool_strdup(entry_fullpath) : entry_fullpath;
// find the end of the list
entryptr = &entrylist;
while ((*entryptr != NULL) && (compare_entries(entry, *entryptr) >= 0))
entryptr = &(*entryptr)->next;
// insert the entry
entry->next = *entryptr;
*entryptr = entry;
return entry;
}
//-------------------------------------------------
// append_entry_menu_item - appends
// a menu item for a file selector entry
//-------------------------------------------------
ui_menu_file_selector::file_selector_entry *ui_menu_file_selector::append_dirent_entry(const osd_directory_entry *dirent)
{
astring buffer;
file_selector_entry_type entry_type;
file_selector_entry *entry;
switch(dirent->type)
{
case ENTTYPE_FILE:
entry_type = SELECTOR_ENTRY_TYPE_FILE;
break;
case ENTTYPE_DIR:
entry_type = SELECTOR_ENTRY_TYPE_DIRECTORY;
break;
default:
// exceptional case; do not add a menu item
return NULL;
}
// determine the full path
zippath_combine(buffer, current_directory, dirent->name);
// create the file selector entry
entry = append_entry(
entry_type,
dirent->name,
buffer);
return entry;
}
//-------------------------------------------------
// append_entry_menu_item - appends
// a menu item for a file selector entry
//-------------------------------------------------
void ui_menu_file_selector::append_entry_menu_item(const file_selector_entry *entry)
{
const char *text = NULL;
const char *subtext = NULL;
switch(entry->type)
{
case SELECTOR_ENTRY_TYPE_EMPTY:
text = "[empty slot]";
break;
case SELECTOR_ENTRY_TYPE_CREATE:
text = "[create]";
break;
case SELECTOR_ENTRY_TYPE_SOFTWARE_LIST:
text = "[software list]";
break;
case SELECTOR_ENTRY_TYPE_DRIVE:
text = entry->basename;
subtext = "[DRIVE]";
break;
case SELECTOR_ENTRY_TYPE_DIRECTORY:
text = entry->basename;
subtext = "[DIR]";
break;
case SELECTOR_ENTRY_TYPE_FILE:
text = entry->basename;
subtext = "[FILE]";
break;
}
item_append(text, subtext, 0, (void *) entry);
}
//-------------------------------------------------
// populate
//-------------------------------------------------
void ui_menu_file_selector::populate()
{
zippath_directory *directory = NULL;
file_error err = FILERR_NONE;
const osd_directory_entry *dirent;
const file_selector_entry *entry;
const file_selector_entry *selected_entry = NULL;
int i;
const char *volume_name;
const char *path = current_directory;
// open the directory
err = zippath_opendir(path, &directory);
if (err != FILERR_NONE)
goto done;
// clear out the menu entries
entrylist = NULL;
if (has_empty)
{
// add the "[empty slot]" entry
append_entry(SELECTOR_ENTRY_TYPE_EMPTY, NULL, NULL);
}
if (has_create)
{
// add the "[create]" entry
append_entry(SELECTOR_ENTRY_TYPE_CREATE, NULL, NULL);
}
if (has_softlist)
{
// add the "[software list]" entry
append_entry(SELECTOR_ENTRY_TYPE_SOFTWARE_LIST, NULL, NULL);
}
// add the drives
i = 0;
while((volume_name = osd_get_volume_name(i))!=NULL)
{
append_entry(SELECTOR_ENTRY_TYPE_DRIVE,
volume_name, volume_name);
i++;
}
// build the menu for each item
while((dirent = zippath_readdir(directory)) != NULL)
{
// append a dirent entry
entry = append_dirent_entry(dirent);
if (entry != NULL)
{
// set the selected item to be the first non-parent directory or file
if ((selected_entry == NULL) && strcmp(dirent->name, ".."))
selected_entry = entry;
// do we have to select this file?
if (!mame_stricmp(current_file, dirent->name))
selected_entry = entry;
}
}
// append all of the menu entries
for (entry = entrylist; entry != NULL; entry = entry->next)
append_entry_menu_item(entry);
// set the selection (if we have one)
if (selected_entry != NULL)
set_selection((void *) selected_entry);
// set up custom render proc
customtop = ui_get_line_height(machine()) + 3.0f * UI_BOX_TB_BORDER;
done:
if (directory != NULL)
zippath_closedir(directory);
}
//-------------------------------------------------
// handle
//-------------------------------------------------
void ui_menu_file_selector::handle()
{
file_error err;
const file_selector_entry *entry;
const file_selector_entry *selected_entry = NULL;
int bestmatch = 0;
// process the menu
const ui_menu_event *event = process(0);
if (event != NULL && event->itemref != NULL)
{
// handle selections
if (event->iptkey == IPT_UI_SELECT)
{
entry = (const file_selector_entry *) event->itemref;
switch(entry->type)
{
case SELECTOR_ENTRY_TYPE_EMPTY:
// empty slot - unload
*result = R_EMPTY;
ui_menu::stack_pop(machine());
break;
case SELECTOR_ENTRY_TYPE_CREATE:
// create
*result = R_CREATE;
ui_menu::stack_pop(machine());
break;
case SELECTOR_ENTRY_TYPE_SOFTWARE_LIST:
*result = R_SOFTLIST;
ui_menu::stack_pop(machine());
break;
case SELECTOR_ENTRY_TYPE_DRIVE:
case SELECTOR_ENTRY_TYPE_DIRECTORY:
// drive/directory - first check the path
err = zippath_opendir(entry->fullpath, NULL);
if (err != FILERR_NONE)
{
// this path is problematic; present the user with an error and bail
ui_popup_time(1, "Error accessing %s", entry->fullpath);
break;
}
current_directory.cpy(entry->fullpath);
reset((ui_menu_reset_options)0);
break;
case SELECTOR_ENTRY_TYPE_FILE:
// file
current_file.cpy(entry->fullpath);
*result = R_FILE;
ui_menu::stack_pop(machine());
break;
}
// reset the char buffer when pressing IPT_UI_SELECT
if (filename_buffer[0] != '\0')
memset(filename_buffer, '\0', ARRAY_LENGTH(filename_buffer));
}
else if (event->iptkey == IPT_SPECIAL)
{
int buflen = strlen(filename_buffer);
bool update_selected = FALSE;
// if it's a backspace and we can handle it, do so
if ((event->unichar == 8 || event->unichar == 0x7f) && buflen > 0)
{
*(char *)utf8_previous_char(&filename_buffer[buflen]) = 0;
update_selected = TRUE;
if (ARRAY_LENGTH(filename_buffer) > 0)
ui_popup_time(ERROR_MESSAGE_TIME, "%s", filename_buffer);
}
// if it's any other key and we're not maxed out, update
else if (event->unichar >= ' ' && event->unichar < 0x7f)
{
buflen += utf8_from_uchar(&filename_buffer[buflen], ARRAY_LENGTH(filename_buffer) - buflen, event->unichar);
filename_buffer[buflen] = 0;
update_selected = TRUE;
if (ARRAY_LENGTH(filename_buffer) > 0)
ui_popup_time(ERROR_MESSAGE_TIME, "%s", filename_buffer);
}
if (update_selected)
{
const file_selector_entry *cur_selected = (const file_selector_entry *)get_selection();
// check for entries which matches our filename_buffer:
// from current entry to the end
for (entry = cur_selected; entry != NULL; entry = entry->next)
{
if (entry->basename != NULL && filename_buffer != NULL)
{
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(filename_buffer); i++)
{
if (mame_strnicmp(entry->basename, filename_buffer, i) == 0)
match = i;
}
if (match > bestmatch)
{
bestmatch = match;
selected_entry = entry;
}
}
}
// and from the first entry to current one
for (entry = entrylist; entry != cur_selected; entry = entry->next)
{
if (entry->basename != NULL && filename_buffer != NULL)
{
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(filename_buffer); i++)
{
if (mame_strnicmp(entry->basename, filename_buffer, i) == 0)
match = i;
}
if (match > bestmatch)
{
bestmatch = match;
selected_entry = entry;
}
}
}
if (selected_entry != NULL && selected_entry != cur_selected)
set_selection((void *) selected_entry);
}
}
else if (event->iptkey == IPT_UI_CANCEL)
{
// reset the char buffer also in this case
if (filename_buffer[0] != '\0')
memset(filename_buffer, '\0', ARRAY_LENGTH(filename_buffer));
}
}
}
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_select_format::ui_menu_select_format(running_machine &machine, render_container *container,
floppy_image_format_t **_formats, int _ext_match, int _total_usable, int *_result)
: ui_menu(machine, container)
{
formats = _formats;
ext_match = _ext_match;
total_usable = _total_usable;
result = _result;
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_select_format::~ui_menu_select_format()
{
}
//-------------------------------------------------
// populate
//-------------------------------------------------
void ui_menu_select_format::populate()
{
item_append("Select image format", NULL, MENU_FLAG_DISABLE, NULL);
for(int i=0; i<total_usable; i++) {
const floppy_image_format_t *fmt = formats[i];
if(i && i == ext_match)
item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL);
item_append(fmt->description(), fmt->name(), 0, (void *)(FPTR)i);
}
}
//-------------------------------------------------
// handle
//-------------------------------------------------
void ui_menu_select_format::handle()
{
// process the menu
const ui_menu_event *event = process(0);
if (event != NULL && event->iptkey == IPT_UI_SELECT)
{
*result = int(FPTR(event->itemref));
ui_menu::stack_pop(machine());
}
}
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_select_rw::ui_menu_select_rw(running_machine &machine, render_container *container,
bool _can_in_place, int *_result)
: ui_menu(machine, container)
{
can_in_place = _can_in_place;
result = _result;
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_select_rw::~ui_menu_select_rw()
{
}
//-------------------------------------------------
// populate
//-------------------------------------------------
void ui_menu_select_rw::populate()
{
item_append("Select access mode", NULL, MENU_FLAG_DISABLE, NULL);
item_append("Read-only", 0, 0, (void *)READONLY);
if(can_in_place)
item_append("Read-write", 0, 0, (void *)READWRITE);
item_append("Read this image, write to another image", 0, 0, (void *)WRITE_OTHER);
item_append("Read this image, write to diff", 0, 0, (void *)WRITE_DIFF);
}
//-------------------------------------------------
// handle
//-------------------------------------------------
void ui_menu_select_rw::handle()
{
// process the menu
const ui_menu_event *event = process(0);
if (event != NULL && event->iptkey == IPT_UI_SELECT)
{
*result = int(FPTR(event->itemref));
ui_menu::stack_pop(machine());
}
}

118
src/emu/ui/filesel.h Normal file
View File

@ -0,0 +1,118 @@
/***************************************************************************
ui/filesel.h
MESS's clunky built-in file manager
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
#pragma once
#ifndef __UI_FILESEL_H__
#define __UI_FILESEL_H__
class ui_menu_confirm_save_as : public ui_menu {
public:
ui_menu_confirm_save_as(running_machine &machine, render_container *container, bool *yes);
virtual ~ui_menu_confirm_save_as();
virtual void populate();
virtual void handle();
private:
bool *yes;
};
class ui_menu_file_create : public ui_menu {
public:
ui_menu_file_create(running_machine &machine, render_container *container, device_image_interface *image, astring &current_directory, astring &current_file);
virtual ~ui_menu_file_create();
virtual void populate();
virtual void handle();
virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
private:
device_image_interface *image;
astring &current_directory, &current_file;
const image_device_format *current_format;
//int confirm_save_as_yes;
char filename_buffer[1024];
};
class ui_menu_file_selector : public ui_menu {
public:
enum { R_EMPTY, R_SOFTLIST, R_CREATE, R_FILE };
ui_menu_file_selector(running_machine &machine, render_container *container, device_image_interface *image, astring &current_directory, astring &current_file, bool has_empty, bool has_softlist, bool has_create, int *result);
virtual ~ui_menu_file_selector();
virtual void populate();
virtual void handle();
virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2);
private:
enum file_selector_entry_type {
SELECTOR_ENTRY_TYPE_EMPTY,
SELECTOR_ENTRY_TYPE_CREATE,
SELECTOR_ENTRY_TYPE_SOFTWARE_LIST,
SELECTOR_ENTRY_TYPE_DRIVE,
SELECTOR_ENTRY_TYPE_DIRECTORY,
SELECTOR_ENTRY_TYPE_FILE
};
struct file_selector_entry {
file_selector_entry *next;
file_selector_entry_type type;
const char *basename;
const char *fullpath;
};
device_image_interface *image;
astring &current_directory, &current_file;
bool has_empty, has_softlist, has_create;
int *result;
file_selector_entry *entrylist;
char filename_buffer[1024];
int compare_entries(const file_selector_entry *e1, const file_selector_entry *e2);
file_selector_entry *append_entry(file_selector_entry_type entry_type, const char *entry_basename, const char *entry_fullpath);
file_selector_entry *append_dirent_entry(const osd_directory_entry *dirent);
void append_entry_menu_item(const file_selector_entry *entry);
};
class ui_menu_select_format : public ui_menu {
public:
ui_menu_select_format(running_machine &machine, render_container *container,
class floppy_image_format_t **formats, int ext_match, int total_usable, int *result);
virtual ~ui_menu_select_format();
virtual void populate();
virtual void handle();
private:
floppy_image_format_t **formats;
int ext_match, total_usable;
int *result;
};
class ui_menu_select_rw : public ui_menu {
public:
enum { READONLY, READWRITE, WRITE_OTHER, WRITE_DIFF };
ui_menu_select_rw(running_machine &machine, render_container *container,
bool can_in_place, int *result);
virtual ~ui_menu_select_rw();
virtual void populate();
virtual void handle();
private:
bool can_in_place;
int *result;
};
// helper
void extra_text_render(render_container *container, float top, float bottom,
float origx1, float origy1, float origx2, float origy2,
const char *header, const char *footer);
#endif /* __UI_FILESEL_H__ */

58
src/emu/ui/imginfo.c Normal file
View File

@ -0,0 +1,58 @@
/***************************************************************************
ui/imginfo.c
Image info screen
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
#include "emu.h"
#include "ui/menu.h"
#include "ui/imginfo.h"
/***************************************************************************
IMPLEMENTATION
***************************************************************************/
//-------------------------------------------------
// ctor
//-------------------------------------------------
ui_menu_image_info::ui_menu_image_info(running_machine &machine, render_container *container) : ui_menu(machine, container)
{
}
//-------------------------------------------------
// dtor
//-------------------------------------------------
ui_menu_image_info::~ui_menu_image_info()
{
}
//-------------------------------------------------
// populate
//-------------------------------------------------
void ui_menu_image_info::populate()
{
astring tempstring;
item_append(image_info_astring(machine(), tempstring), NULL, MENU_FLAG_MULTILINE, NULL);
}
//-------------------------------------------------
// handle
//-------------------------------------------------
void ui_menu_image_info::handle()
{
// process the menu
process(0);
}

26
src/emu/ui/imginfo.h Normal file
View File

@ -0,0 +1,26 @@
/***************************************************************************
ui/imginfo.h
Image info screen
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
#pragma once
#ifndef __UI_IMGINFO_H__
#define __UI_IMGINFO_H__
class ui_menu_image_info : public ui_menu
{
public:
ui_menu_image_info(running_machine &machine, render_container *container);
virtual ~ui_menu_image_info();
virtual void populate();
virtual void handle();
};
#endif // __UI_IMGINFO_H__

View File

@ -17,9 +17,12 @@
#include "cheat.h"
#include "uiinput.h"
#include "ui/filemngr.h"
#include "ui/filesel.h"
#include "ui/bbcontrl.h"
#include "ui/tapectrl.h"
#include "ui/mainmenu.h"
#include "ui/miscmenu.h"
#include "ui/imginfo.h"
#include "ui/selgame.h"
#include "audit.h"
#include "crsshair.h"

View File

@ -1,6 +1,6 @@
/*********************************************************************
uiswlist.c
ui/swlist.c
Internal MAME user interface for software list.
@ -11,7 +11,7 @@
#include "emu.h"
#include "ui.h"
#include "uiswlist.h"
#include "ui/swlist.h"
/***************************************************************************

View File

@ -1,6 +1,6 @@
/***************************************************************************
uiswlist.h
ui/swlist.h
Internal MAME user interface for software list.
@ -9,8 +9,8 @@
***************************************************************************/
#ifndef __UISWLIST_H__
#define __UISWLIST_H__
#ifndef __UI_SWLIST_H__
#define __UI_SWLIST_H__
class ui_menu_software_parts : public ui_menu {
public:
@ -71,4 +71,4 @@ private:
const software_list_device **result;
};
#endif /* __UISWLIST_H__ */
#endif /* __UI_SWLIST_H__ */