Re: [Nettle-commits] CVS: nettle/h chardefn,1.7,1.8 globals,1.88,1.89 zapredraw,1.14,1.15

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Piece of shit.

Backing out last night's changes.

*cvsssh --ext update -kk -j 1.15 -j 1.14 c/chardefn
*cvsssh --ext update -kk -j 1.40 -j 1.39 c/choices
*cvsssh --ext update -kk -j 1.37 -j 1.36 c/socket
*cvsssh --ext update -kk -j 1.38 -j 1.37 c/zapgen
*cvsssh --ext update -kk -j 1.7 -j 1.6 h/chardefn
*cvsssh --ext update -kk -j 1.88 -j 1.87 h/globals
*cvsssh --ext update -kk -j 1.14 -j 1.13 h/zapredraw

was what it said.

In message <E1B...@sc...> you wrote:

> Update of /cvsroot/nettle/nettle/h
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11512/h
>=20
> Modified Files:
> 	chardefn globals zapredraw=20
> Log Message:
> Backing out last night's changes.nn*cvsssh --ext update -kk -j 1.15 -j =
1.14 c/chardefnn*cvsssh --ext update -kk -j 1.40 -j 1.39 c/choicesn*cvsss=
h --ext update -kk -j 1.37 -j 1.36 c/socketn*cvsssh --ext update -kk -j 1=
.38 -j 1.37 c/zapgenn*cvsssh --ext update -kk -j 1.7 -j 1.6 h/chardefnn*c=
vsssh --ext update -kk -j 1.88 -j 1.87 h/globalsn*cvsssh --ext update -kk=
 -j 1.14 -j 1.13 h/zapredraw
