Archives
/
MangoHud
mirror of https://github.com/flightlessmango/MangoHud
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

mangoapp: shutdown and reinit based on no_display

Browse Source
doometernal
FlightlessMango 2 years ago
parent 6c0965c27b
commit 496fa0babc
3 changed files with 120 additions and 67 deletions
Show Stats Download Patch File Download Diff File

143
src/app/main.cpp
Unescape Escape View File

@ -7,11 +7,10 @@
#include "imgui_impl_glfw.h"
#include "imgui_impl_opengl3.h"
#include <stdio.h>
#include <sys/ipc.h>
#include <sys/msg.h>
#include <thread>
#include <unistd.h>
#include "../overlay.h"
#include "mangoapp.h"
#include <GL/glew.h>
#include <GLFW/glfw3.h>
@ -29,25 +28,18 @@ static ImVec2 window_size;
static uint32_t vendorID;
static std::string deviceName;
static notify_thread notifier;
struct mangoapp_msg_header {
long msg_type; // Message queue ID, never change
uint32_t version; /* for major changes in the way things work */
} __attribute__((packed));
struct mangoapp_msg_v1 {
struct mangoapp_msg_header hdr;
uint32_t pid;
uint64_t frametime_ns;
// WARNING: Always ADD fields, never remove or repurpose fields
} __attribute__((packed));
struct mangoapp_ctrl_msg_v1 mangoapp_ctrl;
int msgid;
bool mangoapp_paused = false;
std::mutex mangoapp_m;
std::condition_variable mangoapp_cv;
static uint8_t raw_msg[1024] = {0};
void msg_read_thread(){
mangoapp_ctrl.hdr.version = 1;
mangoapp_ctrl.hdr.msg_type = 2;
int key = ftok("mangoapp", 65);
int msgid = msgget(key, 0666 | IPC_CREAT);
msgid = msgget(key, 0666 | IPC_CREAT);
const struct mangoapp_msg_header *hdr = (const struct mangoapp_msg_header*) raw_msg;
const struct mangoapp_msg_v1 *mangoapp_v1 = (const struct mangoapp_msg_v1*) raw_msg;
while (1){
@ -67,6 +59,35 @@ void msg_read_thread(){
static const char *GamescopeOverlayProperty = "GAMESCOPE_EXTERNAL_OVERLAY";
GLFWwindow* init(GLFWwindow* window, const char* glsl_version){
window = glfwCreateWindow(1280, 720, "mangoapp overlay window", NULL, NULL);
Display *x11_display = glfwGetX11Display();
Window x11_window = glfwGetX11Window(window);
if (x11_window && x11_display)
{
// Set atom for gamescope to render as an overlay.
Atom overlay_atom = XInternAtom (x11_display, GamescopeOverlayProperty, False);
uint32_t value = 1;
XChangeProperty(x11_display, x11_window, overlay_atom, XA_ATOM, 32, PropertyNewValue, (unsigned char *)&value, 1);
}
glfwMakeContextCurrent(window);
glfwSwapInterval(1); // Enable vsync
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
ImGui::StyleColorsDark();
ImGui_ImplGlfw_InitForOpenGL(window, true);
ImGui_ImplOpenGL3_Init(glsl_version);
return window;
}
void shutdown(GLFWwindow* window){
ImGui_ImplOpenGL3_Shutdown();
ImGui_ImplGlfw_Shutdown();
ImGui::DestroyContext();
glfwDestroyWindow(window);
}
int main(int, char**)
{
// Setup window
@ -82,23 +103,7 @@ int main(int, char**)
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
// Create window with graphics context
GLFWwindow* window = glfwCreateWindow(1280, 720, "mangoapp overlay window", NULL, NULL);
if (window == NULL)
return 1;
Display *x11_display = glfwGetX11Display();
Window x11_window = glfwGetX11Window(window);
if (x11_window && x11_display)
{
// Set atom for gamescope to render as an overlay.
Atom overlay_atom = XInternAtom (x11_display, GamescopeOverlayProperty, False);
uint32_t value = 1;
XChangeProperty(x11_display, x11_window, overlay_atom, XA_ATOM, 32, PropertyNewValue, (unsigned char *)&value, 1);
}
glfwMakeContextCurrent(window);
glfwSwapInterval(1); // Enable vsync
GLFWwindow* window = init(window, glsl_version);;
// Initialize OpenGL loader
bool err = glewInit() != GLEW_OK;
@ -109,15 +114,7 @@ int main(int, char**)
return 1;
}
// Setup Dear ImGui context
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
ImGui::StyleColorsDark();
// Setup Platform/Renderer backends
ImGui_ImplGlfw_InitForOpenGL(window, true);
ImGui_ImplOpenGL3_Init(glsl_version);
parse_overlay_config(&params, getenv("MANGOHUD_CONFIG"));
create_fonts(params, sw_stats.font1, sw_stats.font_text);
HUDElements.convert_colors(params);
@ -137,32 +134,44 @@ int main(int, char**)
sw_stats.engine = EngineTypes::GAMESCOPE;
std::thread(msg_read_thread).detach();
// Main loop
while (!glfwWindowShouldClose(window) && !params.no_display)
{
// Start the Dear ImGui frame
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplGlfw_NewFrame();
window_size.x = window_size.x * 1.1;
ImGui::NewFrame();
{
check_keybinds(sw_stats, params, vendorID);
position_layer(sw_stats, params, window_size);
render_imgui(sw_stats, params, window_size, true);
while (!glfwWindowShouldClose(window)){
if (!params.no_display){
if (mangoapp_paused){
window = init(window, glsl_version);
create_fonts(params, sw_stats.font1, sw_stats.font_text);
HUDElements.convert_colors(params);
mangoapp_paused = false;
}
// Start the Dear ImGui frame
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplGlfw_NewFrame();
window_size.x = window_size.x * 1.1;
ImGui::NewFrame();
{
check_keybinds(sw_stats, params, vendorID);
position_layer(sw_stats, params, window_size);
render_imgui(sw_stats, params, window_size, true);
}
ImGui::PopStyleVar(3);
// Rendering
ImGui::Render();
int display_w, display_h;
glfwGetFramebufferSize(window, &display_w, &display_h);
glEnable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
glfwSwapBuffers(window);
} else if (!mangoapp_paused) {
shutdown(window);
mangoapp_paused = true;
std::unique_lock<std::mutex> lk(mangoapp_m);
mangoapp_cv.wait(lk, []{return !params.no_display;});
}
ImGui::PopStyleVar(3);
// Rendering
ImGui::Render();
int display_w, display_h;
glfwGetFramebufferSize(window, &display_w, &display_h);
glEnable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
glfwSwapBuffers(window);
}
// Cleanup

31
src/app/mangoapp.h
Unescape Escape View File

@ -0,0 +1,31 @@
#include <stdint.h>
#include <sys/ipc.h>
#include <sys/msg.h>
#include <mutex>
#include <condition_variable>
extern struct mangoapp_ctrl_msg_v1 mangoapp_ctrl;
extern int ctrl_msgid;
extern int msgid;
extern bool mangoapp_paused;
extern std::mutex mangoapp_m;
extern std::condition_variable mangoapp_cv;
struct mangoapp_msg_header {
long msg_type; // Message queue ID, never change
uint32_t version; /* for major changes in the way things work */
} __attribute__((packed));
struct mangoapp_msg_v1 {
struct mangoapp_msg_header hdr;
uint32_t pid;
uint64_t frametime_ns;
// WARNING: Always ADD fields, never remove or repurpose fields
} __attribute__((packed));
struct mangoapp_ctrl_msg_v1 {
struct mangoapp_msg_header hdr;
uint8_t ready_for_updates;
// WARNING: Always ADD fields, never remove or re-purpose fields
} __attribute__((packed));

13
src/overlay_params.cpp
Unescape Escape View File

@ -38,6 +38,10 @@
#include "dbus_info.h"
#endif
#ifdef MANGOAPP
#include "app/mangoapp.h"
#endif
#if __cplusplus >= 201703L
template<typename... Ts>
@ -801,4 +805,13 @@ parse_overlay_config(struct overlay_params *params,
if(!logger) logger = std::make_unique<Logger>(HUDElements.params);
if(params->autostart_log && !logger->is_active())
std::thread(autostart_log, params->autostart_log).detach();
#ifdef MANGOAPP
mangoapp_ctrl.ready_for_updates = int(!params->no_display);
msgsnd(msgid, &mangoapp_ctrl, sizeof(mangoapp_ctrl), IPC_NOWAIT);
{
std::lock_guard<std::mutex> lk(mangoapp_m);
params->no_display = params->no_display;
mangoapp_cv.notify_one();
}
#endif
}

Write Preview
Loading…
Cancel
Save