v01i058: Diffs to make 4.0.1 SunView Headers ANSI compliant, Part03/03

Charles Mcgrew mcgrew at dartagnan.rutgers.edu
Fri Aug 25 13:15:20 AEST 1989


Submitted-by: P{r Emanuelsson <pell at isy.liu.se>
Posting-number: Volume 1, Issue 58
Archive-name: ansi-sunview/part03



#!/bin/sh
# this is part 3 of a multipart archive
# do not concatenate these parts, unpack them in order with /bin/sh
# file PATCH-sunwindow continued
#
CurArch=3
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-sunwindow"
sed 's/^X//' << 'SHAR_EOF' >> PATCH-sunwindow
X- extern pw_getclipping();
X- 
X- #endif lint
X- 
X- extern	struct pixwin *pw_open();
X- extern	struct pixwin *pw_open_monochrome();
X- extern	struct	pixfont *pw_pfsysopen();
X- 
X  typedef struct pw_pixel_cache {
X  	Rect r;
X--- 256,259 ----
X***************
X*** 296,300 ****
X  	    ((pixel_cache)->plane_group[(pw)->pw_clipdata->pwcd_plane_group])
X  
X- #ifdef	cplus
X  /*
X   * C Library routine specifically relating to pixel device functions
X--- 266,269 ----
X***************
X*** 304,311 ****
X   * Pixwin_clipops types
X   */
X! int	pwco_lock(struct pixwin *pw, struct rect *affected);
X! void	pwco_unlock(struct pixwin *pw);
X! void	pwco_reset(struct pixwin *pw);
X! int	pwco_getclipping(struct pixwin *pw);
X  
X  /*
X--- 273,280 ----
X   * Pixwin_clipops types
X   */
X! int	pwco_lock(struct pixwin *, struct rect *);
X! void	pwco_unlock(struct pixwin *);
X! void	pwco_reset(struct pixwin *);
X! int	pwco_getclipping(struct pixwin *);
X  
X  /*
X***************
X*** 312,322 ****
X   * Pixwin structure utilities
X   */
X! void	pw_open(int windowfd);
X! void	pw_open_monochrome(int windowfd);
X! void	pw_exposed(struct pixwin *pw);
X! void	pw_repairretained(struct pixwin *pw);
X! void	pw_damaged(struct pixwin *pw);
X! void	pw_donedamaged(struct pixwin *pw);
X! void	pw_close(struct pixwin *pw);
X  
X  /*
X--- 281,291 ----
X   * Pixwin structure utilities
X   */
X! struct pixwin *	pw_open(int);
X! struct pixwin *	pw_open_monochrome(int);
X! int	pw_exposed(struct pixwin *);
X! int	pw_repairretained(struct pixwin *);
X! int	pw_damaged(struct pixwin *);
X! int	pw_donedamaged(struct pixwin *);
X! int	pw_close(struct pixwin *);
X  
X  /*
X***************
X*** 323,334 ****
X   * Pixwin color map segment utilities
X   */
X! void	pw_setcmsname(struct pixwin *pw, char cmsname[CMS_NAMESIZE]);
X! void	pw_getcmsname(struct pixwin *pw, char cmsname[CMS_NAMESIZE]);
X! void	pw_getcmsdata(struct pixwin *pw, struct colormapseg *cms, int *planes);
X! void	pw_blackonwhite(struct pixwin *pw, int min, max);
X! void	pw_whiteonblack(struct pixwin *pw, int min, max);
X! void	pw_reversevideo(struct pixwin *pw, int min, max);
X! void	pw_cyclecolormap(struct pixwin *pw, int cycles, begin, length);
X! void	pw_preparesurface(struct pixwin *pw, struct rect *rect);
X  
X  /*
X--- 292,303 ----
X   * Pixwin color map segment utilities
X   */
X! int	pw_setcmsname(struct pixwin *, char *);
X! int	pw_getcmsname(struct pixwin *, char *);
X! int	pw_getcmsdata(struct pixwin *, struct colormapseg *, int *);
X! int	pw_blackonwhite(struct pixwin *, int, int);
X! int	pw_whiteonblack(struct pixwin *, int, int);
X! int	pw_reversevideo(struct pixwin *, int, int);
X! int	pw_cyclecolormap(struct pixwin *, int, int, int);
X! int	pw_preparesurface(struct pixwin *, struct rect *);
X  
X  /*
X***************
X*** 335,339 ****
X   * Global plane group preference
X   */
X! void	pw_set_plane_group_preference(int planes);
X  int	pw_get_plane_group_preference();
X  void	pw_use_fast_monochrome();
X--- 304,308 ----
X   * Global plane group preference
X   */
X! void	pw_set_plane_group_preference(int);
X  int	pw_get_plane_group_preference();
X  void	pw_use_fast_monochrome();
X***************
X*** 342,353 ****
X   * Additional write functions
X   */
X! void	pw_replrop(struct pixwin *pw, int xw, yw, width, height, int op,\
X! 		struct pixrect *pr, int xr, yr);
X! void	pw_text(struct pixwin *pw, int xw, yw, int op,\
X! 		struct pixfont *pixfont, char *s);
X! void	pw_ttext(struct pixwin *pw, int xw, yw, int op,\
X! 		struct pixfont *pixfont, char *s);
X! void	pw_char(struct pixwin *pw, int xw, yw, int op,\
X! 		struct pixfont *pixfont, char c);
X  /*
X   * Font utilities for extern struct pixfont *pf_sys.
X--- 311,330 ----
X   * Additional write functions
X   */
X! int	pw_replrop(struct pixwin *, int, int, int, int, int,
X! 		struct pixrect *, int, int);
X! int	pw_text(struct pixwin *, int, int, int,
X! 		struct pixfont *, char *);
X! int	pw_ttext(struct pixwin *, int, int, int,
X! 		struct pixfont *, char *);
X! int	pw_char(struct pixwin *, int, int, int,
X! 		struct pixfont *, char);
X! int 	pw_line(struct pixwin *, int, int, int, int, struct pr_brush *, 
X! 		Pr_texture *, int);
X! int 	pw_polygon_2(struct pixwin *, int, int, int, int *, struct pr_pos *,
X! 		     int, struct pixrect *, int, int);
X! int 	pw_polyline(struct pixwin *, int, int, int, struct pr_pos *,
X! 		    unsigned char *, struct pr_brush *, struct pr_texture *,
X! 		    int);
X! 
X  /*
X   * Font utilities for extern struct pixfont *pf_sys.
X***************
X*** 354,358 ****
X   */
X  struct	pixfont *pw_pfsysopen();
X! 	pw_pfsysclose();
X  
X  /*
X--- 331,335 ----
X   */
X  struct	pixfont *pw_pfsysopen();
X! int	pw_pfsysclose();
X  
X  /*
X***************
X*** 359,368 ****
X   * Retained control.
X   */
X! void	pw_batch(struct pixwin *pw, Pw_batch_type type);
X! void	pw_set_x_offset(struct pixwin *pw, int offset);
X! void	pw_set_y_offset(struct pixwin *pw, int offset);
X! void	pw_set_xy_offset(struct pixwin *pw, int x_offset, y_offset);
X! int	pw_get_x_offset(struct pixwin *pw);
X! int	pw_get_y_offset(struct pixwin *pw);
X  
X  /*
X--- 336,345 ----
X   * Retained control.
X   */
X! void	pw_batch(struct pixwin *, Pw_batch_type);
X! void	pw_set_x_offset(struct pixwin *, int);
X! void	pw_set_y_offset(struct pixwin *, int);
X! void	pw_set_xy_offset(struct pixwin *, int, int);
X! int	pw_get_x_offset(struct pixwin *);
X! int	pw_get_y_offset(struct pixwin *);
X  
X  /*
X***************
X*** 370,383 ****
X   * accomodate mulitple plane group frame buffers.
X   */
X! Pw_pixel_cache * pw_save_pixels(Pixwin *pw, Rect  *r);
X! void	pw_restore_pixels(Pixwin *pw, Pw_pixel_cache *pc);
X  /*
X   * Double buffering support functions
X   */
X!  void pw_dbl_access(Pixwin *pw);
X!  void pw_dbl_release(Pixwin *pw);
X!  void pw_dbl_flip(Pixwin *pw);
X!  int pw_dbl_get(Pixwin *pw,  Pw_dbl_attribute which_attr);
X!  int pw_dbl_set(Pixwin *pw, int va_alist);
X  
X  /*
X--- 347,360 ----
X   * accomodate mulitple plane group frame buffers.
X   */
X! Pw_pixel_cache * pw_save_pixels(Pixwin *, Rect *);
X! void	pw_restore_pixels(Pixwin *, Pw_pixel_cache *);
X  /*
X   * Double buffering support functions
X   */
X!  void pw_dbl_access(Pixwin *);
X!  void pw_dbl_release(Pixwin *);
X!  void pw_dbl_flip(Pixwin *);
X!  int pw_dbl_get(Pixwin *,  Pw_dbl_attribute);
X!  int pw_dbl_set(Pixwin * ...);
X  
X  /*
X***************
X*** 391,400 ****
X   * should not have been called before using these operations.
X   */
X! int	fullscreen_pw_vector(Pixwin *pw, int x0, y0, x1, y1, op, cms_index);
X! int	fullscreen_pw_write(Pixwin *pw, int xw, yw, width, height, op,
X! 			    struct pixrect *pr, int xr, yr);
X! void	fullscreen_pw_copy(Pixwin *pw, int xw, yw, width, height, op,
X! 			   Pixwin *pw_src, int xr, yr);
X! #endif
X  
X  #endif pixwin_DEFINED
X--- 368,376 ----
X   * should not have been called before using these operations.
X   */
X! int	fullscreen_pw_vector(Pixwin *, int, int, int, int, int, int);
X! int	fullscreen_pw_write(Pixwin *, int, int, int, int, int,
X! 			    struct pixrect *, int, int);
X! void	fullscreen_pw_copy(Pixwin *, int, int, int, int, int,
X! 			   Pixwin *, int, int);
X  
X  #endif pixwin_DEFINED
Xdiff -rc2 /usr/include/sunwindow/pw_dblbuf.h sunwindow/pw_dblbuf.h
X*** /usr/include/sunwindow/pw_dblbuf.h	Sat Apr  9 09:54:19 1988
X--- sunwindow/pw_dblbuf.h	Wed Jul 26 17:11:12 1989
X***************
X*** 18,27 ****
X  } Pw_dbl_attribute;
X  
X- 
X- #ifndef	KERNEL
X- extern int pw_dbl_get();
X- extern int pw_dbl_set();
X- #endif	KERNEL
X- 
X  #define PW_DBL_ERROR	-1	/* Error while trying to set the dbl control bits */
X  #define PW_DBL_FORE	2	/* Set a control bit to the foreground */
X--- 18,21 ----
X***************
X*** 28,31 ****
X  #define PW_DBL_BACK	3	/* Set a control bit to the background */
X  #define PW_DBL_BOTH	4	/* Set a control bit to both backgr and the foregr */
X- 
X- 
X--- 22,23 ----
Xdiff -rc2 /usr/include/sunwindow/pw_util.h sunwindow/pw_util.h
X*** /usr/include/sunwindow/pw_util.h	Sat Apr  9 09:54:17 1988
X--- sunwindow/pw_util.h	Fri Jul 28 17:00:49 1989
X***************
X*** 100,104 ****
X  	    PW_Y_FROM_WIN((pw), 0), &(pw)->pw_fixup)
X  
X- #ifdef	cplus
X  /*
X   * C Library routine specifically relating to pixel device function
X--- 100,103 ----
X***************
X*** 109,114 ****
X   * Make rl_fixup set to the clipped part of the bounding box of pw->pw_clipping
X   */
X! void	pw_initfixup(struct pixwin *pw, struct rectlist *rl_fixup);
X! 
X! #endif
X! 
X--- 108,110 ----
X   * Make rl_fixup set to the clipped part of the bounding box of pw->pw_clipping
X   */
X! void	pw_initfixup(struct pixwin *, struct rectlist *);
Xdiff -rc2 /usr/include/sunwindow/rect.h sunwindow/rect.h
X*** /usr/include/sunwindow/rect.h	Sat Apr  9 09:54:24 1988
X--- sunwindow/rect.h	Fri Jul 28 18:14:38 1989
X***************
X*** 60,72 ****
X  #define	rect_bottom(rect) 	((rect)->r_top+(rect)->r_height-1)
X  
X- #ifdef KERNEL
X  #define rect_print(rect) \
X-         (void)printf("[left: %d, top: %d, width: %d, height: %d]",\
X-             (rect)->r_left, (rect)->r_top, (rect)->r_width, (rect)->r_height)
X- #else
X- #define rect_print(rect) \
X          (void)fprintf(stderr,"[left: %d, top: %d, width: %d, height: %d]",\
X              (rect)->r_left, (rect)->r_top, (rect)->r_width, (rect)->r_height)
X- #endif
X  
X  #define rect_marginadjust(r,m) \
X--- 60,66 ----
X***************
X*** 113,137 ****
X  	{(rect)->r_left=(rect)->r_left-(x); (rect)->r_top=(rect)->r_top-(y);}
X  
X- extern	struct rect rect_bounding();
X- #ifndef KERNEL
X- extern	bool rect_clipvector(), rect_order();
X- #endif !KERNEL
X- 
X- #ifdef cplus
X  /*
X   * C Library routine specifications related to rect functions.
X   */
X! bool	rect_clipvector(struct rect *r, int *x0, *y0, *x1, *y1);
X! struct	rect rect_bounding(struct rect *r1, *r2);
X! void	rect_intersection(struct rect *r1, *r2, *r);
X! bool	rect_order(struct rect *r1, *r2, int sortorder);
X! #endif cplus
X  
X- #ifndef LINT_CAST
X- #ifdef lint
X- #define LINT_CAST(arg)	(arg ? 0 : 0)
X- #else
X- #define LINT_CAST(arg)	(arg)
X- #endif lint
X- #endif LINT_CAST
X  #endif sunwindow_rect_DEFINED
X--- 107,117 ----
X  	{(rect)->r_left=(rect)->r_left-(x); (rect)->r_top=(rect)->r_top-(y);}
X  
X  /*
X   * C Library routine specifications related to rect functions.
X   */
X! bool	rect_clipvector(struct rect *, int *, int *, int *, int *);
X! struct	rect rect_bounding(struct rect *, struct rect *);
X! void	rect_intersection(struct rect *, struct rect *, struct rect *);
X! bool	rect_order(struct rect *, struct rect *, int);
X  
X  #endif sunwindow_rect_DEFINED
Xdiff -rc2 /usr/include/sunwindow/rectlist.h sunwindow/rectlist.h
X*** /usr/include/sunwindow/rectlist.h	Sat Apr  9 09:54:25 1988
X--- sunwindow/rectlist.h	Fri Jul 28 16:45:49 1989
X***************
X*** 56,67 ****
X  #define	rl_coordoffset(rl,x,y) {*(x)-=(rl)->rl_x;*(y)-=(rl)->rl_y;}
X  	
X- extern	bool rl_empty(), rl_equal(), rl_boundintersectsrect(),
X- 		rl_rectintersects();
X- 
X- #ifndef KERNEL
X- extern	bool rl_equalrect(), rl_includespoint();
X- #endif !KERNEL
X- 
X- #ifdef cplus
X  /*
X   * C Library routine specifications related to rectlist functions.
X--- 56,59 ----
X***************
X*** 71,85 ****
X   * Rectlist geometry predicates and functions
X   */
X! bool	rl_empty(struct rectlist *rl);
X! bool	rl_equal(struct rectlist *rl1, *rl2);
X! void	rl_intersection(struct rectlist *rl1, *rl2, *rl);
X! void	rl_sort(struct rectlist *rl1, *rl, int sortorder);
X! void	rl_secondarysort(struct rectlist *rl1, *rl, int sortorder);
X! void	rl_union(struct rectlist *rl1, *rl2, *rl);
X! void	rl_difference(struct rectlist *rl1, *rl2, *rl);
X! void	rl_coalesce(struct rectlist rl);
X! #ifndef KERNEL
X! bool	rl_includespoint(struct rectlist *rl, coord x, y);
X! #endif !KERNEL
X  
X  /*
X--- 63,75 ----
X   * Rectlist geometry predicates and functions
X   */
X! bool	rl_empty(struct rectlist *);
X! bool	rl_equal(struct rectlist *, struct rectlist *);
X! void	rl_intersection(struct rectlist *, struct rectlist *, struct rectlist *);
X! void	rl_sort(struct rectlist *, struct rectlist *, int);
X! void	rl_secondarysort(struct rectlist *, struct rectlist *, int);
X! void	rl_union(struct rectlist *, struct rectlist *, struct rectlist *);
X! void	rl_difference(struct rectlist *, struct rectlist *, struct rectlist *);
X! void	rl_coalesce(struct rectlist *);
X! bool	rl_includespoint(struct rectlist *, coord, coord);
X  
X  /*
X***************
X*** 86,97 ****
X   * Rectlist with Rect geometry predicates and functions
X   */
X! #ifndef KERNEL
X! bool	rl_equalrect(struct rect *r, struct rectlist *rl);
X! #endif !KERNEL
X! bool	rl_boundintersectsrect(struct rect *r,  struct rectlist *rl);
X! bool	rl_rectintersects(struct rect *r,  struct rectlist *rl);
X! void	rl_rectintersection(struct rect *r, struct rectlist *rl1, *rl);
X! void	rl_rectunion(struct rect *r, struct rectlist *rl1, *rl);
X! void	rl_rectdifference(struct rect *r, struct rectlist *rl1, *rl);
X  
X  /*
X--- 76,85 ----
X   * Rectlist with Rect geometry predicates and functions
X   */
X! bool	rl_equalrect(struct rect *, struct rectlist *);
X! bool	rl_boundintersectsrect(struct rect *,  struct rectlist *);
X! bool	rl_rectintersects(struct rect *,  struct rectlist *);
X! void	rl_rectintersection(struct rect *, struct rectlist *, struct rectlist *);
X! void	rl_rectunion(struct rect *, struct rectlist *, struct rectlist *);
X! void	rl_rectdifference(struct rect *, struct rectlist *, struct rectlist *);
X  
X  /*
X***************
X*** 98,102 ****
X   * Rectlist initialization functions
X   */
X! void	rl_initwithrect(struct rect *r, struct rectlist *rl);
X  
X  /*
X--- 86,90 ----
X   * Rectlist initialization functions
X   */
X! void	rl_initwithrect(struct rect *, struct rectlist *);
X  
X  /*
X***************
X*** 103,108 ****
X   * Rectlist List Memory Management functions
X   */
X! void	rl_copy(struct rectlist *rl1, *rl);
X! void	rl_free(struct rectlist *rl);
X  
X  /*
X--- 91,96 ----
X   * Rectlist List Memory Management functions
X   */
X! void	rl_copy(struct rectlist *, struct rectlist *);
X! void	rl_free(struct rectlist *);
X  
X  /*
X***************
X*** 109,113 ****
X   * Rectlist Offset Adjustment functions
X   */
X! void	rl_normalize(struct rectlist *rl);
X  
X  /*
X--- 97,101 ----
X   * Rectlist Offset Adjustment functions
X   */
X! void	rl_normalize(struct rectlist *);
X  
X  /*
X***************
X*** 114,118 ****
X   * Debugging Utilities
X   */
X! void	rl_print(struct rectlist *rl, char *tag);
X! 
X! #endif
X--- 102,104 ----
X   * Debugging Utilities
X   */
X! void	rl_print(struct rectlist *, char *);
Xdiff -rc2 /usr/include/sunwindow/string_utils.h sunwindow/string_utils.h
X*** /usr/include/sunwindow/string_utils.h	Sat Apr  9 09:55:24 1988
X--- sunwindow/string_utils.h	Fri Jul 28 16:48:15 1989
X***************
X*** 11,15 ****
X  
X  
X! extern int string_find();
X  /* int string_find(s, target, case_matters)
X   *	char *s, *target;
X--- 11,15 ----
X  
X  
X! extern int string_find(char *, char *, Bool);
X  /* int string_find(s, target, case_matters)
X   *	char *s, *target;
X***************
X*** 21,25 ****
X   */
X  
X! extern Bool string_equal();
X  /* Bool string_equal(s1, s2, case_matters)
X   *	char *s1, *s2;
X--- 21,25 ----
X   */
X  
X! extern Bool string_equal(char *, char *, Bool);
X  /* Bool string_equal(s1, s2, case_matters)
X   *	char *s1, *s2;
X***************
X*** 31,35 ****
X  
X  
X! extern Bool substrequal();
X  /* Bool substrequal(s1, start1, s2, start2, n, case_matters)
X   *	char *s1, *s2;
X--- 31,35 ----
X  
X  
X! extern Bool substrequal(char *, int, char *, int, Bool);
X  /* Bool substrequal(s1, start1, s2, start2, n, case_matters)
X   *	char *s1, *s2;
X***************
X*** 45,49 ****
X  #endif
X  
X! extern char *string_get_token();
X  /*	char *s;
X   *	int *index;
X--- 45,49 ----
X  #endif
X  
X! extern char *string_get_token(char *, int *, char *, enum CharClass (*) (char));
X  /*	char *s;
X   *	int *index;
X***************
X*** 77,81 ****
X  #ifndef WHITESPACE
X  #define WHITESPACE
X! extern enum CharClass white_space();
X  /* returns sepr for blanks, newlines, and tabs, other for everything else */
X  #endif
X--- 77,81 ----
X  #ifndef WHITESPACE
X  #define WHITESPACE
X! extern enum CharClass white_space(char);
X  /* returns sepr for blanks, newlines, and tabs, other for everything else */
X  #endif
X***************
X*** 89,93 ****
X  #endif
X  
X! extern char *string_get_sequence();
X  /*	char *s;
X   *	int *index;
X--- 89,94 ----
X  #endif
X  
X! extern char *string_get_sequence(char *, int *, char *,
X! 				 struct CharAction (*) (char));
X  /*	char *s;
X   *	int *index;
Xdiff -rc2 /usr/include/sunwindow/win_cursor.h sunwindow/win_cursor.h
X*** /usr/include/sunwindow/win_cursor.h	Sat Apr  9 09:54:43 1988
X--- sunwindow/win_cursor.h	Fri Jul 28 20:12:15 1989
X***************
X*** 7,13 ****
X  #define	win_cursor_DEFINED
X  
X- #ifndef KERNEL
X  #include <sunwindow/attr.h>
X- #endif not KERNEL
X  
X  /*
X--- 7,11 ----
X***************
X*** 45,49 ****
X  #define	CURSOR_TO_EDGE			-1
X  
X- #ifndef KERNEL
X  #define	CURSOR_ATTR(type, ordinal)	ATTR(ATTR_PKG_CURSOR, type, ordinal)
X  
X--- 43,46 ----
X***************
X*** 84,95 ****
X  } Cursor_attribute;
X  
X! typedef caddr_t	Cursor;
X  
X! extern Cursor	cursor_create();
X! extern void	cursor_destroy();
X! extern Cursor	cursor_copy();
X! extern caddr_t	cursor_get();
X! extern int	cursor_set();
X! #endif not KERNEL
X  
X  /* The following cursor struct definition is provided for compatibility
X--- 81,91 ----
X  } Cursor_attribute;
X  
X! typedef void *	Cursor;
X  
X! extern Cursor	cursor_create(...);
X! extern void	cursor_destroy(Cursor);
X! extern Cursor	cursor_copy(Cursor);
X! extern void *	cursor_get(Cursor, Cursor_attribute);
X! extern int	cursor_set(Cursor ...);
X  
X  /* The following cursor struct definition is provided for compatibility
X***************
X*** 138,142 ****
X  	extern struct pixrectops mem_ops;				\
X  	static struct pixrect CAT(name,_mpr) =				\
X! 	    {&mem_ops, 16, 16, 1, (caddr_t)&CAT(name,_data)};		\
X  	static struct cursor name = {(hot_x), (hot_y), (func), &CAT(name,_mpr)};
X  #else
X--- 134,138 ----
X  	extern struct pixrectops mem_ops;				\
X  	static struct pixrect CAT(name,_mpr) =				\
X! 	    {&mem_ops, 16, 16, 1, (void *)&CAT(name,_data)};		\
X  	static struct cursor name = {(hot_x), (hot_y), (func), &CAT(name,_mpr)};
X  #else
X***************
X*** 146,150 ****
X  	extern struct pixrectops mem_ops;				\
X  	static struct pixrect CAT(name,_mpr) =				\
X! 	    {&mem_ops, 16, 16, 1, (caddr_t)&CAT(name,_data)};		\
X  	static struct cursor name = {(hot_x), (hot_y), (func), &CAT(name,_mpr)};
X  #endif
X--- 142,146 ----
X  	extern struct pixrectops mem_ops;				\
X  	static struct pixrect CAT(name,_mpr) =				\
X! 	    {&mem_ops, 16, 16, 1, (void *)&CAT(name,_data)};		\
X  	static struct cursor name = {(hot_x), (hot_y), (func), &CAT(name,_mpr)};
X  #endif
Xdiff -rc2 /usr/include/sunwindow/win_environ.h sunwindow/win_environ.h
X*** /usr/include/sunwindow/win_environ.h	Sat Apr  9 09:54:34 1988
X--- sunwindow/win_environ.h	Sun Jan 22 13:29:56 1989
X***************
X*** 16,20 ****
X  #define	WE_ME			"WINDOW_ME"
X  
X- #ifdef	cplus
X  /*
X   * C Library routines specifically related to ENVIRONMENT conventions.
X--- 16,19 ----
X***************
X*** 24,29 ****
X   * Get/set parent of window that is being created.
X   */
X! void	we_setparentwindow(char *windevname);
X! int	we_getparentwindow(char *windevname);
X  
X  /*
X--- 23,28 ----
X   * Get/set parent of window that is being created.
X   */
X! void	we_setparentwindow(char *);
X! int	we_getparentwindow(char *);
X  
X  /*
X***************
X*** 33,38 ****
X   * information is used once.
X   */
X! void   we_setinitrect(struct rect *initialrect, *initialsavedrect, int *iconic);
X! int    we_getinitrect(struct rect *initialrect, *initialsavedrect, int *iconic);
X  void   we_clearinitdata();
X  
X--- 32,37 ----
X   * information is used once.
X   */
X! void   we_setinitrect(struct rect *, struct rect *, int *);
X! int    we_getinitrect(struct rect *, struct rect *, int *);
X  void   we_clearinitdata();
X  
X***************
X*** 40,45 ****
X   * Get/set window that can be taken over by graphics programs.
X   */
X! void	we_setgfxwindow(char *windevname);
X! int	we_getgfxwindow(char *windevname);
X  
X  /*
X--- 39,44 ----
X   * Get/set window that can be taken over by graphics programs.
X   */
X! void	we_setgfxwindow(char *);
X! int	we_getgfxwindow(char *);
X  
X  /*
X***************
X*** 48,53 ****
X   * of terminal size (see following comment).
X   */
X! void	we_setmywindow(char *windevname);
X! int	we_getmywindow(char *windevname);
X! 
X! #endif
X--- 47,50 ----
X   * of terminal size (see following comment).
X   */
X! void	we_setmywindow(char *);
X! int	we_getmywindow(char *);
Xdiff -rc2 /usr/include/sunwindow/win_input.h sunwindow/win_input.h
X*** /usr/include/sunwindow/win_input.h	Sat Apr  9 09:54:35 1988
X--- sunwindow/win_input.h	Fri Jul 28 20:11:34 1989
X***************
X*** 12,20 ****
X  #define	sunwindow_win_input_DEFINED
X  
X- #ifdef	KERNEL
X- #include "../sundev/vuid_event.h"
X- #else
X  #include <sundev/vuid_event.h>
X- #endif	KERNEL
X  
X  /*
X--- 12,16 ----
X***************
X*** 311,315 ****
X  }               Ws_scale_list;
X  
X- #ifdef	cplus
X  /*
X   * C Library routines dealing this type of input
X--- 307,310 ----
X***************
X*** 316,360 ****
X   */
X  /* Input "read" routine */
X! int	input_readevent(int fd, struct inputevent *event);
X  
X  /* Input mask control */
X! void	input_imnull(struct inputmask *im);
X! void	input_imall(struct inputmask *im);
X! void	win_get_kbd_mask(int windowfd, struct inputmask *im);
X! void	win_set_kbd_mask(int windowfd, struct inputmask *im);
X! void	win_get_pick_mask(int windowfd, struct inputmask *im);
X! void	win_set_pick_mask(int windowfd, struct inputmask *im);
X! void	win_get_designee(int windowfd, *nextwindownumber);
X! void	win_set_designee(int windowfd, nextwindownumber);
X  
X  /* Input state query */
X! int	win_get_vuid_value(int windowfd, unsigned short id);
X  
X  /* Input synchronization release */
X! void	win_release_event_lock(int windowfd);
X  
X  /* Keyboard input focus access */
X! void	win_refuse_kbd_focus(int windowfd);
X! int	win_set_kbd_focus(int windowfd, number);
X! int	win_get_kbd_focus(int windowfd);
X  
X  /* Physical input device control */
X! int	win_remove_input_device(int windowfd; char *name);
X! int	win_enum_input_device(int windowfd; int (*func)(); caddr_t data);
X  		/* Returns -1 if error enumerating, 0 if went smoothly and
X  		 * 1 if func terminated enumeration. */
X! int	win_is_input_device(int windowfd; char *name);
X! int	win_set_input_device(int windowfd, inputfd; char *name);
X  
X  /* Audible/Visible bell control */
X! void	win_bell(int windowfd, struct timeval wait_tv, Pixwin *pw);
X  
X  /* mouse control */
X! int	win_get_button_order(int windowfd);
X! int	win_set_button_order(int windowfd, order);
X! int	win_get_scaling(int windowfd; Ws_scale_list *buffer);
X! int	win_set_scaling(int windowfd; Ws_scale_list *buffer);
X! 
X! #endif
X  
X  #endif	sunwindow_win_input_DEFINED
X--- 311,353 ----
X   */
X  /* Input "read" routine */
X! int	input_readevent(int, struct inputevent *);
X  
X  /* Input mask control */
X! void	input_imnull(struct inputmask *);
X! void	input_imall(struct inputmask *);
X! void	win_get_kbd_mask(int, struct inputmask *);
X! void	win_set_kbd_mask(int, struct inputmask *);
X! void	win_get_pick_mask(int, struct inputmask *);
X! void	win_set_pick_mask(int, struct inputmask *);
X! void	win_get_designee(int, int *);
X! void	win_set_designee(int, int);
X  
X  /* Input state query */
X! int	win_get_vuid_value(int, unsigned short);
X  
X  /* Input synchronization release */
X! void	win_release_event_lock(int);
X  
X  /* Keyboard input focus access */
X! void	win_refuse_kbd_focus(int);
X! int	win_set_kbd_focus(int, int);
X! int	win_get_kbd_focus(int);
X  
X  /* Physical input device control */
X! int	win_remove_input_device(int, char *);
X! int	win_enum_input_device(int, int (*)(...), void *);
X  		/* Returns -1 if error enumerating, 0 if went smoothly and
X  		 * 1 if func terminated enumeration. */
X! int	win_is_input_device(int, char *);
X! int	win_set_input_device(int, int, char *);
X  
X  /* Audible/Visible bell control */
X! void	win_bell(int, struct timeval, Pixwin *);
X  
X  /* mouse control */
X! int	win_get_button_order(int);
X! int	win_set_button_order(int, int);
X! int	win_get_scaling(int, Ws_scale_list *);
X! int	win_set_scaling(int, Ws_scale_list *);
X  
X  #endif	sunwindow_win_input_DEFINED
Xdiff -rc2 /usr/include/sunwindow/win_keymap.h sunwindow/win_keymap.h
X*** /usr/include/sunwindow/win_keymap.h	Sat Apr  9 09:54:45 1988
X--- sunwindow/win_keymap.h	Fri Jul 28 16:51:09 1989
X***************
X*** 106,110 ****
X  
X  #ifndef win_keymap_c
X! 
X  extern Keymap	*win_keymap_for_fd();
X  extern Keymap	*win_keymap_create();
X--- 106,110 ----
X  
X  #ifndef win_keymap_c
X! /* Cannot find any specs for these. I don't know what they do. /Pell */
X  extern Keymap	*win_keymap_for_fd();
X  extern Keymap	*win_keymap_create();
Xdiff -rc2 /usr/include/sunwindow/win_notify.h sunwindow/win_notify.h
X*** /usr/include/sunwindow/win_notify.h	Sat Apr  9 09:54:38 1988
X--- sunwindow/win_notify.h	Sun Jan 22 12:42:34 1989
X***************
X*** 18,62 ****
X  
X  /* Pixwin registration with SunWindows notification support routines */
X! extern	int win_register();			/* (Notify_client client,
X! 						    Pixwin *pw,
X! 						    Notify_func event_func,
X! 						    Notify_func destroy_func,
X! 						    u_int flags) */
X! extern	int win_unregister();			/* (Notify_client client) */
X! extern	int win_set_flags();			/* (Notify_client client,
X! 						    u_int flags) */
X! extern	u_int win_get_flags();			/* (Notify_client client) */
X  
X  /* Extraction of interesting values from window notifier clients */
X! extern	int win_get_fd();			/* (Notify_client client) */
X! extern	Pixwin *win_get_pixwin();		/* (Notify_client client) */
X  
X  /* Posting of client events to window notifier clients */
X! extern	Notify_error win_post_id();		/* (Notify_client client,
X! 						    short id,
X! 						    Notify_event_type when) */
X! extern	Notify_error win_post_id_and_arg();	/* (Notify_client client,
X! 						    short id,
X! 						    Notify_event_type when,
X! 						    Notify_arg arg,
X! 						    Notify_copy copy_func,
X! 						    Notify_release release_func)
X! 						 */
X! extern	Notify_error win_post_event();		/* (Notify_client client,
X! 						    Event *event,
X! 						    Notify_event_type when) */
X! extern	Notify_error win_post_event_arg();	/* (Notify_client client,
X! 						    Event *event,
X! 						    Notify_event_type when,
X! 						    Notify_arg arg,
X! 						    Notify_copy copy_func,
X! 						    Notify_release release_func)
X! 						 */
X  
X  /* Utilities to call if posting with win_post_id_and_arg or win_post_event_arg*/
X! extern	Notify_arg win_copy_event();		/* (Notify_client client,
X! 						    Notify_arg arg,
X! 						    Event **event_ptr) */
X! extern	void win_free_event();			/* (Notify_client client,
X! 						    Notify_arg arg,
X! 						    Event *event) */
X--- 18,42 ----
X  
X  /* Pixwin registration with SunWindows notification support routines */
X! extern	int win_register(Notify_client, Pixwin *, Notify_func,
X! 			 Notify_func, u_int);
X! extern	int win_unregister(Notify_client);
X! extern	int win_set_flags(Notify_client, u_int);
X! extern	u_int win_get_flags(Notify_client);
X  
X  /* Extraction of interesting values from window notifier clients */
X! extern	int win_get_fd(Notify_client);
X! extern	Pixwin *win_get_pixwin(Notify_client);
X  
X  /* Posting of client events to window notifier clients */
X! extern	Notify_error win_post_id(Notify_client, short, Notify_event_type);
X! extern	Notify_error win_post_id_and_arg(Notify_client, short,
X! 					 Notify_event_type, Notify_arg,
X! 					 Notify_copy, Notify_release);
X! extern	Notify_error win_post_event(Notify_client, Event *, Notify_event_type);
X! extern	Notify_error win_post_event_arg(Notify_client, Event *,
X! 					Notify_event_type, Notify_arg,
X! 					Notify_copy, Notify_release);
X  
X  /* Utilities to call if posting with win_post_id_and_arg or win_post_event_arg*/
X! extern	Notify_arg win_copy_event(Notify_client, Notify_arg, Event **);
X! extern	void win_free_event(Notify_client, Notify_arg, Event *);
Xdiff -rc2 /usr/include/sunwindow/win_struct.h sunwindow/win_struct.h
X*** /usr/include/sunwindow/win_struct.h	Sat Apr  9 09:54:41 1988
X--- sunwindow/win_struct.h	Fri Jul 28 18:47:14 1989
X***************
X*** 78,82 ****
X  #define	WIN_EXCLOPEN		0x10000
X  
X- #ifdef cplus
X  /*
X   * C Library routine specifications relating
X--- 78,81 ----
X***************
X*** 87,91 ****
X   * Error handling (overriding library error handler, returns previous handler)
X   */
X! int	win_errorhandler(int *win_error(int errnum, winopnum));
X  
X  /*
X--- 86,91 ----
X   * Error handling (overriding library error handler, returns previous handler)
X   */
X! typedef int (*_foo_func_)(int, int);
X! int	win_errorhandler(_foo_func_);
X  
X  /*
X***************
X*** 92,106 ****
X   * Tree operations.
X   */
X! int	win_getlink(int windowfd, int linkname);
X! void	win_setlink(int windowfd, int linkname, number);
X! void	win_insert(int windowfd);
X! void	win_remove(int windowfd);
X! int	win_nextfree(int windowfd);
X  
X  /* utilities */
X! void	win_numbertoname(int number, char *name);
X! int	win_nametonumber(char *name);
X! void	win_fdtoname(int windowfd, char *name);
X! int	win_fdtonumber(int windowfd);
X  int	win_getnewwindow();
X  
X--- 92,106 ----
X   * Tree operations.
X   */
X! int	win_getlink(int, int);
X! void	win_setlink(int, int, int);
X! void	win_insert(int);
X! void	win_remove(int);
X! int	win_nextfree(int);
X  
X  /* utilities */
X! void	win_numbertoname(int, char *);
X! int	win_nametonumber(char *);
X! void	win_fdtoname(int, char *);
X! int	win_fdtonumber(int);
X  int	win_getnewwindow();
X  
X***************
X*** 108,115 ****
X   * Mouse cursor operations.
X   */
X! void	win_setmouseposition(int windowfd, short x, y);
X! void	win_setcursor(int windowfd, struct cursor *cursor);
X! void	win_getcursor(int windowfd, struct cursor *cursor);
X! int	win_findintersect(int windowfd, short x, y);
X  
X  /*
X--- 108,115 ----
X   * Mouse cursor operations.
X   */
X! void	win_setmouseposition(int, short, short);
X! void	win_setcursor(int, struct cursor *);
X! void	win_getcursor(int, struct cursor *);
X! int	win_findintersect(int, short, short);
X  
X  /*
X***************
X*** 116,133 ****
X   * Geometry operations.
X   */
X! void	win_getrect(int windowfd, struct rect *rect);
X! void	win_setrect(int windowfd, struct rect *rect);
X! void	win_setsavedrect(int windowfd, struct rect *rect);
X! void	win_getsavedrect(int windowfd, struct rect *rect);
X  
X  /* utilities */
X! void	win_getsize(int windowfd, struct rect *rect);
X! coord	win_getheight(int windowfd);
X! coord	win_getwidth(int windowfd);
X  
X  /* blanket window operations */
X! int	win_insertblanket(int windowfd, parentfd);
X! void	win_removeblanket(int windowfd);
X! int	win_isblanket(int windowfd);
X  
X  /*
X--- 116,133 ----
X   * Geometry operations.
X   */
X! void	win_getrect(int, struct rect *);
X! void	win_setrect(int, struct rect *);
X! void	win_setsavedrect(int, struct rect *);
X! void	win_getsavedrect(int, struct rect *);
X  
X  /* utilities */
X! void	win_getsize(int, struct rect *);
X! coord	win_getheight(int);
X! coord	win_getwidth(int);
X  
X  /* blanket window operations */
X! int	win_insertblanket(int, int);
X! void	win_removeblanket(int);
X! int	win_isblanket(int);
X  
X  /*
X***************
X*** 134,144 ****
X   * Misc operations.
X   */
X! int	win_getuserflags(int windowfd);
X! void	win_setuserflags(int windowfd, flags);
X! void	win_setowner(int windowfd, pid);
X! int	win_getowner(int windowfd);
X  
X  /* utilities */
X! void	win_setuserflag(win windowfd, int flag, bool value);
X  
X  /*
X--- 134,144 ----
X   * Misc operations.
X   */
X! int	win_getuserflags(int);
X! void	win_setuserflags(int, int);
X! void	win_setowner(int, int);
X! int	win_getowner(int);
X  
X  /* utilities */
X! void	win_setuserflag(int, int, bool);
X  
X  /*
X***************
X*** 145,152 ****
X   * Input control.
X   */
X! void	win_getinputmask(int windowfd, struct inputmask *im,
X! 	    int *inputredirectwindownumber);
X! void	win_setinputmask(int windowfd, struct inputmask *im_set, *im_flush,
X! 	    int inputredirectwindownumber);
X  
X  /*
X--- 145,150 ----
X   * Input control.
X   */
X! void	win_getinputmask(int, struct inputmask *, int *);
X! void	win_setinputmask(int, struct inputmask *, struct inputmask *, int);
X  
X  /*
X***************
X*** 153,162 ****
X   * Kernel operations applying globally to a screen.
X   */
X! void	win_lockdata(int windowfd);
X! void	win_computeclipping(int windowfd);
X! void	win_partialrepair(int windowfd, struct rect *rectok);
X! void	win_unlockdata(int windowfd);
X! void	win_grabio(int windowfd);
X! void	win_releaseio(int windowfd);
X  
X  /*
X--- 151,160 ----
X   * Kernel operations applying globally to a screen.
X   */
X! void	win_lockdata(int);
X! void	win_computeclipping(int);
X! void	win_partialrepair(int, struct rect *);
X! void	win_unlockdata(int);
X! void	win_grabio(int);
X! void	win_releaseio(int);
X  
X  /*
X***************
X*** 167,177 ****
X   * Screen creation, inquiry and deletion.
X   */
X! int	win_screennew(struct screen *screen);
X! void	win_screenget(int windowfd, struct screen *screen);
X! void	win_screendestroy(int windowfd);
X! void	win_setscreenpositions(int windowfd, int neighbors[SCR_POSITIONS]);
X! void	win_getscreenpositions(int windowfd, int neighbors[SCR_POSITIONS]);
X! #endif cplus
X  
X  #endif sunwindow_win_struct_DEFINED
X- 
X--- 165,173 ----
X   * Screen creation, inquiry and deletion.
X   */
X! int	win_screennew(struct screen *);
X! void	win_screenget(int, struct screen *);
X! void	win_screendestroy(int);
X! void	win_setscreenpositions(int, int *);
X! void	win_getscreenpositions(int, int *);
X  
X  #endif sunwindow_win_struct_DEFINED
SHAR_EOF
echo "File PATCH-sunwindow is complete"
chmod 0644 PATCH-sunwindow || echo "restore of PATCH-sunwindow fails"
rm -f s2_seq_.tmp
echo "You have unpacked the last part"
exit 0



More information about the Comp.sources.sun mailing list