From 0ee6312164999acdbfe064e01f147ee075fdef29 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sat, 1 Sep 2001 14:48:24 +0000
Subject: [PATCH] A few bugfixes from users

---
 ChangeLog                | 2 ++
 WindowMaker/plmenu.zh_CN | 2 +-
 util/wmaker.inst.in      | 6 +++++-
 wrlib/ChangeLog          | 2 ++
 wrlib/raster.c           | 4 ++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f885d85..e08af5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Changes since version 0.65.1:
 - fixed crash with broken apps that set null WM_CLASS
 - replaced I18N_MB with I18N in one place in src/wconfig.h.in
 - fixed default clip title font in WindowMaker.in
+- fixed some locale related problems (Yukihiro Nakai <ynakai@redhat.com>)
+- fixed a bug in RCombineAreaWithOpaqueness() (Brad <lists@anomie.yi.org>)
 
 Changes since version 0.65.0:
 .............................
diff --git a/WindowMaker/plmenu.zh_CN b/WindowMaker/plmenu.zh_CN
index 54ea6707..005f799e 100644
--- a/WindowMaker/plmenu.zh_CN
+++ b/WindowMaker/plmenu.zh_CN
@@ -102,6 +102,6 @@
   ("Æô¶¯ BlackBox", RESTART, blackbox),
   ("Æô¶¯ kwm", RESTART, kwm),
   ("Æô¶¯ IceWM", RESTART, icewm),
-  ("Í˳ö...", EXIT),
+  ("Í˳ö...", EXIT)
  )
 )
diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 91671ca9..ed07d782 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -66,7 +66,11 @@ copy() {
 		sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
 	elif [ "$file" = "WMRootMenu" ]; then
 		if [ "$LOCALE" ]; then
-            	    if [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then
+            	    if [ -f $GLOBALDIR/plmenu.$LOCALE ]; then
+                	source=$GLOBALDIR/plmenu.$LOCALE
+            	    elif [ -f $GLOBALDIR/plmenu.${LOCALE%.*} ]; then
+                	source=$GLOBALDIR/plmenu.${LOCALE%.*}
+            	    elif [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then
                 	source=$GLOBALDIR/plmenu.${LOCALE%_*}
 		    elif [ -f $GLOBALDIR/menu.${LOCALE%_*} ]; then
 			source=$GLOBALDIR/menu.${LOCALE%_*}
diff --git a/wrlib/ChangeLog b/wrlib/ChangeLog
index 592ea819..5f785b7b 100644
--- a/wrlib/ChangeLog
+++ b/wrlib/ChangeLog
@@ -1,3 +1,5 @@
+- fixed a bug in RCombineAreaWithOpaqueness() (Brad <lists@anomie.yi.org>)       
+
 - Added retain/release mechanism to RImage by adding RRetainImage() and
   RReleaseImage(). RDestroyImage() is an alias to RReleaseImage() now, but
   will be removed in a future release because it no longer fits with the
diff --git a/wrlib/raster.c b/wrlib/raster.c
index 5d376041..bf1639c3 100644
--- a/wrlib/raster.c
+++ b/wrlib/raster.c
@@ -412,7 +412,7 @@ RCombineAreaWithOpaqueness(RImage *image, RImage *src, int sx, int sy,
 
     if (!HAS_ALPHA(src)) {
 
-	s = src->data + sy*src->width*3;	
+	s = src->data + (sy*src->width + sx)*3;
 	swi = (src->width - width) * 3;
 	
 	for (y=0; y < height; y++) {
@@ -428,7 +428,7 @@ RCombineAreaWithOpaqueness(RImage *image, RImage *src, int sx, int sy,
     } else {
         int tmp;
 
-	s = src->data + sy*src->width*4;
+	s = src->data + (sy*src->width + sx)*4;
 	swi = (src->width - width) * 4;
 	
 	for (y=0; y < height; y++) {
-- 
2.11.4.GIT