diff -c -r -N /tmp/blackbox-0.60.3/src/BaseDisplay.cc /home2/shaleh/testing/blackbox-0.60.3/src/BaseDisplay.cc *** /tmp/blackbox-0.60.3/src/BaseDisplay.cc Tue May 23 10:14:40 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/BaseDisplay.cc Mon Jun 5 12:55:45 2000 *************** *** 194,208 **** } - // convenience funciton - char *bstrdup(const char *s) { - int l = strlen(s) + 1; - char *n = new char[l]; - strncpy(n, s, l); - return n; - } - - BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) { application_name = app_name; --- 194,199 ---- diff -c -r -N /tmp/blackbox-0.60.3/src/BaseDisplay.hh /home2/shaleh/testing/blackbox-0.60.3/src/BaseDisplay.hh *** /tmp/blackbox-0.60.3/src/BaseDisplay.hh Sun May 21 19:34:14 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/BaseDisplay.hh Mon Jun 5 12:40:46 2000 *************** *** 62,71 **** #define PropBlackboxHintsElements (5) #define PropBlackboxAttributesElements (8) - char *bstrdup(const char *); - template inline Z min(Z a, Z b) { return ((a < b) ? a : b); } - template inline Z max(Z a, Z b) { return ((a > b) ? a : b); } - class BaseDisplay { private: struct cursor { --- 62,67 ---- diff -c -r -N /tmp/blackbox-0.60.3/src/Basemenu.cc /home2/shaleh/testing/blackbox-0.60.3/src/Basemenu.cc *** /tmp/blackbox-0.60.3/src/Basemenu.cc Tue May 23 01:40:14 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Basemenu.cc Mon Jun 5 12:58:41 2000 *************** *** 33,38 **** --- 33,39 ---- #include "blackbox.hh" #include "Basemenu.hh" #include "Screen.hh" + #include "Util.hh" #ifdef HAVE_STDIO_H # include diff -c -r -N /tmp/blackbox-0.60.3/src/Image.cc /home2/shaleh/testing/blackbox-0.60.3/src/Image.cc *** /tmp/blackbox-0.60.3/src/Image.cc Tue May 23 13:28:58 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Image.cc Mon Jun 5 12:59:42 2000 *************** *** 32,37 **** --- 32,38 ---- #include "i18n.hh" #include "BaseDisplay.hh" #include "Image.hh" + #include "Util.hh" #ifdef HAVE_SYS_TYPES_H # include diff -c -r -N /tmp/blackbox-0.60.3/src/Makefile.in /home2/shaleh/testing/blackbox-0.60.3/src/Makefile.in *** /tmp/blackbox-0.60.3/src/Makefile.in Thu May 25 10:52:08 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Makefile.in Mon Jun 5 13:08:30 2000 *************** *** 103,109 **** bin_PROGRAMS = blackbox ! blackbox_SOURCES = BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Icon.cc Image.cc LinkedList.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc blackbox.cc i18n.cc main.cc MAINTAINERCLEANFILES = Makefile.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 103,109 ---- bin_PROGRAMS = blackbox ! blackbox_SOURCES = BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Icon.cc Image.cc LinkedList.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc blackbox.cc i18n.cc main.cc Util.cc MAINTAINERCLEANFILES = Makefile.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 122,128 **** blackbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.o \ Icon.o Image.o LinkedList.o Netizen.o Rootmenu.o Screen.o Slit.o \ Timer.o Toolbar.o Window.o Windowmenu.o Workspace.o Workspacemenu.o \ ! blackbox.o i18n.o main.o blackbox_LDADD = $(LDADD) blackbox_DEPENDENCIES = blackbox_LDFLAGS = --- 122,128 ---- blackbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.o \ Icon.o Image.o LinkedList.o Netizen.o Rootmenu.o Screen.o Slit.o \ Timer.o Toolbar.o Window.o Windowmenu.o Workspace.o Workspacemenu.o \ ! Util.o blackbox.o i18n.o main.o blackbox_LDADD = $(LDADD) blackbox_DEPENDENCIES = blackbox_LDFLAGS = diff -c -r -N /tmp/blackbox-0.60.3/src/Screen.cc /home2/shaleh/testing/blackbox-0.60.3/src/Screen.cc *** /tmp/blackbox-0.60.3/src/Screen.cc Tue May 23 01:42:36 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Screen.cc Mon Jun 5 13:01:13 2000 *************** *** 38,43 **** --- 38,44 ---- #include "Icon.hh" #include "Image.hh" #include "Screen.hh" + #include "Util.hh" #ifdef SLIT #include "Slit.hh" diff -c -r -N /tmp/blackbox-0.60.3/src/Util.cc /home2/shaleh/testing/blackbox-0.60.3/src/Util.cc *** /tmp/blackbox-0.60.3/src/Util.cc Wed Dec 31 16:00:00 1969 --- /home2/shaleh/testing/blackbox-0.60.3/src/Util.cc Mon Jun 5 13:11:59 2000 *************** *** 0 **** --- 1,20 ---- + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif // _GNU_SOURCE + + #ifdef HAVE_CONFIG_H + # include "../config.h" + #endif // HAVE_CONFIG_H + + #ifdef STDC_HEADERS + # include + # include + #endif // STDC_HEADERS + + // convenience funciton + char *bstrdup(const char *s) { + int l = strlen(s) + 1; + char *n = new char[l]; + strncpy(n, s, l); + return n; + } diff -c -r -N /tmp/blackbox-0.60.3/src/Util.hh /home2/shaleh/testing/blackbox-0.60.3/src/Util.hh *** /tmp/blackbox-0.60.3/src/Util.hh Wed Dec 31 16:00:00 1969 --- /home2/shaleh/testing/blackbox-0.60.3/src/Util.hh Mon Jun 5 12:30:03 2000 *************** *** 0 **** --- 1,8 ---- + #ifndef __Util_hh + #define __Util_hh + + char *bstrdup(const char *); + template inline Z min(Z a, Z b) { return ((a < b) ? a : b); } + template inline Z max(Z a, Z b) { return ((a > b) ? a : b); } + + #endif diff -c -r -N /tmp/blackbox-0.60.3/src/Window.cc /home2/shaleh/testing/blackbox-0.60.3/src/Window.cc *** /tmp/blackbox-0.60.3/src/Window.cc Thu May 25 20:17:12 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Window.cc Mon Jun 5 13:03:10 2000 *************** *** 37,42 **** --- 37,43 ---- #include "Window.hh" #include "Windowmenu.hh" #include "Workspace.hh" + #include "Util.hh" #ifdef SLIT # include "Slit.hh" diff -c -r -N /tmp/blackbox-0.60.3/src/Workspace.cc /home2/shaleh/testing/blackbox-0.60.3/src/Workspace.cc *** /tmp/blackbox-0.60.3/src/Workspace.cc Thu May 25 20:12:57 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/Workspace.cc Mon Jun 5 13:04:29 2000 *************** *** 40,45 **** --- 40,46 ---- #include "Window.hh" #include "Workspace.hh" #include "Windowmenu.hh" + #include "Util.hh" #ifdef HAVE_STDIO_H # include diff -c -r -N /tmp/blackbox-0.60.3/src/blackbox.cc /home2/shaleh/testing/blackbox-0.60.3/src/blackbox.cc *** /tmp/blackbox-0.60.3/src/blackbox.cc Sun May 21 22:28:39 2000 --- /home2/shaleh/testing/blackbox-0.60.3/src/blackbox.cc Mon Jun 5 13:05:02 2000 *************** *** 54,59 **** --- 54,60 ---- #include "Window.hh" #include "Workspace.hh" #include "Workspacemenu.hh" + #include "Util.hh" #ifdef HAVE_STDIO_H # include