[PATCH 1/3] Include libwmgeneral in libdockapp
This patch includes the libwmgeneral library in the libdockapp
library.
The new library is now version 3 (previous was version 2) and it
includes the new include folder in $libdir/libdockapp.
The wmgeneral files were moved from the previous folder (libwmgeneral)
and the folder is now removed.
Signed-off-by: Rodolfo García Peñas (kix)
---
libdockapp/configure.ac| 2 +-
libdockapp/src/Makefile.am | 13 +-
libdockapp/src/list.c | 169
libdockapp/src/list.h | 53 +
libdockapp/src/misc.c | 172
libdockapp/src/misc.h | 31 +++
libdockapp/src/wmgeneral.c | 494 +
libdockapp/src/wmgeneral.h | 89
libwmgeneral/Makefile | 37
libwmgeneral/list.c| 169
libwmgeneral/list.h| 53 -
libwmgeneral/misc.c| 172
libwmgeneral/misc.h| 31 ---
libwmgeneral/wmgeneral.c | 494 -
libwmgeneral/wmgeneral.h | 89
15 files changed, 1019 insertions(+), 1049 deletions(-)
create mode 100644 libdockapp/src/list.c
create mode 100644 libdockapp/src/list.h
create mode 100644 libdockapp/src/misc.c
create mode 100644 libdockapp/src/misc.h
create mode 100644 libdockapp/src/wmgeneral.c
create mode 100644 libdockapp/src/wmgeneral.h
delete mode 100644 libwmgeneral/Makefile
delete mode 100644 libwmgeneral/list.c
delete mode 100644 libwmgeneral/list.h
delete mode 100644 libwmgeneral/misc.c
delete mode 100644 libwmgeneral/misc.h
delete mode 100644 libwmgeneral/wmgeneral.c
delete mode 100644 libwmgeneral/wmgeneral.h
diff --git a/libdockapp/configure.ac b/libdockapp/configure.ac
index e08afc6..70158aa 100644
--- a/libdockapp/configure.ac
+++ b/libdockapp/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libdockapp],[0.6.4],[wmaker-dev@lists.windowmaker.org])
+AC_INIT([libdockapp],[0.7.0],[wmaker-dev@lists.windowmaker.org])
AC_CONFIG_SRCDIR([src/dockapp.h])
AM_INIT_AUTOMAKE
diff --git a/libdockapp/src/Makefile.am b/libdockapp/src/Makefile.am
index 2be42bd..5196001 100644
--- a/libdockapp/src/Makefile.am
+++ b/libdockapp/src/Makefile.am
@@ -3,9 +3,13 @@ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libdockapp.la
-libdockapp_la_LDFLAGS = -version-info 2:0:0 @X_LIBS@
+libdockapp_la_LDFLAGS = -version-info 3:0:0 @X_LIBS@
-include_HEADERS = dockapp.h
+otherincludedir = $(includedir)/libdockapp
+otherinclude_HEADERS = dockapp.h \
+ wmgeneral.h \
+ list.h \
+ misc.h
libdockapp_la_SOURCES = \
dockapp.h \
@@ -17,7 +21,10 @@ libdockapp_la_SOURCES = \
dapixmap.c \
darect.c \
dashaped.c \
- dautil.c
+ dautil.c \
+ list.c \
+ misc.c \
+ wmgeneral.c
# Include these in a distribution, but don't install
noinst_HEADERS = daargs.h dautil.h
diff --git a/libdockapp/src/list.c b/libdockapp/src/list.c
new file mode 100644
index 000..0b69885
--- /dev/null
+++ b/libdockapp/src/list.c
@@ -0,0 +1,169 @@
+/* Generic single linked list to keep various information
+ Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+
+
+Author: Kresten Krab Thorup
+
+Many modifications by Alfredo K. Kojima
+
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING. If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301 USA. */
+
+/* As a special exception, if you link this library with files compiled with
+ GCC to produce an executable, this does not cause the resulting executable
+ to be covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the executable file might be
+ covered by the GNU General Public License. */
+
+#include "list.h"
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+#include
+
+/* Return a cons cell produced from (head . tail) */
+
+LinkedList*
+list_cons(void* head, LinkedList* tail)
+{
+ LinkedList* cell;
+
+ cell = (LinkedList*)malloc(sizeof(LinkedList));
+ cell->head = head;
+ cell->tail = tail;
+ return cell;
+}
+
+/* Return the length of a list, list_length(NULL) returns zero */
+
+int
+list_length(LinkedList* list)
+{
+ int i = 0;
+ while(list)
+{
+ i += 1;
+ list = list->tail;
+}
+ return i;
+}
+
+/* Return the Nth element of LIST, where N count from zero. If N
+ larger than the list leng
[PATCH 2/3] wmmon uses libdockapp
The dockapp wmmon uses the new version of libdockapp and do not use libwmgeneral. Signed-off-by: Rodolfo García Peñas (kix) --- wmmon/wmmon/Makefile | 2 +- wmmon/wmmon/wmmon.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wmmon/wmmon/Makefile b/wmmon/wmmon/Makefile index 7466113..3522cef 100644 --- a/wmmon/wmmon/Makefile +++ b/wmmon/wmmon/Makefile @@ -1,5 +1,5 @@ LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib -LIBS = -lXpm -lXext -lX11 -lwmgeneral +LIBS = -lXpm -lXext -lX11 -ldockapp OBJS = wmmon.o CFLAGS = -O2 diff --git a/wmmon/wmmon/wmmon.c b/wmmon/wmmon/wmmon.c index a3df7fe..43e6af5 100644 --- a/wmmon/wmmon/wmmon.c +++ b/wmmon/wmmon/wmmon.c @@ -108,8 +108,8 @@ #include #include -#include -#include +#include +#include #include "wmmon-master.xpm" #include "wmmon-mask.xbm" -- 2.5.0 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 3/3] wmtime uses libdockapp
The dockapp wmtime uses the new version of libdockapp and do not use libwmgeneral. Signed-off-by: Rodolfo García Peñas (kix) --- wmtime/Makefile | 2 +- wmtime/wmtime.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wmtime/Makefile b/wmtime/Makefile index 20783e7..bd7c5f9 100755 --- a/wmtime/Makefile +++ b/wmtime/Makefile @@ -1,4 +1,4 @@ -LIBS = -lXpm -lXext -lX11 -lm -lwmgeneral +LIBS = -lXpm -lXext -lX11 -lm -ldockapp OBJS = wmtime.o XPMS = wmtime-master.xpm wmtime-mask.xbm PREFIX = /usr/local diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c index 687215e..406c2da 100644 --- a/wmtime/wmtime.c +++ b/wmtime/wmtime.c @@ -89,8 +89,8 @@ #include /* for waitpid, WNOHANG */ #include /* for tm, time, localtime */ #include /* for usleep */ -#include "wmgeneral/misc.h"/* for execCommand */ -#include "wmgeneral/wmgeneral.h" /* for copyXPMArea, RedrawWindow, etc */ +#include "libdockapp/misc.h"/* for execCommand */ +#include "libdockapp/wmgeneral.h" /* for copyXPMArea, RedrawWindow, etc */ #include "wmtime-mask.xbm" /* for wmtime_mask_bits */ #include "wmtime-master.xpm" /* for wmtime_master_xpm */ -- 2.5.0 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH] New library wmgeneral
"Alexey I. Froloff" escribió: On Thu, Aug 13, 2015 at 05:42:41PM +0200, Rodolfo García Peñas (kix) wrote: This patch includes the library wmgeneral. Please, don't do it! There's already libdockapp, why would we need yet another _shared_ library with, like, five functions? What are you trying to fix? Does it really worth it? You only make things harder for a package maintainers. Better rewrite those applets to libdockapp. Hello, I think is done. I only included wmgeneral on libdockapp. Please, test it. Cheers, kix Rodolfo García Peñas (kix) http://www.kix.es/ -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH] Window Maker 0.95.7 Debian files
Signed-off-by: Rodolfo García Peñas (kix) --- debian/changelog | 24 +++ debian/copyright | 26 --- debian/debianfiles/wmaker-common.desktop | 1 - debian/libwings3.symbols | 4 ++ debian/libwraster5.symbols | 120 +++ debian/patches/50_def_config_paths.diff | 8 +-- debian/patches/51_wmaker_man.diff| 24 +++ debian/patches/53_Debian_WMState.diff| 6 +- debian/patches/54_Debian_wmmacros.diff | 6 +- debian/patches/55_ungif_problem.diff | 10 +-- debian/wmaker-common.postrm | 2 +- debian/wmaker.postrm | 2 +- 12 files changed, 118 insertions(+), 115 deletions(-) diff --git a/debian/changelog b/debian/changelog index 308bbc6..b0e1129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +wmaker (0.95.7-1) unstable; urgency=medium + + * New upstrem version 0.95.7. + * debian/changelog, removed debian files (lintian warning). + * Updated debian/libwings3.symbols. + * Updated libwraster5.symbols + * Changed the test for the update-menu command in these files to avoid +a lintian warning (command-with-path-in-maintainer-script): +* debian/wmaker.postrm +* debian/wmaker-common.postrm + * Removed the Encoding field in debian/debianfiles/wmaker-common.desktop +to avoid a lintian warning (desktop-entry-contains-encoding-key). + * Updated debian/rules to include pango support (--enable-pango). + * Updated all debian/patches only with quilt refresh. + * Updated some debian files because the manpages are moved from +section 1x to 1: +* debian/patches/51_wmaker_man.diff +* debian/wmaker-common.manpages +* debian/wmaker.install +* debian/wmaker.manpages + * Removed upstream file FAQ.I18N in debian/wmaker-common.docs. + + -- Rodolfo García Peñas (kix) Thu, 13 Aug 2015 20:19:33 +0200 + wmaker (0.95.6-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/copyright b/debian/copyright index c442083..67b38e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -51,32 +51,6 @@ License: LGPL-2 License version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'. -Files: debian/* -Copyright: 1997, Neil A. Rubin - 1997, Marcelo E. Magallon - 2011, Rodolfo García Peñas (kix) -License: GPL-2+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - Files: WindowMaker/Icons/BitchX.tiff WindowMaker/Icons/defaultAppIcon.tiff WindowMaker/Icons/GNUterm.tiff WindowMaker/Icons/defaultterm.tiff WindowMaker/Icons/draw.tiff WindowMaker/Icons/linuxterm.tiff diff --git a/debian/debianfiles/wmaker-common.desktop b/debian/debianfiles/wmaker-common.desktop index 3d6c633..f0276fe 100644 --- a/debian/debianfiles/wmaker-common.desktop +++ b/debian/debianfiles/wmaker-common.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Window Maker Comment=This session logs you into Window Maker Exec=/usr/bin/wmaker diff --git a/debian/libwings3.symbols b/debian/libwings3.symbols index 291a94c..9e72df6 100644 --- a/debian/libwings3.symbols +++ b/debian/libwings3.symbols @@ -118,6 +118,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetBrowserSelectedRowInColumn@Base 0.95.0 WMGetButtonEnabled@Base 0.95.0 WMGetButtonSelected@Base 0.95.0 + WMGetButtonText@Base 0.95.7 WMGetColorAlpha@Base 0.95.0 WMGetColorPanel@Base 0.95.0 WMGetColorPanelColor@Base 0.95.0 @@ -216,6 +217,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetViewScreenPosition@Base 0.95.0 WMGetViewSize@Base 0.95.0 WMGetWidgetBackgroundColor@Base 0.95.0 + WMGetWidgetBackgroundPixmap@Base 0.95.7 WMGrayColor@Base 0.95.0 WMGreenComponentOfColor@Base 0.95.0 WMGroupButtons@Base 0.95.0 @@ -465,6 +467,7 @@ libWINGs.so.3 libwings3 #MINVER# WMSetViewNextResponder@Base 0.95.0 WMSetViewNotifySizeChanges@Base 0.95.0 WMSetWidgetBackgroundColor@Base 0.95.0 + WMSetWidgetBackgroundPixmap@Base 0.95.7 WMSetWidgetDefaultBoldFont@Base 0.95.0 WMSetWidgetDefaultFont@Base 0.95.0 WMSetWindowAspectRatio@Base 0.95.0 @@ -570,6 +573,7 @@ libWINGs.so.3 libwings3 #MINVER# W_Se
Re: Build Errors
Ed Snyder escribió: Hi Milan, Thanks for the info and help! I think I got it sorted out and working now. Thanks! Ed On Thu, Aug 13, 2015 at 1:31 PM, "Milan Čermák" wrote: Hi Ed, I've built WindowMaker Debian packages just yesterday and encountered this error, too. My take is that all manpages from section 1x were moved to section 1. So, the file wxpaste.1x was renamed to wxpaste.1 (and some others too). One other issue was that I had to apply debian patches manually (with dh_quilt_patch). The automatics that should have been in debian/rules just did not work. Hope this helps, Milan > Hi, > > It's been awhile since I've been on here or even Window Maker for that > matter. Currently trying to build wmaker packages from the GIT sources and > having troubles. This is on Debian. > > --- > cp: cannot stat ‘debian/tmp/usr/share/man/ru/man1/wxpaste.1x’: No such > file > or directory > dh_install: cp -a debian/tmp/usr/share/man/ru/man1/wxpaste.1x > debian/wmaker//usr/share/man/ru/man1/ returned exit code 1 > debian/rules:50: recipe for target 'override_dh_install' failed > make[1]: *** [override_dh_install] Error 2 > make[1]: Leaving directory '/home/ed/Downloads/wmaker-crm-2db0449' > debian/rules:39: recipe for target 'binary-arch' failed > make: *** [binary-arch] Error 2 > dpkg-buildpackage: error: fakeroot debian/rules binary-arch gave error > exit > status 2 > > --- > > It seems there are some missing files for Debian? This is not the only one > either. > > Any help would be much appreciated! > > Thanks! > Hi, I updated the debian stuff. Is ready to upload to the debian and ubuntu distros. For Debian, I will do it in some days. Cheers, kix Rodolfo García Peñas (kix) http://www.kix.es/ -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 1/3] Include libwmgeneral in libdockapp
On 08/15/2015 04:38 AM, Rodolfo García Peñas (kix) wrote: > This patch includes the libwmgeneral library in the libdockapp > library. > > The new library is now version 3 (previous was version 2) and it > includes the new include folder in $libdir/libdockapp. > > The wmgeneral files were moved from the previous folder (libwmgeneral) > and the folder is now removed. I like this idea! Carlos, if this patch is accepted, could you tag it libdockapp-0.7.0? Doug -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.7-2-g7e42fed
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project wmaker-crm.git. The branch, next has been updated via 7e42fedcbb25cdee72e937c99f6595f610e16c36 (commit) from c84e787a24e7e17d25022b1d9afa67a20ee002cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://repo.or.cz/w/wmaker-crm.git/commit/7e42fedcbb25cdee72e937c99f6595f610e16c36 commit 7e42fedcbb25cdee72e937c99f6595f610e16c36 Author: Rodolfo García Peñas (kix) Date: Sat Aug 15 12:49:54 2015 +0200 Window Maker 0.95.7 Debian files Signed-off-by: Rodolfo García Peñas (kix) diff --git a/debian/changelog b/debian/changelog index 308bbc6..b0e1129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +wmaker (0.95.7-1) unstable; urgency=medium + + * New upstrem version 0.95.7. + * debian/changelog, removed debian files (lintian warning). + * Updated debian/libwings3.symbols. + * Updated libwraster5.symbols + * Changed the test for the update-menu command in these files to avoid +a lintian warning (command-with-path-in-maintainer-script): +* debian/wmaker.postrm +* debian/wmaker-common.postrm + * Removed the Encoding field in debian/debianfiles/wmaker-common.desktop +to avoid a lintian warning (desktop-entry-contains-encoding-key). + * Updated debian/rules to include pango support (--enable-pango). + * Updated all debian/patches only with quilt refresh. + * Updated some debian files because the manpages are moved from +section 1x to 1: +* debian/patches/51_wmaker_man.diff +* debian/wmaker-common.manpages +* debian/wmaker.install +* debian/wmaker.manpages + * Removed upstream file FAQ.I18N in debian/wmaker-common.docs. + + -- Rodolfo García Peñas (kix) Thu, 13 Aug 2015 20:19:33 +0200 + wmaker (0.95.6-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/copyright b/debian/copyright index c442083..67b38e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -51,32 +51,6 @@ License: LGPL-2 License version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'. -Files: debian/* -Copyright: 1997, Neil A. Rubin - 1997, Marcelo E. Magallon - 2011, Rodolfo García Peñas (kix) -License: GPL-2+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - Files: WindowMaker/Icons/BitchX.tiff WindowMaker/Icons/defaultAppIcon.tiff WindowMaker/Icons/GNUterm.tiff WindowMaker/Icons/defaultterm.tiff WindowMaker/Icons/draw.tiff WindowMaker/Icons/linuxterm.tiff diff --git a/debian/debianfiles/wmaker-common.desktop b/debian/debianfiles/wmaker-common.desktop index 3d6c633..f0276fe 100644 --- a/debian/debianfiles/wmaker-common.desktop +++ b/debian/debianfiles/wmaker-common.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Window Maker Comment=This session logs you into Window Maker Exec=/usr/bin/wmaker diff --git a/debian/libwings3.symbols b/debian/libwings3.symbols index 291a94c..9e72df6 100644 --- a/debian/libwings3.symbols +++ b/debian/libwings3.symbols @@ -118,6 +118,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetBrowserSelectedRowInColumn@Base 0.95.0 WMGetButtonEnabled@Base 0.95.0 WMGetButtonSelected@Base 0.95.0 + WMGetButtonText@Base 0.95.7 WMGetColorAlpha@Base 0.95.0 WMGetColorPanel@Base 0.95.0 WMGetColorPanelColor@Base 0.95.0 @@ -216,6 +217,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetViewScreenPosition@Base 0.95.0 WMGetViewSize@Base 0.95.0 WMGetWidgetBackgroundColor@Base 0.95.0 + WMGetWidgetBackgroundPixmap@Base 0.95.7 WMGrayColor@Base 0.95.0 WMGreenComponentOfColor@Base 0.95.0 WMGroupButtons@Base 0.95.0 @@ -465,6 +467,7 @@ libWINGs.so.3 libwings3 #MINVER# WMSetViewNextResponder@Base 0.95.0 WMSetViewNotifySizeChanges@Base 0.95.0 WMSetWidgetBackgroundColor@Base 0.95.0 + WMSetWidgetBackgroundPixmap@Base 0.95.7 WMSetWidgetDefaultBoldFont@Base 0.95.0 WMSetWidgetDefaultFont@Base 0.95
[PATCH (whome)] Update libdockapp, wmmon, and wmtime on dockapps webpage.
--- dockapps/dockapps.db | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dockapps/dockapps.db b/dockapps/dockapps.db index 90f3ee1..bdad482 100644 --- a/dockapps/dockapps.db +++ b/dockapps/dockapps.db @@ -9,6 +9,7 @@ dockapps = 253 category = Audio [libdockapp] +version-0.7.0 = bc1223ae9359e7965b797902941d4621e16cdeb8 version-0.6.4 = d06e8c1ef2fe262d9cd19a86569070d7f6f2e892 version-0.6.3 = 16b041049fdb98d2770d006680e39302e0ceeb3a image = libdockapp.png @@ -442,7 +443,7 @@ dockapps = 63 category = Audio [wmmon] -version-1.2b1+20150813 = b9a19e1255ffe7505e652f0b05cac3121123616e +version-1.2b1+20150815 = 537c3de536e0d7b95dee8d89ceb0d12d4736cc39 version-1.2b1 = 1f7dc4736465673ee36dc3fa22cdf4f4aea822c4 version-1.0b2 = 26794d80270124f3e39a036503b3edc3284c7f74 image = wmmon.gif @@ -606,7 +607,7 @@ dockapps = 320 category = System Monitoring [wmtime] -version-1.3+20150813 = 1e36ad9ca7dbb0ec2856f1d9eb0617a961d28e6b +version-1.3+20150815 = 32d124860cd15c6379997b4bad8614181e6a294a version-1.3 = d87af19195e66748338aee7cdc8951dc22d3fad9 version-1.2 = 62029f244a9e03250dd846a0d75d692cbd9da683 version-1.1 = 41744c0d145f064c961989e2650a279b59e27518 -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 03/14] wmtz FTBFS
This patch solves the FTBFS problems with wmtz: - Default switch without code. - Broken line. Signed-off-by: Rodolfo García Peñas (kix) --- wmtz/wmtz/wmtz.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wmtz/wmtz/wmtz.c b/wmtz/wmtz/wmtz.c index 928f845..82c47fe 100644 --- a/wmtz/wmtz/wmtz.c +++ b/wmtz/wmtz/wmtz.c @@ -51,8 +51,7 @@ #define STRSIZE 10 #define LMST 1 #define GMST 0 -#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 -http://www.geocities.com/jl1n/wmtz/wmtz.html\""; +#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7 http://www.geocities.com/jl1n/wmtz/wmtz.html\""; /* @@ -478,7 +477,6 @@ void wmtz_routine(int argc, char **argv) } but_stat = -1; break; - default: } } @@ -528,7 +526,6 @@ void handleTheMenu(int but_stat) case 4: exit(0); break; - default: } return; } -- 2.5.0 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
[PATCH 01/14] wmkeys compilation bugs
This patch solves a bug and a warning:
- The dockapp wmkeys uses the getline function, that is the same
function provided by stdio.h. This patch changes the function
name to getline_wmkeys.
- The main function returns void, and should return integer. This
patch includes the return 0 at the function end and it changes
the function prototype.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmkeys/wmkeys.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/wmkeys/wmkeys.c b/wmkeys/wmkeys.c
index 718ccd5..72d98e7 100644
--- a/wmkeys/wmkeys.c
+++ b/wmkeys/wmkeys.c
@@ -94,7 +94,7 @@ void enable_configuration(int n);
* Main
*/
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
num_configs = 0;
current_config = 0;
@@ -105,6 +105,8 @@ void main(int argc, char *argv[])
read_config();
wmkeys_routine(argc, argv);
+
+ return 0;
}
/*
@@ -179,7 +181,7 @@ void draw_string(char* s)
* getline()
*/
-int getline(FILE* pfile, char* s, int lim)
+int getline_wmkeys(FILE* pfile, char* s, int lim)
{
int c = 0, i;
for(i=0; i
[PATCH 02/14] wmkeys uses libdockapp
wmkeys uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmkeys/Makefile | 5 +-
wmkeys/wmgeneral/list.c | 169 ---
wmkeys/wmgeneral/list.h | 53 -
wmkeys/wmgeneral/misc.c | 172 ---
wmkeys/wmgeneral/misc.h | 31 ---
wmkeys/wmgeneral/wmgeneral.c | 494 ---
wmkeys/wmgeneral/wmgeneral.h | 89
wmkeys/wmkeys.c | 4 +-
8 files changed, 3 insertions(+), 1014 deletions(-)
delete mode 100644 wmkeys/wmgeneral/list.c
delete mode 100644 wmkeys/wmgeneral/list.h
delete mode 100644 wmkeys/wmgeneral/misc.c
delete mode 100644 wmkeys/wmgeneral/misc.h
delete mode 100644 wmkeys/wmgeneral/wmgeneral.c
delete mode 100644 wmkeys/wmgeneral/wmgeneral.h
diff --git a/wmkeys/Makefile b/wmkeys/Makefile
index 5fa724f..cc7f2d1 100644
--- a/wmkeys/Makefile
+++ b/wmkeys/Makefile
@@ -1,9 +1,6 @@
LIBDIR = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11 -lm
+LIBS = -lXpm -lXext -lX11 -lm -ldockapp
OBJS = wmkeys.o \
- wmgeneral/wmgeneral.o \
- wmgeneral/misc.o \
- wmgeneral/list.o
.c.o:
cc -c -O2 -Wall $< -o $*.o
diff --git a/wmkeys/wmgeneral/list.c b/wmkeys/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmkeys/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(LinkedList* list)
-{
- if(list)
-{
- list_free(list->t
[PATCH 07/14] wmtv uses libdockapp
wmtv uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmtv/Makefile | 5 +-
wmtv/src/wmgeneral/list.c | 169 -
wmtv/src/wmgeneral/list.h | 59 --
wmtv/src/wmgeneral/misc.c | 164
wmtv/src/wmgeneral/misc.h | 9 -
wmtv/src/wmgeneral/wmgeneral.c | 419 -
wmtv/src/wmgeneral/wmgeneral.h | 62 --
wmtv/src/wmtv.c| 4 +-
8 files changed, 4 insertions(+), 887 deletions(-)
delete mode 100644 wmtv/src/wmgeneral/list.c
delete mode 100644 wmtv/src/wmgeneral/list.h
delete mode 100644 wmtv/src/wmgeneral/misc.c
delete mode 100644 wmtv/src/wmgeneral/misc.h
delete mode 100644 wmtv/src/wmgeneral/wmgeneral.c
delete mode 100644 wmtv/src/wmgeneral/wmgeneral.h
diff --git a/wmtv/Makefile b/wmtv/Makefile
index 0e8407b..d585157 100644
--- a/wmtv/Makefile
+++ b/wmtv/Makefile
@@ -3,9 +3,8 @@
#
INCDIR = -I/usr/X11R6/include
LIBDIR = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11 -lXxf86dga -lXxf86vm
-OBJS = src/wmtv.o \
- src/wmgeneral/wmgeneral.o \
+LIBS = -lXpm -lXext -lX11 -lXxf86dga -lXxf86vm -ldockapp
+OBJS = src/wmtv.o
.c.o:
cc -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR)
diff --git a/wmtv/src/wmgeneral/list.c b/wmtv/src/wmgeneral/list.c
deleted file mode 100644
index a63562f..000
--- a/wmtv/src/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-INLINE LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-INLINE int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-INLINE void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-INLINE void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-INLINE void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-INLINE LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-INLINE LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return
[PATCH 05/14] wmsm uses libdockapp
wmsm uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmsm.app/wmgeneral/list.c | 169 --
wmsm.app/wmgeneral/list.h | 53 -
wmsm.app/wmgeneral/misc.c | 172 --
wmsm.app/wmgeneral/misc.h | 31 ---
wmsm.app/wmgeneral/wmgeneral.c | 494 -
wmsm.app/wmgeneral/wmgeneral.h | 89
wmsm.app/wmsm/Makefile | 4 +-
wmsm.app/wmsm/wmsm.c | 4 +-
8 files changed, 4 insertions(+), 1012 deletions(-)
delete mode 100644 wmsm.app/wmgeneral/list.c
delete mode 100644 wmsm.app/wmgeneral/list.h
delete mode 100644 wmsm.app/wmgeneral/misc.c
delete mode 100644 wmsm.app/wmgeneral/misc.h
delete mode 100644 wmsm.app/wmgeneral/wmgeneral.c
delete mode 100644 wmsm.app/wmgeneral/wmgeneral.h
diff --git a/wmsm.app/wmgeneral/list.c b/wmsm.app/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmsm.app/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(LinkedList* list)
-{
- if(list)
-{
- list_free(list->tail);
- free(list);
-}
-}
-
-/* Map FUNCTION over all elements in LIST */
-
-void
-list_mapcar(LinkedList* list, void(*function)(void*))
-{
- while(list)
-{
- (*function)(list->head);
- list = list->tail;
-}
-}
diff --git a/wmsm.app/wmgeneral/list.h b/wmsm.app/wmgeneral/list.h
deleted file mode 100644
index 3d6bad5..000
--- a/wmsm.app/wmgeneral/list
[PATCH 06/14] wmcpufreq uses libdockapp
wmcpufreq uses now the new library libdockapp that includes the old wmgeneral library. Signed-off-by: Rodolfo García Peñas (kix) --- wmcpufreq/wmcpufreq/Makefile | 8 +- wmcpufreq/wmcpufreq/wmcpufreq.c | 2 +- wmcpufreq/wmcpufreq/wmcpufreq.c~ | 311 wmcpufreq/wmgeneral/list.c | 169 -- wmcpufreq/wmgeneral/list.h | 53 - wmcpufreq/wmgeneral/misc.c | 172 -- wmcpufreq/wmgeneral/misc.h | 31 --- wmcpufreq/wmgeneral/wmgeneral.c | 494 --- wmcpufreq/wmgeneral/wmgeneral.h | 89 --- 9 files changed, 3 insertions(+), 1326 deletions(-) delete mode 100644 wmcpufreq/wmcpufreq/wmcpufreq.c~ delete mode 100644 wmcpufreq/wmgeneral/list.c delete mode 100644 wmcpufreq/wmgeneral/list.h delete mode 100644 wmcpufreq/wmgeneral/misc.c delete mode 100755 wmcpufreq/wmgeneral/misc.h delete mode 100755 wmcpufreq/wmgeneral/wmgeneral.c delete mode 100755 wmcpufreq/wmgeneral/wmgeneral.h diff --git a/wmcpufreq/wmcpufreq/Makefile b/wmcpufreq/wmcpufreq/Makefile index f9f45a6..226089b 100644 --- a/wmcpufreq/wmcpufreq/Makefile +++ b/wmcpufreq/wmcpufreq/Makefile @@ -3,12 +3,8 @@ CFLAGS = -O2 -Wall INCDIR = -I/usr/X11R6/include DESTDIR= /usr/local/ LIBDIR = -L/usr/X11R6/lib -LIBS = -lXpm -lX11 -lXext -lcpufreq -OBJS = wmcpufreq.o \ - ../wmgeneral/wmgeneral.o \ -../wmgeneral/misc.o \ -../wmgeneral/list.o - +LIBS = -lXpm -lX11 -lXext -lcpufreq -ldockapp +OBJS = wmcpufreq.o .c.o: $(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR) diff --git a/wmcpufreq/wmcpufreq/wmcpufreq.c b/wmcpufreq/wmcpufreq/wmcpufreq.c index d413b2c..4be5d3d 100644 --- a/wmcpufreq/wmcpufreq/wmcpufreq.c +++ b/wmcpufreq/wmcpufreq/wmcpufreq.c @@ -35,7 +35,7 @@ #include #include -#include "../wmgeneral/wmgeneral.h" +#include #include "wmcpufreq_master_1.xpm" #include "wmcpufreq_master_2.xpm" #include "wmcpufreq_master_3.xpm" diff --git a/wmcpufreq/wmcpufreq/wmcpufreq.c~ b/wmcpufreq/wmcpufreq/wmcpufreq.c~ deleted file mode 100644 index 08f4583..000 --- a/wmcpufreq/wmcpufreq/wmcpufreq.c~ +++ /dev/null @@ -1,311 +0,0 @@ - -/*/ -/* piece of code and pixmaps from*/ -/* */ -/* wmspeedfreq ( Tom Kistner ) */ -/* wmppp ( Martijn Pieterse, Antoine Nulle )*/ -/* wmapkill (S.Rozange */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2, or (at your option) */ -/* any later version.*/ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of*/ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program (see the file COPYING); if not, write to the */ -/* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ -/* Boston, MA 02111-1307, USA */ -/* */ -/* you need libcpufreq for the libarary */ -/* and libcpufreq-dev for cpufreq.h */ -/* */ -/* */ -/*/ -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../wmgeneral/wmgeneral.h" -#include "wmcpufreq_master_1.xpm" -#include "wmcpufreq_master_2.xpm" -#include "wmcpufreq_master_3.xpm" -#include "wmcpufreq_mask_1.xbm" -#include "wmcpufreq_mask_2.xbm" -#include "wmcpufreq_mask_3.xbm" - -#define DELAY 2/*nano second */ -#define WMCPUFREQ_VERSION "VERSION 3.0 2009/05/14 \n" -#define LN_PATH 40 -#define MAX_CPU 4 -pid_t execCommand(char *); -void show_mhz(unsigned long*,int); -void show_governor(char* ); -void show_driver(char *); -int show_char(int); -static char **wm_xpm; -static unsigned char *wm_bits; -struct cpufreq_policy *policy; -int cpu=0; -unsigned long min,max,f_m
[PATCH 04/14] wmtz uses libdockapp
wmtz uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmtz/wmgeneral/list.c | 169
wmtz/wmgeneral/list.h | 53 -
wmtz/wmgeneral/misc.c | 172
wmtz/wmgeneral/misc.h | 31 ---
wmtz/wmgeneral/wmgeneral.c | 494 -
wmtz/wmgeneral/wmgeneral.h | 89
wmtz/wmtz/Makefile | 8 +-
wmtz/wmtz/wmtz.c | 4 +-
8 files changed, 4 insertions(+), 1016 deletions(-)
delete mode 100644 wmtz/wmgeneral/list.c
delete mode 100644 wmtz/wmgeneral/list.h
delete mode 100644 wmtz/wmgeneral/misc.c
delete mode 100644 wmtz/wmgeneral/misc.h
delete mode 100644 wmtz/wmgeneral/wmgeneral.c
delete mode 100644 wmtz/wmgeneral/wmgeneral.h
diff --git a/wmtz/wmgeneral/list.c b/wmtz/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmtz/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(LinkedList* list)
-{
- if(list)
-{
- list_free(list->tail);
- free(list);
-}
-}
-
-/* Map FUNCTION over all elements in LIST */
-
-void
-list_mapcar(LinkedList* list, void(*function)(void*))
-{
- while(list)
-{
- (*function)(list->head);
- list = list->tail;
-}
-}
diff --git a/wmtz/wmgeneral/list.h b/wmtz/wmgeneral/list.h
deleted file mode 100644
index 3d6bad5..000
--- a/wmtz/wmgeneral/list.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Generic single linked list to keep
[PATCH 08/14] wmSMPmon uses libdockapp
wmSMPmon uses now the new library libdockapp that includes the old wmgeneral library. Signed-off-by: Rodolfo García Peñas (kix) --- wmSMPmon/wmSMPmon/Makefile | 5 +- wmSMPmon/wmSMPmon/wmSMPmon.c | 2 +- wmSMPmon/wmgeneral/wmgeneral.c | 494 - wmSMPmon/wmgeneral/wmgeneral.h | 89 4 files changed, 3 insertions(+), 587 deletions(-) delete mode 100644 wmSMPmon/wmgeneral/wmgeneral.c delete mode 100644 wmSMPmon/wmgeneral/wmgeneral.h diff --git a/wmSMPmon/wmSMPmon/Makefile b/wmSMPmon/wmSMPmon/Makefile index c45e415..20e43fe 100644 --- a/wmSMPmon/wmSMPmon/Makefile +++ b/wmSMPmon/wmSMPmon/Makefile @@ -7,7 +7,7 @@ MANDIR=/usr/local/share/man/ OS := $(shell uname -s) -SRC = general.c ../wmgeneral/wmgeneral.c wmSMPmon.c +SRC = general.c wmSMPmon.c EXE = wmSMPmon MAN = wmSMPmon.1 OBJ = $(SRC:.c=.o) @@ -16,7 +16,7 @@ INSTALLEXEFLAGS = -m 755 -s INSTALLMANFLAGS = -m 644 CC = gcc CFLAGS = -Wall -O2 -g -LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11 +LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11 -ldockapp ifeq ($(OS),Linux) SRC += sysinfo-linux.c @@ -35,7 +35,6 @@ $(OBJ): %.o : %.c clean: rm -rf $(EXE) rm -rf *.o - rm -rf ../wmgeneral/*.o install: $(INSTALL) $(INSTALLEXEFLAGS) $(EXE) $(BINDIR) diff --git a/wmSMPmon/wmSMPmon/wmSMPmon.c b/wmSMPmon/wmSMPmon/wmSMPmon.c index 3db6370..b6743ff 100644 --- a/wmSMPmon/wmSMPmon/wmSMPmon.c +++ b/wmSMPmon/wmSMPmon/wmSMPmon.c @@ -16,7 +16,7 @@ CURRENT MAINTAINER: Thomas Ribbrock #include #include #include -#include "../wmgeneral/wmgeneral.h" +#include #include "wmSMPmon_master.xpm" #include "wmSMPmon_mask.xbm" #include "general.h" diff --git a/wmSMPmon/wmgeneral/wmgeneral.c b/wmSMPmon/wmgeneral/wmgeneral.c deleted file mode 100644 index c624193..000 --- a/wmSMPmon/wmgeneral/wmgeneral.c +++ /dev/null @@ -1,494 +0,0 @@ -/* - wmgeneral was taken from wmppp. - - It has a lot of routines which most of the wm* programs use. - - - - Copyright (C) 1998 Martijn Pieterse (piete...@xs4all.nl) - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. - - --- - CHANGES: - --- - 10/10/2003 (Simon Law, sfl...@debian.org) - * changed the parse_rcfile function to use getline instead of - fgets. - 10/14/2000 (Chris Gray, cg...@tribsoft.com) - * Removed a bug from parse_rcfile. An extra - newline would cause a segfault. - 14/09/1998 (Dave Clark, cla...@skyia.com) - * Updated createXBMfromXPM routine - * Now supports >256 colors - 11/09/1998 (Martijn Pieterse, piete...@xs4all.nl) - * Removed a bug from parse_rcfile. You could - not use "start" in a command if a label was - also start. - * Changed the needed geometry string. - We don't use window size, and don't support - negative positions. - 03/09/1998 (Martijn Pieterse, piete...@xs4all.nl) - * Added parse_rcfile2 - 02/09/1998 (Martijn Pieterse, piete...@xs4all.nl) - * Added -geometry support (untested) - 28/08/1998 (Martijn Pieterse, piete...@xs4all.nl) - * Added createXBMfromXPM routine - * Saves a lot of work with changing xpm's. - 02/05/1998 (Martijn Pieterse, piete...@xs4all.nl) - * changed the read_rc_file to parse_rcfile, as suggested by - Marcelo E. Magallon - * debugged the parse_rc file. - 30/04/1998 (Martijn Pieterse, piete...@xs4all.nl) - * Ripped similar code from all the wm* programs, - and put them in a single file. - -*/ - -#define _POSIX_C_SOURCE 200809L -#include "wmgeneral.h" -#include/* for XCopyArea, etc */ -#include /* for XSizeHints, XWMHints, etc */ -#include/* for XShapeCombineMask */ -#include /* for ShapeBounding, ShapeSet */ -#include /* for XpmAttributes, Pixel, etc */ -#include /* for size_t */ -#includ
[PATCH 11/14] wmsun uses libdockapp
wmsun uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmsun/Makefile | 4 +-
wmsun/wmgeneral/wmgeneral.c | 494
wmsun/wmgeneral/wmgeneral.h | 89
wmsun/wmsun.c | 2 +-
4 files changed, 3 insertions(+), 586 deletions(-)
delete mode 100644 wmsun/wmgeneral/wmgeneral.c
delete mode 100644 wmsun/wmgeneral/wmgeneral.h
diff --git a/wmsun/Makefile b/wmsun/Makefile
index 20e26a6..c369435 100644
--- a/wmsun/Makefile
+++ b/wmsun/Makefile
@@ -10,13 +10,13 @@ INSTALL = install
#
# For Linux (and other?) Machines...
#
-LIBS = -lXpm -lX11 -lXext -lm
+LIBS = -lXpm -lX11 -lXext -lm -ldockapp
#
# For Sun Solaris Machines (I know it compiles on 2.6)...
#
# LIBS = -lXpm -lX11 -lXext -lsocket
-OBJS = wmsun.o SunRise.o wmgeneral/wmgeneral.o
+OBJS = wmsun.o SunRise.o
.c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
diff --git a/wmsun/wmgeneral/wmgeneral.c b/wmsun/wmgeneral/wmgeneral.c
deleted file mode 100644
index c624193..000
--- a/wmsun/wmgeneral/wmgeneral.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- wmgeneral was taken from wmppp.
-
- It has a lot of routines which most of the wm* programs use.
-
-
-
- Copyright (C) 1998 Martijn Pieterse (piete...@xs4all.nl)
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- ---
- CHANGES:
- ---
- 10/10/2003 (Simon Law, sfl...@debian.org)
- * changed the parse_rcfile function to use getline instead of
- fgets.
- 10/14/2000 (Chris Gray, cg...@tribsoft.com)
- * Removed a bug from parse_rcfile. An extra
- newline would cause a segfault.
- 14/09/1998 (Dave Clark, cla...@skyia.com)
- * Updated createXBMfromXPM routine
- * Now supports >256 colors
- 11/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Removed a bug from parse_rcfile. You could
- not use "start" in a command if a label was
- also start.
- * Changed the needed geometry string.
- We don't use window size, and don't support
- negative positions.
- 03/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Added parse_rcfile2
- 02/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Added -geometry support (untested)
- 28/08/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Added createXBMfromXPM routine
- * Saves a lot of work with changing xpm's.
- 02/05/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * changed the read_rc_file to parse_rcfile, as suggested by
- Marcelo E. Magallon
- * debugged the parse_rc file.
- 30/04/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Ripped similar code from all the wm* programs,
- and put them in a single file.
-
-*/
-
-#define _POSIX_C_SOURCE 200809L
-#include "wmgeneral.h"
-#include/* for XCopyArea, etc */
-#include /* for XSizeHints, XWMHints, etc */
-#include/* for XShapeCombineMask */
-#include /* for ShapeBounding, ShapeSet */
-#include /* for XpmAttributes, Pixel, etc */
-#include /* for size_t */
-#include /* for fprintf, stderr, NULL, etc */
-#include /* for exit, free */
-#include /* for strcmp, strdup, strcspn, etc */
-
- /*/
- /* X11 Variables */
-/*/
-
-Window Root;
-intscreen;
-intx_fd;
-intd_depth;
-XSizeHints mysizehints;
-XWMHints mywmhints;
-Pixel back_pix, fore_pix;
-Window iconwin, win;
-GC NormalGC;
-XpmIconwmgen;
-Pixmap pixmask;
-
- /*/
- /* Mouse Regions */
-/*/
-
-typedef struct {
- int enable;
- int top;
- int
[PATCH 10/14] wmifs uses libdockapp
wmifs uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmifs/Makefile | 7 +-
wmifs/wmgeneral/list.c | 169 ---
wmifs/wmgeneral/list.h | 53 -
wmifs/wmgeneral/misc.c | 172 ---
wmifs/wmgeneral/misc.h | 31 ---
wmifs/wmgeneral/wmgeneral.c | 494
wmifs/wmgeneral/wmgeneral.h | 89
wmifs/wmifs.c | 4 +-
8 files changed, 4 insertions(+), 1015 deletions(-)
mode change 100755 => 100644 wmifs/Makefile
delete mode 100644 wmifs/wmgeneral/list.c
delete mode 100644 wmifs/wmgeneral/list.h
delete mode 100644 wmifs/wmgeneral/misc.c
delete mode 100644 wmifs/wmgeneral/misc.h
delete mode 100644 wmifs/wmgeneral/wmgeneral.c
delete mode 100644 wmifs/wmgeneral/wmgeneral.h
diff --git a/wmifs/Makefile b/wmifs/Makefile
old mode 100755
new mode 100644
index e442ed3..139877d
--- a/wmifs/Makefile
+++ b/wmifs/Makefile
@@ -6,11 +6,8 @@ man1dir=${mandir}/man1
CONF=/etc
CC = gcc
-LIBS = -lXpm -lXext -lX11
-OBJS = wmifs.o \
- wmgeneral/wmgeneral.o \
- wmgeneral/misc.o \
- wmgeneral/list.o
+LIBS = -lXpm -lXext -lX11 -ldockapp
+OBJS = wmifs.o
CFLAGS = -Wall -O2 -g
diff --git a/wmifs/wmgeneral/list.c b/wmifs/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmifs/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(L
[PATCH 09/14] wmckgmail uses libdockapp
wmckgmail uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmckgmail/wmckgmail/Makefile| 8 +-
wmckgmail/wmckgmail/wmckgmail.c | 4 +-
wmckgmail/wmgeneral/list.c | 169 --
wmckgmail/wmgeneral/list.h | 53 -
wmckgmail/wmgeneral/misc.c | 172 --
wmckgmail/wmgeneral/misc.h | 31 ---
wmckgmail/wmgeneral/wmgeneral.c | 494
wmckgmail/wmgeneral/wmgeneral.h | 89
8 files changed, 4 insertions(+), 1016 deletions(-)
delete mode 100644 wmckgmail/wmgeneral/list.c
delete mode 100644 wmckgmail/wmgeneral/list.h
delete mode 100644 wmckgmail/wmgeneral/misc.c
delete mode 100644 wmckgmail/wmgeneral/misc.h
delete mode 100644 wmckgmail/wmgeneral/wmgeneral.c
delete mode 100644 wmckgmail/wmgeneral/wmgeneral.h
diff --git a/wmckgmail/wmckgmail/Makefile b/wmckgmail/wmckgmail/Makefile
index 571d741..790d76a 100644
--- a/wmckgmail/wmckgmail/Makefile
+++ b/wmckgmail/wmckgmail/Makefile
@@ -3,13 +3,9 @@
# release date : September 09, 2006
LIBDIR = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11 -lm
+LIBS = -lXpm -lXext -lX11 -lm -ldockapp
FLAGS = -O2
-OBJS = wmckgmail.o \
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
- ../wmgeneral/list.o
-
+OBJS = wmckgmail.o
.c.o:
cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
diff --git a/wmckgmail/wmckgmail/wmckgmail.c b/wmckgmail/wmckgmail/wmckgmail.c
index 66b7381..e0542d1 100644
--- a/wmckgmail/wmckgmail/wmckgmail.c
+++ b/wmckgmail/wmckgmail/wmckgmail.c
@@ -28,8 +28,8 @@
#include
#include
-#include "../wmgeneral/wmgeneral.h"
-#include "../wmgeneral/misc.h"
+#include
+#include
#include "wmckgmail.xpm"
diff --git a/wmckgmail/wmgeneral/list.c b/wmckgmail/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmckgmail/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
[PATCH 13/14] wmppp.app uses libdockapp
wmppp.app uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmppp.app/Makefile | 7 +-
wmppp.app/wmgeneral/list.c | 169 --
wmppp.app/wmgeneral/list.h | 53 -
wmppp.app/wmgeneral/misc.c | 172 --
wmppp.app/wmgeneral/misc.h | 31 ---
wmppp.app/wmgeneral/wmgeneral.c | 494
wmppp.app/wmgeneral/wmgeneral.h | 89
wmppp.app/wmppp.c | 4 +-
8 files changed, 4 insertions(+), 1015 deletions(-)
delete mode 100644 wmppp.app/wmgeneral/list.c
delete mode 100644 wmppp.app/wmgeneral/list.h
delete mode 100644 wmppp.app/wmgeneral/misc.c
delete mode 100644 wmppp.app/wmgeneral/misc.h
delete mode 100644 wmppp.app/wmgeneral/wmgeneral.c
delete mode 100644 wmppp.app/wmgeneral/wmgeneral.h
diff --git a/wmppp.app/Makefile b/wmppp.app/Makefile
index ffa7ace..8329c65 100644
--- a/wmppp.app/Makefile
+++ b/wmppp.app/Makefile
@@ -1,8 +1,5 @@
-LIBS = -lXpm -lXext -lX11
-OBJS = wmppp.o \
- wmgeneral/wmgeneral.o \
- wmgeneral/misc.o \
- wmgeneral/list.o
+LIBS = -lXpm -lXext -lX11 -ldockapp
+OBJS = wmppp.o
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
diff --git a/wmppp.app/wmgeneral/list.c b/wmppp.app/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmppp.app/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(LinkedList* li
[PATCH 14/14] wmitime uses libdockapp
wmitime uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmitime/Makefile | 4 +-
wmitime/wmgeneral/list.c | 169 ---
wmitime/wmgeneral/list.h | 53 -
wmitime/wmgeneral/misc.c | 172 ---
wmitime/wmgeneral/misc.h | 31 ---
wmitime/wmgeneral/wmgeneral.c | 494 --
wmitime/wmgeneral/wmgeneral.h | 89
wmitime/wmitime.c | 2 +-
8 files changed, 3 insertions(+), 1011 deletions(-)
delete mode 100644 wmitime/wmgeneral/list.c
delete mode 100644 wmitime/wmgeneral/list.h
delete mode 100644 wmitime/wmgeneral/misc.c
delete mode 100644 wmitime/wmgeneral/misc.h
delete mode 100644 wmitime/wmgeneral/wmgeneral.c
delete mode 100644 wmitime/wmgeneral/wmgeneral.h
diff --git a/wmitime/Makefile b/wmitime/Makefile
index d10139e..796b90f 100644
--- a/wmitime/Makefile
+++ b/wmitime/Makefile
@@ -1,6 +1,6 @@
-LIBS = -lXpm -lXext -lX11 -lm
+LIBS = -lXpm -lXext -lX11 -lm -ldockapp
CFLAGS = -O2 -Wall
-OBJS = wmitime.o wmgeneral/wmgeneral.o
+OBJS = wmitime.o
INSTALL = install
PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
diff --git a/wmitime/wmgeneral/list.c b/wmitime/wmgeneral/list.c
deleted file mode 100644
index 0b69885..000
--- a/wmitime/wmgeneral/list.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Generic single linked list to keep various information
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-
-Author: Kresten Krab Thorup
-
-Many modifications by Alfredo K. Kojima
-
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301 USA. */
-
-/* As a special exception, if you link this library with files compiled with
- GCC to produce an executable, this does not cause the resulting executable
- to be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU General Public License. */
-
-#include "list.h"
-#ifdef HAVE_SYS_TYPES_H
-# include
-#endif
-#include
-
-/* Return a cons cell produced from (head . tail) */
-
-LinkedList*
-list_cons(void* head, LinkedList* tail)
-{
- LinkedList* cell;
-
- cell = (LinkedList*)malloc(sizeof(LinkedList));
- cell->head = head;
- cell->tail = tail;
- return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-int
-list_length(LinkedList* list)
-{
- int i = 0;
- while(list)
-{
- i += 1;
- list = list->tail;
-}
- return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero. If N
- larger than the list length, NULL is returned */
-
-void*
-list_nth(int index, LinkedList* list)
-{
- while(index-- != 0)
-{
- if(list->tail)
- list = list->tail;
- else
- return 0;
-}
- return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-void
-list_remove_head(LinkedList** list)
-{
- if (!*list) return;
- if ((*list)->tail)
-{
- LinkedList* tail = (*list)->tail; /* fetch next */
- *(*list) = *tail;/* copy next to list head */
- free(tail); /* free next */
-}
- else /* only one element in list */
-{
- free(*list);
- (*list) = 0;
-}
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-/*
-void
-list_remove_elem(LinkedList** list, void* elem)
-{
- while (*list)
-{
- if ((*list)->head == elem)
-list_remove_head(list);
- *list = (*list ? (*list)->tail : NULL);
-}
-}*/
-
-LinkedList *
-list_remove_elem(LinkedList* list, void* elem)
-{
-LinkedList *tmp;
-
-if (list) {
- if (list->head == elem) {
- tmp = list->tail;
- free(list);
- return tmp;
- }
- list->tail = list_remove_elem(list->tail, elem);
- return list;
-}
-return NULL;
-}
-
-
-/* Return element that has ELEM as car */
-
-LinkedList*
-list_find(LinkedList* list, void* elem)
-{
- while(list)
-{
-if (list->head == elem)
- return list;
-list = list->tail;
-}
- return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-void
-list_free(LinkedList* list)
-{
- if(list)
-{
- list_free(list->tail);
- free(list);
-}
-}
[PATCH 12/14] wmfsm uses libdockapp
wmfsm uses now the new library libdockapp that includes the old
wmgeneral library.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmfsm/Makefile.am | 3 +-
wmfsm/configure.ac | 4 +-
wmfsm/wmfsm/Makefile.am | 2 +-
wmfsm/wmfsm/wmfsm.c | 2 +-
wmfsm/wmgeneral/Makefile.am | 2 -
wmfsm/wmgeneral/wmgeneral.c | 494
wmfsm/wmgeneral/wmgeneral.h | 89
7 files changed, 5 insertions(+), 591 deletions(-)
delete mode 100644 wmfsm/wmgeneral/Makefile.am
delete mode 100644 wmfsm/wmgeneral/wmgeneral.c
delete mode 100644 wmfsm/wmgeneral/wmgeneral.h
diff --git a/wmfsm/Makefile.am b/wmfsm/Makefile.am
index 840b1ea..d7a47c0 100644
--- a/wmfsm/Makefile.am
+++ b/wmfsm/Makefile.am
@@ -1,4 +1,3 @@
-
-SUBDIRS = wmgeneral wmfsm
+SUBDIRS = wmfsm
EXTRA_DIST = ChangeLog.old
diff --git a/wmfsm/configure.ac b/wmfsm/configure.ac
index 4ae8cc8..d3bbdc7 100644
--- a/wmfsm/configure.ac
+++ b/wmfsm/configure.ac
@@ -14,7 +14,7 @@ AC_PROG_RANLIB
dnl Checks for libraries
AC_PATH_XTRA
-X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext"
+X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext -ldockapp"
AC_SUBST(X11LIBS)
AC_MSG_CHECKING([to see if we can use X])
AC_TRY_LINK([#include ],,AC_MSG_RESULT([yes]),AC_MSG_RESULT([no]);
exit 1)
@@ -76,5 +76,5 @@ echo "configuring for ${with_xpm} appearance..."
rm -f wmfsm/wmfsm_master.xpm
ln -sr ${xpm} wmfsm/wmfsm_master.xpm
-AC_OUTPUT(Makefile wmfsm/Makefile wmgeneral/Makefile)
+AC_OUTPUT(Makefile wmfsm/Makefile)
diff --git a/wmfsm/wmfsm/Makefile.am b/wmfsm/wmfsm/Makefile.am
index f315429..7c1a792 100644
--- a/wmfsm/wmfsm/Makefile.am
+++ b/wmfsm/wmfsm/Makefile.am
@@ -4,7 +4,7 @@ wmfsm_SOURCES = wmfsm.c
else
wmfsm_SOURCES = wmfsm.c getopt.c getopt1.c getopt.h
endif
-wmfsm_LDADD = ../wmgeneral/libwmgeneral.a @LIBS@ @X11LIBS@ @X_LIBS@
@X_EXTRA_LIBS@
+wmfsm_LDADD = @LIBS@ @X11LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
man_MANS = wmfsm.1
dist_pkgdata_DATA = wmfsm_master_highcolor.xpm wmfsm_master_cyan.xpm \
wmfsm_master_lowcolor.xpm
diff --git a/wmfsm/wmfsm/wmfsm.c b/wmfsm/wmfsm/wmfsm.c
index 1eb5185..46c5395 100644
--- a/wmfsm/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm/wmfsm.c
@@ -42,7 +42,7 @@
#include
#include
#include
-#include "../wmgeneral/wmgeneral.h"
+#include
#include "wmfsm_master.xpm"
#include "wmfsm_mask.xbm"
diff --git a/wmfsm/wmgeneral/Makefile.am b/wmfsm/wmgeneral/Makefile.am
deleted file mode 100644
index e28baa9..000
--- a/wmfsm/wmgeneral/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-noinst_LIBRARIES = libwmgeneral.a
-libwmgeneral_a_SOURCES = wmgeneral.c wmgeneral.h
diff --git a/wmfsm/wmgeneral/wmgeneral.c b/wmfsm/wmgeneral/wmgeneral.c
deleted file mode 100644
index c624193..000
--- a/wmfsm/wmgeneral/wmgeneral.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- wmgeneral was taken from wmppp.
-
- It has a lot of routines which most of the wm* programs use.
-
-
-
- Copyright (C) 1998 Martijn Pieterse (piete...@xs4all.nl)
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- ---
- CHANGES:
- ---
- 10/10/2003 (Simon Law, sfl...@debian.org)
- * changed the parse_rcfile function to use getline instead of
- fgets.
- 10/14/2000 (Chris Gray, cg...@tribsoft.com)
- * Removed a bug from parse_rcfile. An extra
- newline would cause a segfault.
- 14/09/1998 (Dave Clark, cla...@skyia.com)
- * Updated createXBMfromXPM routine
- * Now supports >256 colors
- 11/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Removed a bug from parse_rcfile. You could
- not use "start" in a command if a label was
- also start.
- * Changed the needed geometry string.
- We don't use window size, and don't support
- negative positions.
- 03/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Added parse_rcfile2
- 02/09/1998 (Martijn Pieterse, piete...@xs4all.nl)
- * Added -geometry support (untested)
- 28/08/1998 (Martijn Pieterse, piete...@xs4
Re: [PATCH 01/14] wmkeys compilation bugs
Hi,
I modified all other dockapps.
The wmbiff dockapp includes a different wmgeneral library. This
dockapp doesn't compile. I don't include this new code in libdockapps
because include code of application that doesn't compile IMO is not a
good idea.
Probably we should try to compile the wmbiff dockapps, and then, think
about include or not the three new functions in libdockapp.
Cheers,
kix
"Rodolfo García Peñas (kix)" escribió:
This patch solves a bug and a warning:
- The dockapp wmkeys uses the getline function, that is the same
function provided by stdio.h. This patch changes the function
name to getline_wmkeys.
- The main function returns void, and should return integer. This
patch includes the return 0 at the function end and it changes
the function prototype.
Signed-off-by: Rodolfo García Peñas (kix)
---
wmkeys/wmkeys.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/wmkeys/wmkeys.c b/wmkeys/wmkeys.c
index 718ccd5..72d98e7 100644
--- a/wmkeys/wmkeys.c
+++ b/wmkeys/wmkeys.c
@@ -94,7 +94,7 @@ void enable_configuration(int n);
* Main
*/
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
num_configs = 0;
current_config = 0;
@@ -105,6 +105,8 @@ void main(int argc, char *argv[])
read_config();
wmkeys_routine(argc, argv);
+
+ return 0;
}
/*
@@ -179,7 +181,7 @@ void draw_string(char* s)
* getline()
*/
-int getline(FILE* pfile, char* s, int lim)
+int getline_wmkeys(FILE* pfile, char* s, int lim)
{
int c = 0, i;
for(i=0; i
Rodolfo García Peñas (kix)
http://www.kix.es/
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 01/14] wmkeys compilation bugs
On 08/15/2015 06:29 PM, Rodolfo García Peñas (kix) wrote: > I modified all other dockapps. Thanks for doing this! > The wmbiff dockapp includes a different wmgeneral library. This dockapp > doesn't compile. I don't include this new code in libdockapps because > include code of application that doesn't compile IMO is not a good idea. > > Probably we should try to compile the wmbiff dockapps, and then, think > about include or not the three new functions in libdockapp. This is something I've looked at a little bit. I have a branch [1] with a partially working wmbiff which uses the shared wmgeneral library (after adding the wmbiff-specific functions to the library, as you mentioned). However, wmbiff is special in that it allows non-64x64 windows, and this is the main diverence from the main wmgeneral functions. I haven't gotten around to solving this issue yet. Doug [1] https://github.com/d-torrance/dockapps/tree/update-wmbiff -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
Re: [PATCH 01/14] wmkeys compilation bugs
Doug Torrance escribió:
On 08/15/2015 06:29 PM, Rodolfo García Peñas (kix) wrote:
I modified all other dockapps.
Thanks for doing this!
The wmbiff dockapp includes a different wmgeneral library. This dockapp
doesn't compile. I don't include this new code in libdockapps because
include code of application that doesn't compile IMO is not a good idea.
Probably we should try to compile the wmbiff dockapps, and then, think
about include or not the three new functions in libdockapp.
This is something I've looked at a little bit. I have a branch [1] with
a partially working wmbiff which uses the shared wmgeneral library
(after adding the wmbiff-specific functions to the library, as you
mentioned).
However, wmbiff is special in that it allows non-64x64 windows, and this
is the main diverence from the main wmgeneral functions. I haven't
gotten around to solving this issue yet.
Doug
[1] https://github.com/d-torrance/dockapps/tree/update-wmbiff
Hi Doug,
we can compile it with this little change in tlsComm.c:
-struct connection_state *initialize_gnutls(UNUSED(int sd),
+struct connection_state *initialize_gnutls(UNUSED(intptr_t sd),
I did the changes to run using wmgeneral, are attached for your testing.
About the size, I don't know, I need more time.
Cheers,
kix
Rodolfo García Peñas (kix)
http://www.kix.es/
>From b465e053f6153c477eba250ecab9305c6c658148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?=
Date: Sat, 15 Aug 2015 23:47:29 +0200
Subject: [PATCH 1/2] Include the wmbiff functions of wmgeneral.
The wmbiff application included some functions in wmgeneral. We need
include these functions in the libdockapp library. Probably we should
analize if these functions should be included in wmbiff and removed
from here.
---
libdockapp/src/wmgeneral.c | 39 +++
libdockapp/src/wmgeneral.h | 8
2 files changed, 47 insertions(+)
diff --git a/libdockapp/src/wmgeneral.c b/libdockapp/src/wmgeneral.c
index c624193..5511a31 100644
--- a/libdockapp/src/wmgeneral.c
+++ b/libdockapp/src/wmgeneral.c
@@ -84,6 +84,7 @@ Pixel back_pix, fore_pix;
Window iconwin, win;
GC NormalGC;
XpmIcon wmgen;
+XpmIcon wmgen_bkg;
Pixmap pixmask;
/*/
@@ -378,6 +379,44 @@ void copyXBMArea(int x, int y, int sx, int sy, int dx, int dy) {
}
+/* added for wmbiff */
+XFontStruct *f;
+int loadFont(const char *fontname)
+{
+ if (display != NULL) {
+ f = XLoadQueryFont(display, fontname);
+ if (f) {
+ XSetFont(display, NormalGC, f->fid);
+ return 0;
+ } else {
+ printf("couldn't set font!\n");
+ }
+ }
+ return -1;
+}
+
+void drawString(int dest_x, int dest_y, const char *string,
+const char *colorname, const char *bgcolorname,
+int right_justify)
+{
+ int len = strlen(string);
+ XSetForeground(display, NormalGC, GetColor((char *) colorname));
+ XSetBackground(display, NormalGC, GetColor((char *) bgcolorname));
+ if (right_justify)
+ dest_x -= XTextWidth(f, string, len);
+ XDrawImageString(display, wmgen_bkg.pixmap, NormalGC, dest_x, dest_y,
+ string, len);
+}
+
+void eraseRect(int x, int y, int x2, int y2, const char *bgcolorname)
+{
+ XSetForeground(display, NormalGC, GetColor((char *) bgcolorname));
+ XFillRectangle(display, wmgen_bkg.pixmap, NormalGC, x, y, x2 - x,
+ y2 - y);
+}
+
+/* end wmbiff additions */
+
/***\
|* setMaskXY *|
\***/
diff --git a/libdockapp/src/wmgeneral.h b/libdockapp/src/wmgeneral.h
index c3454c5..620f4de 100644
--- a/libdockapp/src/wmgeneral.h
+++ b/libdockapp/src/wmgeneral.h
@@ -86,4 +86,12 @@ void setMaskXY(int, int);
void parse_rcfile(const char *, rckeys *);
+/* for wmbiff */
+int loadFont(const char *fontname); /* -1 on fail, 0 success. */
+void drawString(int dest_x, int dest_y, const char *string,
+const char *colorname, const char *bgcolorname,
+int right_justify);
+void eraseRect(int x, int y, int x2, int y2, const char *bgcolorname);
+/* end wmbiff */
+
#endif
--
2.5.0
>From 1ccb7be60ad49b035e36ae056f8706f4f250c97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?=
Date: Sun, 16 Aug 2015 00:20:40 +0200
Subject: [PATCH 2/2] wmbiff
---
wmbiff/Makefile.am | 3 +-
wmbiff/configure.ac | 4 +-
wmbiff/wmbiff/Makefile.am| 4 +-
wmbiff/wmbiff/wmbiff.c | 27 +-
wmbiff/wmgeneral/Makefile.am | 10 -
wmbiff/wmgeneral/misc.c | 34 ---
wmbiff/wmgeneral/misc.h | 9 -
wmbiff/wmgeneral/wmgeneral.c | 621 ---
wmbiff/wmgeneral/wmgeneral.h | 69 -
9 files changed, 21 insertions(+), 760 deletions(-)
delete mode 100644 wmbiff/wmgeneral/Makefile.am
delete mode 100644 wmbiff/wmgeneral/misc.c
delete mode 100644 wmbiff/wmgeneral/misc.h
delete mode 10
