gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move repeated code to Fl_Wayland_Graphics_Driver::cairo_init()

Browse Source
This commit is contained in:
ManoloFLTK 2023-08-08 09:05:12 +02:00
parent a98aaecf97
commit 45d119eb3c
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx
View File

@ -77,9 +77,6 @@ struct fl_wld_buffer *Fl_Wayland_Graphics_Driver::create_shm_buffer(int width, i
buffer->shm_pool = pool;
buffer->data = (void*)(pool_data->pool_memory + chunk_offset);
//fprintf(stderr, "last=%p chunk_offset=%d ", pool_data->buffers.next, chunk_offset);
buffer->data_size = size;
buffer->width = width;
buffer->draw_buffer = new uchar[buffer->data_size];
buffer->draw_buffer_needs_commit = true;
//fprintf(stderr, "create_shm_buffer: %dx%d = %d\n", width, height, size);
cairo_init(buffer, width, height, stride, Fl_Cairo_Graphics_Driver::cairo_format);
@ -154,6 +151,9 @@ void Fl_Wayland_Graphics_Driver::buffer_commit(struct wld_window *window,
void Fl_Wayland_Graphics_Driver::cairo_init(struct fl_wld_buffer *buffer, int width, int height, int stride, cairo_format_t format) {
buffer->data_size = stride * height;
buffer->draw_buffer = new uchar[buffer->data_size];
buffer->width = width;
cairo_surface_t *surf = cairo_image_surface_create_for_data(buffer->draw_buffer, format,
width, height, stride);
if (cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS) {

5
src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx
View File

@ -34,9 +34,6 @@ Fl_Wayland_Image_Surface_Driver::Fl_Wayland_Image_Surface_Driver(int w, int h, i
}
struct fl_wld_buffer *off_ = (struct fl_wld_buffer*)calloc(1, sizeof(struct fl_wld_buffer));
off_->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
off_->data_size = off_->stride * h;
off_->draw_buffer = (uchar*)malloc(off_->data_size);
off_->width = w;
offscreen = (Fl_Offscreen)off_;
Fl_Wayland_Graphics_Driver::cairo_init(off_, w, h, off_->stride, CAIRO_FORMAT_RGB24);
}
@ -48,7 +45,7 @@ Fl_Wayland_Image_Surface_Driver::Fl_Wayland_Image_Surface_Driver(int w, int h, i
Fl_Wayland_Image_Surface_Driver::~Fl_Wayland_Image_Surface_Driver() {
if (offscreen && !external_offscreen) {
cairo_destroy(((struct fl_wld_buffer *)offscreen)->cairo_);
free(((struct fl_wld_buffer *)offscreen)->draw_buffer);
delete[] ((struct fl_wld_buffer *)offscreen)->draw_buffer;
free((struct fl_wld_buffer *)offscreen);
}
delete driver();