NMU patch attached.
diff -urN ../orig/xview-3.2p1.4/clients/clock/clock.c
xview-3.2p1.4/clients/clock/clock.c
--- ../orig/xview-3.2p1.4/clients/clock/clock.c 2005-09-02 05:09:51.000000000
+0000
+++ xview-3.2p1.4/clients/clock/clock.c 2005-09-02 05:27:11.000000000 +0000
@@ -147,6 +147,10 @@
static Notify_value analog_timer_expired();
static Notify_value icon_timer_expired();
static Notify_value dig_timer_expired();
+static int min (int a, int b);
+static int seconds_on();
+static int date_on();
+static int armwidth();
typedef enum {digital, analog} Face;
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/gif.c
xview-3.2p1.4/clients/olvwm-4.1/gif.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/gif.c 1994-01-13
21:36:06.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/gif.c 2005-09-02 05:27:11.000000000
+0000
@@ -56,7 +56,10 @@
int disposal;
} Gif89 = { -1, -1, -1, 0 };
-extern XImage* ReadImage();
+static XImage* ReadImage();
+static int ReadColorMap(FILE *fd, int number, XColor *buffer);
+static int DoExtension(FILE *fd, int label);
+static int GetDataBlock(FILE *fd, unsigned char *buf);
XImage *ReadGIF(dpy, fd, pNcolors, pColors)
Display *dpy;
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/olvwmrc.y
xview-3.2p1.4/clients/olvwm-4.1/olvwmrc.y
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/olvwmrc.y 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/olvwmrc.y 2005-09-02 05:27:11.000000000
+0000
@@ -37,7 +37,7 @@
char *LookupToken();
char *FindOlvwmRC();
void resetKeys();
-char *strexpand();
+static char *strexpand();
typedef struct progscreen {
char *target;
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/screen.c
xview-3.2p1.4/clients/olvwm-4.1/screen.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/screen.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/screen.c 2005-09-02 05:27:11.000000000
+0000
@@ -153,6 +153,14 @@
static XrmQuark virtualPixmapColorCQ;
static XrmQuark virtualPixmapColorIQ;
+static updateScreenWorkspaceColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenWindowColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenForegroundColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenBackgroundColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenBorderColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenInputFocusColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenGlyphFont(Display *dpy, ScreenInfo *scrInfo);
+
/*-------------------------------------------------------------------------
* Local Functions
*-------------------------------------------------------------------------*/
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/st.c
xview-3.2p1.4/clients/olvwm-4.1/st.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/st.c 1994-01-13
21:36:18.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/st.c 2005-09-02 05:27:11.000000000
+0000
@@ -39,6 +39,8 @@
#define do_hash(key, table) (*table->hash)(key, table->num_bins)
+static rehash(st_table *table);
+
/*#define do_hash(key, table)\
((table->hash == ST_PTRHASH) ? (((int) (key) >> 2) % table->num_bins) :\
(table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/virtual.c
xview-3.2p1.4/clients/olvwm-4.1/virtual.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/virtual.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/virtual.c 2005-09-02 05:29:20.000000000
+0000
@@ -112,6 +112,9 @@
#define CEIL(a,b) (((a)+(b)-1)/(b))
+static rexMatch(char *string);
+static rexInit(char *pattern);
+
/*
* ==========================================================================
*
@@ -2095,7 +2098,6 @@
MenuInfoCreate(cache, winInfo, menu, depth,
slot);
}
-static
regerr(val)
int val;
{
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/winframe.c
xview-3.2p1.4/clients/olvwm-4.1/winframe.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/winframe.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/winframe.c 2005-09-02 05:27:11.000000000
+0000
@@ -84,6 +84,7 @@
static void setIMStatusText();
#endif
static void updateResizePositions();
+static int headerHeight(Client *cli, Graphics_info *gis);
/***************************************************************************
* sizing and decoration positioning functions
diff -urN ../orig/xview-3.2p1.4/clients/olvwm-4.1/winicon.c
xview-3.2p1.4/clients/olvwm-4.1/winicon.c
--- ../orig/xview-3.2p1.4/clients/olvwm-4.1/winicon.c 1994-01-13
21:36:26.000000000 +0000
+++ xview-3.2p1.4/clients/olvwm-4.1/winicon.c 2005-09-02 05:27:11.000000000
+0000
@@ -52,6 +52,10 @@
* forward-declared functions
***************************************************************************/
+static int heightTopIcon(WinIconFrame *win);
+static int heightBottomIcon(WinIconFrame *win);
+static int widthBothIcon(WinIconFrame *win);
+
/***************************************************************************
* private event functions
***************************************************************************/
diff -urN ../orig/xview-3.2p1.4/clients/olwm/cmdstream.c
xview-3.2p1.4/clients/olwm/cmdstream.c
--- ../orig/xview-3.2p1.4/clients/olwm/cmdstream.c 1993-06-29
05:11:43.000000000 +0000
+++ xview-3.2p1.4/clients/olwm/cmdstream.c 2005-09-02 05:27:11.000000000
+0000
@@ -51,10 +51,10 @@
* Local Forward Declarations
* ---------------------------------------------------------------------*/
-Command *MatchCommand();
-CmdAttr *MatchAttr();
-int EncodeAttrValue();
-int DecodeAttrValue();
+static Command *MatchCommand();
+static CmdAttr *MatchAttr();
+static int EncodeAttrValue();
+static int DecodeAttrValue();
/* ----------------------------------------------------------------------
* SetCmdStream
diff -urN ../orig/xview-3.2p1.4/clients/olwm/menu.c
xview-3.2p1.4/clients/olwm/menu.c
--- ../orig/xview-3.2p1.4/clients/olwm/menu.c 1997-04-28 12:45:33.000000000
+0000
+++ xview-3.2p1.4/clients/olwm/menu.c 2005-09-02 05:27:11.000000000 +0000
@@ -109,6 +109,7 @@
int MenuTrack();
void DrawLocCursor();
+static Bool isEnabled(MenuInfo *mInfo, int item);
/*
*****************************************************************************
diff -urN ../orig/xview-3.2p1.4/clients/olwm/screen.c
xview-3.2p1.4/clients/olwm/screen.c
--- ../orig/xview-3.2p1.4/clients/olwm/screen.c 1997-04-29 18:31:35.000000000
+0000
+++ xview-3.2p1.4/clients/olwm/screen.c 2005-09-02 05:27:11.000000000 +0000
@@ -111,6 +111,12 @@
static XrmQuark stippledRubberBandsCQ;
static XrmQuark stippledRubberBandsIQ;
+static updateScreenWorkspaceColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenWindowColor(Display *dpy, ScreenInfo*scrInfo);
+static updateScreenForegroundColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenBackgroundColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenBorderColor(Display *dpy, ScreenInfo *scrInfo);
+static updateScreenGlyphFont(Display *dpy, ScreenInfo *scrInfo);
/*-------------------------------------------------------------------------
* Local Functions
diff -urN ../orig/xview-3.2p1.4/clients/olwm/slave.c
xview-3.2p1.4/clients/olwm/slave.c
--- ../orig/xview-3.2p1.4/clients/olwm/slave.c 2005-09-02 05:09:51.000000000
+0000
+++ xview-3.2p1.4/clients/olwm/slave.c 2005-09-02 05:27:11.000000000 +0000
@@ -44,7 +44,7 @@
* Local Forward Declarations
* ---------------------------------------------------------------------*/
-void SlaveFailure();
+static void SlaveFailure();
/* ----------------------------------------------------------------------
diff -urN ../orig/xview-3.2p1.4/clients/olwm/st.c
xview-3.2p1.4/clients/olwm/st.c
--- ../orig/xview-3.2p1.4/clients/olwm/st.c 1993-06-29 05:11:58.000000000
+0000
+++ xview-3.2p1.4/clients/olwm/st.c 2005-09-02 05:27:11.000000000 +0000
@@ -34,6 +34,8 @@
(table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\
(*table->hash)((key), table->num_bins))
+static rehash(st_table *table);
+
st_table *st_init_table_with_params(compare, hash, size, density, grow_factor,
reorder_flag)
int (*compare)();
diff -urN ../orig/xview-3.2p1.4/clients/olwm/winframe.c
xview-3.2p1.4/clients/olwm/winframe.c
--- ../orig/xview-3.2p1.4/clients/olwm/winframe.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/olwm/winframe.c 2005-09-02 05:27:11.000000000
+0000
@@ -72,6 +72,7 @@
static void setIMStatusText();
#endif
static void updateResizePositions();
+static int headerHeight(Client *cli, Graphics_info *gis);
/***************************************************************************
* sizing and decoration positioning functions
diff -urN ../orig/xview-3.2p1.4/clients/olwm/winicon.c
xview-3.2p1.4/clients/olwm/winicon.c
--- ../orig/xview-3.2p1.4/clients/olwm/winicon.c 1993-06-29
05:12:04.000000000 +0000
+++ xview-3.2p1.4/clients/olwm/winicon.c 2005-09-02 05:27:11.000000000
+0000
@@ -43,6 +43,10 @@
/* Class function vector */
static ClassIconFrame classIconFrame;
+static int heightTopIcon(WinIconFrame *win);
+static int heightBottomIcon(WinIconFrame *win);
+static int widthBothIcon(WinIconFrame *win);
+
/***************************************************************************
* private event functions
***************************************************************************/
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/cmdstream.c
xview-3.2p1.4/clients/olwmslave/cmdstream.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/cmdstream.c 1993-06-29
05:12:10.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/cmdstream.c 2005-09-02 05:27:11.000000000
+0000
@@ -50,10 +50,10 @@
* Local Forward Declarations
* ---------------------------------------------------------------------*/
-Command *MatchCommand();
-CmdAttr *MatchAttr();
-int EncodeAttrValue();
-int DecodeAttrValue();
+static Command *MatchCommand();
+static CmdAttr *MatchAttr();
+static int EncodeAttrValue();
+static int DecodeAttrValue();
/* ----------------------------------------------------------------------
* SetCmdStream
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/helprecv.c
xview-3.2p1.4/clients/olwmslave/helprecv.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/helprecv.c 1993-06-29
05:12:11.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/helprecv.c 2005-09-02 05:27:11.000000000
+0000
@@ -15,7 +15,7 @@
#include "helpcmd.h"
extern int ShowHelpWindow();
- void ReceiveHelpCmd();
+static void ReceiveHelpCmd();
/* ----------------------------------------------------------------------
* RegisterHelpWindow
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/helpwin.c
xview-3.2p1.4/clients/olwmslave/helpwin.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/helpwin.c 1997-04-28
12:45:33.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/helpwin.c 2005-09-02 05:27:11.000000000
+0000
@@ -128,14 +128,15 @@
* Local Forward Functions
* ---------------------------------------------------------------------*/
int ShowHelpWindow();
-void InitHelpWindow();
-Bool CreateHelpWindow();
-Notify_value DestroyHelpWindow();
-void ResetHelpWindow();
-Bool TextHelpWindow();
-Bool ImageHelpWindow();
-void MoreHelp();
-void ErrorNotice();
+static void InitHelpWindow();
+static Bool CreateHelpWindow();
+static Notify_value DestroyHelpWindow();
+static void ResetHelpWindow();
+static Bool TextHelpWindow();
+static Bool ImageHelpWindow();
+static void MoreHelp();
+static void ErrorNotice();
+static int ConstrainMousePos();
/* ----------------------------------------------------------------------
* ShowHelpWindow
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/olwmslave.c
xview-3.2p1.4/clients/olwmslave/olwmslave.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/olwmslave.c 1997-04-29
18:22:01.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/olwmslave.c 2005-09-02 05:27:11.000000000
+0000
@@ -44,9 +44,9 @@
/* ----------------------------------------------------------------------
* Forward Definitions
* ----------------------------------------------------------------------*/
-void InitScreenInfo();
-void ParseScreenArgs();
-Notify_value InputReader();
+static void InitScreenInfo();
+static void ParseScreenArgs();
+static Notify_value InputReader();
/* ----------------------------------------------------------------------
* main
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/propsrecv.c
xview-3.2p1.4/clients/olwmslave/propsrecv.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/propsrecv.c 1993-06-29
05:12:13.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/propsrecv.c 2005-09-02 05:27:11.000000000
+0000
@@ -15,7 +15,7 @@
#include "propscmd.h"
extern int ShowWindowProps();
- void ReceivePropsCmd();
+static void ReceivePropsCmd();
/* ----------------------------------------------------------------------
* RegisterPropsWindow
diff -urN ../orig/xview-3.2p1.4/clients/olwmslave/propswin.c
xview-3.2p1.4/clients/olwmslave/propswin.c
--- ../orig/xview-3.2p1.4/clients/olwmslave/propswin.c 1993-06-29
05:12:13.000000000 +0000
+++ xview-3.2p1.4/clients/olwmslave/propswin.c 2005-09-02 05:27:11.000000000
+0000
@@ -38,9 +38,9 @@
* Local Forward Declarations
* ----------------------------------------------------------------------*/
int ShowWindowProps();
-void InitWindowProps();
-Bool CreateWindowProps();
-Notify_value DestroyWindowProps();
+static void InitWindowProps();
+static Bool CreateWindowProps();
+static Notify_value DestroyWindowProps();
void ApplyProps();
void ResetProps();
diff -urN ../orig/xview-3.2p1.4/clients/textedit/textedit.c
xview-3.2p1.4/clients/textedit/textedit.c
--- ../orig/xview-3.2p1.4/clients/textedit/textedit.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/clients/textedit/textedit.c 2005-09-02 05:27:11.000000000
+0000
@@ -117,6 +117,8 @@
#define OPTION_EDIT_LOG_WRAPS_AT (1<<15)
#endif
+static die(char *msg1,char *msg2,char *msg3);
+
#ifdef TEXTEDIT_HELP_STRING
static char *help_msg()
/*
diff -urN ../orig/xview-3.2p1.4/debian/changelog xview-3.2p1.4/debian/changelog
--- ../orig/xview-3.2p1.4/debian/changelog 2005-09-02 05:09:52.000000000
+0000
+++ xview-3.2p1.4/debian/changelog 2005-09-02 05:48:39.000000000 +0000
@@ -1,3 +1,12 @@
+xview (3.2p1.4-19.1) unstable; urgency=low
+
+ * NMU for release-critical bug durring bug squishing party
+ * patch for gcc 4.0 from Andreas Jochens (closes: #294844)
+ * fix typo in man page (closes: #306713)
+ * change section of xviewg-dev to devel to match overrides
+
+ -- Blars Blarson <[EMAIL PROTECTED]> Fri, 2 Sep 2005 05:35:09 +0000
+
xview (3.2p1.4-19) unstable; urgency=high
* Applied patch from security team to fix security hole:
diff -urN ../orig/xview-3.2p1.4/debian/control xview-3.2p1.4/debian/control
--- ../orig/xview-3.2p1.4/debian/control 2005-09-02 05:09:52.000000000
+0000
+++ xview-3.2p1.4/debian/control 2005-09-02 06:29:12.000000000 +0000
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 3.0.11), bison, flex, ed, libncurses-dev, xutils,
xlibs-dev
Package: xviewg
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}
Suggests: indent
Conflicts: xview (<< 3.2p1.4-1)
@@ -19,7 +19,9 @@
This package is required by XView-based programs.
Package: xviewg-dev
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Section: devel
+Priority: optional
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: xviewg (= ${Source-Version}), libc6-dev, xlibs-dev
Conflicts: xview-dev (<< 3.2p1.4-1)
Description: XView development tools [libc6]
@@ -27,14 +29,14 @@
the header files and the static libraries for XView.
Package: xview-clients
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}
Description: XView client programs
This package contains the client programs from the free XView
distribution, including cmdtool and textedit.
Package: xview-examples
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}
Suggests: xviewg-dev
Description: XView contrib programs
@@ -43,7 +45,7 @@
as examples for writing your own XView-programs.
Package: olwm
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}
Suggests: menu (>= 1.3), xview-clients
Conflicts: xview (<< 3.2p1.4-1), olvwm (<< 4.1.3.2p1.4-1), menu (<< 2.1.9)
@@ -54,7 +56,7 @@
`olvwm'.
Package: olvwm
-Architecture: alpha arm hppa i386 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha arm hppa i386 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}
Suggests: menu (>= 1.3), xview-clients, olwm
Conflicts: menu (<< 2.1.9)
diff -urN ../orig/xview-3.2p1.4/lib/libxview/attr/attr_copy.c
xview-3.2p1.4/lib/libxview/attr/attr_copy.c
--- ../orig/xview-3.2p1.4/lib/libxview/attr/attr_copy.c 1993-06-29
05:14:35.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/attr/attr_copy.c 2005-09-02 05:27:11.000000000
+0000
@@ -12,6 +12,11 @@
#include <xview/attr.h>
+static int copy_1_attr(Attr_attribute attr, Attr_avlist *source, Attr_avlist
*dest);
+static int copy_counted_list(Attr_attribute **source, Attr_attribute **dest);
+static int copy_singleton(Attr_attribute attr, Attr_attribute **source,
Attr_attribute **dest);
+static int copy_null_list(Attr_attribute attr, Attr_attribute **source,
Attr_attribute **dest);
+
/*
* attr_copy: copy an attribute list, returning the size in bytes
*/
diff -urN ../orig/xview-3.2p1.4/lib/libxview/dnd/dnd.c
xview-3.2p1.4/lib/libxview/dnd/dnd.c
--- ../orig/xview-3.2p1.4/lib/libxview/dnd/dnd.c 1993-06-29
05:15:57.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/dnd/dnd.c 2005-09-02 05:27:11.000000000
+0000
@@ -39,6 +39,18 @@
extern int DndFindSite();
extern XID DndGetCursor();
+static int SendTrigger(
+ Dnd_info *dnd,
+ Xv_Drawable_info *info,
+ XButtonEvent *buttonEvent,
+ int local);
+static int SendOldDndEvent(Dnd_info *dnd, XButtonEvent *buttonEvent);
+static void UpdateGrabCursor(Dnd_info *dnd, int type);
+static void UpdateGrabCursor(Dnd_info *dnd, int type);
+static int WaitForAck(Dnd_info *dnd, Xv_Drawable_info *info);
+static int IsV2App(Display *dpy, Window window, Dnd_info *dnd, XButtonEvent
*ev);
+
+
Xv_public int
dnd_send_drop(dnd_public)
Xv_object dnd_public;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/dnd/dnd_dsdm.c
xview-3.2p1.4/lib/libxview/dnd/dnd_dsdm.c
--- ../orig/xview-3.2p1.4/lib/libxview/dnd/dnd_dsdm.c 1993-06-29
05:16:00.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/dnd/dnd_dsdm.c 2005-09-02 05:27:11.000000000
+0000
@@ -28,6 +28,8 @@
Xv_private int DndSendPreviewEvent();
+static void ReplyProc();
+
Xv_private int
DndContactDSDM(dnd)
Dnd_info *dnd;
@@ -40,8 +42,6 @@
if (!dnd->sel) {
Xv_object owner,
server;
- static void ReplyProc();
-
owner = (Xv_object)xv_get(DND_PUBLIC(dnd), XV_OWNER);
server = XV_SERVER_FROM_WINDOW(owner);
diff -urN ../orig/xview-3.2p1.4/lib/libxview/file_chooser/file_list.c
xview-3.2p1.4/lib/libxview/file_chooser/file_list.c
--- ../orig/xview-3.2p1.4/lib/libxview/file_chooser/file_list.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/file_chooser/file_list.c 2005-09-02
05:27:12.000000000 +0000
@@ -48,7 +48,7 @@
static void flist_error();
#endif
-
+static int flist_match_regex( char *s, File_list_private *private );
/*
* xv_create() method
diff -urN ../orig/xview-3.2p1.4/lib/libxview/filter/filter.c
xview-3.2p1.4/lib/libxview/filter/filter.c
--- ../orig/xview-3.2p1.4/lib/libxview/filter/filter.c 1993-06-29
05:14:57.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/filter/filter.c 2005-09-02 05:27:12.000000000
+0000
@@ -39,10 +39,9 @@
char *stream_fgets();
-enum CharClass
- breakProc();
-struct CharAction
- digits();
+static enum CharClass breakProc(char c);
+static struct CharAction digits(char c);
+static any_shell_meta(char *s);
struct filter_rec **
diff -urN ../orig/xview-3.2p1.4/lib/libxview/font/font.c
xview-3.2p1.4/lib/libxview/font/font.c
--- ../orig/xview-3.2p1.4/lib/libxview/font/font.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/font/font.c 2005-09-02 05:27:12.000000000
+0000
@@ -355,6 +355,10 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
+static int font_setup_defaults(Font_locale_info *linfo);
+static int font_construct_name(Font_return_attrs font_attrs);
+static int font_init_create_attrs(Font_return_attrs font_attrs);
+
/*
* Normalize font name.
* - get rid of sunview style file name
diff -urN ../orig/xview-3.2p1.4/lib/libxview/frame/fmcmd_set.c
xview-3.2p1.4/lib/libxview/frame/fmcmd_set.c
--- ../orig/xview-3.2p1.4/lib/libxview/frame/fmcmd_set.c 1993-06-29
05:16:07.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/frame/fmcmd_set.c 2005-09-02
05:27:12.000000000 +0000
@@ -18,6 +18,8 @@
#include <xview/panel.h>
#include <xview/server.h>
+static int update_default_pin_state();
+
Pkg_private Xv_opaque
frame_cmd_set_avlist(frame_public, avlist)
Frame frame_public;
@@ -30,7 +32,6 @@
int result = XV_OK;
int add_decor, delete_decor, set_win_attr;
Atom add_decor_list[WM_MAX_DECOR],
delete_decor_list[WM_MAX_DECOR];
- int update_default_pin_state();
DRAWABLE_INFO_MACRO(frame_public, info);
server_public = xv_server(info);
diff -urN ../orig/xview-3.2p1.4/lib/libxview/io_stream/input.c
xview-3.2p1.4/lib/libxview/io_stream/input.c
--- ../orig/xview-3.2p1.4/lib/libxview/io_stream/input.c 1993-06-29
05:15:05.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/io_stream/input.c 2005-09-02
05:27:12.000000000 +0000
@@ -22,7 +22,7 @@
XV_MSG("input stream not of type input"), 0); \
ops = in->ops.input_ops
-char *stream_getstring();
+static char *stream_getstring();
/* GENERIC INPUT FUNCTIONS */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/misc/gettext.c
xview-3.2p1.4/lib/libxview/misc/gettext.c
--- ../orig/xview-3.2p1.4/lib/libxview/misc/gettext.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/misc/gettext.c 2005-09-02 05:27:12.000000000
+0000
@@ -11,7 +11,7 @@
#include <xview_private/gettext.h>
char * dgettext(char *, char *), *bindtextdomain();
-char *_gettext();
+static char *_gettext();
char *fgets(), *getenv();
#if !defined(__linux__) || !defined(__GLIBC__)
caddr_t mmap();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/misc/quark.c
xview-3.2p1.4/lib/libxview/misc/quark.c
--- ../orig/xview-3.2p1.4/lib/libxview/misc/quark.c 1993-06-29
05:16:31.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/misc/quark.c 2005-09-02 05:27:12.000000000
+0000
@@ -16,7 +16,7 @@
#include <xview/xview.h>
#include <xview/pkg.h>
-Xv_opaque resource_type_conv();
+static Xv_opaque resource_type_conv();
/*
* Utilities to deal with quark lists and such.
diff -urN ../orig/xview-3.2p1.4/lib/libxview/notice/notice_pt.c
xview-3.2p1.4/lib/libxview/notice/notice_pt.c
--- ../orig/xview-3.2p1.4/lib/libxview/notice/notice_pt.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/notice/notice_pt.c 2005-09-02
05:27:12.000000000 +0000
@@ -74,6 +74,8 @@
#define NOTICE_NORMAL_BUTTON 0
static notice_buttons_handle notice_get_prev_button();
+static int notice_quadrant(Rect notice_screen_rect, int x, int y);
+
/*
* --------------------------- Externals ----------------------------
*/
diff -urN ../orig/xview-3.2p1.4/lib/libxview/openwin/ow_view.c
xview-3.2p1.4/lib/libxview/openwin/ow_view.c
--- ../orig/xview-3.2p1.4/lib/libxview/openwin/ow_view.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/openwin/ow_view.c 2005-09-02
05:27:12.000000000 +0000
@@ -58,6 +58,7 @@
static openwin_locate_top_viewers();
static openwin_expand_viewers();
static openwin_register_initial_sb();
+static int openwin_check_view(Openwin_view_info *view);
/******************************************************************/
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/item_set.c
xview-3.2p1.4/lib/libxview/panel/item_set.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/item_set.c 1993-06-29
05:16:50.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/item_set.c 2005-09-02 05:27:12.000000000
+0000
@@ -25,6 +25,7 @@
Xv_private Graphics_info *xv_init_olgx();
static void item_adjust_label_size();
+static fix_positions(Item_info *ip);
extern Notify_value panel_base_event_handler();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/p_choice.c
xview-3.2p1.4/lib/libxview/panel/p_choice.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/p_choice.c 1993-06-29
05:16:57.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/p_choice.c 2005-09-02 05:27:12.000000000
+0000
@@ -121,6 +121,10 @@
static void update_value_rect();
static Xv_opaque choice_do_menu_item();
+static int find_choice(Item_info *ip, Event *event);
+static int modify_choice(Item_info *ip, int type, int which_choice, Xv_opaque
choice_info);
+static int move_specified(Item_info *ip, Attr_avlist avlist);
+static int re_alloc_choices(Item_info *ip, int type, Xv_opaque choices[]);
static Panel_ops ops = {
panel_default_handle_event, /* handle_event() */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/p_gauge.c
xview-3.2p1.4/lib/libxview/panel/p_gauge.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/p_gauge.c 1993-06-29
05:17:04.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/p_gauge.c 2005-09-02 05:27:12.000000000
+0000
@@ -92,6 +92,7 @@
unsigned int vertical:1;
} Gauge_info;
+static int etoi();
/* ========================================================================= */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/p_get.c
xview-3.2p1.4/lib/libxview/panel/p_get.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/p_get.c 1993-06-29
05:16:49.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/p_get.c 2005-09-02 05:27:12.000000000
+0000
@@ -20,6 +20,7 @@
#define MAX_NEGATIVE_SHRINK 2000
#define SHRINK_MARGIN 4
+static panel_shrink_margin(Panel_info *panel);
/*ARGSUSED*/
Pkg_private Xv_opaque
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/p_set.c
xview-3.2p1.4/lib/libxview/panel/p_set.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/p_set.c 1997-04-29
16:46:30.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/p_set.c 2005-09-02 05:27:12.000000000
+0000
@@ -23,6 +23,8 @@
Xv_private char *xv_font_regular_cmdline();
static void panel_set_fonts();
+static int column_from_absolute_x(int x_position, int col_gap, int
left_margin, Xv_Font font);
+static int row_from_absolute_y(int y_position, int col_gap, int left_margin,
Xv_Font font);
Pkg_private Xv_opaque
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/p_slider.c
xview-3.2p1.4/lib/libxview/panel/p_slider.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/p_slider.c 1993-06-29
05:17:02.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/p_slider.c 2005-09-02 05:27:12.000000000
+0000
@@ -54,6 +54,8 @@
static Panel_setting get_value();
static void paint_slider();
static void update_rects();
+static int etoi();
+static int itoe();
static Panel_ops ops = {
panel_default_handle_event, /* handle_event() */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/panel/panel.c
xview-3.2p1.4/lib/libxview/panel/panel.c
--- ../orig/xview-3.2p1.4/lib/libxview/panel/panel.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/panel/panel.c 2005-09-02 05:27:12.000000000
+0000
@@ -47,6 +47,7 @@
Attr_attribute panel_context_key;
+static panel_unregister_view(Panel_info *panel, Xv_Window view);
/*ARGSUSED*/
Pkg_private int
diff -urN ../orig/xview-3.2p1.4/lib/libxview/rect/rect_util.c
xview-3.2p1.4/lib/libxview/rect/rect_util.c
--- ../orig/xview-3.2p1.4/lib/libxview/rect/rect_util.c 1993-06-29
05:15:17.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/rect/rect_util.c 2005-09-02 05:27:12.000000000
+0000
@@ -16,6 +16,8 @@
#include <xview/rect.h>
+static int rect_nearest_edge(int minimum, int delta, int val);
+
/*
* Compute the distance from rect to (x, y). If (x, y) is in rect, zero is
* returned. If x_used or y_used are non-zero, the projection point is
diff -urN ../orig/xview-3.2p1.4/lib/libxview/sel/sel_agent.c
xview-3.2p1.4/lib/libxview/sel/sel_agent.c
--- ../orig/xview-3.2p1.4/lib/libxview/sel/sel_agent.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/sel/sel_agent.c 2005-09-02 05:27:12.000000000
+0000
@@ -68,6 +68,7 @@
static void selection_agent_do_function();
static Atom get_atom();
static Seln_attribute save_atom();
+static int waitforReadableTimeout(Display *display, struct timeval
*timeout);
Xv_private Seln_result seln_convert_request_to_property();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/selection/sel_own.c
xview-3.2p1.4/lib/libxview/selection/sel_own.c
--- ../orig/xview-3.2p1.4/lib/libxview/selection/sel_own.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/selection/sel_own.c 2005-09-02
05:27:12.000000000 +0000
@@ -45,6 +45,8 @@
static void OwnerProcessIncr();
static void RegisterSelClient();
+static int SendIncr(Sel_owner_info *seln);
+
extern XContext selCtx;
extern XContext propCtx;
extern XContext reqCtx;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/selection/sel_req.c
xview-3.2p1.4/lib/libxview/selection/sel_req.c
--- ../orig/xview-3.2p1.4/lib/libxview/selection/sel_req.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/selection/sel_req.c 2005-09-02
05:27:12.000000000 +0000
@@ -26,7 +26,6 @@
Pkg_private char *xv_sel_atom_to_str(/* display, atom */);
-Pkg_private XID SelGetOwnerXID(/* selReq */);
Pkg_private Atom xv_sel_str_to_atom(/* display, string */);
Pkg_private int xv_sel_add_prop_notify_mask();
Pkg_private Atom xv_sel_get_property();
@@ -56,6 +55,11 @@
static int ProcessReply();
static Requestor *SelGetReq();
+static int XvGetRequestedValue();
+static XID SelGetOwnerXID(Sel_req_info *selReq);
+static int ProcessNonBlkIncr(Sel_req_info *selReq, Sel_reply_info *reply,
XSelectionEvent *ev, Atom target);
+static int ProcessReq(Requestor *req, XPropertyEvent *ev);
+static int OldPkgIsOwner(Display *dpy, Atom selection, Window xid,
Sel_reply_info *reply, Sel_req_info *selReq);
/*ARGSUSED*/
Pkg_private int
diff -urN ../orig/xview-3.2p1.4/lib/libxview/selection/sel_util.c
xview-3.2p1.4/lib/libxview/selection/sel_util.c
--- ../orig/xview-3.2p1.4/lib/libxview/selection/sel_util.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/selection/sel_util.c 2005-09-02
05:27:12.000000000 +0000
@@ -24,6 +24,8 @@
static int SelMatchReply();
static Sel_req_tbl *SelMatchReqTbl();
+static int SelFindReply(Sel_reply_info *r1, Sel_reply_info *r2);
+
Pkg_private struct timeval *
xv_sel_cvt_xtime_to_timeval( XTime )
Time XTime;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/server/server.c
xview-3.2p1.4/lib/libxview/server/server.c
--- ../orig/xview-3.2p1.4/lib/libxview/server/server.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/server/server.c 2005-09-02 05:27:12.000000000
+0000
@@ -63,6 +63,8 @@
Xv_private_data int server_gather_stats;
#endif
+static int xv_set_scheduler();
+
static void load_kbd_cmds();
static void server_init_atoms();
static void destroy_atoms();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/ei_text.c
xview-3.2p1.4/lib/libxview/textsw/ei_text.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/ei_text.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/ei_text.c 2005-09-02 05:27:12.000000000
+0000
@@ -126,6 +126,7 @@
#endif
static struct ei_span_result ei_plain_text_span_of_group();
static struct ei_process_result ei_plain_text_expand();
+static paint_batch();
struct ei_ops ei_plain_text_ops = {
ei_plain_text_destroy,
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/es_file.c
xview-3.2p1.4/lib/libxview/textsw/es_file.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/es_file.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/es_file.c 2005-09-02 05:27:12.000000000
+0000
@@ -495,7 +495,7 @@
}
/* ARGSUSED */
-static caddr_t
+caddr_t
#ifdef ANSI_FUNC_PROTO
es_file_get(Es_handle esh, Es_attribute attribute, ...)
#else
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/es_mem.c
xview-3.2p1.4/lib/libxview/textsw/es_mem.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/es_mem.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/es_mem.c 2005-09-02 05:27:12.000000000
+0000
@@ -116,7 +116,7 @@
}
/* ARGSUSED */
-static caddr_t
+caddr_t
#ifdef ANSI_FUNC_PROTO
es_mem_get(Es_handle esh, Es_attribute attribute, ...)
#else
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/ev_display.c
xview-3.2p1.4/lib/libxview/textsw/ev_display.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/ev_display.c 1994-06-26
21:11:43.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/ev_display.c 2005-09-02
05:27:12.000000000 +0000
@@ -921,6 +921,7 @@
}
+static void ev_swap_line_table();
Pkg_private Es_index
ev_scroll_lines(view, line_count, scroll_by_display_lines)
@@ -940,7 +941,6 @@
register int i;
Es_index pos, pos_to_remember;
Pkg_private void ev_lt_format();
- static void ev_swap_line_table();
esbuf.esh = chain->esh;
esbuf.buf = buf;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/ev_op_bdry.c
xview-3.2p1.4/lib/libxview/textsw/ev_op_bdry.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/ev_op_bdry.c 1993-06-29
05:17:30.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/ev_op_bdry.c 2005-09-02
05:27:12.000000000 +0000
@@ -27,6 +27,8 @@
Pkg_private void ev_clear_from_margins();
static Ev_finger_handle ev_insert_finger();
static Ev_mark_object last_generated_id;
+static int ev_find_finger_internal(Ev_finger_table *fingers, Ev_mark mark);
+static ev_remove_finger_internal(Ev_finger_table *fingers, int i);
#define FORALL(index_var) \
for (index_var = 0; index_var < fingers->last_plus_one; index_var++)
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/ps_impl.c
xview-3.2p1.4/lib/libxview/textsw/ps_impl.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/ps_impl.c 1993-06-29
05:17:39.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/ps_impl.c 2005-09-02 05:27:12.000000000
+0000
@@ -62,6 +62,9 @@
static Es_index ps_replace(), ps_scratch_replace();
static int ps_set();
+static copy_pieces();
+static int get_current_offset(Piece_table private);
+
static Es_index write_header_etc();
static struct es_ops ps_ops = {
@@ -1575,7 +1578,7 @@
private->last_write_plus_one = ES_INFINITY;
}
-static caddr_t
+caddr_t
#ifdef ANSI_FUNC_PROTO
ps_get(Es_handle esh, Es_attribute attribute, ...)
#else
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_again.c
xview-3.2p1.4/lib/libxview/textsw/txt_again.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_again.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_again.c 2005-09-02
05:27:12.000000000 +0000
@@ -27,6 +27,8 @@
Pkg_private Es_index textsw_do_input();
Pkg_private Es_index textsw_do_pending_delete();
+static int textsw_string_min_free(string_t *ptr_to_string, int
min_free_desired);
+
string_t null_string = {0, 0, 0};
#define TEXT_DELIMITER "\\"
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_e_menu.c
xview-3.2p1.4/lib/libxview/textsw/txt_e_menu.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_e_menu.c 1997-04-30
23:22:53.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_e_menu.c 2005-09-02
05:27:12.000000000 +0000
@@ -75,6 +75,7 @@
static int free_argv();
static int Nargs;
static char *check_filename_locale();
+static any_shell_meta(char *s);
extern int EXTRASMENU_FILENAME_KEY;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_field.c
xview-3.2p1.4/lib/libxview/textsw/txt_field.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_field.c 1993-06-29
05:17:50.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_field.c 2005-09-02
05:27:12.000000000 +0000
@@ -98,6 +98,8 @@
}
+static void textsw_get_match_symbol();
+
static int
check_selection(buf, buf_len, first, last_plus_one,
marker1, marker1_len, field_flag)
@@ -121,8 +123,6 @@
CHAR marker2[3];
int marker2_len;
unsigned direction;
- static void textsw_get_match_symbol();
-
buf = buf + (buf_len - marker1_len);
(void) textsw_get_match_symbol(marker1, marker1_len,
marker2, &marker2_len, &direction);
@@ -152,8 +152,6 @@
CHAR marker2[3];
int marker2_len;
unsigned direction;
- static void textsw_get_match_symbol();
-
(void) textsw_get_match_symbol(marker1, marker1_len,
marker2, &marker2_len, &direction);
if (STRNCMP(buf, marker2, marker2_len) == 0) {
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_filter.c
xview-3.2p1.4/lib/libxview/textsw/txt_filter.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_filter.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_filter.c 2005-09-02
05:27:12.000000000 +0000
@@ -76,6 +76,8 @@
Pkg_private Es_index textsw_do_input();
static short unsigned type_for_filter_rec();
static int event_code_for_filter_rec();
+static int talk_to_filter();
+static int start_filter();
/*
* WARNING: this is a hack to force the variable to be in memory. this var
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_input.c
xview-3.2p1.4/lib/libxview/textsw/txt_input.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_input.c 1993-06-29
05:17:42.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_input.c 2005-09-02
05:27:12.000000000 +0000
@@ -193,6 +193,15 @@
#endif
+static int textsw_scroll_event();
+static int textsw_function_key_event();
+static int textsw_mouse_event();
+static int textsw_edit_function_key_event();
+static int textsw_caret_motion_event();
+static int textsw_field_event();
+static int textsw_file_operation();
+static int textsw_erase_action();
+
Pkg_private int
textsw_process_event(view_public, ie, arg)
Textsw_view view_public;
@@ -200,15 +209,6 @@
Notify_arg arg;
{
Pkg_private void textsw_update_scrollbars();
- static int textsw_scroll_event();
- static int textsw_function_key_event();
- static int textsw_mouse_event();
- static int textsw_edit_function_key_event();
- static int textsw_caret_motion_event();
- static int textsw_field_event();
- static int textsw_file_operation();
- static int textsw_erase_action();
-
int caret_was_up;
int result = TEXTSW_PE_USED;
register Textsw_view_handle view = VIEW_PRIVATE(view_public);
@@ -592,7 +592,7 @@
#ifdef OW_I18N
Pkg_private int
#else
-static int
+int
#endif
textsw_do_newline(view, action)
register Textsw_view_handle view;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_menu.c
xview-3.2p1.4/lib/libxview/textsw/txt_menu.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_menu.c 1994-06-26
01:05:22.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_menu.c 2005-09-02
05:27:12.000000000 +0000
@@ -129,6 +129,8 @@
/* VARARGS0 */
+static int textsw_edit_do_menu_action(), textsw_view_do_menu_action(),
+ textsw_find_do_menu_action();
static void
textsw_new_menu(folio)
Textsw_folio folio;
@@ -140,8 +142,6 @@
Frame frame = xv_get(textsw, WIN_FRAME);
Menu_item break_mode_item, undo_cmds_item, find_sel_cmds_item,
select_field_cmds_item;
- static int textsw_edit_do_menu_action(), textsw_view_do_menu_action(),
- textsw_find_do_menu_action();
int index;
Pkg_private char *textsw_get_extras_filename();
Pkg_private int textsw_build_extras_menu_items();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_once.c
xview-3.2p1.4/lib/libxview/textsw/txt_once.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_once.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_once.c 2005-09-02
06:25:38.000000000 +0000
@@ -1357,7 +1357,7 @@
xv_destroy(view->drop_site);
textsw_view_cleanup(view);
- VIEW_PRIVATE(view_public) = NULL; /* WG Mar '95 */
+ ((Xv_textsw_view*)view_public)->private_data = NULL; /* WG Mar '95 */
break;
default: /* Conservative in face of new cases. */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_popup.c
xview-3.2p1.4/lib/libxview/textsw/txt_popup.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_popup.c 1993-06-29
05:17:38.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_popup.c 2005-09-02
05:27:12.000000000 +0000
@@ -104,6 +104,9 @@
Pkg_private open_cmd_proc();
Pkg_private include_cmd_proc();
Pkg_private save_cmd_proc();
+static void add_exten_item();
+static void show_dot_files_proc();
+static int fc_exten_func();
static Notify_value
textsw_popup_destroy_func(client, status)
@@ -135,7 +138,6 @@
Frame popup_frame, base_frame;
Panel panel = NULL;
char *label;
- void add_exten_item();
#ifdef OW_I18N
int win_use_im = ((popup_type !=
TEXTSW_MENU_SEL_MARK_TEXT) &&
(popup_type != TEXTSW_MENU_NORMALIZE_LINE));
@@ -502,8 +504,6 @@
int frame_width;
int frame_height;
Panel_item item;
- void show_dot_files_proc();
- int fc_exten_func();
panel = xv_get(fc, FRAME_CMD_PANEL);
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_putkey.c
xview-3.2p1.4/lib/libxview/textsw/txt_putkey.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_putkey.c 1993-06-29
05:17:41.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_putkey.c 2005-09-02
05:27:12.000000000 +0000
@@ -26,6 +26,7 @@
Pkg_private Es_handle textsw_esh_for_span();
Pkg_private Seln_rank textsw_acquire_seln();
Pkg_private caddr_t textsw_checkpoint_undo();
+static int textsw_do_put(Textsw_view_handle view, int local_operands);
Pkg_private int
textsw_begin_put(view, inform_svc)
diff -urN ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_selsvc.c
xview-3.2p1.4/lib/libxview/textsw/txt_selsvc.c
--- ../orig/xview-3.2p1.4/lib/libxview/textsw/txt_selsvc.c 1994-06-26
01:05:23.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/textsw/txt_selsvc.c 2005-09-02
05:27:12.000000000 +0000
@@ -24,7 +24,8 @@
#include <stdlib.h>
#endif /* SVR4 */
-extern int errno;
+
+static int textsw_should_ask_seln_svc(Textsw_folio textsw);
Pkg_private Es_status es_copy();
static Seln_result textsw_seln_yield();
diff -urN ../orig/xview-3.2p1.4/lib/libxview/ttysw/tty_init.c
xview-3.2p1.4/lib/libxview/ttysw/tty_init.c
--- ../orig/xview-3.2p1.4/lib/libxview/ttysw/tty_init.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/ttysw/tty_init.c 2005-09-02 05:27:12.000000000
+0000
@@ -146,6 +146,8 @@
NULL, -1
};
+static int ttyinit(Ttysw *ttysw);
+
Pkg_private int
ttysw_lookup_boldstyle(str)
char *str;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/ttysw/tty_main.c
xview-3.2p1.4/lib/libxview/ttysw/tty_main.c
--- ../orig/xview-3.2p1.4/lib/libxview/ttysw/tty_main.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/ttysw/tty_main.c 2005-09-02 05:27:12.000000000
+0000
@@ -104,6 +104,11 @@
#define oebp ttysw->ttysw_obuf.cb_ebp
#define obuf ttysw->ttysw_obuf.cb_buf
+static int ttysw_process_point(Ttysw_folio ttysw, struct inputevent *ie);
+static int ttysw_process_adjust(Ttysw_folio ttysw, struct inputevent *ie);
+static int ttysw_process_motion(Ttysw_folio ttysw, struct inputevent *ie);
+static int ttysw_process_keyboard(Ttysw_folio ttysw, struct inputevent *ie);
+
/* #ifdef TERMSW */
/*
* The basic strategy for building a line-oriented command subwindow
diff -urN ../orig/xview-3.2p1.4/lib/libxview/ttysw/ttyansi.c
xview-3.2p1.4/lib/libxview/ttysw/ttyansi.c
--- ../orig/xview-3.2p1.4/lib/libxview/ttysw/ttyansi.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/ttysw/ttyansi.c 2005-09-02 05:27:12.000000000
+0000
@@ -82,6 +82,10 @@
int pre_edit_rows_scrolled; /* updated in ansi_lf, used in ttysw callbacks */
#endif
+static int send_input_to_textsw(Textsw textsw, CHAR *buf, long buf_len,
Textsw_index end_transcript);
+static int ansi_lf(Ttysw_view_handle ttysw_view, CHAR *addr, int len);
+static int ansi_char(Ttysw_view_handle ttysw_view, CHAR *addr, int olen);
+
/*
* Interpret a string of characters of length <len>. Stash and restore the
* cursor indicator.
diff -urN ../orig/xview-3.2p1.4/lib/libxview/ttysw/ttyselect.c
xview-3.2p1.4/lib/libxview/ttysw/ttyselect.c
--- ../orig/xview-3.2p1.4/lib/libxview/ttysw/ttyselect.c 2005-09-02
05:09:52.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/ttysw/ttyselect.c 2005-09-02
05:27:12.000000000 +0000
@@ -113,6 +113,8 @@
static char ttysel_filename[MAXNAMLEN];
#endif
+static ttysel_resynch(struct ttysubwindow *ttysw, Seln_function_buffer
*buffer);
+
/* static */ int
ttysw_is_seln_nonzero(ttysw, rank)
register struct ttysubwindow *ttysw;
diff -urN ../orig/xview-3.2p1.4/lib/libxview/win/win_input.c
xview-3.2p1.4/lib/libxview/win/win_input.c
--- ../orig/xview-3.2p1.4/lib/libxview/win/win_input.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/win/win_input.c 2005-09-02 05:27:12.000000000
+0000
@@ -93,6 +93,7 @@
static int process_property_events();
static int process_wm_pushpin_state();
Pkg_private int win_handle_compose();
+static int xevent_to_event(Display *display, XEvent *xevent, Event *event,
Xv_object *pwindow);
struct _XKeytrans {
struct _XKeytrans *next;/* next on list */
diff -urN ../orig/xview-3.2p1.4/lib/libxview/window/window_set.c
xview-3.2p1.4/lib/libxview/window/window_set.c
--- ../orig/xview-3.2p1.4/lib/libxview/window/window_set.c 2005-09-02
05:09:51.000000000 +0000
+++ xview-3.2p1.4/lib/libxview/window/window_set.c 2005-09-02
05:27:12.000000000 +0000
@@ -52,6 +52,7 @@
Pkg_private void sync_rect();
static Xv_opaque window_set_avlist_tier2();
static Xv_opaque window_set_avlist_tier3();
+static void window_set_softkey_labels(Xv_Drawable_info *info, char
*string);
static Defaults_pairs setinput_pairs[] = {
"select", FALSE,
@@ -1072,7 +1073,6 @@
case WIN_SOFT_FNKEY_LABELS: {
register Xv_Drawable_info *info;
- static void window_set_softkey_labels();
DRAWABLE_INFO_MACRO(win_public, info);
win->softkey_flag = TRUE;
diff -urN ../orig/xview-3.2p1.4/make xview-3.2p1.4/make
--- ../orig/xview-3.2p1.4/make 1997-06-16 00:03:45.000000000 +0000
+++ xview-3.2p1.4/make 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "make-wrapper: running pmake $* in directory `pwd`"
-exec pmake "$@"
diff -urN ../orig/xview-3.2p1.4/xview.man xview-3.2p1.4/xview.man
--- ../orig/xview-3.2p1.4/xview.man 1993-06-29 05:19:38.000000000 +0000
+++ xview-3.2p1.4/xview.man 2005-09-02 05:43:29.000000000 +0000
@@ -1818,7 +1818,7 @@
.TP
.B Description
This resource takes as a value a list of modifier keys. Any semantic
-meaning (mouseless command or keyboard accelerater) that would normally
+meaning (mouseless command or keyboard accelerator) that would normally
be associated with the listed modifiers when the keyboard focus is in
a ttysw or termsw would be removed.
.sp
