Hi, I have some patches here:
- Enable FILE_MAP_OPTIMIZE in dtfile on FreeBSD and Linux to avoid
tt_file_netfile calls when browsing on local host. This speeds up dtfile
a bit in general; also it appears that the tt_file_netfile rpc is
terribly slow on some Linuxen, I have no clue why though :)
- Enable XDM authentication on FreeBSD
- Use X11 screensaver extension on FreeBSD
- amd64 varargs bugfixes in dtwm.
Regards
Alex
>From 853d62893e84e76e202f56da93bcb207838d5848 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Sun, 17 Apr 2016 11:05:48 +0200
Subject: [PATCH 1/6] dtfile: Enable FILE_MAP_OPTIMIZE on FreeBSD. This avoids
unnecessary tt_file_netfile calls on local host.
Content-Length: 523
Status: RO
---
cde/programs/dtfile/Imakefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 039efe9..51a6ad6 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -39,6 +39,7 @@ EXTRA_INCLUDES = -I/usr/include/freetype2
#if defined(BSDArchitecture)
EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
#endif
SRCS = ChangeDir.c ChangeDirP.c Command.c Common.c \
--
2.4.2
>From b9758252c0dd944f120bdc62225d73a307e02434 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Sun, 17 Apr 2016 11:55:41 +0200
Subject: [PATCH 2/6] dtlogin: Enable XDM authentication on FreeBSD
Content-Length: 2081
Status: RO
---
cde/config/cf/FreeBSD.cf | 1 +
cde/programs/dtlogin/Imakefile | 2 ++
cde/programs/dtlogin/dm.h | 2 +-
cde/programs/dtlogin/xdmauth.c | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index c8945df..929b2c6 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -20,6 +20,7 @@ XCOMM operating system: OSName (OSMajorVersion/**/./**/OSMinorVersion/**/./**/O
#define HasPutenv YES
#define HasBSD44Sockets YES
#define HasZlib YES
+#define HasXdmAuth YES
#if OSMajorVersion >= 10 && defined(UseGcc)
USE_GCC = UseGcc
diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 8f8f8c5..d039a7b 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -244,6 +244,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
DEFINES = $(DTDEFINES) -DXDMCP
#elif defined (OpenBSDArchitecture)
DEFINES = $(DTDEFINES) -DXDMCP
+#elif defined (FreeBSDArchitecture)
+ DEFINES = $(DTDEFINES) -DXDMCP
#else
DEFINES = $(DTDEFINES) -D_NO_PROTO
#endif
diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
index 2569f63..66da812 100644
--- a/cde/programs/dtlogin/dm.h
+++ b/cde/programs/dtlogin/dm.h
@@ -1007,7 +1007,7 @@ extern Xauth * XdmGetAuth(
#endif /* NeedWidePrototypes */
char *name) ;
-extern int XdmGetXdmcpAuth(
+extern void XdmGetXdmcpAuth(
struct protoDisplay *pdpy,
#if NeedWidePrototypes
unsigned int authorizationNameLen,
diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c
index 47d003e..70e9eba 100644
--- a/cde/programs/dtlogin/xdmauth.c
+++ b/cde/programs/dtlogin/xdmauth.c
@@ -208,7 +208,7 @@ XdmGetAuth (namelen, name)
#ifdef XDMCP
-XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
+void XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
struct protoDisplay *pdpy;
#if NeedWidePrototypes
unsigned int authorizationNameLen;
--
2.4.2
>From 3222dc5a66f1aac4d046ee84f4f992795b765e3a Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Sun, 17 Apr 2016 12:04:23 +0200
Subject: [PATCH 3/6] dtsession: Enable X11 screensaver extension on FreeBSD
---
cde/programs/dtsession/Imakefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile
index 8da6ce0..a7fb034 100644
--- a/cde/programs/dtsession/Imakefile
+++ b/cde/programs/dtsession/Imakefile
@@ -78,8 +78,8 @@ SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lXss -ldl -lcrypt -lm
#endif
#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
-EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT)
-SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lcrypt -lm
+EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT
+SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lXss -lcrypt -lm
#endif
PROGRAMS=dtsession
--
2.4.2
>From 2b0a5b17ad2448f819926f347bf56a67ebf180ec Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Sun, 17 Apr 2016 12:55:53 +0200
Subject: [PATCH 4/6] dtwm: 0 is not NULL
---
cde/programs/dtwm/WmFunction.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c
index 4ea0313..9e0bf51 100644
--- a/cde/programs/dtwm/WmFunction.c
+++ b/cde/programs/dtwm/WmFunction.c
@@ -1089,12 +1089,12 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
directory, then we must call execlp and not execl
*/
shellname = shell;
- execlp (shell, shellname, "-c", args, 0);
+ execlp (shell, shellname, "-c", args, NULL);
}
else
{
shellname++;
- execl (shell, shellname, "-c", args, 0);
+ execl (shell, shellname, "-c", args, NULL);
}
}
@@ -1103,9 +1103,9 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
* Try /bin/sh .
*/
#ifdef SVR4
- execl ("/usr/bin/sh", "sh", "-c", args, 0);
+ execl ("/usr/bin/sh", "sh", "-c", args, NULL);
#else
- execl ("/bin/sh", "sh", "-c", args, 0);
+ execl ("/bin/sh", "sh", "-c", args, NULL);
#endif
--
2.4.2
>From 4973b69664daee25cf9105ed4d4b4f68f5d8585d Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Sun, 17 Apr 2016 12:58:31 +0200
Subject: [PATCH 5/6] dtwm: Resolved some compiler warnings
Content-Length: 4714
Status: RO
---
cde/include/Xm/XmPrivate.h | 14 ++++++++++++++
cde/programs/dtwm/Button.c | 20 ++++++++++----------
cde/programs/dtwm/Clock.c | 2 +-
cde/programs/dtwm/WmOL.c | 1 +
4 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/cde/include/Xm/XmPrivate.h b/cde/include/Xm/XmPrivate.h
index aaa8b2c..c502e27 100644
--- a/cde/include/Xm/XmPrivate.h
+++ b/cde/include/Xm/XmPrivate.h
@@ -131,6 +131,11 @@ extern void _XmPrimitiveFocusIn(
XEvent *event,
String *params,
Cardinal *num_params) ;
+extern void _XmEnterGadget(
+ Widget wid,
+ XEvent *event,
+ String *params,
+ Cardinal *num_params);
extern void _XmLeaveGadget(
Widget wid,
XEvent *event,
@@ -192,6 +197,15 @@ extern XtPointer _XmStringUngenerate (XmString string,
XmStringTag tag,
XmTextType tag_type,
XmTextType output_type);
+
+/* Extracted from VirtKeysI.h */
+extern Boolean _XmVirtKeysLoadFileBindings(
+ char *fileName,
+ String *binding) ;
+extern int _XmVirtKeysLoadFallbackBindings(
+ Display *display,
+ String *binding) ;
+
#ifdef __cplusplus
}
#endif
diff --git a/cde/programs/dtwm/Button.c b/cde/programs/dtwm/Button.c
index 1f406a3..6549848 100644
--- a/cde/programs/dtwm/Button.c
+++ b/cde/programs/dtwm/Button.c
@@ -757,7 +757,7 @@ InputDispatch(
event_mask & XmMULTI_ARM_EVENT)
{
if (event->button == Button1)
- Arm (w, (XEvent*) event, (String *)NULL, (Cardinal)0);
+ Arm (w, (XEvent*) event, (String *)NULL, (Cardinal*)NULL);
}
else if (event_mask & XmACTIVATE_EVENT ||
event_mask & XmMULTI_ACTIVATE_EVENT)
@@ -770,28 +770,28 @@ InputDispatch(
event->y <= (Position)(G_Y (bg) + G_Height (bg)))
{
Activate (w, (XEvent*) event,
- (String *)NULL, (Cardinal)0);
+ (String *)NULL, (Cardinal*)NULL);
Disarm (w, (XEvent*) event,
- (String *)NULL, (Cardinal)0);
+ (String *)NULL, (Cardinal*)NULL);
}
else
Disarm (w, (XEvent*) event,
- (String *)NULL, (Cardinal)0);
+ (String *)NULL, (Cardinal*)NULL);
}
}
else if (event_mask & XmHELP_EVENT)
_XmSocorro (w, (XEvent *)event,
- (String *)NULL,(Cardinal)0);
+ (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmENTER_EVENT)
- Enter (w, (XEvent *)event, (String *)NULL,(Cardinal)0);
+ Enter (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmLEAVE_EVENT)
- Leave (w, (XEvent *)event, (String *)NULL,(Cardinal)0);
+ Leave (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmFOCUS_IN_EVENT)
_XmFocusInGadget (w, (XEvent *)event,
- (String *)NULL,(Cardinal)0);
+ (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmFOCUS_OUT_EVENT)
_XmFocusOutGadget (w, (XEvent *)event,
- (String *)NULL,(Cardinal)0);
+ (String *)NULL,(Cardinal*)NULL);
}
@@ -860,7 +860,7 @@ Enter(
{
DtButtonGadget bg = (DtButtonGadget) wid ;
- _XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)0);
+ _XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)NULL);
if (B_Armed (bg))
B_Expose (wid, event, NULL);
diff --git a/cde/programs/dtwm/Clock.c b/cde/programs/dtwm/Clock.c
index 0bc38a8..36eda21 100644
--- a/cde/programs/dtwm/Clock.c
+++ b/cde/programs/dtwm/Clock.c
@@ -933,7 +933,7 @@ Draw(
if (g->clock.numseg != 0)
EraseHands (g, (struct tm *) 0);
- ClockTick ((XtPointer)g, (XtIntervalId)0);
+ ClockTick ((XtPointer)g, (XtIntervalId*)NULL);
/* Draw shadow.
*/
diff --git a/cde/programs/dtwm/WmOL.c b/cde/programs/dtwm/WmOL.c
index f40fe77..2e14c92 100644
--- a/cde/programs/dtwm/WmOL.c
+++ b/cde/programs/dtwm/WmOL.c
@@ -35,6 +35,7 @@ static char rcsid[] = "$XConsortium: WmOL.c /main/4 1995/11/01 11:45:08 rswiston
/*
* Included Files:
*/
+#include <stdlib.h>
#include "WmGlobal.h"
#include "WmOL.h"
#include "WmProperty.h"
--
2.4.2
>From 6b03cbfd4d7094cd1d01c55895427a7511659062 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Mon, 18 Apr 2016 19:49:07 +0200
Subject: [PATCH 6/6] dtfile: Enable FILE_MAP_OPTIMIZE on Linux. This avoids
unnecessary tt_file_netfile calls on local host.
Content-Length: 456
Status: RO
---
cde/programs/dtfile/Imakefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 51a6ad6..32f6786 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -35,6 +35,7 @@ EXTRA_CCOPTIONS = -xF
#if defined(LinuxArchitecture)
EXTRA_INCLUDES = -I/usr/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
#endif
#if defined(BSDArchitecture)
--
2.4.2
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
