aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/204-nxagent_repaint-solidpict.full.patch
diff options
context:
space:
mode:
authorOleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>2012-09-20 21:27:59 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-09-20 21:28:26 +0200
commitf6adfd1fa2d5afc98166486b905305ad718853d1 (patch)
treee6fc18f6144b8036689718861c5bd575eb5df9cc /debian/patches/204-nxagent_repaint-solidpict.full.patch
parentb8db5192d8b60c4371aa339e0762268efd62d53f (diff)
downloadnx-libs-f6adfd1fa2d5afc98166486b905305ad718853d1.tar.gz
nx-libs-f6adfd1fa2d5afc98166486b905305ad718853d1.tar.bz2
nx-libs-f6adfd1fa2d5afc98166486b905305ad718853d1.zip
Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of SolidFill pictures by nxagent/x2goagent on reconnects.
Diffstat (limited to 'debian/patches/204-nxagent_repaint-solidpict.full.patch')
-rw-r--r--debian/patches/204-nxagent_repaint-solidpict.full.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches/204-nxagent_repaint-solidpict.full.patch b/debian/patches/204-nxagent_repaint-solidpict.full.patch
new file mode 100644
index 000000000..139a46ad3
--- /dev/null
+++ b/debian/patches/204-nxagent_repaint-solidpict.full.patch
@@ -0,0 +1,53 @@
+Description: Fix repainting of SolidFill pictures with libcairo > 1.12.x
+Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
+diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
+--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-05-16 18:05:07.000000000 +0200
++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c 2012-09-20 20:53:37.893459269 +0200
+@@ -2689,11 +2689,17 @@ void nxagentReconnectPicture(pointer p0,
+ #endif
+ }
+
+- if (!pForm)
++ if (!pForm && pPicture->pSourcePict)
+ {
+- *pBool = False;
+-
+- return;
++ /*possible we need to add support for other picture types, for example gradients...*/
++ switch(pPicture->pSourcePict->type)
++ {
++ case SourcePictTypeSolidFill:
++ nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay,
++ (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor);
++ break;
++ }
++ return;
+ }
+
+ #ifdef TEST
+diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
+--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2010-11-11 21:18:00.000000000 +0100
++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c 2012-09-20 20:54:50.209817849 +0200
+@@ -1137,6 +1137,10 @@ CreateSolidPicture (Picture pid, xRender
+ }
+ pPicture->pSourcePict->type = SourcePictTypeSolidFill;
+ pPicture->pSourcePict->solidFill.color = xRenderColorToCard32(*color);
++ pPicture->pSourcePict->solidFill.fullColor.alpha=color->alpha;
++ pPicture->pSourcePict->solidFill.fullColor.red=color->red;
++ pPicture->pSourcePict->solidFill.fullColor.green=color->green;
++ pPicture->pSourcePict->solidFill.fullColor.blue=color->blue;
+ return pPicture;
+ }
+
+diff -rupN a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h
+--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2010-10-22 16:04:24.000000000 +0200
++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h 2012-09-20 20:55:31.106020653 +0200
+@@ -95,6 +95,7 @@ typedef struct _PictTransform {
+ typedef struct _PictSolidFill {
+ unsigned int type;
+ CARD32 color;
++ xRenderColor fullColor;
+ } PictSolidFill, *PictSolidFillPtr;
+
+ typedef struct _PictGradientStop {
+