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

er.. WPrefs Appearance section update

Browse Source
This commit is contained in:
kojima
1999-03-17 01:20:29 +00:00
parent d8c169c0a8
commit dad0e04829
37 changed files with 1776 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -14,6 +14,7 @@ Changes since version 0.51.2:
- enhancements to the modelock patch (id@windowmaker.org) - enhancements to the modelock patch (id@windowmaker.org)
- show kbd mode for modelock (id@windowmaker.org) - show kbd mode for modelock (id@windowmaker.org)
- enhanced positioning of transient windows - enhanced positioning of transient windows
- added dynamically loadable texture renderer code (from ?)
Changes since version 0.51.1: Changes since version 0.51.1:

1
Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
TODO
View File

@@ -1,6 +1,7 @@
Do ASAP: Do ASAP:
======== ========
- exitscript
- fix bestvisual selection code. Broken. - fix bestvisual selection code. Broken.
- fix RemakeStackList() to account for transient windows - fix RemakeStackList() to account for transient windows
- blink border of clients with UrgencyHint set between red and black - blink border of clients with UrgencyHint set between red and black

1
WINGs/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WINGs/Resources/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WPrefs.app/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

2
WPrefs.app/Menu.c
View File

@@ -1332,7 +1332,6 @@ getDefaultMenu(_Panel *panel, int *hasWSMenu)
} }
} }
free(gspath);
free(menuPath); free(menuPath);
if (menu) { if (menu) {
@@ -1358,7 +1357,6 @@ showData(_Panel *panel)
menuPath = wmalloc(strlen(gspath)+32); menuPath = wmalloc(strlen(gspath)+32);
strcpy(menuPath, gspath); strcpy(menuPath, gspath);
free(gspath);
strcat(menuPath, "/Defaults/WMRootMenu"); strcat(menuPath, "/Defaults/WMRootMenu");
menu = PLGetProplistWithPath(menuPath); menu = PLGetProplistWithPath(menuPath);

117
WPrefs.app/TexturePanel.c
View File

@@ -100,6 +100,7 @@ typedef struct _TexturePanel {
WMButton *dispB; WMButton *dispB;
WMPopUpButton *arrP; WMPopUpButton *arrP;
RImage *image;
char *imageFile; 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 static void
updateSGradButtons(TexturePanel *panel) updateSGradButtons(TexturePanel *panel)
{ {
@@ -619,15 +650,21 @@ browseImageCallback(WMWidget *w, void *data)
return; return;
} }
pixmap = WMCreatePixmapFromRImage(scr, image, 128); if (panel->image)
RDestroyImage(image); RDestroyImage(panel->image);
panel->image = image;
size = WMGetPixmapSize(pixmap); if (WMGetPopUpButtonSelectedItem(panel->typeP) == TYPE_PIXMAP) {
WMSetLabelImage(panel->imageL, pixmap); pixmap = WMCreatePixmapFromRImage(scr, image, 128);
WMResizeWidget(panel->imageL, size.width, size.height);
WMReleasePixmap(pixmap); size = WMGetPixmapSize(pixmap);
WMSetLabelImage(panel->imageL, pixmap);
WMResizeWidget(panel->imageL, size.width, size.height);
WMReleasePixmap(pixmap);
} else {
updateTGradImage(panel);
}
panel->imageFile = path; panel->imageFile = path;
WMSetTextFieldText(panel->imageT, path); WMSetTextFieldText(panel->imageT, path);
@@ -667,6 +704,11 @@ DestroyTexturePanel(TexturePanel *panel)
void void
ShowTexturePanel(TexturePanel *panel) ShowTexturePanel(TexturePanel *panel)
{ {
Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
WMSetWindowUPosition(panel->win,
WidthOfScreen(DefaultScreenOfDisplay(dpy)),
HeightOfScreen(DefaultScreenOfDisplay(dpy)));
WMMapWidget(panel->win); WMMapWidget(panel->win);
} }
@@ -723,10 +765,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
p = PLGetArrayElement(texture, 1); p = PLGetArrayElement(texture, 1);
if (!p) { if (!p) {
goto bad_texture; str = "black";
} else {
str = PLGetString(p);
} }
str = PLGetString(p);
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color); WMSetColorWellColor(panel->defcW, color);
@@ -741,9 +783,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
p = PLGetArrayElement(texture, 1); p = PLGetArrayElement(texture, 1);
if (!p) { if (!p) {
goto bad_texture; str = "black";
} else {
str = PLGetString(p);
} }
str = PLGetString(p);
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol1W, color); WMSetColorWellColor(panel->tcol1W, color);
@@ -752,9 +795,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
p = PLGetArrayElement(texture, 2); p = PLGetArrayElement(texture, 2);
if (!p) { if (!p) {
goto bad_texture; str = "black";
} else {
str = PLGetString(p);
} }
str = PLGetString(p);
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->tcol2W, color); WMSetColorWellColor(panel->tcol2W, color);
@@ -766,11 +810,43 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
} else if (strcasecmp(type, "thgradient")==0 } else if (strcasecmp(type, "thgradient")==0
|| strcasecmp(type, "tvgradient")==0 || strcasecmp(type, "tvgradient")==0
|| strcasecmp(type, "tdgradient")==0) { || strcasecmp(type, "tdgradient")==0) {
int i;
WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_TGRADIENT); WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_TGRADIENT);
/****** TODO: setador de textura apartir desse */
gradient = type[1]; 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 } else if (strcasecmp(type, "mhgradient")==0
|| strcasecmp(type, "mvgradient")==0 || strcasecmp(type, "mvgradient")==0
@@ -787,10 +863,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
p = PLGetArrayElement(texture, 1); p = PLGetArrayElement(texture, 1);
if (!p) { if (!p) {
goto bad_texture; str = "black";
} else {
str = PLGetString(p);
} }
str = PLGetString(p);
color = WMCreateNamedColor(scr, str, False); color = WMCreateNamedColor(scr, str, False);
WMSetColorWellColor(panel->defcW, color); WMSetColorWellColor(panel->defcW, color);
@@ -803,9 +879,10 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
p = PLGetArrayElement(texture, i); p = PLGetArrayElement(texture, i);
if (!p) { if (!p) {
goto bad_texture; str = "black";
} else {
str = PLGetString(p);
} }
str = PLGetString(p);
XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap,
str, &xcolor); str, &xcolor);
@@ -1059,8 +1136,6 @@ CreateTexturePanel(WMWindow *keyWindow)
WMSetPopUpButtonSelectedItem(panel->typeP, 0); WMSetPopUpButtonSelectedItem(panel->typeP, 0);
WMSetPopUpButtonAction(panel->typeP, changeTypeCallback, panel); WMSetPopUpButtonAction(panel->typeP, changeTypeCallback, panel);
WMSetPopUpButtonItemEnabled(panel->typeP, TYPE_TGRADIENT, False);
/* color */ /* color */
panel->defcF = WMCreateFrame(panel->win); panel->defcF = WMCreateFrame(panel->win);
WMResizeWidget(panel->defcF, 100, 75); WMResizeWidget(panel->defcF, 100, 75);

