mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 23:32:33 +02:00
Code Issues Projects Releases Wiki Activity

Update to v106r40 release.

Browse Source 
byuu says:

Changelog:

  - hiro: added BrowserDialog::openObject() [match file *or* folder
    by filters]
  - hiro: BrowserDialog accept button is now disabled when it would
    otherwise do nothing
      - eg openFile without a folder to enter or file to open selected
      - eg saveFile without a file name or with a file name that matches
        a folder name
  - bsnes: added support for gamepaks (game folders)
  - bsnes: store all save states inside per-game .bsz (ZIP) archives
    instead of .bst/ folders
      - this reduces the number of state files from 10+ to 1; without
        having folders sort before files
  - hiro: both gtk2 and gtk3 now use cairo to render Canvas; supports
    sx,sy [BearOso]
  - higan, bsnes: fast PPU/DSP are now run-time options instead of
    compile-time options
  - bsnes: disable fast PPU when loading Air Strike Patrol / Desert
    Fighter
  - bsnes: disable fast DSP when loading Koushien 2
  - bsnes: added options to advanced panel to disable fast PPU and/or
    fast DSP
This commit is contained in:
Tim Allen
2018-06-11 14:50:18 +10:00
parent 91bb781b73
commit 5a8c814e25
39 changed files with 643 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
hiro/gtk/widget/canvas.cpp
View File

@@ -10,11 +10,13 @@ GtkSelectionData* data, unsigned type, unsigned timestamp, pCanvas* p) -> void {
p->self().doDrop(paths);
}
//GTK3
static auto Canvas_draw(GtkWidget* widget, cairo_t* context, pCanvas* p) -> signed {
p->_onDraw(context);
return true;
}
//GTK2
static auto Canvas_expose(GtkWidget* widget, GdkEventExpose* event, pCanvas* p) -> signed {
p->_onExpose(event);
return true;
@@ -116,7 +118,8 @@ auto pCanvas::update() -> void {
}
auto pCanvas::_onDraw(cairo_t* context) -> void {
#if HIRO_GTK==3
if(!surface) return;
int sx = 0, sy = 0, dx = 0, dy = 0;
int width = surfaceWidth, height = surfaceHeight;
auto geometry = pSizable::state().geometry;
@@ -137,41 +140,19 @@ auto pCanvas::_onDraw(cairo_t* context) -> void {
dy = 0;
}
//TODO: support non-zero sx,sy
gdk_cairo_set_source_pixbuf(context, surface, dx, dy);
cairo_set_source_rgba(context, 0.0, 0.0, 0.0, 0.0);
cairo_paint(context);
gdk_cairo_set_source_pixbuf(context, surface, dx - sx, dy - sy);
cairo_rectangle(context, dx, dy, width, height);
cairo_paint(context);
#endif
}
auto pCanvas::_onExpose(GdkEventExpose* expose) -> void {
#if HIRO_GTK==2
if(surface == nullptr) return;
if(!surface) return;
int sx = 0, sy = 0, dx = 0, dy = 0;
int width = surfaceWidth;
int height = surfaceHeight;
auto geometry = pSizable::state().geometry;
if(width <= geometry.width()) {
sx = 0;
dx = (geometry.width() - width) / 2;
} else {
sx = (width - geometry.width()) / 2;
dx = 0;
width = geometry.width();
}
if(height <= geometry.height()) {
sy = 0;
dy = (geometry.height() - height) / 2;
} else {
sy = (height - geometry.height()) / 2;
dy = 0;
height = geometry.height();
}
gdk_draw_pixbuf(gtk_widget_get_window(gtkWidget), nullptr, surface, sx, sy, dx, dy, width, height, GDK_RGB_DITHER_NONE, 0, 0);
#endif
cairo_t* context = gdk_cairo_create(gtk_widget_get_window(gtkWidget));
_onDraw(context);
cairo_destroy(context);
}
auto pCanvas::_rasterize() -> void {