From dad0e04829091587ec4af0718784ca2311286bf7 Mon Sep 17 00:00:00 2001 From: kojima Date: Wed, 17 Mar 1999 01:20:29 +0000 Subject: [PATCH] er.. WPrefs Appearance section update --- ChangeLog | 1 + Makefile.in | 1 + TODO | 1 + WINGs/Makefile.in | 1 + WINGs/Resources/Makefile.in | 1 + WPrefs.app/Makefile.in | 1 + WPrefs.app/Menu.c | 2 - WPrefs.app/TexturePanel.c | 117 ++- WPrefs.app/po/Makefile.in | 1 + WPrefs.app/tiff/Makefile.in | 1 + WPrefs.app/xpm/Makefile.in | 1 + WindowMaker/Backgrounds/Makefile.in | 1 + WindowMaker/Defaults/Makefile.in | 1 + WindowMaker/IconSets/Makefile.in | 1 + WindowMaker/Icons/Makefile.in | 1 + WindowMaker/Makefile.in | 1 + WindowMaker/Pixmaps/Makefile.in | 1 + WindowMaker/Styles/Makefile.in | 1 + WindowMaker/Themes/Makefile.in | 1 + configure | 400 ++++++---- configure.in | 20 + doc/Makefile.in | 1 + po/Makefile.in | 1 + po/README | 1 + po/fi.po | 1388 ++++++++++++++++++++++------------- src/Makefile.am | 1 + src/Makefile.in | 3 +- src/client.c | 1 - src/config.h.in | 3 + src/defaults.c | 43 +- src/texture.c | 69 ++ src/texture.h | 17 + src/wconfig.h.in | 2 + test/Makefile.in | 1 + util/Makefile.in | 1 + wmlib/Makefile.in | 1 + wrlib/Makefile.in | 1 + 37 files changed, 1414 insertions(+), 676 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b1426a3..7dffff40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Changes since version 0.51.2: - enhancements to the modelock patch (id@windowmaker.org) - show kbd mode for modelock (id@windowmaker.org) - enhanced positioning of transient windows +- added dynamically loadable texture renderer code (from ?) Changes since version 0.51.1: diff --git a/Makefile.in b/Makefile.in index 2437fcb8..fd31c14f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/TODO b/TODO index 3127b527..90863d8f 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,7 @@ Do ASAP: ======== +- exitscript - fix bestvisual selection code. Broken. - fix RemakeStackList() to account for transient windows - blink border of clients with UrgencyHint set between red and black diff --git a/WINGs/Makefile.in b/WINGs/Makefile.in index 417adc90..7b925194 100644 --- a/WINGs/Makefile.in +++ b/WINGs/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in index f67f7297..c4efd06b 100644 --- a/WINGs/Resources/Makefile.in +++ b/WINGs/Resources/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in index 6e8ffeaa..27d813c2 100644 --- a/WPrefs.app/Makefile.in +++ b/WPrefs.app/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c index 8804d8ae..06cf2e1c 100644 --- a/WPrefs.app/Menu.c +++ b/WPrefs.app/Menu.c @@ -1332,7 +1332,6 @@ getDefaultMenu(_Panel *panel, int *hasWSMenu) } } - free(gspath); free(menuPath); if (menu) { @@ -1358,7 +1357,6 @@ showData(_Panel *panel) menuPath = wmalloc(strlen(gspath)+32); strcpy(menuPath, gspath); - free(gspath); strcat(menuPath, "/Defaults/WMRootMenu"); menu = PLGetProplistWithPath(menuPath); diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index 637b7bac..3abdbfac 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -100,6 +100,7 @@ typedef struct _TexturePanel { WMButton *dispB; WMPopUpButton *arrP; + RImage *image; char *imageFile; /*****/ @@ -197,6 +198,36 @@ updateGradButtons(TexturePanel *panel) } + +static void +updateTGradImage(TexturePanel *panel) +{ + RImage *image, *gradient; + WMPixmap *pixmap; + RColor from; + RColor to; + WMColor *color; + + color = WMGetColorWellColor(panel->tcol1W); + from.red = WMRedComponentOfColor(color)>>8; + from.green = WMGreenComponentOfColor(color)>>8; + from.blue = WMBlueComponentOfColor(color)>>8; + + color = WMGetColorWellColor(panel->tcol2W); + to.red = WMRedComponentOfColor(color)>>8; + to.green = WMGreenComponentOfColor(color)>>8; + to.blue = WMBlueComponentOfColor(color)>>8; + + if (WMGetButtonSelected(panel->dirhB)) { + gradient = RRenderGradient(80, 30, &from, &to, RHorizontalGradient); + } else if (WMGetButtonSelected(panel->dirvB)) { + gradient = RRenderGradient(80, 30, &from, &to, RVerticalGradient); + } else { + gradient = RRenderGradient(80, 30, &from, &to, RDiagonalGradient); + } +} + + static void updateSGradButtons(TexturePanel *panel) { @@ -619,15 +650,21 @@ browseImageCallback(WMWidget *w, void *data) return; } - pixmap = WMCreatePixmapFromRImage(scr, image, 128); - RDestroyImage(image); + if (panel->image) + RDestroyImage(panel->image); + panel->image = image; - size = WMGetPixmapSize(pixmap); - WMSetLabelImage(panel->imageL, pixmap); - WMResizeWidget(panel->imageL, size.width, size.height); + if (WMGetPopUpButtonSelectedItem(panel->typeP) == TYPE_PIXMAP) { + pixmap = WMCreatePixmapFromRImage(scr, image, 128); - WMReleasePixmap(pixmap); + size = WMGetPixmapSize(pixmap); + WMSetLabelImage(panel->imageL, pixmap); + WMResizeWidget(panel->imageL, size.width, size.height); + WMReleasePixmap(pixmap); + } else { + updateTGradImage(panel); + } panel->imageFile = path; WMSetTextFieldText(panel->imageT, path); @@ -667,6 +704,11 @@ DestroyTexturePanel(TexturePanel *panel) void ShowTexturePanel(TexturePanel *panel) { + Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win)); + + WMSetWindowUPosition(panel->win, + WidthOfScreen(DefaultScreenOfDisplay(dpy)), + HeightOfScreen(DefaultScreenOfDisplay(dpy))); WMMapWidget(panel->win); } @@ -723,10 +765,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) p = PLGetArrayElement(texture, 1); if (!p) { - goto bad_texture; + str = "black"; + } else { + str = PLGetString(p); } - - str = PLGetString(p); color = WMCreateNamedColor(scr, str, False); WMSetColorWellColor(panel->defcW, color); @@ -741,9 +783,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) p = PLGetArrayElement(texture, 1); if (!p) { - goto bad_texture; + str = "black"; + } else { + str = PLGetString(p); } - str = PLGetString(p); color = WMCreateNamedColor(scr, str, False); WMSetColorWellColor(panel->tcol1W, color); @@ -752,9 +795,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) p = PLGetArrayElement(texture, 2); if (!p) { - goto bad_texture; + str = "black"; + } else { + str = PLGetString(p); } - str = PLGetString(p); color = WMCreateNamedColor(scr, str, False); WMSetColorWellColor(panel->tcol2W, color); @@ -766,11 +810,43 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) } else if (strcasecmp(type, "thgradient")==0 || strcasecmp(type, "tvgradient")==0 || strcasecmp(type, "tdgradient")==0) { + int i; WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_TGRADIENT); - /****** TODO: setador de textura apartir desse */ gradient = type[1]; + + WMSetTextFieldText(panel->imageT, + PLGetString(PLGetArrayElement(texture, 1))); + + i = 180; + sscanf(PLGetString(PLGetArrayElement(texture, 2)), "%i", &i); + WMSetSliderValue(panel->topaS, i); + + p = PLGetArrayElement(texture, 3); + if (!p) { + str = "black"; + } else { + str = PLGetString(p); + } + color = WMCreateNamedColor(scr, str, False); + + WMSetColorWellColor(panel->tcol1W, color); + + WMReleaseColor(color); + + p = PLGetArrayElement(texture, 4); + if (!p) { + str = "black"; + } else { + str = PLGetString(p); + } + color = WMCreateNamedColor(scr, str, False); + + WMSetColorWellColor(panel->tcol2W, color); + + WMReleaseColor(color); + /*...............................................*/ } else if (strcasecmp(type, "mhgradient")==0 || strcasecmp(type, "mvgradient")==0 @@ -787,10 +863,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) p = PLGetArrayElement(texture, 1); if (!p) { - goto bad_texture; + str = "black"; + } else { + str = PLGetString(p); } - - str = PLGetString(p); color = WMCreateNamedColor(scr, str, False); WMSetColorWellColor(panel->defcW, color); @@ -803,9 +879,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) p = PLGetArrayElement(texture, i); if (!p) { - goto bad_texture; + str = "black"; + } else { + str = PLGetString(p); } - str = PLGetString(p); XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor); @@ -1059,8 +1136,6 @@ CreateTexturePanel(WMWindow *keyWindow) WMSetPopUpButtonSelectedItem(panel->typeP, 0); WMSetPopUpButtonAction(panel->typeP, changeTypeCallback, panel); - WMSetPopUpButtonItemEnabled(panel->typeP, TYPE_TGRADIENT, False); - /* color */ panel->defcF = WMCreateFrame(panel->win); WMResizeWidget(panel->defcF, 100, 75); diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in index 563d4cc2..183659e8 100644 --- a/WPrefs.app/po/Makefile.in +++ b/WPrefs.app/po/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in index 4167e0ff..2dc7de82 100644 --- a/WPrefs.app/tiff/Makefile.in +++ b/WPrefs.app/tiff/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in index 90c8896d..1a1ebfcd 100644 --- a/WPrefs.app/xpm/Makefile.in +++ b/WPrefs.app/xpm/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Backgrounds/Makefile.in b/WindowMaker/Backgrounds/Makefile.in index 5160cc21..7989ec54 100755 --- a/WindowMaker/Backgrounds/Makefile.in +++ b/WindowMaker/Backgrounds/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in index 74abb286..3fc71515 100755 --- a/WindowMaker/Defaults/Makefile.in +++ b/WindowMaker/Defaults/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in index af6a465c..31104865 100755 --- a/WindowMaker/IconSets/Makefile.in +++ b/WindowMaker/IconSets/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Icons/Makefile.in b/WindowMaker/Icons/Makefile.in index b1ef83e6..da69a963 100755 --- a/WindowMaker/Icons/Makefile.in +++ b/WindowMaker/Icons/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in index 1f50b228..66fec58c 100755 --- a/WindowMaker/Makefile.in +++ b/WindowMaker/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Pixmaps/Makefile.in b/WindowMaker/Pixmaps/Makefile.in index 74357b58..a8d56197 100755 --- a/WindowMaker/Pixmaps/Makefile.in +++ b/WindowMaker/Pixmaps/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Styles/Makefile.in b/WindowMaker/Styles/Makefile.in index 46dd55c6..7b887fa8 100755 --- a/WindowMaker/Styles/Makefile.in +++ b/WindowMaker/Styles/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/WindowMaker/Themes/Makefile.in b/WindowMaker/Themes/Makefile.in index c22a6d58..3e780943 100755 --- a/WindowMaker/Themes/Makefile.in +++ b/WindowMaker/Themes/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/configure b/configure index b606627a..0b407246 100755 --- a/configure +++ b/configure @@ -2356,11 +2356,148 @@ fi done + + +echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +echo "configure:2363: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +dlopen(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_dlopen=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + HAVEDL="yes" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:2409: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + DLLIBS="-ldl" HAVEDL="yes" +else + echo "$ac_t""no" 1>&6 +DLLIBS="" +fi + +fi + + +if test "x$HAVEDL" = xyes; then + for ac_hdr in dlfcn.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2457: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +fi + + + if test "x$CPP_PATH" = x; then # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2364: checking for $ac_word" >&5 +echo "configure:2501: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2416,12 +2553,12 @@ EOF echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2420: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2557: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2437,7 +2574,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2458,12 +2595,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2462: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2599: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2472,7 +2609,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2497,17 +2634,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h\ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2501: checking for $ac_hdr" >&5 +echo "configure:2638: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2537,12 +2674,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2541: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2678: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2554,7 +2691,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2575,12 +2712,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2579: checking for working const" >&5 +echo "configure:2716: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2652,12 +2789,12 @@ fi #AC_TYPE_SIZE_T #AC_TYPE_PID_T echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2656: checking return type of signal handlers" >&5 +echo "configure:2793: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2674,7 +2811,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2700,15 +2837,16 @@ EOF INTLIBS="" +DLLIBS="" echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:2707: checking for gettext" >&5 +echo "configure:2845: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -2749,7 +2887,7 @@ if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2753: checking for gettext in -lintl" >&5 +echo "configure:2891: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2757,7 +2895,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2795,7 +2933,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2799: checking for $ac_word" >&5 +echo "configure:2937: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2901,7 +3039,7 @@ if test "$enable_kanji" = yes; then case $host_os in freebsd*) echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:2905: checking for setlocale in -lxpg4" >&5 +echo "configure:3043: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2909,7 +3047,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2976,6 +3114,9 @@ fi + + + # Check whether --enable-gnome or --disable-gnome was given. if test "${enable_gnome+set}" = set; then enableval="$enable_gnome" @@ -3040,7 +3181,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3044: checking for X" >&5 +echo "configure:3185: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3102,12 +3243,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3176,14 +3317,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3289,17 +3430,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3293: checking whether -R must be followed by a space" >&5 +echo "configure:3434: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3315,14 +3456,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3354,7 +3495,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3358: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3499: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3362,7 +3503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3395,7 +3536,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3399: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3540: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3403,7 +3544,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3443,12 +3584,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3447: checking for gethostbyname" >&5 +echo "configure:3588: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3492,7 +3633,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3496: checking for gethostbyname in -lnsl" >&5 +echo "configure:3637: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3500,7 +3641,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3541,12 +3682,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3545: checking for connect" >&5 +echo "configure:3686: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3590,7 +3731,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3594: checking for connect in -lsocket" >&5 +echo "configure:3735: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3598,7 +3739,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3633,12 +3774,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3637: checking for remove" >&5 +echo "configure:3778: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3682,7 +3823,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3686: checking for remove in -lposix" >&5 +echo "configure:3827: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3690,7 +3831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3725,12 +3866,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3729: checking for shmat" >&5 +echo "configure:3870: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -3774,7 +3915,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3778: checking for shmat in -lipc" >&5 +echo "configure:3919: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3782,7 +3923,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3826,7 +3967,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3830: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3971: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3834,7 +3975,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3891,7 +4032,7 @@ fi if test "$use_locale" = yes; then echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:3895: checking for _Xsetlocale in -lX11" >&5 +echo "configure:4036: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3899,7 +4040,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3962,7 +4103,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:3966: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:4107: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3970,7 +4111,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4022,7 +4163,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:4026: checking for XShmAttach in -lXext" >&5 +echo "configure:4167: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4030,7 +4171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4065,12 +4206,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:4069: checking for shmget" >&5 +echo "configure:4210: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -4142,7 +4283,7 @@ LIBPL="" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6 -echo "configure:4146: checking for PLGetString in -lPropList" >&5 +echo "configure:4287: checking for PLGetString in -lPropList" >&5 ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4150,7 +4291,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lPropList $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4190,17 +4331,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for proplist.h""... $ac_c" 1>&6 -echo "configure:4194: checking for proplist.h" >&5 +echo "configure:4335: checking for proplist.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4268,7 +4409,7 @@ if test "$xpm" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:4272: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:4413: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4276,7 +4417,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4317,17 +4458,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:4321: checking for X11/xpm.h" >&5 +echo "configure:4462: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4389,7 +4530,7 @@ if test "$png" = yes ; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:4393: checking for png_get_valid in -lpng" >&5 +echo "configure:4534: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4397,7 +4538,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4438,17 +4579,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:4442: checking for png.h" >&5 +echo "configure:4583: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4499,7 +4640,7 @@ if test "$jpeg" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4503: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:4644: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4507,7 +4648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4551,17 +4692,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:4555: checking for jpeglib.h" >&5 +echo "configure:4696: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4612,7 +4753,7 @@ if test "$gif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:4616: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:4757: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4620,7 +4761,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4662,7 +4803,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:4666: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:4807: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4670,7 +4811,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4715,17 +4856,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:4719: checking for gif_lib.h" >&5 +echo "configure:4860: checking for gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4786,7 +4927,7 @@ if test "$tif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:4790: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4931: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4794,7 +4935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4837,7 +4978,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:4841: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4982: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4845,7 +4986,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4889,7 +5030,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:4893: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:5034: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4897,7 +5038,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $ljpeg -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4943,17 +5084,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:4947: checking for tiffio.h" >&5 +echo "configure:5088: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5279,6 +5420,7 @@ s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@CPP_PATH@%$CPP_PATH%g s%@XGETTEXT@%$XGETTEXT%g +s%@DLLIBS@%$DLLIBS%g s%@INTLIBS@%$INTLIBS%g s%@NLSDIR@%$NLSDIR%g s%@MOFILES@%$MOFILES%g diff --git a/configure.in b/configure.in index 1ba57da2..c64d468a 100644 --- a/configure.in +++ b/configure.in @@ -98,6 +98,22 @@ AC_FUNC_VPRINTF AC_FUNC_ALLOCA AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit) + + +dnl Loading of dynamic libraries at runtime +dnl ======================================= +AC_CHECK_FUNC(dlopen, [HAVEDL="yes"], + AC_CHECK_LIB(dl, dlopen, [DLLIBS="-ldl" HAVEDL="yes"], + DLLIBS="" )) + +if test "x$HAVEDL" = xyes; then + AC_CHECK_HEADERS(dlfcn.h) +fi + + + +dnl Check CPP +dnl ========= if test "x$CPP_PATH" = x; then AC_PATH_PROG(CPP_PATH, cpp, notfound, $PATH:/lib:/usr/bin:/bin:/usr/lib:/usr/ccs/lib) @@ -153,6 +169,7 @@ dnl AM_GNU_GETTEXT INTLIBS="" +DLLIBS="" AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], @@ -260,6 +277,9 @@ if test "x$NLSDIR" = "x"; then fi fi + + +AC_SUBST(DLLIBS) AC_SUBST(INTLIBS) AC_SUBST(NLSDIR) AC_SUBST(MOFILES) diff --git a/doc/Makefile.in b/doc/Makefile.in index 35c5ff31..3252d12d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/po/Makefile.in b/po/Makefile.in index 67a8ed1d..c5b42f6e 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/po/README b/po/README index 868c4585..d597a589 100644 --- a/po/README +++ b/po/README @@ -23,6 +23,7 @@ ru.po Russian Alexey Vyskubov tr.po Turkish F. Kagan Gurkaynak fi.po Finnish Ville Hautamaki Ramin Miraftabi + Tomi Kajala hr.po Croatian 3 Toni Bilic el.po Greek Nikolaos Papagrigoriou pl.po Polish Piotr Dembiñski diff --git a/po/fi.po b/po/fi.po index d47b2ff9..22a571cd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,1024 +1,1370 @@ -# Finnish translation +# Finnish translation of Window Maker # Copyright (C) 1998 Free Software Foundation, Inc. -# Ramin Miraftabi , +# Ramin Miraftabi , # Ville Hautamäki , 1998. -# 0.17.5 -#, fuzzy +# +# Updates: Tomi Kajala , March 1999 +# msgid "" msgstr "" -"Date: 1998-07-27 10:09:09+0300\n" -"From: Ramin Miraftabi \n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Language-Team: Finnish \n" -"Xgettext-Options: --default-domain=WindowMaker --add-comments --keyword=_\n" -"Files: ../src/appicon.c ../src/defaults.c ../src/dialog.c ../src/dock.c ../src/event.c ../src/framewin.c ../src/icon.c ../src/main.c ../src/menu.c ../src/misc.c ../src/pixmap.c ../src/resources.c ../src/rootmenu.c ../src/screen.c ../src/session.c ../src/stacking.c ../src/startup.c ../src/switchmenu.c ../src/texture.c ../src/wdefaults.c ../src/winmenu.c ../src/winspector.c ../src/workspace.c ../src/xutil.c\n" - -#: ../src/appicon.c:542 ../src/dialog.c:273 ../src/dialog.c:329 ../src/dock.c:262 ../src/dock.c:3116 ../src/rootmenu.c:164 ../src/winspector.c:269 ../src/winspector.c:277 +"Project-Id-Version: Window Maker 0.51.2\n" +"PO-Revision-Date: 1999-03-16 05:14+02:00\n" +"Last-Translator: Tomi Kajala \n" +"Language-Team: Finnish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/appicon.c:509 ../src/dialog.c:216 ../src/dialog.c:272 +#: ../src/dock.c:3070 ../src/dockedapp.c:210 ../src/rootmenu.c:1741 +#: ../src/winspector.c:283 ../src/winspector.c:299 msgid "Error" msgstr "Virhe" -#: ../src/appicon.c:543 ../src/dock.c:263 ../src/winspector.c:278 +#: ../src/appicon.c:510 msgid "Could not open specified icon file" -msgstr "Ei voinut avata kuvaketiedostoa" +msgstr "Määritellyn ikonitiedoston avaus ei onnistunut" -#: ../src/appicon.c:564 ../src/dock.c:515 ../src/winmenu.c:85 -msgid "Kill Application" -msgstr "Tapa sovellus" +#: ../src/appicon.c:511 ../src/dialog.c:115 ../src/dialog.c:216 +#: ../src/dialog.c:272 ../src/dialog.c:460 ../src/dock.c:435 +#: ../src/dock.c:3071 ../src/dockedapp.c:210 ../src/dockedapp.c:354 +#: ../src/rootmenu.c:1745 ../src/winspector.c:284 ../src/winspector.c:300 +msgid "OK" +msgstr "OK" -#: ../src/appicon.c:565 ../src/dock.c:516 ../src/winmenu.c:86 +#: ../src/appicon.c:538 ../src/dock.c:278 msgid "" -"This will kill the application.\n" +" will be forcibly closed.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" -"Tämä tappaa ohjelman.\n" -"Kaikki tallettamattomat muutokset katoavat.\n" -"Varmista." +" suljetaan väkisin.\n" +"Kaikki tallentamattomat muutokset katoavat.\n" +"Vahvista." + +#: ../src/appicon.c:544 ../src/dock.c:283 ../src/winmenu.c:124 +msgid "Kill Application" +msgstr "Tapa sovellus" -#: ../src/appicon.c:580 ../src/dock.c:1147 +#: ../src/appicon.c:545 ../src/dock.c:284 ../src/winmenu.c:126 +msgid "Yes" +msgstr "Kyllä" + +#: ../src/appicon.c:545 ../src/dock.c:284 ../src/winmenu.c:126 +msgid "No" +msgstr "Ei" + +#: ../src/appicon.c:563 ../src/dock.c:1075 msgid "Unhide Here" msgstr "Palauta" -#: ../src/appicon.c:581 ../src/dock.c:1145 -msgid "(Un)Hide" -msgstr "Piilota/Palauta" +#: ../src/appicon.c:564 ../src/appicon.c:589 ../src/dock.c:1077 +#: ../src/dock.c:1079 ../src/dock.c:3196 ../src/dock.c:3198 +#: ../src/winmenu.c:447 +msgid "Hide" +msgstr "Piilota" -#: ../src/appicon.c:582 +#: ../src/appicon.c:565 msgid "Set Icon..." -msgstr "Määrittele kuvake..." +msgstr "Valitse kuvake..." -#: ../src/appicon.c:583 ../src/dock.c:1149 ../src/winmenu.c:248 +#: ../src/appicon.c:566 ../src/dock.c:1083 ../src/rootmenu.c:226 +#: ../src/rootmenu.c:240 ../src/winmenu.c:494 msgid "Kill" msgstr "Tapa" -#: ../src/defaults.c:565 ../src/screen.c:487 ../src/screen.c:567 ../src/screen.c:573 +#: ../src/appicon.c:587 ../src/dock.c:3194 +msgid "Unhide" +msgstr "Tuo näkyviin" + +#: ../src/defaults.c:760 ../src/startup.c:735 ../src/startup.c:753 +#: ../src/startup.c:759 +#, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "" -#: ../src/defaults.c:658 ../src/defaults.c:755 ../src/defaults.c:777 ../src/defaults.c:800 +#: ../src/defaults.c:806 ../src/defaults.c:930 ../src/defaults.c:969 +#: ../src/defaults.c:999 +#, c-format msgid "Domain %s (%s) of defaults database is corrupted!" -msgstr "ei voi muuntaa arvoa \"%s\" boolean arvoon millekkään avaimelle \"%s\"" +msgstr "Oletustietokannan kenttä %s (%s) on korruptoitunut!" -#: ../src/defaults.c:663 ../src/defaults.c:764 ../src/defaults.c:786 ../src/defaults.c:808 +#: ../src/defaults.c:811 ../src/defaults.c:951 ../src/defaults.c:982 +#: ../src/defaults.c:1008 +#, c-format msgid "could not load domain %s from user defaults database" -msgstr "ei voinut ladata arvoa %s käyttäjän alkuasetustietokannasta" +msgstr "arvon %s lataaminen käyttäjän oletustietokannasta ei onnistu" -#: ../src/defaults.c:674 +#: ../src/defaults.c:822 ../src/defaults.c:915 +#, c-format msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "arvo %s (%s) :n alkuasetustietokanssasta on korruptoitunut!" +msgstr "Arvo %s (%s) globaalista oletustietokannasta on vaurioutunut!" -#: ../src/defaults.c:691 +#: ../src/defaults.c:841 ../src/defaults.c:920 +#, c-format msgid "could not load domain %s from global defaults database" -msgstr "" +msgstr "arvon %s lataus globaalista oletustietokannasta ei onnistu" -#: ../src/defaults.c:1090 -msgid "can't convert \"%s\" to boolean for key \"%s\"" -msgstr "ei voi muuntaa \"%s\" boolean arvoon millekkään avaimelle \"%s\"" +#: ../src/defaults.c:1287 +#, c-format +msgid "wrong option value for key \"%s\". Should be one of %s" +msgstr "avaimella \"%s\" on väärä optioarvo. Pitäisi olla joku näistä: %s" -#: ../src/defaults.c:1095 ../src/defaults.c:1128 ../src/defaults.c:1160 ../src/defaults.c:1173 ../src/defaults.c:1188 ../src/defaults.c:1203 ../src/defaults.c:1274 ../src/defaults.c:1286 ../src/defaults.c:1345 ../src/defaults.c:1389 ../src/defaults.c:1431 ../src/defaults.c:1477 ../src/defaults.c:1696 ../src/defaults.c:1710 ../src/defaults.c:1743 ../src/defaults.c:1755 ../src/defaults.c:1767 ../src/defaults.c:1791 ../src/defaults.c:1809 ../src/defaults.c:1822 ../src/defaults.c:1835 ../src/defaults.c:1870 ../src/defaults.c:1908 ../src/defaults.c:1972 +#: ../src/defaults.c:1334 +#, c-format +msgid "can't convert \"%s\" to boolean for key \"%s\"" +msgstr "\"%s\":n muunto boolean-muotoon avaimelle \"%s\" ei onnistu" + +#: ../src/defaults.c:1339 ../src/defaults.c:1373 ../src/defaults.c:1405 +#: ../src/defaults.c:1418 ../src/defaults.c:1433 ../src/defaults.c:1447 +#: ../src/defaults.c:1519 ../src/defaults.c:1531 ../src/defaults.c:1879 +#: ../src/defaults.c:1896 ../src/defaults.c:1909 ../src/defaults.c:1942 +#: ../src/defaults.c:1958 ../src/defaults.c:1989 ../src/defaults.c:2078 +#, c-format msgid "using default \"%s\" instead" -msgstr "käyttää alkuarvoa \"%s\" sijasta" +msgstr "käytetään sensijaan oletusarvoa \"%s\"" -#: ../src/defaults.c:1125 +#: ../src/defaults.c:1370 +#, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" -msgstr "ei voi muuntaa \"%s\" kokonaislukua millekkään avaimelle \"%s\"" +msgstr "\"%s\":n muuntaminen kokonaisluvuksi avaimelle \"%s\" ei onnistu" -#: ../src/defaults.c:1155 ../src/defaults.c:1269 ../src/defaults.c:1691 ../src/defaults.c:1738 ../src/wdefaults.c:537 ../src/wdefaults.c:573 +#: ../src/defaults.c:1400 ../src/defaults.c:1514 ../src/defaults.c:1874 +#: ../src/defaults.c:1891 ../src/defaults.c:1937 ../src/defaults.c:1984 +#: ../src/wdefaults.c:546 ../src/wdefaults.c:582 +#, c-format msgid "Wrong option format for key \"%s\". Should be %s." -msgstr "Väärä muoto avaimella \"%s\". Pitäisi olla %s." +msgstr "Avaimella \"%s\" on väärä optiomuoto. Pitäisi olla %s." -#: ../src/defaults.c:1168 +#: ../src/defaults.c:1413 +#, c-format msgid "Incorrect number of elements in array for key \"%s\"." -msgstr "Väärä lukumäärä osia taulukossa avaimella \"%s\"." +msgstr "Taulukossa on väärä määrä alkioita availemme \"%s\"." -#: ../src/defaults.c:1183 +#: ../src/defaults.c:1428 +#, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." -msgstr "Väärä arvo avaimella \"%s\". Pitäisi olla koordinaatti" +msgstr "Avaimella \"%s\" on väärä arvo. Pitäisi olla koordinaatti." -#: ../src/defaults.c:1198 +#: ../src/defaults.c:1443 +#, c-format msgid "can't convert array to integers for \"%s\"." -msgstr "ei voi muuntaa taulukkoa kokonaisluvuksi \"%s\":lle." +msgstr "ei voi muuntaa taulukkoa kokonaisluvuiksi \"%s\":lle." -#: ../src/defaults.c:1337 -msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy." -msgstr "Väärä focusmoodi \"%s\". Pitäisi olla Manual, Auto tai Sloppy" - -#: ../src/defaults.c:1340 -msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto." -msgstr "Väärä colormap focusmoodi \"%s\". Pitäisi olla Manual tai Auto." - -#: ../src/defaults.c:1383 -msgid "Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or Manual." -msgstr "Väärä ikkunan sijoitusmoodi \"%s\". Pitäisi olla Auto, Cascade, Randomtai " -"Manual." - -#: ../src/defaults.c:1425 -msgid "Invalid geometry display type \"%s\". Should be Center, Corner, Floating or Line." -msgstr "Väärä geometria näyttötyyppi \"%s\". Pitäisi olla Center, Corner, Floating tai " -"Line." - -#: ../src/defaults.c:1472 -msgid "Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow." -msgstr "Väärä nopeus \"%s\". Pitäisi olla UltraFast, Fast, Medium, Slow tai UltraSlow." - -#: ../src/defaults.c:1538 ../src/defaults.c:1569 ../src/defaults.c:1581 ../src/defaults.c:1622 ../src/defaults.c:1658 +#: ../src/defaults.c:1640 ../src/defaults.c:1672 ../src/defaults.c:1688 +#: ../src/defaults.c:1734 ../src/defaults.c:1774 ../src/defaults.c:1812 +#: ../src/defaults.c:1828 +#, c-format msgid "\"%s\" is not a valid color name" -msgstr "\"%s\" ei ole kelvollinen värin nimi" +msgstr "\"%s\" ei käy värin nimeksi" -#: ../src/defaults.c:1550 +#: ../src/defaults.c:1653 msgid "bad number of arguments in gradient specification" -msgstr "virheellinen määrä argumentteja liukuvärjäyksen määrittelyssä" +msgstr "virheellinen määrä argumentteja liukuvärin määrittelyssä" -#: ../src/defaults.c:1596 +#: ../src/defaults.c:1707 msgid "too few arguments in multicolor gradient specification" -msgstr "liian vähän argumentteja monivärisen liukuvärjäyksen määrittelyssä" +msgstr "liian vähän argumentteja monivärisen liukuvärin määrittelyssä" -#: ../src/defaults.c:1705 -msgid "Error in texture specification for key \"%s\"" -msgstr "Virhe tekstuurin määrittelyssä avaimalla \"%s\"" +#: ../src/defaults.c:1801 +msgid "bad number of arguments in textured gradient specification" +msgstr "virheellinen määrä argumentteja liukuväritetyn kuvion määrittelyssä" -#: ../src/defaults.c:1751 ../src/defaults.c:1787 -msgid "Too few elements in array for key \"WorkspaceBack\"." -msgstr "Liian vähän elementtejä taulokossa avaimella \"WorkspaceBack\"." +#: ../src/defaults.c:1844 +#, c-format +msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" +msgstr "väärä peittävyysarvo kuvioliukuvärille \"%s\". Pitäisi olla [0..255]" -#: ../src/defaults.c:1763 -msgid "Wrong type for workspace background. Should be Texture." -msgstr "Väärän tyyppinen työtila taustakuva. Pitäisi olla tekstuuri." +#: ../src/defaults.c:1857 +#, c-format +msgid "invalid texture type %s" +msgstr "väärä kuviotyyppi %s" -#: ../src/defaults.c:1805 -msgid "Cannot get color entry for key \"WorkspaceBack\"." -msgstr "Ei ole värimääritystä avaimelle \"WorkspaceBack\"." - -#: ../src/defaults.c:1817 -msgid "key \"WorkspaceBack\" has invalid color \"%s\"" -msgstr "avaimella \"WorkspaceBack\" on väärä väri \"%s\"" - -#: ../src/defaults.c:1831 -msgid "Cannot get file entry for key \"WorkspaceBack\"." -msgstr "Ei ole tiedostoa avaimelle \"WorkspaceBack\"." - -#: ../src/defaults.c:1847 -msgid "could not run \"%s\"" -msgstr "ei voi käynnistää \"%s\"" - -#: ../src/defaults.c:1853 -msgid "could not find background image \"%s\"" -msgstr "en löydä taustakuvaa \"%s\"" +#: ../src/defaults.c:1904 +#, c-format +msgid "Error in texture specification for key \"%s\"" +msgstr "Virhe tekstuurin määrittelyssä avaimelle \"%s\"" -#: ../src/defaults.c:1866 -msgid "Error in texture specification for key \"WorkspaceBack\"" -msgstr "Virhe tekstuurin määrittelyssä avaimelle \"WorkspaceBack\"" +#: ../src/defaults.c:1954 +msgid "Wrong type for workspace background. Should be a texture type." +msgstr "Väärä tyyppi työtilan taustakuvaksi. Pitäisi olla tekstuuri." -#: ../src/defaults.c:1903 -msgid "Invalid justification type \"%s\". Should be Left, Center or Right" -msgstr "Väärä tasaustyyppi \"%s\". Pitäisi olla Vasen, Keskitetty tai Oikea" +#: ../src/defaults.c:2002 +#, c-format +msgid "Wrong type for background of workspace %i. Should be a texture." +msgstr "Väärä tyyppi työtilan %i taustakuvaksi. Pitäisi olla tekstuuri." -#: ../src/defaults.c:1937 -msgid "could not load any usable font" -msgstr "ei voinut ladata yhtään käyttökelpoista kirjasinlajia" +#: ../src/defaults.c:2043 +msgid "could not load any usable font!!!" +msgstr "minkään käyttökelpoisen fontin lataaminen ei onnistunut!!!" -#: ../src/defaults.c:1967 +#: ../src/defaults.c:2073 +#, c-format msgid "could not get color for key \"%s\"" msgstr "en löytänyt avainta \"%s\" vastaavaa väriä" -#: ../src/defaults.c:2026 -msgid "invalid key modifier \"%s\"" -msgstr "väärä avaimen muunnin \"%s\"" +#: ../src/defaults.c:2132 ../src/rootmenu.c:491 +#, c-format +msgid "%s:invalid key modifier \"%s\"" +msgstr "%s: vääränlainen key modifier \"%s\"" -#: ../src/defaults.c:2038 -msgid "invalid kbd shortcut specification \"%s\"" -msgstr "väärä näppäin oikopolku määrittely \"%s\"" +#: ../src/defaults.c:2144 +#, c-format +msgid "%s:invalid kbd shortcut specification \"%s\"" +msgstr "%s: vääränlainen näppäinpikavalinnan määrittely \"%s\"" -#: ../src/defaults.c:2044 -msgid "invalid key in shortcut \"%s\"" -msgstr "väärä avain näppäin oikopolussa \"%s\"" +#: ../src/defaults.c:2151 +#, c-format +msgid "%s:invalid key in shortcut \"%s\"" +msgstr "%s: epäkelpo näppäin oikopolussa \"%s\"" + +#: ../src/defaults.c:2177 +#, c-format +msgid "%s: modifier key %s is not valid" +msgstr "" -#: ../src/defaults.c:2138 +#: ../src/defaults.c:2253 msgid "could not render texture for icon background" msgstr "ei voi piirtää tekstuuria kuvakkeen taustalle" -#: ../src/defaults.c:2486 -msgid "could not render texture for workspace background" -msgstr "ei voi piirtää tekstuuria taustakuvaksi" - -#: ../src/dialog.c:81 ../src/dialog.c:93 ../src/dialog.c:176 ../src/dialog.c:505 ../src/dock.c:379 -msgid "OK" -msgstr "OK" - -#: ../src/dialog.c:81 ../src/dialog.c:86 ../src/dialog.c:176 ../src/dialog.c:512 ../src/dock.c:385 +#: ../src/dialog.c:115 ../src/dialog.c:467 ../src/dock.c:435 +#: ../src/dockedapp.c:360 ../src/rootmenu.c:188 ../src/rootmenu.c:226 +#: ../src/rootmenu.c:240 msgid "Cancel" -msgstr "Peru" +msgstr "Peruuta" -#: ../src/dialog.c:86 ../src/rootmenu.c:205 -msgid "Exit" -msgstr "Poistu" - -#: ../src/dialog.c:98 -msgid "Yes" -msgstr "Kyllä" - -#: ../src/dialog.c:98 -msgid "No" -msgstr "Ei" - -#: ../src/dialog.c:268 +#: ../src/dialog.c:211 msgid "Could not open directory " msgstr "Ei voi avata hakemistoa " -#: ../src/dialog.c:324 +#: ../src/dialog.c:267 msgid "Could not load image file " msgstr "Ei voi avata kuvatiedostoa " -#: ../src/dialog.c:449 +#: ../src/dialog.c:404 msgid "Directories" msgstr "Hakemistot" -#: ../src/dialog.c:458 +#: ../src/dialog.c:413 msgid "Icons" msgstr "Kuvakkeet" -#: ../src/dialog.c:495 +#: ../src/dialog.c:450 msgid "File Name:" -msgstr "Tiedoston nimi:" +msgstr "Tiedosto:" -#: ../src/dialog.c:518 +#: ../src/dialog.c:473 msgid "Choose File" msgstr "Valitse tiedosto" -#: ../src/dialog.c:528 +#: ../src/dialog.c:490 ../src/dialog.c:492 msgid "Icon Chooser" msgstr "Kuvakkeen valitsin" -#: ../src/dock.c:320 -msgid "Command Arguments" -msgstr "Ohjelman käynnistysparametrit" +#: ../src/dock.c:212 +#, c-format +msgid "Type the name for workspace %i:" +msgstr "Kirjoita nimi työtilalle %i:" -#: ../src/dock.c:331 -msgid "Command for files dropped by DND" -msgstr "Komento tiedostoille, jotka pudotettiin DND:llä" +#: ../src/dock.c:213 ../src/dock.c:1054 +msgid "Rename Workspace" +msgstr "Vaihda työtilan nimi" -#: ../src/dock.c:343 -msgid "%d will be replaced with the file name" -msgstr "%d korvataan tiedoston nimellä" - -#: ../src/dock.c:347 -msgid "DND support was not compiled in" -msgstr "tukea DND:lle ei käännetty mukaan" - -#: ../src/dock.c:353 -msgid "Icon" -msgstr "Kuvake" - -#: ../src/dock.c:365 ../src/winspector.c:1153 -msgid "Browse..." -msgstr "Selaa..." - -#: ../src/dock.c:373 -msgid "Launch this application automatically" -msgstr "Käynnistä tämä ohjelma automaattisesti" - -#: ../src/dock.c:399 -msgid "Docked Application Settings" -msgstr "Docatun ohjelman asetukset" - -#: ../src/dock.c:560 +#: ../src/dock.c:433 msgid "Workspace Clip" -msgstr "Työtilan Clip" +msgstr "Työtilan Liitin" -#: ../src/dock.c:561 +#: ../src/dock.c:434 msgid "All selected icons will be removed!" -msgstr "Kaikki valitut kuvakkeet poistetaan" +msgstr "Kaikki valitut kuvakkeet poistetaan!" -#: ../src/dock.c:610 +#: ../src/dock.c:481 msgid "Keep Icon" msgstr "Pidä kuvake" -#: ../src/dock.c:611 ../src/dock.c:2083 ../src/dock.c:2199 +#: ../src/dock.c:482 ../src/dock.c:1988 ../src/dock.c:2117 msgid "Type the command used to launch the application" msgstr "Kirjoita komento, jolla ohjelma käynnistetään" -#: ../src/dock.c:1005 +#: ../src/dock.c:867 +#, c-format +msgid "could not launch application %s\n" +msgstr "sovelluksen %s käynnistys ei onnistu\n" + +#: ../src/dock.c:922 msgid "could not create workspace submenu for Clip menu" -msgstr "Ei voinut luoda työtila alimenua Clip:lle" +msgstr "ei voinut luoda työtila-alimenua Liitin-valikolle" -#: ../src/dock.c:1063 +#: ../src/dock.c:985 msgid "could not create options submenu for Clip menu" -msgstr "ei voinut luoda asetukset alimenua Clip:lle" +msgstr "ei voinut luoda asetukset-alimenua Liitin-valikolle" -#: ../src/dock.c:1065 -msgid "Floating Clip" -msgstr "Leijuva Clip" +#: ../src/dock.c:989 ../src/dock.c:1043 ../src/winmenu.c:389 +msgid "Keep on top" +msgstr "Pidä päällimmäisenä" -#: ../src/dock.c:1071 +#: ../src/dock.c:995 msgid "Collapsed" msgstr "Häivytä" -#: ../src/dock.c:1077 +#: ../src/dock.c:1001 msgid "AutoCollapse" msgstr "AutoHäivytä" -#: ../src/dock.c:1083 +#: ../src/dock.c:1007 +msgid "AutoRaiseLower" +msgstr "Nosta automaattisesti" + +#: ../src/dock.c:1013 msgid "AutoAttract Icons" msgstr "Kerää kuvakkeet automaattisesti" -#: ../src/dock.c:1089 +#: ../src/dock.c:1019 msgid "Keep Attracted Icons" msgstr "Pidä kerätyt kuvakkeet" -#: ../src/dock.c:1113 -msgid "Floating Dock" -msgstr "Leijuva Dock" - -#: ../src/dock.c:1119 +#: ../src/dock.c:1049 msgid "Clip Options" -msgstr "Clip:in asetukset" +msgstr "Liittimen asetukset" -#: ../src/dock.c:1124 +#: ../src/dock.c:1056 msgid "(Un)Select Icon" -msgstr "(ei)Valitse kuvake" +msgstr "Ikonin valinta (pois)" -#: ../src/dock.c:1126 +#: ../src/dock.c:1058 msgid "(Un)Select All Icons" -msgstr "(ei)valitse kaikki kuvakkeet" +msgstr "Kaikkien ikonien valinta (pois)" -#: ../src/dock.c:1129 +#: ../src/dock.c:1061 msgid "Keep Icon(s)" msgstr "Pidä kuvakkeet" -#: ../src/dock.c:1131 +#: ../src/dock.c:1063 msgid "Move Icon(s) To" -msgstr "Siirrä kuvakkeet ..." +msgstr "Siirrä kuvakkeet..." -#: ../src/dock.c:1136 +#: ../src/dock.c:1068 msgid "Remove Icon(s)" msgstr "Poista kuvakkeet" -#: ../src/dock.c:1138 +#: ../src/dock.c:1070 msgid "Attract Icons" msgstr "Kerää kuvakkeet" -#: ../src/dock.c:1141 +#: ../src/dock.c:1073 msgid "Launch" msgstr "Käynnistä" -#: ../src/dock.c:1143 +#: ../src/dock.c:1081 msgid "Settings..." msgstr "Asetukset..." -#: ../src/dock.c:1593 ../src/dock.c:1607 ../src/dock.c:1616 +#: ../src/dock.c:1466 ../src/dock.c:1480 ../src/dock.c:1494 ../src/dock.c:1504 +#, c-format msgid "bad value in docked icon state info %s" -msgstr "virheellinen arvo dokatulla kuvakkeen tilalla %s " +msgstr "virheellinen arvo telakoidun kuvakkeen tiedolla %s " -#: ../src/dock.c:1624 +#: ../src/dock.c:1512 +#, c-format msgid "bad value in docked icon position %i,%i" -msgstr "virheellinen arvo dokatun kuvakkeen paikkassa %i,%i" +msgstr "virheellinen arvo telakoidun kuvakkeen paikassa %i,%i" -#: ../src/dock.c:1853 +#: ../src/dock.c:1755 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" -msgstr "on liian monta kuvaketta säilöttynä dokkiin. Unohdan ne jotka eivät mahdu" +msgstr "Dockissa on liian monta kuvaketta. Jätän pois ne jotka eivät mahdu" -#: ../src/dock.c:2082 ../src/dock.c:2198 +#. icon->forced_dock = 1; +#: ../src/dock.c:1987 ../src/dock.c:2116 msgid "Dock Icon" -msgstr "Dokkaa kuvake" +msgstr "Telakoi kuvake" -#: ../src/dock.c:3109 ../src/dock.c:3113 +#: ../src/dock.c:3063 ../src/dock.c:3067 +#, c-format msgid "Could not execute command \"%s\"" -msgstr "Ei voi ajaa komentoa \"%s\"" +msgstr "Komennon \"%s\" suoritus ei onnistunut" + +#: ../src/dockedapp.c:130 +#, c-format +msgid "could not find icon %s, used in a docked application" +msgstr "telakoidussa sovelluksessa käytettävää ikonia %s ei löydy" + +#: ../src/dockedapp.c:209 +#, c-format +msgid "Could not open specified icon file:%s" +msgstr "Määritellyn kuvaketiedoston %s lataus ei onnistu" + +#: ../src/dockedapp.c:295 +msgid "Start when WindowMaker is started" +msgstr "Käynnistä, kun WMaker käynnistetään" + +#: ../src/dockedapp.c:302 +msgid "Application path and arguments" +msgstr "Sovelluksen polku ja argumentit" + +#: ../src/dockedapp.c:313 +msgid "Command for files dropped with DND" +msgstr "Komento tiedostoille, jotka pudotetaan DND:llä" + +#: ../src/dockedapp.c:325 +#, c-format +msgid "%d will be replaced with the file name" +msgstr "%d korvataan tiedoston nimellä" -#: ../src/event.c:429 -msgid "stack overflow: too many dead processes" -msgstr "pinon ylivuoto: liian monta kuollutta prosessia" +#: ../src/dockedapp.c:329 +msgid "DND support was not compiled in" +msgstr "tukea DND:lle ei käännetty mukaan" + +#: ../src/dockedapp.c:335 +msgid "Icon Image" +msgstr "Kuvake" + +#: ../src/dockedapp.c:347 ../src/winspector.c:1250 +msgid "Browse..." +msgstr "Selaa..." -#: ../src/framewin.c:515 +#: ../src/dockedapp.c:392 +msgid "Docked Application Settings" +msgstr "Telakoidun ohjelman asetukset" + +#: ../src/framewin.c:489 +#, c-format msgid "could not render gradient: %s" -msgstr "ei voi piirtää liukuvärjäystä: %s" +msgstr "ei voi piirtää liukuväriä: %s" -#: ../src/framewin.c:531 ../src/framewin.c:546 ../src/framewin.c:557 ../src/framewin.c:564 ../src/framewin.c:571 ../src/icon.c:282 ../src/texture.c:503 +#: ../src/framewin.c:505 ../src/framewin.c:520 ../src/framewin.c:531 +#: ../src/framewin.c:538 ../src/framewin.c:545 ../src/icon.c:296 +#: ../src/texture.c:578 +#, c-format msgid "error rendering image:%s" -msgstr "virhe piirtäessä kuvaa: %s" +msgstr "virhe piirtäessä kuvaa:%s" + +#: ../src/icon.c:182 ../src/wdefaults.c:416 +#, c-format +msgid "error loading image file \"%s\"" +msgstr "virhe ladattaessa kuvaa \"%s\"" -#: ../src/icon.c:545 +#: ../src/icon.c:423 ../src/icon.c:432 +#, c-format +msgid "could not create directory %s" +msgstr "hakemiston %s luonti ei onnistunut" + +#: ../src/icon.c:699 +#, c-format msgid "could not find default icon \"%s\"" -msgstr "ei voi löytää oletusarvokuvaketta \"%s\"" +msgstr "Oletuskuvaketta \"%s\" ei löydy" + +#: ../src/icon.c:705 +#, c-format +msgid "could not load default icon \"%s\":%s" +msgstr "ei voi ladata oletuskuvaketta \"%s\":%s" -#: ../src/icon.c:552 -msgid "could not load default icon \"%s\"" -msgstr "ei voi ladata oletusarvokuvaketta \"%s\"" +#: ../src/main.c:195 +msgid "could not exec window manager" +msgstr "ikkunamanagerin käynnistys ei onnistunut" -#: ../src/main.c:163 +#: ../src/main.c:196 msgid "Restart failed!!!" -msgstr "Uudelleen käynnistys epäonnistui!!!" +msgstr "Uudelleenkäynnistys epäonnistui!!!" -#: ../src/main.c:178 +#: ../src/main.c:243 +#, c-format msgid "%s aborted.\n" -msgstr "%s lopettu.\n" +msgstr "%s keskeytetty.\n" -#: ../src/main.c:189 -msgid "usage: %s [-options]\n" -msgstr "käyttö: %s [-asetuket]\n" +#: ../src/main.c:254 +#, c-format +msgid "Usage: %s [options]\n" +msgstr "käyttö: %s [optiot]\n" -#: ../src/main.c:190 -msgid "options:" -msgstr "asetukset:" +#: ../src/main.c:255 +msgid "The Window Maker window manager for the X window system" +msgstr "Window Maker-ikkunamanageri X-ikkunointijärjestelmälle" -#: ../src/main.c:192 -msgid " -nocpp \t\tdisable preprocessing of configuration files" -msgstr " -nocpp \t\tota pois käytöstä konfiguraatiotiedostojen esikäsittely" +#: ../src/main.c:257 +msgid " -display host:dpy\tdisplay to use" +msgstr "" -#: ../src/main.c:194 -msgid " -nodock\t\tdo not open the application Dock" -msgstr " -nodock\t\tälä avaa dokkia" +#: ../src/main.c:259 +msgid " --no-cpp \t\tdisable preprocessing of configuration files" +msgstr " --no-cpp \t\tkonfiguraatiotiedostojen esiprosessointi pois käytöstä" -#: ../src/main.c:195 -msgid " -noclip\t\tdo not open the workspace Clip" -msgstr " -noclip\t\tälä avaa clippiä" +#: ../src/main.c:261 +msgid " --no-dock\t\tdo not open the application Dock" +msgstr " --no-dock\t\tälä avaa Dockia" + +#: ../src/main.c:262 +msgid " --no-clip\t\tdo not open the workspace Clip" +msgstr " --no-clip\t\tälä avaa työtila-liitintä" #. -#. puts(_(" -locale locale locale to use")); +#. puts(_(" --locale locale locale to use")); #. -#: ../src/main.c:199 -msgid " -visualid visualid\tvisual id of visual to use" -msgstr " -visualid visualid\tkäytettävän visualin id" +#: ../src/main.c:266 +msgid " --visual-id visualid\tvisual id of visual to use" +msgstr " --visual-id visualid\tkäytettävä visual id" -#: ../src/main.c:200 -msgid " -display host:dpy\tdisplay to use" -msgstr " -display käytettävä host:dpy\tdisplay" +#: ../src/main.c:267 +msgid " --static\t\tdo not update or save configurations" +msgstr "" -#: ../src/main.c:201 -msgid " -version\t\tprint version and exit" -msgstr " -version\t\ttulosta versio ja poistu" +#: ../src/main.c:268 +msgid " --version\t\tprint version and exit" +msgstr " --version\t\ttulosta versio ja poistu" -#: ../src/main.c:216 -msgid "could not determine home directory" -msgstr "ei voi määritellä kotihakemistoa" +#: ../src/main.c:269 +msgid " --help\t\t\tshow this message" +msgstr "" -#: ../src/main.c:226 +#: ../src/main.c:281 +#, c-format msgid "" -"could not find user GNUstep directory.\n" -"Make sure you have installed WindowMaker correctly and run wmaker.inst" +"could not find user GNUstep directory (%s).\n" +"Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" -"ei voi määritellä käyttäjän GNUstep hakemistoa.\n" -"Tarkista, että olet asentanut WindowMaker:in oikein ja että olet ajanut wmaker.inst:in" +"käyttäjän GNUstep-hakemistoa (%s) ei löydy.\n" +"Tarkista, että olet asentanut Window Makerin oikein ja ajanut komennon wmaker.inst" -#: ../src/main.c:246 +#: ../src/main.c:300 +#, c-format msgid "%s:could not execute initialization script" -msgstr "%s:ei voi ajaa käynnistys skriptaa" +msgstr "%s:ei voi suorittaa käynnistysskriptiä" -#: ../src/main.c:298 ../src/main.c:305 ../src/main.c:312 +#: ../src/main.c:317 +#, c-format +msgid "%s:could not execute exit script" +msgstr "%s:lopetusskriptin suoritus ei onnistu" + +#: ../src/main.c:378 ../src/main.c:385 ../src/main.c:393 ../src/main.c:409 +#, c-format msgid "too few arguments for %s" msgstr "liian vähän argumentteja %s:lle" -#: ../src/main.c:316 +#: ../src/main.c:397 +#, c-format msgid "bad value for visualid: \"%s\"" -msgstr "väärä arvo visualidlle: \"%s\"" +msgstr "väärä arvo visualid:lle: \"%s\"" + +#: ../src/main.c:417 +#, c-format +msgid "%s: invalid argument '%s'\n" +msgstr "%s: argumentti '%s' ei kelpaa\n" + +#: ../src/main.c:418 +#, c-format +msgid "Try '%s --help' for more information\n" +msgstr "Kirjoita '%s --help' saadaksesi lisätietoa\n" -#: ../src/main.c:361 +#: ../src/main.c:461 msgid "X server does not support locale" -msgstr "X server ei tue ympäristöä" +msgstr "X-palvelin ei tue localea" -#: ../src/main.c:364 +#: ../src/main.c:464 msgid "cannot set locale modifiers" -msgstr "ei voi asettaa ympäristön muuntimia" +msgstr "" -#: ../src/main.c:378 +#: ../src/main.c:481 +#, c-format msgid "could not open display \"%s\"" msgstr "ei voi avata näyttöä \"%s\"" -#: ../src/menu.c:281 +#: ../src/menu.c:285 msgid "wrealloc() failed while trying to add menu item" msgstr "wrealloc() epäonnistui yrittäessään lisätä valikon kohdan" -#: ../src/misc.c:70 +#: ../src/misc.c:69 +#, c-format msgid "could not define value for %s for cpp" msgstr "ei voinut määrittää arvoa %s cpp:lle" -#: ../src/misc.c:100 +#: ../src/misc.c:99 +#, c-format msgid "could not get password entry for UID %i" -msgstr "ei saanut salasanaa käyttäjälle %i" +msgstr "ei saanut salasanatietoa käyttäjästä, jonka UID on %i" -#: ../src/misc.c:124 +#: ../src/misc.c:123 +#, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "koneesi on konfiguroity väärin. HOSTNAME on asetettu %s:ksi" -#: ../src/misc.c:130 +#: ../src/misc.c:129 +#, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "koneesi on konfiguroity väärin. HOST on asetettu %s:ksi" -#: ../src/misc.c:701 +#: ../src/misc.c:770 msgid "selection timed-out" -msgstr "valinta poistettu käyttämättömänä" +msgstr "valinta on vanhentunut" -#: ../src/misc.c:715 +#: ../src/misc.c:786 msgid "Program Arguments" -msgstr "Ohjelman parametrit" +msgstr "Ohjelman argumentit" -#: ../src/misc.c:734 +#: ../src/misc.c:787 msgid "Enter command arguments:" -msgstr "Syötä komentoriviparametrit:" +msgstr "Syötä komentoriviargumentit:" -#: ../src/misc.c:755 +#: ../src/misc.c:885 msgid "unable to get dropped data from DND drop" -msgstr "ei saa pudotettua dataa DND pudotuksesta" +msgstr "DND:llä tiputetun datan välitys ei onnistunut" -#: ../src/misc.c:763 +#: ../src/misc.c:893 msgid "error getting dropped data from DND drop" -msgstr "virhe pudotetun datan vastaanotossa DND pudotukselta" +msgstr "virhe DND:llä pudotetun datan vastaanotossa" -#: ../src/misc.c:769 +#: ../src/misc.c:899 msgid "out of memory while getting data from DND drop" -msgstr "muisti loppui DND pudotuksen dataa vastaanotettaessa" +msgstr "muisti loppui vastaanotettaessa DND:llä pudotettua dataa" -#: ../src/misc.c:813 ../src/misc.c:932 +#: ../src/misc.c:944 ../src/misc.c:1079 +#, c-format msgid "out of memory during expansion of \"%s\"" -msgstr "muisti loppui %s:ää laajennettaessa" +msgstr "muisti loppui \"%s\":n lavennuksen aikana" -#: ../src/misc.c:867 +#: ../src/misc.c:998 msgid "out of memory during expansion of \"%w\"" -msgstr "muisti loppui %w:ää laajennettaessa" +msgstr "muisti loppui \"%w\":n lavennuksen aikana" + +#: ../src/misc.c:1016 +msgid "out of memory during expansion of \"%W\"" +msgstr "muisti loppui \"%W\":n lavennuksen aikana" -#: ../src/misc.c:886 +#: ../src/misc.c:1032 msgid "out of memory during expansion of \"%a\"" -msgstr "muisti loppui %a:ää laajennettaessa" +msgstr "muisti loppui \"%a\":n lavennuksen aikana" -#: ../src/misc.c:908 +#: ../src/misc.c:1058 +#, c-format msgid "out of memory during expansion of \"%d\"" -msgstr "muisti loppui %d:ää laajennettaessa" +msgstr "muisti loppui \"%d\":n lavennuksen aikana" -#: ../src/misc.c:920 +#: ../src/misc.c:1072 msgid "selection not available" msgstr "valintaa ei ole saatavilla" -#: ../src/misc.c:998 ../src/misc.c:1004 +#: ../src/misc.c:1144 ../src/misc.c:1150 +#, c-format msgid "bad window name value in %s state info" -msgstr "epäkelpo ikkunan nimi %s tilatiedoissa" +msgstr "kelpaamaton ikkunan nimi %s tilatiedoissa" + +#: ../src/misc.c:1405 +msgid "could not send message to background image helper" +msgstr "viestin lähetys taustakuva-apurille epäonnistui" #: ../src/pixmap.c:235 +#, c-format msgid "could not load mask bitmap file \"%s\". Won't use mask" -msgstr "ei voinut ladata naamio-bittiakarttaa \"%a\". Naamiota ei käytetä" +msgstr "maski-bittikarttatiedostoa \"%s\" ei voitu ladata. Maskia ei käytetä" + +#: ../src/proplist.c:180 +msgid "unterminated string" +msgstr "terminoimaton merkkijono" + +#: ../src/proplist.c:247 +msgid "unterminated array" +msgstr "terminoimaton taulukko" + +#: ../src/proplist.c:256 +msgid "missing , in array or unterminated array" +msgstr "" + +#: ../src/proplist.c:267 +msgid "could not get array element" +msgstr "taulukon alkiota ei saatu" + +#: ../src/proplist.c:297 +msgid "unterminated dictionary" +msgstr "terminoimaton hakemisto" + +#: ../src/proplist.c:315 +msgid "missing dictionary key" +msgstr "hakemistoavain puuttuu" + +#: ../src/proplist.c:317 +msgid "missing dictionary entry key or unterminated dictionary" +msgstr "" + +#: ../src/proplist.c:323 +msgid "error parsing dictionary key" +msgstr "virhe hakemistoavainta jäsennettäessä" + +#: ../src/proplist.c:332 +msgid "missing = in dictionary entry" +msgstr "hakemistomerkinnästä puuttuu =" + +#: ../src/proplist.c:351 +msgid "missing ; in dictionary entry" +msgstr "hakemistomerkinnästä puuttuu ;" + +#: ../src/proplist.c:432 +msgid "was expecting a string, dictionary, data or array." +msgstr "odotettiin merkkijonoa, sanakirjaa, dataa tai taulukkoa." + +#: ../src/proplist.c:434 +msgid "Comments are not allowed inside WindowMaker owned domain files." +msgstr "Kommentit eivät ole sallittuja Window Makerille kuuluvissa tiedostoissa." + +#: ../src/proplist.c:453 +#, c-format +msgid "could not open domain file %s" +msgstr "" + +#: ../src/proplist.c:466 +msgid "extra data after end of file" +msgstr "ylimääräistä dataa tiedoston lopun perässä" #: ../src/resources.c:71 -msgid "The following character sets are missing:" -msgstr "Seuraavat merkistöt puuttuvat" +#, c-format +msgid "The following character sets are missing in %s:" +msgstr "Seuraavat merkistöt puuttuvat \"%s\":sta:" -#: ../src/resources.c:75 +#: ../src/resources.c:76 +#, c-format msgid "The string \"%s\" will be used in place" msgstr "Merkkijonoa \"%s\" käytetään" -#: ../src/resources.c:77 +#: ../src/resources.c:78 msgid "of any characters from those sets." msgstr "merkistöistä puuttuvien merkkien sijaan." -#: ../src/resources.c:80 +#: ../src/resources.c:81 +#, c-format msgid "could not create font set %s. Trying fixed" msgstr "ei voinut luoda kirjasinlajia %s. Kokeillaan fixed:iä" -#: ../src/resources.c:97 +#: ../src/resources.c:98 +#, c-format msgid "could not load font %s. Trying fixed" msgstr "ei voinut avata kirjasinlajia %s. Kokeillaan fixed:iä" -#: ../src/resources.c:135 +#: ../src/resources.c:136 +#, c-format msgid "could not parse color \"%s\"" msgstr "ei voinut käsitellä väriä \"%s\"" -#: ../src/resources.c:139 +#: ../src/resources.c:140 +#, c-format msgid "could not allocate color \"%s\"" msgstr "ei voinut varata väriä \"%s\"" -#: ../src/rootmenu.c:162 -msgid "Program \"%s\" not found or cannot be executed." -msgstr "Ohjelmaa \"%s\" ei löytynyt tai sitä ei voitu ajaa." +#: ../src/rootmenu.c:186 ../src/rootmenu.c:188 +msgid "Exit" +msgstr "Poistu" -#: ../src/rootmenu.c:206 +#: ../src/rootmenu.c:187 msgid "Exit window manager?" msgstr "Poistutaanko ikkunointijärjestelmästä?" -#: ../src/rootmenu.c:226 +#: ../src/rootmenu.c:223 msgid "Close X session" -msgstr "Sulje X yhteys" +msgstr "Sulje X-istunto" -#: ../src/rootmenu.c:227 +#: ../src/rootmenu.c:224 msgid "" "Close Window System session?\n" -"(all applications will be closed)" +"Kill might close applications with unsaved data." msgstr "" -"Suljetaanko ikkunointijärjestelmän istunnosta?\n" -"(kaikki sovellukset suljetaan)" +"Suljetaanko ikkunointijärjestelmän istunto?\n" +"Kaikki sovellukset, joissa on tallettamatonta dataa, voivat sulkeutua." -#: ../src/rootmenu.c:229 -msgid "Exiting...\n" -msgstr "Poistutaan...\n" +#. +#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); +#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); +#. +#: ../src/rootmenu.c:226 ../src/winmenu.c:487 +msgid "Close" +msgstr "Sulje" -#: ../src/rootmenu.c:428 -msgid "%s:invalid key modifier \"%s\"" -msgstr "%s: epäkelpo näppäin \"%s\"" +#: ../src/rootmenu.c:237 +msgid "Kill X session" +msgstr "Sulje X-istunto" -#: ../src/rootmenu.c:442 -msgid "%s:invalid kbd shortcut specification \"%s\"" -msgstr "%s: epäkelpo näppäin oikopolun määritys \"%s\"" +#: ../src/rootmenu.c:238 +msgid "" +"Kill Window System session?\n" +"(all applications will be closed)" +msgstr "" +"Tapetaanko ikkunointijärjestelmän istusto?\n" +"(kaikki ohjelmat suljetaan)" -#: ../src/rootmenu.c:450 -msgid "%s:invalid key in shortcut \"%s\"" -msgstr "%s: epäkelpo näppäin oikopolussa \"%s\"" +#: ../src/rootmenu.c:504 +#, c-format +msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" +msgstr "%s: vääränlainen näppäinpikavalinnan määrittely \"%s\" tiedolle %s" -#: ../src/rootmenu.c:503 +#: ../src/rootmenu.c:512 +#, c-format +msgid "%s:invalid key in shortcut \"%s\" for entry %s" +msgstr "%s: vääränlainen näppäin pikavalinnassa \"%s\" kentälle %s" + +#: ../src/rootmenu.c:565 +#, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: paria merkille '\"' ei löydy valikkotiedostosta" -#: ../src/rootmenu.c:552 +#: ../src/rootmenu.c:615 +#, c-format msgid "%s: missing command" msgstr "%s: puuttuva komento" -#: ../src/rootmenu.c:585 +#: ../src/rootmenu.c:648 +#, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "epäkelpo OPEN_MENU määritys: %s" -#: ../src/rootmenu.c:650 +#: ../src/rootmenu.c:696 +#, c-format msgid "%s:could not stat menu" msgstr "%s: valikolta ei saatu stat-tietoja" -#: ../src/rootmenu.c:658 -msgid "%s:could not stat menu :%s" -msgstr "%s: valikolta %s ei saatu stat-tietoja" +#: ../src/rootmenu.c:704 +#, c-format +msgid "%s:could not stat menu:%s" +msgstr "" -#: ../src/rootmenu.c:676 +#: ../src/rootmenu.c:722 +#, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "liian monta parametria OPEN_MENUssa: %s" -#: ../src/rootmenu.c:712 -msgid "There are more than one WORKSPACE_MENU commands in the applications menu. Only one is allowed." -msgstr "Sovellukset valikossa on enemmän kuin yksi WORKSPACE_MENU määritys. Vain yksi on sallittu." +#: ../src/rootmenu.c:758 +msgid "" +"There are more than one WORKSPACE_MENU commands in the applications menu. " +"Only one is allowed." +msgstr "" +"Sovellukset valikossa on enemmän kuin yksi WORKSPACE_MENU määritys. Vain " +"yksi on sallittu." -#: ../src/rootmenu.c:741 ../src/rootmenu.c:764 +#: ../src/rootmenu.c:787 ../src/rootmenu.c:805 +#, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s: puuttuva parametri valikkokomennolla \"%s\"" -#: ../src/rootmenu.c:827 +#: ../src/rootmenu.c:868 +#, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s: tuntematon komento \"%s\" valikon määrityksessä." -#: ../src/rootmenu.c:835 +#: ../src/rootmenu.c:876 +#, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s: ei voi lisätä oikopolkua kohdalle \"%s\"" -#: ../src/rootmenu.c:971 +#: ../src/rootmenu.c:1013 +#, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s: rivin pituus ylittää suurimman sallitun valikon määrityksessä: %s" -#: ../src/rootmenu.c:993 ../src/rootmenu.c:1085 ../src/rootmenu.c:1185 +#: ../src/rootmenu.c:1035 ../src/rootmenu.c:1127 ../src/rootmenu.c:1228 +#, c-format msgid "%s:missing command in menu config: %s" msgstr "%s: komento puuttuu valikon määrityksessä: %s" -#: ../src/rootmenu.c:1023 +#: ../src/rootmenu.c:1065 +#, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s: valikon määrityksen syntaksissa virhe: END määre puuttuu" -#: ../src/rootmenu.c:1052 ../src/rootmenu.c:1150 +#: ../src/rootmenu.c:1094 ../src/rootmenu.c:1193 msgid "could not make arguments for menu file preprocessor" msgstr "ei voinut tehdä parametreja valikkotiedoston esikäsittelijälle" -#: ../src/rootmenu.c:1058 ../src/rootmenu.c:1157 +#: ../src/rootmenu.c:1100 ../src/rootmenu.c:1200 +#, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s: ei voinut avata/esikäsitellä valikkotiedostoa" -#: ../src/rootmenu.c:1070 ../src/rootmenu.c:1170 +#: ../src/rootmenu.c:1112 ../src/rootmenu.c:1213 +#, c-format msgid "%s:could not open menu file" msgstr "%s: ei voinut avata valikkotiedostoa" -#: ../src/rootmenu.c:1097 -msgid "%s:invalid menu file" -msgstr "%s: epäkelpo valikkotiedosto" +#: ../src/rootmenu.c:1139 +#, c-format +msgid "%s:invalid menu file. MENU command is missing" +msgstr "%s:virheellinen valikkotiedosto. MENU-komento puuttuu." -#: ../src/rootmenu.c:1105 +#: ../src/rootmenu.c:1148 msgid "error reading preprocessed menu data" msgstr "virhe luettaessa esikäsiteltyä valikkodataa" -#: ../src/rootmenu.c:1197 +#: ../src/rootmenu.c:1240 +#, c-format msgid "%s:no title given for the root menu" msgstr "%s: juurivalikolle ei ole annettu nimeä" -#: ../src/rootmenu.c:1251 ../src/rootmenu.c:1314 ../src/rootmenu.c:1358 +#: ../src/rootmenu.c:1323 ../src/rootmenu.c:1390 ../src/rootmenu.c:1434 +#, c-format msgid "out of memory while constructing directory menu %s" msgstr "muisti loppui luotaessa hakemistovalikkoa %s" -#: ../src/rootmenu.c:1261 +#: ../src/rootmenu.c:1333 +#, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s: tiedostolta \"%s\" ei saatu stat-tietoja valikkohakemistossa" -#: ../src/rootmenu.c:1407 +#: ../src/rootmenu.c:1488 msgid "Commands" msgstr "Komennot" -#: ../src/rootmenu.c:1409 +#: ../src/rootmenu.c:1491 +msgid "Restart" +msgstr "Käynnistä uudelleen" + +#: ../src/rootmenu.c:1492 msgid "Exit..." msgstr "Poistu..." -#: ../src/rootmenu.c:1465 -msgid "%s:could not find menu file \"%s\"" -msgstr "%s: valikkotiedostoa \"%s\" ei löytynyt" +#: ../src/rootmenu.c:1537 +#, c-format +msgid "could not find menu file \"%s\" referenced in WMRootMenu" +msgstr "WMRootMenussa mainittua valikkotiedostoa \"%s\" ei löydy" + +#: ../src/rootmenu.c:1544 +#, c-format +msgid "could not access menu \"%s\" referenced in WMRootMenu" +msgstr "WMRootMenussa mainittua valikkoa \"%s\" ei saada käyttöön" -#: ../src/rootmenu.c:1472 -msgid "%s:could not access menu \"%s\"" -msgstr "%s: valikkoa \"%s\" ei voitu käsitellä" +#: ../src/rootmenu.c:1555 +#, c-format +msgid "" +"using default menu file \"%s\" as the menu referenced in WMRootMenu could " +"not be found " +msgstr "käytetään oletusvalikkoa \"%s\", koska WMRootMenussa mainittua valikkoa ei löydy" -#: ../src/rootmenu.c:1498 ../src/rootmenu.c:1545 +#: ../src/rootmenu.c:1578 ../src/rootmenu.c:1654 +#, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s: muotoiluvirhe juurivalikon määrityksessä \"%s\"" -#: ../src/screen.c:110 -msgid "it seems that there already is a window manager running" -msgstr "jokin ikkunointijärjestelmä näyttäisi olevan käynnissä" +#: ../src/rootmenu.c:1742 +msgid "" +"The applications menu could not be loaded.Look at the console output for a " +"detaileddescription of the errors" +msgstr "Sovellusvalikkoa ei voitu ladata. Katso konsolitulostetta saadaksesi tarkemman kuvauksen virheistä." -#: ../src/screen.c:364 +#: ../src/screen.c:428 msgid "could not load logo image for panels" msgstr "panelien logo-kuvaa ei voitu ladata" -#: ../src/screen.c:367 +#: ../src/screen.c:431 +#, c-format msgid "error making logo image for panel:%s" msgstr "virhe panelin %s logon luonnissa" -#: ../src/screen.c:532 +#: ../src/screen.c:695 +#, c-format msgid "could not initialize graphics library context: %s" msgstr "graafisen kirjaston kontekstia %s ei voitu alustaa" -#: ../src/session.c:113 ../src/wdefaults.c:555 ../src/winspector.c:322 +#: ../src/screen.c:726 +msgid "could not do initialization of WINGs widget set" +msgstr "" + +#: ../src/screen.c:1058 +#, c-format +msgid "could not save session state in %s" +msgstr "istunnon tilan talletus -> %s ei onnistunut" + +#: ../src/session.c:182 ../src/wdefaults.c:564 ../src/winspector.c:347 +#, c-format msgid "can't convert \"%s\" to boolean" -msgstr "\"%s\":ää ei voida muuttaa totuusarvoksi (boolean)" +msgstr "\"%s\":ää ei voida muuttaa boolean-tyyppiseksi" -#: ../src/stacking.c:88 +#: ../src/session.c:873 +msgid "out of memory while saving session state" +msgstr "muisti loppui istunnon tilaa talletettaessa" + +#: ../src/session.c:964 +msgid "end of memory while saving session state" +msgstr "muisti loppui istunnon tilaa talletettaessa" + +#. This is not fatal but can mean the session manager exited. +#. * If the session manager exited normally we would get a +#. * Die message, so this probably means an abnormal exit. +#. * If the sm was the last client of session, then we'll die +#. * anyway, otherwise we can continue doing our stuff. +#. +#: ../src/session.c:1098 +msgid "connection to the session manager was lost" +msgstr "yhteys session manageriin menetettiin" + +#: ../src/stacking.c:72 msgid "could not get window list!!" -msgstr "ikkunaluetteloa ei saatu" +msgstr "ikkunaluetteloa ei saatu!!" -#: ../src/startup.c:149 +#: ../src/startup.c:195 +#, c-format msgid "internal X error: %s\n" -msgstr "sisäinen X virhe: %s\n" +msgstr "sisäinen X-virhe: %s\n" -#: ../src/startup.c:189 +#: ../src/startup.c:259 +#, c-format msgid "got signal %i (%s) - restarting\n" msgstr "vastaanotettu signaali %i (%s) - käynnistetään uudelleen\n" -#: ../src/startup.c:191 +#: ../src/startup.c:261 +#, c-format msgid "got signal %i - restarting\n" msgstr "vastaanotettu signaali %i - käynnistetään uudelleen\n" -#: ../src/startup.c:198 -msgid "%s: Received signal SIGTERM. Exiting..." -msgstr "%s: vastaanotettu signaali SIGTERM. Poistutaan..." +#: ../src/startup.c:276 +#, c-format +msgid "got signal %i (%s) - exiting...\n" +msgstr "vastaanotettu signaali %i (%s) - poistutaan...\n" + +#: ../src/startup.c:278 +#, c-format +msgid "got signal %i - exiting...\n" +msgstr "vastaanotettu signaali %i - poistutaan...\n" -#: ../src/startup.c:207 +#: ../src/startup.c:291 +#, c-format msgid "got signal %i (%s)\n" msgstr "vastaanotettu signaali %i (%s)\n" -#: ../src/startup.c:209 +#: ../src/startup.c:293 +#, c-format msgid "got signal %i\n" msgstr "vastaanotettu signaali %i\n" +#: ../src/startup.c:299 +msgid "" +"crashed while trying to do some post-crash cleanup. Aborting immediatelly." +msgstr "" + +#: ../src/startup.c:310 +msgid "" +"a fatal error has occured, probably due to a bug. Please fill the included " +"BUGFORM and report it." +msgstr "vakava virhe on tapahtunut, luultavasti bugin johdosta. Ole hyvä ja täytä oheinen BUGFORM ja lähetä se." + #. restart another window manager so that the X session doesn't #. * go to space -#: ../src/startup.c:218 +#: ../src/startup.c:317 msgid "trying to start alternative window manager..." msgstr "yritetään käynnistää vaihtoehtoista ikkunointijärjestelmää..." -#: ../src/switchmenu.c:124 +#: ../src/startup.c:745 +#, c-format +msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" +msgstr "ikonien kooksi on säädetty %i, mutta se on liian pieni. Käytetään sen sijaan kokoa 16.\n\n" + +#: ../src/startup.c:789 +msgid "it seems that there already is a window manager running" +msgstr "jokin ikkunointijärjestelmä näyttäisi olevan käynnissä" + +#: ../src/startup.c:795 +#, c-format +msgid "could not manage screen %i" +msgstr "ruudun %i käsittely ei onnistu" + +#: ../src/startup.c:855 +msgid "could not manage any screen" +msgstr "minkään ruudun käsittely ei onnistu" + +#: ../src/switchmenu.c:114 msgid "Windows" msgstr "Ikkunat" -#: ../src/texture.c:260 +#: ../src/texture.c:274 ../src/texture.c:318 +#, c-format msgid "image file \"%s\" used as texture could not be found." msgstr "tekstuurina käytettyä kuvatiedostoa \"%s\" ei löydy." -#: ../src/texture.c:266 +#: ../src/texture.c:280 ../src/texture.c:324 +#, c-format msgid "could not load texture pixmap \"%s\":%s" msgstr "tekstuuri pikselikarttaa \"%s\" ei löydy: %s" -#: ../src/texture.c:362 ../src/texture.c:499 +#: ../src/texture.c:463 ../src/texture.c:574 +#, c-format msgid "could not render texture: %s" msgstr "tekstuuria %s ei voida renderoida" -#: ../src/wdefaults.c:387 +#: ../src/wdefaults.c:410 +#, c-format msgid "could not find icon file \"%s\"" msgstr "kuvaketiedostoa \"%s\" ei löytynyt" -#: ../src/winmenu.c:182 -msgid "could not create workspace submenu for window menu" -msgstr "ei voitu luoda työtilojen alivalikkoa ikkunavalikolle" +#: ../src/window.c:2487 ../src/window.c:2619 +msgid "" +"the NumLock, ScrollLock or similar key seems to be turned on.\n" +"Turn it off or some mouse actions and keyboard shortcuts will not work." +msgstr "" +"NumLock, ScrollLock tai samankaltainen näppäin näyttää olevan päällä.\n" +"Laita se pois, tai jotkin hiiritoiminnot ja näppäinpikavalinnat eivät toimi." + +#: ../src/winmenu.c:125 +msgid "" +"This will kill the application.\n" +"Any unsaved changes will be lost.\n" +"Please confirm." +msgstr "" +"Tämä tappaa ohjelman.\n" +"Kaikki tallettamattomat muutokset menetetään.\n" +"Vahvista." + +#: ../src/winmenu.c:253 ../src/winmenu.c:261 +msgid "Set Shortcut" +msgstr "Aseta pikavalinta" -#: ../src/winmenu.c:204 -msgid "(Un)Maximize" -msgstr "Suurenna/Pienennä" +#: ../src/winmenu.c:339 ../src/winmenu.c:385 +msgid "could not create submenu for window menu" +msgstr "ei voitu luoda ikkunavalikolle alivalikkoa" -#: ../src/winmenu.c:205 +#: ../src/winmenu.c:394 +msgid "Keep at bottom" +msgstr "Pidä alimmaisena" + +#: ../src/winmenu.c:399 ../src/winspector.c:1152 +msgid "Omnipresent" +msgstr "Näkyvissä kaikkialla" + +#. +#. * Warning: If you make some change that affects the order of the +#. * entries, you must update the command #defines in the top of +#. * this file. +#. +#: ../src/winmenu.c:422 ../src/winmenu.c:557 +msgid "Maximize" +msgstr "Maksimoi" + +#: ../src/winmenu.c:430 ../src/winmenu.c:543 msgid "Miniaturize" msgstr "Minimoi" -#: ../src/winmenu.c:214 -msgid "(Un)Shade" -msgstr "(Vain) Otsikkopalkki" - -#: ../src/winmenu.c:222 -msgid "Hide" -msgstr "Piilota" +#: ../src/winmenu.c:439 ../src/winmenu.c:574 +msgid "Shade" +msgstr "Vain otsikkopalkki" -#: ../src/winmenu.c:230 -msgid "Hide Others" -msgstr "Piilota muut" +#: ../src/winmenu.c:455 +msgid "Resize/Move" +msgstr "Muuta kokoa/Siirrä" -#: ../src/winmenu.c:232 +#: ../src/winmenu.c:463 msgid "Select" msgstr "Valitse" -#: ../src/winmenu.c:234 +#: ../src/winmenu.c:471 msgid "Move To" msgstr "Siirrä" -#: ../src/winmenu.c:239 +#: ../src/winmenu.c:476 msgid "Attributes..." -msgstr "Ominaisuudet" +msgstr "Ominaisuudet..." -#: ../src/winmenu.c:241 -msgid "Close" -msgstr "Sulje" +#: ../src/winmenu.c:478 +msgid "Options" +msgstr "Optiot" + +#: ../src/winmenu.c:538 +msgid "Deminiaturize" +msgstr "Minimointi pois" + +#: ../src/winmenu.c:552 +msgid "Unmaximize" +msgstr "Maksimointi pois" + +#: ../src/winmenu.c:569 +msgid "Unshade" +msgstr "Myös sisältö" -#: ../src/winspector.c:270 -msgid "Could not find specified icon file" -msgstr "Valittua kuvaketiedostoa ei löytynyt" +#: ../src/winspector.c:281 +#, c-format +msgid "Could not find icon \"%s\" specified for this window" +msgstr "Tälle ikkunalle määriteltyä kuvaketta \"%s\" ei löytynyt" -#: ../src/winspector.c:926 -msgid "not enough memory to open window inspector panel" -msgstr "ei riittävästi muistia ikkunan tarkkailija panelin avaamiseksi" +#: ../src/winspector.c:297 +#, c-format +msgid "Could not open specified icon \"%s\":%s" +msgstr "Ei voinut avata määriteltyä kuvaketiedostoa \"%s\":%s" -#: ../src/winspector.c:953 +#: ../src/winspector.c:1027 msgid "Save" msgstr "Tallenna" -#: ../src/winspector.c:959 +#: ../src/winspector.c:1035 msgid "Apply" msgstr "Toteuta" -#: ../src/winspector.c:965 -msgid "Revert" -msgstr "Palaa" +#: ../src/winspector.c:1041 +msgid "Reload" +msgstr "Lataa uudelleen" -#: ../src/winspector.c:974 ../src/winspector.c:982 +#: ../src/winspector.c:1050 ../src/winspector.c:1060 msgid "Window Specification" -msgstr "Ikkunan määritykset" +msgstr "Ikkunan määrittely" -#: ../src/winspector.c:975 +#: ../src/winspector.c:1051 msgid "Window Attributes" msgstr "Ikkunan ominaisuudet" -#: ../src/winspector.c:976 +#: ../src/winspector.c:1052 msgid "Advanced Options" msgstr "Tarkemmat määritykset" -#: ../src/winspector.c:977 +#: ../src/winspector.c:1053 msgid "Icon and Initial Workspace" msgstr "Kuvake ja alustava työtila" -#: ../src/winspector.c:978 +#: ../src/winspector.c:1054 msgid "Application Specific" msgstr "Sovelluskohtaiset" -#: ../src/winspector.c:990 +#: ../src/winspector.c:1068 msgid "Defaults for all windows" msgstr "Oletusarvot kaikille ikkunoille" -#: ../src/winspector.c:1026 +#: ../src/winspector.c:1111 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS property set to the above selected\n" "name, when saved." msgstr "" -"Määritys vaikuttaa kaikkiin ikkunoihin joiden\n" -"WM_CLASS ominaisuus on asetettu yllä valituksi nimeksi\n" -"tallennuksen jälkeen." +"Määritys vaikuttaa kaikkiin ikkunoihin,\n" +"joiden WM_CLASS-ominaisuus on\n" +"asetettu yllä valituksi nimeksi,\n" +"kun se on talletettu." -#. *** attributes *** -#: ../src/winspector.c:1033 +#: ../src/winspector.c:1118 msgid "Attributes" msgstr "Ominaisuudet" -#: ../src/winspector.c:1043 -msgid "Disable titlebar" +#: ../src/winspector.c:1128 +msgid "Disable Titlebar" msgstr "Älä käytä otsikkopalkkia" -#: ../src/winspector.c:1047 -msgid "Disable resizebar" -msgstr "Älä käytä kokopalkkia" +#: ../src/winspector.c:1132 +msgid "Disable Resizebar" +msgstr "Älä käytä koonmuutospalkkia" -#: ../src/winspector.c:1051 -msgid "Disable close button" +#: ../src/winspector.c:1136 +msgid "Disable Close Button" msgstr "Älä käytä sulje-nappia" -#: ../src/winspector.c:1055 -msgid "Disable miniaturize button" -msgstr "Älä käytä pienennä-nappia" +#: ../src/winspector.c:1140 +msgid "Disable Miniaturize Button" +msgstr "Älä käytä minimointinappia" -#: ../src/winspector.c:1059 -msgid "Keep on top" -msgstr "Pidä päällä" +#: ../src/winspector.c:1144 +msgid "Keep on Top / Floating" +msgstr "Pidä päällimmäisenä" -#: ../src/winspector.c:1063 -msgid "Omnipresent" -msgstr "Näkyvissä kaikkialla" +#: ../src/winspector.c:1148 +msgid "Keep at Bottom / Sunken" +msgstr "Pidä pohjimmaisena" -#: ../src/winspector.c:1067 +#: ../src/winspector.c:1156 msgid "Start Miniaturized" -msgstr "Käynnistä pienennettynä" +msgstr "Käynnistä minimoituna" -#: ../src/winspector.c:1071 -msgid "Skip window list" +#: ../src/winspector.c:1160 +msgid "Start Maximized" +msgstr "Käynnistä maksimoituna" + +#: ../src/winspector.c:1164 +msgid "Skip Window List" msgstr "Älä näytä ikkunaluettelossa" -#: ../src/winspector.c:1085 +#: ../src/winspector.c:1178 msgid "Advanced" msgstr "Tarkemmat määritykset" -#: ../src/winspector.c:1095 +#: ../src/winspector.c:1188 msgid "Ignore HideOthers" -msgstr "Älä huomio PiilotaMuut-komentoa" +msgstr "Ei välitä PiilotaMuut-komennosta" -#: ../src/winspector.c:1099 -msgid "Don't bind keyboard shortcuts" -msgstr "Älä sido näppäimistön oikopolkuja" +#: ../src/winspector.c:1192 +msgid "Don't Bind Keyboard Shortcuts" +msgstr "Älä sido näppäimistön pikavalintoja" -#: ../src/winspector.c:1103 -msgid "Don't bind mouse clicks" +#: ../src/winspector.c:1196 +msgid "Don't Bind Mouse Clicks" msgstr "Älä sido hiiren näpäytyksiä" -#: ../src/winspector.c:1107 -msgid "Keep inside screen" +#: ../src/winspector.c:1200 +msgid "Keep Inside Screen" msgstr "Pidä näytön sisäpuolella" -#: ../src/winspector.c:1111 -msgid "No application icon" -msgstr "Ei sovelluskuvaketta" - -#: ../src/winspector.c:1115 -msgid "Don't let it take focus" +#: ../src/winspector.c:1204 +msgid "Don't Let It Take Focus" msgstr "Älä anna fokusta" -#: ../src/winspector.c:1119 +#: ../src/winspector.c:1208 msgid "Don't Save Session" msgstr "Älä tallenna istuntoa" -#: ../src/winspector.c:1134 -msgid "Enable the \"Don't bind...\" options to allow the application to receive all mouse or keyboard events." -msgstr "Käytä kaikkia \"Älä sido...\" vaihtoehtoja antaaksesi sovellukselle kaikki näppäimistön ja hiiren tapahtumat" +#: ../src/winspector.c:1212 +msgid "Emulate Application Icon" +msgstr "Matki sovelluskuvaketta" + +#: ../src/winspector.c:1216 +msgid "Full Screen Maximization" +msgstr "Kokoruudun maksimointi" -#: ../src/winspector.c:1141 +#: ../src/winspector.c:1231 +msgid "" +"Enable the \"Don't bind...\" options to allow the application to receive all " +"mouse or keyboard events." +msgstr "Käytä \"Älä sido...\"-vaihtoehtoja antaaksesi sovellukselle kaikki näppäimistön ja hiiren tapahtumat." + +#: ../src/winspector.c:1238 msgid "Miniwindow Image" msgstr "Kuvake" -#: ../src/winspector.c:1159 +#: ../src/winspector.c:1257 msgid "Update" msgstr "Päivitä" -#: ../src/winspector.c:1164 -msgid "Icon file name:" +#: ../src/winspector.c:1272 +msgid "Icon File Name:" msgstr "Kuvakkeen tiedostonimi:" -#: ../src/winspector.c:1174 +#: ../src/winspector.c:1284 msgid "Ignore client supplied icon" -msgstr "Älä käytä sovelluksen antamaa kuvaketta" +msgstr "Älä käytä sovelluksen antamaa" -#: ../src/winspector.c:1180 +#: ../src/winspector.c:1291 msgid "Initial Workspace" msgstr "Työtila käynnistettäessä" -#: ../src/winspector.c:1186 +#: ../src/winspector.c:1296 msgid "Nowhere in particular" -msgstr "Ei mikään erityinen" +msgstr "Ei erityistä tilaa" -#: ../src/winspector.c:1217 +#: ../src/winspector.c:1330 msgid "Application Wide" -msgstr "Sovelluskohtainen" +msgstr "Sovelluksenlaajuinen" -#: ../src/winspector.c:1227 +#: ../src/winspector.c:1340 msgid "Start Hidden" msgstr "Käynnistä piilotettuna" -#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:426 +#: ../src/winspector.c:1344 +msgid "No Application Icon" +msgstr "Ei sovelluskuvaketta" + +#: ../src/workspace.c:102 ../src/workspace.c:103 ../src/workspace.c:480 +#, c-format msgid "Workspace %i" msgstr "Työtila %i" -#: ../src/workspace.c:450 +#: ../src/workspace.c:537 msgid "Workspaces" msgstr "Työtilat" -#: ../src/workspace.c:452 +#: ../src/workspace.c:539 msgid "could not create Workspace menu" msgstr "ei voinut luoda Työtila-valikkoa" -#: ../src/workspace.c:459 +#: ../src/workspace.c:546 msgid "New" msgstr "Uusi" -#: ../src/workspace.c:460 +#: ../src/workspace.c:547 msgid "Destroy Last" msgstr "Tuhoa viimeinen" -#: ../src/xutil.c:220 +#: ../src/xutil.c:228 msgid "invalid data in selection" msgstr "epäkelpo data valinnassa" - - diff --git a/src/Makefile.am b/src/Makefile.am index b3cb8ed0..19f7f270 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -115,5 +115,6 @@ wmaker_LDADD = \ @GFXLIBS@ \ @XLIBS@ \ @INTLIBS@ \ + @DLLIBS@ \ -lm diff --git a/src/Makefile.in b/src/Makefile.in index 5f306861..131efc0c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ @@ -103,7 +104,7 @@ CPPFLAGS = @CPPFLAGS@ @DFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\" INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ -wmaker_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @LIBPL@ @GFXLIBS@ @XLIBS@ @INTLIBS@ -lm +wmaker_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @LIBPL@ @GFXLIBS@ @XLIBS@ @INTLIBS@ @DLLIBS@ -lm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h diff --git a/src/client.c b/src/client.c index 9052b1e2..8fed7a18 100644 --- a/src/client.c +++ b/src/client.c @@ -722,7 +722,6 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry, wwin->normal_hints->flags &= ~PPosition; #endif if (wwin->normal_hints->flags & (USPosition|PPosition)) { - puts("QWEWQEWQ"); *x = wwin->normal_hints->x; *y = wwin->normal_hints->y; } diff --git a/src/config.h.in b/src/config.h.in index 3746f8af..dca5adad 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -148,6 +148,9 @@ /* Define if you have the strncasecmp function. */ #undef HAVE_STRNCASECMP +/* Define if you have the header file. */ +#undef HAVE_DLFCN_H + /* Define if you have the header file. */ #undef HAVE_FCNTL_H diff --git a/src/defaults.c b/src/defaults.c index e978b035..5c295c27 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -1602,6 +1602,7 @@ getEnum(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, * (thgradient ) * (tvgradient ) * (tdgradient ) + * (function ...) */ static WTexture* @@ -1853,7 +1854,47 @@ parse_texture(WScreen *scr, proplist_t pl) texture = (WTexture*)wTextureMakeTGradient(scr, style, &color1, &color2, val, opacity); - } else { + } +#ifdef TEXTURE_PLUGIN + else if (strcasecmp(val, "function")==0) { + + char *lib, *func, **argv; + int i, argc; + + if (nelem < 3) + return NULL; + + /* get the library name */ + elem = PLGetArrayElement(pl, 1); + if (!elem || !PLIsString(elem)) { + return NULL; + } + lib = PLGetString(elem); + + /* get the function name */ + elem = PLGetArrayElement(pl, 2); + if (!elem || !PLIsString(elem)) { + return NULL; + } + func = PLGetString(elem); + + argc = nelem - 3; + argv = (char **) wmalloc (argc * sizeof (char *)); + + /* get the parameters */ + for (i=0; i #include +#ifdef TEXTURE_PLUGIN +# ifdef HAVE_DLFCN_H +# include +# endif +#endif + #include #include #include @@ -177,6 +183,17 @@ wTextureDestroy(WScreen *scr, WTexture *texture) case WTEX_TDGRADIENT: RDestroyImage(texture->tgradient.pixmap); break; + +#ifdef TEXTURE_PLUGIN + case WTEX_FUNCTION: +#ifdef HAVE_DLFCN_H + if (texture->function.handle) { + dlclose (texture->function.handle); + } +#endif + free (texture->function.argv); + break; +#endif /* TEXTURE_PLUGIN */ } if (CANFREE(texture->any.color.pixel)) colors[count++] = texture->any.color.pixel; @@ -353,6 +370,46 @@ wTextureMakeTGradient(WScreen *scr, int style, RColor *from, RColor *to, } +#ifdef TEXTURE_PLUGIN +WTexFunction* +wTextureMakeFunction(WScreen *scr, char *lib, char *func, int argc, char **argv) +{ + WTexFunction *texture; + texture = wmalloc(sizeof(WTexture)); + texture->type = WTEX_FUNCTION; + texture->handle = NULL; + texture->render = 0; + texture->argc = argc; + texture->argv = argv; + +#ifdef HAVE_DLFCN_H + /* open the library */ + texture->handle = dlopen(lib, RTLD_LAZY); + if (!texture->handle) { + wwarning(_("library \"%s\" cound not be opened."), lib); + free(argv); + free(texture); + return NULL; + } + + /* find the function */ + texture->render = dlsym (texture->handle, func); + if (!texture->render) { + wwarning(_("function \"%s\" not founf in library \"%s\""), func, lib); + free(argv); + dlclose(texture->handle); + free(texture); + return NULL; + } +#else + wwarning(_("function textures not supported on this system, sorry.")); +#endif + + /* success! */ + return texture; +} +#endif /* TEXTURE_PLUGIN */ + RImage* wTextureRenderImage(WTexture *texture, int width, int height, int relief) @@ -453,6 +510,18 @@ wTextureRenderImage(WTexture *texture, int width, int height, int relief) } break; +#ifdef TEXTURE_PLUGIN + case WTEX_FUNCTION: +#ifdef HAVE_DLFCN_H + if (texture->function.render) { + image = texture->function.render ( + texture->function.argc, texture->function.argv, + width, height, relief); + } +#endif + break; +#endif /* TEXTURE_PLUGIN */ + default: puts("ERROR in wTextureRenderImage()"); image = NULL; diff --git a/src/texture.h b/src/texture.h index 62a2c3c8..180da211 100644 --- a/src/texture.h +++ b/src/texture.h @@ -47,6 +47,7 @@ #define WTEX_THGRADIENT ((1<<9)|WREL_BORDER_MASK) #define WTEX_TVGRADIENT ((1<<10)|WREL_BORDER_MASK) #define WTEX_TDGRADIENT ((1<<11)|WREL_BORDER_MASK) +#define WTEX_FUNCTION ((1<<12)|WREL_BORDER_MASK) /* pixmap subtypes */ #define WTP_TILE 2 @@ -120,6 +121,18 @@ typedef struct WTexTGradient { int opacity; } WTexTGradient; +typedef struct WTexFunction { + short type; + char subtype; + XColor normal; + GC normal_gc; + + void *handle; + RImage *(*render) (int, char**, int, int, int); + int argc; + char **argv; +} WTexFunction; + typedef union WTexture { WTexAny any; WTexSolid solid; @@ -127,6 +140,7 @@ typedef union WTexture { WTexMGradient mgradient; WTexPixmap pixmap; WTexTGradient tgradient; + WTexFunction function; } WTexture; @@ -136,6 +150,9 @@ WTexMGradient *wTextureMakeMGradient(WScreen*, int, RColor**); WTexTGradient *wTextureMakeTGradient(WScreen*, int, RColor*, RColor*, char *, int); WTexPixmap *wTextureMakePixmap(WScreen *scr, int style, char *pixmap_file, XColor *color); +#ifdef TEXTURE_PLUGIN +WTexFunction *wTextureMakeFunction(WScreen*, char *, char *, int, char **); +#endif void wTextureDestroy(WScreen*, WTexture*); void wTexturePaint(WTexture *, Pixmap *, WCoreWindow*, int, int); void wTextureRender(WScreen*, WTexture*, Pixmap*, int, int, int); diff --git a/src/wconfig.h.in b/src/wconfig.h.in index c22ab2bd..82e38340 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -209,6 +209,8 @@ #undef WINDOW_BIRTH_ZOOM +#define TEXTURE_PLUGIN + /* *-------------------------------------------------------------------- * Default Configuration diff --git a/test/Makefile.in b/test/Makefile.in index a7b9de5e..3356d6ec 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/util/Makefile.in b/util/Makefile.in index a3a68902..e1d22226 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -60,6 +60,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/wmlib/Makefile.in b/wmlib/Makefile.in index d42b7f31..5e46ac09 100644 --- a/wmlib/Makefile.in +++ b/wmlib/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ diff --git a/wrlib/Makefile.in b/wrlib/Makefile.in index 1e4974b2..c1859a1e 100644 --- a/wrlib/Makefile.in +++ b/wrlib/Makefile.in @@ -62,6 +62,7 @@ host_triplet = @host@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ +DLLIBS = @DLLIBS@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ -- 2.11.4.GIT