>=20
> Index: chardefn
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/nettle/nettle/h/chardefn,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -C2 -d -r1.7 -r1.8
> *** chardefn	1 Apr 2004 22:31:59 -0000	1.7
> --- chardefn	2 Apr 2004 06:32:00 -0000	1.8
> ***************
> *** 1,5 ****
>   /**
>    * Zap font character definitions
> !  * (C) Nettle developers 2000-2004
>    *
>    * $Id$
> --- 1,5 ----
>   /**
>    * Zap font character definitions
> !  * (C) Nettle developers 2000-2001
>    *
>    * $Id$
> ***************
> *** 9,55 ****
>   #define CHARDEFN_H
>  =20
> - /* FIXME: We shouldn't be including this really as globals are evil *=
/
> - #include "globals.h"
> -=20
>   /* Number of additional characters we are going to define at 0x100 in=

>      chardefn.c */
>   #define EXTRA_ZAP_CHARS (0x1e)
>  =20
> ! /**
> !  * Takes an array of character data, and fills in the cursor characte=
rs
> !  *required by Nettle
> !  *
> !  * @param int_area    pointer to character data
> !  * @param char_size   size of character in bytes
> !  * @param width       width of character
> !  * @param height      height of character
> !  * @param cursor_type the type of the cursor we're using
> !  */
> ! char *chardefn_define_cursors(int     *int_area,
> !                               int      char_size,
> !                               int      width,
> !                               int      height,
> !                               cursor_t cursor_type);
> !=20
> ! /**
> !  * Takes an array of character data, and fills in the additional symb=
ol/
> !  * cursor characters required by Nettle
> !  *
> !  * @param int_area  pointer to character data
> !  * @param first_char first character defined by the Zap font
> !  * @param last_char  last character defined by the Zap font
> !  * @param char_size size of character in bytes
> !  * @param width     width of character
> !  * @param height    height of character
> !  */
> !=20
> ! void chardefn_define_characters(int     *int_area,
> !                                 int      first_char,
> !                                 int      last_char,
> !                                 int      char_size,
> !                                 int      width,
> !                                 int      height,
> !                                 cursor_t cursor_type);
> !=20
>  =20
> ! #endif /* CHARDEFN_H */
> --- 9,18 ----
>   #define CHARDEFN_H
>  =20
>   /* Number of additional characters we are going to define at 0x100 in=

>      chardefn.c */
>   #define EXTRA_ZAP_CHARS (0x1e)
>  =20
> ! extern void define_zap_chars(int *, int, int, int);
> ! extern void define_zap_undef_chars(int *, int, int, int, int, int);
>  =20
> ! #endif
>=20
> Index: globals
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/nettle/nettle/h/globals,v
> retrieving revision 1.88
> retrieving revision 1.89
> diff -C2 -d -r1.88 -r1.89
> *** globals	1 Apr 2004 22:31:59 -0000	1.88
> --- globals	2 Apr 2004 06:32:00 -0000	1.89
> ***************
> *** 137,143 ****
>   typedef enum {
>     cursor_solid,
> !   cursor_underline,
> !=20
> !   cursor_last
>   } cursor_t;
>  =20
> --- 137,141 ----
>   typedef enum {
>     cursor_solid,
> !   cursor_underline
>   } cursor_t;
>  =20
>=20
> Index: zapredraw
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/nettle/nettle/h/zapredraw,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -C2 -d -r1.14 -r1.15
> *** zapredraw	1 Apr 2004 22:31:59 -0000	1.14
> --- zapredraw	2 Apr 2004 06:32:00 -0000	1.15
> ***************
> *** 1,10 ****
>   /**
> -  *
>    * ZapRedraw structure code
>    *
> !  * =A9 Nettle developers 2000-2004
> !  *
> !  * @version $Id$
> !  *
>    */
>  =20
> --- 1,7 ----
>   /**
>    * ZapRedraw structure code
> +  * (C) Nettle developers 2000-2002
>    *
> !  * $Id$
>    */
>  =20
> ***************
> *** 14,20 ****
>   #define ZAPREDRAW_H
>  =20
> - /* FIXME: we shouldn't be including this */
> - #include "globals.h"
> -=20
>   #ifndef ZapRedraw_RedrawArea
>  =20
> --- 11,14 ----
> ***************
> *** 42,46 ****
>   #define ZapRedraw_PlotRectangle     0x48495
>  =20
> ! #endif /* ZapRedraw_RedrawArea */
>  =20
>   struct zapredraw_block
> --- 36,40 ----
>   #define ZapRedraw_PlotRectangle     0x48495
>  =20
> ! #endif
>  =20
>   struct zapredraw_block
> ***************
> *** 76,86 ****
>   extern char *zapgen_code(int *, struct term_char **, int, int, int, i=
nt, int, int, int, int);
>  =20
> ! /**
> !  * Update the cursors in a given font_area
> !  *
> !  * @param font_area   the area, as returned from load_font
> !  * @param cursor_type the cursor type we want to use
>    */
> ! void zapredraw_update_cursors(int *font_area, cursor_t cursor_type);
>  =20
>   extern int *load_font(char *);
> --- 70,82 ----
>   extern char *zapgen_code(int *, struct term_char **, int, int, int, i=
nt, int, int, int, int);
>  =20
> ! /*
> !  * Description:  Update the cursors in a given font_area
> !  * Parameters:   font_area-> the area, as returned from load_font
> !  * Returns:      none
> !  * Note:         Will also update all the other special characters;
> !  *               this is not intentional and should be replaced with
> !  *               /just/ the cursors being updated.
>    */
> ! void update_cursors(int *font_area);
>  =20
>   extern int *load_font(char *);
>=20
>=20
>=20
> -------------------------------------------------------
> This SF.Net email is sponsored by: IBM Linux Tutorials
> Free Linux tutorial presented by Daniel Robbins, President and CEO of
> GenToo technologies. Learn everything from fundamentals to system
> administration.http://ads.osdn.com/?ad_id=3D1470&alloc_id=3D3638&op=3Dc=
lick
> _______________________________________________
> Nettle-commits mailing list
> Net...@li...
> https://lists.sourceforge.net/lists/listinfo/nettle-commits
>=20

Alex.
--=20
E-mail: al...@ar...
WWW:    http://www.archifishal.co.uk/
MSN:    arc...@gm...