mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for "Wayland-only build is not compatible with Cairo option" (#544)

This commit is contained in:
ManoloFLTK 2022-11-15 09:02:03 +01:00
parent d1054c5f6c
commit 1c448d6ff1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cairo/Fl_Cairo.cxx
View File

@ -39,7 +39,11 @@
#elif defined(FLTK_USE_WAYLAND) // Wayland or hybrid
# include "../src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H"
# include "../src/drivers/Wayland/Fl_Wayland_Window_Driver.H"
# include <cairo-xlib.h>
# if defined(FLTK_USE_X11)
# include <cairo-xlib.h>
# else
static void *fl_gc = NULL;
# endif
#elif defined(FLTK_USE_X11) // X11
# include <cairo-xlib.h>
#else
@ -135,6 +139,8 @@ cairo_t *Fl::cairo_make_current(Fl_Window *wi) {
static cairo_surface_t *cairo_create_surface(void *gc, int W, int H) {
#if defined(FLTK_USE_X11)
return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H);
#elif defined(FLTK_USE_WAYLAND)
return NULL;
#elif defined(_WIN32)
return cairo_win32_surface_create((HDC)gc);
#elif defined(__APPLE__)
@ -151,7 +157,7 @@ static cairo_surface_t *cairo_create_surface(void *gc, int W, int H) {
*/
cairo_t *Fl::cairo_make_current(void *gc) {
int W = 0, H = 0;
#if defined(FLTK_USE_X11)
#if defined(FLTK_USE_X11) || defined(FLTK_USE_WAYLAND)
// FIXME X11 get W,H
// gc will be the window handle here
// # warning FIXME get W,H for cairo_make_current(void*)