--- w_drawprim.c +++ w_drawprim.c 2007-05-07 17:11:31.189166000 +0200 @@ -512,7 +512,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"); --- w_layers.c +++ w_layers.c 2007-05-11 16:19:02.691772247 +0200 @@ -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)); --- w_library.c +++ w_library.c 2007-05-07 16:06:15.423107000 +0200 @@ -1029,9 +1029,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, --- w_icons.c +++ w_icons.c 2007-07-25 11:53:51.693851855 +0200 @@ -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 */ --- w_setup.c +++ w_setup.c 2007-05-11 13:44:57.656325000 +0200 @@ -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; } --- w_setup.h +++ w_setup.h 2007-05-11 13:44:57.680328000 +0200 @@ -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 --- w_snap.c +++ w_snap.c 2007-05-11 16:15:09.419022454 +0200 @@ -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 */ --- w_util.c +++ w_util.c 2007-05-11 16:24:36.343207872 +0200 @@ -34,6 +34,7 @@ #include "w_print.h" #include "w_util.h" #include "w_setup.h" +#include "w_snap.h" #include /* 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);