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
94657000
Commit
94657000
authored
Sep 10, 2009
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Sep 25, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Don't use ColorShifts for non-TrueColor bitmaps.
parent
6bd43fbb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
bitmap.c
dlls/winex11.drv/bitmap.c
+3
-5
dib.c
dlls/winex11.drv/dib.c
+2
-0
x11drv.h
dlls/winex11.drv/x11drv.h
+1
-0
No files found.
dlls/winex11.drv/bitmap.c
View file @
94657000
...
...
@@ -102,6 +102,7 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
physDev
->
bitmap
=
physBitmap
;
physDev
->
drawable
=
physBitmap
->
pixmap
;
physDev
->
color_shifts
=
physBitmap
->
trueColor
?
&
physBitmap
->
pixmap_color_shifts
:
NULL
;
SetRect
(
&
physDev
->
drawable_rect
,
0
,
0
,
bitmap
.
bmWidth
,
bitmap
.
bmHeight
);
physDev
->
dc_rect
=
physDev
->
drawable_rect
;
...
...
@@ -119,11 +120,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
wine_tsx11_unlock
();
}
if
(
physDev
->
depth
==
1
)
physDev
->
color_shifts
=
NULL
;
else
physDev
->
color_shifts
=
&
physBitmap
->
pixmap_color_shifts
;
return
hbitmap
;
}
...
...
@@ -167,11 +163,13 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID
if
(
bitmap
.
bmBitsPixel
==
1
)
{
physBitmap
->
pixmap_depth
=
1
;
physBitmap
->
trueColor
=
FALSE
;
}
else
{
physBitmap
->
pixmap_depth
=
screen_depth
;
physBitmap
->
pixmap_color_shifts
=
X11DRV_PALETTE_default_shifts
;
physBitmap
->
trueColor
=
(
visual
->
class
==
TrueColor
||
visual
->
class
==
DirectColor
);
}
physBitmap
->
pixmap
=
XCreatePixmap
(
gdi_display
,
root_window
,
bitmap
.
bmWidth
,
bitmap
.
bmHeight
,
physBitmap
->
pixmap_depth
);
...
...
dlls/winex11.drv/dib.c
View file @
94657000
...
...
@@ -4749,11 +4749,13 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap,
if
(
dib
.
dsBm
.
bmBitsPixel
==
1
)
{
physBitmap
->
pixmap_depth
=
1
;
physBitmap
->
trueColor
=
FALSE
;
}
else
{
physBitmap
->
pixmap_depth
=
screen_depth
;
physBitmap
->
pixmap_color_shifts
=
X11DRV_PALETTE_default_shifts
;
physBitmap
->
trueColor
=
(
visual
->
class
==
TrueColor
||
visual
->
class
==
DirectColor
);
}
#ifdef HAVE_LIBXXSHM
physBitmap
->
shminfo
.
shmid
=
-
1
;
...
...
dlls/winex11.drv/x11drv.h
View file @
94657000
...
...
@@ -124,6 +124,7 @@ typedef struct
XImage
*
image
;
/* cached XImage */
int
*
colorMap
;
/* color map info */
int
nColorMap
;
BOOL
trueColor
;
CRITICAL_SECTION
lock
;
/* GDI access lock */
enum
x11drv_shm_mode
shm_mode
;
#ifdef HAVE_LIBXXSHM
...
...
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