Accepting request 26416 from graphics
Copy from graphics/xfig based on submit request 26416 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/26416 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfig?expand=0&rev=13
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
31a4b947ef
commit
d5c59d51e2
@ -1,354 +0,0 @@
|
|||||||
Index: f_readeps.c
|
|
||||||
===================================================================
|
|
||||||
--- f_readeps.c.orig
|
|
||||||
+++ f_readeps.c
|
|
||||||
@@ -250,11 +250,10 @@ bitmap_from_gs(file, filetype, pic, urx,
|
|
||||||
int urx, llx, ury, lly;
|
|
||||||
int pdf_flag;
|
|
||||||
{
|
|
||||||
- static tempseq = 0;
|
|
||||||
char buf[300];
|
|
||||||
FILE *tmpfp, *pixfile, *gsfile;
|
|
||||||
char *psnam, *driver;
|
|
||||||
- int status, wid, ht, nbitmap;
|
|
||||||
+ int status, wid, ht, nbitmap, fd;
|
|
||||||
char tmpfile[PATH_MAX],
|
|
||||||
pixnam[PATH_MAX],
|
|
||||||
errnam[PATH_MAX],
|
|
||||||
@@ -270,8 +269,12 @@ bitmap_from_gs(file, filetype, pic, urx,
|
|
||||||
/* re-open the pipe */
|
|
||||||
close_picfile(file, filetype);
|
|
||||||
file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
|
|
||||||
- sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
|
|
||||||
- if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
|
|
||||||
+ snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
|
|
||||||
+ if (fd != -1) {
|
|
||||||
+ unlink(tmpfile);
|
|
||||||
+ close(fd);
|
|
||||||
+ }
|
|
||||||
file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
|
|
||||||
return False;
|
|
||||||
}
|
|
||||||
@@ -280,10 +283,20 @@ bitmap_from_gs(file, filetype, pic, urx,
|
|
||||||
fclose(tmpfp);
|
|
||||||
}
|
|
||||||
/* make name /TMPDIR/xfig-pic######.pix */
|
|
||||||
- sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
|
|
||||||
+ snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(pixnam)) == -1) {
|
|
||||||
+ file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
|
|
||||||
+ return False;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* and file name for any error messages from gs */
|
|
||||||
- sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
|
|
||||||
- tempseq++;
|
|
||||||
+ snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(errnam)) == -1) {
|
|
||||||
+ file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
|
|
||||||
+ return False;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
|
|
||||||
/* generate gs command line */
|
|
||||||
/* for monochrome, use pbm */
|
|
||||||
Index: f_readgif.c
|
|
||||||
===================================================================
|
|
||||||
--- f_readgif.c.orig
|
|
||||||
+++ f_readgif.c
|
|
||||||
@@ -76,7 +76,7 @@ read_gif(FILE *file, int filetype, F_pic
|
|
||||||
char buf[BUFLEN],pcxname[PATH_MAX];
|
|
||||||
FILE *giftopcx;
|
|
||||||
struct Cmap localColorMap[MAX_COLORMAP_SIZE];
|
|
||||||
- int i, stat, size;
|
|
||||||
+ int i, stat, size, fd;
|
|
||||||
int useGlobalColormap;
|
|
||||||
unsigned int bitPixel, red, green, blue;
|
|
||||||
unsigned char c;
|
|
||||||
@@ -173,7 +173,13 @@ read_gif(FILE *file, int filetype, F_pic
|
|
||||||
/* now call giftopnm and ppmtopcx */
|
|
||||||
|
|
||||||
/* make name for temp output file */
|
|
||||||
- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
|
|
||||||
+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(pcxname)) == -1) {
|
|
||||||
+ file_msg("Cannot create temporary file\n");
|
|
||||||
+ return FileInvalid;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* make command to convert gif to pcx into temp file */
|
|
||||||
sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
|
|
||||||
if ((giftopcx = popen(buf,"w" )) == 0) {
|
|
||||||
Index: f_readppm.c
|
|
||||||
===================================================================
|
|
||||||
--- f_readppm.c.orig
|
|
||||||
+++ f_readppm.c
|
|
||||||
@@ -34,10 +34,16 @@ read_ppm(FILE *file, int filetype, F_pic
|
|
||||||
{
|
|
||||||
char buf[BUFLEN],pcxname[PATH_MAX];
|
|
||||||
FILE *giftopcx;
|
|
||||||
- int stat, size;
|
|
||||||
+ int stat, size, fd;
|
|
||||||
|
|
||||||
/* make name for temp output file */
|
|
||||||
- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
|
|
||||||
+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(pcxname)) == -1) {
|
|
||||||
+ file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
|
|
||||||
+ return FileInvalid;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* make command to convert gif to pcx into temp file */
|
|
||||||
sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
|
|
||||||
if ((giftopcx = popen(buf,"w" )) == 0) {
|
|
||||||
Index: f_readtif.c
|
|
||||||
===================================================================
|
|
||||||
--- f_readtif.c.orig
|
|
||||||
+++ f_readtif.c
|
|
||||||
@@ -33,11 +33,16 @@ read_tif(char *filename, int filetype, F
|
|
||||||
{
|
|
||||||
char buf[2*PATH_MAX+40],pcxname[PATH_MAX];
|
|
||||||
FILE *tiftopcx;
|
|
||||||
- int stat;
|
|
||||||
+ int stat, fd;
|
|
||||||
|
|
||||||
/* make name for temp output file */
|
|
||||||
- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
|
|
||||||
-
|
|
||||||
+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(pcxname)) == -1) {
|
|
||||||
+ file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
|
|
||||||
+ return FileInvalid;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* make command to convert tif to pnm then to pcx into temp file */
|
|
||||||
/* for some reason, tifftopnm requires a file and can't work in a pipe */
|
|
||||||
sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
|
|
||||||
Index: f_util.c
|
|
||||||
===================================================================
|
|
||||||
--- f_util.c.orig
|
|
||||||
+++ f_util.c
|
|
||||||
@@ -906,14 +906,20 @@ void update_xfigrc(char *name, char *str
|
|
||||||
int strain_out(char *name)
|
|
||||||
{
|
|
||||||
char line[RC_BUFSIZ+1], *tok;
|
|
||||||
+ int fd;
|
|
||||||
|
|
||||||
/* make a temp filename in the user's home directory so we
|
|
||||||
can just rename it to .xfigrc after creating it */
|
|
||||||
- sprintf(tmpname, "%s/%s%06d", userhome, "xfig-xfigrc", getpid());
|
|
||||||
- tmpf = fopen(tmpname,"wb");
|
|
||||||
- if (tmpf == 0) {
|
|
||||||
- file_msg("Can't make temporary file for .xfigrc - error: %s",strerror(errno));
|
|
||||||
- return -1;
|
|
||||||
+ snprintf(tmpname, sizeof(tmpname), "%s/xfig-xfigrc.XXXXXX", userhome);
|
|
||||||
+
|
|
||||||
+ if ((fd = mkstemp(tmpname)) == -1 || (tmpf = fdopen(fd, "wb")) == NULL) {
|
|
||||||
+ file_msg("Can't make temporary file for .xfigrc - error: %s",
|
|
||||||
+ strerror(errno));
|
|
||||||
+ if (fd != -1) {
|
|
||||||
+ unlink(tmpname);
|
|
||||||
+ close(fd);
|
|
||||||
+ }
|
|
||||||
+ return -1;
|
|
||||||
}
|
|
||||||
/* read the .xfigrc file and write all to temp file except file names */
|
|
||||||
xfigrc = fopen(xfigrc_name,"r");
|
|
||||||
Index: main.c
|
|
||||||
===================================================================
|
|
||||||
--- main.c.orig
|
|
||||||
+++ main.c
|
|
||||||
@@ -671,8 +671,10 @@ void main(int argc, char **argv)
|
|
||||||
update_figs = False;
|
|
||||||
|
|
||||||
/* get the TMPDIR environment variable for temporary files */
|
|
||||||
- if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL)
|
|
||||||
- TMPDIR = "/tmp";
|
|
||||||
+ if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL) {
|
|
||||||
+ if ((TMPDIR = getenv("TMPDIR")) == NULL)
|
|
||||||
+ TMPDIR = "/tmp";
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* first check args to see if user wants to scale the figure as it is
|
|
||||||
read in and make sure it is a resonable (positive) number */
|
|
||||||
@@ -1687,7 +1689,14 @@ make_cut_buf_name(void)
|
|
||||||
if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
|
|
||||||
strcat(cut_buf_name, "/.xfig");
|
|
||||||
} else {
|
|
||||||
- sprintf(cut_buf_name, "%s/xfig%06d", TMPDIR, getpid());
|
|
||||||
+ int fd;
|
|
||||||
+ sprintf(cut_buf_name, "%s/xfig.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(cut_buf_name)) == -1) {
|
|
||||||
+ fprintf(stderr, "Can't create temporary file for cut_buff: %s\n",
|
|
||||||
+ strerror(errno));
|
|
||||||
+ exit(0);
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: mode.c
|
|
||||||
===================================================================
|
|
||||||
--- mode.c.orig
|
|
||||||
+++ mode.c
|
|
||||||
@@ -86,7 +86,7 @@ int min_num_points;
|
|
||||||
|
|
||||||
int cur_exp_lang; /* gets initialized in main.c */
|
|
||||||
Boolean batch_exists = False;
|
|
||||||
-char batch_file[32];
|
|
||||||
+char batch_file[PATH_MAX];
|
|
||||||
|
|
||||||
/*******************************************************************/
|
|
||||||
/* If you change the order of the lang_items[] you must change the */
|
|
||||||
Index: u_print.c
|
|
||||||
===================================================================
|
|
||||||
--- u_print.c.orig
|
|
||||||
+++ u_print.c
|
|
||||||
@@ -92,9 +92,16 @@ void print_to_printer(char *printer, cha
|
|
||||||
char syspr[2*PATH_MAX+200];
|
|
||||||
char tmpfile[PATH_MAX];
|
|
||||||
char *name;
|
|
||||||
+ int fd;
|
|
||||||
|
|
||||||
- sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
|
|
||||||
+ snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
|
|
||||||
warnexist = False;
|
|
||||||
+ if ((fd = mkstemp(tmpfile)) == -1) {
|
|
||||||
+ file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
init_write_tmpfile();
|
|
||||||
if (write_file(tmpfile, False)) {
|
|
||||||
end_write_tmpfile();
|
|
||||||
@@ -190,12 +197,21 @@ int print_to_file(char *file, char *lang
|
|
||||||
char tmp_fig_file[PATH_MAX];
|
|
||||||
char *outfile, *name, *real_lang;
|
|
||||||
char *suf;
|
|
||||||
+ int fd;
|
|
||||||
|
|
||||||
/* if file exists, ask if ok */
|
|
||||||
if (!ok_to_write(file, "EXPORT"))
|
|
||||||
return (1);
|
|
||||||
|
|
||||||
- sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid());
|
|
||||||
+
|
|
||||||
+ snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(tmp_fig_file)) == -1) {
|
|
||||||
+ file_msg("Can't open temp file %s: %s\n", tmp_fig_file,
|
|
||||||
+ strerror(errno));
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* write the fig objects to a temporary file */
|
|
||||||
warnexist = False;
|
|
||||||
init_write_tmpfile();
|
|
||||||
@@ -648,10 +664,16 @@ exec_prcmd(char *command, char *msg)
|
|
||||||
char errfname[PATH_MAX];
|
|
||||||
FILE *errfile;
|
|
||||||
char str[400];
|
|
||||||
- int status;
|
|
||||||
+ int status, fd;
|
|
||||||
|
|
||||||
/* make temp filename for any errors */
|
|
||||||
- sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
|
|
||||||
+ snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(errfname)) == -1) {
|
|
||||||
+ file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* direct any output from fig2dev to this file */
|
|
||||||
strcat(command, " 2> ");
|
|
||||||
strcat(command, errfname);
|
|
||||||
Index: w_print.c
|
|
||||||
===================================================================
|
|
||||||
--- w_print.c.orig
|
|
||||||
+++ w_print.c
|
|
||||||
@@ -294,9 +294,10 @@ void
|
|
||||||
do_print_batch(Widget w)
|
|
||||||
{
|
|
||||||
FILE *infp,*outfp;
|
|
||||||
- char tmp_exp_file[32];
|
|
||||||
+ char tmp_exp_file[PATH_MAX];
|
|
||||||
char str[255];
|
|
||||||
char backgrnd[10], grid[80];
|
|
||||||
+ int fd;
|
|
||||||
|
|
||||||
if (writing_batch || emptyfigure_msg(print_msg))
|
|
||||||
return;
|
|
||||||
@@ -305,11 +306,20 @@ do_print_batch(Widget w)
|
|
||||||
/* this could happen if the user presses the button too fast */
|
|
||||||
writing_batch = True;
|
|
||||||
|
|
||||||
- /* make a temporary name to write the batch stuff to */
|
|
||||||
- sprintf(batch_file, "%s/%s%06d", TMPDIR, "xfig-batch", getpid());
|
|
||||||
/* make a temporary name to write this figure to */
|
|
||||||
- sprintf(tmp_exp_file, "%s/%s%06d", TMPDIR, "xfig-exp", getpid());
|
|
||||||
- batch_exists = True;
|
|
||||||
+ snprintf(tmp_exp_file, sizeof(tmp_exp_file), "%s/xfig-exp.XXXXXX",
|
|
||||||
+ TMPDIR);
|
|
||||||
+
|
|
||||||
+ if (batch_exists != True) {
|
|
||||||
+ /* make a temporary name to write the batch stuff to */
|
|
||||||
+ sprintf(batch_file, "%s/xfig-batch.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(batch_file)) == -1) {
|
|
||||||
+ file_msg("Error creating temporary file");
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+ batch_exists = True;
|
|
||||||
+ }
|
|
||||||
if (!print_popup)
|
|
||||||
create_print_panel(w);
|
|
||||||
|
|
||||||
@@ -322,6 +332,12 @@ do_print_batch(Widget w)
|
|
||||||
/* make a #rrggbb string from the background color */
|
|
||||||
make_rgb_string(export_background_color, backgrnd);
|
|
||||||
|
|
||||||
+ if ((fd = mkstemp(tmp_exp_file)) == -1) {
|
|
||||||
+ file_msg("Error creating temporary file");
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ close(fd);
|
|
||||||
+
|
|
||||||
/* get grid params and assemble into fig2dev parm */
|
|
||||||
get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
|
|
||||||
|
|
||||||
Index: w_srchrepl.c
|
|
||||||
===================================================================
|
|
||||||
--- w_srchrepl.c.orig
|
|
||||||
+++ w_srchrepl.c
|
|
||||||
@@ -788,7 +788,7 @@ spell_check(void)
|
|
||||||
char *cmd;
|
|
||||||
char str[300];
|
|
||||||
FILE *fp;
|
|
||||||
- int len, i;
|
|
||||||
+ int len, i, fd;
|
|
||||||
Boolean done = FALSE;
|
|
||||||
static int lines = 0;
|
|
||||||
|
|
||||||
@@ -804,9 +804,12 @@ spell_check(void)
|
|
||||||
}
|
|
||||||
lines = 0;
|
|
||||||
|
|
||||||
- sprintf(filename, "%s/xfig-spell.%d", TMPDIR, (int)getpid());
|
|
||||||
- fp = fopen(filename, "w");
|
|
||||||
- if (fp == NULL) {
|
|
||||||
+ snprintf(filename, sizeof(filename), "%s/xfig-spell.XXXXXX", TMPDIR);
|
|
||||||
+ if ((fd = mkstemp(filename)) == -1 || (fp = fdopen(fd, "w")) == NULL) {
|
|
||||||
+ if (fd != -1) {
|
|
||||||
+ unlink(filename);
|
|
||||||
+ close(fd);
|
|
||||||
+ }
|
|
||||||
file_msg("Can't open temporary file: %s: %s\n", filename, strerror(errno));
|
|
||||||
} else {
|
|
||||||
/* locate all text objects and write them to file fp */
|
|
||||||
@ -1,8 +1,7 @@
|
|||||||
Index: xfig.3.2.5/main.c
|
diff -ru xfig.3.2.3d.orig/main.c xfig.3.2.3d/main.c
|
||||||
===================================================================
|
--- xfig.3.2.3d.orig/main.c 2001-01-25 22:49:19.000000000 +0100
|
||||||
--- xfig.3.2.5.orig/main.c
|
+++ xfig.3.2.3d/main.c 2003-05-09 11:58:41.000000000 +0200
|
||||||
+++ xfig.3.2.5/main.c
|
@@ -259,18 +259,36 @@
|
||||||
@@ -318,18 +318,36 @@ static XtResource application_resources[
|
|
||||||
XtOffset(appresPtr, always_use_fontset), XtRBoolean, (caddr_t) & false},
|
XtOffset(appresPtr, always_use_fontset), XtRBoolean, (caddr_t) & false},
|
||||||
{"fixedFontSet", "FontSet", XtRFontSet, sizeof(XFontSet),
|
{"fixedFontSet", "FontSet", XtRFontSet, sizeof(XFontSet),
|
||||||
XtOffset(appresPtr, fixed_fontset), XtRString,
|
XtOffset(appresPtr, fixed_fontset), XtRString,
|
||||||
@ -47,3 +46,4 @@ Index: xfig.3.2.5/main.c
|
|||||||
{"fontSetSize", "FontSetSize", XtRInt, sizeof(int),
|
{"fontSetSize", "FontSetSize", XtRInt, sizeof(int),
|
||||||
XtOffset(appresPtr, fontset_size), XtRImmediate, (caddr_t)0 },
|
XtOffset(appresPtr, fontset_size), XtRImmediate, (caddr_t)0 },
|
||||||
{"inputStyle", "InputStyle", XtRString, sizeof(char *),
|
{"inputStyle", "InputStyle", XtRString, sizeof(char *),
|
||||||
|
|
||||||
|
|||||||
@ -1,72 +0,0 @@
|
|||||||
Index: w_dir.c
|
|
||||||
===================================================================
|
|
||||||
--- w_dir.c.orig
|
|
||||||
+++ w_dir.c
|
|
||||||
@@ -132,6 +132,8 @@ FileSelected(Widget w, XtPointer client_
|
|
||||||
{
|
|
||||||
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
|
||||||
|
|
||||||
+ if (!ret_struct)
|
|
||||||
+ return;
|
|
||||||
strcpy(CurrentSelectionName, ret_struct->string);
|
|
||||||
FirstArg(XtNstring, CurrentSelectionName);
|
|
||||||
if (browse_up) {
|
|
||||||
@@ -163,6 +165,8 @@ DirSelected(Widget w, XtPointer client_d
|
|
||||||
{
|
|
||||||
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
|
||||||
|
|
||||||
+ if (!ret_struct)
|
|
||||||
+ return;
|
|
||||||
strcpy(CurrentSelectionName, ret_struct->string);
|
|
||||||
DoChangeDir(CurrentSelectionName);
|
|
||||||
}
|
|
||||||
Index: w_library.c
|
|
||||||
===================================================================
|
|
||||||
--- w_library.c.orig
|
|
||||||
+++ w_library.c
|
|
||||||
@@ -481,6 +481,8 @@ NewObjectSel(Widget w, XtPointer closure
|
|
||||||
int new_obj;
|
|
||||||
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
|
||||||
|
|
||||||
+ if (!ret_struct)
|
|
||||||
+ return;
|
|
||||||
new_obj = ret_struct->list_index;
|
|
||||||
if (icons_made) {
|
|
||||||
/* unhighlight the current view icon */
|
|
||||||
Index: w_srchrepl.c
|
|
||||||
===================================================================
|
|
||||||
--- w_srchrepl.c.orig
|
|
||||||
+++ w_srchrepl.c
|
|
||||||
@@ -887,6 +887,8 @@ spell_select_word(Widget widget, XtPoint
|
|
||||||
XtSetSensitive(correct_button, True);
|
|
||||||
XtSetSensitive(correct_word, True);
|
|
||||||
|
|
||||||
+ if (!ret_struct)
|
|
||||||
+ return;
|
|
||||||
/* save the selected word */
|
|
||||||
strcpy(selected_word, ret_struct->string);
|
|
||||||
/* copy the word to the correct_word ascii widget */
|
|
||||||
Index: w_style.c
|
|
||||||
===================================================================
|
|
||||||
--- w_style.c.orig
|
|
||||||
+++ w_style.c
|
|
||||||
@@ -589,7 +589,8 @@ family_select (Widget w, XtPointer closu
|
|
||||||
|
|
||||||
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
|
||||||
|
|
||||||
- current_family = ret_struct->list_index;
|
|
||||||
+ if (ret_struct)
|
|
||||||
+ current_family = ret_struct->list_index;
|
|
||||||
current_style = -1;
|
|
||||||
style_update ();
|
|
||||||
}
|
|
||||||
@@ -599,7 +600,8 @@ style_select (Widget w, XtPointer closur
|
|
||||||
{
|
|
||||||
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
|
||||||
|
|
||||||
- current_style = ret_struct->list_index;
|
|
||||||
+ if (ret_struct)
|
|
||||||
+ current_style = ret_struct->list_index;
|
|
||||||
style_update ();
|
|
||||||
cur_updatemask = set_style (¤t_family_set[current_family].style[current_style]);
|
|
||||||
|
|
||||||
@ -1,563 +0,0 @@
|
|||||||
Index: w_drawprim.c
|
|
||||||
===================================================================
|
|
||||||
--- w_drawprim.c.orig
|
|
||||||
+++ w_drawprim.c
|
|
||||||
@@ -528,7 +528,9 @@ void init_gc(void)
|
|
||||||
gccache[ERASE] = makegc(ERASE, x_fg_color.pixel, x_bg_color.pixel);
|
|
||||||
gccache[INV_PAINT] = makegc(INV_PAINT, x_fg_color.pixel, x_bg_color.pixel);
|
|
||||||
/* parse any grid color spec */
|
|
||||||
+#if 0
|
|
||||||
fprintf(stderr,"color = '%s'\n",appres.grid_color);
|
|
||||||
+#endif
|
|
||||||
XParseColor(tool_d, tool_cm, appres.grid_color, &tmp_color);
|
|
||||||
if (XAllocColor(tool_d, tool_cm, &tmp_color)==0) {
|
|
||||||
fprintf(stderr,"Can't allocate color for grid \n");
|
|
||||||
Index: w_layers.c
|
|
||||||
===================================================================
|
|
||||||
--- w_layers.c.orig
|
|
||||||
+++ w_layers.c
|
|
||||||
@@ -118,9 +118,27 @@ init_depth_panel(Widget parent)
|
|
||||||
{
|
|
||||||
Widget label, below;
|
|
||||||
Widget layer_viewform;
|
|
||||||
+ Dimension ind_ht = 0, snap_ht = 0, mouse_ht;
|
|
||||||
|
|
||||||
- /* MOUSEFUN_HT and ind_panel height aren't known yet */
|
|
||||||
- LAYER_HT = TOPRULER_HT + CANVAS_HT;
|
|
||||||
+ if (XtIsManaged(ind_panel)) {
|
|
||||||
+ /* get height of indicator panel */
|
|
||||||
+ FirstArg(XtNheight, &ind_ht);
|
|
||||||
+ GetValues(ind_panel);
|
|
||||||
+ ind_ht += INTERNAL_BW*2;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (XtIsManaged(snap_indicator_panel)) {
|
|
||||||
+ /* get height of snap panel */
|
|
||||||
+ FirstArg(XtNheight, &snap_ht);
|
|
||||||
+ GetValues(snap_indicator_panel);
|
|
||||||
+ snap_ht += INTERNAL_BW*4;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* MOUSEFUN_HT height aren't known yet */
|
|
||||||
+ mouse_ht = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
|
|
||||||
+
|
|
||||||
+ /* now that the bitmaps have been created, put the checkmark in the proper toggle */
|
|
||||||
+ LAYER_HT = mouse_ht + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
|
|
||||||
|
|
||||||
/* main form to hold all the layer stuff */
|
|
||||||
|
|
||||||
@@ -366,11 +384,21 @@ init_depth_panel(Widget parent)
|
|
||||||
void
|
|
||||||
setup_depth_panel(void)
|
|
||||||
{
|
|
||||||
- Dimension ind_ht;
|
|
||||||
- /* get height of indicator panel */
|
|
||||||
- FirstArg(XtNheight, &ind_ht);
|
|
||||||
- GetValues(ind_panel);
|
|
||||||
- LAYER_HT = MOUSEFUN_HT + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*4;
|
|
||||||
+ Dimension ind_ht = 0, snap_ht = 0;
|
|
||||||
+
|
|
||||||
+ if (XtIsManaged(ind_panel)) {
|
|
||||||
+ /* get height of indicator panel */
|
|
||||||
+ FirstArg(XtNheight, &ind_ht);
|
|
||||||
+ GetValues(ind_panel);
|
|
||||||
+ ind_ht += INTERNAL_BW*2;
|
|
||||||
+ }
|
|
||||||
+ if (XtIsManaged(snap_indicator_panel)) {
|
|
||||||
+ FirstArg(XtNheight, &snap_ht);
|
|
||||||
+ GetValues(snap_indicator_panel);
|
|
||||||
+ snap_ht += INTERNAL_BW*4;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ LAYER_HT = MOUSEFUN_HT + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
|
|
||||||
|
|
||||||
/* now that the bitmaps have been created, put the checkmark in the proper toggle */
|
|
||||||
FirstArg(XtNbitmap, (gray_layers? sm_check_pm : sm_null_check_pm));
|
|
||||||
Index: w_library.c
|
|
||||||
===================================================================
|
|
||||||
--- w_library.c.orig
|
|
||||||
+++ w_library.c
|
|
||||||
@@ -1031,9 +1031,9 @@ make_library_menu(Widget parent, char *n
|
|
||||||
Widget menu, entry;
|
|
||||||
#ifndef XAW3D1_5E
|
|
||||||
Widget submenu;
|
|
||||||
- char submenu_name[200];
|
|
||||||
#endif /* XAW3D1_5E */
|
|
||||||
char menu_name[200];
|
|
||||||
+ char submenu_name[200];
|
|
||||||
int i;
|
|
||||||
|
|
||||||
menu = XtCreatePopupShell(name, simpleMenuWidgetClass,
|
|
||||||
Index: w_icons.c
|
|
||||||
===================================================================
|
|
||||||
--- w_icons.c.orig
|
|
||||||
+++ w_icons.c
|
|
||||||
@@ -3013,237 +3013,156 @@ char * fig_reduced_c_icon_X[] = {
|
|
||||||
|
|
||||||
/* bitmap of letters for splash screen ("3.2.X") */
|
|
||||||
|
|
||||||
-#define letters_width 243
|
|
||||||
-#define letters_height 110
|
|
||||||
+#define letters_width 231
|
|
||||||
+#define letters_height 76
|
|
||||||
static char letters_bits[] = {
|
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
|
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,
|
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x00,0x00,0x00,
|
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x00,0x00,0x80,0xff,
|
|
||||||
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0x07,0x00,0xf8,0x8f,0x00,0x00,0x80,0xff,0xff,
|
|
||||||
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xc0,0xff,0x07,0x00,0xf8,0x8f,0x00,0x00,0xf0,0xff,0xff,0x7f,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfc,0xff,0xff,0xff,0x03,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfe,0x07,0xf8,0xff,0x07,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xe0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfe,0x07,0xf8,0xff,0x07,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
|
|
||||||
+ 0xff,0xff,0xff,0xff,0x87,0x00,0xc0,0x7f,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xf8,0x01,0x00,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
|
|
||||||
+ 0xff,0xff,0xff,0x81,0x00,0xc0,0x7f,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xf8,0x01,0x00,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
|
|
||||||
+ 0xff,0xff,0x81,0x00,0xc0,0x7f,0x00,0x80,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xfc,0x00,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
|
|
||||||
+ 0xff,0x81,0x00,0xc0,0x7f,0x00,0x80,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,
|
|
||||||
+ 0x00,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
|
|
||||||
+ 0x81,0x00,0xe0,0xff,0x01,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,
|
|
||||||
+ 0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x80,
|
|
||||||
+ 0x00,0xe0,0xff,0x01,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,
|
|
||||||
+ 0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x80,0x00,
|
|
||||||
+ 0xf0,0xff,0x07,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0xf0,
|
|
||||||
+ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x07,0x80,0x00,0xf0,
|
|
||||||
+ 0xff,0x0f,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0xf0,0xff,
|
|
||||||
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x01,0x80,0x00,0xf0,0xff,
|
|
||||||
+ 0x0f,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0xf0,0xff,0x0f,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xe1,0xff,0x1f,0x00,0x80,0x00,0xf0,0xff,0x0f,
|
|
||||||
+ 0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0xf0,0xff,0x0f,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xfc,0xe1,0xff,0x1f,0x00,0x80,0x00,0xe0,0xff,0x0f,0x00,
|
|
||||||
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0xf0,0xff,0x0f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x00,0xff,
|
|
||||||
+ 0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x80,0xff,0x7f,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x80,0xff,0x7f,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xc0,0xff,0x01,0x80,0xff,0x3f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xc0,0xff,0xff,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x80,0x00,0xc0,0xff,0x01,0x80,0xff,0x3f,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xc0,0xff,0xff,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x80,0x00,0x00,0xfe,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xc0,0xff,0xff,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x80,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,0xc0,
|
|
||||||
+ 0xff,0xff,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x80,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x80,0xff,
|
|
||||||
+ 0xff,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0x7f,0x00,0x00,
|
|
||||||
+ 0x80,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
|
|
||||||
+ 0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0x7f,0x00,0x00,0x80,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,
|
|
||||||
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x80,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,
|
|
||||||
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x80,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x80,0xff,0xff,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,0x80,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x80,0xff,0xff,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,0x80,0x00,0x00,0xf8,0xff,
|
|
||||||
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xf0,0x7f,0x80,0xff,0xff,0x07,0x80,0x00,0x00,0xf8,0xff,0xff,
|
|
||||||
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xf0,0x7f,0x80,0xff,0xff,0x07,0x80,0x00,0x00,0xfc,0xff,0x7f,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xf8,0x1f,0x00,0xfe,0xff,0x07,0x80,0x00,0x00,0xfc,0xff,0x3f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xf8,0x03,0x00,0xf8,0xff,0x07,0x80,0x00,0x00,0xf8,0xff,0xff,0x01,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,
|
|
||||||
+ 0x03,0x00,0xf8,0xff,0x1f,0x80,0x00,0x00,0xf8,0xff,0xff,0x01,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0x03,
|
|
||||||
+ 0x00,0xf8,0xff,0x1f,0x80,0x00,0x00,0x00,0x00,0xff,0x1f,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,
|
|
||||||
+ 0xe0,0xff,0x3f,0x80,0x00,0x00,0x00,0x00,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0xe0,
|
|
||||||
+ 0xff,0x3f,0x80,0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0xe0,0xff,
|
|
||||||
+ 0x3f,0x80,0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xe0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,
|
|
||||||
+ 0x80,0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
|
|
||||||
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
|
|
||||||
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x7f,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x80,0x1f,0x00,
|
|
||||||
+ 0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x38,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x30,0x00,0x00,0xc0,0xff,0x3f,0x80,0x80,0x1f,0x00,0x00,
|
|
||||||
+ 0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x38,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x30,0x00,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x01,0x00,0xfc,
|
|
||||||
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0xc0,0xff,0x03,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x01,0x00,0xfc,0xff,
|
|
||||||
+ 0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0xc0,0xff,0x03,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x03,0x00,0xfc,0xff,0x03,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0xe0,
|
|
||||||
+ 0xff,0x0f,0x00,0xc0,0xff,0x1f,0x80,0xf0,0xff,0x03,0x00,0xfc,0xff,0x03,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0xfc,0x0f,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xe0,0xff,
|
|
||||||
+ 0x0f,0x00,0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0xfe,0x01,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,
|
|
||||||
+ 0x00,0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0xfe,0x01,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,0x00,
|
|
||||||
+ 0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x80,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,0x00,0xe0,
|
|
||||||
+ 0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x00,0x7c,0x00,0x00,0xc0,
|
|
||||||
+ 0x3f,0x00,0x00,0xc0,0x3f,0x00,0xc0,0x0f,0x00,0xf0,0xff,0x1f,0x00,0xe0,0xff,
|
|
||||||
+ 0x07,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x80,0xff,0x01,0x00,0xe0,0x0f,
|
|
||||||
+ 0x00,0x00,0xf0,0x0f,0x00,0xf0,0x3f,0x00,0xf0,0xff,0x0f,0x00,0xf8,0xff,0x07,
|
|
||||||
+ 0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x80,0xff,0x01,0x00,0xe0,0x0f,0x00,
|
|
||||||
+ 0x00,0xf0,0x0f,0x00,0xf0,0x3f,0x00,0xf0,0xff,0x0f,0x00,0xf8,0xff,0x07,0x80,
|
|
||||||
+ 0xfc,0xff,0x01,0x00,0xff,0x7f,0x00,0xe0,0xff,0x07,0x00,0xf8,0xff,0xff,0xff,
|
|
||||||
+ 0xff,0x0f,0x00,0xfc,0xff,0x00,0xf0,0xff,0x03,0x00,0xf8,0xff,0x07,0x80,0xfc,
|
|
||||||
+ 0xff,0x01,0x00,0xff,0x7f,0x00,0xe0,0xff,0x07,0x00,0xf8,0xff,0xff,0xff,0xff,
|
|
||||||
+ 0x0f,0x00,0xfc,0xff,0x00,0xf0,0xff,0x03,0x00,0xf8,0xff,0x07,0x80,0xfc,0x3f,
|
|
||||||
+ 0x00,0xc0,0xff,0x7f,0x00,0xf0,0xff,0x1f,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,
|
|
||||||
+ 0x00,0xff,0xff,0x03,0xf0,0xff,0x01,0x00,0xf8,0xff,0x01,0x80,0xf0,0x0f,0x00,
|
|
||||||
+ 0xc0,0xff,0x7f,0x00,0xf0,0xff,0x1f,0x00,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
|
|
||||||
+ 0xff,0xff,0x03,0xe0,0xff,0x00,0x00,0xfe,0xff,0x00,0x80,0xf0,0x0f,0x00,0xe0,
|
|
||||||
+ 0xff,0x1f,0x00,0xf0,0xff,0x1f,0x80,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xff,
|
|
||||||
+ 0xff,0x03,0xe0,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xf0,0x0f,0x00,0xe0,0xff,
|
|
||||||
+ 0x1f,0x00,0xf0,0xff,0x1f,0x80,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xff,0xff,
|
|
||||||
+ 0x03,0xe0,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xf0,0x0f,0x00,0xf0,0xff,0x0f,
|
|
||||||
+ 0x00,0xf0,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,
|
|
||||||
+ 0xc0,0x3f,0x00,0x80,0xff,0x1f,0x00,0x80,0xf0,0x1f,0x00,0xf8,0xff,0x07,0x00,
|
|
||||||
+ 0xf0,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0xc0,
|
|
||||||
+ 0x7f,0x00,0xf0,0xff,0x1f,0x00,0x80,0xc0,0xff,0x00,0xff,0xff,0x01,0x00,0xf0,
|
|
||||||
+ 0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x80,0xff,
|
|
||||||
+ 0x01,0xfc,0xff,0x07,0x00,0x80,0xc0,0xff,0x00,0xff,0xff,0x01,0x00,0xf0,0xff,
|
|
||||||
+ 0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x80,0xff,0x01,
|
|
||||||
+ 0xfc,0xff,0x07,0x00,0x80,0x00,0xfc,0xff,0xff,0x3f,0x00,0x00,0xe0,0xff,0x07,
|
|
||||||
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0xff,0x00,0x00,0xfc,0xff,0xff,
|
|
||||||
+ 0x3f,0x00,0x00,0x80,0x00,0xfc,0xff,0xff,0x3f,0x00,0x00,0xe0,0xff,0x07,0xf8,
|
|
||||||
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0xff,0x00,0x00,0xfc,0xff,0xff,0x3f,
|
|
||||||
+ 0x00,0x00,0x80,0x00,0xf0,0xff,0xff,0x07,0x00,0x00,0x80,0xff,0x07,0xf8,0xff,
|
|
||||||
+ 0xff,0xff,0xff,0xff,0x00,0x00,0xf8,0xff,0x00,0x00,0xf0,0xff,0xff,0x07,0x00,
|
|
||||||
+ 0x00,0x80,0x00,0x00,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,
|
|
||||||
+ 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
|
|
||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,
|
|
||||||
- 0xc0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x0f,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,
|
|
||||||
- 0x00,0xfc,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0xfc,
|
|
||||||
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
|
|
||||||
- 0xff,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xfc,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x1f,
|
|
||||||
- 0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xfe,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
|
|
||||||
- 0x07,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x7f,0x80,0xff,0x3f,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xfe,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xf8,0x03,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x1f,0x00,0xfe,0x7f,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xf8,0x03,0x80,0xff,0x07,0x00,0x00,0x00,0x80,0x0f,0x00,0xfc,0x7f,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xfc,0x07,0x00,0xff,0x07,0x00,0x00,0x00,0xc0,0x07,0x00,0xf8,0xff,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xfc,0x0f,0x00,0xff,0x0f,0x00,0x00,0x00,0xc0,0x07,0x00,0xf8,
|
|
||||||
- 0xff,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xff,0x0f,0x00,0x00,0x00,0xe0,0x07,0x00,
|
|
||||||
- 0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,0xe0,0x07,
|
|
||||||
- 0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,0xf0,
|
|
||||||
- 0x1f,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0x0f,0xff,0x0f,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,
|
|
||||||
- 0xf0,0x7f,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0x0f,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0xff,0x0f,0x00,0x00,
|
|
||||||
- 0x00,0xf0,0xff,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x80,0xff,0x0f,0x00,
|
|
||||||
- 0x00,0x00,0xf0,0xff,0x01,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0x80,0xff,0x07,
|
|
||||||
- 0x00,0x00,0x00,0xf0,0xff,0x03,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x0f,0x80,0xff,
|
|
||||||
- 0x07,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x01,0x00,0x00,0x00,0xc0,0x03,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0xc0,
|
|
||||||
- 0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x00,0x00,0x00,0x00,0xe0,
|
|
||||||
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xc0,0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xe0,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xe0,0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0x03,0xfc,0xff,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xe0,0xc1,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0xfc,0x7f,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xf0,0xf9,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0xfe,0x3f,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xf0,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x80,0xff,0x00,0xff,0x3f,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x07,0xfe,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0xff,
|
|
||||||
- 0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
|
|
||||||
- 0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0x07,0xfe,0xff,0x01,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xc0,0xff,0x07,0x00,0x00,0x00,0x00,0xfe,0x01,0xf8,0xff,0x03,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xe0,0xff,0x03,0x00,0x00,0x00,0x00,0x7e,0x00,0xf0,0xff,0x03,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x7f,0x00,0xe0,0xff,0x07,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xff,0x07,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0xc0,0xff,0x07,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x0f,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfc,0x7f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0xc0,0xff,
|
|
||||||
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0xc0,
|
|
||||||
- 0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xf8,
|
|
||||||
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0xe0,0x7f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xe0,
|
|
||||||
- 0x03,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x0c,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x04,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
|
|
||||||
- 0xf0,0x0f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0x07,0x00,0x3c,0x00,
|
|
||||||
- 0x00,0x00,0x80,0x3f,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,
|
|
||||||
- 0x00,0xf8,0x1f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xfe,0x03,0x00,0x3e,
|
|
||||||
- 0x00,0x00,0x00,0xe0,0x7f,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,
|
|
||||||
- 0x00,0x00,0xfc,0x3f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,
|
|
||||||
- 0x1e,0x00,0x00,0x00,0xf0,0xff,0x00,0x80,0xff,0x07,0xf0,0xff,0xff,0xff,0xff,
|
|
||||||
- 0x1f,0x00,0x00,0xfc,0x3f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,
|
|
||||||
- 0x00,0x1f,0x00,0x00,0x00,0xf0,0xff,0x00,0xc0,0xff,0x07,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0xff,0x00,0x00,0x00,0x00,0xc0,0x1f,
|
|
||||||
- 0x00,0x00,0x1f,0x00,0x00,0x00,0xf8,0xff,0x01,0xc0,0xff,0x07,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0xff,0x00,0x00,0x00,0x00,0xe0,
|
|
||||||
- 0x07,0x00,0x80,0x0f,0x00,0x00,0x00,0xf8,0xff,0x01,0xc0,0xff,0x07,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0x7f,0x00,0xe0,0x01,0x00,
|
|
||||||
- 0xf0,0x03,0x00,0xc0,0x0f,0x00,0x3c,0x00,0xf8,0xff,0x01,0xc0,0xff,0x03,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0x7f,0x00,0xf8,0x07,
|
|
||||||
- 0x00,0xf8,0x01,0x00,0xf0,0x07,0x00,0xff,0x00,0xf8,0xff,0x00,0xe0,0xff,0x03,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xfe,0x7f,0x00,0xfc,
|
|
||||||
- 0x0f,0x00,0xfc,0xff,0xff,0xff,0x07,0x80,0xff,0x01,0xf8,0xff,0x00,0xe0,0xff,
|
|
||||||
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xfe,0x3f,0x00,
|
|
||||||
- 0xfe,0x1f,0x00,0xfe,0xff,0xff,0xff,0x07,0xc0,0xff,0x03,0xf8,0x7f,0x00,0xf0,
|
|
||||||
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x07,0x00,0xff,0x3f,
|
|
||||||
- 0x00,0xff,0x3f,0x00,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf8,0x3f,0x00,
|
|
||||||
- 0xf0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0x00,0xff,
|
|
||||||
- 0x1f,0x00,0xff,0x3f,0x80,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf0,0x1f,
|
|
||||||
- 0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0x80,
|
|
||||||
- 0xff,0x0f,0x00,0xff,0x3f,0xc0,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf0,
|
|
||||||
- 0x07,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,
|
|
||||||
- 0xc0,0xff,0x07,0x00,0xff,0x3f,0xe0,0xff,0xff,0xff,0xff,0x01,0xe0,0xff,0x07,
|
|
||||||
- 0xe0,0x07,0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
|
|
||||||
- 0x03,0xe0,0xff,0x03,0x00,0xff,0x3f,0xf0,0xff,0xff,0xff,0xff,0x01,0xe0,0xff,
|
|
||||||
- 0x07,0xe0,0x0f,0x80,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xf0,0x0f,0xf8,0xff,0x01,0x00,0xff,0x3f,0xf0,0xff,0xff,0xff,0xff,0x01,0xe0,
|
|
||||||
- 0xff,0x07,0xc0,0x3f,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xe0,0xff,0xff,0xff,0x00,0x00,0xfe,0x1f,0xf8,0xff,0xff,0xff,0xff,0x00,
|
|
||||||
- 0xc0,0xff,0x03,0x80,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x80,0xff,0xff,0x3f,0x00,0x00,0xfe,0x1f,0xf8,0xff,0xff,0xff,0xff,
|
|
||||||
- 0x00,0xc0,0xff,0x03,0x00,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,0x00,0x00,0xfc,0x0f,0xf8,0xff,0xff,0xff,
|
|
||||||
- 0x7f,0x00,0x80,0xff,0x01,0x00,0xfc,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x7f,0x00,0x00,0xe0,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x07,0x00,0x00,0xe0,0x1f,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x07,0x00,0x00,0xf0,0x1f,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0x00,0x00,0x80,
|
|
||||||
- 0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x03,0x00,0x00,
|
|
||||||
- 0x80,0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x03,0x00,
|
|
||||||
- 0x00,0x80,0x0f,0x00,0x00,0x00,0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x03,
|
|
||||||
- 0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0xf8,0x3f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
|
|
||||||
- 0x01,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xf0,0x01,0x00,0x00,0xc0,0x07,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xf8,0x01,0x00,0x00,0xe0,0x07,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x3f,0x0f,0xf8,0xe1,0xdf,0x1f,0xe0,0xe7,0x07,0x80,0x9f,0x07,0xec,0x07,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0xc0,0xff,0x1f,0xf8,0xe0,0xff,0x3f,0xe0,0xfb,0x0f,0xe0,0xff,0x0f,0xfe,0x1f,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0xe0,0xe3,0x0f,0xfc,0x00,0x3f,0x7e,0xf0,0xff,0x0f,0xf0,0xf1,0x07,0x1e,
|
|
||||||
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0xf0,0xc1,0x0f,0xfc,0x80,0x1f,0x7c,0xf0,0x8f,0x0f,0xf8,0xe0,0x07,
|
|
||||||
- 0x07,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xf8,0xc0,0x0f,0x7c,0x80,0x1f,0x7c,0xf0,0xc7,0x0f,0x7c,0xe0,
|
|
||||||
- 0x07,0x03,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xf8,0xc0,0x07,0x7e,0x80,0x0f,0x7c,0xf0,0xc3,0x07,0x7c,
|
|
||||||
- 0xe0,0x03,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0x07,0x7e,0xc0,0x0f,0x7e,0xf8,0xe1,0x07,
|
|
||||||
- 0x7e,0xf0,0x03,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0x07,0x3e,0xc0,0x0f,0x7e,0xf8,0xe1,
|
|
||||||
- 0x07,0x7e,0xf0,0x83,0x07,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xe0,0x03,0x3e,0xc0,0x07,0x7e,0xf8,
|
|
||||||
- 0xe0,0x03,0x3e,0xf0,0xc1,0x0f,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf0,0x23,0x3f,0xc1,0x07,0x3e,
|
|
||||||
- 0xfc,0xf0,0x13,0x3e,0xf8,0xd1,0x0f,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf0,0x33,0x3f,0xe3,0x07,
|
|
||||||
- 0x3f,0xfc,0xf0,0x31,0x3e,0xf8,0xd9,0x0f,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf8,0x19,0x9f,0xe1,
|
|
||||||
- 0x07,0x1f,0x7c,0xf0,0x19,0x3e,0xfc,0xcc,0x07,0x1f,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xfc,0x0f,0xdf,
|
|
||||||
- 0xe0,0x8f,0x0f,0x7e,0xf0,0x0d,0x7c,0xfe,0xc7,0xc1,0x0f,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,
|
|
||||||
- 0xff,0xf0,0xff,0x07,0x7e,0xf0,0x07,0xfc,0xff,0x83,0xff,0x07,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe3,
|
|
||||||
- 0x03,0x3e,0xf0,0xfb,0x01,0x3e,0xe0,0x03,0xf0,0xf1,0x01,0xfe,0x01,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
||||||
- 0x00,0x00,0x00,0x00,0x00};
|
|
||||||
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80};
|
|
||||||
|
|
||||||
/* splash background in XPM */
|
|
||||||
|
|
||||||
Index: w_setup.c
|
|
||||||
===================================================================
|
|
||||||
--- w_setup.c.orig
|
|
||||||
+++ w_setup.c
|
|
||||||
@@ -44,7 +44,7 @@ int SW_PER_ROW, SW_PER_COL;
|
|
||||||
|
|
||||||
void setup_sizes(int new_canv_wd, int new_canv_ht)
|
|
||||||
{
|
|
||||||
- int NUM_CMD_MENUS;
|
|
||||||
+ int NUM_CMD_MENUS, NUM_DRAW, NUM_EDIT;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* make the width of the mousefun panel about 1/3 of the size of the
|
|
||||||
@@ -93,9 +93,11 @@ void setup_sizes(int new_canv_wd, int ne
|
|
||||||
INDPANEL_WD = MODEPANEL_WD + CANVAS_WD + SIDERULER_WD;
|
|
||||||
|
|
||||||
/* space for both modepanel titles (Drawing modes and Editing modes) */
|
|
||||||
+ NUM_DRAW = (int)(ceil((double)NUM_DRAW_SW/SW_PER_ROW)) - 1;
|
|
||||||
+ NUM_EDIT = (int)(ceil((double)(NUM_MODE_SW-(NUM_DRAW*SW_PER_ROW))/SW_PER_ROW)) + 1;
|
|
||||||
MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD -
|
|
||||||
- (MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
|
|
||||||
- ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
|
|
||||||
+ (MODE_SW_HT + INTERNAL_BW) * (NUM_DRAW + NUM_EDIT);
|
|
||||||
+
|
|
||||||
if (MODEPANEL_SPACE < 2)
|
|
||||||
MODEPANEL_SPACE = 2;
|
|
||||||
}
|
|
||||||
Index: w_setup.h
|
|
||||||
===================================================================
|
|
||||||
--- w_setup.h.orig
|
|
||||||
+++ w_setup.h
|
|
||||||
@@ -29,12 +29,12 @@
|
|
||||||
#define DISPLAY_PIX_PER_INCH 80
|
|
||||||
|
|
||||||
/* Portrait dimensions */
|
|
||||||
-#define DEF_CANVAS_HT_PORT 9.5*DISPLAY_PIX_PER_INCH+1
|
|
||||||
-#define DEF_CANVAS_WD_PORT 8.5*DISPLAY_PIX_PER_INCH+1
|
|
||||||
+#define DEF_CANVAS_HT_PORT 9.5*DISPLAY_PIX_PER_INCH+1.0
|
|
||||||
+#define DEF_CANVAS_WD_PORT 8.5*DISPLAY_PIX_PER_INCH+1.0
|
|
||||||
|
|
||||||
/* Landscape dimensions */
|
|
||||||
-#define DEF_CANVAS_HT_LAND 8.5*DISPLAY_PIX_PER_INCH+1
|
|
||||||
-#define DEF_CANVAS_WD_LAND 11*DISPLAY_PIX_PER_INCH+1
|
|
||||||
+#define DEF_CANVAS_HT_LAND 9.0*DISPLAY_PIX_PER_INCH+1.0
|
|
||||||
+#define DEF_CANVAS_WD_LAND 11.0*DISPLAY_PIX_PER_INCH+1.0
|
|
||||||
|
|
||||||
#define DEF_RULER_WD 24
|
|
||||||
#define UNITBOX_WD 95
|
|
||||||
Index: w_snap.c
|
|
||||||
===================================================================
|
|
||||||
--- w_snap.c.orig
|
|
||||||
+++ w_snap.c
|
|
||||||
@@ -1373,9 +1373,8 @@ init_snap_panel(parent)
|
|
||||||
Widget dlabel;
|
|
||||||
DeclareArgs(10);
|
|
||||||
|
|
||||||
-
|
|
||||||
- /* MOUSEFUN_HT and ind_panel height aren't known yet */
|
|
||||||
- LAYER_HT = TOPRULER_HT + CANVAS_HT;
|
|
||||||
+ /* MOUSEFUN_HT height aren't known yet */
|
|
||||||
+ LAYER_HT = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
|
|
||||||
|
|
||||||
/* main form to hold all the layer stuff */
|
|
||||||
|
|
||||||
Index: w_util.c
|
|
||||||
===================================================================
|
|
||||||
--- w_util.c.orig
|
|
||||||
+++ w_util.c
|
|
||||||
@@ -34,6 +34,7 @@
|
|
||||||
#include "w_print.h"
|
|
||||||
#include "w_util.h"
|
|
||||||
#include "w_setup.h"
|
|
||||||
+#include "w_snap.h"
|
|
||||||
|
|
||||||
#include <X11/IntrinsicP.h> /* XtResizeWidget() */
|
|
||||||
|
|
||||||
@@ -1518,8 +1519,10 @@ void resize_all(int width, int height)
|
|
||||||
GetValues(msg_panel);
|
|
||||||
XtUnmanageChild(mousefun); /* unmanage the mouse function... */
|
|
||||||
XtUnmanageChild(layer_form);/* and the layer form */
|
|
||||||
+ XtUnmanageChild(snap_indicator_panel);/* also snap ind panel */
|
|
||||||
XtResizeWidget(msg_panel, MSGPANEL_WD, MSGPANEL_HT, b);
|
|
||||||
XtManageChild(mousefun); /* so that they shift with msg_panel */
|
|
||||||
+ XtManageChild(snap_indicator_panel);
|
|
||||||
|
|
||||||
/* now redo the center area */
|
|
||||||
XtUnmanageChild(mode_panel);
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
--- main.c
|
|
||||||
+++ main.c 2008-05-14 19:08:15.853469188 +0200
|
|
||||||
@@ -1533,7 +1533,7 @@ notablet:
|
|
||||||
if (event.type == KeyPress
|
|
||||||
&& XtWindow(canvas_sw) == ((XKeyPressedEvent *)&event)->window) {
|
|
||||||
KeySym key = XLookupKeysym((XKeyPressedEvent *)&event, 0);
|
|
||||||
- if (XK_F1 <= key && key <= XK_F35) {
|
|
||||||
+ if (XK_F1 >= key && key <= XK_F35) {
|
|
||||||
XtDispatchEvent(&event);
|
|
||||||
} else {
|
|
||||||
canvas_selected(canvas_sw, &event, NULL, NULL);
|
|
||||||
--- w_rulers.c
|
|
||||||
+++ w_rulers.c 2008-05-14 19:05:40.041361341 +0200
|
|
||||||
@@ -1166,7 +1166,7 @@ void reset_topruler(void)
|
|
||||||
register int i,k;
|
|
||||||
register tick_info* tk;
|
|
||||||
register Pixmap p = topruler_pm;
|
|
||||||
- char number[6];
|
|
||||||
+ char number[60];
|
|
||||||
int X0,len;
|
|
||||||
int tickmod, tickskip;
|
|
||||||
|
|
||||||
@@ -1183,7 +1183,7 @@ void reset_topruler(void)
|
|
||||||
tickmod = 1;
|
|
||||||
|
|
||||||
/* see how big a label is to adjust spacing, if necessary */
|
|
||||||
- sprintf(number, "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
|
|
||||||
+ snprintf(number, sizeof(number)-1, "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
|
|
||||||
len = XTextWidth(roman_font, number, strlen(number));
|
|
||||||
while (skipx < (len + 5)/zoomscale) {
|
|
||||||
skip *= 2;
|
|
||||||
@@ -1197,11 +1197,11 @@ void reset_topruler(void)
|
|
||||||
/* string */
|
|
||||||
if (i % skipx == 0) {
|
|
||||||
if ((i/10) % tickmod == 0)
|
|
||||||
- sprintf(number, "%d%s", i/tickmod, cur_fig_units);
|
|
||||||
+ snprintf(number, sizeof(number)-1, "%d%s", i/tickmod, cur_fig_units);
|
|
||||||
else if (i % tickmod == 0)
|
|
||||||
- sprintf(number, "%d", i/tickmod);
|
|
||||||
+ snprintf(number, sizeof(number)-1, "%d", i/tickmod);
|
|
||||||
else
|
|
||||||
- sprintf(number, precstr, (float)(1.0 * i / tickmod));
|
|
||||||
+ snprintf(number, sizeof(number)-1, precstr, (float)(1.0 * i / tickmod));
|
|
||||||
/* get length of string to position it */
|
|
||||||
len = XTextWidth(roman_font, number, strlen(number));
|
|
||||||
/* we center on the number only, letting the minus sign hang out */
|
|
||||||
@@ -1425,7 +1425,7 @@ void reset_sideruler(void)
|
|
||||||
register int i,k;
|
|
||||||
register tick_info* tk;
|
|
||||||
register Pixmap p = sideruler_pm;
|
|
||||||
- char number[6],len;
|
|
||||||
+ char number[60],len;
|
|
||||||
int Y0;
|
|
||||||
int tickmod, tickskip;
|
|
||||||
|
|
||||||
@@ -1456,11 +1456,11 @@ void reset_sideruler(void)
|
|
||||||
/* string */
|
|
||||||
if (i % skipx == 0) {
|
|
||||||
if ((i/10) % tickmod == 0)
|
|
||||||
- sprintf(number, "%d%s", i/tickmod, cur_fig_units);
|
|
||||||
+ snprintf(number, sizeof(number)-1, "%d%s", i/tickmod, cur_fig_units);
|
|
||||||
else if (i % tickmod == 0)
|
|
||||||
- sprintf(number, "%d", i/tickmod);
|
|
||||||
+ snprintf(number, sizeof(number)-1, "%d", i/tickmod);
|
|
||||||
else
|
|
||||||
- sprintf(number, precstr, (float)(1.0 * i / tickmod));
|
|
||||||
+ snprintf(number, sizeof(number)-1, precstr, (float)(1.0 * i / tickmod));
|
|
||||||
/* get length of string to position it */
|
|
||||||
len = XTextWidth(roman_font, number, strlen(number));
|
|
||||||
/* vertically centered on inch/cm mark */
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
Index: xfig.3.2.5/w_rulers.c
|
|
||||||
===================================================================
|
|
||||||
--- w_rulers.c
|
|
||||||
+++ w_rulers.c 2009-03-06 11:23:08.000000000 +0200
|
|
||||||
@@ -1149,7 +1149,7 @@ get_skip_prec(void)
|
|
||||||
/* look for values for current zoom */
|
|
||||||
if ((display_zoomscale/appres.userscale <= rs->max_zoom) ||
|
|
||||||
(rs->max_zoom == 0.0)) {
|
|
||||||
- skip = rs->skipt/appres.userscale;
|
|
||||||
+ skip = rs->skipt>appres.userscale ? rs->skipt/appres.userscale : 1;
|
|
||||||
skipx = skip * rs->skipx;
|
|
||||||
sprintf(precstr, "%%.%df", rs->prec);
|
|
||||||
break;
|
|
||||||
287
xfig.3.2.5.dif
287
xfig.3.2.5.dif
@ -1,287 +0,0 @@
|
|||||||
--- Fig-color.ad
|
|
||||||
+++ Fig-color.ad 2006-07-31 17:56:25.000000000 +0200
|
|
||||||
@@ -79,6 +79,12 @@ Fig*MenuButton*background: gray83
|
|
||||||
! in the color editor popup
|
|
||||||
Fig*mixedEdit.background: gray83
|
|
||||||
|
|
||||||
+Fig*mode_panel.background: gray67
|
|
||||||
+Fig*mode_panel*topShadow:: white
|
|
||||||
+Fig*mode_panel*bottomShadow: gray17
|
|
||||||
+Fig*mode_panel*topShadowPixel: white
|
|
||||||
+Fig*mode_panel*bottomShadowPixel: gray17
|
|
||||||
+
|
|
||||||
Fig*cancel.background: gray88
|
|
||||||
Fig*dismiss.background: gray88
|
|
||||||
Fig*commands*background: gray88
|
|
||||||
@@ -88,12 +94,35 @@ Fig*horizontal.background: gray88
|
|
||||||
|
|
||||||
Fig*topruler.background: gray95
|
|
||||||
Fig*sideruler.background: gray95
|
|
||||||
+Fig*topruler.foreground: black
|
|
||||||
+Fig*sideruler.foreground: black
|
|
||||||
|
|
||||||
! file panel and scrollbar
|
|
||||||
|
|
||||||
Fig*FigList*background: gray95
|
|
||||||
Fig*List*background: gray95
|
|
||||||
-Fig*Scrollbar.background: gray95
|
|
||||||
+Fig*Scrollbar.background: gray77
|
|
||||||
+Fig*Scrollbar.foreground: gray37
|
|
||||||
+Fig*ScrollbarBackground: gray67
|
|
||||||
+Fig*ScrollbarForeground: gray37
|
|
||||||
+
|
|
||||||
+Fig*horizontal.shadowWidth: 2
|
|
||||||
+Fig*horizontal.topShadowPixel: gray95
|
|
||||||
+Fig*horizontal.bottomShadowPixel: gray37
|
|
||||||
+Fig*horizontal.topShadow: gray95
|
|
||||||
+Fig*horizontal.bottomShadow: gray37
|
|
||||||
+
|
|
||||||
+Fig*Scrollbar.shadowWidth: 2
|
|
||||||
+Fig*Scrollbar.topShadow: gray95
|
|
||||||
+Fig*Scrollbar.bottomShadow: gray37
|
|
||||||
+Fig*Scrollbar.topShadowPixel: gray95
|
|
||||||
+Fig*Scrollbar.bottomShadowPixel: gray37
|
|
||||||
+
|
|
||||||
+Fig*stdColor.shadowWidth: 2
|
|
||||||
+Fig*stdColor.topShadow: gray95
|
|
||||||
+Fig*stdColor.bottomShadow: gray37
|
|
||||||
+Fig*stdColor.topShadowPixel: gray95
|
|
||||||
+Fig*stdColor.bottomShadowPixel: gray37
|
|
||||||
|
|
||||||
Fig*Label.background: gray80
|
|
||||||
Fig*ind_box.background: gray80
|
|
||||||
--- Fig.ad
|
|
||||||
+++ Fig.ad 2006-07-31 17:56:25.000000000 +0200
|
|
||||||
@@ -10,6 +10,8 @@ Fig.version: 3.2.5-alpha6
|
|
||||||
|
|
||||||
Fig*AllowShellResize: false
|
|
||||||
|
|
||||||
+Fig.inches: false
|
|
||||||
+
|
|
||||||
! Image editor - can edit imported image
|
|
||||||
Fig.image_editor: xv
|
|
||||||
|
|
||||||
@@ -20,7 +22,7 @@ Fig.ghostscript: gs
|
|
||||||
! This is for viewing the xfig html reference.
|
|
||||||
! For netscape, this command will open the help pages in a running netscape,
|
|
||||||
! or start a new netscape if one isn't already running
|
|
||||||
-Fig.browser: netscape -remote 'openFile(%f)' || netscape %f
|
|
||||||
+Fig.browser: /usr/X11R6/lib/X11/xfig/browser %f
|
|
||||||
|
|
||||||
! pdfviewer - put your favorite pdf viewer here.
|
|
||||||
! This is for viewing the xfig how-to guide and man pages
|
|
||||||
@@ -110,60 +112,62 @@ Fig.internalborderwidth: 1
|
|
||||||
! I include both for compatibility. Be sure to change both values when
|
|
||||||
! modifying them.
|
|
||||||
|
|
||||||
- Fig*horizontal.shadowWidth: 0
|
|
||||||
- Fig*horizontal.topShadowPixel: black
|
|
||||||
- Fig*horizontal.bottomShadowPixel: white
|
|
||||||
- Fig*horizontal.topShadow: black
|
|
||||||
- Fig*horizontal.bottomShadow: white
|
|
||||||
+Fig*horizontal.shadowWidth: 0
|
|
||||||
+Fig*horizontal.topShadowPixel: black
|
|
||||||
+Fig*horizontal.bottomShadowPixel: white
|
|
||||||
+Fig*horizontal.topShadow: black
|
|
||||||
+Fig*horizontal.bottomShadow: white
|
|
||||||
|
|
||||||
! the following is done so the widget set doesn't try to make shades of
|
|
||||||
! the scrollbar shadows (even though the width is 0 it takes more colors)
|
|
||||||
- Fig*Scrollbar.shadowWidth: 0
|
|
||||||
- Fig*Scrollbar.topShadow: black
|
|
||||||
- Fig*Scrollbar.bottomShadow: white
|
|
||||||
- Fig*Scrollbar.topShadowPixel: black
|
|
||||||
- Fig*Scrollbar.bottomShadowPixel: white
|
|
||||||
+
|
|
||||||
+Fig*Scrollbar.shadowWidth: 0
|
|
||||||
+Fig*Scrollbar.topShadow: black
|
|
||||||
+Fig*Scrollbar.bottomShadow: white
|
|
||||||
+Fig*Scrollbar.topShadowPixel: black
|
|
||||||
+Fig*Scrollbar.bottomShadowPixel: white
|
|
||||||
|
|
||||||
! this is for the standard color buttons in the color panel
|
|
||||||
- Fig*stdColor.shadowWidth: 2
|
|
||||||
- Fig*stdColor.topShadow: black
|
|
||||||
- Fig*stdColor.bottomShadow: white
|
|
||||||
- Fig*stdColor.topShadowPixel: black
|
|
||||||
- Fig*stdColor.bottomShadowPixel: white
|
|
||||||
+
|
|
||||||
+Fig*stdColor.shadowWidth: 2
|
|
||||||
+Fig*stdColor.topShadow: black
|
|
||||||
+Fig*stdColor.bottomShadow: white
|
|
||||||
+Fig*stdColor.topShadowPixel: black
|
|
||||||
+Fig*stdColor.bottomShadowPixel: white
|
|
||||||
|
|
||||||
! turn off any shadows for the user color cells
|
|
||||||
- Fig*colorMemory.shadowWidth: 0
|
|
||||||
+Fig*colorMemory.shadowWidth: 0
|
|
||||||
|
|
||||||
! You may need or want to adjust the highlight thickness for the mode
|
|
||||||
! and indicator panels depending on the results. If it is too thick
|
|
||||||
! it will erase part of the button graphics.
|
|
||||||
- Fig*mode_panel*highlightThickness: 1
|
|
||||||
- Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
|
|
||||||
+Fig*mode_panel*highlightThickness: 1
|
|
||||||
+Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
|
|
||||||
! Same for the popup panels from the indicator panel
|
|
||||||
- Fig*set_indicator_panel*Command.highlightThickness: 1
|
|
||||||
+Fig*set_indicator_panel*Command.highlightThickness: 1
|
|
||||||
|
|
||||||
! If you use the 3D Athena widget set and the small icons for the mode panel
|
|
||||||
! (because you have a small screen; see Imakefile) you may want to reduce
|
|
||||||
! the shadow width to 1 or 0. Uncomment the following in that case:
|
|
||||||
-! Fig*mode_panel*shadowWidth: 1
|
|
||||||
+Fig*mode_panel*shadowWidth: 1
|
|
||||||
|
|
||||||
! The following is for the update marker in the upper-right corner of the
|
|
||||||
! indicator buttons. You may not want any highlight thickness because
|
|
||||||
! the boxes are so small.
|
|
||||||
- Fig*ind_panel.ind_box.button_form.update.highlightThickness: 0
|
|
||||||
+Fig*ind_panel.ind_box.button_form.update.highlightThickness: 1
|
|
||||||
|
|
||||||
! This sets the shadows for the spinner arrows
|
|
||||||
- Fig*spinup.shadowWidth: 2
|
|
||||||
- Fig*spindown.shadowWidth: 2
|
|
||||||
+Fig*spinup.shadowWidth: 0
|
|
||||||
+Fig*spindown.shadowWidth: 0
|
|
||||||
|
|
||||||
! This gets rid of that funny black line that sometimes borders the canvas
|
|
||||||
|
|
||||||
- Fig*canvas.shadowWidth: 0
|
|
||||||
+Fig*canvas.shadowWidth: 0
|
|
||||||
|
|
||||||
!if on monochrome server, or no Fig-color app-defaults file
|
|
||||||
! This background resource shows between the buttons like a border
|
|
||||||
- Fig*mode_panel.background: black
|
|
||||||
- Fig*mode_panel.foreground: black
|
|
||||||
+Fig*mode_panel.background: black
|
|
||||||
+Fig*mode_panel.foreground: black
|
|
||||||
|
|
||||||
! Specify a private Compose key database file. If this resource contains a "/"
|
|
||||||
! then the wired-in name of the xfig global directory won't be prefixed to it.
|
|
||||||
--- Imakefile
|
|
||||||
+++ Imakefile 2007-05-07 16:44:13.756022210 +0200
|
|
||||||
@@ -55,11 +55,11 @@ XCOMM the 3d Athena Widget Set (highly r
|
|
||||||
XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
|
|
||||||
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
|
|
||||||
|
|
||||||
-XCOMM #define XAW3D1_5E
|
|
||||||
+#define XAW3D1_5E
|
|
||||||
|
|
||||||
#ifdef XAW3D1_5E
|
|
||||||
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
|
|
||||||
- XAWLIB = -lXaw3d15e
|
|
||||||
+ XAWLIB = -lXaw3d
|
|
||||||
#else
|
|
||||||
XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
|
|
||||||
XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
|
|
||||||
@@ -73,7 +73,7 @@ XCOMM Redefine the following if your PNG
|
|
||||||
XCOMM are in different places
|
|
||||||
|
|
||||||
PNGLIBDIR = $(USRLIBDIR)
|
|
||||||
-PNGINC = -I/usr/local/include
|
|
||||||
+PNGINC = -I/usr/include
|
|
||||||
ZLIBDIR = $(USRLIBDIR)
|
|
||||||
|
|
||||||
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
|
|
||||||
@@ -93,8 +93,8 @@ XCOMM You must have version 5b or newer
|
|
||||||
|
|
||||||
#ifdef USEJPEG
|
|
||||||
#ifdef USEINSTALLEDJPEG
|
|
||||||
-JPEGLIBDIR = /usr/local/lib
|
|
||||||
-JPEGINC = -I/usr/include/X11
|
|
||||||
+JPEGLIBDIR = /usr/lib
|
|
||||||
+JPEGINC = -I/usr/include
|
|
||||||
#else
|
|
||||||
JPEGLIBDIR = ../jpeg
|
|
||||||
JPEGINC = -I$(JPEGLIBDIR)
|
|
||||||
@@ -116,8 +116,8 @@ XCOMM Change XPMINC if necessary to poin
|
|
||||||
#define USEXPM_ICON
|
|
||||||
|
|
||||||
#ifdef USEXPM
|
|
||||||
-XPMLIBDIR = /usr/local/lib
|
|
||||||
-XPMINC = -I/usr/local/include/X11
|
|
||||||
+XPMLIBDIR = $(USRLIBDIR)
|
|
||||||
+XPMINC = -I$(USRLIBDIR)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
XCOMM Uncomment the following definiton if you want to use the small icons
|
|
||||||
@@ -158,7 +158,7 @@ XCOMM uncomment the following line if yo
|
|
||||||
XCOMM inline functions. With the "INLINE" keyword, you should notice that
|
|
||||||
XCOMM the display will be a bit faster in complex figures
|
|
||||||
|
|
||||||
-XCOMM USEINLINE = -DUSE_INLINE
|
|
||||||
+USEINLINE = -DUSE_INLINE
|
|
||||||
|
|
||||||
XCOMM use (and change) the following if you want the multi-key data base file
|
|
||||||
XCOMM somewhere other than the standard X11 library directory
|
|
||||||
@@ -166,16 +166,18 @@ XCOMM be sure to comment out the second
|
|
||||||
XCOMM XFIGLIBDIR = $(LIBDIR)
|
|
||||||
|
|
||||||
XCOMM use this if you want the multi-key data base file in the standard X11 tree
|
|
||||||
-XFIGLIBDIR = $(LIBDIR)/xfig
|
|
||||||
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
|
|
||||||
+XFIGLIBDIR = _DATA/xfig
|
|
||||||
|
|
||||||
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
|
|
||||||
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
|
|
||||||
-XFIGDOCDIR = /usr/local/xfig/doc
|
|
||||||
+XCOMM XFIGDOCDIR = /usr/local/xfig/doc
|
|
||||||
+XFIGDOCDIR = /usr/share/doc/packages/xfig
|
|
||||||
|
|
||||||
XCOMM MANDIR tells where the standard man pages should go (no need to change it
|
|
||||||
XCOMM if you want the man pages installed in the standard place on your system
|
|
||||||
XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
|
|
||||||
-MANDIR = /usr/local/xfig/man
|
|
||||||
+MANDIR = /usr/share/man/man1
|
|
||||||
|
|
||||||
XCOMM If your system doesn't have strstr undefine the following definition
|
|
||||||
XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
|
|
||||||
@@ -205,7 +207,7 @@ XCOMM instead.
|
|
||||||
XCOMM Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
|
|
||||||
XCOMM A cache size of zero turns caching off.
|
|
||||||
|
|
||||||
-CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
|
|
||||||
+CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
|
|
||||||
|
|
||||||
XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
|
|
||||||
XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
|
|
||||||
@@ -219,6 +221,7 @@ XCOMM number of vertices.
|
|
||||||
XCOMM If you want a compiler other than "cc", define it here
|
|
||||||
|
|
||||||
XCOMM CC = /opt/SUNWspro/bin/cc
|
|
||||||
+CC = gcc
|
|
||||||
|
|
||||||
XCOMM *****************************************************
|
|
||||||
XCOMM *****************************************************
|
|
||||||
@@ -241,7 +244,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
|
|
||||||
#endif /* USEJPEG */
|
|
||||||
|
|
||||||
#ifdef I18N
|
|
||||||
-I18N_DEFS = -DI18N -DSETLOCALE
|
|
||||||
+I18N_DEFS = -DI18N
|
|
||||||
I18N_SRC = w_i18n.c
|
|
||||||
I18N_OBJ = w_i18n.o
|
|
||||||
#endif
|
|
||||||
--- fig.h
|
|
||||||
+++ fig.h 2006-07-31 17:56:25.000000000 +0200
|
|
||||||
@@ -29,6 +29,7 @@ extern char *my_strdup(char *str);
|
|
||||||
#endif
|
|
||||||
#include <sys/types.h> /* for stat structure */
|
|
||||||
#endif
|
|
||||||
+#include <sys/param.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#if defined(__convex__) && defined(__STDC__)
|
|
||||||
--- w_menuentry.c
|
|
||||||
+++ w_menuentry.c 2006-07-31 17:56:25.000000000 +0200
|
|
||||||
@@ -169,7 +169,8 @@ Redisplay(Widget w, XEvent *event, Regio
|
|
||||||
gc = entry->sme_bsb.norm_gray_gc;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (entry->sme_bsb.label != NULL) {
|
|
||||||
+/* if (entry->sme_bsb.label != NULL) { */
|
|
||||||
+ if (entry->sme_bsb.label == XtName((Widget)(entry))) {
|
|
||||||
int x_loc = entry->sme_bsb.left_margin;
|
|
||||||
int len = strlen(entry->sme_bsb.label);
|
|
||||||
char * label = entry->sme_bsb.label;
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:86b0c277a1d37039da3f37668caf988214ffc70990e8a900761df709a5ffcf09
|
|
||||||
size 5349446
|
|
||||||
55
xfig.3.2.5b-fixes.dif
Normal file
55
xfig.3.2.5b-fixes.dif
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
--- w_layers.c
|
||||||
|
+++ w_layers.c 2009-12-14 12:37:11.335429185 +0000
|
||||||
|
@@ -118,9 +118,27 @@ init_depth_panel(Widget parent)
|
||||||
|
{
|
||||||
|
Widget label, below;
|
||||||
|
Widget layer_viewform;
|
||||||
|
+ Dimension ind_ht = 0, snap_ht = 0, mouse_ht;
|
||||||
|
|
||||||
|
- /* MOUSEFUN_HT and ind_panel height aren't known yet */
|
||||||
|
- LAYER_HT = TOPRULER_HT + CANVAS_HT;
|
||||||
|
+ if (XtIsManaged(ind_panel)) {
|
||||||
|
+ /* get height of indicator panel */
|
||||||
|
+ FirstArg(XtNheight, &ind_ht);
|
||||||
|
+ GetValues(ind_panel);
|
||||||
|
+ ind_ht += INTERNAL_BW*2;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (XtIsManaged(snap_indicator_panel)) {
|
||||||
|
+ /* get height of snap panel */
|
||||||
|
+ FirstArg(XtNheight, &snap_ht);
|
||||||
|
+ GetValues(snap_indicator_panel);
|
||||||
|
+ snap_ht += INTERNAL_BW*4;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* MOUSEFUN_HT height aren't known yet */
|
||||||
|
+ mouse_ht = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
|
||||||
|
+
|
||||||
|
+ /* now that the bitmaps have been created, put the checkmark in the proper toggle */
|
||||||
|
+ LAYER_HT = mouse_ht + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
|
||||||
|
|
||||||
|
/* main form to hold all the layer stuff */
|
||||||
|
|
||||||
|
@@ -367,11 +385,18 @@ void
|
||||||
|
setup_depth_panel(void)
|
||||||
|
{
|
||||||
|
Dimension ind_ht, snap_ht=0;
|
||||||
|
+
|
||||||
|
/* get height of indicator and snap panels */
|
||||||
|
- FirstArg(XtNheight, &ind_ht);
|
||||||
|
- GetValues(ind_panel);
|
||||||
|
- FirstArg(XtNheight, &snap_ht);
|
||||||
|
- GetValues(snap_indicator_panel);
|
||||||
|
+ if (XtIsManaged(ind_panel)) {
|
||||||
|
+ FirstArg(XtNheight, &ind_ht);
|
||||||
|
+ GetValues(ind_panel);
|
||||||
|
+ ind_ht += INTERNAL_BW*2;
|
||||||
|
+ }
|
||||||
|
+ if (XtIsManaged(snap_indicator_panel)) {
|
||||||
|
+ FirstArg(XtNheight, &snap_ht);
|
||||||
|
+ GetValues(snap_indicator_panel);
|
||||||
|
+ snap_ht += INTERNAL_BW*4;
|
||||||
|
+ }
|
||||||
|
LAYER_HT = MOUSEFUN_HT + TOPRULER_HT + CANVAS_HT + ind_ht - snap_ht + INTERNAL_BW*4;
|
||||||
|
|
||||||
|
/* now that the bitmaps have been created, put the checkmark in the proper toggle */
|
||||||
@ -14,8 +14,8 @@
|
|||||||
+#include <langinfo.h>
|
+#include <langinfo.h>
|
||||||
#endif /* I18N */
|
#endif /* I18N */
|
||||||
|
|
||||||
/* EXPORTS */
|
#include <X11/IntrinsicP.h>
|
||||||
@@ -765,11 +767,6 @@ void main(int argc, char **argv)
|
@@ -771,11 +773,6 @@ void main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,7 +27,7 @@
|
|||||||
/*
|
/*
|
||||||
* save the command line arguments
|
* save the command line arguments
|
||||||
*/
|
*/
|
||||||
@@ -860,6 +857,10 @@ void main(int argc, char **argv)
|
@@ -866,6 +863,10 @@ void main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef I18N
|
#ifdef I18N
|
||||||
@ -38,7 +38,7 @@
|
|||||||
/************************************************************/
|
/************************************************************/
|
||||||
/* if the international option has been set, set the locale */
|
/* if the international option has been set, set the locale */
|
||||||
/************************************************************/
|
/************************************************************/
|
||||||
@@ -1581,6 +1582,11 @@ setup_visual(int *argc_p, char **argv, A
|
@@ -1587,6 +1588,11 @@ setup_visual(int *argc_p, char **argv, A
|
||||||
*/
|
*/
|
||||||
tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
|
tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
|
||||||
(String *) NULL, args, 0);
|
(String *) NULL, args, 0);
|
||||||
43
xfig.3.2.5b-null.dif
Normal file
43
xfig.3.2.5b-null.dif
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
--- w_dir.c
|
||||||
|
+++ w_dir.c 2004-03-22 12:17:21.000000000 +0000
|
||||||
|
@@ -126,6 +126,8 @@
|
||||||
|
{
|
||||||
|
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
||||||
|
|
||||||
|
+ if (!ret_struct)
|
||||||
|
+ return;
|
||||||
|
strcpy(CurrentSelectionName, ret_struct->string);
|
||||||
|
FirstArg(XtNstring, CurrentSelectionName);
|
||||||
|
if (browse_up) {
|
||||||
|
@@ -160,6 +162,8 @@
|
||||||
|
{
|
||||||
|
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
||||||
|
|
||||||
|
+ if (!ret_struct)
|
||||||
|
+ return;
|
||||||
|
strcpy(CurrentSelectionName, ret_struct->string);
|
||||||
|
DoChangeDir(CurrentSelectionName);
|
||||||
|
}
|
||||||
|
--- w_library.c
|
||||||
|
+++ w_library.c 2004-03-22 12:19:10.000000000 +0000
|
||||||
|
@@ -461,6 +461,8 @@
|
||||||
|
int new_obj;
|
||||||
|
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
||||||
|
|
||||||
|
+ if (!ret_struct)
|
||||||
|
+ return;
|
||||||
|
new_obj = ret_struct->list_index;
|
||||||
|
if (icons_made) {
|
||||||
|
/* unhighlight the current view icon */
|
||||||
|
--- w_srchrepl.c
|
||||||
|
+++ w_srchrepl.c 2004-03-22 12:20:38.000000000 +0000
|
||||||
|
@@ -883,6 +883,9 @@ spell_select_word(Widget widget, XtPoint
|
||||||
|
{
|
||||||
|
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
|
||||||
|
|
||||||
|
+ if (!ret_struct)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
/* make correct button and correction entry sensitive */
|
||||||
|
XtSetSensitive(correct_button, True);
|
||||||
|
XtSetSensitive(correct_word, True);
|
||||||
@ -1,9 +1,9 @@
|
|||||||
--- u_print.c
|
--- u_print.c
|
||||||
+++ u_print.c 2008-04-25 18:15:33.810809242 +0200
|
+++ u_print.c 2009-12-14 12:01:21.031429470 +0000
|
||||||
@@ -351,8 +351,10 @@ int print_to_file(char *file, char *lang
|
@@ -354,8 +354,10 @@ int print_to_file(char *file, char *lang
|
||||||
strcat(prcmd, tmpcmd);
|
strcat(prcmd, tmpcmd);
|
||||||
} else if (!strcmp(lang,"pspdftex")) {
|
} else if (!strcmp(lang,"pspdftex")) {
|
||||||
/* first generate postscript then PDF. */
|
/* first generate pstex postscript then pdftex PDF. */
|
||||||
- sprintf(tmpcmd, "-n %s", outfile);
|
- sprintf(tmpcmd, "-n %s", outfile);
|
||||||
+ sprintf(tmpcmd, "-b %d -n %s", border, outfile);
|
+ sprintf(tmpcmd, "-b %d -n %s", border, outfile);
|
||||||
strcat(prcmd, tmpcmd);
|
strcat(prcmd, tmpcmd);
|
||||||
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
if (backgrnd[0]) {
|
if (backgrnd[0]) {
|
||||||
strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */
|
strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */
|
||||||
@@ -366,13 +368,13 @@ int print_to_file(char *file, char *lang
|
@@ -369,13 +371,13 @@ int print_to_file(char *file, char *lang
|
||||||
strcat(prcmd,tmp_name);
|
strcat(prcmd,tmp_name);
|
||||||
|
|
||||||
/* make it suitable for pstex. */
|
/* make it suitable for pstex. */
|
||||||
@ -23,14 +23,14 @@
|
|||||||
+ (void) exec_prcmd(tmpcmd, "EXPORT of EPS part");
|
+ (void) exec_prcmd(tmpcmd, "EXPORT of EPS part");
|
||||||
|
|
||||||
/* make it suitable for pdftex. */
|
/* make it suitable for pdftex. */
|
||||||
- strsub(prcmd,"eps","pdf",tmpcmd,0);
|
- strsub(prcmd,"ps","pdf",tmpcmd,0);
|
||||||
- strsub(tmpcmd,"pspdftex","pdftex",prcmd,0);
|
- strsub(tmpcmd,"pspdftex","pdftex",prcmd,0);
|
||||||
+ strsub(prcmd,"pstex","pdftex",tmpcmd,0);
|
+ strsub(prcmd,"pstex","pdf",tmpcmd,0);
|
||||||
+ strsub(tmpcmd,"eps","pdftex",prcmd,0);
|
+ strsub(tmpcmd,"eps","pdftex",prcmd,0);
|
||||||
strcat(prcmd,".pdf");
|
strcat(prcmd,".pdf");
|
||||||
(void) exec_prcmd(prcmd, "EXPORT of PDF part");
|
(void) exec_prcmd(prcmd, "EXPORT of PDF part");
|
||||||
|
|
||||||
@@ -380,12 +382,13 @@ int print_to_file(char *file, char *lang
|
@@ -383,12 +385,13 @@ int print_to_file(char *file, char *lang
|
||||||
#ifdef I18N
|
#ifdef I18N
|
||||||
/* set the numeric locale to C so we get decimal points for numbers */
|
/* set the numeric locale to C so we get decimal points for numbers */
|
||||||
setlocale(LC_NUMERIC, "C");
|
setlocale(LC_NUMERIC, "C");
|
||||||
@ -48,7 +48,7 @@
|
|||||||
#ifdef I18N
|
#ifdef I18N
|
||||||
/* reset to original locale */
|
/* reset to original locale */
|
||||||
setlocale(LC_NUMERIC, "");
|
setlocale(LC_NUMERIC, "");
|
||||||
@@ -727,7 +730,7 @@ void build_layer_list(char *layers)
|
@@ -742,7 +745,7 @@ void build_layer_list(char *layers)
|
||||||
{
|
{
|
||||||
char list[PATH_MAX], notlist[PATH_MAX], num[10];
|
char list[PATH_MAX], notlist[PATH_MAX], num[10];
|
||||||
int layer, len, notlen;
|
int layer, len, notlen;
|
||||||
195
xfig.3.2.5b.dif
Normal file
195
xfig.3.2.5b.dif
Normal file
@ -0,0 +1,195 @@
|
|||||||
|
--- Fig.ad
|
||||||
|
+++ Fig.ad 2009-12-14 11:42:24.307429001 +0000
|
||||||
|
@@ -15,6 +15,8 @@ Fig.version: 3.2.5b
|
||||||
|
|
||||||
|
Fig*AllowShellResize: false
|
||||||
|
|
||||||
|
+Fig.inches: false
|
||||||
|
+
|
||||||
|
! Image editor - can edit imported image
|
||||||
|
Fig.image_editor: xv
|
||||||
|
|
||||||
|
@@ -25,7 +27,7 @@ Fig.ghostscript: gs
|
||||||
|
! This is for viewing the xfig html reference.
|
||||||
|
! For firefox, this command will open the help pages in a running firefox,
|
||||||
|
! or start a new netscape if one isn't already running
|
||||||
|
-Fig.browser: firefox -remote 'openFile(%f)' || firefox %f
|
||||||
|
+Fig.browser: /usr/X11R6/lib/X11/xfig/browser %f
|
||||||
|
|
||||||
|
! pdfviewer - put your favorite pdf viewer here.
|
||||||
|
! This is for viewing the xfig how-to guide and man pages
|
||||||
|
@@ -643,6 +645,12 @@ Fig*MenuButton*background: gray83
|
||||||
|
! in the color editor popup
|
||||||
|
Fig*mixedEdit.background: gray83
|
||||||
|
|
||||||
|
+Fig*mode_panel.background: gray67
|
||||||
|
+Fig*mode_panel*topShadow:: white
|
||||||
|
+Fig*mode_panel*bottomShadow: gray17
|
||||||
|
+Fig*mode_panel*topShadowPixel: white
|
||||||
|
+Fig*mode_panel*bottomShadowPixel: gray17
|
||||||
|
+
|
||||||
|
Fig*cancel.background: gray88
|
||||||
|
Fig*dismiss.background: gray88
|
||||||
|
Fig*commands*background: gray88
|
||||||
|
@@ -650,14 +658,36 @@ Fig*horizontal.background: gray88
|
||||||
|
|
||||||
|
! ruler colors
|
||||||
|
|
||||||
|
-Fig*topruler.background: gray95
|
||||||
|
-Fig*sideruler.background: gray95
|
||||||
|
+Fig*topruler.background: gray95
|
||||||
|
+Fig*sideruler.background: gray95
|
||||||
|
|
||||||
|
! file panel and scrollbar
|
||||||
|
|
||||||
|
Fig*FigList*background: gray95
|
||||||
|
Fig*List*background: gray95
|
||||||
|
-Fig*Scrollbar.background: gray80
|
||||||
|
+Fig*Scrollbar.background: gray77
|
||||||
|
+
|
||||||
|
+Fig*Scrollbar.foreground: gray37
|
||||||
|
+Fig*ScrollbarBackground: gray67
|
||||||
|
+Fig*ScrollbarForeground: gray37
|
||||||
|
+
|
||||||
|
+Fig*horizontal.shadowWidth: 2
|
||||||
|
+Fig*horizontal.topShadowPixel: gray95
|
||||||
|
+Fig*horizontal.bottomShadowPixel: gray37
|
||||||
|
+Fig*horizontal.topShadow: gray95
|
||||||
|
+Fig*horizontal.bottomShadow: gray37
|
||||||
|
+
|
||||||
|
+Fig*Scrollbar.shadowWidth: 2
|
||||||
|
+Fig*Scrollbar.topShadow: gray95
|
||||||
|
+Fig*Scrollbar.bottomShadow: gray37
|
||||||
|
+Fig*Scrollbar.topShadowPixel: gray95
|
||||||
|
+Fig*Scrollbar.bottomShadowPixel: gray37
|
||||||
|
+
|
||||||
|
+Fig*stdColor.shadowWidth: 2
|
||||||
|
+Fig*stdColor.topShadow: gray95
|
||||||
|
+Fig*stdColor.bottomShadow: gray37
|
||||||
|
+Fig*stdColor.topShadowPixel: gray95
|
||||||
|
+Fig*stdColor.bottomShadowPixel: gray37
|
||||||
|
|
||||||
|
Fig*Label.background: gray80
|
||||||
|
Fig*ind_box.background: gray80
|
||||||
|
--- Imakefile
|
||||||
|
+++ Imakefile 2009-12-14 11:46:44.459929609 +0000
|
||||||
|
@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav
|
||||||
|
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
|
||||||
|
XCOMM NOTE: This is the default for many X systems now.
|
||||||
|
|
||||||
|
-XCOMM #define XAW3D1_5E
|
||||||
|
+#define XAW3D1_5E
|
||||||
|
|
||||||
|
#ifdef XAW3D1_5E
|
||||||
|
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
|
||||||
|
@@ -76,7 +76,7 @@ XCOMM Redefine the following if your PNG
|
||||||
|
XCOMM are in different places
|
||||||
|
|
||||||
|
PNGLIBDIR = $(USRLIBDIR)
|
||||||
|
-PNGINC = -I/usr/local/include
|
||||||
|
+PNGINC = -I/usr/include
|
||||||
|
ZLIBDIR = $(USRLIBDIR)
|
||||||
|
|
||||||
|
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
|
||||||
|
@@ -96,8 +96,8 @@ XCOMM You must have version 5b or newer
|
||||||
|
|
||||||
|
#ifdef USEJPEG
|
||||||
|
#ifdef USEINSTALLEDJPEG
|
||||||
|
- JPEGLIBDIR = /usr/local/lib
|
||||||
|
- JPEGINC = -I/usr/include/X11
|
||||||
|
+ JPEGLIBDIR = /usr/lib
|
||||||
|
+ JPEGINC = -I/usr/include
|
||||||
|
#else
|
||||||
|
JPEGLIBDIR = ../jpeg
|
||||||
|
JPEGINC = -I$(JPEGLIBDIR)
|
||||||
|
@@ -119,8 +119,8 @@ XCOMM Change XPMINC if necessary to poin
|
||||||
|
#define USEXPM_ICON
|
||||||
|
|
||||||
|
#ifdef USEXPM
|
||||||
|
-XPMLIBDIR = /usr/local/lib
|
||||||
|
-XPMINC = -I/usr/local/include/X11
|
||||||
|
+XPMLIBDIR = $(USRLIBDIR)
|
||||||
|
+XPMINC = -I$(USRLIBDIR)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
XCOMM Uncomment the following definiton if you want to use the small icons
|
||||||
|
@@ -161,7 +161,7 @@ XCOMM uncomment the following line if yo
|
||||||
|
XCOMM inline functions. With the "INLINE" keyword, you should notice that
|
||||||
|
XCOMM the display will be a bit faster in complex figures
|
||||||
|
|
||||||
|
-XCOMM USEINLINE = -DUSE_INLINE
|
||||||
|
+USEINLINE = -DUSE_INLINE
|
||||||
|
|
||||||
|
XCOMM use (and change) the following if you want the multi-key data base file
|
||||||
|
XCOMM somewhere other than the standard X11 library directory
|
||||||
|
@@ -169,16 +169,19 @@ XCOMM be sure to comment out the second
|
||||||
|
XCOMM XFIGLIBDIR = $(LIBDIR)
|
||||||
|
|
||||||
|
XCOMM use this if you want the multi-key data base file in the standard X11 tree
|
||||||
|
-XFIGLIBDIR = $(LIBDIR)/xfig
|
||||||
|
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
|
||||||
|
+XFIGLIBDIR = _DATA/xfig
|
||||||
|
|
||||||
|
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
|
||||||
|
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
|
||||||
|
-XFIGDOCDIR = /usr/local/xfig/doc
|
||||||
|
+XCOMM XFIGDOCDIR = /usr/local/xfig/doc
|
||||||
|
+XFIGDOCDIR = /usr/share/doc/packages/xfig
|
||||||
|
|
||||||
|
XCOMM MANDIR tells where the standard man pages should go (no need to change it
|
||||||
|
XCOMM if you want the man pages installed in the standard place on your system
|
||||||
|
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
|
||||||
|
+XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
|
||||||
|
XCOMM MANDIR = /usr/local/xfig/man
|
||||||
|
+MANDIR = /usr/share/man/man1
|
||||||
|
|
||||||
|
XCOMM If your system doesn't have strstr undefine the following definition
|
||||||
|
XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
|
||||||
|
@@ -208,7 +211,7 @@ XCOMM instead.
|
||||||
|
XCOMM Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
|
||||||
|
XCOMM A cache size of zero turns caching off.
|
||||||
|
|
||||||
|
-CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
|
||||||
|
+CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
|
||||||
|
|
||||||
|
XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
|
||||||
|
XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
|
||||||
|
@@ -222,6 +225,7 @@ XCOMM number of vertices.
|
||||||
|
XCOMM If you want a compiler other than "cc", define it here
|
||||||
|
|
||||||
|
XCOMM CC = /opt/SUNWspro/bin/cc
|
||||||
|
+CC = gcc
|
||||||
|
|
||||||
|
XCOMM Shorten unnecessary dependencies:
|
||||||
|
XCOMM #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
|
||||||
|
@@ -251,7 +255,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
|
||||||
|
#endif /* USEJPEG */
|
||||||
|
|
||||||
|
#ifdef I18N
|
||||||
|
-I18N_DEFS = -DI18N -DSETLOCALE
|
||||||
|
+I18N_DEFS = -DI18N
|
||||||
|
I18N_SRC = w_i18n.c
|
||||||
|
I18N_OBJ = w_i18n.o
|
||||||
|
#endif
|
||||||
|
--- fig.h
|
||||||
|
+++ fig.h 2006-07-31 15:56:25.000000000 +0000
|
||||||
|
@@ -29,6 +29,7 @@ extern char *my_strdup(char *str);
|
||||||
|
#endif
|
||||||
|
#include <sys/types.h> /* for stat structure */
|
||||||
|
#endif
|
||||||
|
+#include <sys/param.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
#if defined(__convex__) && defined(__STDC__)
|
||||||
|
--- w_menuentry.c
|
||||||
|
+++ w_menuentry.c 2006-07-31 15:56:25.000000000 +0000
|
||||||
|
@@ -169,7 +169,8 @@ Redisplay(Widget w, XEvent *event, Regio
|
||||||
|
gc = entry->sme_bsb.norm_gray_gc;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (entry->sme_bsb.label != NULL) {
|
||||||
|
+/* if (entry->sme_bsb.label != NULL) { */
|
||||||
|
+ if (entry->sme_bsb.label == XtName((Widget)(entry))) {
|
||||||
|
int x_loc = entry->sme_bsb.left_margin;
|
||||||
|
int len = strlen(entry->sme_bsb.label);
|
||||||
|
char * label = entry->sme_bsb.label;
|
||||||
3
xfig.3.2.5b.tar.bz2
Normal file
3
xfig.3.2.5b.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:16db346465543698ae0fe56f018c9b87690a330d149e1cb2868c248dd05ac7c9
|
||||||
|
size 5349266
|
||||||
70
xfig.changes
70
xfig.changes
@ -1,3 +1,73 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 14:08:05 CET 2009 - werner@suse.de
|
||||||
|
|
||||||
|
- Update to xfig 3.2.5b including various bug fixes (including the
|
||||||
|
bug fix for bnc#560351):
|
||||||
|
* Dimension line indicator incorrectly showed arrow length/width
|
||||||
|
* Several patches from Fedora xfig maintainer
|
||||||
|
* divide by 0 under certain circumstances in ruler code
|
||||||
|
From Libor Pechacek
|
||||||
|
* Segfault if PRINTER env variable was not defined
|
||||||
|
* Fig-color merged into Fig app-defaults file because almost no one knows about
|
||||||
|
the "*customization: -color" option to make X programs read the color def file.
|
||||||
|
* dimension line arrowhead width and length used %d instead of %f in
|
||||||
|
dialog, always displaying 0
|
||||||
|
* leftover debugging printf(...color = ) in startup
|
||||||
|
* finally fixed size of mode panel so it doesn't cover indicator panel
|
||||||
|
under certain circumstances
|
||||||
|
* removed "Alpha" from splash
|
||||||
|
* updated copyright date in Help/About
|
||||||
|
* problem with depth panel height due to snap mode indicator
|
||||||
|
* snap indicator indicated "Focus" when "Diameter" was selected
|
||||||
|
* w_keyboard.c had pointer assignment reversed
|
||||||
|
* extraneous "done" in Imakefile in "install.jhtml" section
|
||||||
|
From Eric Scott
|
||||||
|
* many protoytpe cleanups from Eric Scott
|
||||||
|
* #ifndef __FreeBSD__ added around #include from Eric Scott
|
||||||
|
* uses rint() instead of lrint() for those with non-C99 compilers
|
||||||
|
* Solaris doesn't have REG_NOERROR for regex, so have new #define for that
|
||||||
|
* added dependency on version.h and patchlevel.h for f_util.c and f_save.c to
|
||||||
|
Imakefile
|
||||||
|
* In imperial fractional scale mode, if the user scale factor wasn't 1.0, xfig
|
||||||
|
would switch to decimal mode. This has been fixed to remain in fractional mode.
|
||||||
|
* Added condition for GLIBC to not declare srandom(int)
|
||||||
|
* Better resizing of message popup panel
|
||||||
|
* Map of Spain included Portugal. From Eugen Dedu.
|
||||||
|
* Double-clicking on either style or family would crash xfig
|
||||||
|
* Export/Print grid units were not reset when loading Fig file of different units
|
||||||
|
* When converting empty export/print grid units to fractional inches would make 0/2
|
||||||
|
* Escaped hyphens in man page
|
||||||
|
From Roland Rosendfeld
|
||||||
|
* When exporting to all three: PostScript, PDF and TeX, incorrectly generated
|
||||||
|
PostScript and PDF that included LaTeX-only (special) text
|
||||||
|
* Bug when doing Save As to a shorter filename - would corrupt name sometimes
|
||||||
|
* Note about 450 pixels/cm didn't make it from the FORMAT3.1 file to FORMAT3.2
|
||||||
|
* Print command was using -P instead of -d for lp
|
||||||
|
* On Cygwin, needed to double-escape PRINTER environment when backslashes in name
|
||||||
|
* w_library.c had incompatible poiner type in call to ScanLibraryDirectory
|
||||||
|
* Not enough characters allocated for ruler inch/cm indicators. Would cause segfault
|
||||||
|
on zooming out because of longer ruler text, e.g. -10210cm
|
||||||
|
* 22 new arrowhead types
|
||||||
|
* changed default browser to firefox and default pdf viewer to xpdf
|
||||||
|
* HTML MAP export (fig2dev) produces reference to .png file instead of .gif now
|
||||||
|
* A note added to i18n.html that says if you run fig2dev standalone, you must
|
||||||
|
pass the -j option to it
|
||||||
|
* No need to have the C99 complex functions in the math library.
|
||||||
|
* New computers from Andre Esser (Libraries/Computers)
|
||||||
|
* Some network icons colored and/or combined by Roland Rosenfeld.
|
||||||
|
* When exporting only active layers have choice of bounding area of whole
|
||||||
|
figure or only the active layers
|
||||||
|
* Two new library figures - piano_keyboard.fig, top view of a piano keyboard
|
||||||
|
by Reinaert Albrecht, and piano_keyboard_perspect.fig, a perspective
|
||||||
|
view of a piano keyboard by Brian Smith, both in the Libraries/Music
|
||||||
|
directory.
|
||||||
|
* New library figure - scissors.fig in Libraries/OfficeEquip from Kasie
|
||||||
|
Breezer Talbot
|
||||||
|
* Search tolerance increased from 4 pixels to 10 for zoom < 20
|
||||||
|
* Isometric grid to ease making isometric drawings
|
||||||
|
From Jasper Wesselingh
|
||||||
|
* New 37-pin D connector and 50-pin ribbon connector in Libraries/Electronic/Physical
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Nov 15 14:48:07 CET 2009 - meissner@suse.de
|
Sun Nov 15 14:48:07 CET 2009 - meissner@suse.de
|
||||||
|
|
||||||
|
|||||||
25
xfig.spec
25
xfig.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xfig (Version 3.2.5)
|
# spec file for package xfig (Version 3.2.5b)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -25,8 +25,8 @@ Group: Productivity/Graphics/Vector Editors
|
|||||||
Provides: xfig.3.2.3d
|
Provides: xfig.3.2.3d
|
||||||
Requires: transfig netpbm ghostscript-fonts-std
|
Requires: transfig netpbm ghostscript-fonts-std
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 3.2.5
|
Version: 3.2.5b
|
||||||
Release: 135
|
Release: 1
|
||||||
Summary: Facility for Interactive Generation of Figures under the X Window System
|
Summary: Facility for Interactive Generation of Figures under the X Window System
|
||||||
Url: http://www.xfig.org/
|
Url: http://www.xfig.org/
|
||||||
Source: xfig.%{version}.tar.bz2
|
Source: xfig.%{version}.tar.bz2
|
||||||
@ -35,16 +35,13 @@ Source2: browser
|
|||||||
Source3: xfig.sh
|
Source3: xfig.sh
|
||||||
Source4: xfig.desktop
|
Source4: xfig.desktop
|
||||||
Patch0: xfig.%{version}.dif
|
Patch0: xfig.%{version}.dif
|
||||||
Patch1: xfig.%{version}-urw-fonts.dif
|
Patch1: xfig.3.2.5-urw-fonts.dif
|
||||||
Patch2: xfig.%{version}-xim.dif
|
Patch2: xfig.3.2.5-xim.dif
|
||||||
Patch3: xfig.3.2.3d-international-std-fonts.dif
|
Patch3: xfig.3.2.3d-international-std-fonts.dif
|
||||||
Patch4: xfig-%{version}-mkstemp.dif
|
Patch5: xfig.3.2.5b-null.dif
|
||||||
Patch5: xfig.3.2.4-null.dif
|
Patch6: xfig.3.2.5b-locale.dif
|
||||||
Patch6: xfig.%{version}-locale.dif
|
Patch7: xfig.3.2.5b-fixes.dif
|
||||||
Patch7: xfig.%{version}-fixes.dif
|
Patch8: xfig.3.2.5b-pspdftex.dif
|
||||||
Patch8: xfig.%{version}-pspdftex.dif
|
|
||||||
Patch9: xfig.%{version}-zoom.dif
|
|
||||||
Patch10: xfig.%{version}-zoom_fpe.dif
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
|
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
|
||||||
%if "%_exec_prefix" == "/usr/X11R6"
|
%if "%_exec_prefix" == "/usr/X11R6"
|
||||||
@ -86,13 +83,10 @@ find -type f | xargs -r chmod a-x,go-w
|
|||||||
%patch1 -p0 -b .urw-fonts
|
%patch1 -p0 -b .urw-fonts
|
||||||
%patch2 -p0 -b .xim
|
%patch2 -p0 -b .xim
|
||||||
%patch3 -p1 -b .international-std-fonts
|
%patch3 -p1 -b .international-std-fonts
|
||||||
%patch4 -p0 -b .security
|
|
||||||
%patch5 -p0 -b .null
|
%patch5 -p0 -b .null
|
||||||
%patch6 -p0 -b .locale
|
%patch6 -p0 -b .locale
|
||||||
%patch7 -p0 -b .fixes
|
%patch7 -p0 -b .fixes
|
||||||
%patch8 -p0 -b .pspdftex
|
%patch8 -p0 -b .pspdftex
|
||||||
%patch9 -p0 -b .zoom
|
|
||||||
%patch10 -p0 -b .fpe
|
|
||||||
cp %{S:1} .
|
cp %{S:1} .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -144,7 +138,6 @@ find %{buildroot}/%{_docdir}/%{name} -name '*.orig' | xargs -r rm -f
|
|||||||
%{_x11data}/xfig
|
%{_x11data}/xfig
|
||||||
%{_bindir}/xfig*
|
%{_bindir}/xfig*
|
||||||
%config %{_appdefdir}/Fig
|
%config %{_appdefdir}/Fig
|
||||||
%config %{_appdefdir}/Fig-color
|
|
||||||
%doc %{_mandir}/man1/xfig.1x.gz
|
%doc %{_mandir}/man1/xfig.1x.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user