1
WPrefs.app/po/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WPrefs.app/tiff/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WPrefs.app/xpm/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Backgrounds/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Defaults/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/IconSets/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Icons/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Pixmaps/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Styles/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
WindowMaker/Themes/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

400
configure vendored
View File

File diff suppressed because it is too large Load Diff

20
configure.in
View File

@@ -98,6 +98,22 @@ AC_FUNC_VPRINTF
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit) 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 if test "x$CPP_PATH" = x; then
AC_PATH_PROG(CPP_PATH, cpp, notfound, AC_PATH_PROG(CPP_PATH, cpp, notfound,
$PATH:/lib:/usr/bin:/bin:/usr/lib:/usr/ccs/lib) $PATH:/lib:/usr/bin:/bin:/usr/lib:/usr/ccs/lib)
@@ -153,6 +169,7 @@ dnl AM_GNU_GETTEXT
INTLIBS="" INTLIBS=""
DLLIBS=""
AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"],
@@ -260,6 +277,9 @@ if test "x$NLSDIR" = "x"; then
fi fi
fi fi
AC_SUBST(DLLIBS)
AC_SUBST(INTLIBS) AC_SUBST(INTLIBS)
AC_SUBST(NLSDIR) AC_SUBST(NLSDIR)
AC_SUBST(MOFILES) AC_SUBST(MOFILES)

1
doc/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
po/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
po/README
View File

