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

- A few additions and enhancements to the Install script.

Browse Source 
- Removed the --disable-sound option to the configure script.
This commit is contained in:
dan
2001-05-13 00:28:55 +00:00
parent 3208e193d7
commit 430c12e2b2
11 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Install
View File

@@ -28,6 +28,29 @@ perform() {
fi
}
help() {
echo "Usage: $(basename $0) <switch>"
echo "Where switches are:"
echo " -s --quiet make silent build"
echo " -h --help show this message"
echo ""
exit $1
}
OPTIONS=""
MAKE_OPTIONS=""
while [ -n "$1" ]
do
case "$1" in
"-s"|"--quiet") OPTIONS="--quiet"
MAKE_OPTIONS="-s";;
"-h"|"--help") help 0;;
*) echo "bad command-line parameter $1"
help 1;;
esac
shift
done
trap "echo Window Maker installation aborted. ; exit 1" 2 3
@@ -144,7 +167,7 @@ if [ "$NLS" = "y" -o "$NLS" = "Y" ]; then
ling=` (cd po; /bin/ls *.po) `
ALL_LINGUAS=""
for l in $ling; do
lname=`(cd po; grep Language-Team $l|cut -f2 -d: |cut -f2 -d\ |cut -f1 -d\\)`
lname=`(cd po; grep Language-Team $l|cut -f2- -d:|cut -f1 -d\\\\|cut -f1 -d\<)`
lname=`echo $lname`
lcode=`basename $l .po`
ALL_LINGUAS="$ALL_LINGUAS $lcode"
@@ -218,6 +241,17 @@ done
OPTIONS="$OPTIONS --prefix=$PREFIX"
##################### Install stripped binaries?
INSTALL="install"
echo "Do you want stripped binaries to be installed?"
echo "Installed binaries will be smaller (with debug info removed)."
echo -n "<y/n> [n] "
read foo
if [ "$foo" = y -o "$foo" = Y ]; then
INSTALL="install-strip"
fi
##################### Configure
echo "--------------------------"
@@ -242,14 +276,14 @@ fi
echo "-------------------------"
echo "Compiling Window Maker..."
echo "-------------------------"
(cd src; perform make clean)
perform make
(cd src; perform make $MAKE_OPTIONS clean)
perform make $MAKE_OPTIONS
echo "--------------------------"
echo "Installing Window Maker..."
echo "--------------------------"
perform make install
perform make $MAKE_OPTIONS $INSTALL
if [ `uname -s` = "Linux" ]; then
echo

4
WPrefs.app/WPrefs.h
View File

@@ -41,8 +41,8 @@
/****/
#define WVERSION "0.44"
#define WMVERSION "0.64.x"
#define WVERSION "0.45"
#define WMVERSION "0.65.x"
extern char *NOptionValueChanged;

4
acconfig.h
View File

@@ -48,9 +48,6 @@
* set by configure */
#undef I18N
/* define if you want sound support */
#undef WSOUND
/* define if you want the 'lite' version */
#undef LITE
@@ -58,7 +55,6 @@
* set by configure */
#undef SHAPE
/* define if you want support for the XINERAMA extension
* set by configure */
#undef XINERAMA

13
configure.in
View File

@@ -736,17 +736,6 @@ dnl End of Graphic Format Libraries
dnl ==============================================
dnl Sound support - Dan
dnl =============================================
sound=yes
AC_ARG_ENABLE(sound,
[ --disable-sound disable sound support ],
sound=$enableval, sound=yes)
if test "$sound" = yes; then
AC_DEFINE(WSOUND)
fi
# AC_PREFIX_PROGRAM(wmaker)
dnl Support for PIXMAPDIR option
@@ -1006,7 +995,7 @@ echo "Graphic format libraries: $supported_gfx"
if test x$hermes_support = xyes; then
echo "Hermes support for wrlib enabled"
fi
echo "Sound support: $sound"
dnl echo "Sound support: yes"
echo "Translated message files to install: $mof"
if test "x$MOFILES" != "x"; then
echo "Installation path of translated messages: $NLSDIR" | sed -e 's|\$(prefix)|'"$prefix|"

2
po/el.po
View File

@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 1998-08-20 01:33+0300\n"
"PO-Revision-Date: 1999-09-04 01:39+0300\n"
"Last-Translator: Nikolaos Papagrigoriou <papanikos@freemail.gr>\n"
"Language-Team: no team\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=el\n"
"Content-Transfer-Encoding: iso8859-7\n"

20
src/actions.c
View File

