Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[GTK3] Move GTK widgets into gtk3/widgets

Browse Source
This commit is contained in:
Maximilian Mader 2021-01-07 14:36:46 +01:00
parent c125083a45
commit 6ce3016719
Signed by: Max
GPG Key ID: F71D56A3151C4FB3
17 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -54,7 +54,7 @@ endif
# Use clang if it's available. # Use clang if it's available.
ifeq ($(origin CC),default) ifeq ($(origin CC),default)
ifneq (, $(shell which clang)) ifneq (, $(shell which clang))
CC := clang CC := clang
endif endif
endif endif
@ -226,7 +226,7 @@ all: cocoa sdl tester libretro
CORE_SOURCES := $(shell ls Core/*.c) CORE_SOURCES := $(shell ls Core/*.c)
SDL_SOURCES := $(shell ls SDL/*.c) $(OPEN_DIALOG) SDL/audio/$(SDL_AUDIO_DRIVER).c SDL_SOURCES := $(shell ls SDL/*.c) $(OPEN_DIALOG) SDL/audio/$(SDL_AUDIO_DRIVER).c
GTK3_SOURCES := $(shell ls gtk3/*.c) gtk3/sameboy-gtk3-resources.c SDL/audio/$(SDL_AUDIO_DRIVER).c GTK3_SOURCES := $(shell ls gtk3/*.c gtk3/**/*.c) gtk3/sameboy-gtk3-resources.c SDL/audio/$(SDL_AUDIO_DRIVER).c
TESTER_SOURCES := $(shell ls Tester/*.c) TESTER_SOURCES := $(shell ls Tester/*.c)
ifeq ($(PLATFORM),Darwin) ifeq ($(PLATFORM),Darwin)

10
gtk3/main.c
View File

@ -12,11 +12,11 @@
#include "config.h" #include "config.h"
#include "util.h" #include "util.h"
#include "main_window.h" #include "widgets/console_window.h"
#include "console_window.h" #include "widgets/main_window.h"
#include "preferences_window.h" #include "widgets/preferences_window.h"
#include "vram_viewer_window.h" #include "widgets/printer_window.h"
#include "printer_window.h" #include "widgets/vram_viewer_window.h"
// used for audio and game controllers // used for audio and game controllers
#include "SDL.h" #include "SDL.h"

10
gtk3/types.h
View File

@ -2,11 +2,11 @@
#define types_h #define types_h
#include "SDL.h" #include "SDL.h"
#include "main_window.h" #include "widgets/console_window.h"
#include "console_window.h" #include "widgets/main_window.h"
#include "preferences_window.h" #include "widgets/preferences_window.h"
#include "vram_viewer_window.h" #include "widgets/printer_window.h"
#include "printer_window.h" #include "widgets/vram_viewer_window.h"
typedef struct{ typedef struct{
int16_t x, y; int16_t x, y;

3
gtk3/console_window.c → gtk3/widgets/console_window.c
View File

@ -1,6 +1,5 @@
#include "console_window.h" #include "console_window.h"
#include "util.h" #include "../util.h"
#include <stdbool.h>
struct Selection { struct Selection {
gint start; gint start;

1
gtk3/console_window.h → gtk3/widgets/console_window.h
View File

@ -3,6 +3,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include <stdbool.h>
#define CONSOLE_WINDOW_TYPE (console_window_get_type()) #define CONSOLE_WINDOW_TYPE (console_window_get_type())
G_DECLARE_FINAL_TYPE(ConsoleWindow, console_window, SAMEBOY, CONSOLE_WINDOW, GtkWindow) G_DECLARE_FINAL_TYPE(ConsoleWindow, console_window, SAMEBOY, CONSOLE_WINDOW, GtkWindow)

5
gtk3/gb_screen.c → gtk3/widgets/gb_screen.c
View File

@ -1,7 +1,6 @@
#include "gb_screen.h" #include "gb_screen.h"
#include "config.h" #include "../config.h"
#include "util.h" #include "../util.h"
#include <stdint.h>
struct _GbScreen { struct _GbScreen {
GtkBin parent; GtkBin parent;

2
gtk3/gb_screen.h → gtk3/widgets/gb_screen.h
View File

@ -5,7 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include "shader.h" #include "../shader.h"
#define GB_SCREEN_TYPE (gb_screen_get_type()) #define GB_SCREEN_TYPE (gb_screen_get_type())
G_DECLARE_FINAL_TYPE(GbScreen, gb_screen, SAMEBOY, GB_SCREEN, GtkBin) G_DECLARE_FINAL_TYPE(GbScreen, gb_screen, SAMEBOY, GB_SCREEN, GtkBin)

3
gtk3/main_menu.c → gtk3/widgets/main_menu.c
View File

@ -1,8 +1,7 @@
#include "main_menu.h" #include "main_menu.h"
#include <stdbool.h> #include <stdbool.h>
#include "util.h"
#include "gb_screen.h" #include "gb_screen.h"
#include "check_menu_radio_group.h" #include "../check_menu_radio_group.h"
struct _MainMenu { struct _MainMenu {
GtkMenuBar parent_instance; GtkMenuBar parent_instance;

1
gtk3/main_menu.h → gtk3/widgets/main_menu.h
View File

@ -3,7 +3,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include "shader.h"
#define MAIN_MENU_TYPE (main_menu_get_type()) #define MAIN_MENU_TYPE (main_menu_get_type())
G_DECLARE_FINAL_TYPE(MainMenu, main_menu, SAMEBOY, MAIN_MENU, GtkMenuBar) G_DECLARE_FINAL_TYPE(MainMenu, main_menu, SAMEBOY, MAIN_MENU, GtkMenuBar)

3
gtk3/main_window.c → gtk3/widgets/main_window.c
View File

@ -1,9 +1,6 @@
#include "main_window.h" #include "main_window.h"
#include <stdbool.h>
#include "util.h"
#include "gb_screen.h" #include "gb_screen.h"
#include "main_menu.h" #include "main_menu.h"
#include "check_menu_radio_group.h"
struct _MainWindow { struct _MainWindow {
GtkApplicationWindowClass parent_class; GtkApplicationWindowClass parent_class;

3
gtk3/main_window.h → gtk3/widgets/main_window.h
View File

@ -1,9 +1,10 @@
#ifndef main_window_h #ifndef main_window_h
#define main_window_h #define main_window_h
#include <stdbool.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include "shader.h" #include "../shader.h"
#define MAIN_WINDOW_TYPE (main_window_get_type()) #define MAIN_WINDOW_TYPE (main_window_get_type())
G_DECLARE_FINAL_TYPE(MainWindow, main_window, SAMEBOY, MAIN_WINDOW, GtkApplicationWindow) G_DECLARE_FINAL_TYPE(MainWindow, main_window, SAMEBOY, MAIN_WINDOW, GtkApplicationWindow)

4
gtk3/preferences_window.c → gtk3/widgets/preferences_window.c
View File

@ -1,6 +1,6 @@
#include "preferences_window.h" #include "preferences_window.h"
#include "config.h" #include "../config.h"
#include "util.h" #include "../util.h"
struct _PreferencesWindow { struct _PreferencesWindow {
GtkWindowClass parent_class; GtkWindowClass parent_class;

0
gtk3/preferences_window.h → gtk3/widgets/preferences_window.h
View File

2
gtk3/printer_window.c → gtk3/widgets/printer_window.c
View File

@ -1,6 +1,6 @@
#include "printer_window.h" #include "printer_window.h"
#include <stdbool.h> #include <stdbool.h>
#include "util.h" #include "../util.h"
struct _PrinterWindow { struct _PrinterWindow {
GtkWindowClass parent_class; GtkWindowClass parent_class;

1
gtk3/printer_window.h → gtk3/widgets/printer_window.h
View File

@ -3,7 +3,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include <stdint.h>
struct PrinterData { struct PrinterData {
uint32_t *image; uint32_t *image;

3
gtk3/vram_viewer_window.c → gtk3/widgets/vram_viewer_window.c
View File

@ -1,6 +1,7 @@
#include "vram_viewer_window.h" #include "vram_viewer_window.h"
#include <stdbool.h> #include <stdbool.h>
#include "util.h" #include "../types.h"
#include "../util.h"
#define tileset_buffer_length 256 * 192 * 4 #define tileset_buffer_length 256 * 192 * 4
#define tilemap_buffer_length 256 * 256 * 4 #define tilemap_buffer_length 256 * 256 * 4

1
gtk3/vram_viewer_window.h → gtk3/widgets/vram_viewer_window.h
View File

@ -3,7 +3,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <Core/gb.h> #include <Core/gb.h>
#include <stdint.h>
#define VRAM_VIEWER_WINDOW_TYPE (vram_viewer_window_get_type()) #define VRAM_VIEWER_WINDOW_TYPE (vram_viewer_window_get_type())
G_DECLARE_FINAL_TYPE(VramViewerWindow, vram_viewer_window, SAMEBOY, VRAM_VIEWER_WINDOW, GtkWindow) G_DECLARE_FINAL_TYPE(VramViewerWindow, vram_viewer_window, SAMEBOY, VRAM_VIEWER_WINDOW, GtkWindow)