mcgrew@dartagnan.rutgers.edu (Charles Mcgrew) (08/25/89)
Submitted-by: P{r Emanuelsson <pell@isy.liu.se>
Posting-number: Volume 1, Issue 57
Archive-name: ansi-sunview/part02
#!/bin/sh
# this is part 2 of a multipart archive
# do not concatenate these parts, unpack them in order with /bin/sh
# file PATCH-suntool continued
#
CurArch=2
if test ! -r s2_seq_.tmp
then echo "Please unpack part 1 first!"
exit 1; fi
( read Scheck
if test "$Scheck" != $CurArch
then echo "Please unpack part $Scheck next!"
exit 1;
else exit 0; fi
) < s2_seq_.tmp || exit 1
echo "x - Continuing file PATCH-suntool"
sed 's/^X//' << 'SHAR_EOF' >> PATCH-suntool
X! seln_rank_is_me();
X
X! void seln_init_request(),
X seln_clear_functions();
X
X--- 187,201 ----
X /* possibly useful predicates */
X
X! int seln_get_function_state(Seln_function);
X
X #define seln_holder_is_me(client, holder) \
X (seln_holder_same_client(client, holder))
X! int seln_holder_same_client(Seln_holder *, char *),
X! seln_holder_same_process(Seln_holder *),
X! seln_secondary_made(Seln_function_buffer *),
X! seln_secondary_exists(Seln_function_buffer *),
X! seln_rank_is_me(...); /* Cannot find this function /Pell */
X
X! void seln_init_request(Seln_request *, Seln_holder * ...),
X seln_clear_functions();
X
Xdiff -rc2 /usr/include/suntool/tek.h suntool/tek.h
X*** /usr/include/suntool/tek.h Sat Apr 9 09:59:58 1988
X--- suntool/tek.h Fri Jul 28 18:06:34 1989
X***************
X*** 11,17 ****
X ********************
X *
X! * caddr_t
X * tek_create(tdata, straps) init emulator return magic cookie to ident.
X! * caddr_t tdata; user magic cookie for output routines
X * int straps; terminal straps
X *
X--- 11,17 ----
X ********************
X *
X! * void *
X * tek_create(tdata, straps) init emulator return magic cookie to ident.
X! * void * tdata; user magic cookie for output routines
X * int straps; terminal straps
X *
X***************
X*** 33,41 ****
X *******************/
X
X! extern caddr_t tek_create();
X! extern void tek_destroy();
X! extern void tek_ttyinput();
X! extern void tek_kbdinput();
X! extern void tek_posinput();
X
X /*******************
X--- 33,41 ----
X *******************/
X
X! extern void * tek_create(void *, int);
X! extern void tek_destroy(struct tek *);
X! extern void tek_ttyinput(struct tek *, char);
X! extern void tek_kbdinput(struct tek *, char);
X! extern void tek_posinput(struct tek *, int, int);
X
X /*******************
X***************
X*** 46,54 ****
X *
X * tek_move(tdata, x, y) move current position without writing
X! * caddr_t tdata;
X * int x,y;
X *
X * tek_draw(tdata, x, y, type, style) draw from current position to x,y
X! * caddr_t tdata;
X * int x,y;
X * enum vtype type;
X--- 46,54 ----
X *
X * tek_move(tdata, x, y) move current position without writing
X! * void * tdata;
X * int x,y;
X *
X * tek_draw(tdata, x, y, type, style) draw from current position to x,y
X! * void * tdata;
X * int x,y;
X * enum vtype type;
X***************
X*** 56,93 ****
X *
X * tek_char(tdata, c) put a character at the current position
X! * caddr_t tdata;
X * char c;
X *
X * tek_ttyoutput(tdata, c) output to tty
X! * caddr_t tdata;
X * char c;
X *
X * tek_chfont(tdata, font) change alph fonts
X! * caddr_t tdata;
X * int font;
X *
X * tek_cursormode(tdata, cmode) change displayed cursor mode
X! * caddr_t tdata; alpha cursor is put at current position
X * enum cursormode cmode;
X *
X * tek_clearscreen(tdata) clear the screen
X! * caddr_t tdata;
X *
X * tek_bell(tdata) ring the bell
X! * caddr_t tdata;
X *
X ********************/
X
X! extern void tek_move();
X! extern void tek_draw();
X! extern void tek_char();
X! extern void tek_ttyoutput();
X! extern void tek_chfont();
X! extern void tek_cursormode();
X! extern void tek_clearscreen();
X! extern void tek_bell();
X! extern void tek_makecopy();
X! extern void tek_pagefull_on();
X! extern void tek_pagefull_off();
X
X /*
X--- 56,93 ----
X *
X * tek_char(tdata, c) put a character at the current position
X! * void * tdata;
X * char c;
X *
X * tek_ttyoutput(tdata, c) output to tty
X! * void * tdata;
X * char c;
X *
X * tek_chfont(tdata, font) change alph fonts
X! * void * tdata;
X * int font;
X *
X * tek_cursormode(tdata, cmode) change displayed cursor mode
X! * void * tdata; alpha cursor is put at current position
X * enum cursormode cmode;
X *
X * tek_clearscreen(tdata) clear the screen
X! * void * tdata;
X *
X * tek_bell(tdata) ring the bell
X! * void * tdata;
X *
X ********************/
X
X! extern void tek_move(void *, int, int);
X! extern void tek_draw(void *, int, enum vtype, enum vstyle);
X! extern void tek_char(void *, char);
X! extern void tek_ttyoutput(void *, char);
X! extern void tek_chfont(void *, char);
X! extern void tek_cursormode(void *, enum cursormode);
X! extern void tek_clearscreen(void *);
X! extern void tek_bell(void *);
X! extern void tek_makecopy(void *);
X! extern void tek_pagefull_on(void *);
X! extern void tek_pagefull_off(void *);
X
X /*
Xdiff -rc2 /usr/include/suntool/teksw.h suntool/teksw.h
X*** /usr/include/suntool/teksw.h Sat Apr 9 09:59:59 1988
X--- suntool/teksw.h Fri Jan 20 16:26:27 1989
X***************
X*** 26,31 ****
X * Interface for tools
X */
X! extern struct toolsw *teksw_createtoolsubwindow();
X! extern int teksw_fork();
X
X /*
X--- 26,32 ----
X * Interface for tools
X */
X! extern struct toolsw *teksw_createtoolsubwindow(struct tool *, char *,
X! short, short);
X! extern int teksw_fork(Window, int, char **);
X
X /*
X***************
X*** 32,37 ****
X * Interface for subwindows
X */
X! extern struct teksubwindow *teksw_init();
X! extern teksw_done();
X! extern int teksw_handlesigwinch();
X! extern int teksw_selected();
X--- 33,39 ----
X * Interface for subwindows
X */
X! extern struct teksubwindow *teksw_init(int, char **);
X! extern teksw_done(struct teksubwindow *);
X! extern int teksw_handlesigwinch(struct teksubwindow *);
X! extern int teksw_selected(struct teksubwindow *, int *, int *, int *,
X! struct timeval **);
Xdiff -rc2 /usr/include/suntool/textsw.h suntool/textsw.h
X*** /usr/include/suntool/textsw.h Sat Apr 9 10:00:53 1988
X--- suntool/textsw.h Fri Jul 28 18:06:39 1989
X***************
X*** 40,51 ****
X #define TEXTSW_TYPE ATTR_PKG_TEXTSW
X #define TEXTSW textsw_window_object, WIN_COMPATIBILITY
X! extern caddr_t textsw_window_object();
X # endif
X
X! #if lint
X! typedef void * Textsw_opaque;
X! #else
X! typedef char * Textsw_opaque;
X! #endif
X
X typedef Textsw_opaque Textsw;
X--- 40,47 ----
X #define TEXTSW_TYPE ATTR_PKG_TEXTSW
X #define TEXTSW textsw_window_object, WIN_COMPATIBILITY
X! extern void * textsw_window_object(Window ...);
X # endif
X
X! typedef void * Textsw_opaque;
X
X typedef Textsw_opaque Textsw;
X***************
X*** 52,55 ****
X--- 48,53 ----
X #define TEXTSW_NULL ((Textsw)0)
X typedef long int Textsw_index;
X+ typedef long int Es_index;
X+ typedef long int Es_status;
X #define TEXTSW_INFINITY ((Textsw_index)0x77777777)
X #define TEXTSW_CANNOT_SET ((Textsw_index)0x80000000)
X***************
X*** 59,117 ****
X
X
X! extern Textsw
X! textsw_build( /* tool, attributes */ );
X! # ifdef notdef
X! struct tool *tool;
X! char **attributes;
X! # endif
X
X- extern void
X- textsw_destroy( /* textsw */ );
X- # ifdef notdef
X- Textsw textsw;
X- # endif
X-
X- extern void
X- textsw_destroy_view( /* textsw */ );
X- # ifdef notdef
X- Textsw textsw;
X- # endif
X-
X- extern Textsw
X- textsw_first( /* textsw */ );
X- # ifdef notdef
X- Textsw textsw;
X- # endif
X-
X- extern Textsw
X- textsw_init( /* windowfd, attributes */ );
X- # ifdef notdef
X- int windowfd;
X- char **attributes;
X- # endif
X-
X- extern Textsw
X- textsw_next( /* textsw */ );
X- # ifdef notdef
X- Textsw textsw;
X- # endif
X-
X- extern void
X- textsw_reset( /* abstract, locx, locy */ );
X- # ifdef notdef
X- Textsw abstract;
X- int locx;
X- int locy;
X- # endif
X-
X- extern void
X- textsw_file_lines_visible( /* abstract, top, bottom */ );
X- # ifdef notdef
X-
X- Textsw abstract;
X- int *top;
X- int *bottom;
X- # endif
X-
X /* Status values for textsw_build and textsw_init. */
X typedef enum {
X--- 57,69 ----
X
X
X! extern Textsw textsw_build(struct tool* ...);
X! extern void textsw_destroy(Textsw);
X! extern void textsw_destroy_view(Textsw);
X! extern Textsw textsw_first(Textsw);
X! extern Textsw textsw_init(int ...);
X! extern Textsw textsw_next(Textsw);
X! extern void textsw_reset(Textsw, int, int);
X! extern void textsw_file_lines_visible(Textsw, int *, int *);
X
X /* Status values for textsw_build and textsw_init. */
X typedef enum {
X***************
X*** 134,147 ****
X
X extern Textsw_expand_status
X! textsw_expand( /* abstract, start, stop_plus_one,
X! out_buf, out_buf_len, total_chars */ );
X! # ifdef notdef
X! Textsw abstract;
X! Es_index start; /* Entity to start expanding at */
X! Es_index stop_plus_one; /* 1st ent not expanded */
X! char *out_buf;
X! int out_buf_len;
X! int *total_chars;
X! # endif
X
X /* Attributes for textsw_build, textsw_init, textsw_set and textsw_get. */
X--- 86,90 ----
X
X extern Textsw_expand_status
X! textsw_expand(Textsw, Es_index, Es_index, char *, int, int *);
X
X /* Attributes for textsw_build, textsw_init, textsw_set and textsw_get. */
X***************
X*** 234,237 ****
X--- 177,207 ----
X } Textsw_attribute;
X
X+ extern void *textsw_get(Textsw, Textsw_attribute);
X+ extern Textsw_status textsw_set(Textsw ...);
X+ extern int textsw_append_file_name(Textsw, char *);
X+ extern Textsw_index textsw_index_for_file_line(Textsw, int);
X+ extern void textsw_scroll_lines(Textsw, int);
X+ extern int textsw_set_selection(Textsw, Es_index, Es_index, unsigned int);
X+ extern Textsw_index textsw_delete(Textsw, Es_index, Es_index);
X+ extern Textsw_index textsw_erase(Textsw, Textsw_index, Textsw_index);
X+ extern int textsw_find_bytes(Textsw, Es_index *, Es_index *, char *,
X+ unsigned int, unsigned int);
X+ extern Textsw_index textsw_edit(Textsw, unsigned int, unsigned int,
X+ unsigned int);
X+ extern Textsw_index textsw_insert(Textsw, char *, long int);
X+ extern Textsw_index textsw_replace_bytes(Textsw, Es_index, Es_index,
X+ char *, long int);
X+ extern int textsw_possibly_normalize(Textsw, Es_index);
X+ extern int textsw_normalize_view(Textsw, Es_index);
X+ extern Es_status textsw_save(Textsw, int, int);
X+ extern int textsw_screen_line_count(Textsw);
X+ extern Es_status textsw_store_file(Textsw, char *, int, int);
X+ extern void textsw_scroll(void * /*Scrollbar*/ );
X+ extern Textsw_index textsw_replace(Textsw, Es_index, Es_index, char *, long int);
X+ extern int textsw_load_file(Textsw, char *, int, int, int);
X+ extern int textsw_has_been_modified(Textsw);
X+ extern void textsw_set_start(Textsw, Textsw_index);
X+
X+
X /* Following definitions are for compatibility during 3.0. */
X #define TEXTSW_NO_CD TEXTSW_DISABLE_CD
X***************
X*** 256,260 ****
X
X /* A special scrollbar value for TEXTSW_VIEW_SCROLLBAR */
X! #define TEXTSW_DEFAULT_SCROLLBAR ((caddr_t)1)
X
X /* Flag values for TEXTSW_NOTIFY_LEVEL attribute. */
X--- 226,230 ----
X
X /* A special scrollbar value for TEXTSW_VIEW_SCROLLBAR */
X! #define TEXTSW_DEFAULT_SCROLLBAR ((void *)1)
X
X /* Flag values for TEXTSW_NOTIFY_LEVEL attribute. */
X***************
X*** 278,295 ****
X TEXTSW_NOTIFY_STANDARD)
X
X! extern int
X! textsw_default_notify( /* textsw, attributes */ );
X! # ifdef notdef
X! Textsw textsw;
X! Attr_avlist attributes;
X! # endif
X
X- extern int
X- textsw_nop_notify( /* textsw, attributes */ );
X- # ifdef notdef
X- Textsw textsw;
X- Attr_avlist attributes;
X- # endif
X-
X /*
X * Following are actions defined for client provided notify_proc.
X--- 248,254 ----
X TEXTSW_NOTIFY_STANDARD)
X
X! extern int textsw_default_notify(Textsw ...);
X! extern int textsw_nop_notify(Textsw ...);
X
X /*
X * Following are actions defined for client provided notify_proc.
X***************
X*** 410,434 ****
X #define TEXTSW_MARK_READ_ONLY 0x2
X
X! extern Textsw_mark
X! textsw_add_mark( /* textsw, position, flags */ );
X! #ifdef notdef
X! Textsw textsw;
X! Textsw_index position;
X! unsigned flags;
X! #endif
X!
X! extern Textsw_index
X! textsw_find_mark( /* textsw, mark */ );
X! #ifdef notdef
X! Textsw textsw;
X! Textsw_mark mark;
X! #endif
X!
X! extern void
X! textsw_remove_mark( /* textsw, mark */ );
X! #ifdef notdef
X! Textsw textsw;
X! Textsw_mark mark;
X! #endif
X
X
X--- 369,375 ----
X #define TEXTSW_MARK_READ_ONLY 0x2
X
X! extern Textsw_mark textsw_add_mark(Textsw, Textsw_index, unsigned int);
X! extern Textsw_index textsw_find_mark(Textsw, Textsw_mark);
X! extern void textsw_remove_mark(Textsw, Textsw_mark);
X
X
Xdiff -rc2 /usr/include/suntool/tool_struct.h suntool/tool_struct.h
X*** /usr/include/suntool/tool_struct.h Sat Apr 9 09:59:21 1988
X--- suntool/tool_struct.h Fri Jul 28 18:06:51 1989
X***************
X*** 39,43 ****
X struct rect tl_rectcache; /* rect of tool (tool relative) */
X struct rect tl_openrect; /* saved open rect of tool while full */
X! caddr_t tl_menu; /* Menu, Non zero if tool has a walking menu */
X void (*props_proc)();/* proc to call on props */
X int props_active;
X--- 39,43 ----
X struct rect tl_rectcache; /* rect of tool (tool relative) */
X struct rect tl_openrect; /* saved open rect of tool while full */
X! void * tl_menu; /* Menu, Non zero if tool has a walking menu */
X void (*props_proc)();/* proc to call on props */
X int props_active;
X***************
X*** 54,59 ****
X struct toolio ts_io; /* Tool_select and signal handling */
X int (*ts_destroy)();/* call when removing subwindow */
X! caddr_t ts_data; /* uninterpreted data passed to functions */
X! caddr_t ts_priv; /* tool implementation private data */
X } Toolsw;
X #define TOOLSW_NULL ((Toolsw *)0)
X--- 54,59 ----
X struct toolio ts_io; /* Tool_select and signal handling */
X int (*ts_destroy)();/* call when removing subwindow */
X! void * ts_data; /* uninterpreted data passed to functions */
X! void * ts_priv; /* tool implementation private data */
X } Toolsw;
X #define TOOLSW_NULL ((Toolsw *)0)
X***************
X*** 95,101 ****
X
X
X! extern struct tool *tool_begin();
X! extern struct toolsw *tool_createsubwindow();
X! extern short tool_stripeheight(), tool_borderwidth(), tool_subwindowspacing();
X extern struct pixrect *tool_bkgrd;
X
X--- 95,99 ----
X
X
X! extern struct tool *tool_begin(...);
X extern struct pixrect *tool_bkgrd;
X
X***************
X*** 102,106 ****
X #define tool_end(tool) tool_destroy((tool))
X
X- #ifdef cplus
X /*
X * C Library routines specifically related to tool functions.
X--- 100,103 ----
X***************
X*** 110,117 ****
X * Create operations
X */
X! int tool *tool_new(int attribute_num, char *value,
X! ...more attribute_num/value pairs..., 0);
X! struct toolsw *tool_createsubwindow(struct tool *tool, char *name,
X! short width, height);
X
X /*
X--- 107,112 ----
X * Create operations
X */
X! struct tool *tool_new(int, char *, ...);
X! struct toolsw *tool_createsubwindow(struct tool *, char *, short, short);
X
X /*
X***************
X*** 118,123 ****
X * Cleanup routines
X */
X! void tool_destroysubwindow(struct tool *tool, struct toolsw *toolsw);
X! void tool_destroy(struct tool *tool);
X
X /*
X--- 113,118 ----
X * Cleanup routines
X */
X! void tool_destroysubwindow(struct tool *, struct toolsw *);
X! void tool_destroy(struct tool *);
X
X /*
X***************
X*** 124,134 ****
X * Subwindow layout utilities.
X */
X! short tool_stripeheight(struct tool *tool);
X! short tool_borderwidth(struct tool *tool);
X! short tool_subwindowspacing(struct tool *tool);
X! int tool_heightfromlines(struct tool *tool, int lines);
X! int tool_widthfromcolumns(struct tool *tool, int columns);
X! int tool_linesfromheight(struct tool *tool, int height);
X! int tool_columnsfromwidth(struct tool *tool, int width);
X
X /*
X--- 119,129 ----
X * Subwindow layout utilities.
X */
X! short tool_stripeheight(struct tool *);
X! short tool_borderwidth(struct tool *);
X! short tool_subwindowspacing(struct tool *);
X! int tool_heightfromlines(struct tool *, int);
X! int tool_widthfromcolumns(struct tool *, int);
X! int tool_linesfromheight(struct tool *, int);
X! int tool_columnsfromwidth(struct tool *, int);
X
X /*
X***************
X*** 135,145 ****
X * Input & display functions.
X */
X! void tool_select(struct tool *tool, int waitprocessesdie);
X! void tool_sigchld(struct tool *tool);
X! void tool_done(struct tool *tool);
X! void tool_sigwinch(struct tool *tool);
X! void tool_handlesigwinchstd(struct tool *tool);
X! void tool_selectedstd(struct tool *tool,
X! int *inputbits, *outputbits, *exceptbits, struct timeval *timer);
X
X /*
X--- 130,139 ----
X * Input & display functions.
X */
X! void tool_select(struct tool *, int);
X! void tool_sigchld(struct tool *);
X! void tool_done(struct tool *);
X! void tool_sigwinch(struct tool *);
X! void tool_handlesigwinchstd(struct tool *);
X! void tool_selectedstd(struct tool *, int *, int *, int *, struct timeval *);
X
X /*
X***************
X*** 146,154 ****
X * Replacable operations calling sequence.
X */
X! void tio_selected(caddr_t ts_data, int *inputbits, *outputbits, *exceptbits,
X! struct timeval *timer);
X! void tio_handlesigwinch(caddr_t ts_data);
X! void ts_destroy(caddr_t ts_data);
X! void tool_layoutsubwindows(struct tool *tool);
X
X /*
X--- 140,147 ----
X * Replacable operations calling sequence.
X */
X! void tio_selected(void *, int *, int *, int *, struct timeval *);
X! void tio_handlesigwinch(void *);
X! void ts_destroy(void *);
X! void tool_layoutsubwindows(struct tool *);
X
X /*
X***************
X*** 155,168 ****
X * Attribute operations.
X */
X! int tool_set_attributes(struct tool *tool, int attribute_num, char *value,
X! ...more attribute_num/value pairs..., 0);
X! char * tool_get_attribute(struct tool *tool, int attribute_num);
X! void tool_free_attribute(int attribute_num, char *value);
X! void tool_free_attribute_list(char **avlist);
X! void tool_find_attribute(char **avlist, int attribute_num, char **value);
X! int tool_parse_one(int argc, char **argv, char ***avlist_ptr,
X! char *tool_name);
X! int tool_parse_all(int *argc_ptr, char **argv, char ***avlist_ptr,
X! char *tool_name);
X
X /*
X--- 148,158 ----
X * Attribute operations.
X */
X! int tool_set_attributes(struct tool *, int, char *, ...);
X! char * tool_get_attribute(struct tool *, int);
X! void tool_free_attribute(int, char *);
X! void tool_free_attribute_list(char **);
X! void tool_find_attribute(char **, int, char **);
X! int tool_parse_one(int, char **, char ***, char *);
X! int tool_parse_all(int *, char **, char ***, char *);
X
X /*
X***************
X*** 169,185 ****
X * Obsolete (but implemented) operations
X */
X! struct tool *tool_create(char *name, short flags, struct rect *rect,
X! struct icon *icon); /* Use tool_make instead */
X! int tool *tool_make(int attribute_num, char *value,
X! ...more attribute_num/value pairs..., 0);
X! void tool_display(struct tool *tool); /* Use tool_set_attributes */
X!
X! #endif
X!
X! /*
X! * Obsolete (but implemented) operations
X! */
X! extern struct tool *tool_create(); /* Old-fashion */
X! extern struct tool *tool_make(); /* Old-fashion */
X
X #endif not tool_struct_DEFINED
X--- 159,166 ----
X * Obsolete (but implemented) operations
X */
X! struct tool *tool_create(char *, short, struct rect *,
X! struct icon *); /* Use tool_make instead */
X! struct tool *tool_make(int, char *, ...);
X! void tool_display(struct tool *); /* Use tool_set_attributes */
X
X #endif not tool_struct_DEFINED
Xdiff -rc2 /usr/include/suntool/tty.h suntool/tty.h
X*** /usr/include/suntool/tty.h Sat Apr 9 10:01:07 1988
X--- suntool/tty.h Fri Jul 28 18:02:55 1989
X***************
X*** 35,39 ****
X } Tty_attribute;
X
X! #define tty_attr_next(attr) (Tty_attribute *)attr_next((caddr_t *)attr)
X
X /***********************************************************************/
X--- 35,39 ----
X } Tty_attribute;
X
X! #define tty_attr_next(attr) (Tty_attribute *)attr_next((void **)attr)
X
X /***********************************************************************/
X***************
X*** 41,45 ****
X /***********************************************************************/
X
X! typedef caddr_t Tty;
X #define TTY_ARGV_DO_NOT_FORK -1
X #define TTY_INFINITY ((long)0x77777777)
X--- 41,45 ----
X /***********************************************************************/
X
X! typedef void * Tty;
X #define TTY_ARGV_DO_NOT_FORK -1
X #define TTY_INFINITY ((long)0x77777777)
X***************
X*** 49,54 ****
X /***********************************************************************/
X
X! extern int tty_start();
X! extern int tty_save_parameters();
X
X /***********************************************************************/
X--- 49,54 ----
X /***********************************************************************/
X
X! extern int tty_start(...); /* Couldn't find the spec's for these /Pell */
X! extern int tty_save_parameters(...);
X
X /***********************************************************************/
X***************
X*** 57,64 ****
X
X #define TTY tty_window_object
X! extern caddr_t tty_window_object();
X
X #define TERM term_window_object
X! extern caddr_t term_window_object();
X
X #define TTY_TYPE ATTR_PKG_TTY
X--- 57,64 ----
X
X #define TTY tty_window_object
X! extern void * tty_window_object(Window);
X
X #define TERM term_window_object
X! extern void * term_window_object(Window);
X
X #define TTY_TYPE ATTR_PKG_TTY
Xdiff -rc2 /usr/include/suntool/ttysw.h suntool/ttysw.h
X*** /usr/include/suntool/ttysw.h Sat Apr 9 10:01:06 1988
X--- suntool/ttysw.h Fri Jul 28 18:07:06 1989
X***************
X*** 34,65 ****
X #define TTYSW_SAME_AS_BOLD 0x2
X
X! caddr_t ttysw_create();
X
X- typedef caddr_t Ttysubwindow;
X-
X- #ifdef cplus
X /*
X * C Library routines specifically related to ttysw subwindow functions.
X */
X! caddr_t ttysw_create(Tool *tool, char *name, short width, height);
X! void ttysw_becomeconsole(caddr_t ttysw);
X! int ttysw_start(caddr_t ttysw, char **argv);
X! void ttysw_done(caddr_t ttysw);
X! void ttysw_setopt(caddr_t ttysw, int opt, int on);
X! int ttysw_getopt(caddr_t ttysw, int opt);
X
X /* Obsolete (but implemented) routines */
X! struct toolsw *ttysw_createtoolsubwindow(
X! struct tool *tool, char *name, short width, height);
X! caddr_t ttysw_init(int windowfd);
X! void ttysw_handlesigwinch(caddr_t ttysw);
X! void ttysw_selected(caddr_t ttysw, int *ibits, *obits, *ebits,
X! struct timeval **timer);
X! int ttysw_fork(caddr_t ttysw, char **argv,
X! int *inputmask, *outputmask, *exceptmask);
X! #endif
X!
X! /* Obsolete (but implemented) routines */
X! extern caddr_t ttysw_init();
X! extern int ttysw_handlesigwinch(), ttysw_selected();
X! extern struct toolsw *ttysw_createtoolsubwindow();
X--- 34,53 ----
X #define TTYSW_SAME_AS_BOLD 0x2
X
X! typedef void * Ttysubwindow;
X
X /*
X * C Library routines specifically related to ttysw subwindow functions.
X */
X! extern void * ttysw_create(Tool *, char *, short, short);
X! extern void ttysw_becomeconsole(void *);
X! extern int ttysw_start(void *, char **);
X! extern void ttysw_done(void *);
X! extern void ttysw_setopt(void *, int, int);
X! extern int ttysw_getopt(void *, int);
X
X /* Obsolete (but implemented) routines */
X! extern struct toolsw *ttysw_createtoolsubwindow(struct tool *, char *, short, short);
X! extern void * ttysw_init(int);
X! extern void ttysw_handlesigwinch(void *);
X! extern void ttysw_selected(void *, int *, int *, int *, struct timeval **);
X! extern int ttysw_fork(void *, char **, int *, int *, int *);
Xdiff -rc2 /usr/include/suntool/ttytlsw.h suntool/ttytlsw.h
X*** /usr/include/suntool/ttytlsw.h Sat Apr 9 10:01:07 1988
X--- suntool/ttytlsw.h Fri Jul 28 18:02:01 1989
X***************
X*** 43,64 ****
X #endif
X
X! extern caddr_t ttytlsw_create();
X
X- #ifdef cplus
X- /*
X- * C Library routines specifically related to ttysw subwindow functions.
X- */
X- void ttytlsw_done(caddr_t ttysw);
X-
X- /*
X- * Utility for creating a ttytlsw.
X- */
X- caddr_t ttytlsw_create(struct tool *tool, char *name, short width, height);
X-
X /* Obsolete (but implemented) routine */
X! struct toolsw *ttytlsw_createtoolsubwindow(
X! struct tool *tool, char *name, short width, height);
X! #endif
X!
X! /* Obsolete (but implemented) routine */
X! extern struct toolsw *ttytlsw_createtoolsubwindow();
X--- 43,49 ----
X #endif
X
X! extern void * ttytlsw_create(struct tool *, char *, short, short);
X! extern void ttytlsw_done(Ttysubwindow); /* Seemed to be missing /Pell */
X
X /* Obsolete (but implemented) routine */
X! extern struct toolsw *ttytlsw_createtoolsubwindow(struct tool *, char *, short, short);
Xdiff -rc2 /usr/include/suntool/walkmenu.h suntool/walkmenu.h
X*** /usr/include/suntool/walkmenu.h Sat Apr 9 10:01:13 1988
X--- suntool/walkmenu.h Fri Jul 28 18:01:33 1989
X***************
X*** 175,180 ****
X /***********************************************************************/
X
X! typedef caddr_t Menu;
X! typedef caddr_t Menu_item;
X
X #define MENU_BUT MS_RIGHT
X--- 175,180 ----
X /***********************************************************************/
X
X! typedef void * Menu;
X! typedef void * Menu_item;
X
X #define MENU_BUT MS_RIGHT
X***************
X*** 192,211 ****
X /***********************************************************************/
X
X! extern Menu menu_create();
X! extern Menu menu_create_customizable();
X! extern Menu_item menu_create_item();
X! extern caddr_t menu_get();
X! extern int menu_set();
X! extern void menu_destroy();
X! extern void menu_destroy_with_proc();
X! extern caddr_t menu_show();
X! extern caddr_t menu_show_using_fd();
X! extern Menu_item menu_find();
X
X! extern caddr_t menu_pullright_return_result();
X! extern caddr_t menu_return_value();
X! extern caddr_t menu_return_item();
X! extern caddr_t menu_return_no_value();
X! extern caddr_t menu_return_no_item();
X
X extern struct pixrect menu_gray25_pr;
X--- 192,215 ----
X /***********************************************************************/
X
X! extern Menu menu_create(...);
X! extern Menu menu_create_customizable(char *, void (*)(), void **);
X! extern Menu_item menu_create_item(...);
X! extern void * menu_get(Menu, Menu_attribute, ...); /* Or Menu_item */
X! extern int menu_set(Menu, ...); /* Or Menu_item */
X! extern void menu_destroy(Menu); /* Or Menu_item */
X! extern void menu_destroy_with_proc(Menu, void (*)()); /* Or Menu_item */
X! #ifdef WINDOW_TYPE /* Unfortunately, window.h is usually included after this file... /Pell */
X! extern void * menu_show(Menu, Window, Event *, int); /* Last is ignored */
X! #else
X! extern void * menu_show(Menu, void *, Event *, int); /* Last is ignored */
X! #endif
X! extern void * menu_show_using_fd(Menu, int, Event *);
X! extern Menu_item menu_find(Menu, ...);
X
X! extern void * menu_pullright_return_result(Menu_item);
X! extern void * menu_return_value(Menu, Menu_item);
X! extern void * menu_return_item(Menu, Menu_item);
X! extern void * menu_return_no_value(Menu, Menu_item);
X! extern void * menu_return_no_item(Menu, Menu_item);
X
X extern struct pixrect menu_gray25_pr;
Xdiff -rc2 /usr/include/suntool/window.h suntool/window.h
X*** /usr/include/suntool/window.h Sat Apr 9 10:01:36 1988
X--- suntool/window.h Fri Jul 28 18:07:09 1989
X***************
X*** 21,25 ****
X #define WINDOW_TYPE ATTR_PKG_WIN
X
X! typedef caddr_t Window;
X typedef Attr_pkg Window_type;
X
X--- 21,25 ----
X #define WINDOW_TYPE ATTR_PKG_WIN
X
X! typedef void * Window;
X typedef Attr_pkg Window_type;
X
X***************
X*** 221,241 ****
X /* external declarations */
X /***********************************************************************/
X
X! extern Window window_create();
X! extern caddr_t window_get();
X! extern int/*bool*/ window_set();
X! extern int/*bool*/ window_destroy();
X! extern int/*bool*/ window_done();
X! extern void window_main_loop();
X! extern int window_fd();
X! extern void window_rc_units_to_pixels();
X! extern caddr_t window_loop();
X! extern void window_return();
X
X /* added by th on 10/4 */
X! extern void window_release_event_lock();
X! extern void window_refuse_kbd_focus();
X! extern int window_read_event();
X! extern void window_bell();
X
X
X--- 221,240 ----
X /* external declarations */
X /***********************************************************************/
X+ /* window_main_loop and window_loop are now in frame.h!! /Pell */
X
X! extern Window window_create(Window, void * (*)(Window ...) ...);
X! extern void * window_get(Window, Window_attribute);
X! extern int/*bool*/ window_set(Window ...);
X! extern int/*bool*/ window_destroy(Window);
X! extern int/*bool*/ window_done(Window);
X! extern int window_fd(Window);
X! extern void window_rc_units_to_pixels(Window ...);
X! extern void window_return(void *);
X
X /* added by th on 10/4 */
X! extern void window_release_event_lock(Window);
X! extern void window_refuse_kbd_focus(Window);
X! extern int window_read_event(Window, Event *);
X! extern void window_bell(Window);
X
X
X***************
X*** 257,265 ****
X
X #define window_event_proc(win, event, arg) \
X! (((int (*)())(LINT_CAST(window_get(win, WIN_EVENT_PROC))))(win, event, arg))
X
X
X #define window_default_event_proc(win, event, arg) \
X! (((int (*)())(LINT_CAST(window_get(win, WIN_DEFAULT_EVENT_PROC))))(win, event, arg))
X
X /***********************************************************************/
X--- 256,264 ----
X
X #define window_event_proc(win, event, arg) \
X! (((int (*)())(window_get(win, WIN_EVENT_PROC)))(win, event, arg))
X
X
X #define window_default_event_proc(win, event, arg) \
X! (((int (*)())(window_get(win, WIN_DEFAULT_EVENT_PROC)))(win, event, arg))
X
X /***********************************************************************/
X***************
X*** 275,277 ****
X #endif
X
X! #endif ~window_DEFINED
X--- 274,276 ----
X #endif
X
X! #endif /* ~window_DEFINED */
SHAR_EOF
echo "File PATCH-suntool is complete"
chmod 0644 PATCH-suntool || echo "restore of PATCH-suntool fails"
echo "x - extracting PATCH-sunwindow (Text)"
sed 's/^X//' << 'SHAR_EOF' > PATCH-sunwindow &&
Xdiff -rc2 /usr/include/sunwindow/attr.h sunwindow/attr.h
X*** /usr/include/sunwindow/attr.h Sat Apr 9 09:53:52 1988
X--- sunwindow/attr.h Fri Jul 28 20:22:19 1989
X***************
X*** 8,12 ****
X #define sunwindow_attr_DEFINED
X
X! typedef caddr_t * Attr_avlist;
X typedef unsigned Attr_attribute; /* 32 bit quantity */
X /* Attr_avlist is not an array of Attr_attributes, because it is an array
X--- 8,12 ----
X #define sunwindow_attr_DEFINED
X
X! typedef void ** Attr_avlist;
X typedef unsigned Attr_attribute; /* 32 bit quantity */
X /* Attr_avlist is not an array of Attr_attributes, because it is an array
X***************
X*** 255,266 ****
X /* Character unit support */
X
X- #ifdef lint
X- /* The following #ifndef fixes kernel lint warnings, but is pretty strange */
X- #ifndef lint
X- extern void attr_replace_cu();
X- extern int attr_cu_to_x();
X- extern int attr_cu_to_y();
X- #endif
X- #else lint
X #define attr_replace_cu(avlist, font, lmargin, tmargin, rgap) \
X attr_rc_units_to_pixels(avlist, font->pf_defaultsize.x, \
X--- 255,258 ----
X***************
X*** 272,276 ****
X #define attr_cu_to_y(encoded_value, font, top_margin, row_gap) \
X attr_rc_unit_to_y(encoded_value, font->pf_defaultsize.y, top_margin, row_gap)
X- #endif lint
X
X typedef enum {
X--- 264,267 ----
X***************
X*** 320,341 ****
X #define ATTR_NOP(attr) \
X ( (((unsigned)ATTR_PKG_NOP) << 24) | (ATTR_CODE(attr) & 0xffffff) )
X! #define ATTR_CONSUME(attr) (attr) = ((caddr_t)ATTR_NOP(attr))
X
X- #ifndef lint
X /* Available functions
X */
X! extern Attr_avlist attr_create_list();
X! extern Attr_avlist attr_create();
X! extern Attr_avlist attr_make_count();
X! extern int attr_copy();
X! extern int attr_count();
X! extern char *attr_sprint();
X! extern Attr_avlist attr_skip_value();
X! extern void attr_free();
X! extern int attr_rc_unit_to_x();
X! extern int attr_rc_unit_to_y();
X! extern void attr_rc_units_to_pixels();
X! #endif lint
X #endif
X-
X-
X--- 311,328 ----
X #define ATTR_NOP(attr) \
X ( (((unsigned)ATTR_PKG_NOP) << 24) | (ATTR_CODE(attr) & 0xffffff) )
X! #define ATTR_CONSUME(attr) (attr) = ((void *)ATTR_NOP(attr))
X
X /* Available functions
X */
X! extern Attr_avlist attr_create_list(...);
X! extern Attr_avlist attr_create(void **, int ...);
X! extern Attr_avlist attr_make_count(void **, int ...);
X! extern int attr_copy(unsigned int **, unsigned int **);
X! extern int attr_count(void **);
X! extern char *attr_sprint(char *, unsigned int);
X! extern Attr_avlist attr_skip_value(unsigned int, void **);
X! extern void attr_free(void **);
X! extern int attr_rc_unit_to_x(unsigned int, int, int, int);
X! extern int attr_rc_unit_to_y(unsigned int, int, int, int);
X! extern void attr_rc_units_to_pixels(void **, int, int, int, int, int, int);
X #endif
Xdiff -rc2 /usr/include/sunwindow/hashfn.h sunwindow/hashfn.h
X*** /usr/include/sunwindow/hashfn.h Sat Apr 9 09:54:06 1988
X--- sunwindow/hashfn.h Fri Jul 28 16:59:11 1989
X***************
X*** 13,18 ****
X HashEntry *he_next;
X HashEntry *he_prev;
X! caddr_t he_key;
X! caddr_t he_payload;
X };
X
X--- 13,18 ----
X HashEntry *he_next;
X HashEntry *he_prev;
X! void * he_key;
X! void * he_payload;
X };
X
X***************
X*** 22,30 ****
X int ht_size;
X
X! /* hash func: int f(caddr_t) */
X! int (*ht_hash_fn)();
X
X! /* compare func: int f(caddr_t, caddr_t) returns 0 for equal */
X! int (*ht_cmp_fn)();
X HashEntry **ht_table;
X };
X--- 22,30 ----
X int ht_size;
X
X! /* hash func: int f(void *) */
X! int (*ht_hash_fn)(void *);
X
X! /* compare func: int f(void *, void *) returns 0 for equal */
X! int (*ht_cmp_fn)(void *, void *);
X HashEntry **ht_table;
X };
X***************
X*** 32,44 ****
X #ifndef hashfn_c
X
X extern HashTable *hashfn_new_table();
X extern void hashfn_dispose_table();
X
X! extern caddr_t /* payload pointer */ hashfn_lookup();
X! extern caddr_t /* payload pointer */ hashfn_install();
X! extern caddr_t /* payload pointer */ hashfn_delete();
X
X! extern caddr_t /* key pointer */ hashfn_first_key();
X! extern caddr_t /* key pointer */ hashfn_next_key();
X
X #endif hashfn_c
X--- 32,46 ----
X #ifndef hashfn_c
X
X+ /* I don't know what these do or where their spec's are /Pell */
X+
X extern HashTable *hashfn_new_table();
X extern void hashfn_dispose_table();
X
X! extern void * /* payload pointer */ hashfn_lookup();
X! extern void * /* payload pointer */ hashfn_install();
X! extern void * /* payload pointer */ hashfn_delete();
X
X! extern void * /* key pointer */ hashfn_first_key();
X! extern void * /* key pointer */ hashfn_next_key();
X
X #endif hashfn_c
Xdiff -rc2 /usr/include/sunwindow/io_stream.h sunwindow/io_stream.h
X*** /usr/include/sunwindow/io_stream.h Sat Apr 9 09:55:01 1988
X--- sunwindow/io_stream.h Fri Jul 28 18:07:50 1989
X***************
X*** 92,96 ****
X union Ops_Pointer ops; /* the procedures that implement the stream */
X struct Stream *backing_stream; /* for streams that are composed by layering one stream on top of the other, such as filtered_comments_stream. Allows clients to get at the lower stream, e.g. to find out how many characters were seen at that level */
X! caddr_t client_data;
X };
X
X--- 92,96 ----
X union Ops_Pointer ops; /* the procedures that implement the stream */
X struct Stream *backing_stream; /* for streams that are composed by layering one stream on top of the other, such as filtered_comments_stream. Allows clients to get at the lower stream, e.g. to find out how many characters were seen at that level */
X! void * client_data;
X };
X
Xdiff -rc2 /usr/include/sunwindow/notify.h sunwindow/notify.h
X*** /usr/include/sunwindow/notify.h Sat Apr 9 09:55:15 1988
X--- sunwindow/notify.h Fri Jul 28 22:57:31 1989
X***************
X*** 11,15 ****
X * Opaque client handle.
X */
X! typedef char * Notify_client;
X #define NOTIFY_CLIENT_NULL ((Notify_client)0)
X
X--- 11,15 ----
X * Opaque client handle.
X */
X! typedef void * Notify_client;
X #define NOTIFY_CLIENT_NULL ((Notify_client)0)
X
X***************
X*** 17,21 ****
X * Opaque client event.
X */
X! typedef char * Notify_event;
X
X /*
X--- 17,21 ----
X * Opaque client event.
X */
X! typedef void * Notify_event;
X
X /*
X***************
X*** 22,26 ****
X * Opaque client event optional argument.
X */
X! typedef char * Notify_arg;
X #define NOTIFY_ARG_NULL ((Notify_arg)0)
X
X--- 22,26 ----
X * Opaque client event optional argument.
X */
X! typedef void * Notify_arg;
X #define NOTIFY_ARG_NULL ((Notify_arg)0)
X
X***************
X*** 112,151 ****
X
X extern Notify_error notify_errno;
X! extern void notify_perror();
X extern Notify_value notify_nop();
X! extern Notify_value notify_default_wait3();
X
X! extern Notify_func notify_set_input_func();
X! extern Notify_func notify_set_output_func();
X! extern Notify_func notify_set_exception_func();
X! extern Notify_func notify_set_itimer_func();
X! extern Notify_func notify_set_signal_func();
X! extern Notify_func notify_set_wait3_func();
X! extern Notify_func notify_set_destroy_func();
X! extern Notify_func notify_set_event_func();
X
X! extern Notify_error notify_interpose_input_func();
X! extern Notify_error notify_interpose_output_func();
X! extern Notify_error notify_interpose_exception_func();
X! extern Notify_error notify_interpose_itimer_func();
X! extern Notify_error notify_interpose_signal_func();
X! extern Notify_error notify_interpose_wait3_func();
X! extern Notify_error notify_interpose_destroy_func();
X! extern Notify_error notify_interpose_event_func();
X
X! extern Notify_value notify_next_input_func();
X! extern Notify_value notify_next_output_func();
X! extern Notify_value notify_next_exception_func();
X! extern Notify_value notify_next_itimer_func();
X! extern Notify_value notify_next_signal_func();
X! extern Notify_value notify_next_wait3_func();
X! extern Notify_value notify_next_destroy_func();
X! extern Notify_value notify_next_event_func();
X
X! extern Notify_error notify_itimer_value();
X! extern Notify_error notify_post_event();
X! extern Notify_error notify_post_event_and_arg();
X! extern Notify_error notify_post_destroy();
X! extern Notify_error notify_veto_destroy();
X
X extern Notify_error notify_start();
X--- 112,172 ----
X
X extern Notify_error notify_errno;
X! extern void notify_perror(char *);
X extern Notify_value notify_nop();
X! extern Notify_value notify_default_wait3(Notify_client, int, union wait *,
X! struct rusage *);
X
X! extern Notify_func notify_set_input_func(Notify_client, Notify_func, int);
X! extern Notify_func notify_set_output_func(Notify_client, Notify_func, int);
X! extern Notify_func notify_set_exception_func(Notify_client, Notify_func, int);
X! extern Notify_func notify_set_itimer_func(Notify_client, Notify_func, int,
X! struct itimerval *,
X! struct itimerval *);
X! extern Notify_func notify_set_signal_func(Notify_client, Notify_func, int,
X! Notify_signal_mode);
X! extern Notify_func notify_set_wait3_func(Notify_client, Notify_func, int);
X! extern Notify_func notify_set_destroy_func(Notify_client, Notify_func);
X! extern Notify_func notify_set_event_func(Notify_client, Notify_func,
X! Notify_event_type);
X
X! extern Notify_error notify_interpose_input_func(Notify_client, Notify_func,
X! int);
X! extern Notify_error notify_interpose_output_func(Notify_client, Notify_func,
X! int);
X! extern Notify_error notify_interpose_exception_func(Notify_client,
X! Notify_func, int);
X! extern Notify_error notify_interpose_itimer_func(Notify_client, Notify_func,
X! int);
X! extern Notify_error notify_interpose_signal_func(Notify_client, Notify_func,
X! int, Notify_signal_mode);
X! extern Notify_error notify_interpose_wait3_func(Notify_client, Notify_func,
X! int);
X! extern Notify_error notify_interpose_destroy_func(Notify_client,
X! Destroy_status);
X! extern Notify_error notify_interpose_event_func(Notify_client, Notify_func,
X! Notify_event_type);
X
X! extern Notify_value notify_next_input_func(Notify_client, int);
X! extern Notify_value notify_next_output_func(Notify_client, int);
X! extern Notify_value notify_next_exception_func(Notify_client, int);
X! extern Notify_value notify_next_itimer_func(Notify_client, int);
X! extern Notify_value notify_next_signal_func(Notify_client, int,
X! Notify_signal_mode);
X! extern Notify_value notify_next_wait3_func(Notify_client, int, union wait *,
X! struct rusage *);
X! extern Notify_value notify_next_destroy_func(Notify_client, Destroy_status);
X! extern Notify_value notify_next_event_func(Notify_client, Notify_event,
X! Notify_arg, Notify_event_type);
X
X! extern Notify_error notify_itimer_value(Notify_client, int,
X! struct itimerval *);
X! extern Notify_error notify_post_event(Notify_client, Notify_event,
X! Notify_event_type);
X! extern Notify_error notify_post_event_and_arg(Notify_client, Notify_event,
X! Notify_event_type, Notify_arg,
X! Notify_copy, Notify_release);
X! extern Notify_error notify_post_destroy(Notify_client, Destroy_status,
X! Notify_event_type);
X! extern Notify_error notify_veto_destroy(Notify_client);
X
X extern Notify_error notify_start();
X***************
X*** 152,196 ****
X extern Notify_error notify_dispatch();
X extern Notify_error notify_stop();
X! extern Notify_error notify_die();
X! extern Notify_error notify_remove();
X extern Notify_error notify_do_dispatch();
X extern Notify_error notify_no_dispatch();
X
X! extern Notify_func notify_get_input_func();
X! extern Notify_func notify_get_output_func();
X! extern Notify_func notify_get_exception_func();
X! extern Notify_func notify_get_itimer_func();
X! extern Notify_func notify_get_signal_func();
X! extern Notify_func notify_get_wait3_func();
X! extern Notify_func notify_get_destroy_func();
X! extern Notify_func notify_get_event_func();
X
X! extern Notify_error notify_remove_input_func();
X! extern Notify_error notify_remove_output_func();
X! extern Notify_error notify_remove_exception_func();
X! extern Notify_error notify_remove_itimer_func();
X! extern Notify_error notify_remove_signal_func();
X! extern Notify_error notify_remove_wait3_func();
X! extern Notify_error notify_remove_destroy_func();
X! extern Notify_error notify_remove_event_func();
X
X! extern Notify_func notify_set_prioritizer_func();
X! extern Notify_func notify_set_scheduler_func();
X
X! extern Notify_error notify_input();
X! extern Notify_error notify_output();
X! extern Notify_error notify_exception();
X! extern Notify_error notify_itimer();
X! extern Notify_error notify_signal();
X! extern Notify_error notify_wait3();
X! extern Notify_error notify_event();
X! extern Notify_error notify_destroy();
X
X! extern Notify_error notify_client();
X
X! extern Notify_func notify_get_prioritizer_func();
X extern Notify_func notify_get_scheduler_func();
X
X! extern void notify_flush_pending();
X
X extern int notify_get_signal_code();
X--- 173,221 ----
X extern Notify_error notify_dispatch();
X extern Notify_error notify_stop();
X! extern Notify_error notify_die(Destroy_status);
X! extern Notify_error notify_remove(Notify_client);
X extern Notify_error notify_do_dispatch();
X extern Notify_error notify_no_dispatch();
X
X! extern Notify_func notify_get_input_func(Notify_client, Notify_event_type);
X! extern Notify_func notify_get_output_func(Notify_client, int);
X! extern Notify_func notify_get_exception_func(Notify_client, int);
X! extern Notify_func notify_get_itimer_func(Notify_client, int);
X! extern Notify_func notify_get_signal_func(Notify_client, int,
X! Notify_signal_mode);
X! extern Notify_func notify_get_wait3_func(Notify_client, int);
X! extern Notify_func notify_get_destroy_func(Notify_client);
X! extern Notify_func notify_get_event_func(Notify_client, Notify_event_type);
X
X! extern notify_error notify_remove_input_func(Notify_client, Notify_func, int);
X! extern Notify_error notify_remove_output_func(Notify_client, Notify_func, int);
X! extern Notify_error notify_remove_exception_func(Notify_client,
X! Notify_func, int);
X! extern Notify_error notify_remove_itimer_func(Notify_client, Notify_func, int);
X! extern Notify_error notify_remove_signal_func(Notify_client, Notify_func,
X! int, Notify_signal_mode);
X! extern Notify_error notify_remove_wait3_func(Notify_client, Notify_func, int);
X! extern Notify_error notify_remove_destroy_func(Notify_client, Notify_func);
X! extern Notify_error notify_remove_event_func(Notify_client, Notify_func,
X! Notify_event_type);
X
X! extern Notify_func notify_set_prioritizer_func(Notify_client, Notify_func);
X! extern Notify_func notify_set_scheduler_func(Notify_func);
X
X! extern Notify_error notify_input(Notify_client, int);
X! extern Notify_error notify_output(Notify_client, int);
X! extern Notify_error notify_exception(Notify_client, int);
X! extern Notify_error notify_itimer(Notify_client, int);
X! extern Notify_error notify_signal(Notify_client, int);
X! extern Notify_error notify_wait3(Notify_client);
X! extern Notify_error notify_event(Notify_client, Notify_event, Notify_arg);
X! extern Notify_error notify_destroy(Notify_client, Destroy_status);
X
X! extern Notify_error notify_client(Notify_client);
X
X! extern Notify_func notify_get_prioritizer_func(Notify_client);
X extern Notify_func notify_get_scheduler_func();
X
X! extern void notify_flush_pending(Notify_client);
X
X extern int notify_get_signal_code();
X***************
X*** 200,203 ****
X--- 225,230 ----
X * FD manipulation funtions
X */
X+
X+ /* Don't know about these /Pell */
X extern int ntfy_fd_cmp_and();
X extern int ntfy_fd_cmp_or();
X***************
X*** 219,223 ****
X NOTIFY_DISPATCH=2,
X } Notify_dump_type;
X! extern void notify_dump();
X
X #endif NOTIFY_DEFINED
X--- 246,251 ----
X NOTIFY_DISPATCH=2,
X } Notify_dump_type;
X! /* void* should be FILE* /Pell */
X! extern void notify_dump(Notify_client, Notify_dump_type, void *);
X
X #endif NOTIFY_DEFINED
Xdiff -rc2 /usr/include/sunwindow/pixwin.h sunwindow/pixwin.h
X*** /usr/include/sunwindow/pixwin.h Sat Apr 9 09:54:16 1988
X--- sunwindow/pixwin.h Fri Jul 28 20:13:10 1989
X***************
X*** 9,12 ****
X--- 9,13 ----
X
X #include <sunwindow/attr.h>
X+ #include <sunwindow/pw_dblbuf.h>
X
X /*
X***************
X*** 83,87 ****
X typedef struct pixwin {
X struct pixrectops *pw_ops; /* imaging ops appropriate to this pw */
X! caddr_t pw_opshandle; /* handle used during pw_ops calls */
X int pw_opsx; /* left offset used during pw_ops call*/
X int pw_opsy; /* top offset used during pw_ops call*/
X--- 84,88 ----
X typedef struct pixwin {
X struct pixrectops *pw_ops; /* imaging ops appropriate to this pw */
X! void * pw_opshandle; /* handle used during pw_ops calls */
X int pw_opsx; /* left offset used during pw_ops call*/
X int pw_opsy; /* top offset used during pw_ops call*/
X***************
X*** 155,159 ****
X #define PWCD_DBL_AVAIL 0x04 /* Is double buffering available ? */
X #define PWCD_IGNORE_DBLSET 0x08
X! caddr_t pwcd_client; /* Unused */
X enum pw_batch_type pwcd_batch_type;
X /* If != PW_NONE then batching */
X--- 156,160 ----
X #define PWCD_DBL_AVAIL 0x04 /* Is double buffering available ? */
X #define PWCD_IGNORE_DBLSET 0x08
X! void * pwcd_client; /* Unused */
X enum pw_batch_type pwcd_batch_type;
X /* If != PW_NONE then batching */
X***************
X*** 190,195 ****
X extern struct pixrectops *pw_opsstd_ptr;
X
X- #ifndef lint
X-
X #define pw_rop(dpw, dx, dy, w, h, op, sp, sx, sy) \
X (*(dpw)->pw_ops->pro_rop)((dpw)->pw_opshandle, \
X--- 191,194 ----
X***************
X*** 257,289 ****
X (*(pixwin)->pw_clipops->pwco_getclipping)((pixwin));
X
X- #else lint
X-
X- extern pw_rop();
X- extern pw_write();
X- extern pw_writebackground();
X- extern pw_read();
X- extern pw_copy();
X- extern pw_batchrop();
X- extern pw_stencil();
X- extern pw_destroy();
X- extern pw_get();
X- extern pw_put();
X- extern pw_vector();
X- extern struct pixwin * pw_region();
X- extern pw_putattributes();
X- extern pw_getattributes();
X- extern pw_putcolormap();
X- extern pw_getcolormap();
X- extern pw_lock();
X- extern pw_unlock();
X- extern pw_reset();
SHAR_EOF
echo "End of part 2"
echo "File PATCH-sunwindow is continued in part 3"
echo "3" > s2_seq_.tmp
exit 0