Emulation/nestopia
1
0
Fork 0
mirror of https://github.com/0ldsk00l/nestopia.git synced 2024-06-22 06:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better fullscreen support in GTK port

Browse source
This commit is contained in:
rdanbrook 2021-03-13 17:26:03 -05:00
parent 54e904b3ba
commit 5ca5722b7a
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/common/video.cpp
View file

@ -182,7 +182,6 @@ void nst_ogl_render() {
void nst_video_refresh() {
// Refresh the video settings
nst_ogl_deinit();
nst_ogl_init();
@ -190,7 +189,6 @@ void nst_video_refresh() {
void video_init() {
// Initialize video
nst_ogl_deinit();
video_set_dimensions();
@ -201,12 +199,6 @@ void video_init() {
if (nst_nsf()) { video_clear_buffer(); video_disp_nsf(); }
}
void video_toggle_fullscreen() {
// Toggle between fullscreen and window mode
if (!nst_playing()) { return; }
conf.video_fullscreen ^= 1;
}
void video_toggle_filter() {
conf.video_filter++;
if (conf.video_filter > 5) { conf.video_filter = 0; }

1
source/common/video.h
View file

@ -35,7 +35,6 @@ void nst_ogl_deinit();
void nst_ogl_render();
void video_init();
void video_toggle_fullscreen();
void video_toggle_filter();
void video_toggle_filterupdate();
void video_toggle_scalefactor();

21
source/gtkui/gtkui.cpp
View file

@ -126,6 +126,7 @@ void gtkui_open_recent(GtkWidget *widget, gpointer userdata) {
dimensions_t gtkui_video_get_dimensions() {
// Return the dimensions of the current screen
dimensions_t scrsize;
dimensions_t rendsize = nst_video_get_dimensions_render();
GdkDisplay *display = gdk_display_get_default();
GdkWindow *gdkwindow = gtk_widget_get_window(GTK_WIDGET(gtkwindow));
GdkMonitor *monitor = gdk_display_get_monitor_at_window(display, gdkwindow);
@ -133,6 +134,8 @@ dimensions_t gtkui_video_get_dimensions() {
gdk_monitor_get_geometry(monitor, &geom);
scrsize.w = geom.width;
scrsize.h = geom.height;
float ratio = (float)scrsize.h / (float)rendsize.h;
scrsize.w = (int)(rendsize.w * ratio);
return scrsize;
}
@ -296,11 +299,9 @@ void gtkui_create() {
gtk_menu_shell_append(GTK_MENU_SHELL(menubar), help);
// Create the DrawingArea/OpenGL context
///drawingarea = gtk_drawing_area_new();
drawingarea = gtk_gl_area_new();
g_signal_connect(G_OBJECT(drawingarea), "realize", G_CALLBACK(gtkui_glarea_realize), NULL);
g_signal_connect(G_OBJECT(drawingarea), "render", gtkui_swapbuffers, NULL);
//gtk_widget_add_tick_callback(drawingarea, gtkui_tick, drawingarea, NULL);
g_object_set_data(G_OBJECT(gtkwindow), "area", drawingarea);
@ -478,8 +479,9 @@ void gtkui_signals_deinit() {
void gtkui_resize() {
// Resize the GTK window
if (gtkwindow) {
video_set_dimensions();
dimensions_t rendersize = nst_video_get_dimensions_render();
dimensions_t rendersize;
if (conf.video_fullscreen) { rendersize = gtkui_video_get_dimensions(); }
else { rendersize = nst_video_get_dimensions_render(); }
gtk_widget_set_size_request(drawingarea, rendersize.w, rendersize.h);
}
}
@ -489,8 +491,7 @@ void gtkui_set_title(const char *title) {
}
void gtkui_video_toggle_fullscreen() {
video_toggle_fullscreen();
conf.video_fullscreen ^= 1;
if (conf.video_fullscreen) {
gtk_widget_hide(menubar);
@ -509,8 +510,9 @@ void gtkui_video_toggle_fullscreen() {
else {gtkui_cursor_set(1); }
}
nst_video_set_dimensions_screen(gtkui_video_get_dimensions());
video_init();
gtkui_resize();
video_init();
}
void gtkui_video_toggle_filter() {
@ -655,7 +657,10 @@ int main(int argc, char *argv[]) {
// Load a rom from the command line
if (argc > 1 && argv[argc - 1][0] != '-') {
nst_load(argv[argc - 1]);
if (conf.video_fullscreen) { gtkui_video_toggle_fullscreen(); }
if (conf.video_fullscreen) {
conf.video_fullscreen = 0;
gtkui_video_toggle_fullscreen();
}
gtkui_play();
gtkui_set_title(nstpaths.gamename);
}