@@ -23,6 +23,7 @@ ru.po Russian Alexey Vyskubov <alexey@alv.stud.pu.ru>
tr.po Turkish F. Kagan Gurkaynak <kgf@wpi.edu> tr.po Turkish F. Kagan Gurkaynak <kgf@wpi.edu>
fi.po Finnish Ville Hautamaki <villeh@cs.joensuu.fi> fi.po Finnish Ville Hautamaki <villeh@cs.joensuu.fi>
Ramin Miraftabi <ramin@cs.joensuu.fi> Ramin Miraftabi <ramin@cs.joensuu.fi>
Tomi Kajala <tomi@iki.fi>
hr.po Croatian 3 Toni Bilic <tbilic@efos.hr> hr.po Croatian 3 Toni Bilic <tbilic@efos.hr>
el.po Greek Nikolaos Papagrigoriou <papanikos@usa.net> el.po Greek Nikolaos Papagrigoriou <papanikos@usa.net>
pl.po Polish Piotr Dembiñski <pdemb@aurora.put.poznan.pl> pl.po Polish Piotr Dembiñski <pdemb@aurora.put.poznan.pl>

2112
po/fi.po
View File

File diff suppressed because it is too large Load Diff

1
src/Makefile.am
View File

@@ -115,5 +115,6 @@ wmaker_LDADD = \
@GFXLIBS@ \ @GFXLIBS@ \
@XLIBS@ \ @XLIBS@ \
@INTLIBS@ \ @INTLIBS@ \
@DLLIBS@ \
-lm -lm

3
src/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@
@@ -103,7 +104,7 @@ CPPFLAGS = @CPPFLAGS@ @DFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 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 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h CONFIG_HEADER = config.h

1
src/client.c
View File

@@ -722,7 +722,6 @@ wClientGetNormalHints(WWindow *wwin, XWindowAttributes *wattribs, Bool geometry,
wwin->normal_hints->flags &= ~PPosition; wwin->normal_hints->flags &= ~PPosition;
#endif #endif
if (wwin->normal_hints->flags & (USPosition|PPosition)) { if (wwin->normal_hints->flags & (USPosition|PPosition)) {
puts("QWEWQEWQ");
*x = wwin->normal_hints->x; *x = wwin->normal_hints->x;
*y = wwin->normal_hints->y; *y = wwin->normal_hints->y;
} }

3
src/config.h.in
View File

@@ -148,6 +148,9 @@
/* Define if you have the strncasecmp function. */ /* Define if you have the strncasecmp function. */
#undef HAVE_STRNCASECMP #undef HAVE_STRNCASECMP
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have the <fcntl.h> header file. */ /* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H

43
src/defaults.c
View File

@@ -1602,6 +1602,7 @@ getEnum(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr,
* (thgradient <file> <opaqueness> <color> <color>) * (thgradient <file> <opaqueness> <color> <color>)
* (tvgradient <file> <opaqueness> <color> <color>) * (tvgradient <file> <opaqueness> <color> <color>)
* (tdgradient <file> <opaqueness> <color> <color>) * (tdgradient <file> <opaqueness> <color> <color>)
* (function <lib> <function> ...)
*/ */
static WTexture* static WTexture*
@@ -1853,7 +1854,47 @@ parse_texture(WScreen *scr, proplist_t pl)
texture = (WTexture*)wTextureMakeTGradient(scr, style, &color1, &color2, texture = (WTexture*)wTextureMakeTGradient(scr, style, &color1, &color2,
val, opacity); 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<argc; i++) {
elem = PLGetArrayElement(pl, 3+i);
if (!elem || !PLIsString(elem)) {
free (argv);
return NULL;
}
argv[i] = PLGetString(elem);
}
texture = (WTexture*)wTextureMakeFunction(scr, lib, func, argc, argv);
}
#endif /* TEXTURE_PLUGIN */
else {
wwarning(_("invalid texture type %s"), val); wwarning(_("invalid texture type %s"), val);
return NULL; return NULL;
} }

69
src/texture.c
View File

