jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt xcb image put.

Browse source
This commit is contained in:
James Grogan 2022-11-12 13:46:10 +00:00
parent c6d03f16d0
commit 5d984aa61d
6 changed files with 78 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/windows/ui_interfaces/x11/XcbImage.h
View file

@ -1,6 +1,47 @@
#pragma once
#include <xcb/xcb_image.h>
#include "Window.h"
#include "XcbWindow.h"
class XcbImage
{
public:
XcbImage(xcb_connection_t* connection, mt::Window* window, xcb_screen_t* screen)
{
mPixmap = xcb_generate_id(connection);
auto hwnd = dynamic_cast<XcbWindow*>(window->GetPlatformWindow())->getHandle();
const auto w = window->GetWidth();
const auto h = window->GetHeight();
xcb_create_pixmap(connection, screen->root_depth, mPixmap, hwnd, w, h);
}
void update(mt::Window* window, xcb_screen_t* screen, xcb_connection_t* connection, xcb_gcontext_t gc)
{
if (!mXImage)
{
auto backing_image = window->getBackingImage();
const auto w = window->GetWidth();
const auto h = window->GetHeight();
//auto data = const_cast<unsigned char*>(backing_image->getDataPtr());
auto data = backing_image->getData();
unsigned char* converted = &data[0];
mXImage = xcb_image_create_native(connection, w, h, XCB_IMAGE_FORMAT_Z_PIXMAP, screen->root_depth, converted, w*h*4, converted);
xcb_image_put(connection, mPixmap, gc, mXImage, 0, 0, 0);
//xcb_image_destroy(mXImage);
}
}
xcb_pixmap_t getPixMap() const
{
return mPixmap;
}
private:
xcb_pixmap_t mPixmap{0};
xcb_image_t* mXImage{nullptr};
};

17
src/windows/ui_interfaces/x11/XcbWindow.cpp
View file

@ -5,13 +5,13 @@
#include "XcbScreen.h"
#include "XcbImage.h"
#include "Screen.h"
#include "ImagePrimitives.h"
#include <xcb/xcb.h>
XcbWindow::XcbWindow(mt::Window* window, int hwnd, xcb_connection_t* connection)
: IPlatformWindow(window),
mHandle(hwnd),
mBackingImage(std::make_unique<XcbImage>()),
mConnection(connection)
{
@ -61,10 +61,25 @@ void XcbWindow::show() const
void XcbWindow::paint(mt::Screen* screen)
{
auto xcb_screen = dynamic_cast<XcbScreen*>(screen->GetPlatformScreen());
if (!mBackingImage)
{
mBackingImage = std::make_unique<XcbImage>(mConnection, mWindow, xcb_screen->GetNativeScreen());
}
auto backing_image = mWindow->getBackingImage();
backing_image->initialize();
//ImagePrimitives::drawCheckerboard(const_cast<unsigned char*>(backing_image->getDataPtr()), backing_image->getWidth(), backing_image->getHeight(), 0);
mBackingImage->update(mWindow, xcb_screen->GetNativeScreen(), mConnection, xcb_screen->GetGraphicsContext());
xcb_copy_area(mConnection, mBackingImage->getPixMap(), mHandle, xcb_screen->GetGraphicsContext(), 0, 0 ,0 , 0, backing_image->getWidth(), backing_image->getHeight());
/*
for(const auto& layer : mWindow->GetLayers())
{
XcbLayerInterface::AddLayer(mConnection, xcb_screen->GetNativeScreen(), mHandle, xcb_screen->GetGraphicsContext(), layer);
}
*/
}
void XcbWindow::clear() const