ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: add static GetX11Display() in panel.cpp 

Add static GetX11Display() function to get the app X11 Display* instead
of making the GDK/GTK calls in two places.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-08-10 13:31:22 +00:00
parent 236cffb42b
commit a87a6a2cc1
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wx/panel.cpp
View File

@ -1274,6 +1274,13 @@ static void process_keyboard_event(const wxKeyEvent& ev, bool down)
};
}
#ifdef __WXGTK__
static Display* GetX11Display()
{
return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(wxGetApp().frame->GetHandle()));
}
#endif
void GameArea::OnKeyDown(wxKeyEvent& ev)
{
process_keyboard_event(ev, true);
@ -1315,7 +1322,7 @@ void GameArea::OnSDLJoy(wxJoyEvent& ev)
// this shouldn't be necessary of course
#if defined(__WXGTK__) && defined(HAVE_XSS)
if (!wxGetApp().UsingWayland()) {
Display* display = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(wxGetApp().frame->GetHandle()));
auto display = GetX11Display();
XResetScreenSaver(display);
XFlush(display);
}
@ -2172,7 +2179,7 @@ void GLDrawingPanel::DrawingPanelInit()
static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL;
static PFNGLXSWAPINTERVALMESAPROC glXSwapIntervalMESA = NULL;
auto display = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(wxGetApp().frame->GetHandle()));
auto display = GetX11Display();
char* glxQuery = (char*)glXQueryExtensionsString(display, DefaultScreen(display));