Release 940405
Tue Apr 5 14:36:59 1994 Bob Amstadt (bob@pooh)
* [include/mdi.h] [windows/mdi.c]
Use WM_PARENTNOTIFY messages to activate children.
Generate WM_CHILDACTIVATE messages.
Beginnings handler for maxmized child window.
Clean up when children are destroyed.
* [windows/message.c] [windows/nonclient.c] [windows/winpos.c]
Removed code add 94/03/26.
Apr 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c]
Make mouse menu navigation working again. :-))
(be carefull, clicking outside menus (ie.: clientrect)
not resolved yet)
* [windows/nonclient.c] [controls/scroll.c]
Bugs fix in NCTrackScrollBars().
* [misc/dos_fs.c]
Bug fix in 'ToDos()' in conversion for '/',
(example: '/window/' was translated to 'WINDOWs').
* [miscemu/int21.c]
Function ChangeDir() extract possible drive before DOS_ChangeDir().
* [loader/library.c] [loader/wine.c]
Playing around moving function GetProcAddress() and put some code in.
Mon Apr 4 21:39:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [misc/main.c]
Better explanation of command-line options.
* [objects/dib.c]
Implemented SetDIBitsToDevice().
* [windows/dc.c]
Bug fix in SetDCState().
* [windows/event.c]
Removed WS_DISABLED handling (now done in message.c).
* [windows/message.c]
Added sending a WM_PARENTNOTIFY message in MSG_TranslateMouseMsg().
Use WindowFromPoint() to find the window for mouse events, taking
into account disabled windows.
* [windows/painting.c]
Bug fix in BeginPaint() to allow calling it at other times than
on WM_PAINT (Solitaire needs it...)
* [windows/win.c]
Implemented FindWindow().
Rewritten EnableWindow() to behave more like Windows.
* [windows/winpos.c]
Rewritten WindowFromPoint() to also search child windows.
Mon Apr 4 17:36:32 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [include/int21.h] -> [msdos.h]
renamed.
* [miscemu/int10.h] [miscemu/int25.h] [miscemu/int26.h]
new, added for int 10, 25 and 26.
* [miscemu/ioports.c]
new, added to allow win apps to use ioports.
* [loader/signal.c]
Added support for in, inb, out, outb instructions.
Sun Mar 27 13:40:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (InsertMenu): Changed to use FindMenuItem().
Sat Mar 26 21:23:55 1994 Bob Amstadt (bob@pooh)
* [windows/mdi.c]
Window list properly updated.
* [windows/message.c]
Call WINPOS_ChildActivate() when mouse pressed.
* [windows/nonclient.c]
Use WINPOS_IsAnActiveWindow() instead of GetActiveWindow() in
NC_HandleNCPaint().
* [windows/winpos.c]
Created functions WINPOS_IsAnActiveWindow() and WINPOS_ActivateChild()
Thu Mar 24 14:49:17 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (DeleteMenu): Changed to use FindMenuItem
(DeleteMenu): Many bug fixes.
* [controls/menu.c]
Created function FindMenuItem().
Thu Mar 24 14:17:24 1994 Bob Amstadt (bob@pooh)
* [windows/win.c]
Removed incorrect MDI handling code from CreateWindowEx().
* [controls/menu.c]
MF_STRING items needed to allocate a private copy of string.
* [controls/menu.c]
Fixed buggy calls to GlobalFree().
* [memory/global.c]
Eliminated some redundant code with function call.
Wed Mar 23 1994 Pentti Moilanen (pentti.moilanen@ntc.nokia.com)
* [windows/timer.c]
timer list pointers looped in InsertTimer
Tue Mar 29 13:32:08 MET DST 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [misc/cursor.c]
A few changes for desktop window support.
* [misc/main.c]
Added -depth option.
* [misc/rect.c]
Yet another bug fix in SubtractRect().
* [objects/bitmap.c]
Changes to use only one depth (specified with -depth)
for color bitmaps.
* [objects/brush.c]
Added support for dithered solid brushes.
* [objects/color.c]
Use the same 20 system colors as in Windows.
System palette initialisation now done in COLOR_InitPalette().
Added support for a color mapping table to map logical color
indexes to X colormap entries.
Implemented GetNearestColor() and RealizeDefaultPalette().
* [objects/dib.c]
Added support for color mapping table.
* [objects/dither.c] (New file)
Implemented solid color dithering.
* [objects/palette.c]
Implemented GetSystemPaletteEntries() and SelectPalette().
* [windows/class.c]
Make a copy of the menu name in RegisterClass().
* [windows/dc.c]
Fixed device caps when using a desktop window.
Added support for the color mapping table in DCs.
* [windows/event.c]
Added ConfigureNotify handler on desktop window.
* [windows/message.c]
Removed call to XTranslateCoordinates() on every mouse motion
New function MSG_Synchronize() to synchronize with the X server.
* [windows/syscolor.c]
Rewritten SYSCOLOR_Init() to read the system colors from WIN.INI.
* [windows/winpos.c]
Added synchronization on window mapping. Solves the double redraw
problem when starting Solitaire.
Mar 27, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c] * [windows/defwnd.c]
Make keyboard navigation working with menubar,
but temporarely inserted a bug in menubar mouse handling ... :-((
(it will be fix next week !)
* [windows/defwnd.c]
Connect VK_MENU to menubar navigation.
* [loader/library.c]
GetModuleHandle() return 'fictive 0xF000+ handles' for built-in DLLs.
Sun Mar 20 22:32:13 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/main.c]
Added Copy(). Added a check for `-h' to show usage.
* [misc/dos_fs.c]
Fixed bug in FindFile(), to load directories as dlls.
* [misc/dos_fs.c]
Fixed ToUnix() and ToDos() again, as my previous patch
didn't make it.
* [misc/dos_fs.c] [miscemu/int21.c]
Bug fixes, should be able to handle all winfile and progman int21
requests now except for a few small things.
Tue Mar 29 06:25:54 1994 crw@harris.mlb.semi.harris.com (Carl Williams)
* [memory/heap.c]
Implemented GetFreeSystemResources().
Mon Mar 21 17:32:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (GetSubMenu): Function did not return correct value
* [windows/mdi.c]
Beginnings of menu handling.
Thu Mar 10 11:32:06 1994 Stefan (SAM) Muenzel (muenzel@tat.physik.uni-tuebingen.de)
* [objects/font.c]
if font.width equals zero use asterix instead.
Mon Mar 21 17:23:37 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/bitmap.c]
Rewritten bitmap code to use exclusively X pixmaps; *much* faster.
* [objects/brush.c]
Some changes with pattern brushes because of the new bitmap code.
* [objects/color.c]
Added function COLOR_ToPhysical for better color mapping.
* [objects/dib.c]
Heavily optimized SetDIBits().
* [windows/dc.c]
Opimized SetDCState() and DC_SetupGC*() functions.
Added stub for CreateIC().
Mar 20, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [misc/message.c]
Call SetFocus() after closing box to give back focus to previous owner.
* [misc/files.c]
Small bug fix in GetTempFilename() : replace a '\' to '\\'.
* [control/scroll.c]
Calls to BitBlt() replace by StretchBlt().
* [control/menu.c]
Call SetFocus() to previous owner after closing Popups.
Fill stub DeleteMenu().
* [control/listbox.c]
* [control/combo.c]
Use SetFocus() in WM_LBUTTONDOWN.
Close ComboBox List upon WM_KILLFOCUS.
Early development of WM_MEASUREITEM mecanism.
* [windows/defwnd.c]
Early development of WM_MEASUREITEM mecanism.
Tue Mar 22 10:44:57 1994 Miguel de Icaza (miguel@xochitl)
* [misc/atom.c]
Fixed sintaxis problem when building the library.
Tue Mar 15 13:11:56 1994 Bob Amstadt (bob@pooh)
* [include/windows.h]
Added message types and structures for MDI
* [include/mdi.h]
Created internal structures for handling MDI
* [windows/mdi.c]
Began creating MDI support
Thu Mar 10 16:51:46 1994 Bob Amstadt (bob@pooh)
* [loader/wine.c] [include/wine.h]
Added new field to "struct w_files" to hold the "name table"
resource for Windows 3.0 programs
* [loader/resource.c]
Added code to handle programs with a "name table" resource.
LoadResourceByName() modified to check for the existence of
this resource.
Mon Mar 14 22:31:42 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c]
Added installing the private colormap on the desktop window.
* [windows/event.c]
Cleaned up focus event handling (see focus.c).
Use GetFocus() to direct key events to the correct window.
* [windows/focus.c]
Rewritten SetFocus() to:
- only set X focus on top-level windows
- send WM_SETFOCUS and WM_KILLFOCUS messages (was done in event.c)
- prevent setting focus to disabled windows
- install private colormap so -privatemap option works again
* [windows/message.c] [windows/timer.c]
Changed timer management to no longer use PostMessage(), but
to generate timer messages on the fly. Also fixed a related bug
in GetMessage() which could cause busy-waiting.
* [windows/win.c]
Only select focus events on top-level windows.
* [windows/winpos.c]
Added some sanity checks for desktop window.
Fri Mar 4 20:42:01 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/dos_fs.c]
bug fixes in ToUnix(), WinIniFileName(), GetUnixFileName().
Support for tilde symbol added for rootdirectories in [drives]
section of wine's configfile.
* [misc/file.c]
hread(), hwrite() added.
* [misc/main.c]
hmemcpy() added.
* [if1632/stress.spec] [include/stress.h] [misc/stress.c]
Added STRESS.DLL, an useless dll used to stress a windows system.
* [*/*]
Added missing #includes, fixed prototypes for prototype checking.
* [include/prototypes.h]
Added prototypes for loader/*c, if1632/*c.
Tue Mar 8 09:54:34 1994 Bob Amstadt (bob@pooh)
* [Configure]
Added reminder to set WINEPATH, if it is not set.
* [Imakefile]
Removed #elif's
* [controls/button.c]
Added BN_CLICKED notification for owner-draw buttons.
* [if1632/kernel.spec] [memory/heap.c]
Changed Local* functions to WIN16_Local* to prevent unconcious use
of these functions.
* [if1632/relay.c]
Push old Stack16Frame on stack before setting.
* [include/atom.h] [misc/atom.c] [include/heap.h] [memory/local.c]
Added multiple local heap handling in Atom* functions.
* [include/regfunc.h] [miscemu/int21.c]
Rewrote DOS3Call() use context frame that is already on the stack.
* [misc/profile.c]
Fixed to allow leading ";" to mark comments.
* [misc/spy.c]
Fixed bugs and added support for "include" and "exclude" filters.
* [misc/user.c]
Rearranged calls in InitApp().
* [misc/font.c]
Fixed font handling to create system fonts, if they are used.
* [windows/dc.c]
If text drawn on window with no font specified, then default the
font to the system font.
Mon Mar 7 20:32:09 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [controls/desktop.c]
Added handling of WM_NCCREATE and WM_ERASEBKGND functions.
Implemented SetDeskPattern().
* [misc/main.c]
Added -desktop option to get a large desktop window with
everything inside it.
Added -name option.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/*.c]
Replaced the DefaultRootWindow() macro by the rootWindow variable.
* [windows/event.c] [windows/message.c]
[windows/nonclient.c] [windows/win.c]
A few changes to accomodate the new desktop window.
Tue Mar 8 11:13:03 1994 Miguel de Icaza (miguel@xochitl.nuclecu.unam.mx)
* [toolkit/arch.c] --New file--
Routines for converting little endian data structures to
big-endian data structures, currently only BITMAP structures are
converted.
* [misc/atom.c]
When used as part of the WineLib, the code is much simpler.
Doesn't depend on alignement.
* [loader/wine.c]
Ifdefed Emulator dependent code if compiling WineLib.
* [loader/resource.c]
Moved misc/resource.c to loader/resource.c.
* [loader/dump.c,ldt.c,ldtlib.c,library,c,selector.c,signal.c]
Ifdefed whole code if compiling WINELIB.
* [include/winsock.h]
Added compilation define to allow compilation on SunOS.
* [include/wine.h]
Removed load_typeinfo and load_nameinfo prototypes, they belong
to neexe.h
* [include/neexe.h]
Added load_typeinfo and load_nameinfo prototypes.
* [include/arch.h]
Fixed some bugs in the conversion routines.
Added macros for Bitmap loading.
Tue Mar 8 12:52:05 1994 crw@maniac.mlb.semi.harris.com (Carl Williams)
* [if1632/kernel.spec] [memory/global.c]
Implemented GetFreeSpace()
* [if1632/user.spec] [loader/resource.c]
Implemented CreateIcon()
diff --git a/objects/bitmap.c b/objects/bitmap.c
index ffec3e9..6c21e0c 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -6,22 +6,18 @@
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include "gdi.h"
+#include "bitmap.h"
-/* A GDI bitmap object contains a handle to a packed BITMAP,
- * which is stored on the global heap.
- * A packed BITMAP is a BITMAP structure followed by the bitmap bits.
- */
/* Handle of the bitmap selected by default in a memory DC */
-HBITMAP BITMAP_hbitmapMemDC;
+HBITMAP BITMAP_hbitmapMemDC = 0;
- /* List of supported depths */
-static int depthCount;
-static int * depthList;
-
- /* List of GC used for bitmap to pixmap operations (one for each depth) */
-static GC * bitmapGC;
+ /* GCs used for B&W and color bitmap operations */
+GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
/***********************************************************************
@@ -29,27 +25,25 @@
*/
BOOL BITMAP_Init()
{
- int i;
Pixmap tmpPixmap;
- depthList = XListDepths( XT_display, DefaultScreen(XT_display),
- &depthCount );
- if (!depthList || !depthCount) return FALSE;
- if (!(bitmapGC = (GC *) malloc( depthCount * sizeof(GC) ))) return FALSE;
-
/* Create the necessary GCs */
- for (i = 0; i < depthCount; i++)
+ if ((tmpPixmap = XCreatePixmap( display, rootWindow, 1, 1, 1 )))
{
- tmpPixmap = XCreatePixmap( XT_display, DefaultRootWindow(XT_display),
- 1, 1, depthList[i] );
- if (tmpPixmap)
+ BITMAP_monoGC = XCreateGC( display, tmpPixmap, 0, NULL );
+ XSetGraphicsExposures( display, BITMAP_monoGC, False );
+ XFreePixmap( display, tmpPixmap );
+ }
+
+ if (screenDepth != 1)
+ {
+ if ((tmpPixmap = XCreatePixmap(display, rootWindow, 1,1,screenDepth)))
{
- bitmapGC[i] = XCreateGC( XT_display, tmpPixmap, 0, NULL );
- XSetGraphicsExposures( XT_display, bitmapGC[i], False );
- XFreePixmap( XT_display, tmpPixmap );
+ BITMAP_colorGC = XCreateGC( display, tmpPixmap, 0, NULL );
+ XSetGraphicsExposures( display, BITMAP_colorGC, False );
+ XFreePixmap( display, tmpPixmap );
}
- else bitmapGC[i] = 0;
}
BITMAP_hbitmapMemDC = CreateBitmap( 1, 1, 1, 1, NULL );
@@ -58,26 +52,13 @@
/***********************************************************************
- * BITMAP_FindGCForDepth
- *
- * Return a GC appropriate for operations with the given depth.
- */
-GC BITMAP_FindGCForDepth( int depth )
-{
- int i;
- for (i = 0; i < depthCount; i++)
- if (depthList[i] == depth) return bitmapGC[i];
- return 0;
-}
-
-
-/***********************************************************************
* BITMAP_BmpToImage
*
* Create an XImage pointing to the bitmap data.
*/
-XImage * BITMAP_BmpToImage( BITMAP * bmp, void * bmpData )
+static XImage *BITMAP_BmpToImage( BITMAP * bmp, void * bmpData )
{
+ extern void _XInitImageFuncPtrs( XImage* );
XImage * image;
image = XCreateImage( XT_display, DefaultVisualOfScreen(XT_screen),
@@ -93,57 +74,6 @@
/***********************************************************************
- * BITMAP_CopyToPixmap
- *
- * Copy the content of the bitmap to the pixmap. Both must have the same depth.
- */
-BOOL BITMAP_CopyToPixmap( BITMAP * bmp, Pixmap pixmap,
- int x, int y, int width, int height )
-{
- GC gc;
- XImage * image;
-
- gc = BITMAP_FindGCForDepth( bmp->bmBitsPixel );
- if (!gc) return FALSE;
-
- image = BITMAP_BmpToImage( bmp, ((char *)bmp) + sizeof(BITMAP) );
- if (!image) return FALSE;
-
-#ifdef DEBUG_GDI
- printf( "BITMAP_CopyToPixmap: %dx%d %d colors -> %d,%d %dx%d\n",
- bmp->bmWidth, bmp->bmHeight, 1 << bmp->bmBitsPixel, x, y, width, height );
-#endif
- XPutImage(XT_display, pixmap, gc, image, 0, 0, x, y, width, height);
- image->data = NULL;
- XDestroyImage( image );
- return TRUE;
-}
-
-
-/***********************************************************************
- * BITMAP_CopyFromPixmap
- *
- * Copy the content of the pixmap to the bitmap. Both must have
- * the same dimensions and depth.
- */
-BOOL BITMAP_CopyFromPixmap( BITMAP * bmp, Pixmap pixmap )
-{
- XImage *image = BITMAP_BmpToImage( bmp, ((char *)bmp) + sizeof(BITMAP) );
- if (!image) return FALSE;
-
-#ifdef DEBUG_GDI
- printf( "BITMAP_CopyFromPixmap: %dx%d %d colors\n",
- bmp->bmWidth, bmp->bmHeight, 1 << bmp->bmBitsPixel );
-#endif
- XGetSubImage( XT_display, pixmap, 0, 0, bmp->bmWidth, bmp->bmHeight,
- AllPlanes, ZPixmap, image, 0, 0 );
- image->data = NULL;
- XDestroyImage( image );
- return TRUE;
-}
-
-
-/***********************************************************************
* CreateBitmap (GDI.48)
*/
HBITMAP CreateBitmap( short width, short height,
@@ -154,9 +84,6 @@
printf( "CreateBitmap: %dx%d, %d colors\n",
width, height, 1 << (planes*bpp) );
#endif
- if (!width || !height) return 0;
- if ((planes != 1) && (bpp != 1)) return 0;
- bitmap.bmWidthBytes = (width * bpp + 15) / 16 * 2;
return CreateBitmapIndirect( &bitmap );
}
@@ -166,15 +93,12 @@
*/
HBITMAP CreateCompatibleBitmap( HDC hdc, short width, short height )
{
- HBITMAP hbitmap;
DC * dc;
#ifdef DEBUG_GDI
printf( "CreateCompatibleBitmap: %d %dx%d\n", hdc, width, height );
#endif
- dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
- if (!dc) return 0;
- hbitmap = CreateBitmap( width, height, dc->w.planes, dc->w.bitsPerPixel, NULL);
- return hbitmap;
+ if (!(dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ))) return 0;
+ return CreateBitmap( width, height, 1, dc->w.bitsPerPixel, NULL );
}
@@ -184,72 +108,34 @@
HBITMAP CreateBitmapIndirect( BITMAP * bmp )
{
BITMAPOBJ * bmpObjPtr;
- char * bmpPtr;
HBITMAP hbitmap;
- int size = bmp->bmPlanes * bmp->bmHeight * bmp->bmWidthBytes;
-
- /* Create the BITMAPOBJ */
+ /* Check parameters */
+ if (!bmp->bmHeight || !bmp->bmWidth) return 0;
+ if (bmp->bmPlanes != 1) return 0;
+ if ((bmp->bmBitsPixel != 1) && (bmp->bmBitsPixel != screenDepth)) return 0;
+
+ /* Create the BITMAPOBJ */
hbitmap = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC );
if (!hbitmap) return 0;
bmpObjPtr = (BITMAPOBJ *) GDI_HEAP_ADDR( hbitmap );
-
- /* Create the bitmap in global heap */
- bmpObjPtr->hBitmap = GlobalAlloc( GMEM_MOVEABLE, sizeof(BITMAP) + size );
- if (!bmpObjPtr->hBitmap)
+ bmpObjPtr->size.cx = 0;
+ bmpObjPtr->size.cy = 0;
+ bmpObjPtr->bitmap = *bmp;
+ bmpObjPtr->bitmap.bmBits = NULL;
+ bmpObjPtr->bitmap.bmWidthBytes = (bmp->bmWidth*bmp->bmBitsPixel+15)/16 * 2;
+
+ /* Create the pixmap */
+ bmpObjPtr->pixmap = XCreatePixmap( display, rootWindow, bmp->bmWidth,
+ bmp->bmHeight, bmp->bmBitsPixel );
+ if (!bmpObjPtr->pixmap)
{
- GDI_FreeObject( hbitmap );
- return 0;
+ GDI_HEAP_FREE( hbitmap );
+ hbitmap = 0;
}
- bmpPtr = (char *) GlobalLock( bmpObjPtr->hBitmap );
- memcpy( bmpPtr, bmp, sizeof(BITMAP) );
- ((BITMAP *)bmpPtr)->bmBits = NULL;
- if (bmp->bmBits) memcpy( bmpPtr + sizeof(BITMAP), bmp->bmBits, size );
- GlobalUnlock( bmpObjPtr->hBitmap );
-
- bmpObjPtr->bSelected = FALSE;
- bmpObjPtr->hdc = 0;
- bmpObjPtr->size.cx = 0;
- bmpObjPtr->size.cy = 0;
- return hbitmap;
-}
-
-
-/***********************************************************************
- * BITMAP_GetSetBitmapBits
- */
-LONG BITMAP_GetSetBitmapBits( HBITMAP hbitmap, LONG count,
- LPSTR buffer, int set )
-{
- BITMAPOBJ * bmpObjPtr;
- BITMAP * bmp;
- DC * dc = NULL;
- int maxSize;
-
- if (!count) return 0;
- bmpObjPtr = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
- if (!bmpObjPtr) return 0;
- if (!(bmp = (BITMAP *) GlobalLock( bmpObjPtr->hBitmap ))) return 0;
-
- if (bmpObjPtr->bSelected)
- dc = (DC *) GDI_GetObjPtr( bmpObjPtr->hdc, DC_MAGIC );
-
- maxSize = bmp->bmPlanes * bmp->bmHeight * bmp->bmWidthBytes;
- if (count > maxSize) count = maxSize;
-
- if (set)
- {
- memcpy( bmp+1, buffer, count );
- if (dc) BITMAP_CopyToPixmap( bmp, dc->u.x.drawable,
- 0, 0, bmp->bmWidth, bmp->bmHeight );
- }
- else
- {
- if (dc) BITMAP_CopyFromPixmap( bmp, dc->u.x.drawable );
- memcpy( buffer, bmp+1, count );
- }
- GlobalUnlock( bmpObjPtr->hBitmap );
+ else if (bmp->bmBits) /* Set bitmap bits */
+ SetBitmapBits( hbitmap, bmp->bmHeight*bmp->bmWidthBytes, bmp->bmBits );
return hbitmap;
}
@@ -259,7 +145,29 @@
*/
LONG GetBitmapBits( HBITMAP hbitmap, LONG count, LPSTR buffer )
{
- return BITMAP_GetSetBitmapBits( hbitmap, count, buffer, 0 );
+ BITMAPOBJ * bmp;
+ LONG height;
+ XImage * image;
+
+ bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
+ if (!bmp) return 0;
+
+#ifdef DEBUG_BITMAP
+ printf( "GetBitmapBits: %dx%d %d colors %p\n",
+ bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
+ 1 << bmp->bitmap.bmBitsPixel, buffer );
+#endif
+ /* Only get entire lines */
+ height = count / bmp->bitmap.bmWidthBytes;
+ if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
+ if (!height) return 0;
+
+ if (!(image = BITMAP_BmpToImage( &bmp->bitmap, buffer ))) return 0;
+ XGetSubImage( display, bmp->pixmap, 0, 0, bmp->bitmap.bmWidth, height,
+ AllPlanes, ZPixmap, image, 0, 0 );
+ image->data = NULL;
+ XDestroyImage( image );
+ return height * bmp->bitmap.bmWidthBytes;
}
@@ -268,7 +176,29 @@
*/
LONG SetBitmapBits( HBITMAP hbitmap, LONG count, LPSTR buffer )
{
- return BITMAP_GetSetBitmapBits( hbitmap, count, buffer, 1 );
+ BITMAPOBJ * bmp;
+ LONG height;
+ XImage * image;
+
+ bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
+ if (!bmp) return 0;
+
+#ifdef DEBUG_BITMAP
+ printf( "SetBitmapBits: %dx%d %d colors %p\n",
+ bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
+ 1 << bmp->bitmap.bmBitsPixel, buffer );
+#endif
+ /* Only set entire lines */
+ height = count / bmp->bitmap.bmWidthBytes;
+ if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
+ if (!height) return 0;
+
+ if (!(image = BITMAP_BmpToImage( &bmp->bitmap, buffer ))) return 0;
+ XPutImage( display, bmp->pixmap, BITMAP_GC(bmp), image, 0, 0,
+ 0, 0, bmp->bitmap.bmWidth, height );
+ image->data = NULL;
+ XDestroyImage( image );
+ return height * bmp->bitmap.bmWidthBytes;
}
@@ -277,8 +207,7 @@
*/
BOOL BMP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ * bitmap )
{
- /* Free bitmap on global heap */
- GlobalFree( bitmap->hBitmap );
+ XFreePixmap( display, bitmap->pixmap );
return GDI_FreeObject( hbitmap );
}
@@ -286,95 +215,39 @@
/***********************************************************************
* BMP_GetObject
*/
-int BMP_GetObject( BITMAPOBJ * bitmap, int count, LPSTR buffer )
+int BMP_GetObject( BITMAPOBJ * bmp, int count, LPSTR buffer )
{
- char * bmpPtr = (char *) GlobalLock( bitmap->hBitmap );
if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
- memcpy( buffer, bmpPtr, count );
- GlobalUnlock( bitmap->hBitmap );
+ memcpy( buffer, &bmp->bitmap, count );
return count;
}
-
-/***********************************************************************
- * BITMAP_UnselectBitmap
- *
- * Unselect the bitmap from the DC. Used by SelectObject and DeleteDC.
- */
-BOOL BITMAP_UnselectBitmap( DC * dc )
-{
- BITMAPOBJ * bmp;
- BITMAP * bmpPtr;
-
- if (!dc->w.hBitmap) return TRUE;
- bmp = (BITMAPOBJ *) GDI_GetObjPtr( dc->w.hBitmap, BITMAP_MAGIC );
- if (!bmp) return FALSE;
-
- if (!(bmpPtr = (BITMAP *) GlobalLock( bmp->hBitmap ))) return FALSE;
-
- BITMAP_CopyFromPixmap( bmpPtr, dc->u.x.drawable );
- XFreePixmap( XT_display, dc->u.x.drawable );
- bmp->bSelected = FALSE;
- bmp->hdc = 0;
- GlobalUnlock( bmp->hBitmap );
- return TRUE;
-}
-
/***********************************************************************
* BITMAP_SelectObject
*/
HBITMAP BITMAP_SelectObject( HDC hdc, DC * dc, HBITMAP hbitmap,
- BITMAPOBJ * bitmap )
+ BITMAPOBJ * bmp )
{
- BITMAP * bmp;
HBITMAP prevHandle = dc->w.hBitmap;
if (!(dc->w.flags & DC_MEMORY)) return 0;
- if (bitmap->bSelected && hbitmap != BITMAP_hbitmapMemDC) return 0;
- if (!(bmp = (BITMAP *) GlobalLock( bitmap->hBitmap ))) return 0;
-
- /* Make sure the bitmap has the right format */
-
- if ((bmp->bmPlanes != 1) || !BITMAP_FindGCForDepth( bmp->bmBitsPixel ))
- {
- GlobalUnlock( bitmap->hBitmap );
- return 0;
- }
-
- /* Unselect the previous bitmap */
-
- if (!BITMAP_UnselectBitmap( dc ))
- {
- GlobalUnlock( bitmap->hBitmap );
- return 0;
- }
-
- /* Create the pixmap */
-
- dc->u.x.drawable = XCreatePixmap( XT_display,
- DefaultRootWindow( XT_display ),
- bmp->bmWidth, bmp->bmHeight,
- bmp->bmBitsPixel );
- dc->w.DCSizeX = bmp->bmWidth;
- dc->w.DCSizeY = bmp->bmHeight;
- BITMAP_CopyToPixmap( bmp, dc->u.x.drawable,
- 0, 0, bmp->bmWidth, bmp->bmHeight );
+ dc->u.x.drawable = bmp->pixmap;
+ dc->w.DCSizeX = bmp->bitmap.bmWidth;
+ dc->w.DCSizeY = bmp->bitmap.bmHeight;
+ dc->w.hBitmap = hbitmap;
/* Change GC depth if needed */
- if (dc->w.bitsPerPixel != bmp->bmBitsPixel)
+ if (dc->w.bitsPerPixel != bmp->bitmap.bmBitsPixel)
{
- XFreeGC( XT_display, dc->u.x.gc );
- dc->u.x.gc = XCreateGC( XT_display, dc->u.x.drawable, 0, NULL );
- dc->w.bitsPerPixel = bmp->bmBitsPixel;
- DC_SetDeviceInfo( hdc, dc );
+ XFreeGC( display, dc->u.x.gc );
+ dc->u.x.gc = XCreateGC( display, dc->u.x.drawable, 0, NULL );
+ dc->w.bitsPerPixel = bmp->bitmap.bmBitsPixel;
+ /* Re-select objects with changed depth */
+ SelectObject( hdc, dc->w.hPen );
+ SelectObject( hdc, dc->w.hBrush );
}
-
- GlobalUnlock( bitmap->hBitmap );
- dc->w.hBitmap = hbitmap;
- bitmap->bSelected = TRUE;
- bitmap->hdc = hdc;
return prevHandle;
}
