gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

fixed bug in builtin xpm loader

Browse Source 
fixed crash bug in menu editor
This commit is contained in:
kojima
2001-01-06 22:38:07 +00:00
parent bb7314ddac
commit e314838447
8 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -4,6 +4,10 @@ Changes since version 0.63.0:
- decreased nice() value in wmsetbg
- applied gnome panel not-covering patch from (Bastien Nocera <hadess@hadess.net>)
- added item copy to WPrefs menu editor
- added locale selection code for menu in wmaker.inst (Eliphas Levy Theodoro <eliphas@conectiva.com.br>)
- fixed bug in built-in xpm support (Alessandro Strada <a.strada@libero.it>)
- removed plugin support
- fixed a crash bug in WPrefs menu editor
Changes since version 0.62.1:
.............................

3
WINGs/Extras/Makefile.am
View File

@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = no-dependencies
# is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs
include_HEADERS = wtableview.h wtabledelegates.h

3
WINGs/Makefile.am
View File

@@ -8,6 +8,9 @@ SUBDIRS = . Documentation Resources Examples Extras Tests
#libWINGs_la_LDFLAGS = -version-info 1:1:0
# is this a kluge? if so, how should i do it?
includedir = @includedir@/WINGs
include_HEADERS = WINGs.h WUtil.h WINGsP.h
bin_SCRIPTS = get-wings-flags get-wutil-flags

4
WPrefs.app/Menu.c
View File

@@ -1439,7 +1439,7 @@ buildSubmenu(_Panel *panel, proplist_t pl)
char *title;
proplist_t tp, bp;
int i;
tp = PLGetArrayElement(pl, 0);
title = PLGetString(tp);
@@ -1455,7 +1455,7 @@ buildSubmenu(_Panel *panel, proplist_t pl)
title = PLGetString(tp);
if (PLIsArray(bp)) { /* it's a submenu */
if (!bp || PLIsArray(bp)) { /* it's a submenu */
WEditMenu *submenu;
submenu = buildSubmenu(panel, pi);

3
WPrefs.app/WPrefs.c
View File

@@ -410,6 +410,9 @@ savePanelData(Panel *panel)
static void
changeSection(WMWidget *self, void *data)
{
if (WPrefs.currentPanel == data)
return;
if (WPrefs.banner) {
WMDestroyWidget(WPrefs.banner);
WPrefs.banner = NULL;

2
configure.in
View File

@@ -886,7 +886,7 @@ cat <<EOF >get-wraster-flags
prefix="$prefix"
exec_prefix=\$prefix
WCFLAGS="-I\$prefix/include $inc_search_path"
WCFLAGS="-I\$prefix/include/WINGs $inc_search_path"
WLFLAGS="-L\$exec_prefix/lib $lib_search_path"
WLIBS="-lwraster $GFXLIBS $XLIBS -lm"

16
util/wmaker.inst.in
View File

@@ -11,6 +11,12 @@ else
fi
# /xx herbert
LOCALE=$LANG
if [ -z "$LOCALE" ]; then
LOCALE=$LC_ALL
fi
# directory where system wide configuration is stored
GLOBALDIR="#pkgdatadir#"
GLOBALDEFDIR="#sysconfdir#"
@@ -56,6 +62,16 @@ copy() {
rm -f $target
if [ "$file" = "WindowMaker" ]; then
sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
elif [ "$file" = "WMRootMenu" ]; then
if [ "$LOCALE" ]; then
if [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then
cp $GLOBALDIR/plmenu.${LOCALE%_*} $GSDIR/Defaults/WMRootMenu
else
cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu
fi
else
cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu
fi
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \

38
wrlib/nxpm.c
View File

@@ -176,11 +176,20 @@ RGetImageFromXPMData(RContext *context, char **data)
if (k==ccount)
k = 0;
*(r++) = color_table[0][k];
*(g++) = color_table[1][k];
*(b++) = color_table[2][k];
if (a)
*(a++) = color_table[3][k];
*r = color_table[0][k];
*g = color_table[1][k];
*b = color_table[2][k];
if (a) {
*a = color_table[3][k];
r += 4;
g += 4;
b += 4;
a += 4;
} else {
r += 3;
g += 3;
b += 3;
}
}
} else {
for (j=0; j<w*2; j++) {
@@ -194,11 +203,20 @@ RGetImageFromXPMData(RContext *context, char **data)
if (k==ccount)
k = 0;
*(r++) = color_table[0][k];
*(g++) = color_table[1][k];
*(b++) = color_table[2][k];
if (a)
*(a++) = color_table[3][k];
*r = color_table[0][k];
*g = color_table[1][k];
*b = color_table[2][k];
if (a) {
*a = color_table[3][k];
r += 4;
g += 4;
b += 4;
a += 4;
} else {
r += 3;
g += 3;
b += 3;
}
}
}
line++;