The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-29 06:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Activate the Gui (basic stuff works!)

Browse Source
This commit is contained in:
simon.kagstrom 2010-01-25 13:23:14 +00:00
parent 0ae643c77e
commit fcf5d06256
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/C64_SDL.h
View File

@ -338,6 +338,8 @@ void C64::VBlank(bool draw_frame)
} }
this->network_vblank(); this->network_vblank();
Gui::gui->runLogic();
#if defined(GEKKO) #if defined(GEKKO)
if (this->quit_thyself && Network::networking_started == true) if (this->quit_thyself && Network::networking_started == true)
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);

5
Src/Display_SDL.h
View File

@ -327,6 +327,7 @@ void C64Display::Update(uint8 *src_pixels)
this->Update_32((Uint8*)screen); break; this->Update_32((Uint8*)screen); break;
} }
} }
Gui::gui->draw(real_screen);
if (this->TheC64->network_connection_type != NONE) if (this->TheC64->network_connection_type != NONE)
draw_string(real_screen, 0, 0, networktraffic_string, black, fill_gray); draw_string(real_screen, 0, 0, networktraffic_string, black, fill_gray);
@ -669,6 +670,8 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst
{ {
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
Gui::gui->pushEvent(&event);
switch (event.type) { switch (event.type) {
// Key pressed // Key pressed
@ -691,7 +694,7 @@ void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joyst
break; break;
case SDLK_HOME: // Home: Pause and enter menu case SDLK_HOME: // Home: Pause and enter menu
TheC64->enter_menu(); Gui::gui->activate();
break; break;
case SDLK_KP_PLUS: // '+' on keypad: Increase SkipFrames case SDLK_KP_PLUS: // '+' on keypad: Increase SkipFrames

3
Src/main_x.h
View File

@ -75,8 +75,6 @@ int main(int argc, char **argv)
fprintf(stderr, "Unable to init TTF: %s\n", TTF_GetError() ); fprintf(stderr, "Unable to init TTF: %s\n", TTF_GetError() );
return 1; return 1;
} }
Gui::gui = new Gui();
Gui::gui->setTheme("default");
#endif #endif
if (!init_graphics()) if (!init_graphics())
return 1; return 1;
@ -141,6 +139,7 @@ void Frodo::ReadyToRun(void)
// Create and start C64 // Create and start C64
TheC64 = new C64; TheC64 = new C64;
Gui::init();
load_rom_files(); load_rom_files();
TheC64->Run(); TheC64->Run();
delete TheC64; delete TheC64;