starred/Mu
1
0
Fork 0
mirror of https://github.com/libretro/Mu.git synced 2026-08-03 06:20:30 +00:00
Code Issues 18 Packages Projects Releases 2 Wiki Activity

Remove attempted graphics viewer, I can just take a hex dump and view it on rawpixels.net

Browse Source
This commit is contained in:
meepingsnesroms
2018-04-30 17:31:27 -07:00
parent d07dbb3964
commit 3740ccdd55
6 changed files with 166 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libretroBuildSystem/libretro.c
View File

@@ -201,7 +201,6 @@ bool retro_load_game(const struct retro_game_info *info)
strncat(palmRomPath, "palmos41-en-m515.rom", PATH_MAX_LENGTH - strlen(palmRomPath));
romFile = fopen(palmRomPath, "rb");
if(romFile == NULL)
return false;

5
qtBuildSystem/Mu/hexviewer.cpp
View File

@@ -44,11 +44,6 @@ HexViewer::HexViewer(QWidget *parent) :
ui(new Ui::HexViewer){
ui->setupUi(this);
ui->tabWidget->setCurrentIndex(0);
ui->tabWidget->setTabText(0, "Hex");
ui->tabWidget->setTabText(1, "Graphics");
bitsPerEntry = 8;
hexRadioButtonHandler();
}

463
qtBuildSystem/Mu/hexviewer.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>482</width>
<height>385</height>
<width>467</width>
<height>350</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,12 +19,6 @@
<property name="windowTitle">
<string>Hex Viewer</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="modal">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
@@ -46,327 +40,156 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QTabWidget" name="tabWidget">
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="hex">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QPushButton" name="hexUpdate">
<property name="geometry">
<rect>
<x>320</x>
<y>250</y>
<width>113</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Update</string>
</property>
<attribute name="title">
<string>Tab 1</string>
</attribute>
<widget class="QPushButton" name="hexUpdate">
<property name="geometry">
<rect>
<x>320</x>
<y>250</y>
<width>113</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Update</string>
</property>
</widget>
<widget class="QLineEdit" name="hexAddress">
<property name="geometry">
<rect>
<x>270</x>
<y>30</y>
<width>113</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>270</x>
<y>10</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Address</string>
</property>
</widget>
<widget class="QRadioButton" name="hex8Bit">
<property name="geometry">
<rect>
<x>260</x>
<y>60</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>8bit</string>
</property>
</widget>
<widget class="QRadioButton" name="hex16Bit">
<property name="geometry">
<rect>
<x>320</x>
<y>60</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>16bit</string>
</property>
</widget>
<widget class="QRadioButton" name="hex32Bit">
<property name="geometry">
<rect>
<x>380</x>
<y>60</y>
<width>61</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>32bit</string>
</property>
</widget>
<widget class="QLineEdit" name="hexLength">
<property name="geometry">
<rect>
<x>270</x>
<y>110</y>
<width>113</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>270</x>
<y>90</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Length</string>
</property>
</widget>
<widget class="QListWidget" name="hexValueList">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>251</width>
<height>281</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="hexDump">
<property name="geometry">
<rect>
<x>272</x>
<y>180</y>
<width>161</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Dump</string>
</property>
</widget>
<widget class="QLineEdit" name="hexFilePath">
<property name="geometry">
<rect>
<x>272</x>
<y>160</y>
<width>161</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>270</x>
<y>140</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>File Path</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="graphics">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QLineEdit" name="hexAddress">
<property name="geometry">
<rect>
<x>270</x>
<y>30</y>
<width>113</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>270</x>
<y>10</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Address</string>
</property>
</widget>
<widget class="QRadioButton" name="hex8Bit">
<property name="geometry">
<rect>
<x>260</x>
<y>60</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>8bit</string>
</property>
</widget>
<widget class="QRadioButton" name="hex16Bit">
<property name="geometry">
<rect>
<x>320</x>
<y>60</y>
<width>51</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>16bit</string>
</property>
</widget>
<widget class="QRadioButton" name="hex32Bit">
<property name="geometry">
<rect>
<x>380</x>
<y>60</y>
<width>61</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>32bit</string>
</property>
</widget>
<widget class="QLineEdit" name="hexLength">
<property name="geometry">
<rect>
<x>270</x>
<y>110</y>
<width>113</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>270</x>
<y>90</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Length</string>
</property>
</widget>
<widget class="QListWidget" name="hexValueList">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>251</width>
<height>281</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="hexDump">
<property name="geometry">
<rect>
<x>272</x>
<y>180</y>
<width>161</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Dump</string>
</property>
</widget>
<widget class="QLineEdit" name="hexFilePath">
<property name="geometry">
<rect>
<x>272</x>
<y>160</y>
<width>161</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>270</x>
<y>140</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>File Path</string>
</property>
<attribute name="title">
<string>Tab 2</string>
</attribute>
<widget class="QLabel" name="gfxRawGraphics">
<property name="geometry">
<rect>
<x>190</x>
<y>10</y>
<width>241</width>
<height>231</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::WinPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
<widget class="QPushButton" name="gfxUpdate">
<property name="geometry">
<rect>
<x>260</x>
<y>250</y>
<width>171</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Update</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Width</string>
</property>
</widget>
<widget class="QLineEdit" name="gfxAddress">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>91</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="gfxWidth">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>91</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Address</string>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>110</x>
<y>10</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>BPP</string>
</property>
</widget>
<widget class="QLineEdit" name="gfxBpp">
<property name="geometry">
<rect>
<x>110</x>
<y>30</y>
<width>41</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QCheckBox" name="gfxColor">
<property name="geometry">
<rect>
<x>110</x>
<y>60</y>
<width>61</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Color</string>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Height</string>
</property>
</widget>
<widget class="QLineEdit" name="gfxHeight">
<property name="geometry">
<rect>
<x>10</x>
<y>130</y>
<width>91</width>
<height>21</height>
</rect>
</property>
</widget>
</widget>
</widget>
</item>

