Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
f45befe4
Commit
f45befe4
authored
Jul 22, 2004
by
Huw Davies
Committed by
Alexandre Julliard
Jul 22, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Draw underline and strikeout lines in the non-xrender cases too.
parent
11a61a8e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
39 deletions
+39
-39
xrender.c
dlls/x11drv/xrender.c
+39
-39
No files found.
dlls/x11drv/xrender.c
View file @
f45befe4
...
@@ -1290,45 +1290,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
...
@@ -1290,45 +1290,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
}
}
wine_tsx11_unlock
();
wine_tsx11_unlock
();
if
(
lf
.
lfUnderline
||
lf
.
lfStrikeOut
)
{
int
linePos
;
unsigned
int
lineWidth
;
UINT
nMetricsSize
=
GetOutlineTextMetricsW
(
hdc
,
0
,
NULL
);
OUTLINETEXTMETRICW
*
otm
=
HeapAlloc
(
GetProcessHeap
(),
0
,
nMetricsSize
);
if
(
!
otm
)
goto
done
;
GetOutlineTextMetricsW
(
hdc
,
nMetricsSize
,
otm
);
wine_tsx11_lock
();
XSetForeground
(
gdi_display
,
physDev
->
gc
,
physDev
->
textPixel
);
if
(
lf
.
lfUnderline
)
{
linePos
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsUnderscorePosition
);
lineWidth
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsUnderscoreSize
);
XSetLineAttributes
(
gdi_display
,
physDev
->
gc
,
lineWidth
,
LineSolid
,
CapProjecting
,
JoinBevel
);
XDrawLine
(
gdi_display
,
physDev
->
drawable
,
physDev
->
gc
,
physDev
->
org
.
x
+
x
-
linePos
*
sinEsc
,
physDev
->
org
.
y
+
y
-
linePos
*
cosEsc
,
physDev
->
org
.
x
+
x
+
width
*
cosEsc
-
linePos
*
sinEsc
,
physDev
->
org
.
y
+
y
-
width
*
sinEsc
-
linePos
*
cosEsc
);
}
if
(
lf
.
lfStrikeOut
)
{
linePos
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsStrikeoutPosition
);
lineWidth
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsStrikeoutSize
);
XSetLineAttributes
(
gdi_display
,
physDev
->
gc
,
lineWidth
,
LineSolid
,
CapProjecting
,
JoinBevel
);
XDrawLine
(
gdi_display
,
physDev
->
drawable
,
physDev
->
gc
,
physDev
->
org
.
x
+
x
,
physDev
->
org
.
y
+
y
-
linePos
,
physDev
->
org
.
x
+
x
+
width
,
physDev
->
org
.
y
+
y
-
linePos
);
}
wine_tsx11_unlock
();
HeapFree
(
GetProcessHeap
(),
0
,
otm
);
}
}
else
{
}
else
{
INT
offset
=
0
,
xoff
=
0
,
yoff
=
0
;
INT
offset
=
0
,
xoff
=
0
,
yoff
=
0
;
wine_tsx11_lock
();
wine_tsx11_lock
();
...
@@ -1486,6 +1447,45 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
...
@@ -1486,6 +1447,45 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
}
}
LeaveCriticalSection
(
&
xrender_cs
);
LeaveCriticalSection
(
&
xrender_cs
);
if
(
lf
.
lfUnderline
||
lf
.
lfStrikeOut
)
{
int
linePos
;
unsigned
int
lineWidth
;
UINT
nMetricsSize
=
GetOutlineTextMetricsW
(
hdc
,
0
,
NULL
);
OUTLINETEXTMETRICW
*
otm
=
HeapAlloc
(
GetProcessHeap
(),
0
,
nMetricsSize
);
if
(
!
otm
)
goto
done
;
GetOutlineTextMetricsW
(
hdc
,
nMetricsSize
,
otm
);
wine_tsx11_lock
();
XSetForeground
(
gdi_display
,
physDev
->
gc
,
physDev
->
textPixel
);
if
(
lf
.
lfUnderline
)
{
linePos
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsUnderscorePosition
);
lineWidth
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsUnderscoreSize
);
XSetLineAttributes
(
gdi_display
,
physDev
->
gc
,
lineWidth
,
LineSolid
,
CapProjecting
,
JoinBevel
);
XDrawLine
(
gdi_display
,
physDev
->
drawable
,
physDev
->
gc
,
physDev
->
org
.
x
+
x
-
linePos
*
sinEsc
,
physDev
->
org
.
y
+
y
-
linePos
*
cosEsc
,
physDev
->
org
.
x
+
x
+
width
*
cosEsc
-
linePos
*
sinEsc
,
physDev
->
org
.
y
+
y
-
width
*
sinEsc
-
linePos
*
cosEsc
);
}
if
(
lf
.
lfStrikeOut
)
{
linePos
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsStrikeoutPosition
);
lineWidth
=
X11DRV_YWStoDS
(
physDev
,
otm
->
otmsStrikeoutSize
);
XSetLineAttributes
(
gdi_display
,
physDev
->
gc
,
lineWidth
,
LineSolid
,
CapProjecting
,
JoinBevel
);
XDrawLine
(
gdi_display
,
physDev
->
drawable
,
physDev
->
gc
,
physDev
->
org
.
x
+
x
,
physDev
->
org
.
y
+
y
-
linePos
,
physDev
->
org
.
x
+
x
+
width
,
physDev
->
org
.
y
+
y
-
linePos
);
}
wine_tsx11_unlock
();
HeapFree
(
GetProcessHeap
(),
0
,
otm
);
}
if
(
deltas
&&
deltas
!=
lpDx
)
if
(
deltas
&&
deltas
!=
lpDx
)
HeapFree
(
GetProcessHeap
(),
0
,
deltas
);
HeapFree
(
GetProcessHeap
(),
0
,
deltas
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment