[UI] Image post-processing and full presentation/window rework
[GPU] Add FXAA post-processing [UI] Add FidelityFX FSR and CAS post-processing [UI] Add blue noise dithering from 10bpc to 8bpc [GPU] Apply the DC PWL gamma ramp closer to the spec, supporting fully white color [UI] Allow the GPU CP thread to present on the host directly, bypassing the UI thread OS paint event [UI] Allow variable refresh rate (or tearing) [UI] Present the newest frame (restart) on DXGI [UI] Replace GraphicsContext with a far more advanced Presenter with more coherent surface connection and UI overlay state management [UI] Connect presentation to windows via the Surface class, not native window handles [Vulkan] Switch to simpler Vulkan setup with no instance/device separation due to interdependencies and to pass fewer objects around [Vulkan] Lower the minimum required Vulkan version to 1.0 [UI/GPU] Various cleanup, mainly ComPtr usage [UI] Support per-monitor DPI awareness v2 on Windows [UI] DPI-scale Dear ImGui [UI] Replace the remaining non-detachable window delegates with unified window event and input listeners [UI] Allow listeners to safely destroy or close the window, and to register/unregister listeners without use-after-free and the ABA problem [UI] Explicit Z ordering of input listeners and UI overlays, top-down for input, bottom-up for drawing [UI] Add explicit window lifecycle phases [UI] Replace Window virtual functions with explicit desired state, its application, actual state, its feedback [UI] GTK: Apply the initial size to the drawing area [UI] Limit internal UI frame rate to that of the monitor [UI] Hide the cursor using a timer instead of polling due to no repeated UI thread paints with GPU CP thread presentation, and only within the window
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2020 Ben Vanik. All rights reserved. *
|
||||
* Copyright 2022 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include <gdk/gdkx.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <xcb/xcb.h>
|
||||
|
||||
@@ -28,72 +28,61 @@ class GTKWindow : public Window {
|
||||
using super = Window;
|
||||
|
||||
public:
|
||||
GTKWindow(WindowedAppContext& app_context, const std::string& title);
|
||||
GTKWindow(WindowedAppContext& app_context, const std::string_view title,
|
||||
uint32_t desired_logical_width, uint32_t desired_logical_height);
|
||||
~GTKWindow() override;
|
||||
|
||||
NativePlatformHandle native_platform_handle() const override {
|
||||
return connection_;
|
||||
}
|
||||
NativeWindowHandle native_handle() const override { return window_; }
|
||||
GtkWidget* native_window_handle() const { return drawing_area_; }
|
||||
|
||||
void EnableMainMenu() override {}
|
||||
void DisableMainMenu() override {}
|
||||
|
||||
bool set_title(const std::string_view title) override;
|
||||
|
||||
bool SetIcon(const void* buffer, size_t size) override;
|
||||
|
||||
// This seems to happen implicitly compared to Windows.
|
||||
bool CaptureMouse() override { return true; };
|
||||
bool ReleaseMouse() override { return true; };
|
||||
|
||||
bool is_fullscreen() const override;
|
||||
void ToggleFullscreen(bool fullscreen) override;
|
||||
|
||||
bool is_bordered() const override;
|
||||
void set_bordered(bool enabled) override;
|
||||
|
||||
void set_cursor_visible(bool value) override;
|
||||
void set_focus(bool value) override;
|
||||
|
||||
void Resize(int32_t width, int32_t height) override;
|
||||
void Resize(int32_t left, int32_t top, int32_t right,
|
||||
int32_t bottom) override;
|
||||
|
||||
bool Initialize() override;
|
||||
void Invalidate() override;
|
||||
void Close() override;
|
||||
// Will be null if the window hasn't been successfully opened yet, or has been
|
||||
// closed.
|
||||
GtkWidget* window() const { return window_; }
|
||||
|
||||
protected:
|
||||
bool OnCreate() override;
|
||||
void OnMainMenuChange() override;
|
||||
void OnDestroy() override;
|
||||
void OnClose() override;
|
||||
bool OpenImpl() override;
|
||||
void RequestCloseImpl() override;
|
||||
|
||||
void OnResize(UIEvent* e) override;
|
||||
void ApplyNewFullscreen() override;
|
||||
void ApplyNewTitle() override;
|
||||
void ApplyNewMainMenu(MenuItem* old_main_menu) override;
|
||||
// Mouse capture seems to happen implicitly compared to Windows.
|
||||
void FocusImpl() override;
|
||||
|
||||
std::unique_ptr<Surface> CreateSurfaceImpl(
|
||||
Surface::TypeFlags allowed_types) override;
|
||||
void RequestPaintImpl() override;
|
||||
|
||||
private:
|
||||
GtkWidget* window_;
|
||||
GtkWidget* box_;
|
||||
GtkWidget* drawing_area_;
|
||||
xcb_connection_t* connection_;
|
||||
void HandleSizeUpdate(WindowDestructionReceiver& destruction_receiver);
|
||||
// For updating multiple factors that may influence the window size at once,
|
||||
// without handling the configure event multiple times (that may not only
|
||||
// result in wasted handling, but also in the state potentially changed to an
|
||||
// inconsistent one in the middle of a size update by the listeners).
|
||||
void BeginBatchedSizeUpdate();
|
||||
void EndBatchedSizeUpdate(WindowDestructionReceiver& destruction_receiver);
|
||||
|
||||
// C Callback shims for GTK
|
||||
friend gboolean gtk_event_handler(GtkWidget*, GdkEvent*, gpointer);
|
||||
friend gboolean close_callback(GtkWidget*, gpointer);
|
||||
friend gboolean draw_callback(GtkWidget*, GdkFrameClock*, gpointer);
|
||||
// Handling events related to the whole window.
|
||||
bool HandleMouse(GdkEvent* event,
|
||||
WindowDestructionReceiver& destruction_receiver);
|
||||
bool HandleKeyboard(GdkEventKey* event,
|
||||
WindowDestructionReceiver& destruction_receiver);
|
||||
gboolean WindowEventHandler(GdkEvent* event);
|
||||
static gboolean WindowEventHandlerThunk(GtkWidget* widget, GdkEvent* event,
|
||||
gpointer user_data);
|
||||
|
||||
bool HandleMouse(GdkEventAny* event);
|
||||
bool HandleKeyboard(GdkEventKey* event);
|
||||
bool HandleWindowResize(GdkEventConfigure* event);
|
||||
bool HandleWindowFocus(GdkEventFocus* event);
|
||||
bool HandleWindowVisibility(GdkEventVisibility* event);
|
||||
bool HandleWindowOwnerChange(GdkEventOwnerChange* event);
|
||||
bool HandleWindowPaint();
|
||||
// Handling events related specifically to the drawing (client) area.
|
||||
gboolean DrawingAreaEventHandler(GdkEvent* event);
|
||||
static gboolean DrawingAreaEventHandlerThunk(GtkWidget* widget,
|
||||
GdkEvent* event,
|
||||
gpointer user_data);
|
||||
static gboolean DrawHandler(GtkWidget* widget, cairo_t* cr, gpointer data);
|
||||
|
||||
bool closing_ = false;
|
||||
bool fullscreen_ = false;
|
||||
// Non-owning (initially floating) references to the widgets.
|
||||
GtkWidget* window_ = nullptr;
|
||||
GtkWidget* box_ = nullptr;
|
||||
GtkWidget* drawing_area_ = nullptr;
|
||||
|
||||
uint32_t batched_size_update_depth_ = 0;
|
||||
bool batched_size_update_contained_configure_ = false;
|
||||
bool batched_size_update_contained_draw_ = false;
|
||||
};
|
||||
|
||||
class GTKMenuItem : public MenuItem {
|
||||
@@ -102,20 +91,16 @@ class GTKMenuItem : public MenuItem {
|
||||
std::function<void()> callback);
|
||||
~GTKMenuItem() override;
|
||||
|
||||
GtkWidget* handle() { return menu_; }
|
||||
using MenuItem::OnSelected;
|
||||
void Activate();
|
||||
|
||||
void EnableMenuItem(Window& window) override {}
|
||||
void DisableMenuItem(Window& window) override {}
|
||||
GtkWidget* handle() const { return menu_; }
|
||||
|
||||
protected:
|
||||
void OnChildAdded(MenuItem* child_item) override;
|
||||
void OnChildRemoved(MenuItem* child_item) override;
|
||||
GTKMenuItem* parent_ = nullptr;
|
||||
GTKMenuItem* child_ = nullptr;
|
||||
|
||||
private:
|
||||
static void ActivateHandler(GtkWidget* menu_item, gpointer user_data);
|
||||
|
||||
// An owning reference because a menu may be transferred between windows.
|
||||
GtkWidget* menu_ = nullptr;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user