Index: unk/Ohana/src/kii/include/alphabet.h =================================================================== --- /trunk/Ohana/src/kii/include/alphabet.h (revision 6240) +++ (revision ) @@ -1,53 +1,0 @@ -# include "../rotfont/times8.h" -# include "../rotfont/times12.h" -# include "../rotfont/times14.h" -# include "../rotfont/times18.h" -# include "../rotfont/times24.h" - -# include "../rotfont/courier8.h" -# include "../rotfont/courier12.h" -# include "../rotfont/courier14.h" -# include "../rotfont/courier18.h" -# include "../rotfont/courier24.h" - -# include "../rotfont/helvetica8.h" -# include "../rotfont/helvetica12.h" -# include "../rotfont/helvetica14.h" -# include "../rotfont/helvetica18.h" -# include "../rotfont/helvetica24.h" - -# include "../rotfont/symbol8.h" -# include "../rotfont/symbol12.h" -# include "../rotfont/symbol14.h" -# include "../rotfont/symbol18.h" -# include "../rotfont/symbol24.h" - -# define DEFFONT 1 -static FontSet HardwiredFonts[] = { - {times8font, "times", 8}, - {times12font, "times", 12}, - {times14font, "times", 14}, - {times18font, "times", 18}, - {times24font, "times", 24}, - - {courier8font, "courier", 8}, - {courier12font, "courier", 12}, - {courier14font, "courier", 14}, - {courier18font, "courier", 18}, - {courier24font, "courier", 24}, - - {helvetica8font, "helvetica", 8}, - {helvetica12font, "helvetica", 12}, - {helvetica14font, "helvetica", 14}, - {helvetica18font, "helvetica", 18}, - {helvetica24font, "helvetica", 24}, - - {symbol8font, "symbol", 8}, - {symbol12font, "symbol", 12}, - {symbol14font, "symbol", 14}, - {symbol18font, "symbol", 18}, - {symbol24font, "symbol", 24} -}; - -/* put these as static in RotFont.c with accessor functions */ -# define NROT 256 Index: unk/Ohana/src/kii/include/bDraw.h =================================================================== --- /trunk/Ohana/src/kii/include/bDraw.h (revision 6240) +++ (revision ) @@ -1,52 +1,0 @@ -# include - -typedef png_byte bDrawColor; - -typedef struct { - int Nx, Ny; - bDrawColor **pixels; -} bDrawBuffer; - -# if (0) -int bDrawObjects (Layout *layout); -void bDrawConnect (Layout *layout, Gobjects *object); -void bDrawClipLine (double x0, double y0, double x1, double y1, double X0, double Y1, double X1, double Y0); -void bDrawHistogram (Layout *layout, Gobjects *object); -void bDrawPoints (Layout *layout, Gobjects *object); -void bDrawXErrors (Layout *layout, Gobjects *object); -void bDrawYErrors (Layout *layout, Gobjects *object); -int bDrawFrame (Layout *layout); -void bDrawTick (double fx, double fy, double dfx, double dfy, int P, double min, double max, double value, int mode, int naxis); -void bDrawLabels (Layout *layout); -void bDrawPtext (Layout *layout); -# endif - -bDrawBuffer *bDrawBufferCreate (int Nx, int Ny); -void bDrawBufferFree (bDrawBuffer *buffer); -void bDrawSetBuffer (bDrawBuffer *buffer); -void bDrawSetStyle (bDrawColor color, int lw, int lt); -void bDrawPoint (int x, int y); -void bDrawPointf (float x, float y); - -void bDrawArc (double Xc, double Yc, double Xr, double Yr, double Ts, double Te); -void bDrawCircle (double Xc, double Yc, double radius); -void bDrawCircleFill (double xc, double yc, double radius); - -void bDrawLine (double x1, double y1, double x2, double y2); -void bDrawLineWeight (int X1, int Y1, int X2, int Y2, int swapcoords); -void bDrawLineBresen (int X1, int Y1, int X2, int Y2, int swapcoords); -void bDrawLineHorizontal (int X1, int X2, int Y); -void bDrawLineVertical (int X, int Y1, int Y2); - -png_color *MakePNGPalette (int *Npalette); -bDrawColor GetColorByName (char *name); -bDrawBuffer *bDrawIt (); - -void bDrawRectOpen (double x1, double y1, double x2, double y2); -void bDrawRectFill (double x1, double y1, double x2, double y2); -void bDrawTriOpen (double x1, double y1, double x2, double y2, double x3, double y3); -void bDrawTriFill (double x1, double y1, double x2, double y2, double x3, double y3); -int bDrawRotText (int x, int y, char *string, int pos, double angle); -int bDrawRotBitmap (int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale); - -void bDrawOverlay (Layout *layout, int N); Index: unk/Ohana/src/kii/include/icons/R0.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R0.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R0_width 9 -#define R0_height 6 -static char R0_bits[] = { - 0x00, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x82, 0x00, 0x7c, 0x00}; Index: unk/Ohana/src/kii/include/icons/R1.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R1.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R1_width 9 -#define R1_height 6 -static char R1_bits[] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xff, 0x01, 0x02, 0x01, 0x04, 0x01}; Index: unk/Ohana/src/kii/include/icons/R2.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R2.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R2_width 9 -#define R2_height 6 -static char R2_bits[] = { - 0x00, 0x00, 0x0e, 0x01, 0x11, 0x01, 0x21, 0x01, 0x41, 0x01, 0x86, 0x01}; Index: unk/Ohana/src/kii/include/icons/R3.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R3.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R3_width 9 -#define R3_height 6 -static char R3_bits[] = { - 0x00, 0x00, 0xe3, 0x00, 0x15, 0x01, 0x19, 0x01, 0x11, 0x01, 0x81, 0x00}; Index: unk/Ohana/src/kii/include/icons/R4.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R4.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R4_width 9 -#define R4_height 6 -static char R4_bits[] = { - 0x00, 0x00, 0x40, 0x00, 0xff, 0x01, 0x44, 0x00, 0x58, 0x00, 0x60, 0x00}; Index: unk/Ohana/src/kii/include/icons/R5.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R5.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R5_width 9 -#define R5_height 6 -static char R5_bits[] = { - 0x00, 0x00, 0xf1, 0x00, 0x09, 0x01, 0x09, 0x01, 0x11, 0x01, 0x9f, 0x00}; Index: unk/Ohana/src/kii/include/icons/R6.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R6.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R6_width 9 -#define R6_height 6 -static char R6_bits[] = { - 0x00, 0x00, 0xe2, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0xfe, 0x00}; Index: unk/Ohana/src/kii/include/icons/R7.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R7.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R7_width 9 -#define R7_height 6 -static char R7_bits[] = { - 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x31, 0x00, 0xc1, 0x01, 0x01, 0x00}; Index: unk/Ohana/src/kii/include/icons/R8.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R8.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R8_width 9 -#define R8_height 6 -static char R8_bits[] = { - 0x00, 0x00, 0xee, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0xee, 0x00}; Index: unk/Ohana/src/kii/include/icons/R9.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/R9.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define R9_width 9 -#define R9_height 6 -static char R9_bits[] = { - 0x00, 0x00, 0xfe, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x8e, 0x00}; Index: unk/Ohana/src/kii/include/icons/Rd.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/Rd.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define Rd_width 9 -#define Rd_height 6 -static char Rd_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00}; Index: unk/Ohana/src/kii/include/icons/Re.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/Re.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define Re_width 9 -#define Re_height 6 -static char Re_bits[] = { - 0x00, 0x00, 0xb0, 0x00, 0x28, 0x01, 0x28, 0x01, 0x28, 0x01, 0xf0, 0x00}; Index: unk/Ohana/src/kii/include/icons/Rm.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/Rm.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define Rm_width 9 -#define Rm_height 6 -static char Rm_bits[] = { - 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00}; Index: unk/Ohana/src/kii/include/icons/Rp.h =================================================================== --- /trunk/Ohana/src/kii/include/icons/Rp.h (revision 6240) +++ (revision ) @@ -1,4 +1,0 @@ -#define Rp_width 9 -#define Rp_height 6 -static char Rp_bits[] = { - 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x7c, 0x00, 0x10, 0x00, 0x10, 0x00}; Index: unk/Ohana/src/kii/include/rotletters.h =================================================================== --- /trunk/Ohana/src/kii/include/rotletters.h (revision 6240) +++ (revision ) @@ -1,56 +1,0 @@ -#define R0_width 9 -#define R0_height 6 -static char R0_bits[] = { - 0x00, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x82, 0x00, 0x7c, 0x00}; -#define R1_width 9 -#define R1_height 6 -static char R1_bits[] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xff, 0x01, 0x02, 0x01, 0x04, 0x01}; -#define R2_width 9 -#define R2_height 6 -static char R2_bits[] = { - 0x00, 0x00, 0x0e, 0x01, 0x11, 0x01, 0x21, 0x01, 0x41, 0x01, 0x86, 0x01}; -#define R3_width 9 -#define R3_height 6 -static char R3_bits[] = { - 0x00, 0x00, 0xe3, 0x00, 0x15, 0x01, 0x19, 0x01, 0x11, 0x01, 0x81, 0x00}; -#define R4_width 9 -#define R4_height 6 -static char R4_bits[] = { - 0x00, 0x00, 0x40, 0x00, 0xff, 0x01, 0x44, 0x00, 0x58, 0x00, 0x60, 0x00}; -#define R5_width 9 -#define R5_height 6 -static char R5_bits[] = { - 0x00, 0x00, 0xf1, 0x00, 0x09, 0x01, 0x09, 0x01, 0x11, 0x01, 0x9f, 0x00}; -#define R6_width 9 -#define R6_height 6 -static char R6_bits[] = { - 0x00, 0x00, 0xe2, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0xfe, 0x00}; -#define R7_width 9 -#define R7_height 6 -static char R7_bits[] = { - 0x00, 0x00, 0x03, 0x00, 0x0d, 0x00, 0x31, 0x00, 0xc1, 0x01, 0x01, 0x00}; -#define R8_width 9 -#define R8_height 6 -static char R8_bits[] = { - 0x00, 0x00, 0xee, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0xee, 0x00}; -#define R9_width 9 -#define R9_height 6 -static char R9_bits[] = { - 0x00, 0x00, 0xfe, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x8e, 0x00}; -#define Rd_width 9 -#define Rd_height 6 -static char Rd_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00}; -#define Re_width 9 -#define Re_height 6 -static char Re_bits[] = { - 0x00, 0x00, 0xb0, 0x00, 0x28, 0x01, 0x28, 0x01, 0x28, 0x01, 0xf0, 0x00}; -#define Rm_width 9 -#define Rm_height 6 -static char Rm_bits[] = { - 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00}; -#define Rp_width 9 -#define Rp_height 6 -static char Rp_bits[] = { - 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x7c, 0x00, 0x10, 0x00, 0x10, 0x00};