From 345acc90fdc09f8247aa3dd646fba01bcf9db614 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Sun, 24 Dec 2000 20:16:25 +0000
Subject: [PATCH] Updated the look of dots and dashes to match the Win32 look.
 Issue a FIXME about PS_USERSTYLE.

---
 graphics/x11drv/pen.c | 14 ++++++++------
 windows/painting.c    |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/graphics/x11drv/pen.c b/graphics/x11drv/pen.c
index eb3af604d10..7d789a62909 100644
--- a/graphics/x11drv/pen.c
+++ b/graphics/x11drv/pen.c
@@ -11,11 +11,13 @@
 #include "x11drv.h"
 #include "debugtools.h"
 
-static const char PEN_dash[]       = { 5,3 };      /* -----   -----   -----  */
-static const char PEN_dot[]        = { 1,1 };      /* --  --  --  --  --  -- */
-static const char PEN_dashdot[]    = { 4,3,2,3 };  /* ----   --   ----   --  */
-static const char PEN_dashdotdot[] = { 4,2,2,2,2,2 }; /* ----  --  --  ----  */
-static const char PEN_alternate[]  = { 1,1 };      /* FIXME */
+DEFAULT_DEBUG_CHANNEL(x11drv);
+
+static const char PEN_dash[]       = { 16,8 };
+static const char PEN_dot[]        = { 4,4 };
+static const char PEN_dashdot[]    = { 12,8,4,8 };
+static const char PEN_dashdotdot[] = { 12,4,4,4,4,4 };
+static const char PEN_alternate[]  = { 1,1 };
 
 /***********************************************************************
  *           PEN_SelectObject
@@ -59,7 +61,7 @@ HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
 	physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate);
 	break;
       case PS_USERSTYLE:
-	/* FIXME */
+        FIXME("PS_USERSTYLE is not supported\n");
 	break;
     }
     
diff --git a/windows/painting.c b/windows/painting.c
index bc5244ffde0..208aacbed4d 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -1355,7 +1355,7 @@ BOOL WINAPI DrawFocusRect( HDC hdc, const RECT* rc )
     INT oldDrawMode, oldBkMode;
 
     hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
-    hNewPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_WINDOWTEXT));
+    hNewPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_WINDOWTEXT));
     hOldPen = SelectObject(hdc, hNewPen);
     oldDrawMode = SetROP2(hdc, R2_XORPEN);
     oldBkMode = SetBkMode(hdc, TRANSPARENT);