27
qtBuildSystem/Mu/mainwindow.cpp
View File

@@ -68,7 +68,7 @@ void emuThreadRun(){
}
static inline void waitForEmuPaused(){
while(!emuPaused){
while(!emuPaused && emuInited){
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
}
@@ -141,7 +141,11 @@ MainWindow::~MainWindow(){
}
void MainWindow::popupErrorDialog(QString error){
QMessageBox::information(this, "Mu", error, QMessageBox::Ok);
QMessageBox::critical(this, "Mu", error, QMessageBox::Ok);
}
void MainWindow::popupInformationDialog(QString info){
QMessageBox::information(this, "Mu", info, QMessageBox::Ok);
}
bool MainWindow::eventFilter(QObject *object, QEvent *event){
@@ -306,14 +310,19 @@ void MainWindow::on_ctrlBtn_clicked(){
}
void MainWindow::on_hexViewer_clicked(){
if(emuOn){
emuOn = false;
ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.png"));
if(emuInited){
if(emuOn){
emuOn = false;
ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.png"));
}
waitForEmuPaused();
emuStateBrowser->exec();
}
else{
popupInformationDialog("Cant open hex viewer, emulator not running.");
}
waitForEmuPaused();
emuStateBrowser->exec();
}
void MainWindow::on_screenshot_clicked(){

1
qtBuildSystem/Mu/mainwindow.h
View File

@@ -22,6 +22,7 @@ public:
private slots:
void popupErrorDialog(QString error);
void popupInformationDialog(QString info);
bool eventFilter(QObject *object, QEvent *event);
void selectHomePath();
void on_install_pressed();

5
src/sed1376.c
View File

@@ -130,6 +130,9 @@ uint8_t sed1376GetRegister(uint8_t address){
case PWR_SAVE_CFG:
case SPECIAL_EFFECT:
case DISP_MODE:
case LINE_SIZE_0:
case LINE_SIZE_1:
case PIP_ADDR_0:
case PIP_ADDR_1:
case PIP_ADDR_2:
@@ -325,7 +328,7 @@ void sed1376Render(){
}
//rotation
//later
//later, unemulated
//software display inversion
if((sed1376Registers[DISP_MODE] & 0x30) == 0x10)