Fix RGB color pallette (gray X2GO logo to be more accurate) for agent splash screen.

2 files changed, 52 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index 9d30af4e4..1ae998ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ nx-libs (2:3.5.0.2-1) UNRELEASED; urgency=low
     has been installed to /usr/local/lib/nx via tarball or it has been packaged
     for a distribution and is installed to /usr/lib/nx. Other installation paths
     are currently not supported.
+  * Fix RGB color pallette (gray X2GO logo to be more accurate) for agent splash
+    screen.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 11 Jan 2012 15:30:36 +0100
 
diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
index 54e5996d2..67e4c5d03 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
+++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
@@ -228,47 +228,59 @@ Last-Update: 2012-01-11
    XSetWindowBackgroundPixmap(nxagentDisplay, win, nxagentPixmapLogo);
  
    #ifdef NXAGENT_LOGO_DEBUG
---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
-@@ -33,6 +33,7 @@
- extern int nxagentLogoWhite;
- extern int nxagentLogoRed;
- extern int nxagentLogoBlack;
-+extern int nxagentLogoGray;
- 
- extern Window nxagentSplashWindow;
- 
 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
 +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
-@@ -1408,6 +1408,7 @@
-     nxagentLogoBlack = 0x000000;
-     nxagentLogoRed   = 0xff0000;
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = 0x222222;
-   }
-   else
-   {
-@@ -1418,6 +1419,7 @@
-     nxagentLogoRed   = nxagentLogoColor(0xff0000);
-     nxagentLogoBlack = nxagentLogoColor(0x000000);
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = nxagentLogoColor(0x222222);
-   }
+@@ -1403,22 +1403,10 @@
+   g = pV.green_mask;
+   b = pV.blue_mask;
+ 
+-  if (!pV.red_mask || !pV.green_mask || !pV.blue_mask)
+-  {
+-    nxagentLogoBlack = 0x000000;
+-    nxagentLogoRed   = 0xff0000;
+-    nxagentLogoWhite = 0xffffff;
+-  }
+-  else
+-  {
+-    for (or=0, off=0x800000; (r&(off>>or)) == 0; or++);
+-    for (og=0, off=0x800000; (g&(off>>og)) == 0; og++);
+-    for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++);
+-
+-    nxagentLogoRed   = nxagentLogoColor(0xff0000);
+-    nxagentLogoBlack = nxagentLogoColor(0x000000);
+-    nxagentLogoWhite = 0xffffff;
+-  }
++  nxagentLogoBlack = 0x000000;
++  nxagentLogoRed   = 0xff0000;
++  nxagentLogoWhite = 0xffffff;
++  nxagentLogoGray  = 0x222222;
  
    #ifdef WATCH
-@@ -2678,6 +2680,7 @@
-     nxagentLogoBlack = 0x000000;
-     nxagentLogoRed   = 0xff0000;
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = 0x222222;
-   }
-   else
-   {
-@@ -2688,6 +2691,7 @@
-     nxagentLogoRed   = nxagentLogoColor(0xff0000);
-     nxagentLogoBlack = nxagentLogoColor(0x000000);
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = nxagentLogoColor(0x222222);
-   }
+ 
+@@ -2673,22 +2661,10 @@
+   g = pV.green_mask;
+   b = pV.blue_mask;
+ 
+-  if (!pV.red_mask || !pV.green_mask || !pV.blue_mask)
+-  {
+-    nxagentLogoBlack = 0x000000;
+-    nxagentLogoRed   = 0xff0000;
+-    nxagentLogoWhite = 0xffffff;
+-  }
+-  else
+-  {
+-    for (or=0, off=0x800000; (r&(off>>or)) == 0; or++);
+-    for (og=0, off=0x800000; (g&(off>>og)) == 0; og++);
+-    for (ob=0, off=0x800000; (b&(off>>ob)) == 0; ob++);
+-
+-    nxagentLogoRed   = nxagentLogoColor(0xff0000);
+-    nxagentLogoBlack = nxagentLogoColor(0x000000);
+-    nxagentLogoWhite = 0xffffff;
+-  }
++  nxagentLogoBlack = 0x000000;
++  nxagentLogoRed   = 0xff0000;
++  nxagentLogoWhite = 0xffffff;
++  nxagentLogoGray  = 0x222222;
  
    useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);
+