385 lines
9.9 KiB
Text
385 lines
9.9 KiB
Text
diff -rc ../old/xview3.2p1-X11R6/clients/cmdtool/cmdtool.c cmdtool/cmdtool.c
|
|
*** ../old/xview3.2p1-X11R6/clients/cmdtool/cmdtool.c Tue Jun 29 01:12:08 1993
|
|
--- clients/cmdtool/cmdtool.c Sun Nov 20 13:38:56 1994
|
|
***************
|
|
*** 123,129 ****
|
|
int cmdline_count = 0;
|
|
char cmdline2[50];
|
|
Server_image cmd_pixmap, cmd_mask_pixmap;
|
|
-
|
|
|
|
#ifdef GPROF
|
|
if (argc > 1 && strcmp(argv[argc-1], "-gprof") == 0) {
|
|
--- 123,128 ----
|
|
***************
|
|
*** 141,146 ****
|
|
--- 140,147 ----
|
|
#endif
|
|
|
|
/* This is required to initialize correctly */
|
|
+
|
|
+
|
|
xv_init(XV_INIT_ARGC_PTR_ARGV, &argc, argv,
|
|
XV_USE_LOCALE, TRUE, 0);
|
|
|
|
***************
|
|
*** 286,291 ****
|
|
--- 287,293 ----
|
|
strcat( cmdline2, argv[0] );
|
|
argv[0] = cmdline2;
|
|
}
|
|
+
|
|
|
|
/* If FRAME_LABEL wasn't set by cmdline argument, set it */
|
|
if ((tmp_label1 = (char *)xv_get(base_frame, FRAME_LABEL)) == NULL) {
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/cmdstream.c olwm/cmdstream.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/cmdstream.c Tue Jun 29 01:11:43 1993
|
|
--- clients/olwm/cmdstream.c Sun Nov 20 13:38:56 1994
|
|
***************
|
|
*** 51,60 ****
|
|
* Local Forward Declarations
|
|
* ---------------------------------------------------------------------*/
|
|
|
|
! Command *MatchCommand();
|
|
! CmdAttr *MatchAttr();
|
|
! int EncodeAttrValue();
|
|
! int DecodeAttrValue();
|
|
|
|
/* ----------------------------------------------------------------------
|
|
* SetCmdStream
|
|
--- 51,60 ----
|
|
* Local Forward Declarations
|
|
* ---------------------------------------------------------------------*/
|
|
|
|
! static Command *MatchCommand();
|
|
! static CmdAttr *MatchAttr();
|
|
! static int EncodeAttrValue();
|
|
! static int DecodeAttrValue();
|
|
|
|
/* ----------------------------------------------------------------------
|
|
* SetCmdStream
|
|
*** clients/olwm/gettext.h.orig Tue Jun 29 00:11:46 1993
|
|
--- clients/olwm/gettext.h Mon Jan 25 19:35:08 1999
|
|
***************
|
|
*** 27,33 ****
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
!
|
|
struct domain_binding {
|
|
char *domain_name;
|
|
char *binding;
|
|
--- 27,37 ----
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
!
|
|
! #if !defined(LC_MESSAGES) && defined(LC_RESPONSE)
|
|
! #define LC_MESSAGES LC_RESPONSE
|
|
! #endif
|
|
!
|
|
struct domain_binding {
|
|
char *domain_name;
|
|
char *binding;
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/i18n.h olwm/i18n.h
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/i18n.h Tue Jun 29 01:11:48 1993
|
|
--- clients/olwm/i18n.h Sun Nov 20 13:38:57 1994
|
|
***************
|
|
*** 35,40 ****
|
|
--- 35,44 ----
|
|
|
|
#endif /* OW_I18N_L4 */
|
|
|
|
+ #if !defined(LC_MESSAGES) && defined(LC_RESPONSE)
|
|
+ #define LC_MESSAGES LC_RESPONSE
|
|
+ #endif
|
|
+
|
|
/*
|
|
* String/Text - To better handle non-i18n, Level3 and Level4
|
|
* we introduce two 'types'; string and text.
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/mem.c olwm/mem.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/mem.c Tue Jun 29 01:11:45 1993
|
|
--- clients/olwm/mem.c Sun Nov 20 13:38:57 1994
|
|
***************
|
|
*** 14,21 ****
|
|
*
|
|
*/
|
|
|
|
!
|
|
#include <malloc.h>
|
|
#include <memory.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
--- 14,25 ----
|
|
*
|
|
*/
|
|
|
|
! #include <sys/param.h>
|
|
! #if (defined(BSD) && (BSD >= 199103))
|
|
! #include <stdlib.h>
|
|
! #else
|
|
#include <malloc.h>
|
|
+ #endif
|
|
#include <memory.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/menu.c olwm/menu.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/menu.c Tue Jun 29 01:11:50 1993
|
|
--- clients/olwm/menu.c Sun Nov 20 13:38:57 1994
|
|
***************
|
|
*** 52,57 ****
|
|
--- 52,59 ----
|
|
static WinGeneric *prevColorFocusWindow = NULL;
|
|
static MenuTrackMode menuTrackMode;
|
|
|
|
+ static Bool isEnabled();
|
|
+
|
|
/*
|
|
* Table of currently active menus.
|
|
* REMIND: perhaps this should be dynamically allocated.
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/olwm.c olwm/olwm.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/olwm.c Tue Jun 29 01:11:52 1993
|
|
--- clients/olwm/olwm.c Sun Nov 20 13:38:57 1994
|
|
***************
|
|
*** 23,28 ****
|
|
--- 23,32 ----
|
|
#include <sys/stat.h>
|
|
#include <sys/wait.h>
|
|
|
|
+ #ifndef MAXPID
|
|
+ #define MAXPID 30000
|
|
+ #endif
|
|
+
|
|
#include <X11/Xos.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
***************
|
|
*** 622,634 ****
|
|
void
|
|
ReapChildren()
|
|
{
|
|
! #ifdef SYSV
|
|
pid_t pid;
|
|
int status;
|
|
#else
|
|
int oldmask;
|
|
int pid;
|
|
union wait status;
|
|
#endif
|
|
|
|
if (!deadChildren)
|
|
--- 626,644 ----
|
|
void
|
|
ReapChildren()
|
|
{
|
|
! #if defined(SYSV)
|
|
pid_t pid;
|
|
int status;
|
|
#else
|
|
+ #if (defined(BSD) && (BSD >= 199103))
|
|
+ pid_t pid;
|
|
+ int status;
|
|
+ int oldmask;
|
|
+ #else
|
|
int oldmask;
|
|
int pid;
|
|
union wait status;
|
|
+ #endif
|
|
#endif
|
|
|
|
if (!deadChildren)
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/slave.c olwm/slave.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/slave.c Tue Jun 29 01:11:57 1993
|
|
--- clients/olwm/slave.c Sun Nov 20 13:38:58 1994
|
|
***************
|
|
*** 22,27 ****
|
|
--- 22,29 ----
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
+ #include <sys/param.h>
|
|
+
|
|
#include "cmdstream.h"
|
|
#include "error.h"
|
|
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwm/winicon.c olwm/winicon.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwm/winicon.c Tue Jun 29 01:12:04 1993
|
|
--- clients/olwm/winicon.c Sun Nov 20 13:38:58 1994
|
|
***************
|
|
*** 32,37 ****
|
|
--- 32,41 ----
|
|
extern Bool PropGetWMName();
|
|
extern Bool PropGetWMIconName();
|
|
|
|
+ static int heightTopIcon();
|
|
+ static int heightBottomIcon();
|
|
+ static int widthBothIcon();
|
|
+
|
|
/***************************************************************************
|
|
* private data
|
|
***************************************************************************/
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwmslave/Imakefile olwmslave/Imakefile
|
|
*** ../old/xview3.2p1-X11R6/clients/olwmslave/Imakefile Tue Jun 29 01:12:14 1993
|
|
--- clients/olwmslave/Imakefile Sun Nov 20 13:38:58 1994
|
|
***************
|
|
*** 38,55 ****
|
|
mem.c \
|
|
olwmslave.c \
|
|
propsrecv.c \
|
|
! propswin.c
|
|
|
|
|
|
OBJS = \
|
|
cmdstream.o \
|
|
help_file.o \
|
|
! helprecv.o \
|
|
helpwin.o \
|
|
mem.o \
|
|
olwmslave.o \
|
|
propsrecv.o \
|
|
! propswin.o
|
|
|
|
|
|
ALLFILES = \
|
|
--- 38,55 ----
|
|
mem.c \
|
|
olwmslave.c \
|
|
propsrecv.c \
|
|
! propswin.c ${GETTEXT.C}
|
|
|
|
|
|
OBJS = \
|
|
cmdstream.o \
|
|
help_file.o \
|
|
! helprecv.o \
|
|
helpwin.o \
|
|
mem.o \
|
|
olwmslave.o \
|
|
propsrecv.o \
|
|
! propswin.o ${GETTEXT.O}
|
|
|
|
|
|
ALLFILES = \
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwmslave/cmdstream.c olwmslave/cmdstream.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwmslave/cmdstream.c Tue Jun 29 01:12:10 1993
|
|
--- clients/olwmslave/cmdstream.c Sun Nov 20 13:38:58 1994
|
|
***************
|
|
*** 50,59 ****
|
|
* Local Forward Declarations
|
|
* ---------------------------------------------------------------------*/
|
|
|
|
! Command *MatchCommand();
|
|
! CmdAttr *MatchAttr();
|
|
! int EncodeAttrValue();
|
|
! int DecodeAttrValue();
|
|
|
|
/* ----------------------------------------------------------------------
|
|
* SetCmdStream
|
|
--- 50,59 ----
|
|
* Local Forward Declarations
|
|
* ---------------------------------------------------------------------*/
|
|
|
|
! static Command *MatchCommand();
|
|
! static CmdAttr *MatchAttr();
|
|
! static int EncodeAttrValue();
|
|
! static int DecodeAttrValue();
|
|
|
|
/* ----------------------------------------------------------------------
|
|
* SetCmdStream
|
|
*** clients/olwmslave/help_file.c.orig Mon Jan 25 20:14:43 1999
|
|
--- clients/olwmslave/help_file.c Mon Jan 25 20:15:42 1999
|
|
***************
|
|
*** 24,30 ****
|
|
#include <xview_private/i18n_impl.h>
|
|
#endif
|
|
|
|
! #define DEFAULT_HELP_DIRECTORY "/usr/lib/help"
|
|
#define MAX_MORE_HELP_CMD 128
|
|
|
|
static FILE *help_file;
|
|
--- 24,30 ----
|
|
#include <xview_private/i18n_impl.h>
|
|
#endif
|
|
|
|
! #define DEFAULT_HELP_DIRECTORY "/usr/X11R6/lib/help"
|
|
#define MAX_MORE_HELP_CMD 128
|
|
|
|
static FILE *help_file;
|
|
*** clients/olwmslave/helpwin.c.orig Tue Jun 29 00:12:11 1993
|
|
--- clients/olwmslave/helpwin.c Mon Jan 25 20:07:04 1999
|
|
***************
|
|
*** 136,141 ****
|
|
--- 136,142 ----
|
|
Bool ImageHelpWindow();
|
|
void MoreHelp();
|
|
void ErrorNotice();
|
|
+ static int ConstrainMousePos();
|
|
|
|
/* ----------------------------------------------------------------------
|
|
* ShowHelpWindow
|
|
***************
|
|
*** 493,498 ****
|
|
--- 494,501 ----
|
|
xv_set(hw->hwMGlassItem,
|
|
PANEL_LABEL_IMAGE, hw->hwMGlassRender,
|
|
NULL);
|
|
+
|
|
+ return True;
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------
|
|
diff -rc ../old/xview3.2p1-X11R6/clients/olwmslave/mem.c olwmslave/mem.c
|
|
*** ../old/xview3.2p1-X11R6/clients/olwmslave/mem.c Tue Jun 29 01:12:12 1993
|
|
--- clients/olwmslave/mem.c Sun Nov 20 13:38:58 1994
|
|
***************
|
|
*** 16,22 ****
|
|
--- 16,27 ----
|
|
*
|
|
*/
|
|
|
|
+ #include <sys/param.h>
|
|
+ #if (defined(BSD) && (BSD >= 199103))
|
|
+ #include <stdlib.h>
|
|
+ #else
|
|
#include <malloc.h>
|
|
+ #endif
|
|
#include <memory.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
*** clients/olwm/defaults.c.orig Tue Jun 29 07:11:43 1993
|
|
--- clients/olwm/defaults.c Mon Feb 27 00:59:03 1995
|
|
***************
|
|
*** 25,33 ****
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Xatom.h>
|
|
#include <X11/Xresource.h>
|
|
! #ifdef OW_I18N_L4
|
|
#include <sys/param.h>
|
|
! #endif
|
|
|
|
#include "i18n.h"
|
|
#include "ollocale.h"
|
|
--- 25,33 ----
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Xatom.h>
|
|
#include <X11/Xresource.h>
|
|
! /* #ifdef OW_I18N_L4 */
|
|
#include <sys/param.h>
|
|
! /* #endif */
|
|
|
|
#include "i18n.h"
|
|
#include "ollocale.h"
|
|
***************
|
|
*** 80,86 ****
|
|
--- 80,90 ----
|
|
if (homedir != NULL) {
|
|
(void) strcpy(filename, homedir);
|
|
(void) strcat(filename, "/.Xdefaults-");
|
|
+ #if (defined(BSD) && (BSD >= 199103))
|
|
+ if (0 == gethostname(hostname, sizeof(hostname))) {
|
|
+ #else
|
|
if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
|
|
+ #endif
|
|
(void) strcat(filename, hostname);
|
|
fileDB = XrmGetFileDatabase(filename);
|
|
}
|