From 209bd5e587a5c2fda7088a06535233ef4b8051ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Fri, 19 Sep 2014 15:39:18 +0200
Subject: [PATCH] 2014-09-19 15:39 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/rtl/gtxwc/gtxwc.c     + added support for
 HB_GTI_MOUSEPOS_XY and HB_GFX_GETPIXEL.       Modifciations created by Rolf.

---
 ChangeLog.txt         |  5 +++++
 src/rtl/gtxwc/gtxwc.c | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index dffa0b1584..e281683792 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-09-19 15:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/gtxwc/gtxwc.c
+    + added support for HB_GTI_MOUSEPOS_XY and HB_GFX_GETPIXEL.
+      Modifciations created by Rolf.
+
 2014-09-19 15:22 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/common/hbdate.c
     ! fixed typo in hb_timeUTCOffset() - this code was used in POSIX
diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c
index 82c5aa5122..f56fe852ba 100644
--- a/src/rtl/gtxwc/gtxwc.c
+++ b/src/rtl/gtxwc/gtxwc.c
@@ -253,6 +253,8 @@ typedef struct
    /* Mouse informations */
    int mouseCol;
    int mouseRow;
+   int mouseColPxl;
+   int mouseRowPxl;
    int mouseGotoCol;
    int mouseGotoRow;
    int mouseNumButtons;
@@ -3005,8 +3007,10 @@ static void hb_gt_xwc_WndProc( PXWND_DEF wnd, XEvent * evt )
          if( evt->xmotion.time != CurrentTime )
             wnd->lastEventTime = evt->xmotion.time;
 
-         wnd->mouseCol = evt->xmotion.x / wnd->fontWidth;
-         wnd->mouseRow = evt->xmotion.y / wnd->fontHeight;
+         wnd->mouseColPxl = evt->xmotion.x;
+         wnd->mouseRowPxl = evt->xmotion.y;
+         wnd->mouseCol = wnd->mouseColPxl / wnd->fontWidth;
+         wnd->mouseRow = wnd->mouseRowPxl / wnd->fontHeight;
          if( wnd->fMarkMode )
          {
             hb_gt_xwc_InvalidateChar( wnd, wnd->markLeft, wnd->markTop,
@@ -5412,6 +5416,14 @@ static HB_BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
          }
          break;
 
+      case HB_GTI_MOUSEPOS_XY:
+         if( ! pInfo->pResult )
+            pInfo->pResult = hb_itemNew( NULL );
+         hb_arrayNew( pInfo->pResult, 2 );
+         hb_arraySetNI( pInfo->pResult, 1, wnd->mouseColPxl );
+         hb_arraySetNI( pInfo->pResult, 2, wnd->mouseRowPxl );
+         break;
+
       case HB_GTI_SETPOS_XY:
       case HB_GTI_SETPOS_ROWCOL:
       {
@@ -5569,6 +5581,7 @@ static int hb_gt_xwc_gfx_Primitive( PHB_GT pGT, int iType, int iTop, int iLeft,
    PXWND_DEF wnd;
    int iRet = 1, iTmp;
    XColor color;
+   XImage * image;
 
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_xwc_gfx_Primitive(%p,%d,%d,%d,%d,%d,%d)", pGT, iType, iTop, iLeft, iBottom, iRight, iColor ) );
 
@@ -5588,7 +5601,6 @@ static int hb_gt_xwc_gfx_Primitive( PHB_GT pGT, int iType, int iTop, int iLeft,
          break;
 
       case HB_GFX_MAKECOLOR:
-         /* TODO: */
          color.red = iTop * 256;
          color.green = iLeft * 256;
          color.blue = iBottom * 256;
@@ -5630,8 +5642,20 @@ static int hb_gt_xwc_gfx_Primitive( PHB_GT pGT, int iType, int iTop, int iLeft,
          break;
 
       case HB_GFX_GETPIXEL:
-         /* TODO: */
-         iRet = 0;
+         HB_XWC_XLIB_LOCK();
+         image = XGetImage( wnd->dpy, wnd->drw, iLeft, iTop, 1, 1, AllPlanes, XYPixmap );
+         if( image )
+         {
+            color.pixel = XGetPixel( image, 0, 0 );
+            XQueryColor( wnd->dpy, wnd->colorsmap, &color );
+            iRet = ( ( color.red / 256 ) & 0xFF ) << 16 |
+                   ( ( color.green / 256 ) & 0xFF ) << 8 |
+                   ( ( color.blue / 256 ) & 0xFF );
+            XDestroyImage( image );
+         }
+         else
+            iRet = 0;
+         HB_XWC_XLIB_UNLOCK();
          break;
 
       case HB_GFX_PUTPIXEL: