Move bdfcursor.c from libgdk_win32_la_SOURCES to EXTRA_DIST.

2002-02-28  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/Makefile.am: Move bdfcursor.c from
	libgdk_win32_la_SOURCES to EXTRA_DIST.

	* gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
	bitmap case, use just the LSB of the pixel value. Does this match
	X11 semantics? Or should it be pixel!=0?

diff --git a/ChangeLog b/ChangeLog
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 377010e46b864ee1597e262d984d911c47dc708a..615ffef1bf6a19e094e368bd587352c354ad1bb4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2002-02-28  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/Makefile.am: Move bdfcursor.c from
+       libgdk_win32_la_SOURCES to EXTRA_DIST.
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_colormap_color_pack): In the
+       bitmap case, use just the LSB of the pixel value. Does this match
+       X11 semantics? Or should it be pixel!=0?
+
 Wed Feb 27 19:16:50 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (gdk_window_new): 

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 6990dd230bffe4a1d37c8419d19078358a7704db..a17397f1cc2c4fefd185899072c6c3ff50479625 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -39,13 +39,13 @@ noinst_LTLIBRARIES = libgdk-win32.la
 SUBDIRS=rc
 
 EXTRA_DIST = \
+       bdfcursor.c \
        makefile.mingw  \
        makefile.msc    \
        libie55uuid.la  \
        libwntab32x.la
 
 libgdk_win32_la_SOURCES = \
-       bdfcursor.c \
        xcursors.h \
        gdkcolor-win32.c \
        gdkcursor-win32.c \

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index a5efc8b2c9c39b8638f541b4d3110cd237a2dbc5..4bbc76750ccd73e4e62da34d61f7dfdc1840dbcf 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -784,7 +784,7 @@ _gdk_win32_colormap_color (GdkColormap *colormap,
   guchar r, g, b;
 
   if (colormap == NULL)
-    return DIBINDEX (pixel);
+    return DIBINDEX (pixel & 1);
 
   colormap_private = GDK_WIN32_COLORMAP_DATA (colormap);