@@ -24,6 +24,12 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#ifdef TEXTURE_PLUGIN
# ifdef HAVE_DLFCN_H
# include <dlfcn.h>
# endif
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -177,6 +183,17 @@ wTextureDestroy(WScreen *scr, WTexture *texture)
case WTEX_TDGRADIENT: case WTEX_TDGRADIENT:
RDestroyImage(texture->tgradient.pixmap); RDestroyImage(texture->tgradient.pixmap);
break; 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)) if (CANFREE(texture->any.color.pixel))
colors[count++] = 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* RImage*
wTextureRenderImage(WTexture *texture, int width, int height, int relief) wTextureRenderImage(WTexture *texture, int width, int height, int relief)
@@ -453,6 +510,18 @@ wTextureRenderImage(WTexture *texture, int width, int height, int relief)
} }
break; 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: default:
puts("ERROR in wTextureRenderImage()"); puts("ERROR in wTextureRenderImage()");
image = NULL; image = NULL;

17
src/texture.h
View File

@@ -47,6 +47,7 @@
#define WTEX_THGRADIENT ((1<<9)|WREL_BORDER_MASK) #define WTEX_THGRADIENT ((1<<9)|WREL_BORDER_MASK)
#define WTEX_TVGRADIENT ((1<<10)|WREL_BORDER_MASK) #define WTEX_TVGRADIENT ((1<<10)|WREL_BORDER_MASK)
#define WTEX_TDGRADIENT ((1<<11)|WREL_BORDER_MASK) #define WTEX_TDGRADIENT ((1<<11)|WREL_BORDER_MASK)
#define WTEX_FUNCTION ((1<<12)|WREL_BORDER_MASK)
/* pixmap subtypes */ /* pixmap subtypes */
#define WTP_TILE 2 #define WTP_TILE 2
@@ -120,6 +121,18 @@ typedef struct WTexTGradient {
int opacity; int opacity;
} WTexTGradient; } 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 { typedef union WTexture {
WTexAny any; WTexAny any;
WTexSolid solid; WTexSolid solid;
@@ -127,6 +140,7 @@ typedef union WTexture {
WTexMGradient mgradient; WTexMGradient mgradient;
WTexPixmap pixmap; WTexPixmap pixmap;
WTexTGradient tgradient; WTexTGradient tgradient;
WTexFunction function;
} WTexture; } WTexture;
@@ -136,6 +150,9 @@ WTexMGradient *wTextureMakeMGradient(WScreen*, int, RColor**);
WTexTGradient *wTextureMakeTGradient(WScreen*, int, RColor*, RColor*, char *, int); WTexTGradient *wTextureMakeTGradient(WScreen*, int, RColor*, RColor*, char *, int);
WTexPixmap *wTextureMakePixmap(WScreen *scr, int style, char *pixmap_file, WTexPixmap *wTextureMakePixmap(WScreen *scr, int style, char *pixmap_file,
XColor *color); XColor *color);
#ifdef TEXTURE_PLUGIN
WTexFunction *wTextureMakeFunction(WScreen*, char *, char *, int, char **);
#endif
void wTextureDestroy(WScreen*, WTexture*); void wTextureDestroy(WScreen*, WTexture*);
void wTexturePaint(WTexture *, Pixmap *, WCoreWindow*, int, int); void wTexturePaint(WTexture *, Pixmap *, WCoreWindow*, int, int);
void wTextureRender(WScreen*, WTexture*, Pixmap*, int, int, int); void wTextureRender(WScreen*, WTexture*, Pixmap*, int, int, int);

2
src/wconfig.h.in
View File

@@ -209,6 +209,8 @@
#undef WINDOW_BIRTH_ZOOM #undef WINDOW_BIRTH_ZOOM
#define TEXTURE_PLUGIN
/* /*
*-------------------------------------------------------------------- *--------------------------------------------------------------------
* Default Configuration * Default Configuration

1
test/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
util/Makefile.in
View File

@@ -60,6 +60,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
wmlib/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@

1
wrlib/Makefile.in
View File

@@ -62,6 +62,7 @@ host_triplet = @host@
CC = @CC@ CC = @CC@
CPP_PATH = @CPP_PATH@ CPP_PATH = @CPP_PATH@
DFLAGS = @DFLAGS@ DFLAGS = @DFLAGS@
DLLIBS = @DLLIBS@
GFXLIBS = @GFXLIBS@ GFXLIBS = @GFXLIBS@
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
ICONEXT = @ICONEXT@ ICONEXT = @ICONEXT@