@@ -47,6 +47,7 @@
#include "appmenu.h"
#include "winspector.h"
#include "workspace.h"
#include "wsound.h"
#ifdef GNOME_STUFF
# include "gnome.h"
@@ -55,9 +56,6 @@
# include "kwm.h"
#endif
#ifdef WSOUND
#include "wsound.h"
#endif
/****** Global Variables ******/
@@ -272,9 +270,7 @@ wShadeWindow(WWindow *wwin)
XLowerWindow(dpy, wwin->client_win);
#ifdef WSOUND
wSoundPlay(WSOUND_SHADE);
#endif
#ifdef ANIMATIONS
if (!wwin->screen_ptr->flags.startup && !wwin->flags.skip_next_animation
@@ -359,9 +355,7 @@ wUnshadeWindow(WWindow *wwin)
wwin->flags.mapped = 1;
XMapWindow(dpy, wwin->client_win);
#ifdef WSOUND
wSoundPlay(WSOUND_UNSHADE);
#endif
#ifdef ANIMATIONS
if (!wPreferences.no_animations && !wwin->flags.skip_next_animation) {
@@ -514,9 +508,7 @@ wMaximizeWindow(WWindow *wwin, int directions)
wKWMSendEventMessage(wwin, WKWMChangedClient);
#endif
#ifdef WSOUND
wSoundPlay(WSOUND_MAXIMIZE);
#endif
}
@@ -548,9 +540,7 @@ wUnmaximizeWindow(WWindow *wwin)
wKWMSendEventMessage(wwin, WKWMChangedClient);
#endif
#ifdef WSOUND
wSoundPlay(WSOUND_UNMAXIMIZE);
#endif
}
#ifdef ANIMATIONS
@@ -969,9 +959,7 @@ wIconifyWindow(WWindow *wwin)
unmapTransientsFor(wwin);
if (present) {
#ifdef WSOUND
wSoundPlay(WSOUND_ICONIFY);
#endif
XUngrabPointer(dpy, CurrentTime);
wWindowUnmap(wwin);
@@ -1123,9 +1111,7 @@ wDeiconifyWindow(WWindow *wwin)
XUnmapWindow(dpy, wwin->icon->core->window);
}
#ifdef WSOUND
wSoundPlay(WSOUND_DEICONIFY);
#endif
/* if the window is in another workspace, do it silently */
#ifdef ANIMATIONS
@@ -1241,9 +1227,7 @@ hideWindow(WIcon *icon, int icon_x, int icon_y, WWindow *wwin, int animate)
wClientSetState(wwin, IconicState, icon->icon_win);
flushExpose();
#ifdef WSOUND
wSoundPlay(WSOUND_HIDE);
#endif
#ifdef ANIMATIONS
if (!wwin->screen_ptr->flags.startup && !wPreferences.no_animations &&
!wwin->flags.skip_next_animation && animate) {
@@ -1390,9 +1374,7 @@ unhideWindow(WIcon *icon, int icon_x, int icon_y, WWindow *wwin, int animate,
wwin->flags.hidden=0;
wwin->flags.mapped=1;
#ifdef WSOUND
wSoundPlay(WSOUND_UNHIDE);
#endif
#ifdef ANIMATIONS
if (!wwin->screen_ptr->flags.startup && !wPreferences.no_animations
&& animate) {

2
src/appicon.c
View File

@@ -912,9 +912,7 @@ appIconMouseDown(WObjDescriptor *desc, XEvent *event)
}
}
#ifdef WSOUND
wSoundPlay(WSOUND_DOCK);
#endif
} else {
if (movingSingle) {
/* move back to its place */

9
src/application.c
View File

@@ -47,12 +47,8 @@
#include "actions.h"
#include "defaults.h"
#include "workspace.h"
#include "dock.h"
#ifdef WSOUND
#include "wsound.h"
#endif
/******** Global variables ********/
@@ -437,10 +433,7 @@ wApplicationCreate(WScreen *scr, Window main_window)
extractClientIcon(wapp->app_icon);
}
#ifdef WSOUND
wSoundPlay(WSOUND_APPSTART);
#endif
#ifdef DEBUG
printf("Created application for %x\n", (unsigned)main_window);
@@ -517,9 +510,7 @@ wApplicationDestroy(WApplication *wapp)
wArrangeIcons(scr, True);
}
#ifdef WSOUND
wSoundPlay(WSOUND_APPEXIT);
#endif
}

11
src/dialog.c
View File

@@ -1319,7 +1319,7 @@ wShowInfoPanel(WScreen *scr)
strcat(buffer, " ");
}
strcat(buffer, _("\nAdditional Support For: "));
strcat(buffer, _("\nAdditional support for: "));
{
char *list[8];
char buf[80];
@@ -1337,9 +1337,6 @@ wShowInfoPanel(WScreen *scr)
#ifdef OLWM_HINTS
list[j++] = "OLWM";
#endif
#ifdef WSOUND
list[j++] = _("Sound");
#endif
buf[0] = 0;
for (i = 0; i < j; i++) {
@@ -1354,6 +1351,12 @@ wShowInfoPanel(WScreen *scr)
strcat(buffer, buf);
}
if (wPreferences.no_sound) {
strcat(buffer, _("\nSound support disabled"));
} else {
strcat(buffer, _("\nSound support enabled"));
}
panel->infoL = WMCreateLabel(panel->win);
WMResizeWidget(panel->infoL, 350, 75);

6
src/dock.c
View File

@@ -3874,19 +3874,13 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
if (aicon->icon->selected)
wIconSelect(aicon->icon);
#ifdef WSOUND
wSoundPlay(WSOUND_KABOOM);
#endif
DoKaboom(scr,aicon->icon->core->window, x, y);
#ifdef WSOUND
} else {
wSoundPlay(WSOUND_UNDOCK);
#endif
}
#ifdef WSOUND
} else {
wSoundPlay(WSOUND_UNDOCK);
#endif
}
if (clip && clip->auto_raise_lower)
wDockLower(clip);

3
src/wsound.c
View File

@@ -11,7 +11,6 @@
#include "funcs.h"
#include "wsound.h"
#ifdef WSOUND
@@ -41,4 +40,4 @@ wSoundPlay(long event_sound)
}
}
#endif /* WSOUND */