From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Feb 2022 16:04:24 +0100 Subject: New upstream version 5.2.2GA --- app/bin/CMakeLists.txt | 94 +- app/bin/acclkeys.h | 3 + app/bin/appdefaults.c | 15 +- app/bin/archive.c | 44 +- app/bin/archive.h | 2 +- app/bin/bdf2xtp.c | 2 +- app/bin/bitmaps/16pix/bridge.png | Bin 0 -> 209 bytes app/bin/bitmaps/16pix/circle-center.png | Bin 0 -> 249 bytes app/bin/bitmaps/16pix/circle-tangent.png | Bin 0 -> 244 bytes app/bin/bitmaps/16pix/circle.png | Bin 0 -> 242 bytes app/bin/bitmaps/16pix/curved-chord.png | Bin 0 -> 244 bytes app/bin/bitmaps/16pix/curved-end.png | Bin 0 -> 239 bytes app/bin/bitmaps/16pix/curved-middle.png | Bin 0 -> 239 bytes app/bin/bitmaps/16pix/curved-tangent.png | Bin 0 -> 241 bytes app/bin/bitmaps/16pix/description.png | Bin 0 -> 228 bytes app/bin/bitmaps/16pix/elevation.png | Bin 0 -> 216 bytes app/bin/bitmaps/16pix/exit.png | Bin 0 -> 203 bytes app/bin/bitmaps/16pix/palette.png | Bin 0 -> 179 bytes app/bin/bitmaps/16pix/pan-zoom.png | Bin 0 -> 229 bytes app/bin/bitmaps/16pix/select.png | Bin 0 -> 220 bytes app/bin/bitmaps/16pix/snap-curs.png | Bin 0 -> 222 bytes app/bin/bitmaps/16pix/snap-grid.png | Bin 0 -> 191 bytes app/bin/bitmaps/24pix/description.png | Bin 0 -> 253 bytes app/bin/bitmaps/24pix/exit.png | Bin 0 -> 236 bytes app/bin/bitmaps/24pix/pan-zoom.png | Bin 0 -> 273 bytes app/bin/bitmaps/24pix/snap-curs.png | Bin 0 -> 265 bytes app/bin/bitmaps/24pix/snap-grid.png | Bin 0 -> 183 bytes app/bin/bitmaps/Info.xpm | 116 + app/bin/bitmaps/SVG/Info.svg | 69 + app/bin/bitmaps/SVG/NotUsed/ease-broad.svg | 66 + app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg | 61 + app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg | 69 + app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg | 66 + app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg | 67 + app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg | 66 + app/bin/bitmaps/SVG/NotUsed/ease-none.svg | 66 + app/bin/bitmaps/SVG/NotUsed/ease-normal.svg | 66 + app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg | 66 + app/bin/bitmaps/SVG/background.svg | 153 + app/bin/bitmaps/SVG/benchwork.svg | 100 + app/bin/bitmaps/SVG/bezier-line.svg | 92 + app/bin/bitmaps/SVG/bezier-track.svg | 424 +++ app/bin/bitmaps/SVG/block.svg | 233 +- app/bin/bitmaps/SVG/bottom.svg | 62 + app/bin/bitmaps/SVG/box.svg | 72 + app/bin/bitmaps/SVG/bridge.svg | 162 + app/bin/bitmaps/SVG/building.svg | 85 + app/bin/bitmaps/SVG/car-inventory.svg | 146 + app/bin/bitmaps/SVG/change-grid.svg | 136 + app/bin/bitmaps/SVG/circle-center.svg | 283 ++ app/bin/bitmaps/SVG/circle-filled-center.svg | 72 + app/bin/bitmaps/SVG/circle-filled-tangent.svg | 78 + app/bin/bitmaps/SVG/circle-line-center.svg | 78 + app/bin/bitmaps/SVG/circle-line-tangent.svg | 78 + app/bin/bitmaps/SVG/circle-line.svg | 228 ++ app/bin/bitmaps/SVG/circle-tangent.svg | 272 ++ app/bin/bitmaps/SVG/circle.svg | 301 ++ app/bin/bitmaps/SVG/connect.svg | 159 + app/bin/bitmaps/SVG/control.svg | 84 + app/bin/bitmaps/SVG/convert-from.svg | 110 + app/bin/bitmaps/SVG/convert-to.svg | 107 + app/bin/bitmaps/SVG/copy.svg | 57 + app/bin/bitmaps/SVG/cornu.svg | 275 ++ app/bin/bitmaps/SVG/curved-chord.svg | 172 + app/bin/bitmaps/SVG/curved-end.svg | 160 + app/bin/bitmaps/SVG/curved-line-chord.svg | 114 + app/bin/bitmaps/SVG/curved-line-end.svg | 108 + app/bin/bitmaps/SVG/curved-line-middle.svg | 99 + app/bin/bitmaps/SVG/curved-line-tangent.svg | 190 + app/bin/bitmaps/SVG/curved-middle.svg | 202 + app/bin/bitmaps/SVG/curved-tangent.svg | 191 + app/bin/bitmaps/SVG/cut.svg | 64 + app/bin/bitmaps/SVG/delete.svg | 143 + app/bin/bitmaps/SVG/describe.svg | 144 + app/bin/bitmaps/SVG/description.svg | 143 + app/bin/bitmaps/SVG/dimension.svg | 148 + app/bin/bitmaps/SVG/doc-export-bmap.svg | 97 + app/bin/bitmaps/SVG/doc-export-dxf.svg | 114 + app/bin/bitmaps/SVG/doc-export-svg.svg | 76 + app/bin/bitmaps/SVG/doc-export-xtc.svg | 60 + app/bin/bitmaps/SVG/doc-export.svg | 66 + app/bin/bitmaps/SVG/doc-import-xtc.svg | 60 + app/bin/bitmaps/SVG/doc-import.svg | 66 + app/bin/bitmaps/SVG/doc-new.svg | 63 + app/bin/bitmaps/SVG/doc-open.svg | 72 + app/bin/bitmaps/SVG/doc-print.svg | 94 + app/bin/bitmaps/SVG/doc-revert.svg | 55 + app/bin/bitmaps/SVG/doc-save-as.svg | 99 + app/bin/bitmaps/SVG/doc-save.svg | 90 + app/bin/bitmaps/SVG/doc-setup.svg | 101 + app/bin/bitmaps/SVG/down.svg | 56 + app/bin/bitmaps/SVG/elevation.svg | 139 + app/bin/bitmaps/SVG/exit.svg | 88 + app/bin/bitmaps/SVG/extend.svg | 154 + app/bin/bitmaps/SVG/filled-box.svg | 72 + app/bin/bitmaps/SVG/filled-polygon.svg | 59 + app/bin/bitmaps/SVG/go.svg | 106 + app/bin/bitmaps/SVG/grid.svg | 18 + app/bin/bitmaps/SVG/helix.svg | 170 + app/bin/bitmaps/SVG/join-line.svg | 94 + app/bin/bitmaps/SVG/join.svg | 154 + app/bin/bitmaps/SVG/layers.svg | 98 + app/bin/bitmaps/SVG/magnet.svg | 83 + app/bin/bitmaps/SVG/manage.svg | 77 + app/bin/bitmaps/SVG/map.svg | 146 + app/bin/bitmaps/SVG/move.svg | 231 ++ app/bin/bitmaps/SVG/new-car.svg | 136 + app/bin/bitmaps/SVG/ok.svg | 55 + app/bin/bitmaps/SVG/pan-zoom.svg | 89 + app/bin/bitmaps/SVG/parallel-line.svg | 155 + app/bin/bitmaps/SVG/parallel.svg | 221 ++ app/bin/bitmaps/SVG/parameter.svg | 76 + app/bin/bitmaps/SVG/paste.svg | 64 + app/bin/bitmaps/SVG/polygon.svg | 57 + app/bin/bitmaps/SVG/polyline.svg | 56 + app/bin/bitmaps/SVG/profile.svg | 176 + app/bin/bitmaps/SVG/protractor.svg | 68 + app/bin/bitmaps/SVG/redo.svg | 52 + app/bin/bitmaps/SVG/reflect.svg | 71 + app/bin/bitmaps/SVG/rotate.svg | 222 ++ app/bin/bitmaps/SVG/ruler.svg | 81 + app/bin/bitmaps/SVG/select.svg | 153 + app/bin/bitmaps/SVG/sensor.svg | 71 + app/bin/bitmaps/SVG/signal.svg | 78 + app/bin/bitmaps/SVG/snap-curs.svg | 130 + app/bin/bitmaps/SVG/snap-grid.svg | 128 + app/bin/bitmaps/SVG/split-draw.svg | 97 + app/bin/bitmaps/SVG/split.svg | 153 + app/bin/bitmaps/SVG/sticky-doc.svg | 72 + app/bin/bitmaps/SVG/sticky-link.svg | 76 + app/bin/bitmaps/SVG/sticky-note.svg | 88 + app/bin/bitmaps/SVG/stop.svg | 106 + app/bin/bitmaps/SVG/straight-line.svg | 126 + app/bin/bitmaps/SVG/straight.svg | 160 + app/bin/bitmaps/SVG/switch-ai.svg | 89 + app/bin/bitmaps/SVG/table-edge.svg | 80 + app/bin/bitmaps/SVG/text.svg | 56 + app/bin/bitmaps/SVG/top.svg | 62 + app/bin/bitmaps/SVG/train.svg | 173 + app/bin/bitmaps/SVG/trim.svg | 91 + app/bin/bitmaps/SVG/tunnel.svg | 164 + app/bin/bitmaps/SVG/turnout-designer.svg | 179 + app/bin/bitmaps/SVG/turnout.svg | 168 + app/bin/bitmaps/SVG/turntable.svg | 175 + app/bin/bitmaps/SVG/undo.svg | 53 + app/bin/bitmaps/SVG/zoom-choose.svg | 359 ++ app/bin/bitmaps/SVG/zoom-extent.svg | 247 ++ app/bin/bitmaps/SVG/zoom-in.svg | 222 ++ app/bin/bitmaps/SVG/zoom-out.svg | 215 ++ app/bin/bitmaps/above.xpm | 22 - app/bin/bitmaps/background.xpm | 312 +- app/bin/bitmaps/below.xpm | 22 - app/bin/bitmaps/benchwork.xpm | 112 + app/bin/bitmaps/bezier-line.xpm | 98 + app/bin/bitmaps/bezier-track.xpm | 130 + app/bin/bitmaps/bezier.xpm | 23 - app/bin/bitmaps/block.xpm | 162 +- app/bin/bitmaps/bottom.xpm | 101 + app/bin/bitmaps/box.xpm | 93 + app/bin/bitmaps/bridge.xbm | 7 - app/bin/bitmaps/bridge.xpm | 127 +- app/bin/bitmaps/building.xpm | 125 + app/bin/bitmaps/car-inventory.xpm | 103 + app/bin/bitmaps/change-grid.xpm | 118 + app/bin/bitmaps/circle-center.xpm | 114 + app/bin/bitmaps/circle-filled-center.xpm | 145 + app/bin/bitmaps/circle-filled-tangent.xpm | 148 + app/bin/bitmaps/circle-line-center.xpm | 93 + app/bin/bitmaps/circle-line-tangent.xpm | 93 + app/bin/bitmaps/circle-line.xpm | 95 + app/bin/bitmaps/circle-tangent.xpm | 110 + app/bin/bitmaps/circle.xpm | 115 + app/bin/bitmaps/circle1.xpm | 23 - app/bin/bitmaps/circle2.xpm | 22 - app/bin/bitmaps/circle3.xpm | 22 - app/bin/bitmaps/cnote.xpm | 22 - app/bin/bitmaps/connect.xpm | 116 + app/bin/bitmaps/control.xpm | 153 +- app/bin/bitmaps/convert-from.xpm | 99 + app/bin/bitmaps/convert-to.xpm | 99 + app/bin/bitmaps/convertfr.xpm | 23 - app/bin/bitmaps/convertto.xpm | 23 - app/bin/bitmaps/copy.xpm | 95 + app/bin/bitmaps/cornu.xpm | 140 +- app/bin/bitmaps/curve1.xpm | 23 - app/bin/bitmaps/curve2.xpm | 23 - app/bin/bitmaps/curve3.xpm | 23 - app/bin/bitmaps/curve4.xpm | 23 - app/bin/bitmaps/curved-chord.xpm | 109 + app/bin/bitmaps/curved-end.xpm | 107 + app/bin/bitmaps/curved-line-chord.xpm | 92 + app/bin/bitmaps/curved-line-end.xpm | 94 + app/bin/bitmaps/curved-line-middle.xpm | 95 + app/bin/bitmaps/curved-line-tangent.xpm | 98 + app/bin/bitmaps/curved-middle.xpm | 108 + app/bin/bitmaps/curved-tangent.xpm | 116 + app/bin/bitmaps/cut.xpm | 92 + app/bin/bitmaps/dbench.xpm | 22 - app/bin/bitmaps/dbezier.xpm | 22 - app/bin/bitmaps/dbox.xpm | 22 - app/bin/bitmaps/dcircle1.xpm | 22 - app/bin/bitmaps/dcircle2.xpm | 22 - app/bin/bitmaps/dcircle3.xpm | 22 - app/bin/bitmaps/dcurve1.xpm | 22 - app/bin/bitmaps/dcurve2.xpm | 22 - app/bin/bitmaps/dcurve3.xpm | 22 - app/bin/bitmaps/dcurve4.xpm | 22 - app/bin/bitmaps/ddimlin.xpm | 22 - app/bin/bitmaps/delete.xpm | 136 +- app/bin/bitmaps/describe.xpm | 133 +- app/bin/bitmaps/description.xpm | 101 + app/bin/bitmaps/dfilbox.xpm | 23 - app/bin/bitmaps/dfilpoly.xpm | 23 - app/bin/bitmaps/dflcrcl1.xpm | 22 - app/bin/bitmaps/dflcrcl2.xpm | 23 - app/bin/bitmaps/dflcrcl3.xpm | 23 - app/bin/bitmaps/dimension.xpm | 94 + app/bin/bitmaps/dline.xpm | 22 - app/bin/bitmaps/doc-export-bmap.xpm | 162 + app/bin/bitmaps/doc-export-dxf.xpm | 100 + app/bin/bitmaps/doc-export-svg.xpm | 114 + app/bin/bitmaps/doc-export-xtc.xpm | 108 + app/bin/bitmaps/doc-export.xpm | 119 + app/bin/bitmaps/doc-import-xtc.xpm | 123 + app/bin/bitmaps/doc-import.xpm | 123 + app/bin/bitmaps/doc-new.xpm | 127 + app/bin/bitmaps/doc-open.xpm | 136 + app/bin/bitmaps/doc-print.xpm | 108 + app/bin/bitmaps/doc-revert.xpm | 134 + app/bin/bitmaps/doc-save-as.xpm | 135 + app/bin/bitmaps/doc-save.xpm | 116 + app/bin/bitmaps/doc-setup.xpm | 110 + app/bin/bitmaps/document-export.xpm | 90 - app/bin/bitmaps/document-exportdxf.xpm | 84 - app/bin/bitmaps/document-import.xpm | 92 - app/bin/bitmaps/document-importmod.xpm | 71 - app/bin/bitmaps/document-new.xpm | 38 - app/bin/bitmaps/document-open.xpm | 35 - app/bin/bitmaps/document-print.xpm | 24 - app/bin/bitmaps/document-save.xpm | 35 - app/bin/bitmaps/down.xpm | 89 + app/bin/bitmaps/dpoly.xpm | 22 - app/bin/bitmaps/dpolyline.xpm | 23 - app/bin/bitmaps/dtbledge.xpm | 23 - app/bin/bitmaps/ease-broad.xpm | 89 + app/bin/bitmaps/ease-cornu.xpm | 96 + app/bin/bitmaps/ease-gt-broad.xpm | 89 + app/bin/bitmaps/ease-gt-sharp.xpm | 89 + app/bin/bitmaps/ease-lt-broad.xpm | 89 + app/bin/bitmaps/ease-lt-sharp.xpm | 89 + app/bin/bitmaps/ease-none.xpm | 89 + app/bin/bitmaps/ease-normal.xpm | 89 + app/bin/bitmaps/ease-sharp.xpm | 89 + app/bin/bitmaps/ebroad.xpm | 21 - app/bin/bitmaps/ecornu.xpm | 23 - app/bin/bitmaps/edit-redo.xpm | 29 - app/bin/bitmaps/edit-undo.xpm | 28 - app/bin/bitmaps/egtbroad.xpm | 21 - app/bin/bitmaps/egtsharp.xpm | 21 - app/bin/bitmaps/elev.xpm | 23 - app/bin/bitmaps/elevation.xpm | 117 + app/bin/bitmaps/eltbroad.xpm | 21 - app/bin/bitmaps/eltsharp.xpm | 21 - app/bin/bitmaps/enone.xpm | 21 - app/bin/bitmaps/enormal.xpm | 21 - app/bin/bitmaps/esharp.xpm | 21 - app/bin/bitmaps/exit.xpm | 115 +- app/bin/bitmaps/extend.xpm | 166 +- app/bin/bitmaps/filled-box.xpm | 120 + app/bin/bitmaps/filled-polygon.xpm | 121 + app/bin/bitmaps/flip.xpm | 23 - app/bin/bitmaps/funnel.xpm | 62 + app/bin/bitmaps/funnelclear.xpm | 124 + app/bin/bitmaps/go.xpm | 157 +- app/bin/bitmaps/helix.xpm | 95 + app/bin/bitmaps/hndldto.xpm | 21 - app/bin/bitmaps/join-line.xpm | 99 + app/bin/bitmaps/join.xpm | 139 +- app/bin/bitmaps/joinline.xpm | 22 - app/bin/bitmaps/l1.xbm | 84 +- app/bin/bitmaps/l10.xbm | 84 +- app/bin/bitmaps/l11.xbm | 84 +- app/bin/bitmaps/l12.xbm | 84 +- app/bin/bitmaps/l13.xbm | 84 +- app/bin/bitmaps/l14.xbm | 84 +- app/bin/bitmaps/l15.xbm | 84 +- app/bin/bitmaps/l16.xbm | 84 +- app/bin/bitmaps/l17.xbm | 84 +- app/bin/bitmaps/l18.xbm | 84 +- app/bin/bitmaps/l19.xbm | 84 +- app/bin/bitmaps/l2.xbm | 84 +- app/bin/bitmaps/l20.xbm | 84 +- app/bin/bitmaps/l21.xbm | 84 +- app/bin/bitmaps/l22.xbm | 84 +- app/bin/bitmaps/l23.xbm | 84 +- app/bin/bitmaps/l24.xbm | 84 +- app/bin/bitmaps/l25.xbm | 84 +- app/bin/bitmaps/l26.xbm | 84 +- app/bin/bitmaps/l27.xbm | 84 +- app/bin/bitmaps/l28.xbm | 84 +- app/bin/bitmaps/l29.xbm | 84 +- app/bin/bitmaps/l3.xbm | 84 +- app/bin/bitmaps/l30.xbm | 84 +- app/bin/bitmaps/l31.xbm | 84 +- app/bin/bitmaps/l32.xbm | 84 +- app/bin/bitmaps/l33.xbm | 84 +- app/bin/bitmaps/l34.xbm | 84 +- app/bin/bitmaps/l35.xbm | 84 +- app/bin/bitmaps/l36.xbm | 84 +- app/bin/bitmaps/l37.xbm | 84 +- app/bin/bitmaps/l38.xbm | 84 +- app/bin/bitmaps/l39.xbm | 84 +- app/bin/bitmaps/l4.xbm | 84 +- app/bin/bitmaps/l40.xbm | 84 +- app/bin/bitmaps/l41.xbm | 84 +- app/bin/bitmaps/l42.xbm | 84 +- app/bin/bitmaps/l43.xbm | 84 +- app/bin/bitmaps/l44.xbm | 84 +- app/bin/bitmaps/l45.xbm | 84 +- app/bin/bitmaps/l46.xbm | 84 +- app/bin/bitmaps/l47.xbm | 84 +- app/bin/bitmaps/l48.xbm | 84 +- app/bin/bitmaps/l49.xbm | 84 +- app/bin/bitmaps/l5.xbm | 84 +- app/bin/bitmaps/l50.xbm | 84 +- app/bin/bitmaps/l51.xbm | 84 +- app/bin/bitmaps/l52.xbm | 84 +- app/bin/bitmaps/l53.xbm | 84 +- app/bin/bitmaps/l54.xbm | 84 +- app/bin/bitmaps/l55.xbm | 84 +- app/bin/bitmaps/l56.xbm | 84 +- app/bin/bitmaps/l57.xbm | 84 +- app/bin/bitmaps/l58.xbm | 84 +- app/bin/bitmaps/l59.xbm | 84 +- app/bin/bitmaps/l6.xbm | 84 +- app/bin/bitmaps/l60.xbm | 84 +- app/bin/bitmaps/l61.xbm | 84 +- app/bin/bitmaps/l62.xbm | 84 +- app/bin/bitmaps/l63.xbm | 84 +- app/bin/bitmaps/l64.xbm | 84 +- app/bin/bitmaps/l65.xbm | 84 +- app/bin/bitmaps/l66.xbm | 84 +- app/bin/bitmaps/l67.xbm | 84 +- app/bin/bitmaps/l68.xbm | 84 +- app/bin/bitmaps/l69.xbm | 84 +- app/bin/bitmaps/l7.xbm | 84 +- app/bin/bitmaps/l70.xbm | 84 +- app/bin/bitmaps/l71.xbm | 84 +- app/bin/bitmaps/l72.xbm | 84 +- app/bin/bitmaps/l73.xbm | 84 +- app/bin/bitmaps/l74.xbm | 84 +- app/bin/bitmaps/l75.xbm | 84 +- app/bin/bitmaps/l76.xbm | 84 +- app/bin/bitmaps/l77.xbm | 84 +- app/bin/bitmaps/l78.xbm | 84 +- app/bin/bitmaps/l79.xbm | 84 +- app/bin/bitmaps/l8.xbm | 84 +- app/bin/bitmaps/l80.xbm | 84 +- app/bin/bitmaps/l81.xbm | 84 +- app/bin/bitmaps/l82.xbm | 84 +- app/bin/bitmaps/l83.xbm | 84 +- app/bin/bitmaps/l84.xbm | 84 +- app/bin/bitmaps/l85.xbm | 84 +- app/bin/bitmaps/l86.xbm | 84 +- app/bin/bitmaps/l87.xbm | 84 +- app/bin/bitmaps/l88.xbm | 84 +- app/bin/bitmaps/l89.xbm | 84 +- app/bin/bitmaps/l9.xbm | 84 +- app/bin/bitmaps/l90.xbm | 84 +- app/bin/bitmaps/l91.xbm | 84 +- app/bin/bitmaps/l92.xbm | 84 +- app/bin/bitmaps/l93.xbm | 84 +- app/bin/bitmaps/l94.xbm | 84 +- app/bin/bitmaps/l95.xbm | 84 +- app/bin/bitmaps/l96.xbm | 84 +- app/bin/bitmaps/l97.xbm | 84 +- app/bin/bitmaps/l98.xbm | 84 +- app/bin/bitmaps/l99.xbm | 84 +- app/bin/bitmaps/layers.xpm | 110 + app/bin/bitmaps/magnet.xpm | 161 +- app/bin/bitmaps/magnifier.xpm | 89 - app/bin/bitmaps/manage.xpm | 110 + app/bin/bitmaps/map.xpm | 193 +- app/bin/bitmaps/move.xpm | 142 +- app/bin/bitmaps/movedesc.xpm | 23 - app/bin/bitmaps/new-car.xpm | 100 + app/bin/bitmaps/newcar.xpm | 23 - app/bin/bitmaps/note.xpm | 114 + app/bin/bitmaps/ok.xpm | 92 + app/bin/bitmaps/openbutt.xpm | 21 - app/bin/bitmaps/pan-zoom.xpm | 94 + app/bin/bitmaps/pan.xpm | 22 - app/bin/bitmaps/parallel-line.xpm | 130 +- app/bin/bitmaps/parallel.xpm | 138 +- app/bin/bitmaps/parameter.xpm | 104 + app/bin/bitmaps/paste.xpm | 107 + app/bin/bitmaps/pause.xpm | 147 + app/bin/bitmaps/polygon.xpm | 89 + app/bin/bitmaps/polyline.xpm | 92 + app/bin/bitmaps/profile.xpm | 145 +- app/bin/bitmaps/protractor.xpm | 99 + app/bin/bitmaps/pull.xpm | 23 - app/bin/bitmaps/redo.xpm | 104 + app/bin/bitmaps/reflect.xpm | 115 + app/bin/bitmaps/rotate.xpm | 171 +- app/bin/bitmaps/ruler.xpm | 110 +- app/bin/bitmaps/select.xpm | 128 +- app/bin/bitmaps/sensor.xpm | 160 +- app/bin/bitmaps/signal.xpm | 131 +- app/bin/bitmaps/snap-curs.xpm | 102 + app/bin/bitmaps/snap-grid.xpm | 92 + app/bin/bitmaps/snapcurs.xbm | 7 - app/bin/bitmaps/snapvis.xbm | 7 - app/bin/bitmaps/split-draw.xpm | 95 + app/bin/bitmaps/split.xpm | 107 + app/bin/bitmaps/splittrk.xpm | 22 - app/bin/bitmaps/sticky-doc.xpm | 130 + app/bin/bitmaps/sticky-link.xpm | 138 + app/bin/bitmaps/sticky-note-chain.xpm | 84 - app/bin/bitmaps/sticky-note-clip.xpm | 99 - app/bin/bitmaps/sticky-note-text.xpm | 86 - app/bin/bitmaps/sticky-note.xpm | 124 + app/bin/bitmaps/stop.xpm | 150 +- app/bin/bitmaps/straight-line.xpm | 96 + app/bin/bitmaps/straight.xpm | 155 +- app/bin/bitmaps/switch-ai.xpm | 96 + app/bin/bitmaps/table-edge.xpm | 114 + app/bin/bitmaps/text.xpm | 110 +- app/bin/bitmaps/top.xpm | 111 + app/bin/bitmaps/train.xpm | 140 +- app/bin/bitmaps/trim.xpm | 99 + app/bin/bitmaps/tunnel.xpm | 140 +- app/bin/bitmaps/turnout-designer.xpm | 129 + app/bin/bitmaps/turnout.xpm | 128 +- app/bin/bitmaps/turntable.xpm | 133 + app/bin/bitmaps/turntbl.xpm | 21 - app/bin/bitmaps/undo.xpm | 103 + app/bin/bitmaps/zoom-choose.xpm | 127 + app/bin/bitmaps/zoom-extent.xpm | 125 + app/bin/bitmaps/zoom-in.xpm | 128 + app/bin/bitmaps/zoom-out.xpm | 127 + app/bin/bitmaps/zoom.xpm | 24 - app/bin/bitmaps/zoomin.xpm | 24 - app/bin/bitmaps/zoomout.xpm | 24 - app/bin/cJSON.c | 2 +- app/bin/cJSON.h | 2 +- app/bin/cbezier.c | 105 +- app/bin/cbezier.h | 8 +- app/bin/cblock.c | 78 +- app/bin/ccontrol.c | 44 +- app/bin/ccornu.c | 102 +- app/bin/ccornu.h | 4 +- app/bin/ccurve.c | 167 +- app/bin/ccurve.h | 10 +- app/bin/cdraw.c | 1352 ++++--- app/bin/celev.c | 166 +- app/bin/cgroup.c | 328 +- app/bin/chndldto.c | 11 +- app/bin/chotbar.c | 187 +- app/bin/cjoin.c | 96 +- app/bin/cjoin.h | 3 +- app/bin/cmisc.c | 245 +- app/bin/cmisc2.c | 2 +- app/bin/cmodify.c | 98 +- app/bin/cnote.c | 24 +- app/bin/cnvdsgn.c | 11 +- app/bin/common-ui.h | 31 + app/bin/common.h | 140 +- app/bin/compound.c | 430 ++- app/bin/compound.h | 58 +- app/bin/cparalle.c | 20 +- app/bin/cprint.c | 251 +- app/bin/cprofile.c | 90 +- app/bin/cpull.c | 19 +- app/bin/cruler.c | 256 +- app/bin/cselect.c | 982 +++-- app/bin/cselect.h | 29 +- app/bin/csensor.c | 44 +- app/bin/csignal.c | 56 +- app/bin/csnap.c | 105 +- app/bin/csplit.c | 293 +- app/bin/cstraigh.c | 23 +- app/bin/cstraigh.h | 1 - app/bin/cstruct.c | 173 +- app/bin/cswitchmotor.c | 62 +- app/bin/ctext.c | 24 +- app/bin/ctodesgn.c | 496 +-- app/bin/ctrain.c | 346 +- app/bin/ctrain.h | 5 +- app/bin/cturnout.c | 5062 +++++++++++++++++-------- app/bin/cturntbl.c | 226 +- app/bin/cundo.c | 354 +- app/bin/cundo.h | 6 +- app/bin/custom.c | 50 +- app/bin/custom.h | 9 +- app/bin/dbench.c | 42 +- app/bin/dbitmap.c | 545 ++- app/bin/dcar.c | 494 +-- app/bin/dcmpnd.c | 80 +- app/bin/dcontmgm.c | 20 +- app/bin/dcustmgm.c | 53 +- app/bin/dease.c | 70 +- app/bin/denum.c | 38 +- app/bin/directory.c | 23 +- app/bin/dlayer.c | 658 +++- app/bin/doption.c | 195 +- app/bin/dpricels.c | 9 +- app/bin/dprmfile.c | 43 +- app/bin/draw.c | 1040 ++--- app/bin/draw.h | 52 +- app/bin/drawgeom.c | 504 ++- app/bin/drawgeom.h | 16 +- app/bin/dxfformat.c | 6 - app/bin/dxfoutput.c | 50 +- app/bin/elev.c | 111 +- app/bin/file2uri.c | 8 +- app/bin/fileio.c | 305 +- app/bin/fileio.h | 41 +- app/bin/filenoteui.c | 38 +- app/bin/i18n.c | 11 +- app/bin/include/dirent.h | 4 +- app/bin/include/levenshtein.h | 24 + app/bin/include/paramfile.h | 9 + app/bin/include/paramfilelist.h | 11 +- app/bin/include/partcatalog.h | 83 +- app/bin/include/svgformat.h | 55 + app/bin/include/utlist.h | 1073 ++++++ app/bin/layout.c | 203 +- app/bin/layout.h | 9 +- app/bin/levenshtein.c | 72 + app/bin/linknoteui.c | 30 +- app/bin/lprintf.c | 18 +- app/bin/macro.c | 278 +- app/bin/manifest.c | 20 +- app/bin/misc.c | 1270 ++++--- app/bin/misc.h | 109 +- app/bin/misc2.c | 255 +- app/bin/misc2.h | 17 +- app/bin/note.h | 15 +- app/bin/param.c | 481 ++- app/bin/param.h | 122 +- app/bin/paramfile.c | 95 +- app/bin/paramfilelist.c | 124 +- app/bin/paramfilesearch_ui.c | 394 +- app/bin/partcatalog.c | 1250 +++--- app/bin/paths.c | 16 +- app/bin/shortentext.c | 7 +- app/bin/shrtpath.c | 8 +- app/bin/shrtpath.h | 1 - app/bin/smalldlg.c | 97 +- app/bin/smalldlg.h | 6 +- app/bin/svgformat.c | 677 ++++ app/bin/svgoutput.c | 490 +++ app/bin/tbezier.c | 766 ++-- app/bin/tbezier.h | 15 +- app/bin/tcornu.c | 756 ++-- app/bin/tcornu.h | 16 +- app/bin/tcurve.c | 312 +- app/bin/tease.c | 241 +- app/bin/textnoteui.c | 19 +- app/bin/track.c | 667 ++-- app/bin/track.h | 71 +- app/bin/trackx.h | 6 +- app/bin/trknote.c | 131 +- app/bin/trkseg.c | 215 +- app/bin/tstraigh.c | 197 +- app/bin/unittest/CMakeLists.txt | 1 + app/bin/unittest/testfiles/HO-Peco-Code83.xtp | 6 +- app/bin/utf8convert.c | 11 +- app/bin/utility.c | 134 +- app/bin/utility.h | 2 + app/bin/validator.c | 1 - 572 files changed, 54342 insertions(+), 13508 deletions(-) create mode 100644 app/bin/bitmaps/16pix/bridge.png create mode 100644 app/bin/bitmaps/16pix/circle-center.png create mode 100644 app/bin/bitmaps/16pix/circle-tangent.png create mode 100644 app/bin/bitmaps/16pix/circle.png create mode 100644 app/bin/bitmaps/16pix/curved-chord.png create mode 100644 app/bin/bitmaps/16pix/curved-end.png create mode 100644 app/bin/bitmaps/16pix/curved-middle.png create mode 100644 app/bin/bitmaps/16pix/curved-tangent.png create mode 100644 app/bin/bitmaps/16pix/description.png create mode 100644 app/bin/bitmaps/16pix/elevation.png create mode 100644 app/bin/bitmaps/16pix/exit.png create mode 100644 app/bin/bitmaps/16pix/palette.png create mode 100644 app/bin/bitmaps/16pix/pan-zoom.png create mode 100644 app/bin/bitmaps/16pix/select.png create mode 100644 app/bin/bitmaps/16pix/snap-curs.png create mode 100644 app/bin/bitmaps/16pix/snap-grid.png create mode 100644 app/bin/bitmaps/24pix/description.png create mode 100644 app/bin/bitmaps/24pix/exit.png create mode 100644 app/bin/bitmaps/24pix/pan-zoom.png create mode 100644 app/bin/bitmaps/24pix/snap-curs.png create mode 100644 app/bin/bitmaps/24pix/snap-grid.png create mode 100644 app/bin/bitmaps/Info.xpm create mode 100644 app/bin/bitmaps/SVG/Info.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-broad.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-none.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-normal.svg create mode 100644 app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg create mode 100644 app/bin/bitmaps/SVG/background.svg create mode 100644 app/bin/bitmaps/SVG/benchwork.svg create mode 100644 app/bin/bitmaps/SVG/bezier-line.svg create mode 100644 app/bin/bitmaps/SVG/bezier-track.svg create mode 100644 app/bin/bitmaps/SVG/bottom.svg create mode 100644 app/bin/bitmaps/SVG/box.svg create mode 100644 app/bin/bitmaps/SVG/bridge.svg create mode 100644 app/bin/bitmaps/SVG/building.svg create mode 100644 app/bin/bitmaps/SVG/car-inventory.svg create mode 100644 app/bin/bitmaps/SVG/change-grid.svg create mode 100644 app/bin/bitmaps/SVG/circle-center.svg create mode 100644 app/bin/bitmaps/SVG/circle-filled-center.svg create mode 100644 app/bin/bitmaps/SVG/circle-filled-tangent.svg create mode 100644 app/bin/bitmaps/SVG/circle-line-center.svg create mode 100644 app/bin/bitmaps/SVG/circle-line-tangent.svg create mode 100644 app/bin/bitmaps/SVG/circle-line.svg create mode 100644 app/bin/bitmaps/SVG/circle-tangent.svg create mode 100644 app/bin/bitmaps/SVG/circle.svg create mode 100644 app/bin/bitmaps/SVG/connect.svg create mode 100644 app/bin/bitmaps/SVG/control.svg create mode 100644 app/bin/bitmaps/SVG/convert-from.svg create mode 100644 app/bin/bitmaps/SVG/convert-to.svg create mode 100644 app/bin/bitmaps/SVG/copy.svg create mode 100644 app/bin/bitmaps/SVG/cornu.svg create mode 100644 app/bin/bitmaps/SVG/curved-chord.svg create mode 100644 app/bin/bitmaps/SVG/curved-end.svg create mode 100644 app/bin/bitmaps/SVG/curved-line-chord.svg create mode 100644 app/bin/bitmaps/SVG/curved-line-end.svg create mode 100644 app/bin/bitmaps/SVG/curved-line-middle.svg create mode 100644 app/bin/bitmaps/SVG/curved-line-tangent.svg create mode 100644 app/bin/bitmaps/SVG/curved-middle.svg create mode 100644 app/bin/bitmaps/SVG/curved-tangent.svg create mode 100644 app/bin/bitmaps/SVG/cut.svg create mode 100644 app/bin/bitmaps/SVG/delete.svg create mode 100644 app/bin/bitmaps/SVG/describe.svg create mode 100644 app/bin/bitmaps/SVG/description.svg create mode 100644 app/bin/bitmaps/SVG/dimension.svg create mode 100644 app/bin/bitmaps/SVG/doc-export-bmap.svg create mode 100644 app/bin/bitmaps/SVG/doc-export-dxf.svg create mode 100644 app/bin/bitmaps/SVG/doc-export-svg.svg create mode 100644 app/bin/bitmaps/SVG/doc-export-xtc.svg create mode 100644 app/bin/bitmaps/SVG/doc-export.svg create mode 100644 app/bin/bitmaps/SVG/doc-import-xtc.svg create mode 100644 app/bin/bitmaps/SVG/doc-import.svg create mode 100644 app/bin/bitmaps/SVG/doc-new.svg create mode 100644 app/bin/bitmaps/SVG/doc-open.svg create mode 100644 app/bin/bitmaps/SVG/doc-print.svg create mode 100644 app/bin/bitmaps/SVG/doc-revert.svg create mode 100644 app/bin/bitmaps/SVG/doc-save-as.svg create mode 100644 app/bin/bitmaps/SVG/doc-save.svg create mode 100644 app/bin/bitmaps/SVG/doc-setup.svg create mode 100644 app/bin/bitmaps/SVG/down.svg create mode 100644 app/bin/bitmaps/SVG/elevation.svg create mode 100644 app/bin/bitmaps/SVG/exit.svg create mode 100644 app/bin/bitmaps/SVG/extend.svg create mode 100644 app/bin/bitmaps/SVG/filled-box.svg create mode 100644 app/bin/bitmaps/SVG/filled-polygon.svg create mode 100644 app/bin/bitmaps/SVG/go.svg create mode 100644 app/bin/bitmaps/SVG/grid.svg create mode 100644 app/bin/bitmaps/SVG/helix.svg create mode 100644 app/bin/bitmaps/SVG/join-line.svg create mode 100644 app/bin/bitmaps/SVG/join.svg create mode 100644 app/bin/bitmaps/SVG/layers.svg create mode 100644 app/bin/bitmaps/SVG/magnet.svg create mode 100644 app/bin/bitmaps/SVG/manage.svg create mode 100644 app/bin/bitmaps/SVG/map.svg create mode 100644 app/bin/bitmaps/SVG/move.svg create mode 100644 app/bin/bitmaps/SVG/new-car.svg create mode 100644 app/bin/bitmaps/SVG/ok.svg create mode 100644 app/bin/bitmaps/SVG/pan-zoom.svg create mode 100644 app/bin/bitmaps/SVG/parallel-line.svg create mode 100644 app/bin/bitmaps/SVG/parallel.svg create mode 100644 app/bin/bitmaps/SVG/parameter.svg create mode 100644 app/bin/bitmaps/SVG/paste.svg create mode 100644 app/bin/bitmaps/SVG/polygon.svg create mode 100644 app/bin/bitmaps/SVG/polyline.svg create mode 100644 app/bin/bitmaps/SVG/profile.svg create mode 100644 app/bin/bitmaps/SVG/protractor.svg create mode 100644 app/bin/bitmaps/SVG/redo.svg create mode 100644 app/bin/bitmaps/SVG/reflect.svg create mode 100644 app/bin/bitmaps/SVG/rotate.svg create mode 100644 app/bin/bitmaps/SVG/ruler.svg create mode 100644 app/bin/bitmaps/SVG/select.svg create mode 100644 app/bin/bitmaps/SVG/sensor.svg create mode 100644 app/bin/bitmaps/SVG/signal.svg create mode 100644 app/bin/bitmaps/SVG/snap-curs.svg create mode 100644 app/bin/bitmaps/SVG/snap-grid.svg create mode 100644 app/bin/bitmaps/SVG/split-draw.svg create mode 100644 app/bin/bitmaps/SVG/split.svg create mode 100644 app/bin/bitmaps/SVG/sticky-doc.svg create mode 100644 app/bin/bitmaps/SVG/sticky-link.svg create mode 100644 app/bin/bitmaps/SVG/sticky-note.svg create mode 100644 app/bin/bitmaps/SVG/stop.svg create mode 100644 app/bin/bitmaps/SVG/straight-line.svg create mode 100644 app/bin/bitmaps/SVG/straight.svg create mode 100644 app/bin/bitmaps/SVG/switch-ai.svg create mode 100644 app/bin/bitmaps/SVG/table-edge.svg create mode 100644 app/bin/bitmaps/SVG/text.svg create mode 100644 app/bin/bitmaps/SVG/top.svg create mode 100644 app/bin/bitmaps/SVG/train.svg create mode 100644 app/bin/bitmaps/SVG/trim.svg create mode 100644 app/bin/bitmaps/SVG/tunnel.svg create mode 100644 app/bin/bitmaps/SVG/turnout-designer.svg create mode 100644 app/bin/bitmaps/SVG/turnout.svg create mode 100644 app/bin/bitmaps/SVG/turntable.svg create mode 100644 app/bin/bitmaps/SVG/undo.svg create mode 100644 app/bin/bitmaps/SVG/zoom-choose.svg create mode 100644 app/bin/bitmaps/SVG/zoom-extent.svg create mode 100644 app/bin/bitmaps/SVG/zoom-in.svg create mode 100644 app/bin/bitmaps/SVG/zoom-out.svg delete mode 100644 app/bin/bitmaps/above.xpm delete mode 100644 app/bin/bitmaps/below.xpm create mode 100644 app/bin/bitmaps/benchwork.xpm create mode 100644 app/bin/bitmaps/bezier-line.xpm create mode 100644 app/bin/bitmaps/bezier-track.xpm delete mode 100644 app/bin/bitmaps/bezier.xpm create mode 100644 app/bin/bitmaps/bottom.xpm create mode 100644 app/bin/bitmaps/box.xpm delete mode 100644 app/bin/bitmaps/bridge.xbm create mode 100644 app/bin/bitmaps/building.xpm create mode 100644 app/bin/bitmaps/car-inventory.xpm create mode 100644 app/bin/bitmaps/change-grid.xpm create mode 100644 app/bin/bitmaps/circle-center.xpm create mode 100644 app/bin/bitmaps/circle-filled-center.xpm create mode 100644 app/bin/bitmaps/circle-filled-tangent.xpm create mode 100644 app/bin/bitmaps/circle-line-center.xpm create mode 100644 app/bin/bitmaps/circle-line-tangent.xpm create mode 100644 app/bin/bitmaps/circle-line.xpm create mode 100644 app/bin/bitmaps/circle-tangent.xpm create mode 100644 app/bin/bitmaps/circle.xpm delete mode 100644 app/bin/bitmaps/circle1.xpm delete mode 100644 app/bin/bitmaps/circle2.xpm delete mode 100644 app/bin/bitmaps/circle3.xpm delete mode 100644 app/bin/bitmaps/cnote.xpm create mode 100644 app/bin/bitmaps/connect.xpm create mode 100644 app/bin/bitmaps/convert-from.xpm create mode 100644 app/bin/bitmaps/convert-to.xpm delete mode 100644 app/bin/bitmaps/convertfr.xpm delete mode 100644 app/bin/bitmaps/convertto.xpm create mode 100644 app/bin/bitmaps/copy.xpm delete mode 100644 app/bin/bitmaps/curve1.xpm delete mode 100644 app/bin/bitmaps/curve2.xpm delete mode 100644 app/bin/bitmaps/curve3.xpm delete mode 100644 app/bin/bitmaps/curve4.xpm create mode 100644 app/bin/bitmaps/curved-chord.xpm create mode 100644 app/bin/bitmaps/curved-end.xpm create mode 100644 app/bin/bitmaps/curved-line-chord.xpm create mode 100644 app/bin/bitmaps/curved-line-end.xpm create mode 100644 app/bin/bitmaps/curved-line-middle.xpm create mode 100644 app/bin/bitmaps/curved-line-tangent.xpm create mode 100644 app/bin/bitmaps/curved-middle.xpm create mode 100644 app/bin/bitmaps/curved-tangent.xpm create mode 100644 app/bin/bitmaps/cut.xpm delete mode 100644 app/bin/bitmaps/dbench.xpm delete mode 100644 app/bin/bitmaps/dbezier.xpm delete mode 100644 app/bin/bitmaps/dbox.xpm delete mode 100644 app/bin/bitmaps/dcircle1.xpm delete mode 100644 app/bin/bitmaps/dcircle2.xpm delete mode 100644 app/bin/bitmaps/dcircle3.xpm delete mode 100644 app/bin/bitmaps/dcurve1.xpm delete mode 100644 app/bin/bitmaps/dcurve2.xpm delete mode 100644 app/bin/bitmaps/dcurve3.xpm delete mode 100644 app/bin/bitmaps/dcurve4.xpm delete mode 100644 app/bin/bitmaps/ddimlin.xpm create mode 100644 app/bin/bitmaps/description.xpm delete mode 100644 app/bin/bitmaps/dfilbox.xpm delete mode 100644 app/bin/bitmaps/dfilpoly.xpm delete mode 100644 app/bin/bitmaps/dflcrcl1.xpm delete mode 100644 app/bin/bitmaps/dflcrcl2.xpm delete mode 100644 app/bin/bitmaps/dflcrcl3.xpm create mode 100644 app/bin/bitmaps/dimension.xpm delete mode 100644 app/bin/bitmaps/dline.xpm create mode 100644 app/bin/bitmaps/doc-export-bmap.xpm create mode 100644 app/bin/bitmaps/doc-export-dxf.xpm create mode 100644 app/bin/bitmaps/doc-export-svg.xpm create mode 100644 app/bin/bitmaps/doc-export-xtc.xpm create mode 100644 app/bin/bitmaps/doc-export.xpm create mode 100644 app/bin/bitmaps/doc-import-xtc.xpm create mode 100644 app/bin/bitmaps/doc-import.xpm create mode 100644 app/bin/bitmaps/doc-new.xpm create mode 100644 app/bin/bitmaps/doc-open.xpm create mode 100644 app/bin/bitmaps/doc-print.xpm create mode 100644 app/bin/bitmaps/doc-revert.xpm create mode 100644 app/bin/bitmaps/doc-save-as.xpm create mode 100644 app/bin/bitmaps/doc-save.xpm create mode 100644 app/bin/bitmaps/doc-setup.xpm delete mode 100644 app/bin/bitmaps/document-export.xpm delete mode 100644 app/bin/bitmaps/document-exportdxf.xpm delete mode 100644 app/bin/bitmaps/document-import.xpm delete mode 100644 app/bin/bitmaps/document-importmod.xpm delete mode 100644 app/bin/bitmaps/document-new.xpm delete mode 100644 app/bin/bitmaps/document-open.xpm delete mode 100644 app/bin/bitmaps/document-print.xpm delete mode 100644 app/bin/bitmaps/document-save.xpm create mode 100644 app/bin/bitmaps/down.xpm delete mode 100644 app/bin/bitmaps/dpoly.xpm delete mode 100644 app/bin/bitmaps/dpolyline.xpm delete mode 100644 app/bin/bitmaps/dtbledge.xpm create mode 100644 app/bin/bitmaps/ease-broad.xpm create mode 100644 app/bin/bitmaps/ease-cornu.xpm create mode 100644 app/bin/bitmaps/ease-gt-broad.xpm create mode 100644 app/bin/bitmaps/ease-gt-sharp.xpm create mode 100644 app/bin/bitmaps/ease-lt-broad.xpm create mode 100644 app/bin/bitmaps/ease-lt-sharp.xpm create mode 100644 app/bin/bitmaps/ease-none.xpm create mode 100644 app/bin/bitmaps/ease-normal.xpm create mode 100644 app/bin/bitmaps/ease-sharp.xpm delete mode 100644 app/bin/bitmaps/ebroad.xpm delete mode 100644 app/bin/bitmaps/ecornu.xpm delete mode 100644 app/bin/bitmaps/edit-redo.xpm delete mode 100644 app/bin/bitmaps/edit-undo.xpm delete mode 100644 app/bin/bitmaps/egtbroad.xpm delete mode 100644 app/bin/bitmaps/egtsharp.xpm delete mode 100644 app/bin/bitmaps/elev.xpm create mode 100644 app/bin/bitmaps/elevation.xpm delete mode 100644 app/bin/bitmaps/eltbroad.xpm delete mode 100644 app/bin/bitmaps/eltsharp.xpm delete mode 100644 app/bin/bitmaps/enone.xpm delete mode 100644 app/bin/bitmaps/enormal.xpm delete mode 100644 app/bin/bitmaps/esharp.xpm create mode 100644 app/bin/bitmaps/filled-box.xpm create mode 100644 app/bin/bitmaps/filled-polygon.xpm delete mode 100644 app/bin/bitmaps/flip.xpm create mode 100644 app/bin/bitmaps/funnel.xpm create mode 100644 app/bin/bitmaps/funnelclear.xpm create mode 100644 app/bin/bitmaps/helix.xpm delete mode 100644 app/bin/bitmaps/hndldto.xpm create mode 100644 app/bin/bitmaps/join-line.xpm delete mode 100644 app/bin/bitmaps/joinline.xpm create mode 100644 app/bin/bitmaps/layers.xpm delete mode 100644 app/bin/bitmaps/magnifier.xpm create mode 100644 app/bin/bitmaps/manage.xpm delete mode 100644 app/bin/bitmaps/movedesc.xpm create mode 100644 app/bin/bitmaps/new-car.xpm delete mode 100644 app/bin/bitmaps/newcar.xpm create mode 100644 app/bin/bitmaps/note.xpm create mode 100644 app/bin/bitmaps/ok.xpm delete mode 100644 app/bin/bitmaps/openbutt.xpm create mode 100644 app/bin/bitmaps/pan-zoom.xpm delete mode 100644 app/bin/bitmaps/pan.xpm create mode 100644 app/bin/bitmaps/parameter.xpm create mode 100644 app/bin/bitmaps/paste.xpm create mode 100644 app/bin/bitmaps/pause.xpm create mode 100644 app/bin/bitmaps/polygon.xpm create mode 100644 app/bin/bitmaps/polyline.xpm create mode 100644 app/bin/bitmaps/protractor.xpm delete mode 100644 app/bin/bitmaps/pull.xpm create mode 100644 app/bin/bitmaps/redo.xpm create mode 100644 app/bin/bitmaps/reflect.xpm create mode 100644 app/bin/bitmaps/snap-curs.xpm create mode 100644 app/bin/bitmaps/snap-grid.xpm delete mode 100644 app/bin/bitmaps/snapcurs.xbm delete mode 100644 app/bin/bitmaps/snapvis.xbm create mode 100644 app/bin/bitmaps/split-draw.xpm create mode 100644 app/bin/bitmaps/split.xpm delete mode 100644 app/bin/bitmaps/splittrk.xpm create mode 100644 app/bin/bitmaps/sticky-doc.xpm create mode 100644 app/bin/bitmaps/sticky-link.xpm delete mode 100644 app/bin/bitmaps/sticky-note-chain.xpm delete mode 100644 app/bin/bitmaps/sticky-note-clip.xpm delete mode 100644 app/bin/bitmaps/sticky-note-text.xpm create mode 100644 app/bin/bitmaps/sticky-note.xpm create mode 100644 app/bin/bitmaps/straight-line.xpm create mode 100644 app/bin/bitmaps/switch-ai.xpm create mode 100644 app/bin/bitmaps/table-edge.xpm create mode 100644 app/bin/bitmaps/top.xpm create mode 100644 app/bin/bitmaps/trim.xpm create mode 100644 app/bin/bitmaps/turnout-designer.xpm create mode 100644 app/bin/bitmaps/turntable.xpm delete mode 100644 app/bin/bitmaps/turntbl.xpm create mode 100644 app/bin/bitmaps/undo.xpm create mode 100644 app/bin/bitmaps/zoom-choose.xpm create mode 100644 app/bin/bitmaps/zoom-extent.xpm create mode 100644 app/bin/bitmaps/zoom-in.xpm create mode 100644 app/bin/bitmaps/zoom-out.xpm delete mode 100644 app/bin/bitmaps/zoom.xpm delete mode 100644 app/bin/bitmaps/zoomin.xpm delete mode 100644 app/bin/bitmaps/zoomout.xpm create mode 100644 app/bin/common-ui.h create mode 100644 app/bin/include/levenshtein.h create mode 100644 app/bin/include/svgformat.h create mode 100644 app/bin/include/utlist.h create mode 100644 app/bin/levenshtein.c create mode 100644 app/bin/svgformat.c create mode 100644 app/bin/svgoutput.c (limited to 'app/bin') diff --git a/app/bin/CMakeLists.txt b/app/bin/CMakeLists.txt index 2dea1bc..8d28205 100644 --- a/app/bin/CMakeLists.txt +++ b/app/bin/CMakeLists.txt @@ -1,6 +1,7 @@ include( CheckSymbolExists ) ADD_EXECUTABLE(cnvdsgn cnvdsgn.c utility.c) + IF(NOT WIN32) TARGET_LINK_LIBRARIES(cnvdsgn m) ENDIF(NOT WIN32) @@ -53,15 +54,24 @@ ADD_CUSTOM_COMMAND( COMMAND genhelp ${GENHELP_OPTS} ${help_SOURCE_DIR}/genhelp.json ${CMAKE_CURRENT_BINARY_DIR}/bllnhlp.c ) +ADD_EXECUTABLE(xtrkcad WIN32 + misc.c + xtrkcad.rc +) + SET(SOURCES ${LIN_SOURCES} appdefaults.c archive.c + archive.h bllnhlp.c cbezier.c + cbezier.h cblock.c ccornu.c + ccornu.h ccurve.c + ccurve.h ccontrol.c cdraw.c celev.c @@ -69,21 +79,27 @@ SET(SOURCES chndldto.c chotbar.c cjoin.c + cjoin.h cmisc.c cmodify.c cnote.c + common.h + common-ui.h compound.c + compound.h cparalle.c cprint.c cprofile.c cpull.c cruler.c cselect.c + cselect.h csensor.c csnap.c csplit.c csignal.c cstraigh.c + cstraigh.h cstruct.c cswitchmotor.c ctext.c @@ -93,6 +109,7 @@ SET(SOURCES cturntbl.c cundo.c custom.c + custom.h dbench.c dbitmap.c dcar.c @@ -107,8 +124,10 @@ SET(SOURCES dpricels.c dprmfile.c draw.c + draw.h drawgeom.c dxfformat.c + dxfformat.h dxfoutput.c elev.c file2uri.c @@ -117,10 +136,14 @@ SET(SOURCES filenoteui.c i18n.c layout.c + layout.h + levenshtein.c linknoteui.c lprintf.c macro.c manifest.c + misc.c + misc.h misc2.c param.c paramfile.c @@ -138,10 +161,13 @@ SET(SOURCES tease.c textnoteui.c track.c + track.h + trackx.h trknote.c trkseg.c tstraigh.c utility.c + utility.h validator.c cJSON.c archive.h @@ -162,10 +188,38 @@ endif(WIN32) set (SOURCES ${SOURCES} include/dirent.h + include/levenshtein.h include/paramfile.h include/paramfilelist.h + include/partcatalog.h + include/stringxtc.h + include/utlist.h ) +if(XTRKCAD_CREATE_SVG) + set (SOURCES + ${SOURCES} + svgformat.c + svgoutput.c + ) + include_directories(${MINIXML_INCLUDE_PATH}) + if(WIN32) + + add_custom_command( + TARGET xtrkcad POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${MINIXML_SHAREDLIB} + ${CMAKE_CURRENT_BINARY_DIR} + ) + + # add dll to install package + install(FILES ${MINIXML_SHAREDLIB} + DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} + ) + endif(WIN32) + +endif(XTRKCAD_CREATE_SVG) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR}) INCLUDE_DIRECTORIES(${help_BINARY_DIR}) @@ -183,15 +237,28 @@ ADD_LIBRARY(xtrkcad-lib ${SOURCES}) # This ensures that messages.h has been generated before we build xtrkcad-lib ADD_DEPENDENCIES(xtrkcad-lib Help) -ADD_EXECUTABLE(xtrkcad WIN32 - misc.c - xtrkcad.rc - ) TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-lib) TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-wlib) TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-cornu) TARGET_LINK_LIBRARIES(xtrkcad dynstring) +if(XTRKCAD_CREATE_SVG) +IF(UNIX) + if (NOT APPLE) + target_link_libraries(xtrkcad ${MINIXML_STATIC_LIBRARY}) + target_link_libraries(xtrkcad "pthread") + else(NOT APPLE) + target_link_libraries(xtrkcad ${MINIXML_LIBRARY}) + endif(NOT APPLE) +ELSE(UNIX) + target_link_libraries(xtrkcad ${MINIXML_STATIC_LIBRARY}) +ENDIF(UNIX) +endif(XTRKCAD_CREATE_SVG) + +IF(UNIX AND NOT APPLE) +target_link_libraries(xtrkcad ${LIBZIP_LIBRARY} ${LIBZIP_LIBRARIES} ${ZLIB_LIBRARY}) +ELSE(UNIX AND NOT APPLE) target_link_libraries(xtrkcad ${LIBZIP_LIBRARY} ${LIBZIP_LIBRARIES}) +ENDIF(UNIX AND NOT APPLE) ADD_EXECUTABLE(mkturnout ${LIN_SOURCES} @@ -238,13 +305,20 @@ ELSE(NOT WIN32) ) # add dll to install package - install(FILES - ${LIBZIP_SHAREDLIB} - DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} + INSTALL( + FILES + ${LIBZIP_SHAREDLIB} + DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} ) - install(FILES - ${ZLIB_SHAREDLIB} - DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} + INSTALL(FILES + ${ZLIB_SHAREDLIB} + DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} + ) + + # Copy program PDB file + INSTALL( + FILES $ + DESTINATION ${XTRKCAD_BIN_INSTALL_DIR} OPTIONAL ) ENDIF(NOT WIN32) diff --git a/app/bin/acclkeys.h b/app/bin/acclkeys.h index 4dd80fc..d8c59d3 100644 --- a/app/bin/acclkeys.h +++ b/app/bin/acclkeys.h @@ -55,6 +55,8 @@ #define ACCL_CONNECT (WCTL+WSHIFT+'j') #define ACCL_HELIX (WCTL+WSHIFT+'h') #define ACCL_SPLIT (WCTL+WSHIFT+'s') +#define ACCL_SPLITDRAW (0) +#define ACCL_TRIMDRAW (0) #define ACCL_ELEVATION (WCTL+WSHIFT+'e') #define ACCL_PROFILE (WCTL+WSHIFT+'f') #define ACCL_DELETE (WCTL+'d') @@ -89,6 +91,7 @@ #define ACCL_ABOVE (WCTL+WSHIFT+'b') #define ACCL_BELOW (WCTL+WSHIFT+'w') #define ACCL_RULER (0) +#define ACCL_ANGLE (0) /* fileM */ #define ACCL_NEW (WCTL+'n') diff --git a/app/bin/appdefaults.c b/app/bin/appdefaults.c index 55a2201..e5cff8b 100644 --- a/app/bin/appdefaults.c +++ b/app/bin/appdefaults.c @@ -20,22 +20,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include #include -#ifdef WINDOWS -#include -#include -#endif - #include "common.h" #include "custom.h" #include "fileio.h" #include "paths.h" -#include "wlib.h" enum defaultTypes { INTEGERCONSTANT, @@ -114,7 +104,7 @@ struct appDefault xtcDefaults[] = { { "misc.scale", 0, STRINGFUNCTION, { .stringFunction = GetLocalPopularScale}}, /**< the (probably) most popular scale for a region */ }; -#define DEFAULTCOUNT (sizeof(xtcDefaults)/sizeof(xtcDefaults[0])) +#define DEFAULTCOUNT COUNT(xtcDefaults) static long bFirstRun; /**< TRUE if appl is run the first time */ @@ -203,6 +193,7 @@ InitializeRegionCode(void) { strcpy(regionCode, "US"); +// TODO Move this to wlib #ifdef WINDOWS { LCID lcid; @@ -301,7 +292,7 @@ static char * GetParamFullPath(struct appDefault *ptrDefault, void *additionalData) { char *str; - MakeFullpath(&str, libDir, PARAM_SUBDIR, (char*)additionalData, (void *)0); + MakeFullpath(&str, libDir, PARAM_SUBDIR, (char*)additionalData, I2VP(0)); return str; } diff --git a/app/bin/archive.c b/app/bin/archive.c index 4e82bd3..430db49 100644 --- a/app/bin/archive.c +++ b/app/bin/archive.c @@ -20,42 +20,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include -#include -#include -#include -#include - #include -#ifdef WINDOWS - #include "include/dirent.h" - #include - #include - #include - #define unlink(a) _unlink((a)) - #define rmdir(a) _rmdir((a)) - #define open(name, flag, mode) _open((name), (flag), (mode)) - #define write(file, buffer, count) _write((file),(buffer), (count)) - #define close(file) _close((file)) - #define getpid() _getpid() -#else - #include - #include -#endif - -#include #include "archive.h" #include "directory.h" #include "dynstring.h" -#include "i18n.h" -#include "messages.h" #include "misc.h" #include "misc2.h" #include "paths.h" #include "include/utf8convert.h" +#include "common-ui.h" int log_zip = 0; @@ -63,7 +39,7 @@ int log_zip = 0; //NativeToUtf8(const char *nativeString) //{ // -//#ifdef WINDOWS +//#ifdef XINDOWS // // int cnt = 2 * (strlen(nativeString) + 1); // char *tempBuffer = MyMalloc( cnt ); @@ -227,11 +203,11 @@ BOOL_T AddDirectoryToArchive( } else { char *archPathUtf8 = MyStrdup(arch_path); char *fullPathUtf8 = MyStrdup(full_path); -#ifdef WINDOWS +#ifdef UTFCONVERT archPathUtf8 = Convert2UTF8(archPathUtf8); fullPathUtf8 = Convert2UTF8(fullPathUtf8); ConvertPathForward(archPathUtf8); -#endif // WINDOWS +#endif // UTFCONVERT zt = zip_source_file(za, fullPathUtf8, 0, -1); if (zip_file_add(za, archPathUtf8, zt, ZIP_FL_ENC_UTF_8) == -1) { zip_error_t *ziperr = zip_get_error(za); @@ -283,9 +259,9 @@ BOOL_T CreateArchive( MakeFullpath(&archive_path, workingDir, archive_name, NULL); archiveUtf8 = MyStrdup(archive_path); -#ifdef WINDOWS +#ifdef UTFCONVERT archiveUtf8 = Convert2UTF8(archiveUtf8); -#endif // WINDOWS +#endif // UTFCONVERT MyFree(archive); @@ -355,9 +331,9 @@ BOOL_T UnpackArchiveFor( long long sum; char *destBuffer = MyStrdup(pathName); -#ifdef WINDOWS +#ifdef UTFCONVERT destBuffer = Convert2UTF8(destBuffer); -#endif // WINDOWS +#endif // UTFCONVERT if ((za = zip_open(destBuffer, 0, &err)) == NULL) { @@ -408,9 +384,9 @@ BOOL_T UnpackArchiveFor( } } MakeFullpath(&dirName, tempDir, &sb.name[0], NULL); -#ifdef WINDOWS +#ifdef UTFCONVERT ConvertUTF8ToSystem(dirName); -#endif // WINDOWS +#endif // UTFCONVERT fd = fopen(dirName, "wb"); if (!fd) { NoticeMessage(MSG_ZIP_FILE_OPEN_FAIL, _("Continue"), NULL, dirName, diff --git a/app/bin/archive.h b/app/bin/archive.h index cfbb642..7977bc6 100644 --- a/app/bin/archive.h +++ b/app/bin/archive.h @@ -1,12 +1,12 @@ #ifndef HAVE_ARCHIVE_H #define HAVE_ARCHIVE_H -#include #include "common.h" enum ArchiveOps { ARCHIVE_READ, ARCHIVE_WRITE }; // has to be contiguous, see CleanupFiles()! extern int log_zip; extern const char *workingDir; +struct zip; char *GetZipDirectoryName(enum ArchiveOps op); BOOL_T AddDirectoryToArchive(struct zip * za, const char * dir_path, const char * prefix); diff --git a/app/bin/bdf2xtp.c b/app/bin/bdf2xtp.c index c979aa3..f19ceb8 100644 --- a/app/bin/bdf2xtp.c +++ b/app/bin/bdf2xtp.c @@ -1096,7 +1096,7 @@ void parse( void ) inch++; continue; } - for ( tp=tokens; tp<&tokens[ sizeof tokens / sizeof *tp ]; tp++ ){ + for ( tp=tokens; tp<&tokens[COUNT( tokens )]; tp++ ){ tlen = strlen(tp->name); if ( strncasecmp( cp, tp->name, tlen) != 0 ) continue; diff --git a/app/bin/bitmaps/16pix/bridge.png b/app/bin/bitmaps/16pix/bridge.png new file mode 100644 index 0000000..ebcde0a Binary files /dev/null and b/app/bin/bitmaps/16pix/bridge.png differ diff --git a/app/bin/bitmaps/16pix/circle-center.png b/app/bin/bitmaps/16pix/circle-center.png new file mode 100644 index 0000000..062560d Binary files /dev/null and b/app/bin/bitmaps/16pix/circle-center.png differ diff --git a/app/bin/bitmaps/16pix/circle-tangent.png b/app/bin/bitmaps/16pix/circle-tangent.png new file mode 100644 index 0000000..0dc831b Binary files /dev/null and b/app/bin/bitmaps/16pix/circle-tangent.png differ diff --git a/app/bin/bitmaps/16pix/circle.png b/app/bin/bitmaps/16pix/circle.png new file mode 100644 index 0000000..eaecd31 Binary files /dev/null and b/app/bin/bitmaps/16pix/circle.png differ diff --git a/app/bin/bitmaps/16pix/curved-chord.png b/app/bin/bitmaps/16pix/curved-chord.png new file mode 100644 index 0000000..0068d1a Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-chord.png differ diff --git a/app/bin/bitmaps/16pix/curved-end.png b/app/bin/bitmaps/16pix/curved-end.png new file mode 100644 index 0000000..49dcee3 Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-end.png differ diff --git a/app/bin/bitmaps/16pix/curved-middle.png b/app/bin/bitmaps/16pix/curved-middle.png new file mode 100644 index 0000000..d23a6a2 Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-middle.png differ diff --git a/app/bin/bitmaps/16pix/curved-tangent.png b/app/bin/bitmaps/16pix/curved-tangent.png new file mode 100644 index 0000000..6d8fcfe Binary files /dev/null and b/app/bin/bitmaps/16pix/curved-tangent.png differ diff --git a/app/bin/bitmaps/16pix/description.png b/app/bin/bitmaps/16pix/description.png new file mode 100644 index 0000000..9bd679c Binary files /dev/null and b/app/bin/bitmaps/16pix/description.png differ diff --git a/app/bin/bitmaps/16pix/elevation.png b/app/bin/bitmaps/16pix/elevation.png new file mode 100644 index 0000000..9121d56 Binary files /dev/null and b/app/bin/bitmaps/16pix/elevation.png differ diff --git a/app/bin/bitmaps/16pix/exit.png b/app/bin/bitmaps/16pix/exit.png new file mode 100644 index 0000000..ba227c3 Binary files /dev/null and b/app/bin/bitmaps/16pix/exit.png differ diff --git a/app/bin/bitmaps/16pix/palette.png b/app/bin/bitmaps/16pix/palette.png new file mode 100644 index 0000000..efcf3d3 Binary files /dev/null and b/app/bin/bitmaps/16pix/palette.png differ diff --git a/app/bin/bitmaps/16pix/pan-zoom.png b/app/bin/bitmaps/16pix/pan-zoom.png new file mode 100644 index 0000000..04d18f7 Binary files /dev/null and b/app/bin/bitmaps/16pix/pan-zoom.png differ diff --git a/app/bin/bitmaps/16pix/select.png b/app/bin/bitmaps/16pix/select.png new file mode 100644 index 0000000..39605d1 Binary files /dev/null and b/app/bin/bitmaps/16pix/select.png differ diff --git a/app/bin/bitmaps/16pix/snap-curs.png b/app/bin/bitmaps/16pix/snap-curs.png new file mode 100644 index 0000000..acf8f66 Binary files /dev/null and b/app/bin/bitmaps/16pix/snap-curs.png differ diff --git a/app/bin/bitmaps/16pix/snap-grid.png b/app/bin/bitmaps/16pix/snap-grid.png new file mode 100644 index 0000000..381b451 Binary files /dev/null and b/app/bin/bitmaps/16pix/snap-grid.png differ diff --git a/app/bin/bitmaps/24pix/description.png b/app/bin/bitmaps/24pix/description.png new file mode 100644 index 0000000..e273ed5 Binary files /dev/null and b/app/bin/bitmaps/24pix/description.png differ diff --git a/app/bin/bitmaps/24pix/exit.png b/app/bin/bitmaps/24pix/exit.png new file mode 100644 index 0000000..d3ebf2f Binary files /dev/null and b/app/bin/bitmaps/24pix/exit.png differ diff --git a/app/bin/bitmaps/24pix/pan-zoom.png b/app/bin/bitmaps/24pix/pan-zoom.png new file mode 100644 index 0000000..67ab631 Binary files /dev/null and b/app/bin/bitmaps/24pix/pan-zoom.png differ diff --git a/app/bin/bitmaps/24pix/snap-curs.png b/app/bin/bitmaps/24pix/snap-curs.png new file mode 100644 index 0000000..15154a2 Binary files /dev/null and b/app/bin/bitmaps/24pix/snap-curs.png differ diff --git a/app/bin/bitmaps/24pix/snap-grid.png b/app/bin/bitmaps/24pix/snap-grid.png new file mode 100644 index 0000000..3073985 Binary files /dev/null and b/app/bin/bitmaps/24pix/snap-grid.png differ diff --git a/app/bin/bitmaps/Info.xpm b/app/bin/bitmaps/Info.xpm new file mode 100644 index 0000000..c4fa897 --- /dev/null +++ b/app/bin/bitmaps/Info.xpm @@ -0,0 +1,116 @@ +static char *Info_x16[] = { + "16 16 11 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366FF", + "3 c #6666FF", + "4 c #6699FF", + "5 c #9999FF", + "6 c #99CCFF", + "7 c #CCCCFF", + "8 c #CCFFFF", + "9 c #FFFFFF", + " ", + " 122221 ", + " 25799763 ", + " 3899999994 ", + " 289994299993 ", + " 15999922999973 ", + " 27999912999992 ", + " 29999942999992 ", + " 29999954999992 ", + " 27999976999992 ", + " 26999999999972 ", + " 299994299994 ", + " 149997699952 ", + " 2379999833 ", + " 223312 ", + " "}; + +static char *Info_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366FF", + "3 c #6666FF", + "4 c #6699FF", + "5 c #9999FF", + "6 c #99CCFF", + "7 c #CCCCFF", + "8 c #CCFFFF", + "9 c #FFFFFF", + " ", + " 111111 ", + " 1111111111 ", + " 11115777762111 ", + " 1114999999995111 ", + " 11799994499997211 ", + " 116999971179999811 ", + " 11499999611599999511 ", + " 119999995114999999211 ", + " 1159999996114999999611 ", + " 1179999996114999999711 ", + " 1179999997115999999911 ", + " 1179999999117999999911 ", + " 1179999999117999999811 ", + " 1159999999529999999711 ", + " 129999999779999999511 ", + " 11599999711599999711 ", + " 1179999211199999211 ", + " 114999971149999511 ", + " 1127999779997311 ", + " 11157999975111 ", + " 111111111111 ", + " 11111111 ", + " "}; + +static char *Info_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366FF", + "3 c #6666FF", + "4 c #6699FF", + "5 c #9999FF", + "6 c #99CCFF", + "7 c #CCCCFF", + "8 c #CCFFFF", + "9 c #FFFFFF", + " ", + " 11 ", + " 111111111111 ", + " 1111111111111111 ", + " 111111577775211111 ", + " 11114799999999751111 ", + " 1111799999779999972111 ", + " 111279999971179999994111 ", + " 1117999999411299999992111 ", + " 11179999999111199999997111 ", + " 113999999971111799999994111 ", + " 1117999999971111799999997111 ", + " 1119999999991111799999999411 ", + " 11499999999911117999999996111 ", + " 11599999999911117999999997111 ", + " 111799999999931119999999997111 ", + " 11799999999951119999999999111 ", + " 11699999999971149999999997111 ", + " 11599999999971159999999997111 ", + " 1129999999999317999999999511 ", + " 1117999999999979999999999111 ", + " 1114999999995114999999997111 ", + " 11179999997111179999999211 ", + " 11139999997111159999995111 ", + " 111499999911117999996111 ", + " 1114999997557999995111 ", + " 111279999999999731111 ", + " 111126799998731111 ", + " 1111111111111111 ", + " 111111111111 ", + " 11111111 ", + " "}; + +static char **Info_xpm[3] = { Info_x16, Info_x24, Info_x32 }; + diff --git a/app/bin/bitmaps/SVG/Info.svg b/app/bin/bitmaps/SVG/Info.svg new file mode 100644 index 0000000..979601d --- /dev/null +++ b/app/bin/bitmaps/SVG/Info.svg @@ -0,0 +1,69 @@ + +image/svg+xml + + + + + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg new file mode 100644 index 0000000..fadc6df --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-broad.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement Broad + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg b/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg new file mode 100644 index 0000000..df906a9 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-cornu.svg @@ -0,0 +1,61 @@ + +image/svg+xml + + + + + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg new file mode 100644 index 0000000..9b2f26d --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-gt-broad.svg @@ -0,0 +1,69 @@ + +image/svg+xml + + +> BroadEasement diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg new file mode 100644 index 0000000..77031f6 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-gt-sharp.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement Sharp + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg b/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg new file mode 100644 index 0000000..3022616 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-lt-broad.svg @@ -0,0 +1,67 @@ + +image/svg+xml + + +Easement < Broad diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg new file mode 100644 index 0000000..77031f6 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-lt-sharp.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement Sharp + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-none.svg b/app/bin/bitmaps/SVG/NotUsed/ease-none.svg new file mode 100644 index 0000000..75fa776 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-none.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement None + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg b/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg new file mode 100644 index 0000000..3e94707 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-normal.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement Normal + diff --git a/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg b/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg new file mode 100644 index 0000000..77031f6 --- /dev/null +++ b/app/bin/bitmaps/SVG/NotUsed/ease-sharp.svg @@ -0,0 +1,66 @@ + +image/svg+xml + +Easement Sharp + diff --git a/app/bin/bitmaps/SVG/background.svg b/app/bin/bitmaps/SVG/background.svg new file mode 100644 index 0000000..4856eac --- /dev/null +++ b/app/bin/bitmaps/SVG/background.svg @@ -0,0 +1,153 @@ + +image/svg+xml + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/benchwork.svg b/app/bin/bitmaps/SVG/benchwork.svg new file mode 100644 index 0000000..1562ae3 --- /dev/null +++ b/app/bin/bitmaps/SVG/benchwork.svg @@ -0,0 +1,100 @@ + +image/svg+xml + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/bezier-line.svg b/app/bin/bitmaps/SVG/bezier-line.svg new file mode 100644 index 0000000..df4232b --- /dev/null +++ b/app/bin/bitmaps/SVG/bezier-line.svg @@ -0,0 +1,92 @@ + +image/svg+xml + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/bezier-track.svg b/app/bin/bitmaps/SVG/bezier-track.svg new file mode 100644 index 0000000..4f3cf33 --- /dev/null +++ b/app/bin/bitmaps/SVG/bezier-track.svg @@ -0,0 +1,424 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/block.svg b/app/bin/bitmaps/SVG/block.svg index 221d631..9d306d7 100755 --- a/app/bin/bitmaps/SVG/block.svg +++ b/app/bin/bitmaps/SVG/block.svg @@ -1,150 +1,95 @@ - - - - - - - - - - - image/svg+xml - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + inkscape:window-width="1578" + inkscape:window-height="996" + id="namedview41" + showgrid="false" + inkscape:zoom="8.7705101" + inkscape:cx="31.982176" + inkscape:cy="37.968145" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="g37" + inkscape:document-rotation="0" + inkscape:pagecheckerboard="0" /> diff --git a/app/bin/bitmaps/SVG/bottom.svg b/app/bin/bitmaps/SVG/bottom.svg new file mode 100644 index 0000000..e529c66 --- /dev/null +++ b/app/bin/bitmaps/SVG/bottom.svg @@ -0,0 +1,62 @@ + +image/svg+xml + + + + diff --git a/app/bin/bitmaps/SVG/box.svg b/app/bin/bitmaps/SVG/box.svg new file mode 100644 index 0000000..e936fa4 --- /dev/null +++ b/app/bin/bitmaps/SVG/box.svg @@ -0,0 +1,72 @@ + +image/svg+xml + + + + + diff --git a/app/bin/bitmaps/SVG/bridge.svg b/app/bin/bitmaps/SVG/bridge.svg new file mode 100644 index 0000000..af55093 --- /dev/null +++ b/app/bin/bitmaps/SVG/bridge.svg @@ -0,0 +1,162 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/building.svg b/app/bin/bitmaps/SVG/building.svg new file mode 100644 index 0000000..4b63286 --- /dev/null +++ b/app/bin/bitmaps/SVG/building.svg @@ -0,0 +1,85 @@ + +image/svg+xml + + + + + + + diff --git a/app/bin/bitmaps/SVG/car-inventory.svg b/app/bin/bitmaps/SVG/car-inventory.svg new file mode 100644 index 0000000..27d805d --- /dev/null +++ b/app/bin/bitmaps/SVG/car-inventory.svg @@ -0,0 +1,146 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/change-grid.svg b/app/bin/bitmaps/SVG/change-grid.svg new file mode 100644 index 0000000..0962f5f --- /dev/null +++ b/app/bin/bitmaps/SVG/change-grid.svg @@ -0,0 +1,136 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-center.svg b/app/bin/bitmaps/SVG/circle-center.svg new file mode 100644 index 0000000..dc1b0fc --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-center.svg @@ -0,0 +1,283 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-filled-center.svg b/app/bin/bitmaps/SVG/circle-filled-center.svg new file mode 100644 index 0000000..252ce43 --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-filled-center.svg @@ -0,0 +1,72 @@ + +image/svg+xml + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-filled-tangent.svg b/app/bin/bitmaps/SVG/circle-filled-tangent.svg new file mode 100644 index 0000000..afbf7ea --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-filled-tangent.svg @@ -0,0 +1,78 @@ + +image/svg+xml + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-line-center.svg b/app/bin/bitmaps/SVG/circle-line-center.svg new file mode 100644 index 0000000..18e05df --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-line-center.svg @@ -0,0 +1,78 @@ + +image/svg+xml + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-line-tangent.svg b/app/bin/bitmaps/SVG/circle-line-tangent.svg new file mode 100644 index 0000000..02f8c39 --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-line-tangent.svg @@ -0,0 +1,78 @@ + +image/svg+xml + + + + + + diff --git a/app/bin/bitmaps/SVG/circle-line.svg b/app/bin/bitmaps/SVG/circle-line.svg new file mode 100644 index 0000000..2aa4811 --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-line.svg @@ -0,0 +1,228 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +36 diff --git a/app/bin/bitmaps/SVG/circle-tangent.svg b/app/bin/bitmaps/SVG/circle-tangent.svg new file mode 100644 index 0000000..3e970c6 --- /dev/null +++ b/app/bin/bitmaps/SVG/circle-tangent.svg @@ -0,0 +1,272 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/circle.svg b/app/bin/bitmaps/SVG/circle.svg new file mode 100644 index 0000000..660e7fd --- /dev/null +++ b/app/bin/bitmaps/SVG/circle.svg @@ -0,0 +1,301 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + +30 diff --git a/app/bin/bitmaps/SVG/connect.svg b/app/bin/bitmaps/SVG/connect.svg new file mode 100644 index 0000000..91578a6 --- /dev/null +++ b/app/bin/bitmaps/SVG/connect.svg @@ -0,0 +1,159 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/control.svg b/app/bin/bitmaps/SVG/control.svg new file mode 100644 index 0000000..051e57f --- /dev/null +++ b/app/bin/bitmaps/SVG/control.svg @@ -0,0 +1,84 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/convert-from.svg b/app/bin/bitmaps/SVG/convert-from.svg new file mode 100644 index 0000000..259abd8 --- /dev/null +++ b/app/bin/bitmaps/SVG/convert-from.svg @@ -0,0 +1,110 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/convert-to.svg b/app/bin/bitmaps/SVG/convert-to.svg new file mode 100644 index 0000000..5876444 --- /dev/null +++ b/app/bin/bitmaps/SVG/convert-to.svg @@ -0,0 +1,107 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/copy.svg b/app/bin/bitmaps/SVG/copy.svg new file mode 100644 index 0000000..a865437 --- /dev/null +++ b/app/bin/bitmaps/SVG/copy.svg @@ -0,0 +1,57 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/cornu.svg b/app/bin/bitmaps/SVG/cornu.svg new file mode 100644 index 0000000..be91077 --- /dev/null +++ b/app/bin/bitmaps/SVG/cornu.svg @@ -0,0 +1,275 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/curved-chord.svg b/app/bin/bitmaps/SVG/curved-chord.svg new file mode 100644 index 0000000..5db0f01 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-chord.svg @@ -0,0 +1,172 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-end.svg b/app/bin/bitmaps/SVG/curved-end.svg new file mode 100644 index 0000000..4c76cb4 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-end.svg @@ -0,0 +1,160 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/curved-line-chord.svg b/app/bin/bitmaps/SVG/curved-line-chord.svg new file mode 100644 index 0000000..b1cc041 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-line-chord.svg @@ -0,0 +1,114 @@ + +image/svg+xml + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-line-end.svg b/app/bin/bitmaps/SVG/curved-line-end.svg new file mode 100644 index 0000000..365e1bd --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-line-end.svg @@ -0,0 +1,108 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-line-middle.svg b/app/bin/bitmaps/SVG/curved-line-middle.svg new file mode 100644 index 0000000..237b453 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-line-middle.svg @@ -0,0 +1,99 @@ + +image/svg+xml + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-line-tangent.svg b/app/bin/bitmaps/SVG/curved-line-tangent.svg new file mode 100644 index 0000000..dbac2e2 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-line-tangent.svg @@ -0,0 +1,190 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-middle.svg b/app/bin/bitmaps/SVG/curved-middle.svg new file mode 100644 index 0000000..011b402 --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-middle.svg @@ -0,0 +1,202 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/curved-tangent.svg b/app/bin/bitmaps/SVG/curved-tangent.svg new file mode 100644 index 0000000..e9aee6b --- /dev/null +++ b/app/bin/bitmaps/SVG/curved-tangent.svg @@ -0,0 +1,191 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/cut.svg b/app/bin/bitmaps/SVG/cut.svg new file mode 100644 index 0000000..8b8d9f0 --- /dev/null +++ b/app/bin/bitmaps/SVG/cut.svg @@ -0,0 +1,64 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/delete.svg b/app/bin/bitmaps/SVG/delete.svg new file mode 100644 index 0000000..55d6471 --- /dev/null +++ b/app/bin/bitmaps/SVG/delete.svg @@ -0,0 +1,143 @@ + +image/svg+xml + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/describe.svg b/app/bin/bitmaps/SVG/describe.svg new file mode 100644 index 0000000..495a3b8 --- /dev/null +++ b/app/bin/bitmaps/SVG/describe.svg @@ -0,0 +1,144 @@ + +image/svg+xml + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/description.svg b/app/bin/bitmaps/SVG/description.svg new file mode 100644 index 0000000..15f43e2 --- /dev/null +++ b/app/bin/bitmaps/SVG/description.svg @@ -0,0 +1,143 @@ + +image/svg+xml + + + + + + + + + + + + + +DESC diff --git a/app/bin/bitmaps/SVG/dimension.svg b/app/bin/bitmaps/SVG/dimension.svg new file mode 100644 index 0000000..7443b8a --- /dev/null +++ b/app/bin/bitmaps/SVG/dimension.svg @@ -0,0 +1,148 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + +36 + diff --git a/app/bin/bitmaps/SVG/doc-export-bmap.svg b/app/bin/bitmaps/SVG/doc-export-bmap.svg new file mode 100644 index 0000000..90a88b0 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-export-bmap.svg @@ -0,0 +1,97 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-export-dxf.svg b/app/bin/bitmaps/SVG/doc-export-dxf.svg new file mode 100644 index 0000000..30e6e79 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-export-dxf.svg @@ -0,0 +1,114 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-export-svg.svg b/app/bin/bitmaps/SVG/doc-export-svg.svg new file mode 100644 index 0000000..fcde438 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-export-svg.svg @@ -0,0 +1,76 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-export-xtc.svg b/app/bin/bitmaps/SVG/doc-export-xtc.svg new file mode 100644 index 0000000..dab12aa --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-export-xtc.svg @@ -0,0 +1,60 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-export.svg b/app/bin/bitmaps/SVG/doc-export.svg new file mode 100644 index 0000000..6954caf --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-export.svg @@ -0,0 +1,66 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-import-xtc.svg b/app/bin/bitmaps/SVG/doc-import-xtc.svg new file mode 100644 index 0000000..01f2275 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-import-xtc.svg @@ -0,0 +1,60 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-import.svg b/app/bin/bitmaps/SVG/doc-import.svg new file mode 100644 index 0000000..e2bfc72 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-import.svg @@ -0,0 +1,66 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-new.svg b/app/bin/bitmaps/SVG/doc-new.svg new file mode 100644 index 0000000..6aac25e --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-new.svg @@ -0,0 +1,63 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-open.svg b/app/bin/bitmaps/SVG/doc-open.svg new file mode 100644 index 0000000..ede9909 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-open.svg @@ -0,0 +1,72 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-print.svg b/app/bin/bitmaps/SVG/doc-print.svg new file mode 100644 index 0000000..1926edf --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-print.svg @@ -0,0 +1,94 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-revert.svg b/app/bin/bitmaps/SVG/doc-revert.svg new file mode 100644 index 0000000..f5b6290 --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-revert.svg @@ -0,0 +1,55 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-save-as.svg b/app/bin/bitmaps/SVG/doc-save-as.svg new file mode 100644 index 0000000..cf9244d --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-save-as.svg @@ -0,0 +1,99 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-save.svg b/app/bin/bitmaps/SVG/doc-save.svg new file mode 100644 index 0000000..3a553dd --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-save.svg @@ -0,0 +1,90 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/doc-setup.svg b/app/bin/bitmaps/SVG/doc-setup.svg new file mode 100644 index 0000000..1219b1e --- /dev/null +++ b/app/bin/bitmaps/SVG/doc-setup.svg @@ -0,0 +1,101 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/down.svg b/app/bin/bitmaps/SVG/down.svg new file mode 100644 index 0000000..41f83fb --- /dev/null +++ b/app/bin/bitmaps/SVG/down.svg @@ -0,0 +1,56 @@ + +image/svg+xml + + + + diff --git a/app/bin/bitmaps/SVG/elevation.svg b/app/bin/bitmaps/SVG/elevation.svg new file mode 100644 index 0000000..b6f9813 --- /dev/null +++ b/app/bin/bitmaps/SVG/elevation.svg @@ -0,0 +1,139 @@ + +image/svg+xml + + + + + + + + + + + + +Z + diff --git a/app/bin/bitmaps/SVG/exit.svg b/app/bin/bitmaps/SVG/exit.svg new file mode 100644 index 0000000..210bdb9 --- /dev/null +++ b/app/bin/bitmaps/SVG/exit.svg @@ -0,0 +1,88 @@ + +image/svg+xml + + + + + + + + + + + + + +EXIT diff --git a/app/bin/bitmaps/SVG/extend.svg b/app/bin/bitmaps/SVG/extend.svg new file mode 100644 index 0000000..eac7840 --- /dev/null +++ b/app/bin/bitmaps/SVG/extend.svg @@ -0,0 +1,154 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/filled-box.svg b/app/bin/bitmaps/SVG/filled-box.svg new file mode 100644 index 0000000..2d8e2dd --- /dev/null +++ b/app/bin/bitmaps/SVG/filled-box.svg @@ -0,0 +1,72 @@ + +image/svg+xml + + + + + diff --git a/app/bin/bitmaps/SVG/filled-polygon.svg b/app/bin/bitmaps/SVG/filled-polygon.svg new file mode 100644 index 0000000..6fe8cce --- /dev/null +++ b/app/bin/bitmaps/SVG/filled-polygon.svg @@ -0,0 +1,59 @@ + +image/svg+xml + + + + diff --git a/app/bin/bitmaps/SVG/go.svg b/app/bin/bitmaps/SVG/go.svg new file mode 100644 index 0000000..943e561 --- /dev/null +++ b/app/bin/bitmaps/SVG/go.svg @@ -0,0 +1,106 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/grid.svg b/app/bin/bitmaps/SVG/grid.svg new file mode 100644 index 0000000..23b9b93 --- /dev/null +++ b/app/bin/bitmaps/SVG/grid.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/helix.svg b/app/bin/bitmaps/SVG/helix.svg new file mode 100644 index 0000000..c88f470 --- /dev/null +++ b/app/bin/bitmaps/SVG/helix.svg @@ -0,0 +1,170 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/join-line.svg b/app/bin/bitmaps/SVG/join-line.svg new file mode 100644 index 0000000..feb8a93 --- /dev/null +++ b/app/bin/bitmaps/SVG/join-line.svg @@ -0,0 +1,94 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/join.svg b/app/bin/bitmaps/SVG/join.svg new file mode 100644 index 0000000..c441656 --- /dev/null +++ b/app/bin/bitmaps/SVG/join.svg @@ -0,0 +1,154 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/layers.svg b/app/bin/bitmaps/SVG/layers.svg new file mode 100644 index 0000000..b261d30 --- /dev/null +++ b/app/bin/bitmaps/SVG/layers.svg @@ -0,0 +1,98 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/magnet.svg b/app/bin/bitmaps/SVG/magnet.svg new file mode 100644 index 0000000..9d0b3a6 --- /dev/null +++ b/app/bin/bitmaps/SVG/magnet.svg @@ -0,0 +1,83 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/manage.svg b/app/bin/bitmaps/SVG/manage.svg new file mode 100644 index 0000000..2791e15 --- /dev/null +++ b/app/bin/bitmaps/SVG/manage.svg @@ -0,0 +1,77 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/map.svg b/app/bin/bitmaps/SVG/map.svg new file mode 100644 index 0000000..69686be --- /dev/null +++ b/app/bin/bitmaps/SVG/map.svg @@ -0,0 +1,146 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/move.svg b/app/bin/bitmaps/SVG/move.svg new file mode 100644 index 0000000..9c1e906 --- /dev/null +++ b/app/bin/bitmaps/SVG/move.svg @@ -0,0 +1,231 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/new-car.svg b/app/bin/bitmaps/SVG/new-car.svg new file mode 100644 index 0000000..6b0d579 --- /dev/null +++ b/app/bin/bitmaps/SVG/new-car.svg @@ -0,0 +1,136 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/ok.svg b/app/bin/bitmaps/SVG/ok.svg new file mode 100644 index 0000000..21e0640 --- /dev/null +++ b/app/bin/bitmaps/SVG/ok.svg @@ -0,0 +1,55 @@ + +image/svg+xml + + + diff --git a/app/bin/bitmaps/SVG/pan-zoom.svg b/app/bin/bitmaps/SVG/pan-zoom.svg new file mode 100644 index 0000000..7597072 --- /dev/null +++ b/app/bin/bitmaps/SVG/pan-zoom.svg @@ -0,0 +1,89 @@ + +image/svg+xml + + + + + + + + diff --git a/app/bin/bitmaps/SVG/parallel-line.svg b/app/bin/bitmaps/SVG/parallel-line.svg new file mode 100644 index 0000000..ad96c16 --- /dev/null +++ b/app/bin/bitmaps/SVG/parallel-line.svg @@ -0,0 +1,155 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/parallel.svg b/app/bin/bitmaps/SVG/parallel.svg new file mode 100644 index 0000000..9ff2898 --- /dev/null +++ b/app/bin/bitmaps/SVG/parallel.svg @@ -0,0 +1,221 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/parameter.svg b/app/bin/bitmaps/SVG/parameter.svg new file mode 100644 index 0000000..b686804 --- /dev/null +++ b/app/bin/bitmaps/SVG/parameter.svg @@ -0,0 +1,76 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/paste.svg b/app/bin/bitmaps/SVG/paste.svg new file mode 100644 index 0000000..7d089d6 --- /dev/null +++ b/app/bin/bitmaps/SVG/paste.svg @@ -0,0 +1,64 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/polygon.svg b/app/bin/bitmaps/SVG/polygon.svg new file mode 100644 index 0000000..f8aa925 --- /dev/null +++ b/app/bin/bitmaps/SVG/polygon.svg @@ -0,0 +1,57 @@ + +image/svg+xml + + + + diff --git a/app/bin/bitmaps/SVG/polyline.svg b/app/bin/bitmaps/SVG/polyline.svg new file mode 100644 index 0000000..695bad9 --- /dev/null +++ b/app/bin/bitmaps/SVG/polyline.svg @@ -0,0 +1,56 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/profile.svg b/app/bin/bitmaps/SVG/profile.svg new file mode 100644 index 0000000..9f76546 --- /dev/null +++ b/app/bin/bitmaps/SVG/profile.svg @@ -0,0 +1,176 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/protractor.svg b/app/bin/bitmaps/SVG/protractor.svg new file mode 100644 index 0000000..6e7d141 --- /dev/null +++ b/app/bin/bitmaps/SVG/protractor.svg @@ -0,0 +1,68 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/redo.svg b/app/bin/bitmaps/SVG/redo.svg new file mode 100644 index 0000000..77c8cb8 --- /dev/null +++ b/app/bin/bitmaps/SVG/redo.svg @@ -0,0 +1,52 @@ + +image/svg+xml + + + diff --git a/app/bin/bitmaps/SVG/reflect.svg b/app/bin/bitmaps/SVG/reflect.svg new file mode 100644 index 0000000..837743c --- /dev/null +++ b/app/bin/bitmaps/SVG/reflect.svg @@ -0,0 +1,71 @@ + +image/svg+xml + + + + + + diff --git a/app/bin/bitmaps/SVG/rotate.svg b/app/bin/bitmaps/SVG/rotate.svg new file mode 100644 index 0000000..2c788f2 --- /dev/null +++ b/app/bin/bitmaps/SVG/rotate.svg @@ -0,0 +1,222 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/ruler.svg b/app/bin/bitmaps/SVG/ruler.svg new file mode 100644 index 0000000..8cb140b --- /dev/null +++ b/app/bin/bitmaps/SVG/ruler.svg @@ -0,0 +1,81 @@ + +image/svg+xml1 diff --git a/app/bin/bitmaps/SVG/select.svg b/app/bin/bitmaps/SVG/select.svg new file mode 100644 index 0000000..bb81e69 --- /dev/null +++ b/app/bin/bitmaps/SVG/select.svg @@ -0,0 +1,153 @@ + +image/svg+xml + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/sensor.svg b/app/bin/bitmaps/SVG/sensor.svg new file mode 100644 index 0000000..4188f0e --- /dev/null +++ b/app/bin/bitmaps/SVG/sensor.svg @@ -0,0 +1,71 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/signal.svg b/app/bin/bitmaps/SVG/signal.svg new file mode 100644 index 0000000..ad01427 --- /dev/null +++ b/app/bin/bitmaps/SVG/signal.svg @@ -0,0 +1,78 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/snap-curs.svg b/app/bin/bitmaps/SVG/snap-curs.svg new file mode 100644 index 0000000..fa700ce --- /dev/null +++ b/app/bin/bitmaps/SVG/snap-curs.svg @@ -0,0 +1,130 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/snap-grid.svg b/app/bin/bitmaps/SVG/snap-grid.svg new file mode 100644 index 0000000..f6650a7 --- /dev/null +++ b/app/bin/bitmaps/SVG/snap-grid.svg @@ -0,0 +1,128 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/split-draw.svg b/app/bin/bitmaps/SVG/split-draw.svg new file mode 100644 index 0000000..d74ee25 --- /dev/null +++ b/app/bin/bitmaps/SVG/split-draw.svg @@ -0,0 +1,97 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/split.svg b/app/bin/bitmaps/SVG/split.svg new file mode 100644 index 0000000..2bc28cb --- /dev/null +++ b/app/bin/bitmaps/SVG/split.svg @@ -0,0 +1,153 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/sticky-doc.svg b/app/bin/bitmaps/SVG/sticky-doc.svg new file mode 100644 index 0000000..20ea76f --- /dev/null +++ b/app/bin/bitmaps/SVG/sticky-doc.svg @@ -0,0 +1,72 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/sticky-link.svg b/app/bin/bitmaps/SVG/sticky-link.svg new file mode 100644 index 0000000..f403661 --- /dev/null +++ b/app/bin/bitmaps/SVG/sticky-link.svg @@ -0,0 +1,76 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/sticky-note.svg b/app/bin/bitmaps/SVG/sticky-note.svg new file mode 100644 index 0000000..1fe3d30 --- /dev/null +++ b/app/bin/bitmaps/SVG/sticky-note.svg @@ -0,0 +1,88 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/stop.svg b/app/bin/bitmaps/SVG/stop.svg new file mode 100644 index 0000000..4bd5fa0 --- /dev/null +++ b/app/bin/bitmaps/SVG/stop.svg @@ -0,0 +1,106 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/straight-line.svg b/app/bin/bitmaps/SVG/straight-line.svg new file mode 100644 index 0000000..32a01a3 --- /dev/null +++ b/app/bin/bitmaps/SVG/straight-line.svg @@ -0,0 +1,126 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/straight.svg b/app/bin/bitmaps/SVG/straight.svg new file mode 100644 index 0000000..6c5f37b --- /dev/null +++ b/app/bin/bitmaps/SVG/straight.svg @@ -0,0 +1,160 @@ + +image/svg+xml + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/switch-ai.svg b/app/bin/bitmaps/SVG/switch-ai.svg new file mode 100644 index 0000000..9c842e3 --- /dev/null +++ b/app/bin/bitmaps/SVG/switch-ai.svg @@ -0,0 +1,89 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/table-edge.svg b/app/bin/bitmaps/SVG/table-edge.svg new file mode 100644 index 0000000..e2663ac --- /dev/null +++ b/app/bin/bitmaps/SVG/table-edge.svg @@ -0,0 +1,80 @@ + +image/svg+xml + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/text.svg b/app/bin/bitmaps/SVG/text.svg new file mode 100644 index 0000000..c5e5c32 --- /dev/null +++ b/app/bin/bitmaps/SVG/text.svg @@ -0,0 +1,56 @@ + +image/svg+xml + +A + diff --git a/app/bin/bitmaps/SVG/top.svg b/app/bin/bitmaps/SVG/top.svg new file mode 100644 index 0000000..ccf60ad --- /dev/null +++ b/app/bin/bitmaps/SVG/top.svg @@ -0,0 +1,62 @@ + +image/svg+xml + + + + diff --git a/app/bin/bitmaps/SVG/train.svg b/app/bin/bitmaps/SVG/train.svg new file mode 100644 index 0000000..e2d2a71 --- /dev/null +++ b/app/bin/bitmaps/SVG/train.svg @@ -0,0 +1,173 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/trim.svg b/app/bin/bitmaps/SVG/trim.svg new file mode 100644 index 0000000..553d08f --- /dev/null +++ b/app/bin/bitmaps/SVG/trim.svg @@ -0,0 +1,91 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/tunnel.svg b/app/bin/bitmaps/SVG/tunnel.svg new file mode 100644 index 0000000..c31fabe --- /dev/null +++ b/app/bin/bitmaps/SVG/tunnel.svg @@ -0,0 +1,164 @@ + +image/svg+xml diff --git a/app/bin/bitmaps/SVG/turnout-designer.svg b/app/bin/bitmaps/SVG/turnout-designer.svg new file mode 100644 index 0000000..f11cbf6 --- /dev/null +++ b/app/bin/bitmaps/SVG/turnout-designer.svg @@ -0,0 +1,179 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/turnout.svg b/app/bin/bitmaps/SVG/turnout.svg new file mode 100644 index 0000000..35b8260 --- /dev/null +++ b/app/bin/bitmaps/SVG/turnout.svg @@ -0,0 +1,168 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/turntable.svg b/app/bin/bitmaps/SVG/turntable.svg new file mode 100644 index 0000000..8dbb510 --- /dev/null +++ b/app/bin/bitmaps/SVG/turntable.svg @@ -0,0 +1,175 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/undo.svg b/app/bin/bitmaps/SVG/undo.svg new file mode 100644 index 0000000..290e251 --- /dev/null +++ b/app/bin/bitmaps/SVG/undo.svg @@ -0,0 +1,53 @@ + +image/svg+xml + + + diff --git a/app/bin/bitmaps/SVG/zoom-choose.svg b/app/bin/bitmaps/SVG/zoom-choose.svg new file mode 100644 index 0000000..1f41ba8 --- /dev/null +++ b/app/bin/bitmaps/SVG/zoom-choose.svg @@ -0,0 +1,359 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/zoom-extent.svg b/app/bin/bitmaps/SVG/zoom-extent.svg new file mode 100644 index 0000000..9ee2521 --- /dev/null +++ b/app/bin/bitmaps/SVG/zoom-extent.svg @@ -0,0 +1,247 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/zoom-in.svg b/app/bin/bitmaps/SVG/zoom-in.svg new file mode 100644 index 0000000..8c9a883 --- /dev/null +++ b/app/bin/bitmaps/SVG/zoom-in.svg @@ -0,0 +1,222 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/SVG/zoom-out.svg b/app/bin/bitmaps/SVG/zoom-out.svg new file mode 100644 index 0000000..a476985 --- /dev/null +++ b/app/bin/bitmaps/SVG/zoom-out.svg @@ -0,0 +1,215 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/bin/bitmaps/above.xpm b/app/bin/bitmaps/above.xpm deleted file mode 100644 index 07f5daf..0000000 --- a/app/bin/bitmaps/above.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * above_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ..........", -" ..... . . . .", -" ..XXX... . . ..", -" .XXXXXX.. . . .", -".XXXXXXX. . . ..", -".XXXXXXXX. . . .", -".XXXXXXXX.. . ..", -".XXXXXXXX. . . .", -".XXXXXXX. . . ..", -" .XXXXXX.. . . .", -" ..XXX... . . ..", -" ..... . . . .", -" ..........", -" ", -" "}; diff --git a/app/bin/bitmaps/background.xpm b/app/bin/bitmaps/background.xpm index 4859734..2e8a141 100644 --- a/app/bin/bitmaps/background.xpm +++ b/app/bin/bitmaps/background.xpm @@ -1,155 +1,157 @@ -/* XPM */ -static char *background[] = { -/* columns rows colors chars-per-pixel */ -"16 16 133 2 ", -" c #0B2B2B", -". c #183A3A", -"X c #789757", -"o c #799358", -"O c #7E9068", -"+ c #86A068", -"@ c #9BA77A", -"# c #99B073", -"$ c #9DB777", -"% c #98B67E", -"& c #A6BD7F", -"* c #A4BE7E", -"= c #77AAA8", -"- c #5FA7D7", -"; c #58A1DB", -": c #59A2DB", -"> c #5AA3DA", -", c #5BA4DB", -"< c #5CA4D9", -"1 c #5DA5DB", -"2 c #66ACD3", -"3 c #62A9D5", -"4 c #69AED1", -"5 c #60A9DB", -"6 c #63ACDB", -"7 c #64ACDA", -"8 c #66AFDB", -"9 c #62ACDE", -"0 c #67B0DC", -"q c #67B0DE", -"w c #68B1DB", -"e c #6BB4DB", -"r c #6EB7DB", -"t c #6FBADF", -"y c #71B9DB", -"u c #71BADB", -"i c #74BEDE", -"p c #6FBAE0", -"a c #6EB9E3", -"s c #73BEE3", -"d c #74BEE0", -"f c #72BEE4", -"g c #70BCE7", -"h c #6BBFFF", -"j c #7CC9E9", -"k c #7CCAEC", -"l c #6EC2FF", -"z c #6FC4FF", -"x c #73C8FF", -"c c #74C9FF", -"v c #78CDFF", -"b c #79CEFF", -"n c #7DD2FF", -"m c #7ED3FF", -"M c #809786", -"N c #84AC98", -"B c #93A492", -"V c #A1AD8E", -"C c #A3B587", -"Z c #A7B787", -"A c #ABB584", -"S c #A2B389", -"D c #A3B988", -"F c #A8BA94", -"G c #ACBD97", -"H c #B5BC90", -"J c #8EA8A8", -"K c #97BEAB", -"L c #8BADB7", -"P c #80B2B8", -"I c #91B5B6", -"U c #AFBFA9", -"Y c #A4C182", -"T c #B5C987", -"R c #B2C088", -"E c #BAD08E", -"W c #AFC491", -"Q c #B6CB97", -"! c #BED190", -"~ c #AFCEAA", -"^ c #BBCAA0", -"/ c #BECFA1", -"( c #BDCEA7", -") c #B5C7A9", -"_ c #BFD0AE", -"` c #BFD1AF", -"' c #A8CDBF", -"] c #C2CC95", -"[ c #C7D798", -"{ c #C3D19D", -"} c #C6D898", -"| c #CDD8A6", -" . c #D0DDA6", -".. c #C4DCB6", -"X. c #D3E0A2", -"o. c #D0E4B9", -"O. c #DBE5B9", -"+. c #D9E5BD", -"@. c #E2ECB3", -"#. c #E4EDB0", -"$. c #87B8C5", -"%. c #96CFDB", -"&. c #9CD1D5", -"*. c #98D1DF", -"=. c #A4CDC4", -"-. c #ADD7D0", -";. c #B0D1D5", -":. c #82D6FF", -">. c #83D7FF", -",. c #83D8FF", -"<. c #8CDEFF", -"1. c #95DEFC", -"2. c #99E1F6", -"3. c #A8E4ED", -"4. c #B6E6E2", -"5. c #BDEAE6", -"6. c #ADE7F8", -"7. c #E2EBCA", -"8. c #E2F3F3", -"9. c #E4F4F4", -"0. c #E6F5F5", -"q. c #E9F6F6", -"w. c #EBF7F7", -"e. c #E9F9F9", -"r. c #EEF8F8", -"t. c #F1F9F9", -"y. c #F4FBFB", -"u. c #F7FCFC", -"i. c #F9FDFD", -"p. c #FCFEFE", -"a. c #FEFFFF", -"s. c #FFFFFF", -"d. c None", -/* pixels */ -"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.", -"d.s.s.s.s.s.s.s.s.s.s.s.s.s.d.d.", -"d.s.; ; , < 5 6 7 w e r r s.d.d.", -"d.s.; l l 9 x v a m ,.1.k s.d.d.", -"d.i.< z x q b m j ,.3.5.-.i.d.d.", -"d.u.- 7 q g p s %.*.%.=.{ u.d.d.", -"d.y.3 b m t :.5.| @.o...K u.d.d.", -"d.t.2 m :.i 2.#._ .} ! = t.d.d.", -"d.w.4 u i k ' ] / W * $ = w.d.d.", -"d.q.$.<.6.;.7.+.^ ~ D % N q.d.d.", -"d.w.H O. .R T * D _ ) F I q.d.d.", -"d.q.A [ ! # Q ( F F ) V L 0.d.d.", -"d.0.@ Z C S + X o O B M J 0.d.d.", -". e.8.8.8.8.8.8.8.8.8.8.8.e.. d.", -"d. d.d.", -"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d." -}; +static char *background_x16[] = { + "16 16 23 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #333300", + "3 c #333333", + "4 c #336666", + "5 c #336699", + "6 c #339933", + "7 c #339966", + "8 c #33CC33", + "9 c #669966", + "A c #66CC66", + "B c #66CCFF", + "C c #999966", + "D c #999999", + "E c #99CC66", + "F c #99CC99", + "G c #99CCCC", + "H c #CC9999", + "I c #CCCC99", + "J c #FFCC99", + "K c #FFCCCC", + "L c #C0C0C0", + "3333333333333333", + "5BBBBBBBBDCCCCC0", + "5BBBBBBBBHC69HH0", + "5BBBBBBBBH966CH0", + "5BBBBBBBFED99HH0", + "5BBBBBGD88AHHHH0", + "5BBGLHHD88AIHHH0", + "5BGDCHHHIEIIIIH0", + "4GH77CHIIIIIIII0", + "2HH77CIIIJKKIII0", + "2HHDCFIIKKKKIIH0", + "2HHHE88EKKKJIIH0", + "2C9CE88EIKJIIIH0", + "2666CAAIIIIIIHH0", + "2969HHHHIIIHHHH0", + "2011000000000000"}; + +static char *background_x24[] = { + "24 24 23 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333333", + "3 c #339933", + "4 c #339966", + "5 c #33CC33", + "6 c #666666", + "7 c #669966", + "8 c #6699CC", + "9 c #66CC66", + "A c #66CCFF", + "B c #996666", + "C c #999966", + "D c #999999", + "E c #99CC66", + "F c #99CC99", + "G c #99CCCC", + "H c #CC9999", + "I c #CCCC99", + "J c #FFCC99", + "K c #FFCCCC", + "L c #C0C0C0", + " 0000000000000000000000 ", + "28888888888888BBBBBBBB62", + "2AAAAAAAAAAAAAHHHHCHHHC2", + "2AAAAAAAAAAAAGHH733CHHC2", + "2AAAAAAAAAAAALH73337HHC2", + "2AAAAAAAAAAAAHHC3333HHC2", + "2AAAAAAAAAAAFDEH733CHHC2", + "2AAAAAAAAAGH9559HDHHHHC2", + "2AAAAAAAAGHE5555HHHHHHC2", + "2AAAAAGHHHHE5555IIHHHHC2", + "2AAAGHHHHHHHE55IIIIIHHC2", + "2AAGH77HHHHIIIIIIIIIIHC2", + "2AGH7444HHIIIIIIIIIIIIC2", + "2CHH7444HHIIIIIKKKIIIIC2", + "2CHHC447HIIIIJKKKKIIIIC2", + "2CHHHCCCHIIIJKKKKKIIIIC2", + "2CHHHHHE55EIKKKKKJIIIHC2", + "2CHHHHE5555IKKKKKIIIIHC2", + "2CC73HH5555IIKKKIIIIHHC2", + "2C3333C9559IIIIIIIIIHHC2", + "2C3333CH9EIIIIIIIIIHHHC2", + "2C3337DHHHHIIIIIIHHHHHC2", + "2BC77CCCCCCCCCCCCCCCCCC2", + "122222222222222222222222"}; + +static char *background_x32[] = { + "32 32 28 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #336666", + "3 c #339933", + "4 c #339966", + "5 c #33CC33", + "6 c #33CC66", + "7 c #663333", + "8 c #666633", + "9 c #666666", + "A c #666699", + "B c #669966", + "C c #6699CC", + "D c #66CC66", + "E c #66CCFF", + "F c #996666", + "G c #999966", + "H c #999999", + "I c #99CC66", + "J c #99CC99", + "K c #99CCCC", + "L c #CC9999", + "M c #CCCC99", + "N c #FFCC99", + "O c #FFCCCC", + "P c #C0C0C0", + "Q c #808080", + " ", + "02AAAAAAAAAAAAAAAA97777777777710", + "0CEEEEEEEEEEEEEEEEKLLLLLLLLLLLF0", + "0CEEEEEEEEEEEEEEEELLLLGGGLLLLLF0", + "0CEEEEEEEEEEEEEEEELLLG333GLLLLF0", + "0CEEEEEEEEEEEEEEEELLG33333GLLLF0", + "0CEEEEEEEEEEEEEEEKLLG33333GLLLF0", + "0CEEEEEEEEEEEEEEELLLG33333BLLLF0", + "0CEEEEEEEEEEEEEEJLLILB333BLLLLF0", + "0CEEEEEEEEEEEEELI555ILBGGGLLLLF0", + "0CEEEEEEEEEEEKLI55555ILLLLLLLLF0", + "0CEEEEEEEEEEPLLD55555ILLLLLLLLF0", + "0CEEEEEEKPLLLLLI55555DMMLLLLLLF0", + "0CEEEELLLLLLLLLID555DMMMMMLLLLF0", + "0CEEEKLLLLLLLLLLM6IIMMMMMMMLLLF0", + "0CEEKLG44BLLLLLMMMMMMMMMMMMMMLF0", + "0CEKLHB4444LLLMMMMMMMMMMMMMMMLF0", + "0QLLLG4444BLLMMMMMMMNOOMMMMMMLF0", + "09LLLH44444LMMMMMMMOOOOOMMMMMLF0", + "09LLLLB444GLMMMMMMOOOOOOMMMMMLF0", + "09LLLLL4BBLMMMMMMOOOOOOOMMMMMLF0", + "09LLLLLLLLDD5IMMOOOOOOONMMMMLLF0", + "09LLLLLLLI5555IMOOOOOOOMMMMMLLF0", + "09LLLLLLL55555DMOOOOOONMMMMMLLF0", + "09LGBBBLLD5555DMMOOOOMMMMMMLLLF0", + "09H3333BH55555DMMMMMMMMMMMMLLLF0", + "09333333GHD555MMMMMMMMMMMMLLLLF0", + "09B33333GLHIMMMMMMMMMMMMMLLLLLF0", + "09B33333GLLLLLMMMMMMMMMLLLLLLLF0", + "09LG333GLLLLLLLLLLLLLLLLLLLLLLF0", + "07FFBFFFFFFFFFFFFFFFFFFFFFFFFF80", + " 000000000000000000000000000000 "}; + +static char **background_xpm[3] = { background_x16, background_x24, background_x32 }; + diff --git a/app/bin/bitmaps/below.xpm b/app/bin/bitmaps/below.xpm deleted file mode 100644 index 43bc22a..0000000 --- a/app/bin/bitmaps/below.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * below_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ...........", -" ... . . . . .", -" ..XX.. . . . ..", -" .XXX. . . . . .", -".XXXX.. . . . ..", -".XXXX. . . . . .", -".XXXX.. . . . ..", -".XXXX. . . . . .", -".XXXX.. . . . ..", -" .XXX. . . . . .", -" ..XX.. . . . ..", -" ... . . . . .", -" ...........", -" ", -" "}; diff --git a/app/bin/bitmaps/benchwork.xpm b/app/bin/bitmaps/benchwork.xpm new file mode 100644 index 0000000..a94b1fa --- /dev/null +++ b/app/bin/bitmaps/benchwork.xpm @@ -0,0 +1,112 @@ +static char *benchwork_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #663300", + "3 c #993300", + "4 c #996600", + "5 c #CC6600", + "6 c #FF6600", + "7 c #FF9900", + " 2 3 ", + " 126743 ", + " 1476257 ", + " 026752677 ", + " 1366247777 ", + " 00001677777 ", + " 07772777777 ", + " 07772777777 ", + " 07772777777 ", + " 07772777777 ", + " 07772777775 ", + " 07772777742 ", + " 0777277622 ", + " 07772762 ", + " 0777252 ", + " 000012 "}; + +static char *benchwork_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC6600", + "7 c #FF6600", + "8 c #FF9900", + " ", + " 03788843 ", + " 147887368 ", + " 02688863788 ", + " 147887358888 ", + " 01688863788888 ", + " 137887447888888 ", + " 0000003688888888 ", + " 0888807888888888 ", + " 0888808888888888 ", + " 0888808888888888 ", + " 0888808888888888 ", + " 0888808888888888 ", + " 0888808888888888 ", + " 0888808888888888 ", + " 0888808888888886 ", + " 0888808888888743 ", + " 088880888888733 ", + " 0888808888863 ", + " 088880888853 ", + " 08888088733 ", + " 088880873 ", + " 08888053 ", + " 0000001 "}; + +static char *benchwork_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC6600", + "7 c #FF6600", + "8 c #FF9900", + " ", + " 027888874 ", + " 3478888736 ", + " 026888885378 ", + " 1478888736888 ", + " 16888886378888 ", + " 1378888734888888 ", + " 16888886268888888 ", + " 0378888743788888888 ", + " 16888887368888888888 ", + " 000000001788888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888888 ", + " 088888884888888888873 ", + " 08888888488888888863 ", + " 0888888848888888863 ", + " 088888884888888743 ", + " 08888888488888733 ", + " 088888884888863 ", + " 08888888488853 ", + " 0888888848733 ", + " 08888888463 ", + " 0000000033 ", + " 0 "}; + +static char **benchwork_xpm[3] = { benchwork_x16, benchwork_x24, benchwork_x32 }; + diff --git a/app/bin/bitmaps/bezier-line.xpm b/app/bin/bitmaps/bezier-line.xpm new file mode 100644 index 0000000..2aea754 --- /dev/null +++ b/app/bin/bitmaps/bezier-line.xpm @@ -0,0 +1,98 @@ +static char *bezier_line_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #800000", + " 2 ", + " 2222222222221", + " 22222222221111", + " 22 00 ", + " 00 ", + " 0 ", + " 0 ", + " 00 ", + " 0 ", + " 00 ", + " 0 ", + " 0 ", + " 00 2 ", + " 13331 2222 ", + "12222222222 2 ", + " 222 "}; + +static char *bezier_line_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " 222 ", + " 22 2222222222222221 ", + " 2 2222222222221111 ", + " 2222 00 ", + " 0 ", + " 0 ", + " 00 ", + " 00 ", + " 0 ", + " 00 ", + " 0 ", + " 00 ", + " 0 ", + " 0 ", + " 00 ", + " 0 ", + " 0 ", + " 0 ", + " 00 2222 ", + " 000 22 2 ", + " 222222222222222 2 ", + " 2222 ", + " 22 "}; + +static char *bezier_line_x32[] = { + "32 32 6 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #990000", + "3 c #CC0000", + "4 c #800000", + " ", + " 33333 ", + " 3333333 ", + " 33 333333333333333333332 ", + " 33 333333333333333333334 ", + " 3333333 0000 ", + " 33333 0000 ", + " 00 ", + " 00 ", + " 000 ", + " 000 ", + " 00 ", + " 000 ", + " 00 ", + " 000 ", + " 00 ", + " 00 ", + " 000 ", + " 00 ", + " 000 ", + " 00 ", + " 00 ", + " 000 ", + " 000 ", + " 000 ", + " 000 3333 ", + " 0000 333333 ", + " 24441142 33333333 33 ", + " 23333333333333333333 33 ", + " 233333 333 333 ", + " 33333 ", + " 333 "}; + +static char **bezier_line_xpm[3] = { bezier_line_x16, bezier_line_x24, bezier_line_x32 }; + diff --git a/app/bin/bitmaps/bezier-track.xpm b/app/bin/bitmaps/bezier-track.xpm new file mode 100644 index 0000000..a8b7d92 --- /dev/null +++ b/app/bin/bitmaps/bezier-track.xpm @@ -0,0 +1,130 @@ +static char *bezier_track_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #996666", + "2 c #999999", + "3 c #CC0000", + "4 c #CC6666", + "5 c #CC9966", + "6 c #FFCCCC", + "7 c #808080", + " ", + " 434 200", + " 3 33333333333", + " 434 07 5 5", + " 0 5 700", + " 05 602 ", + " 06 50 ", + " 06160 ", + " 05 60 ", + " 06 50 ", + " 206160 ", + "0075 60 ", + " 5 570 434 ", + "3333333333 3 ", + "002 434 ", + " "}; + +static char *bezier_track_x24[] = { + "24 24 18 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663333", + "5 c #666633", + "6 c #990000", + "7 c #993300", + "8 c #996633", + "9 c #999933", + "A c #999966", + "B c #CC0000", + "C c #CC3300", + "D c #CC3333", + "E c #CC6633", + "F c #CC9966", + "G c #CCCC66", + " ", + " FF ", + " BBBB G 00000", + " BB BBBBBBBBBBD76BEEB", + " BB BBBBBBBBB66ECBEEB", + " BBBB GF0 FF0100", + " 4F 244 G ", + " 0 GF20FF ", + " G4 2F ", + " 18G 00 ", + " 0 A5 ", + " F48 0F ", + " 05GG10 ", + " F50 A5 ", + " A5F 0 F ", + " F 0 GG20 ", + " 854 58G ", + " G G808G 00 ", + " 9218 F0 BB ", + "084 GF 02F BBBB ", + "BBBBBBBBBBBBBBBBB B ", + "083008 BBBB ", + "088 FF BBB ", + " G "}; + +static char *bezier_track_x32[] = { + "32 32 20 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663333", + "5 c #666633", + "6 c #990000", + "7 c #993300", + "8 c #996633", + "9 c #999933", + "A c #999966", + "B c #CC0000", + "C c #CC3300", + "D c #CC3333", + "E c #CC6633", + "F c #CC9933", + "G c #CC9966", + "H c #CCCC66", + "I c #800000", + " ", + " HH ", + " BBB AG80", + " BBBBBB H 0002540", + " BBB BBBBBBBBBBBBBCE76BBEFE ", + " BB BBBBBBBBBBBBBBBBBBBBBBB", + " BBB BBB EDBI6CGGC EGE ", + " BBBBB HG2 GH800340", + " BBB G5GH 484 HH ", + " 0GHHG00AH ", + " H 0 H95 ", + " H88 35H ", + " 85HH 0 ", + " 0 HHG3 ", + " HH2 H5GH ", + " HA8H 02H ", + " 2GHHG0 ", + " 0 HH8A ", + " H84 45HH ", + " 88HH 0 ", + " 0 HHH10 ", + " HG2 HG8H ", + " H 85GH 2GH ", + " HG20GHHH 0 ", + " HG0448 HG2 BBB ", + "00400GH 85GH BBBBB ", + " EFBBEFEB66DEEBBBBBBBBB BBB ", + " BBBBBBBBBBBBBBBBBBBBB BB ", + " EG7III8E BBB BBB ", + "04520 HH BBBBB ", + " HH BB ", + " "}; + +static char **bezier_track_xpm[3] = { bezier_track_x16, bezier_track_x24, bezier_track_x32 }; + diff --git a/app/bin/bitmaps/bezier.xpm b/app/bin/bitmaps/bezier.xpm deleted file mode 100644 index 6c592ed..0000000 --- a/app/bin/bitmaps/bezier.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * bezier_xpm[] = { -"16 16 4 1", -" c None", -"! c #000000000000", -"# c #FFFF00000000", -"$ c #808080000000", -" ### !!!!", -" # #########", -" ### !! !", -" $!! $!!!", -" !!$$ !! !", -" !! $!$ !", -" $$ !! !! $ ", -" !!!!!!! ", -" !! ! $$ ", -" $!! !! ", -"! !$$!! ", -"! ! $! ", -"!!!$ !!$ ", -"! !! ### ", -"######### # ", -"!!!! ### "}; \ No newline at end of file diff --git a/app/bin/bitmaps/block.xpm b/app/bin/bitmaps/block.xpm index 232d859..e3a6937 100644 --- a/app/bin/bitmaps/block.xpm +++ b/app/bin/bitmaps/block.xpm @@ -1,24 +1,138 @@ -/* XPM */ -static char * block_xpm[] = { -"16 16 5 1", -" c None", -". c #2E3436", -"+ c #00FFFF", -"@ c #25E100", -"# c #EF2929", -".. . ", -"... ... ", -" .....++ @@@ ", -" ...+++ @@@@@ ", -" ...+++ @@@@@ ", -"...++++ @@@@@ ", -" .++++++ @@@ ", -" ++ +++ ", -" +++ + ", -" ### +++ +++ ", -" ##### +++++..", -" ##### +++...", -" ##### +++... ", -" ### +++.... ", -" +......", -" .. ..."}; +static char *block_x16[] = { + "16 16 18 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006600", + "4 c #006666", + "5 c #009900", + "6 c #009999", + "7 c #00CC00", + "8 c #00FF00", + "9 c #330000", + "A c #660000", + "B c #990000", + "C c #990033", + "D c #CC0033", + "E c #FF0033", + "F c #008000", + "G c #008080", + " ", + " 0 ", + " 0 1111 ", + " 0 6 1577F1 ", + " G6 088880 ", + " 66 188881 ", + " 6 66 178871 ", + " 66 1FF3 ", + " 099966 00 ", + " 0ADDB966 66 ", + " 9DEEE9 6666 ", + " 9EEEE9 66 ", + " 9CEED9 6640 ", + " 99A9 6 0 ", + " 0 ", + " 0"}; + +static char *block_x24[] = { + "24 24 18 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #006666", + "4 c #009900", + "5 c #009999", + "6 c #00CC00", + "7 c #00FF00", + "8 c #330000", + "9 c #660000", + "A c #990000", + "B c #990033", + "C c #CC0033", + "D c #FF0033", + "E c #800000", + "F c #008000", + "G c #008080", + " ", + " 00 ", + " 000 ", + " 000 110 ", + " 000 5 1266421 ", + " 000 555 2777772 ", + " 03555 167777761 ", + " 555 177777761 ", + " 55555 177777761 ", + " 555 555 167777741 ", + " 5 555 2677761 ", + " 555 12F21 ", + " 080 555 ", + " 8BCC98 555 ", + " 8DDDDD9 555 55 ", + " 0BDDDDDC8 555555 ", + " 8CDDDDDC8 5555 ", + " 8CDDDDDC8 55G0 ", + " 9DDDDDA8 555000 ", + " 9ECDDB9 55 000 ", + " 08088 000 ", + " 000 ", + " 000", + " 0 "}; + +static char *block_x32[] = { + "32 32 19 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006600", + "4 c #006666", + "5 c #009900", + "6 c #009999", + "7 c #00CC00", + "8 c #00FF00", + "9 c #330000", + "A c #660000", + "B c #990000", + "C c #990033", + "D c #CC0033", + "E c #FF0033", + "F c #800000", + "G c #008000", + "H c #008080", + " ", + " 00 ", + " 000 ", + " 0000 ", + " 0000 00 ", + " 0000 6 135531 ", + " 0000 666 137888871 ", + " 0000 6666 1888888871 ", + " 000H666 1588888888G ", + " 26666 178888888850 ", + " 66666 178888888871 ", + " 6666666 178888888850 ", + " 6666 6666 05888888883 ", + " 66 6666 1788888851 ", + " 6666 17888851 ", + " 6666 103111 ", + " 00 6666 ", + " 99FBA9 6666 ", + " 9DEEEEDA 6666 6 ", + " 9DEEEEEED9 6666 666 ", + " 9EEEEEEEEB0 6666 666 ", + " 0FEEEEEEEED9 666666 ", + " 0FEEEEEEEED9 6666 ", + " AEEEEEEEEC0 66640 ", + " 9DEEEEEEEA 6664000 ", + " AEEEEEEB9 666 0000 ", + " 9DDDDA9 6 0000 ", + " 0999 0000 ", + " 0000 ", + " 000 ", + " 00 ", + " "}; + +static char **block_xpm[3] = { block_x16, block_x24, block_x32 }; + diff --git a/app/bin/bitmaps/bottom.xpm b/app/bin/bitmaps/bottom.xpm new file mode 100644 index 0000000..dd50a6c --- /dev/null +++ b/app/bin/bitmaps/bottom.xpm @@ -0,0 +1,101 @@ +static char *bottom_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #FF0000", + "4 c #808080", + " ", + " ", + " 000000000 ", + " 104444444440", + " 11204444444440", + " 123304444444440", + " 233304444444440", + "1233304444444440", + "1233304444444440", + "1233304444444440", + " 133304444444440", + " 13304444444440", + " 1104444444440", + " 0000000000", + " ", + " "}; + +static char *bottom_x24[] = { + "24 24 6 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #FF0000", + "4 c #808080", + " ", + " ", + " ", + " ", + " 000000000000000 ", + " 111044444444444440 ", + " 1223044444444444440 ", + " 13333044444444444440 ", + " 133333044444444444440 ", + " 1333333044444444444440 ", + " 1333333044444444444440 ", + " 1333333044444444444440 ", + " 2333333044444444444440 ", + " 1333333044444444444440 ", + " 1333333044444444444440 ", + " 1233333044444444444440 ", + " 123333044444444444440 ", + " 12333044444444444440 ", + " 1112044444444444440 ", + " 000000000000000 ", + " ", + " ", + " ", + " "}; + +static char *bottom_x32[] = { + "32 32 6 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #FF0000", + "4 c #808080", + " ", + " ", + " ", + " ", + " ", + " 00000000000000000000 ", + " 04444444444444444440 ", + " 11104444444444444444440 ", + " 1223304444444444444444440 ", + " 113333304444444444444444440 ", + " 1233333304444444444444444440 ", + " 2333333304444444444444444440 ", + " 13333333304444444444444444440 ", + " 123333333304444444444444444440 ", + " 123333333304444444444444444440 ", + " 133333333304444444444444444440 ", + " 133333333304444444444444444440 ", + " 133333333304444444444444444440 ", + " 123333333304444444444444444440 ", + " 123333333304444444444444444440 ", + " 13333333304444444444444444440 ", + " 1333333304444444444444444440 ", + " 133333304444444444444444440 ", + " 12333304444444444444444440 ", + " 1112204444444444444444440 ", + " 1104444444444444444440 ", + " 00000000000000000000 ", + " ", + " ", + " ", + " ", + " "}; + +static char **bottom_xpm[3] = { bottom_x16, bottom_x24, bottom_x32 }; + diff --git a/app/bin/bitmaps/box.xpm b/app/bin/bitmaps/box.xpm new file mode 100644 index 0000000..610fb5a --- /dev/null +++ b/app/bin/bitmaps/box.xpm @@ -0,0 +1,93 @@ +static char *box_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + " 00000000000000 ", + " 0 0 ", + " 0 22220 ", + " 0 2220 ", + " 0 22 20 ", + " 0 22 20 ", + " 0 22 0 ", + " 0 22 0 ", + " 0 2 0 ", + " 0 2 0 ", + " 0 2 0 ", + " 0 2 0 ", + " 12 0 ", + " 00000000000000 ", + " "}; + +static char *box_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " ", + " 000000000000000000000 ", + " 0 0 ", + " 0 1111111 0 ", + " 0 111111 0 ", + " 0 1111 0 ", + " 0 11 11 0 ", + " 0 11 11 0 ", + " 0 11 11 0 ", + " 0 11 0 ", + " 0 11 0 ", + " 0 11 0 ", + " 0 1 0 ", + " 0 1 0 ", + " 0 1 0 ", + " 0 1 0 ", + " 0 11 0 ", + " 0 11 0 ", + " 0 11 0 ", + " 0 0 ", + " 0000000000000000000000 ", + " ", + " "}; + +static char *box_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " ", + " ", + " 0000000000000000000000000000 ", + " 0 0 ", + " 0 11111111 0 ", + " 0 111111111 0 ", + " 0 11111 0 ", + " 0 111111 0 ", + " 0 1111111 0 ", + " 0 1111 11 0 ", + " 0 1111 11 0 ", + " 0 1111 11 0 ", + " 0 1111 11 0 ", + " 0 1111 0 ", + " 0 111 0 ", + " 0 111 0 ", + " 0 111 0 ", + " 0 111 0 ", + " 0 111 0 ", + " 0 111 0 ", + " 0 1111 0 ", + " 0 1111 0 ", + " 0 1111 0 ", + " 0 1111 0 ", + " 0 1111 0 ", + " 0 111 0 ", + " 0 0 ", + " 0000000000000000000000000000 ", + " ", + " ", + " "}; + +static char **box_xpm[3] = { box_x16, box_x24, box_x32 }; + diff --git a/app/bin/bitmaps/bridge.xbm b/app/bin/bitmaps/bridge.xbm deleted file mode 100644 index fd5857b..0000000 --- a/app/bin/bitmaps/bridge.xbm +++ /dev/null @@ -1,7 +0,0 @@ -#define bridge_width 16 -#define bridge_height 16 -// static unsigned char bridge_bits[] = { -static char bridge_bits[] = { - 0x01, 0x80, 0x01, 0x80, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x82, 0x20, - 0xff, 0xff, 0x82, 0x20, 0x82, 0x20, 0xff, 0xff, 0x82, 0x20, 0x00, 0x00, - 0x00, 0x00, 0xfe, 0x7f, 0x01, 0x80, 0x01, 0x80}; diff --git a/app/bin/bitmaps/bridge.xpm b/app/bin/bitmaps/bridge.xpm index 446f055..089542d 100644 --- a/app/bin/bitmaps/bridge.xpm +++ b/app/bin/bitmaps/bridge.xpm @@ -1,22 +1,105 @@ -/* XPM */ -static char * bridge_xpm[] = { -"16 16 3 1", -" c None", -". c #00FFFF", -"+ c #000000", -".. ..", -" .. .. ", -" ............ ", -" .......... ", -"+ + + + ", -"+++++++++++++++ ", -"+ + + + ", -"+ + + + ", -"+ + + + ", -"+++++++++++++++ ", -"+ + + + ", -" .......... ", -" ............ ", -" .. .. ", -".. ..", -" "}; +static char *bridge_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #CC6600", + " ", + " ", + "2 2 ", + "22 22 ", + " 2222222222222 ", + " 3 3 3 3 3 3 3 ", + "000000000000000 ", + " 3 3 3 3 3 3 3 ", + "010000000000000 ", + " 3 3 3 3 3 3 3 ", + " 2222222222222 ", + "22 22 ", + "2 2 ", + " ", + " ", + " "}; + +static char *bridge_x24[] = { + "24 24 8 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #996600", + "4 c #996666", + "5 c #CC6600", + "6 c #CC9900", + " ", + " ", + "444 44", + " 44 44 ", + " 44 44 ", + " 444444444444444444 ", + " 444444444444444444 ", + " ", + " 6 6 6 66 6 66 6 ", + "032023003103300300320130", + "032023003103300300320130", + " 6 6 6 66 6 66 6 ", + " 6 6 6 66 6 66 6 ", + " 6 6 6 66 6 66 6 ", + "000000000000000000000000", + " 6 6 6 66 6 66 6 ", + " ", + " ", + " 444444444444444444 ", + " 44444444444444444444 ", + " 44 44 ", + "444 444", + " 4 44", + " "}; + +static char *bridge_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #996666", + "6 c #CC6600", + "7 c #CC9900", + " ", + " ", + " 55 55", + " 55 555", + " 555 555 ", + " 555 555 ", + " 55555555555555555555555555 ", + " 555555555555555555555555 ", + " 55555555555555555555555 ", + " ", + " ", + " 77 77 777 77 77 77 77 ", + "03320033002320033002330033101330", + "00000000000000000000000000000000", + " 77 77 777 77 77 77 77 ", + " 77 77 777 77 77 77 77 ", + " 77 77 777 77 77 77 77 ", + " 77 77 777 77 77 77 77 ", + " 4430044003430044003440044202440", + "00000000000000000000000000000000", + " 77 77 777 77 77 77 77 ", + " ", + " ", + " 5555555555555555555555 ", + " 555555555555555555555555 ", + " 55555555555555555555555555 ", + " 555 555 ", + " 555 555 ", + " 55 5555", + "555 555", + " ", + " "}; + +static char **bridge_xpm[3] = { bridge_x16, bridge_x24, bridge_x32 }; + diff --git a/app/bin/bitmaps/building.xpm b/app/bin/bitmaps/building.xpm new file mode 100644 index 0000000..044e3f8 --- /dev/null +++ b/app/bin/bitmaps/building.xpm @@ -0,0 +1,125 @@ +static char *building_x16[] = { + "16 16 13 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #666600", + "4 c #666633", + "5 c #666666", + "6 c #996666", + "7 c #999966", + "8 c #999999", + "9 c #CCCCCC", + "A c #C0C0C0", + "B c #808080", + " ", + " 011111111110 ", + " 137888888841 ", + " 448AAAAAA844 ", + " 4448AAAAA634 ", + " 4846AAAA84B4 ", + " 4884333334A4 ", + " 48B5AAAA8484 ", + " 4B4999999B44 ", + " 448999999944 ", + " 159999999981 ", + "0550000000000050", + "0999999999999992", + "0999999999999992", + "0555555555555550", + " "}; + +static char *building_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663333", + "5 c #666600", + "6 c #666633", + "7 c #666666", + "8 c #996666", + "9 c #999966", + "A c #999999", + "B c #CCCCCC", + "C c #C0C0C0", + "D c #808080", + " ", + " ", + " 12222222222222220 ", + " 066777DAAAAAAAAD50 ", + " 156CCCCCCCCCCCCD62 ", + " 156DCCCCCCCCCCA652 ", + " 1686ACCCCCCCCCD662 ", + " 16A66CCCCCCCCA6982 ", + " 16CA6ACCCCCCCD6C82 ", + " 16CC66777777769B82 ", + " 16CC7377777774AB82 ", + " 16CA6BBBBBBBBA6B82 ", + " 16A6ABBBBBBBBB6D82 ", + " 1677BBBBBBBBBBC662 ", + " 156BBBBBBBBBBBB752 ", + " 06ABBBBBBBBBBBBB41 ", + "333000000000000000000333", + "3ACCBBBBBBBBBBBBBBBBCCC0", + "3BBBBBBBBBBBBBBBBBBBBBB0", + "3BBBBBBBBBBBBBBBBBBBBBB0", + "3BBBBBBBBBBBBBBBBBBBBBB0", + "3ACCCCCCCCCCCCCCCCCCCCC0", + "333333333333333333333333", + " "}; + +static char *building_x32[] = { + "32 32 14 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #663333", + "4 c #666600", + "5 c #666633", + "6 c #666666", + "7 c #996666", + "8 c #999966", + "9 c #999999", + "A c #CCCCCC", + "B c #C0C0C0", + "C c #808080", + " ", + " ", + " ", + " 0111111111111111111110 ", + " 0456666C99999999999951 ", + " 358BBBBBBBBBBBBBBBB951 ", + " 5559BBBBBBBBBBBBBBB655 ", + " 5756BBBBBBBBBBBBBB9555 ", + " 59559BBBBBBBBBBBBB7595 ", + " 59955BBBBBBBBBBBB955A5 ", + " 59B649BBBBBBBBBBBC59A5 ", + " 59B9559BBBBBBBBB955AA5 ", + " 59BB956999999999659AA5 ", + " 59BB94111111111115AAA5 ", + " 59BBC5AAAAAAAAAAA59AA5 ", + " 59B959AAAAAAAAAAA95AA5 ", + " 59B56AAAAAAAAAAAAA2CA5 ", + " 59C5AAAAAAAAAAAAAA95B5 ", + " 5959AAAAAAAAAAAAAAA555 ", + " 556AAAAAAAAAAAAAAAAB55 ", + " 33AAAAAAAAAAAAAAAAAA65 ", + " 09AAAAAAAAAAAAAAAAAAB0 ", + "20006000000000000000000000062002", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "29AAAAAAAAAAAAAAAAAAAAAAAAAAAAB2", + "20000000000000000000000000000002", + " ", + " "}; + +static char **building_xpm[3] = { building_x16, building_x24, building_x32 }; + diff --git a/app/bin/bitmaps/car-inventory.xpm b/app/bin/bitmaps/car-inventory.xpm new file mode 100644 index 0000000..45ceb2c --- /dev/null +++ b/app/bin/bitmaps/car-inventory.xpm @@ -0,0 +1,103 @@ +static char *car_inventory_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #003366", + "2 c #006600", + "3 c #663300", + "4 c #999999", + " ", + " 33333333 ", + " 33333333 ", + " 33333333 ", + " 4 ", + " 0411111111 ", + " 11111111 ", + " 11111111 ", + " 4 ", + " 0422222222 ", + " 22222222 ", + " 22222222 ", + " 4 4 4 4 ", + " 040 040 ", + " ", + " "}; + +static char *car_inventory_x24[] = { + "24 24 6 1", + " c None", + "0 c #000000", + "1 c #003366", + "2 c #006600", + "3 c #663300", + "4 c #CCCCCC", + "44444444444444444 ", + "43333333333333334 ", + "43333333333333334 ", + "43333333333333334 ", + "43333333333333334 ", + "43333333333333334 ", + "44444444444444444 ", + " 00 4444444444444444 ", + " 00041111111111111114 ", + " 0 41111111111111114 ", + " 41111111111111114 ", + " 41111111111111114 ", + " 41111111111111114 ", + " 44444444444444444 ", + " 0044444444444444444", + " 0042222222222222224", + " 0042222222222222224", + " 42222222222222224", + " 42222222222222224", + " 42222222222222224", + " 44444444444444444", + " 00 00 00 00 ", + " 00000 00000 ", + " 00 00 00 00 "}; + +static char *car_inventory_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #003366", + "2 c #006600", + "3 c #663300", + "4 c #999999", + "5 c #CCCCCC", + "6 c #C0C0C0", + " 555555555555555555555 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + "53333333333333333333335 ", + " 564555555555555555555 ", + " 0005555555555555555555555 ", + " 0005111111111111111111115 ", + " 00 5111111111111111111115 ", + " 5111111111111111111115 ", + " 5111111111111111111115 ", + " 5111111111111111111115 ", + " 5111111111111111111115 ", + " 5111111111111111111115 ", + " 5555555555555555555555 ", + " 000 5555555555555555555555", + " 00052222222222222222222225", + " 00052222222222222222222225", + " 52222222222222222222225", + " 52222222222222222222225", + " 52222222222222222222225", + " 52222222222222222222225", + " 52222222222222222222225", + " 55555555555555555555555", + " 00 00 000 00 ", + " 00000000 0000000 ", + " 0000000 0000000 ", + " 0 00 0 00 "}; + +static char **car_inventory_xpm[3] = { car_inventory_x16, car_inventory_x24, car_inventory_x32 }; + diff --git a/app/bin/bitmaps/change-grid.xpm b/app/bin/bitmaps/change-grid.xpm new file mode 100644 index 0000000..0287f34 --- /dev/null +++ b/app/bin/bitmaps/change-grid.xpm @@ -0,0 +1,118 @@ +static char *change_grid_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #00CC00", + "2 c #00CC33", + "3 c #339933", + "4 c #666666", + "5 c #669933", + "6 c #669966", + "7 c #996666", + "8 c #999966", + "9 c #CC9966", + "A c #FFCC66", + "1111111111111111", + "1111111111111111", + "1 1 11 3 1", + "1 1 11 484 1", + "11111111159A8311", + "1 1 169A94 1", + "1 1 69A962 1", + "11111148A9411111", + "1111168794211111", + "1 14994 1 1", + "1 14462 1 1", + "1111111111111111", + "11 11 11 11 11", + "1 1 11 1 1", + "11 11 11 11 11", + "1111111111111111"}; + +static char *change_grid_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #00CC00", + "2 c #33CC33", + "3 c #666666", + "4 c #669933", + "5 c #669966", + "6 c #996666", + "7 c #999966", + "8 c #CC9966", + "9 c #FF9966", + "A c #FFCC66", + " 1 1 11 1 1 ", + "111111111111111111111111", + "11 1 11 1 11", + "11 1 11 1 11", + "11 1 11 33 11", + "11 1 11 3796 11", + "1111111111111147AA932111", + "11 11 1157AAA83 11", + "11 1 147AAA83 11", + "11 1 47AAA85 11", + "11 1 37AAA831 11", + "11111111156AAA8511111111", + "111111114787A85111111111", + "11 1 39A863 1 11", + "11 1 39A83 1 11", + "11 1 33351 1 11", + "11 1 11 1 11", + "111111111111111111111111", + "11 1 11 1 11", + "11 1 11 1 11", + "11 1 11 1 11", + "11 1 11 1 11", + "111111111111111111111111", + "111111111111111111111111"}; + +static char *change_grid_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #00CC00", + "2 c #33CC33", + "3 c #666666", + "4 c #669933", + "5 c #669966", + "6 c #996666", + "7 c #999966", + "8 c #CC9966", + "9 c #FFCC66", + " ", + "11111111111111111111111111111111", + "11111111111111111111111111111111", + " 1 11 11 11 11", + " 1 11 11 11 11", + " 1 11 11 44 11", + " 1 11 11 3775 11", + " 1 11 11 379973 11", + " 1111111111111111112799997411111", + " 1111111111111111127999997411111", + " 1 11 11379999973 11", + " 1 11 1279999975 11", + " 1 11 279999974 11", + " 1 11 3799999751 11", + " 1 11 37999997311 11", + " 1111111111123899998511111111111", + " 1111111111279789984111111111111", + " 1 11 39997883 11 11", + " 1 11 3999963 11 11", + " 1 11 399985 11 11", + " 1 11 333351 11 11", + " 1 11 11 11 11", + " 1111111111111111111111111111111", + " 1111111111111111111111111111111", + " 1 11 11 11 11", + " 1 11 11 11 11", + " 1 11 11 11 11", + " 1 11 11 11 11", + " 1 11 11 11 11", + "111 11 11 111 111", + "11111111111111111111111111111111", + " "}; + +static char **change_grid_xpm[3] = { change_grid_x16, change_grid_x24, change_grid_x32 }; + diff --git a/app/bin/bitmaps/circle-center.xpm b/app/bin/bitmaps/circle-center.xpm new file mode 100644 index 0000000..e58036a --- /dev/null +++ b/app/bin/bitmaps/circle-center.xpm @@ -0,0 +1,114 @@ +static char *circle_center_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF0000", + "4 c #808080", + " 000000 ", + " 40 2 2 04 ", + " 0 2 0000 2 0 ", + " 4 00 00 4 ", + " 020 020 ", + "0 0 0 0", + "020 020", + "0 0 0 0", + "0 0 3 0 0", + "020 3 020", + "0 3 1 0", + " 020 31 0 ", + " 4 00 111 4 ", + " 0 2 0000 0 ", + " 40 2 2 04 ", + " 000000 "}; + +static char *circle_center_x24[] = { + "24 24 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666600", + "5 c #990000", + "6 c #993300", + "7 c #996600", + "8 c #CC0000", + "9 c #CC3300", + "A c #CC6600", + "B c #CC9900", + " B ", + " 07700 B ", + " B7000770017 ", + " 07A A7 B30 BB ", + " B30 B70033017 17 ", + " 33 077 BB A303B10 ", + " 0 A2 B 36 0 ", + " 00 0A BA0 33B ", + " A2B00 23B30 ", + " 13B1B B2 00 ", + " 0 0 00 0 ", + " 0 00 33A0 ", + "B3A77B 8 B77B1B", + " 2772 8 00 0 ", + " 00 0B 8 90 00 ", + " 1B37 8 A93B10 ", + " B37 0 8857A3B ", + " 0 33 8985 0 ", + " 02B307B A856B00 ", + " 31 31077022 33 ", + " B 007B 0770 B 00BB ", + " 320 77 032 ", + " B 0033007B ", + " BB "}; + +static char *circle_center_x32[] = { + "32 32 12 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #993300", + "6 c #996600", + "7 c #CC0000", + "8 c #CC3300", + "9 c #CC6600", + "A c #CC9900", + " A ", + " AA ", + " A 00000000 A ", + " 6100 AA 0220 ", + " 039 AA A900 A ", + " A 0 A 00000001A 06A ", + " A60 6200 AA 0320 31 ", + " 2A 00A A A 00 A 00 ", + " 0 A10 336 0 ", + " 00 19 A60 00AA ", + " 0 00 00 A39 ", + " A66A 0 29A20 ", + " 06A66 A91 0 ", + " 0 09A 0 0 ", + " 0 0 0 00 ", + " 00 0 7 33 33 ", + "A63A93AA 777 A36A66A", + " 62 61 777 00 00 ", + " 0 0 777 0 0 ", + " 0 03A 777 7740 0 ", + " 00A93A 777 8756 00 ", + " 63A 00 777773AA36 ", + " AA20 06A 7777 2AA ", + " 0 636 777777 00 ", + " 00 A300 A 777789 00 ", + " 36 036 AA 620 A60 ", + " AA10 9000320039 03A ", + " 000AA 96 A 000 AA ", + " 022 AA 520 ", + " A900003200029 ", + " A 96 A ", + " A "}; + +static char **circle_center_xpm[3] = { circle_center_x16, circle_center_x24, circle_center_x32 }; + diff --git a/app/bin/bitmaps/circle-filled-center.xpm b/app/bin/bitmaps/circle-filled-center.xpm new file mode 100644 index 0000000..91f7764 --- /dev/null +++ b/app/bin/bitmaps/circle-filled-center.xpm @@ -0,0 +1,145 @@ +static char *circle_filled_center_x16[] = { + "16 16 19 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #339999", + "7 c #669999", + "8 c #6699CC", + "9 c #66CCCC", + "A c #66CCFF", + "B c #9999CC", + "C c #99CCCC", + "D c #99CCFF", + "E c #99FFFF", + "F c #CC0000", + "G c #CC6666", + "H c #CC6699", + " 00 ", + " 11488413 ", + " 28AEEEEE93 ", + " 3AEEEEEEEEA3 ", + " 38EEEEEEEEEE93 ", + " 2AEEEEEEEEEEE4 ", + "05EEEEEEEEEEEE80", + "18EEEEEBDEEEEE92", + "18EEEEEDHDEEEE92", + "06EEEEEEDHDECE81", + " 4EEEEEEEDHDFE60", + " 29EEEEEEEDHGA2 ", + " 3AEEEEEBGFH4 ", + " 14AEEEEDDA43 ", + " 268AA973 ", + " 012210 "}; + +static char *circle_filled_center_x24[] = { + "24 24 20 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #339999", + "7 c #669999", + "8 c #6699CC", + "9 c #66CCCC", + "A c #66CCFF", + "B c #9999CC", + "C c #99CCCC", + "D c #99CCFF", + "E c #99FFFF", + "F c #CC0000", + "G c #CC6666", + "H c #CC6699", + "I c #CC9999", + " ", + " 11044011 ", + " 238AEEEEA942 ", + " 26AEEEEEEEEE83 ", + " 29EEEEEEEEEEEEA4 ", + " 2AEEEEEEEEEEEEEEA3 ", + " 27EEEEEEEEEEEEEEEE93 ", + " 4AEEEEEEEEEEEEEEEEE50 ", + " 19EEEEEEEEEEEEEEEEEEA2 ", + " 1AEEEEEEEEEEEEEEEEEEE1 ", + " 3EEEEEEEEEEEEEEEEEEEE50", + " 4EEEEEEEEDIDEEEEEEEEE60", + " 4EEEEEEEEECIDEEEEEEEE60", + " 3EEEEEEEEEECIDEEEEEEE50", + " 1AEEEEEEEEEECIDEEHCEE4 ", + " 29EEEEEEEEEEECIDDFBEA1 ", + " 05EEEEEEEEEEEECIDFCE71 ", + " 39EEEEEEEEEEEECHFDA2 ", + " 2AEEEEEEEEDIGFFFD4 ", + " 04AEEEEEEEDHIBCC62 ", + " 139EEEEEEEEEEA42 ", + " 26AEEEEEEA82 ", + " 2146886411 ", + " 0000 "}; + +static char *circle_filled_center_x32[] = { + "32 32 23 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #336699", + "7 c #339999", + "8 c #669999", + "9 c #6699CC", + "A c #66CCCC", + "B c #66CCFF", + "C c #9999CC", + "D c #99CCCC", + "E c #99CCFF", + "F c #99FFFF", + "G c #CC0000", + "H c #CC3333", + "I c #CC3366", + "J c #CC6666", + "K c #CC6699", + "L c #CC9999", + " ", + " 00333300 ", + " 3169ABBA97230 ", + " 35AFFFFFFFFFFB63 ", + " 4AFFFFFFFFFFFFFFB52 ", + " 5BFFFFFFFFFFFFFFFFB64 ", + " 5BFFFFFFFFFFFFFFFFFFF62 ", + " 5BFFFFFFFFFFFFFFFFFFFFB5 ", + " 3AFFFFFFFFFFFFFFFFFFFFFFB3 ", + " 5FFFFFFFFFFFFFFFFFFFFFFFF82 ", + " 3AFFFFFFFFFFFFFFFFFFFFFFFFB2 ", + " 2FFFFFFFFFFFFFFFFFFFFFFFFFF5 ", + " 07FFFFFFFFFFFFFFFFFFFFFFFFFF92 ", + " 2AFFFFFFFFFFFFFFFFFFFFFFFFFFB3 ", + " 3AFFFFFFFFFFFFEFFFFFFFFFFFFFB2 ", + " 3BFFFFFFFFFFFDHLFFFFFFFFFFFFF0 ", + " 2BFFFFFFFFFFFDHGLFFFFFFFFFFFF0 ", + " 3BFFFFFFFFFFFFDHGLFFFFFFFFFFB2 ", + " 3AFFFFFFFFFFFFFDHGLFFFFEEFFFB3 ", + " 08FFFFFFFFFFFFFFDHGLFFFIHFFFA3 ", + " 4FFFFFFFFFFFFFFFDHGLFEGHFFF60 ", + " 2BFFFFFFFFFFFFFFFDHGLEGJFFB2 ", + " 28FFFFFFFFFFFFFFFFDHGKGLFF92 ", + " 3BFFFFFFFFFFFFFFFFDHGGCFB3 ", + " 6BFFFFFFFFFFFFEKJGGGGDF73 ", + " 47FFFFFFFFFFFFLGGGHKLE94 ", + " 57FFFFFFFFFFFEEEFFFF94 ", + " 36BFFFFFFFFFFFFFFB74 ", + " 239BFFFFFFFFFFFA33 ", + " 227ABFFFFBA723 ", + " 0330000230 ", + " "}; + +static char **circle_filled_center_xpm[3] = { circle_filled_center_x16, circle_filled_center_x24, circle_filled_center_x32 }; + diff --git a/app/bin/bitmaps/circle-filled-tangent.xpm b/app/bin/bitmaps/circle-filled-tangent.xpm new file mode 100644 index 0000000..f20856e --- /dev/null +++ b/app/bin/bitmaps/circle-filled-tangent.xpm @@ -0,0 +1,148 @@ +static char *circle_filled_tangent_x16[] = { + "16 16 20 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #339999", + "7 c #666699", + "8 c #669999", + "9 c #6699CC", + "A c #66CCCC", + "B c #66CCFF", + "C c #9999CC", + "D c #99CCFF", + "E c #99FFFF", + "F c #CC3333", + "G c #CC6699", + "H c #CC9999", + "I c #CC99CC", + " 0110 ", + " 3469A842 ", + " 3AEEEEEEA31 ", + " 2BEEEEEEEEB4 ", + " 3AEEEEEEEEEEB3 ", + " 4EEEEEEEEEEEE60", + "08EEEEEEEEEEEEA1", + "2AEEEEEDCIHEEEB2", + "2AEEEEECFCDEEEB1", + "09EEEEEHCGDEEEA2", + "05EEEEEHDDGDEE90", + " 3BEEEEEEEDGDB3 ", + " 4BEEEEEEEDG71 ", + " 34BEEEEEEB74 ", + " 39ABBB931 ", + " 021120 "}; + +static char *circle_filled_tangent_x24[] = { + "24 24 22 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #336699", + "7 c #339999", + "8 c #669999", + "9 c #6699CC", + "A c #66CCCC", + "B c #66CCFF", + "C c #9999CC", + "D c #99CCCC", + "E c #99CCFF", + "F c #99FFFF", + "G c #CC0000", + "H c #CC6666", + "I c #CC6699", + "J c #CC9999", + "K c #CC99CC", + " ", + " 0315555230 ", + " 46AFFFFFFB73 ", + " 03AFFFFFFFFFFA42 ", + " 05BFFFFFFFFFFFFB73 ", + " 3BFFFFFFFFFFFFFFB5 ", + " 4AFFFFFFFFFFFFFFFFB4 ", + " 26FFFFFFFFFFFFFFFFFF94 ", + " 3BFFFFFFFFFFFFFFFFFFB2 ", + " 2FFFFFFFFFFFFFFFFFFFF5 ", + " 5FFFFFFFFFFFFFEFFFFFF80", + "07FFFFFFFFFDIHGGCFFFFF92", + "08FFFFFFFFFIGJCDEFFFFFA2", + "06FFFFFFFFFHIIEFFFFFFF90", + " 5FFFFFFFFEGKEIEFFFFFF60", + " 2BFFFFFFFEGDFEIEFFFFB2 ", + " 29FFFFFFFFEEFFEIEFFFA3 ", + " 4BFFFFFFFFFFFFEIEFB4 ", + " 5BFFFFFFFFFFFFEIE72 ", + " 48FFFFFFFFFFFFFEC4 ", + " 35BFFFFFFFFFFB74 ", + " 3AFFFFFFFFA42 ", + " 3179AA9723 ", + " 003300 "}; + +static char *circle_filled_tangent_x32[] = { + "32 32 23 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #336699", + "7 c #339999", + "8 c #669999", + "9 c #6699CC", + "A c #66CCCC", + "B c #66CCFF", + "C c #9999CC", + "D c #99CCCC", + "E c #99CCFF", + "F c #99FFFF", + "G c #CC0000", + "H c #CC3333", + "I c #CC6666", + "J c #CC6699", + "K c #CC9999", + "L c #CC99CC", + " ", + " 233003320 ", + " 2259BBFFBB9622 ", + " 28BFFFFFFFFFFB920 ", + " 25BFFFFFFFFFFFFFFB63 ", + " 37BFFFFFFFFFFFFFFFFF84 ", + " 27FFFFFFFFFFFFFFFFFFFF94 ", + " 5BFFFFFFFFFFFFFFFFFFFFF74 ", + " 4BFFFFFFFFFFFFFFFFFFFFFFB3 ", + " 28FFFFFFFFFFFFFFFFFFFFFFFFA3 ", + " 2BFFFFFFFFFFFFFFFFFFFFFFFFF4 ", + " 5FFFFFFFFFFFFFFFFFFFFFFFFFF80 ", + " 29FFFFFFFFFFFFFFFFFFFFFFFFFFB3 ", + " 3BFFFFFFFFFFFFFFFFFFFFFFFFFFB1 ", + " 2BFFFFFFFFFFFFFFEEDCDFFFFFFFF2 ", + " 0FFFFFFFFFFFFFLHGGGGGEFFFFFFF5 ", + " 1FFFFFFFFFFFFFHGGJLCEFFFFFFFF5 ", + " 2BFFFFFFFFFFFEGGGIEFFFFFFFFFF4 ", + " 3BFFFFFFFFFFFEGIJGIEFFFFFFFFF0 ", + " 3AFFFFFFFFFFFDGKEJGHEFFFFFFFB3 ", + " 07FFFFFFFFFFFCGCFEJGHEFFFFFF92 ", + " 2FFFFFFFFFFFEJEFFEJGHEFFFFF5 ", + " 29FFFFFFFFFFFFFFFFEJGHEFFFB3 ", + " 4BFFFFFFFFFFFFFFFFEJGHEFF5 ", + " 27FFFFFFFFFFFFFFFFFEJGHEA4 ", + " 49FFFFFFFFFFFFFFFFFEJDB4 ", + " 4AFFFFFFFFFFFFFFFFFFB5 ", + " 49FFFFFFFFFFFFFFFFA4 ", + " 45AFFFFFFFFFFFFB54 ", + " 359BFFFFFFB953 ", + " 2305555022 ", + " "}; + +static char **circle_filled_tangent_xpm[3] = { circle_filled_tangent_x16, circle_filled_tangent_x24, circle_filled_tangent_x32 }; + diff --git a/app/bin/bitmaps/circle-line-center.xpm b/app/bin/bitmaps/circle-line-center.xpm new file mode 100644 index 0000000..24a41f6 --- /dev/null +++ b/app/bin/bitmaps/circle-line-center.xpm @@ -0,0 +1,93 @@ +static char *circle_line_center_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " 00 ", + " 00000000 ", + " 00 00 ", + " 0 0 ", + " 00 00 ", + " 0 0 ", + "00 00", + "00 00", + "00 1 00", + "00 1 00", + " 0 1 1 00", + " 00 11 0 ", + " 0 1110 ", + " 00 00 ", + " 000 000 ", + " 000000 "}; + +static char *circle_line_center_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 00000000 ", + " 000 000 ", + " 00 00 ", + " 00 0 ", + " 0 0 ", + " 00 00 ", + " 0 0 ", + " 00 0 ", + " 0 0 ", + " 0 0 ", + " 0 1 00", + " 0 11 00", + " 0 11 00", + " 0 11 0 ", + " 00 11 1 0 ", + " 00 11 1 00 ", + " 00 111 0 ", + " 0 1111 0 ", + " 00 1 00 ", + " 000 00 ", + " 00 00 ", + " 0000000000 ", + " 000 "}; + +static char *circle_line_center_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " 0000000000 ", + " 00000000000000 ", + " 00000 00000 ", + " 0000 0000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 00 000 ", + " 000 00 ", + " 00 000 ", + " 000 00 ", + " 00 00 ", + " 00 00 ", + " 00 000", + " 00 2 000", + " 00 222 000", + " 00 2222 000", + " 00 2222 00 ", + " 00 2222 00 ", + " 000 2222 22 00 ", + " 00 2222 22 000 ", + " 00 222222 00 ", + " 000 22222 000 ", + " 000 2222222000 ", + " 000 2222221000 ", + " 000 0000 ", + " 0000 0000 ", + " 0000 00000 ", + " 0000000 0000000 ", + " 000000000000 ", + " 0000 "}; + +static char **circle_line_center_xpm[3] = { circle_line_center_x16, circle_line_center_x24, circle_line_center_x32 }; + diff --git a/app/bin/bitmaps/circle-line-tangent.xpm b/app/bin/bitmaps/circle-line-tangent.xpm new file mode 100644 index 0000000..0a5a52d --- /dev/null +++ b/app/bin/bitmaps/circle-line-tangent.xpm @@ -0,0 +1,93 @@ +static char *circle_line_tangent_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " 00 ", + " 00000000 ", + " 00 00 ", + " 00 0 ", + " 00 00 ", + " 0 0 ", + " 0 00", + "00 1111 00", + "00 11 00", + "00 1 1 00", + " 0 1 1 00", + " 00 1 0 ", + " 0 10 ", + " 00 00 ", + " 0000 000 ", + " 00000 "}; + +static char *circle_line_tangent_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " 00000000 ", + " 000 000 ", + " 00 00 ", + " 00 0 ", + " 00 0 ", + " 0 00 ", + " 0 0 ", + " 00 00 ", + " 0 0 ", + " 0 2222 0 ", + " 0 22222 00", + " 0 222 00", + " 0 22 22 0 ", + " 0 22 22 0 ", + " 00 22 22 0 ", + " 0 22 00 ", + " 00 22 0 ", + " 0 2 0 ", + " 0 00 ", + " 000 00 ", + " 00 00 ", + " 0000000000 ", + " 00 "}; + +static char *circle_line_tangent_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 000000000 ", + " 00000000000000 ", + " 000000 000000 ", + " 0000 0000 ", + " 0000 000 ", + " 000 000 ", + " 000 000 ", + " 000 00 ", + " 000 000 ", + " 00 00 ", + " 00 000 ", + " 000 00 ", + " 00 00 ", + " 00 1111111 00 ", + " 00 1111111 000", + " 00 11111 000", + " 00 111111 00 ", + " 00 11 1111 00 ", + " 00 11 1111 00 ", + " 000 11 1111 00 ", + " 00 1111 000 ", + " 000 1111 00 ", + " 00 1111 000 ", + " 000 111000 ", + " 000 1000 ", + " 000 0000 ", + " 000 0000 ", + " 0000 0000 ", + " 0000000000000000 ", + " 000000000000 ", + " 00 "}; + +static char **circle_line_tangent_xpm[3] = { circle_line_tangent_x16, circle_line_tangent_x24, circle_line_tangent_x32 }; + diff --git a/app/bin/bitmaps/circle-line.xpm b/app/bin/bitmaps/circle-line.xpm new file mode 100644 index 0000000..1f6de11 --- /dev/null +++ b/app/bin/bitmaps/circle-line.xpm @@ -0,0 +1,95 @@ +static char *circle_line_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #800000", + " 00 ", + " 00000000 ", + " 00 00 ", + " 0 22 22 0 ", + " 00 2 222 00 ", + " 0 22222 0 ", + "00 2 222222 2 00", + "0022 2200", + "0322222222222210", + "0022 2 00", + " 0 00", + " 00 0 ", + " 0 0 ", + " 00 00 ", + " 000 000 ", + " 000000 "}; + +static char *circle_line_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 00000000 ", + " 000 000 ", + " 00 00 ", + " 00 0 ", + " 00 1111 111 0 ", + " 00 11 11 00 ", + " 0 11 1111 0 ", + " 00 1111 11 00 ", + " 0 1111 1111 0 ", + " 0 1 11 1 11 0 ", + " 0 11 11 00", + " 0 111111111111111111 00", + " 0 11 11 0 ", + " 0 1 1 0 ", + " 00 0 ", + " 0 00 ", + " 00 0 ", + " 0 0 ", + " 0 00 ", + " 000 00 ", + " 00 00 ", + " 0000000000 ", + " 00 "}; + +static char *circle_line_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + " 0000000000 ", + " 00000000000000 ", + " 00000 00000 ", + " 0000 0000 ", + " 000 000 ", + " 000 222 222 000 ", + " 000 22222 22222 000 ", + " 00 2 22 22 000 ", + " 000 22 22222 00 ", + " 00 222 222 22 000 ", + " 000 22 22 22 000 ", + " 00 2 22222 222222 00 ", + " 00 222 2222 2222 222 00 ", + " 00 222 2222 00 ", + " 0022222222222222222222222222000", + " 0022222222222222222222222222100", + " 00 222 222 000", + " 00 222 222 00 ", + " 00 222 22 00 ", + " 000 00 ", + " 00 000 ", + " 00 00 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 000 0000 ", + " 0000 0000 ", + " 0000 00000 ", + " 0000000000000000 ", + " 000000000000 ", + " 0000 "}; + +static char **circle_line_xpm[3] = { circle_line_x16, circle_line_x24, circle_line_x32 }; + diff --git a/app/bin/bitmaps/circle-tangent.xpm b/app/bin/bitmaps/circle-tangent.xpm new file mode 100644 index 0000000..4ae8c69 --- /dev/null +++ b/app/bin/bitmaps/circle-tangent.xpm @@ -0,0 +1,110 @@ +static char *circle_tangent_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #808080", + " 000000 ", + " 30 2 2 03 ", + " 0 2 0000 2 0 ", + " 3 00 00 3 ", + " 020 020 ", + "0 0 0 0", + "020 020", + "0 0 0 0", + "0 0 111 0 0", + "020 11 020", + "0 0 1 1 0", + " 020 1 20 ", + " 3 00 1 3 ", + " 0 2 0000 2 0 ", + " 30 2 2 03 ", + " 000000 "}; + +static char *circle_tangent_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + " 99 ", + " 9 00330059 ", + " 5000550023 ", + " 0059 85 93009 ", + " 930 80023025 25 ", + " 139 035 99 8305900 ", + " 0 920 335 0 ", + " 00 059 950 539 ", + " 83930 3591 ", + " 03938 90 00 ", + " 0 0 0 0 ", + " 0 0 6666 2551 ", + "928839 66666 955829", + " 15 0 6666 0 0 ", + " 00 05 66666 0 00 ", + " 01953 66 666983900 ", + " 839 0 66608939 ", + " 920 38 764 029 ", + " 0395029 9316800 ", + " 35 31053022 82 ", + " 9500 9 055059 0089 ", + " 025 99 520 ", + " 8100330038 ", + " 55 9 "}; + +static char *circle_tangent_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + "9 c #800000", + " 8 ", + " 75 8 ", + " 8 00003200018 ", + " 3200 88 0320 ", + " 0028 88 8 00 8 ", + " 8 00 88000100038 058 ", + " 52 300 78 032 830 ", + " 018 0058 8 8 0088 0 ", + " 0 830 23 0 ", + " 00 138 830 038 ", + " 850 0 0 8835 ", + " 8558 00 538 00 ", + " 058828 830 0 ", + " 0 028 0 0 ", + " 0 00 0 0 ", + " 00 0 6666666 07 25 ", + "85488378 666666 8278458", + " 52 25 6666 0 0 ", + " 0 00 66666 0 0 ", + " 0 18 6666666 00 0 ", + " 00 837 666 6666 8835 00 ", + " 3388 0 6 6666 138833 ", + " 881 018 66660 288 ", + " 00 35 6666 00 ", + " 0 8700 8 8 0967 00 ", + " 17 015 8 510 870 ", + " 71 8200320037 37 ", + " 00 88 75 8 00 8 ", + " 005 88 8500 ", + " 53000 55 0003 ", + " 88 00033000 8 ", + " 88 "}; + +static char **circle_tangent_xpm[3] = { circle_tangent_x16, circle_tangent_x24, circle_tangent_x32 }; + diff --git a/app/bin/bitmaps/circle.xpm b/app/bin/bitmaps/circle.xpm new file mode 100644 index 0000000..0be3fe9 --- /dev/null +++ b/app/bin/bitmaps/circle.xpm @@ -0,0 +1,115 @@ +static char *circle_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #808080", + " 000000 ", + " 30 2 2 03 ", + " 0 2 0000 2 0 ", + " 3 00 00 3 ", + " 020 020 ", + "0 0 0 0", + "0 00 303 0", + "0 1 0 0 0 1 0", + "311110 0 011113", + "0 1 00 303 1 0", + "0 0", + " 020 020 ", + " 3 00 00 3 ", + " 0 2 0000 2 0 ", + " 30 2 2 03 ", + " 000000 "}; + +static char *circle_x24[] = { + "24 24 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #990000", + "6 c #996600", + "7 c #CC0000", + "8 c #CC3300", + "9 c #CC6600", + "A c #CC9900", + "B c #800000", + " AA ", + " 004400 A ", + " 6000660014 ", + " 06A 69 A600 A ", + " A40 60024006 24 ", + " 44A 066 A A601A40 ", + " 0 92 44 0 ", + " 00 09 AA0 64A ", + " A2A00 64A40 ", + " 14AB8 000 000 971 0 ", + " 00577 0 0000 00 777 0 ", + " 03777 000 00 007777816", + "A497787 000000 017887829", + " 26878 0000 00 77 0 ", + " 00 57 0000 000 773 0 ", + " 0A46 A4920 ", + " A49 0 04A49 ", + " A 0 24A A60 00A ", + " 01A40 A A 04A 0 ", + " 44 240660420 64 ", + " A 00 A404404A 006A ", + " 240 AA 620 ", + " A40000004A ", + " A AA A "}; + +static char *circle_x32[] = { + "32 32 14 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #990000", + "6 c #993300", + "7 c #996600", + "8 c #CC0000", + "9 c #CC3300", + "A c #CC6600", + "B c #CC9900", + "C c #800000", + " BB ", + " BB ", + " B 0000000000AB ", + " 7100 BB 0240 ", + " 02B BB BB000 B ", + " B 0 BA00000000A 04B ", + " A1 4400 BB 420 72 ", + " 1B 00BB B BB00 B 00 ", + " 0 B10 47 00 ", + " 00 17B BB0 0BB ", + " B 0 00 0 B77 ", + " B77B 0 47B 0 ", + " 07B799 0000 000 A93 0 ", + " 0 588 00000 00000 888C 00 ", + " 0 8888 00 00 00 888 00 ", + " 0 88888 0000 00 00 88888862 ", + "B74A88888 0000 00 00 888889A4B", + "BA2B9889 00000 00 888 00 ", + " 0 888 0 000 00 00 8885 00 ", + " 0 189 00000 0000 88C 00 ", + " 00 A4B BB74 0 ", + " 74BB00 2BB74 ", + " BB40 0 B 00 2AB ", + " 0 44A B40 00 ", + " 00 B700 B B 07B 0 ", + " 27 02A BB A40 BA0 ", + " B20 A100440017 2A ", + " B 00 BB 77 B 00 BB ", + " 044 BB 7700 ", + " A00004700007 ", + " BB 0470 BB ", + " BB "}; + +static char **circle_xpm[3] = { circle_x16, circle_x24, circle_x32 }; + diff --git a/app/bin/bitmaps/circle1.xpm b/app/bin/bitmaps/circle1.xpm deleted file mode 100644 index 03426f0..0000000 --- a/app/bin/bitmaps/circle1.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * circle1_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -"o c #FFFFFFFFFFFF", -" ...... ", -" . . ", -" .. .... .. ", -" .XXXXXXXXXXX . ", -" .XoooooooooX . ", -". XoXXXoXXXoX .", -". XoXoXoXoooX. .", -". XoXXXoXXooX. .", -". XoooXoooXoX. .", -". XoooXoooXoX. .", -". XoooXoXXooX .", -" .XoooooooooX . ", -" .XXXXXXXXXXX . ", -" .. .... .. ", -" . . ", -" ...... "}; diff --git a/app/bin/bitmaps/circle2.xpm b/app/bin/bitmaps/circle2.xpm deleted file mode 100644 index 343f29b..0000000 --- a/app/bin/bitmaps/circle2.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * circle2_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" . . . . . ", -" .. .... .. ", -" . ... . ... . ", -" . .. .. . ", -". . . .", -". . . .", -". . XXXX ....", -".... XX . .", -". . X X . .", -". . X X . .", -" . .. X. . ", -" . ... . ..X . ", -" .. .... .X ", -" . . . . ", -" ...... "}; diff --git a/app/bin/bitmaps/circle3.xpm b/app/bin/bitmaps/circle3.xpm deleted file mode 100644 index 3a7c9ab..0000000 --- a/app/bin/bitmaps/circle3.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * circle3_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" . . . . . ", -" .. .... .. ", -" . ... . ... . ", -" . .. .. . ", -". . . .", -". . . .", -". . XX ....", -".... XX . .", -". . X X. .", -". . X X .", -" . .. XX . ", -" . ... .XXXX . ", -" .. .... .. ", -" . . . . . ", -" ...... "}; diff --git a/app/bin/bitmaps/cnote.xpm b/app/bin/bitmaps/cnote.xpm deleted file mode 100644 index c008c24..0000000 --- a/app/bin/bitmaps/cnote.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * cnote_xpm[] = { -"16 16 3 1", -". c None", -" c #000000000000", -"X c #FFFFFFFF0000", -" ......", -" XXXXXXXX .....", -" XXXXXX X X ....", -" XXXXXX X XX ...", -" XXXXXX X XXX ..", -" XXXXXX X .", -" XXXXXX XXXXXX .", -" XXXXXX XXXXXX .", -" XXXXXX XXXXXX .", -" XXXXXX XXXXXX .", -" XXXXXX XXXXXX .", -" XXXXXXXXXXXXX .", -" XXXXXX XXXXXX .", -" XXXXXXXXXXXXX .", -" XXXXXXXXXXXXX .", -" ."}; diff --git a/app/bin/bitmaps/connect.xpm b/app/bin/bitmaps/connect.xpm new file mode 100644 index 0000000..3853635 --- /dev/null +++ b/app/bin/bitmaps/connect.xpm @@ -0,0 +1,116 @@ +static char *connect_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #003399", + "2 c #336699", + "3 c #3366CC", + "4 c #3366FF", + "5 c #3399FF", + "6 c #6699FF", + "7 c #9966CC", + "8 c #CC0000", + "9 c #CC3366", + "A c #CC3399", + " ", + " ", + " ", + " 5 4333 3435 5 ", + "1313121 1313131", + " 6 6 66 6 6 6 ", + " 313233 3313133", + "1313233 2313132", + " 6 6 9 A 6 6 ", + " 88 88 ", + "8888888888888888", + " 8 8 ", + " 8 8 ", + " ", + " ", + " "}; + +static char *connect_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #003399", + "2 c #336699", + "3 c #3366CC", + "4 c #3366FF", + "5 c #3399FF", + "6 c #6699FF", + "7 c #CC0000", + "8 c #CC3366", + "9 c #CC6699", + " ", + " ", + " ", + " ", + " 6 6 6 6 6 6 ", + " 35 5 53 35 53 43 ", + "11311311311 11311311211", + " 6 6 6 6 6 66 ", + " 6 6 6 6 6 66 ", + " 6 6 6 6 6 66 ", + "11111111111 11111111111", + " 6 6 6 6 6 66 ", + " 8 8 ", + " 77 777 ", + " 777 777 ", + " 7777777777777777777777 ", + " 7777777777 77777777777 ", + " 777 777 ", + " 777 777 ", + " 7 7 ", + " ", + " ", + " ", + " "}; + +static char *connect_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #003399", + "2 c #336699", + "3 c #3366CC", + "4 c #3366FF", + "5 c #3399FF", + "6 c #6699FF", + "7 c #CC0000", + "8 c #CC3366", + " ", + " ", + " ", + " ", + " ", + " ", + " 66 6 6 6 6 66 ", + " 33 35 53 35 53 34 ", + " 1111113111311 1131113111121 ", + " 66 6 6 6 6 66 ", + " 66 6 6 6 6 66 ", + " 66 6 6 6 6 66 ", + " 66 6 6 6 6 66 ", + " 1331113111321 1131113211331 ", + " 1331113111321 1131113211331 ", + " 66 6 6 6 6 66 ", + " 78 87 ", + " 777 777 ", + " 7777 7777 ", + " 7777 7777 ", + " 77777777777777 777777777777777 ", + " 777777777777777777777777777777 ", + " 7777 7777 ", + " 777 777 ", + " 777 777 ", + " 77 77 ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char **connect_xpm[3] = { connect_x16, connect_x24, connect_x32 }; + diff --git a/app/bin/bitmaps/control.xpm b/app/bin/bitmaps/control.xpm index bc73a57..45d1f9b 100644 --- a/app/bin/bitmaps/control.xpm +++ b/app/bin/bitmaps/control.xpm @@ -1,24 +1,129 @@ -/* XPM */ -static char * control_xpm[] = { -"16 16 5 1", -" c None", -". c #05FB0B", -"+ c #000000", -"@ c #EF2929", -"# c #25E100", -".+ + ", -"+++ +++", -" +++ +++ ", -" +++ +++ +++ ", -" ++++++++++ ", -" +++@@@+++ ", -" ++@@@@@++ ", -" ++###@@@@++ ", -" ++####@@@++ ", -" ++#####@@++ ", -" ++####@++ ", -" +++###++++ ", -" ++++++++++++ ", -" +++ +++ +++ ", -"+++ +++", -"++ ++"}; +static char *control_x16[] = { + "16 16 16 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #009900", + "4 c #00CC00", + "5 c #00FF00", + "6 c #330000", + "7 c #333300", + "8 c #660000", + "9 c #663300", + "A c #990000", + "B c #CC0000", + "C c #FF0000", + "D c #800000", + "E c #008000", + " ", + " 0 00", + " 0 00 ", + " 0 00 ", + " 0 8ABD 00 ", + " 07CCCCA0 ", + " E49CCCCD ", + " 4549CCCB ", + " 45549CCB0 ", + " 355549CA ", + " 04555496 ", + " 01455420 ", + " 0 00 0 ", + " 0 0 ", + " 0 0 ", + "0 0"}; + +static char *control_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #006600", + "2 c #009900", + "3 c #00CC00", + "4 c #00FF00", + "5 c #330000", + "6 c #339900", + "7 c #660000", + "8 c #663300", + "9 c #990000", + "A c #CC0000", + "B c #FF0000", + "C c #800000", + "D c #008000", + " ", + " 00 00 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 000005CC700000 ", + " 007ABBBBA500 ", + " 018BBBBBBA50 ", + " 0338BBBBBBA0 ", + " 014438BBBBBB70 ", + " 0244438BBBBB90 ", + " 03444438BBBB90 ", + " 0D4444438BBB90 ", + " 0044444438BB5 ", + " 0D4444443890 ", + " 002444444600 ", + " 00001333310000 ", + " 000 000000 000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 00 000", + " "}; + +static char *control_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #009900", + "4 c #00CC00", + "5 c #00FF00", + "6 c #330000", + "7 c #660000", + "8 c #663300", + "9 c #990000", + "A c #CC0000", + "B c #FF0000", + "C c #800000", + "D c #008000", + " ", + " 0 0 ", + " 000 000 ", + " 000 0000 ", + " 000 0000 ", + " 000 0000 ", + " 000 0000 ", + " 000 00 0000 ", + " 000 00077000 0000 ", + " 0000CABBBBAC00000 ", + " 06ABBBBBBBB9000 ", + " 0038BBBBBBBBB90 ", + " 0D548BBBBBBBBB70 ", + " 0045548BBBBBBBBA0 ", + " 02555548BBBBBBBB60 ", + " 035555548BBBBBBBC0 ", + " 0355555548BBBBBBC0 ", + " 0D555555548BBBBB70 ", + " 005555555548BBBB00 ", + " 035555555548BB90 ", + " 0045555555548B60 ", + " 02455555555480 ", + " 000145555554D000 ", + " 00000024444200 000 ", + " 000 00000000 000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 000 000 ", + " 00 00 ", + " "}; + +static char **control_xpm[3] = { control_x16, control_x24, control_x32 }; + diff --git a/app/bin/bitmaps/convert-from.xpm b/app/bin/bitmaps/convert-from.xpm new file mode 100644 index 0000000..ed72d8a --- /dev/null +++ b/app/bin/bitmaps/convert-from.xpm @@ -0,0 +1,99 @@ +static char *convert_from_x16[] = { + "16 16 8 1", + " c None", + "0 c #000000", + "1 c #999999", + "2 c #CC0000", + "3 c #CCCCCC", + "4 c #FF0000", + "5 c #FFFFFF", + "6 c #808080", + " 363 363 ", + "5060 10601 ", + "36 1 6006 03", + "30 101 1 63", + " 10601 060 ", + " 363 2 363 ", + " 2 ", + " 2 ", + " 42224 ", + " 424 ", + " 4 ", + " 00000 ", + " 00 ", + " 0000 ", + " 00 ", + " 00 "}; + +static char *convert_from_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC0033", + " ", + " 00 0000 ", + " 0000 00000 00 ", + " 00 00 0000 0 00 ", + " 0 00 000 00 0 ", + " 00 00 00 0 0 ", + " 0 000 0 00 ", + " 000000 22 0000 ", + " 22 ", + " 22 ", + " 2 22 ", + " 2 22 22 ", + " 2222 ", + " 22 ", + " 2 ", + " 000000 ", + " 00 ", + " 0 ", + " 00000 ", + " 00 ", + " 0 ", + " 0 ", + " 0 ", + " "}; + +static char *convert_from_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC0033", + " ", + " ", + " 00000 0000000 ", + " 00 0 0000 00 ", + " 0 00 0000 0 ", + " 0 00 000 000 00 ", + " 0 0 000 0 00 ", + " 0 000 00 00 00 ", + " 00 00 0 0 ", + " 00 0000 22 00 00 ", + " 00000 22 0000 ", + " 22 ", + " 22 ", + " 2 22 ", + " 22 22 22 ", + " 222 22 222 ", + " 22222222 ", + " 222222 ", + " 222 ", + " 2 ", + " 00000000 ", + " 00 ", + " 00 ", + " 00 ", + " 000000 ", + " 000000 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " ", + " "}; + +static char **convert_from_xpm[3] = { convert_from_x16, convert_from_x24, convert_from_x32 }; + diff --git a/app/bin/bitmaps/convert-to.xpm b/app/bin/bitmaps/convert-to.xpm new file mode 100644 index 0000000..5f5c94e --- /dev/null +++ b/app/bin/bitmaps/convert-to.xpm @@ -0,0 +1,99 @@ +static char *convert_to_x16[] = { + "16 16 8 1", + " c None", + "0 c #000000", + "1 c #999999", + "2 c #CC0000", + "3 c #CCCCCC", + "4 c #FF0000", + "5 c #FFFFFF", + "6 c #808080", + " 00000 ", + " 00 ", + " 0000 ", + " 00 ", + " 00 ", + " 2 ", + " 2 ", + " 2 ", + " 42224 ", + " 424 ", + " 363 4 363 ", + "5060 10601 ", + "36 1 6006 03", + "30 101 1 63", + " 10601 060 ", + " 363 363 "}; + +static char *convert_to_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC0033", + " ", + " 000000 ", + " 000000 ", + " 00 ", + " 00000 ", + " 00000 ", + " 00 ", + " 00 ", + " 00 ", + " 2 ", + " 2 ", + " 2 ", + " 22 2 2 ", + " 22 2 2 ", + " 2222 ", + " 22 ", + " 0000 00000 ", + " 00 0 0000 0 ", + " 0 00 0000 00 00 ", + " 0 0 00 0 0 ", + " 00 00 00 00 0 ", + " 00 000 0 0 ", + " 0000 000 ", + " "}; + +static char *convert_to_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC0033", + " ", + " ", + " 00000000 ", + " 0 ", + " 0 ", + " 0 ", + " 000000 ", + " 0 ", + " 0 ", + " 0 ", + " 0 ", + " 0 ", + " 22 ", + " 22 ", + " 22 ", + " 22 ", + " 22 22 22 ", + " 222 22 222 ", + " 22222222 ", + " 222222 ", + " 2222 ", + " 000 22 00000 ", + " 000 00 00000 000 ", + " 0 0 0000 00 ", + " 00 00 000 00 0 ", + " 00 0 000 00 00 ", + " 00 000 000 00 00 ", + " 0 00 00 0 ", + " 00 00 0 00 ", + " 0000000 00000 ", + " 00 ", + " "}; + +static char **convert_to_xpm[3] = { convert_to_x16, convert_to_x24, convert_to_x32 }; + diff --git a/app/bin/bitmaps/convertfr.xpm b/app/bin/bitmaps/convertfr.xpm deleted file mode 100644 index 7f141c8..0000000 --- a/app/bin/bitmaps/convertfr.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * convertfr_xpm[] = { -"16 16 4 1", -" c None", -"! c #000000000000", -"# c #FFFF00000000", -"$ c #808080000000", -" !!! !!!! ", -" !! !!! !!", -" !! !! !! ", -" !!!! # !!! ", -" # ", -" ## # ## ", -" ####### ", -" ### ", -" # ", -" ", -" !!!!!! ", -" !! ", -" !!!! ", -" !! ", -" !! ", -" "}; \ No newline at end of file diff --git a/app/bin/bitmaps/convertto.xpm b/app/bin/bitmaps/convertto.xpm deleted file mode 100644 index f0fead2..0000000 --- a/app/bin/bitmaps/convertto.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * convertto_xpm[] = { -"16 16 4 1", -" c None", -"! c #000000000000", -"# c #FFFF00000000", -"$ c #808080000000", -" !!! !!!! ", -" !! !!! !!", -" !! !! !! ", -" !!!! # !!! ", -" ### ", -" ####### ", -" ## # ## ", -" # ", -" # ", -" ", -" !!!!!! ", -" !! ", -" !!!! ", -" !! ", -" !! ", -" "}; \ No newline at end of file diff --git a/app/bin/bitmaps/copy.xpm b/app/bin/bitmaps/copy.xpm new file mode 100644 index 0000000..1812343 --- /dev/null +++ b/app/bin/bitmaps/copy.xpm @@ -0,0 +1,95 @@ +static char *copy_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #FFFFFF", + "111111111111 ", + "1222222222221 ", + "1222222222221 ", + "1221111111111111", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1221222222222221", + "1111222222222221", + " 1222222222221", + " 1222222222221", + " 1111111111111"}; + +static char *copy_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #FFFFFF", + " 11111111111111111 ", + "1222222222222222221 ", + "1222222222222222221 ", + "1222222222222222221 ", + "12222211111111111111111 ", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + "122221222222222222222221", + " 11111222222222222222221", + " 1222222222222222221", + " 1222222222222222221", + " 1222222222222222221", + " 11111111111111111 "}; + +static char *copy_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #FFFFFF", + " ", + " 111111111111111111111111 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222111111111111111111111111 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 122222122222222222222222222221 ", + " 111111122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 122222222222222222222221 ", + " 111111111111111111111111 ", + " "}; + +static char **copy_xpm[3] = { copy_x16, copy_x24, copy_x32 }; + diff --git a/app/bin/bitmaps/cornu.xpm b/app/bin/bitmaps/cornu.xpm index bd3a2ed..d1bffcb 100644 --- a/app/bin/bitmaps/cornu.xpm +++ b/app/bin/bitmaps/cornu.xpm @@ -1,23 +1,117 @@ -/* XPM */ -static char * cornu_xpm[] = { -"16 16 4 1", -" c None", -"! c #000000000000", -"# c #FFFF00000000", -"$ c #808080000000", -" !!$!!!! ", -" !! $ !! ", -" !! $!!! $$$", -" $! !!$ $$ !!", -" !! $! ! !!", -"!! !! !! !! ", -"! !! $###$ ", -"$$$$ # # ", -"! !! ### ", -"! !! ", -"! !$ ", -"!!$$! ", -"!$ !! ", -"$! $!!!$!!$###", -" !! $ $ # #", -" $!!!!!$!!$###"}; +static char *cornu_x16[] = { + "16 16 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " 5 ", + " 5303022 ", + " 8307353733 ", + " 03523552566 ", + " 8233 84666 ", + " 0327 66 ", + "8353 ", + " 153 ", + " 253 ", + " 3518 ", + " 34528 ", + " 832538 6 ", + " 3552555753666", + " 232523335666", + " 85301331246 ", + " 7557 "}; + +static char *cornu_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666600", + "5 c #990000", + "6 c #996600", + "7 c #CC0000", + "8 c #CC6600", + "9 c #CC9900", + "A c #800000", + " ", + " 9 66009 ", + " 300360320 ", + " 91069 99 99018 ", + " 36 6100023 915 ", + " 099038 9 8138777 ", + " 92 28 9657 7 ", + " 3392 5777 ", + " 00339 77 ", + " 91826 ", + " 91928 ", + " 0 0 ", + " 61938 ", + " 91963 ", + " 00 19 ", + " 03962 ", + " 93 069 ", + " 0 9309 7 ", + " 33 3209 9 98A777 ", + " 93049 32032330377 7 ", + " 32099 8368 98777 ", + " 9002308166022A7 ", + " 90130160 9 ", + " 9 9 "}; + +static char *cornu_x32[] = { + "32 32 12 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #993300", + "6 c #996600", + "7 c #CC0000", + "8 c #CC6600", + "9 c #CC9900", + "A c #800000", + " ", + " 9 9 ", + " 98000000038 ", + " 1300 9 6300 ", + " 9 00099 99 9 039 ", + " 61 9 033039 60 ", + " 029 021086062039 47 ", + " 0 80089 9 9 13577477 ", + " 9920 28 9917 7 ", + " 639 0 7 77 ", + " 00966 777 ", + " 0 08 ", + " 0 0 ", + " 9869839 ", + " 00 62 ", + " 00 0 ", + " 00 629 ", + " 9669928 ", + " 60 00 ", + " 0 19 ", + " 019932 ", + " 839 0 9 ", + " 930 38 ", + " 00 98009 7 ", + " 26 33 9 9 99 4777 ", + " 9920 93016 69 903317 77 ", + " 008 85010002008 7 77 ", + " 8300 9 99 9 997777 ", + " 9 00060 99 960220A7 ", + " 96000000020089 ", + " 9 99 99 ", + " "}; + +static char **cornu_xpm[3] = { cornu_x16, cornu_x24, cornu_x32 }; + diff --git a/app/bin/bitmaps/curve1.xpm b/app/bin/bitmaps/curve1.xpm deleted file mode 100644 index dd1a295..0000000 --- a/app/bin/bitmaps/curve1.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * curve1_xpm[] = { -"16 16 4 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -"o c #861782078617", -" . ", -" ... ", -" . . . ", -" . .X .", -" X XX.XX ", -" oXXX .X ", -" X XXX XX.XX ", -" X X. .X .", -" XooX X. . . ", -" X X ... ", -" XoX X X . ", -" XoX ", -" X XX ", -" X X ", -"XXXXX ", -" X X "}; diff --git a/app/bin/bitmaps/curve2.xpm b/app/bin/bitmaps/curve2.xpm deleted file mode 100644 index e1ff0c6..0000000 --- a/app/bin/bitmaps/curve2.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * curve2_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #861782078617", -"o c #FFFF00000000", -" . X", -" ......", -" . .. . .", -" .. ..... ", -" . X.. . ..", -" . .o .. . ", -" X. o . ", -" . X. o ", -" . .X o ", -" . . X o ", -" . . o ", -"..... o o", -" . . o o", -" . . ooo", -" . . ooo", -" .... ooooo"}; diff --git a/app/bin/bitmaps/curve3.xpm b/app/bin/bitmaps/curve3.xpm deleted file mode 100644 index 97c447b..0000000 --- a/app/bin/bitmaps/curve3.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * curve3_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #861782078617", -"o c #FFFF00000000", -" . X", -" ......", -" . .. . .", -" ..X ..... ", -" . .. . ..", -" . .ooooo . ", -" .Xooo . ", -" . .ooo ", -" . .o. o ", -" . .o o ", -" . . o ", -" . . o ", -"..... o ", -" . . o ", -" . . o ", -" .... o"}; diff --git a/app/bin/bitmaps/curve4.xpm b/app/bin/bitmaps/curve4.xpm deleted file mode 100644 index 0d26396..0000000 --- a/app/bin/bitmaps/curve4.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * curve4_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #861782078617", -"o c #FFFF00000000", -" . X", -" ......", -" . .. . .", -" ..X ..... ", -" . .. . ..", -" . .ooooo . ", -" .Xooo . ", -" . .ooo ", -" . .o. o o", -" . .o o o ", -" . . o o ", -" . . oo ", -"..... oo ", -" . . o ", -" . . o ", -" .... o "}; diff --git a/app/bin/bitmaps/curved-chord.xpm b/app/bin/bitmaps/curved-chord.xpm new file mode 100644 index 0000000..b8c1d9d --- /dev/null +++ b/app/bin/bitmaps/curved-chord.xpm @@ -0,0 +1,109 @@ +static char *curved_chord_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF6666", + " 2 2 ", + " 2 0000 ", + " 2 00 2 2 ", + " 2 00 2 000 ", + " 0 2 002 2 ", + " 2 0 2002 ", + " 0 ", + " 20 2 1111 ", + " 020 113 ", + " 20 0 1313 ", + " 0202 1 313 1 ", + " 0 0 31311 ", + "20202 311 ", + " 0 0 11 ", + "20202 11 ", + " "}; + +static char *curved_chord_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + " 9 ", + " 9100300", + " 0130 89 ", + " 820089 99 ", + " 018 930200", + " 9500 99 013059 ", + " 135 500 9 ", + " 9900 9 039 ", + " 53 81 9 ", + " 099 019 ", + " 9 0 950 ", + " 938 39 ", + " 029990 766666 ", + " 0 38 666666 ", + " 953 00 6666 ", + " 19990 66 66 ", + " 00 559 66 66 ", + " 00 0 66 66 66", + " 929930 66 66 ", + " 3299559 6666 ", + " 00 0 66 ", + " 00 0 66 ", + "9459829 66 ", + " 25 539 6 "}; + +static char *curved_chord_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " 8 ", + " 88 000330 ", + " 250000000 ", + " 8 000020 88 ", + " 85000058 8 ", + " 00010 8 00130 ", + " 00038 3200000 ", + " 87000 88 00022 8 ", + " 0000 5000088 ", + " 00078 003 ", + " 8500 88000088 ", + " 503 500 ", + " 0288 0037 ", + " 00 888100 8 ", + " 88000 8501 ", + " 405 0038 ", + " 00888 0076666666 ", + " 00 820 66666666 ", + " 00 0058 66666 ", + " 830 00 66666 ", + " 0388800 66 666 ", + " 00 8703 66 6666 ", + " 00 007 66 6666 66 ", + " 00 00 66 6666 6666", + " 8505 000 6 6666 6666 ", + " 1188831 6666666 ", + " 00 5038 66666 ", + " 00 000 666 ", + " 00 00 666 ", + " 503 00 666 ", + "850788318 666 ", + " 0 00 6 "}; + +static char **curved_chord_xpm[3] = { curved_chord_x16, curved_chord_x24, curved_chord_x32 }; + diff --git a/app/bin/bitmaps/curved-end.xpm b/app/bin/bitmaps/curved-end.xpm new file mode 100644 index 0000000..6c91543 --- /dev/null +++ b/app/bin/bitmaps/curved-end.xpm @@ -0,0 +1,107 @@ +static char *curved_end_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF6666", + " 111 ", + " 11 ", + " 2 133 ", + " 2 0 1 ", + " 2 00 2 331", + " 0 2 00 11", + " 2 0 2002 111", + " 0 02 ", + " 20 20 ", + " 0202 ", + " 20 0 ", + " 0202 ", + " 0 0 ", + "20202 ", + " 0 0 ", + "20202 "}; + +static char *curved_end_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666600", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " ", + " 66 ", + " 66666 ", + " 6 6 ", + " 8 6 ", + " 750 66 ", + " 85005 66 ", + " 8 0130 8 6 ", + " 730 88 530 6 6 ", + " 058 7015 66666 ", + " 70 87035 8 666 ", + " 18 532 ", + " 870 83078 ", + " 35 33 ", + " 008850 ", + " 881 38 ", + " 35880 ", + " 0 53 ", + " 71 05 ", + " 55871 ", + " 00 338 ", + " 0 00 ", + "837835 ", + " 17 35 "}; + +static char *curved_end_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC0000", + "6 c #CC6600", + "7 c #CC9900", + " ", + " 555 ", + " 555555 ", + " 55555555 ", + " 55555 5 ", + " 55 55 ", + " 77 55 ", + " 6400 555 ", + " 7700367 55 ", + " 420 77 55 ", + " 7700377 77 55 55", + " 743 77 64215 55555 ", + " 047 760046 5555555 ", + " 740 77 333 77 55555 ", + " 636 774037 5555 ", + " 1777 347 ", + " 7 0 777017 ", + " 734 734 ", + " 3477 077 ", + " 0 7772 ", + " 7730 447 ", + " 6377 007 ", + " 047772 ", + " 0 447 ", + " 740 067 ", + " 7447740 ", + " 1677447 ", + " 0 16 ", + " 0 0 ", + " 437 41 ", + "76477637 ", + " 00 42 "}; + +static char **curved_end_xpm[3] = { curved_end_x16, curved_end_x24, curved_end_x32 }; + diff --git a/app/bin/bitmaps/curved-line-chord.xpm b/app/bin/bitmaps/curved-line-chord.xpm new file mode 100644 index 0000000..779cc67 --- /dev/null +++ b/app/bin/bitmaps/curved-line-chord.xpm @@ -0,0 +1,92 @@ +static char *curved_line_chord_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 0000 ", + " 0000 ", + " 00 ", + " 0 ", + " 00 ", + " 01111 ", + " 0 111 ", + " 00 1111 ", + " 0 1 11 ", + " 00 11 11", + " 0 11 11 ", + " 0 111 ", + " 0 11 ", + " 0 11 ", + " "}; + +static char *curved_line_chord_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " ", + " 00000 ", + " 0000 ", + " 000 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 0 11111 ", + " 00 111 ", + " 00 111 ", + " 0 1 11 ", + " 00 1 11 ", + " 0 1 11 ", + " 00 11 1 ", + " 0 11 1 ", + " 0 11 1 ", + " 00 111 ", + " 00 11 ", + " 00 11 ", + " 00 11 ", + " 11 ", + " "}; + +static char *curved_line_chord_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " ", + " 00000 ", + " 00000000 ", + " 000000 ", + " 00000 ", + " 0000 ", + " 000 ", + " 000 ", + " 0000 ", + " 000 ", + " 000 ", + " 0011111111 ", + " 00011111111 ", + " 000 1111 ", + " 000 11111 ", + " 00 11 111 ", + " 000 11 111 ", + " 00 11 111 ", + " 000 11 111 ", + " 00 111 1 ", + " 00 111 111 ", + " 000 11 111 ", + " 00 111 111 ", + " 00 11111 ", + " 00 111 ", + " 00 111 ", + " 00 111 ", + " 00 111 ", + " 11 ", + " ", + " "}; + +static char **curved_line_chord_xpm[3] = { curved_line_chord_x16, curved_line_chord_x24, curved_line_chord_x32 }; + diff --git a/app/bin/bitmaps/curved-line-end.xpm b/app/bin/bitmaps/curved-line-end.xpm new file mode 100644 index 0000000..0e967ab --- /dev/null +++ b/app/bin/bitmaps/curved-line-end.xpm @@ -0,0 +1,94 @@ +static char *curved_line_end_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 11 ", + " 1111 ", + " 11 ", + " 00011 ", + " 0000 11 ", + " 000 1111 ", + " 00 11 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 00 ", + " 00 ", + " 00 ", + " 0 "}; + +static char *curved_line_end_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #CC0000", + " ", + " 2 ", + " 2222 ", + " 222222 ", + " 22 ", + " 22 ", + " 00012 ", + " 00000 2 ", + " 000 2 ", + " 000 22222 ", + " 00 222 ", + " 00 ", + " 00 ", + " 00 ", + " 0 ", + " 00 ", + " 0 ", + " 0 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 0 ", + " 0 "}; + +static char *curved_line_end_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #CC0000", + " ", + " ", + " 222 ", + " 22222 ", + " 2222222 ", + " 22222 22 ", + " 222 ", + " 222 ", + " 0000122 ", + " 0000000 22 ", + " 000000 22 ", + " 00000 22 22 ", + " 0000 22222222 ", + " 000 2222222 ", + " 0000 2222 ", + " 000 2 ", + " 000 ", + " 000 ", + " 000 ", + " 00 ", + " 000 ", + " 00 ", + " 00 ", + " 000 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 000 ", + " 000 ", + " 00 ", + " "}; + +static char **curved_line_end_xpm[3] = { curved_line_end_x16, curved_line_end_x24, curved_line_end_x32 }; + diff --git a/app/bin/bitmaps/curved-line-middle.xpm b/app/bin/bitmaps/curved-line-middle.xpm new file mode 100644 index 0000000..fceb7d6 --- /dev/null +++ b/app/bin/bitmaps/curved-line-middle.xpm @@ -0,0 +1,95 @@ +static char *curved_line_middle_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #800000", + " ", + " 00000", + " 0000 ", + " 000 ", + " 00 ", + " 00 ", + " 02111 ", + " 00111 ", + " 0 1111 ", + " 00 11 ", + " 0 11 ", + " 00 11 ", + " 00 11 ", + " 0 1 ", + " 0 ", + " 0 "}; + +static char *curved_line_middle_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + " 0 ", + " 000000 ", + " 0000 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 0022222 ", + " 00 222 ", + " 0 22 2 ", + " 00 22 2 ", + " 00 22 ", + " 00 22 ", + " 0 22 ", + " 00 22 ", + " 00 22 ", + " 0 22 ", + " 0 2 ", + " 0 ", + " 0 ", + " "}; + +static char *curved_line_middle_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #800000", + " ", + " ", + " 000000 ", + " 000000000 ", + " 000000 ", + " 00000 ", + " 00000 ", + " 0000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 002 ", + " 000111111 ", + " 000 111111 ", + " 00 11111 ", + " 00 11 111 ", + " 000 11 111 ", + " 00 11 111 ", + " 000 111 ", + " 00 111 ", + " 00 111 ", + " 000 111 ", + " 00 111 ", + " 00 1111 ", + " 000 111 ", + " 00 111 ", + " 00 111 ", + " 00 1 ", + " 00 ", + " 00 ", + " "}; + +static char **curved_line_middle_xpm[3] = { curved_line_middle_x16, curved_line_middle_x24, curved_line_middle_x32 }; + diff --git a/app/bin/bitmaps/curved-line-tangent.xpm b/app/bin/bitmaps/curved-line-tangent.xpm new file mode 100644 index 0000000..e184d3a --- /dev/null +++ b/app/bin/bitmaps/curved-line-tangent.xpm @@ -0,0 +1,98 @@ +static char *curved_line_tangent_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + " 00000", + " 0000 ", + " 000 ", + " 00 ", + " 10 ", + " 022 ", + " 00 22 ", + " 00 22 ", + " 0 22 ", + " 00 22 ", + " 00 22 2 ", + " 0 22 2 ", + " 0 222 ", + "00 2222 ", + " 0 "}; + +static char *curved_line_tangent_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #CC0000", + " ", + " ", + " 000000 ", + " 0000 ", + " 000 ", + " 000 ", + " 00 ", + " 00 ", + " 01 ", + " 23 ", + " 0 3 ", + " 0 3 ", + " 00 3 ", + " 0 3 ", + " 0 33 ", + " 0 33 ", + " 00 33 ", + " 0 33 3 ", + " 00 33 3 ", + " 00 33 3 ", + " 00 333 ", + " 00 33333 ", + " 0 3 ", + " "}; + +static char *curved_line_tangent_x32[] = { + "32 32 6 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #990000", + "3 c #CC0000", + "4 c #800000", + " ", + " ", + " 00000 ", + " 00000000 ", + " 0000000 ", + " 00000 ", + " 00000 ", + " 0000 ", + " 000 ", + " 000 ", + " 0000 ", + " 001 ", + " 0043 ", + " 002333 ", + " 00 333 ", + " 000 333 ", + " 000 333 ", + " 00 333 ", + " 000 333 ", + " 00 333 ", + " 000 333 ", + " 00 333 ", + " 00 333 3 ", + " 00 333 33 ", + " 00 333 33 ", + " 00 333 33 ", + " 00 333333 ", + " 000 3333 ", + " 000 33333333 ", + " 00 33333333 ", + " ", + " "}; + +static char **curved_line_tangent_xpm[3] = { curved_line_tangent_x16, curved_line_tangent_x24, curved_line_tangent_x32 }; + diff --git a/app/bin/bitmaps/curved-middle.xpm b/app/bin/bitmaps/curved-middle.xpm new file mode 100644 index 0000000..70fc4de --- /dev/null +++ b/app/bin/bitmaps/curved-middle.xpm @@ -0,0 +1,108 @@ +static char *curved_middle_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF6666", + " 2 2 ", + " 2 0000 ", + " 2 00 2 2 ", + " 2 00 2 000 ", + " 0 2 002 2 ", + " 2 0 2 ", + " 0 1111 ", + " 20 113 ", + " 02 1313 ", + " 20 1 313 ", + " 0202 313 ", + " 0 0 313 ", + "20202 313 ", + " 0 0 313 ", + "20202 31 ", + " "}; + +static char *curved_middle_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC0000", + "6 c #CC6600", + "7 c #CC9900", + " 7 ", + " 7 430", + " 4300340", + " 7 0026 77 ", + " 320 730210", + " 7 00077 013037 ", + " 41 400 7 7 ", + " 037 037 ", + " 720 60 7 ", + " 167 027 ", + " 00 740 7 ", + " 743 37 ", + " 17740 655555 ", + " 00 736 55555 ", + " 742 00 555 ", + " 26760 5 55 ", + " 0 367 5 55 ", + " 00 0 5 55 ", + "7726720 5 ", + " 277277 5 ", + " 00 0 5 ", + " 00 00 5 ", + "7447447 5 ", + " 01 34 "}; + +static char *curved_middle_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666600", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + " ", + " 99 ", + " 9 002300", + " 5200038 ", + " 99 00038 9 ", + " 810 9 820", + " 028 8500033 ", + " 99 000 99 005 99 ", + " 930 9200 99 ", + " 059 015 ", + " 99 0 9 00 99 ", + " 983 920 ", + " 399 08 ", + " 0 99950 9 ", + " 99 0 9938 ", + " 935 299 ", + " 02999 0 97666666 ", + " 0 953 66666666 ", + " 00 0299 6666666 ", + " 9991 0 666666 ", + " 3599 00 6666666 ", + " 0 9839 666 6666 ", + " 00 0399 666 6666 ", + " 00 0 6666 ", + " 9919 00 666 ", + " 5399928 666 ", + " 00 3299 666 ", + " 00 00 666 ", + " 0 00 666 ", + "99289 15 666 ", + "990999199 66 ", + " 0 0 "}; + +static char **curved_middle_xpm[3] = { curved_middle_x16, curved_middle_x24, curved_middle_x32 }; + diff --git a/app/bin/bitmaps/curved-tangent.xpm b/app/bin/bitmaps/curved-tangent.xpm new file mode 100644 index 0000000..6332785 --- /dev/null +++ b/app/bin/bitmaps/curved-tangent.xpm @@ -0,0 +1,116 @@ +static char *curved_tangent_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF6666", + " 2 2 ", + " 2 0000 ", + " 2 00 2 2 ", + " 2 00 2 000 ", + " 0 2 002 2 ", + " 2 0 002 ", + " 0 13 ", + " 20 313 ", + " 020 313 ", + " 20 0 313 ", + " 0202 313 ", + " 0 0 313 1 ", + "20202 3131 ", + " 0 0 311 ", + "20202 1111 ", + " "}; + +static char *curved_tangent_x24[] = { + "24 24 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC0000", + "6 c #CC6600", + "7 c #CC6666", + "8 c #CC9900", + "9 c #CCCCCC", + "A c #FFCCCC", + "B c #FFFFFF", + " ", + " 8 440 ", + " 2400340 ", + " 830048 8 ", + " 014 88 8 ", + " 8600 88 80030 ", + " 34 80022 4 ", + " 00 8 33 ", + " 63 81048 ", + " 08BA 34 ", + " 60 95A0 ", + " 26 B755 ", + " 00 880B555 ", + " 60 43 555 ", + " 448 0 555 ", + " 0 8830 555 ", + " 00 438 555 ", + " 10 00 555 5 ", + " 828881 555 55 ", + " 0 8438 55555 ", + " 00 00 5555 ", + " 33 23 55555 ", + " 448836 55555 ", + " 0 0 "}; + +static char *curved_tangent_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3333", + "8 c #CC6600", + "9 c #CC6666", + "A c #CC9900", + "B c #CC9999", + "C c #FFCCCC", + "D c #FFFFFF", + " ", + " AA ", + " AA 003200 ", + " 320005A ", + " A0000A A ", + " 32 AA A ", + " 005A AA A3 ", + " A 00 AA A000010 ", + " 33 A 0023 A ", + " 00AA 8200A ", + " A 00 A 018 ", + " 33 A500 A ", + " 02AADD 53 ", + " 00 D9BD08 ", + " A82 DC76BD ", + " 1AA DC766 ", + " 00 AA 0C666 ", + " 0 A3 666 ", + " A1 05A 666 ", + " 54A 00 666 ", + " 0 AAA0 666 ", + " 0 55 666 ", + " 00 0 666 ", + " 0 00 666 6 ", + " A3AAA 00 666 666 ", + " 00 AAA2A 6666666 ", + " 00 00 666666 ", + " 00 00 66666 ", + " 0 00 6666666 ", + " A3AAAA38 6666666 ", + " 0 08 ", + " "}; + +static char **curved_tangent_xpm[3] = { curved_tangent_x16, curved_tangent_x24, curved_tangent_x32 }; + diff --git a/app/bin/bitmaps/cut.xpm b/app/bin/bitmaps/cut.xpm new file mode 100644 index 0000000..6dcae39 --- /dev/null +++ b/app/bin/bitmaps/cut.xpm @@ -0,0 +1,92 @@ +static char *cut_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #333333", + " ", + " ", + " 1 ", + " 1111 ", + " 11 11 ", + " 1111 ", + " 11 ", + " 11 11111 ", + " 11111111111111 ", + " 11111 1111 ", + " 1 11 111 ", + " 111 111 ", + " 111 ", + " 111 ", + " ", + " "}; + +static char *cut_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #333333", + " ", + " ", + " ", + " ", + " 1111 ", + " 11 11 ", + " 111 11 ", + " 111 1 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 1111111 ", + " 11111111111111111111 ", + " 111111111111111111111 ", + " 1111111 111 ", + " 11 11 1111 ", + " 11 111 1111 ", + " 111 1111 ", + " 1111 ", + " 1111 ", + " 111 ", + " ", + " ", + " "}; + +static char *cut_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #333333", + " ", + " ", + " ", + " ", + " ", + " 11111 ", + " 1111111 ", + " 111 111 ", + " 111 11 ", + " 1111 111 ", + " 111111111 ", + " 1111111 ", + " 1111 ", + " 11111 ", + " 11111 ", + " 11111 1111111111 ", + " 111111111111111111111111 ", + " 1111111111111111111111111111 ", + " 111111111111111111 ", + " 111 111 1111 ", + " 11 111 1111 ", + " 111 111 11111 ", + " 1111111 11111 ", + " 11111 1111 ", + " 1111 ", + " 11111 ", + " 11111 ", + " 111 ", + " ", + " ", + " ", + " "}; + +static char **cut_xpm[3] = { cut_x16, cut_x24, cut_x32 }; + diff --git a/app/bin/bitmaps/dbench.xpm b/app/bin/bitmaps/dbench.xpm deleted file mode 100644 index a880329..0000000 --- a/app/bin/bitmaps/dbench.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dbench_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF9A691861", -" .XXXX.XX", -" .XXXX.XXX", -" ..XXX..XXXX", -" .XXXX.XXXXXX", -" .XXXX.XXXXXXX", -" ......XXXXXXXX", -" .XXXX.XXXXXXXX", -" .XXXX.XXXXXXXX", -" .XXXX.XXXXXXX.", -" .XXXX.XXXXXX. ", -" .XXXX.XXXXX. ", -" .XXXX.XXXX. ", -" .XXXX.XX.. ", -" .XXXX.X. ", -" .XXXX.. ", -" ...... "}; diff --git a/app/bin/bitmaps/dbezier.xpm b/app/bin/bitmaps/dbezier.xpm deleted file mode 100644 index 1bf366f..0000000 --- a/app/bin/bitmaps/dbezier.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dbezier_xpm[] = { -"16 16 3 1", -" c None", -"! c #000000000000", -"# c #FFFF00000000", -" ### ", -" # ########", -" ### !!!!", -" !!!! ", -" !!!! ", -" !!! ", -" !!! ", -" !! ", -" !!! ", -" !! ", -" !!! ", -" !!! ", -" !!! ", -"!!!! ### ", -"######## # ", -" ### "}; \ No newline at end of file diff --git a/app/bin/bitmaps/dbox.xpm b/app/bin/bitmaps/dbox.xpm deleted file mode 100644 index 83dbeec..0000000 --- a/app/bin/bitmaps/dbox.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dbox_xpm[] = { -"16 16 3 1", -"X c None", -" c #000000000000", -". c #FFFF00000000", -" .....", -" XX..", -" XXXXXXXXXXX.X.", -" XXXXXXXXXX.XX.", -" XXXXXXXXX.XX .", -" XXXXXXXX.XXX ", -" XXXXXXX.XXXX ", -" XXXXXX.XXXXX ", -" XXXXX.XXXXXX ", -" XXXX.XXXXXXX ", -" XXX.XXXXXXXX ", -" XX.XXXXXXXXX ", -" X.XXXXXXXXXX ", -" .XXXXXXXXXXX ", -".. ", -".. "}; diff --git a/app/bin/bitmaps/dcircle1.xpm b/app/bin/bitmaps/dcircle1.xpm deleted file mode 100644 index a17a56a..0000000 --- a/app/bin/bitmaps/dcircle1.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcircle1_xpm[] = { -"16 16 3 1", -" c #None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" ........ ", -" ... ... ", -" .XXXXXXXXXXX.. ", -" .X X.. ", -"..X XXX XXX X ..", -". X X X X X ..", -". X XXX XX X ..", -". X X X X ..", -". X X X X ..", -"..X X XX X ..", -" .X X.. ", -" .XXXXXXXXXXX.. ", -" ... ... ", -" ........ ", -" ...... "}; diff --git a/app/bin/bitmaps/dcircle2.xpm b/app/bin/bitmaps/dcircle2.xpm deleted file mode 100644 index 36e4763..0000000 --- a/app/bin/bitmaps/dcircle2.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcircle2_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" ........ ", -" ... ... ", -" ... .. ", -" .. . ", -".. ..", -".. ..", -".. XXXXX ..", -".. XX ..", -".. X X ..", -".. X X ..", -" .. X X . ", -" ... X.. ", -" ... .X ", -" ......... ", -" ...... "}; diff --git a/app/bin/bitmaps/dcircle3.xpm b/app/bin/bitmaps/dcircle3.xpm deleted file mode 100644 index ec0dc1f..0000000 --- a/app/bin/bitmaps/dcircle3.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcircle3_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" ........ ", -" ... ... ", -" .. .. ", -" .. . ", -".. ..", -".. ..", -".. XX ..", -".. XX X ..", -".. X X ..", -".. X X ..", -" . XX . ", -" .. XXXXX.. ", -" ... ... ", -" ........ ", -" ...... "}; diff --git a/app/bin/bitmaps/dcurve1.xpm b/app/bin/bitmaps/dcurve1.xpm deleted file mode 100644 index 286e8bc..0000000 --- a/app/bin/bitmaps/dcurve1.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcurve1_xpm[] = { -"16 16 3 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -" . ", -" ... ", -" . . . ", -" . . .", -" XXX.X ", -" XXXX.X ", -" XXX . ", -" XXX . . ", -" XXX . . . ", -" XXX ... ", -" XXX . ", -" XX ", -" XXX ", -" XX ", -" XX ", -" XX "}; diff --git a/app/bin/bitmaps/dcurve2.xpm b/app/bin/bitmaps/dcurve2.xpm deleted file mode 100644 index 2714d5e..0000000 --- a/app/bin/bitmaps/dcurve2.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcurve2_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ..... ", -" ........", -" .... ..", -" ... .", -" .X. ", -" ...X ", -" ... X ", -" .. X ", -" ... X ", -" .. X ", -" .. X X", -" .. X X", -" .. X X", -" .. XX", -" .. XXXXX"}; diff --git a/app/bin/bitmaps/dcurve3.xpm b/app/bin/bitmaps/dcurve3.xpm deleted file mode 100644 index c452ffd..0000000 --- a/app/bin/bitmaps/dcurve3.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcurve3_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ..... ", -" ........", -" .... .", -" ... ", -" .XXXXXX ", -" ..XXX ", -" .. XXX ", -" .. X X ", -" ... X X ", -" .. X X ", -" .. X ", -" .. X ", -" .. X ", -" .. XX", -" .. XX"}; diff --git a/app/bin/bitmaps/dcurve4.xpm b/app/bin/bitmaps/dcurve4.xpm deleted file mode 100644 index 2474481..0000000 --- a/app/bin/bitmaps/dcurve4.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dcurve4_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ..... ", -" ........", -" .... ..", -" ... ", -" .XXXXXX ", -" ..XXX ", -" .. XXX ", -" .. X X .", -" .. X X . ", -" .. X X . ", -" .. X. ", -" .. .X ", -" .. . ", -" .. . ", -" .. . "}; diff --git a/app/bin/bitmaps/ddimlin.xpm b/app/bin/bitmaps/ddimlin.xpm deleted file mode 100644 index 3980e44..0000000 --- a/app/bin/bitmaps/ddimlin.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * ddimlin_xpm[] = { -"16 16 3 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -" .....", -" ..", -" . .", -" . .", -" . .", -" X XXX ", -" X X X ", -" XX XX ", -" X X ", -" XX XX ", -" . ", -". . ", -". . ", -". . ", -".. ", -"..... "}; diff --git a/app/bin/bitmaps/delete.xpm b/app/bin/bitmaps/delete.xpm index 63b875a..9002046 100644 --- a/app/bin/bitmaps/delete.xpm +++ b/app/bin/bitmaps/delete.xpm @@ -1,22 +1,114 @@ -/* XPM */ -static char * delete_xpm[] = { -"16 16 3 1", -" c None", -". c #FF0000", -"+ c #000000", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" + .. .. + ", -"++++++....++++++", -" + +..+ + ", -" + +..+ + ", -" + .... + ", -"+++++..++..+++++", -" + .. .. + ", -" .. .. ", -" .. .. ", -" .. .. ", -".. ..", -" "}; +static char *delete_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #990000", + "3 c #CC0000", + "4 c #CC3300", + "5 c #CC6600", + "6 c #CC9900", + "7 c #800000", + " ", + " ", + " 33 33 ", + " 33 333 ", + " 33 333 ", + " 6 6 533534 6 6 ", + "0000007333100000", + " 6 6 663346 6 6 ", + " 6 6 663356 6 6 ", + "0000007332000000", + " 6 6 633435 6 6 ", + " 333 33 ", + " 333 33 ", + " 33 333 ", + " 3 ", + " "}; + +static char *delete_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #993300", + "4 c #996600", + "5 c #CC0000", + "6 c #CC3300", + "7 c #CC6600", + "8 c #CC9900", + "9 c #800000", + " ", + " ", + " ", + " 555 555 ", + " 5555 555 ", + " 5555 555 ", + " 5555 5555 ", + " 555 5555 ", + " 8 8 75557556 8 8 ", + "01200200295555520020021 ", + " 47 7 74555567 7 74 ", + " 8 8 8 555578 8 8 ", + " 8 8 8 5555 8 8 8 ", + " 47 7 74555537 7 74 ", + "012002002255555200200210", + " 8 8 85556557 8 8 ", + " 5555 555 ", + " 555 555 ", + " 555 5555 ", + " 555 5555 ", + " 555 555 ", + " 5 5 ", + " ", + " "}; + +static char *delete_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #990000", + "4 c #993300", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + " ", + " ", + " ", + " 6 6 ", + " 666 666 ", + " 66666 66666 ", + " 66666 66666 ", + " 66666 6666 ", + " 66666 6666 ", + " 66666 66666 ", + " 66666 66666 ", + " 99 99 9766686667 99 99 ", + " 055005510254666666651025500550 ", + " 055005510255366666751025500550 ", + " 99 99 99 6666699 99 99 ", + " 99 99 99 6666699 99 99 ", + " 99 99 99 6666699 99 99 ", + " 99 99 99 6666699 99 99 ", + " 055005510255666666551025500550 ", + " 055005510254666666751025500550 ", + " 99 99 9766686668 99 99 ", + " 66666 6666 ", + " 6666 6666 ", + " 6666 66666 ", + " 66666 66666 ", + " 66666 66666 ", + " 6666 66666 ", + " 6666 666 ", + " 66 6 ", + " ", + " ", + " "}; + +static char **delete_xpm[3] = { delete_x16, delete_x24, delete_x32 }; + diff --git a/app/bin/bitmaps/describe.xpm b/app/bin/bitmaps/describe.xpm index e5506a5..1cbeb20 100644 --- a/app/bin/bitmaps/describe.xpm +++ b/app/bin/bitmaps/describe.xpm @@ -1,22 +1,111 @@ -/* XPM */ -static char * describe_xpm[] = { -"16 16 3 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -" ...... ", -" ... ... ", -" ... ... ", -" ... ... ", -" ... ... ", -" X X ... X ", -"XXXXXXXX ... XX", -" X X ... X ", -" X .... X ", -" X ... X ", -"XXXX ... XXXXXX", -" X ... X X ", -" ... ", -" ", -" ... ", -" ... "}; +static char *describe_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #FF6666", + " ", + " 331133 ", + " 31111113 ", + " 113 311 ", + " 11 ", + " 2 2 2 3113 2 ", + "000000 3113 0000", + " 2 2 2 113 2 2 ", + " 2 2 2 11 2 2 2 ", + "000000 11 000000", + " 2 2 2 11 2 2 2 ", + " ", + " 11 ", + " 11 ", + " ", + " "}; + +static char *describe_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #660000", + "3 c #663300", + "4 c #990000", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " ", + " ", + " ", + " 66666666 ", + " 6666666666 ", + " 66666666666 ", + " 6666 6666 ", + " 66 6666 ", + " 6666 ", + " 8 8 88 66666 8 88 ", + " 00000000046666620000000", + " 8 8 88666667 8 88 ", + " 8 8 886666 8 8 88 ", + " 8 8 886666 8 8 88 ", + " 1500510536664150051053 ", + " 1500510536664150051053 ", + " 8 8 8 6666 8 8 8 ", + " 666 ", + " 6 ", + " 66 ", + " 666 ", + " ", + " ", + " "}; + +static char *describe_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #993300", + "6 c #996600", + "7 c #CC0000", + "8 c #CC3300", + "9 c #CC6600", + "A c #CC9900", + "B c #800000", + " ", + " ", + " ", + " 7777 ", + " 7777777777 ", + " 777777777777 ", + " 77777777777777 ", + " 77777 77777 ", + " 7777 77777 ", + " 7777 77777 ", + " 77 7777 ", + " 77777 ", + " AA AA AA 777777 AA AA ", + " 066006630266B77777777106600660 ", + " 066006630266B77777785006600660 ", + " AA AA AA 777778AA AA AA ", + " AA AA AA 7777 AAA AA AA ", + " AA AA AA 7777 AAA AA AA ", + " AA AA AA 7777 AAA AA AA ", + " 033003320133B77770232003300330 ", + " 99 696 39947777 696 99 99 ", + " AA AA AA 7777 AAA AA AA ", + " 7777 ", + " 7777 ", + " 7 ", + " 77 ", + " 7777 ", + " 7777 ", + " 77 ", + " ", + " ", + " "}; + +static char **describe_xpm[3] = { describe_x16, describe_x24, describe_x32 }; + diff --git a/app/bin/bitmaps/description.xpm b/app/bin/bitmaps/description.xpm new file mode 100644 index 0000000..47941b0 --- /dev/null +++ b/app/bin/bitmaps/description.xpm @@ -0,0 +1,101 @@ +static char *description_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099FF", + "3 c #FF0000", + " ", + "00 000 00 00 ", + "0 0 0 0 0 ", + "0 0 00 0 0 ", + "0 0 0 0 0 ", + "00 000 00 00 ", + " 3 ", + " 333 ", + " 33333 ", + " 3 ", + " 2 2 2 3 2 2 2 ", + " 11111 3 11111 ", + " 2 2 2 2 2 2 ", + " 1111111111111 ", + " 2 2 2 2 2 2 2 ", + " "}; + +static char *description_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099FF", + "3 c #FF0000", + " ", + " ", + " ", + " 000 0000 000 00 ", + " 0 0 0 0 0 0 ", + " 0 0 000 00 0 ", + " 0 0 0 0 0 0 ", + " 000 0000 000 00 ", + " ", + " 33 ", + " 3333 ", + " 333333 ", + " 33 ", + " 33 ", + " 2 2 2 33 2 2 2 ", + " 111111111 33 11111111 ", + " 2 2 2 33 2 2 2 ", + " 2 2 2 33 2 2 2 ", + " 2 2 2 2 2 2 ", + " 111111111111111111111 ", + " 2 2 2 2 2 2 2 ", + " ", + " ", + " "}; + +static char *description_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #0000CC", + "2 c #0033CC", + "3 c #0066CC", + "4 c #0066FF", + "5 c #0099FF", + "6 c #CC0000", + " ", + " 0000 00000 000 000 ", + " 000000 00000 00000 00000 ", + " 00 000 00 00 00 ", + " 00 00 00000 0000 00 ", + " 00 000 00 0000 00 ", + " 00 000 00 0 00 000 0 ", + " 000000 00000 00000 00000 ", + " ", + " 66 ", + " 6666 ", + " 666666 ", + " 66666666 ", + " 6 66 66 ", + " 66 ", + " 66 ", + " 66 ", + " 66 ", + " 66 ", + " 66 ", + " ", + " 55 5 5 55 5 5 55 ", + " 55 35 53 55 35 53 45 ", + " 111111111111111111111111111111 ", + " 55 35 53 55 35 53 45 ", + " 55 5 5 55 5 5 55 ", + " 55 5 5 55 5 5 55 ", + " 55 35 53 55 35 53 45 ", + " 111111111111111111111111111111 ", + " 133112311133113311231113311331 ", + " 55 5 5 55 5 5 55 ", + " "}; + +static char **description_xpm[3] = { description_x16, description_x24, description_x32 }; + diff --git a/app/bin/bitmaps/dfilbox.xpm b/app/bin/bitmaps/dfilbox.xpm deleted file mode 100644 index 4d78c26..0000000 --- a/app/bin/bitmaps/dfilbox.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dfilbox_xpm[] = { -"16 16 4 1", -"o c None", -" c #000000000000", -". c #FFFF00000000", -"X c #0000FFFFFFFF", -" .....", -" XXXXXXXXXXXXX..", -" XXXXXXXXXXXX.X.", -" XXXXXXXXXXX.XX.", -" XXXXXXXXXX.XXX.", -" XXXXXXXXX.XXXX ", -" XXXXXXXX.XXXXX ", -" XXXXXXX.XXXXXX ", -" XXXXXX.XXXXXXX ", -" XXXXX.XXXXXXXX ", -" XXXX.XXXXXXXXX ", -" XXX.XXXXXXXXXX ", -" XX.XXXXXXXXXXX ", -" X.XXXXXXXXXXXX ", -"..XXXXXXXXXXXXX ", -".. "}; diff --git a/app/bin/bitmaps/dfilpoly.xpm b/app/bin/bitmaps/dfilpoly.xpm deleted file mode 100644 index 56a62ee..0000000 --- a/app/bin/bitmaps/dfilpoly.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dfilpoly_xpm[] = { -"16 16 4 1", -"X c None", -" c #FFFF00000000", -". c #000000000000", -"o c #0000FFFFFFFF", -" ..... XXXXXXXXX", -".oooooo..... XXX", -".ooooooooo..XXXX", -".oooooooo.XXXXXX", -".oooooo..XXXXXXX", -".ooooo.XXXXXXXXX", -".oooo.XXXXXXXXXX", -".oooo .XXXXXXXXX", -".oooooo..... XXX", -" oooooooooooo.. ", -"X.oooooooooooo.X", -"X.oooooooooo..XX", -"XX.oooooooo.XXXX", -"XXX.oooooo.XXXXX", -"XXX.oooo..XXXXXX", -"XXXX .. XXXXXXXX"}; diff --git a/app/bin/bitmaps/dflcrcl1.xpm b/app/bin/bitmaps/dflcrcl1.xpm deleted file mode 100644 index 404660d..0000000 --- a/app/bin/bitmaps/dflcrcl1.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dflcrcl1_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ...... ", -" .. . . . ", -" . . . . . .. ", -" .XXXXXXXXXXX.. ", -" .X X . ", -". X XXX XXX X. .", -"..X X X X X ..", -". X XXX XX X. .", -"..X X X X ..", -". X X X X. .", -"..X X XX X ..", -". X X.. ", -" .XXXXXXXXXXX . ", -" .. . . . ... ", -" . . . .. ", -" ...... "}; diff --git a/app/bin/bitmaps/dflcrcl2.xpm b/app/bin/bitmaps/dflcrcl2.xpm deleted file mode 100644 index c02d1ea..0000000 --- a/app/bin/bitmaps/dflcrcl2.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dflcrcl2_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #0000FFFFFFFF", -"o c #FFFF00000000", -" ...... ", -" .XXXXXX. ", -" ..XXXXXXXX.. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -".XXXXXXXXXXXXXX.", -".XXXXXXXXXXXXXX.", -".XXXXXXoooooXXX.", -".XXXXXXooXXXXXX.", -".XXXXXXoXoXXXXX.", -".XXXXXXoXXoXXXX.", -" .XXXXXoXXXoXX. ", -" .XXXXXXXXXXoX. ", -" ..XXXXXXXXXo ", -" .XXXXXX.. ", -" ...... "}; diff --git a/app/bin/bitmaps/dflcrcl3.xpm b/app/bin/bitmaps/dflcrcl3.xpm deleted file mode 100644 index e1bd80a..0000000 --- a/app/bin/bitmaps/dflcrcl3.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dflcrcl3_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #0000FFFFFFFF", -"o c #FFFF00000000", -" ...... ", -" .XXXXXX. ", -" ..XXXXXXXX.. ", -" .XXXXXXXXXXXX. ", -" .XXXXXXXXXXXX. ", -".XXXXXXXXXXXXXX.", -".XXXXXXXXXXXXXX.", -".XXXXXXooXXXXXX.", -".XXXXXXooXXXoXX.", -".XXXXXXXXoXXoXX.", -".XXXXXXXXXoXoXX.", -" .XXXXXXXXXooX. ", -" .XXXXXXoooooX. ", -" ..XXXXXXXX.. ", -" .XXXXXX. ", -" ...... "}; diff --git a/app/bin/bitmaps/dimension.xpm b/app/bin/bitmaps/dimension.xpm new file mode 100644 index 0000000..faceac6 --- /dev/null +++ b/app/bin/bitmaps/dimension.xpm @@ -0,0 +1,94 @@ +static char *dimension_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #999999", + " 1111", + " 111", + " 1111", + " 111 1", + " 11 ", + " 002 200 ", + " 0 0 ", + " 02 002 ", + " 0 0 0 ", + " 002 202 ", + " ", + " 11 ", + "1 111 ", + "1111 ", + "111 ", + "1111 "}; + +static char *dimension_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " 222222 ", + " 22222 ", + " 22222", + " 222222", + " 222 22", + " 222 2 ", + " 22 ", + " 2 ", + " 000 0000 ", + " 0 00 0 0 ", + " 00 0000 ", + " 0000 00 ", + " 0 0 0 0 ", + " 0000 0000 ", + " 0 0 ", + " 22 ", + " 22 222 ", + " 22 222 ", + " 22222 ", + " 2222 ", + " 222222 ", + " 222222 ", + " "}; + +static char *dimension_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 1111111 ", + " 11111111 ", + " 1111111 ", + " 11111 ", + " 111111 ", + " 1111 11 ", + " 1111 11 ", + " 1111 11 ", + " 1111 ", + " 111 ", + " ", + " 00000 00000 ", + " 00 00 00 00 ", + " 00 00 ", + " 000 000000 ", + " 000 00 00 ", + " 0000 00 ", + " 00 00 0 00 ", + " 00000 00000 ", + " 0 00 ", + " 11 ", + " 1 111 ", + " 111 1111 ", + " 111 1111 ", + " 111 1111 ", + " 1111111 ", + " 111111 ", + " 11111111 ", + " 11111111 ", + " 11111111 ", + " "}; + +static char **dimension_xpm[3] = { dimension_x16, dimension_x24, dimension_x32 }; + diff --git a/app/bin/bitmaps/dline.xpm b/app/bin/bitmaps/dline.xpm deleted file mode 100644 index 2105dad..0000000 --- a/app/bin/bitmaps/dline.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dline_xpm[] = { -"16 16 3 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -" .....", -" ..", -" . .", -" . .", -" . .", -" . ", -" X. ", -" XXX ", -" XXX ", -" XXX ", -" XXX ", -" XXX ", -" XXX ", -" XXX ", -"XXX ", -"XX "}; diff --git a/app/bin/bitmaps/doc-export-bmap.xpm b/app/bin/bitmaps/doc-export-bmap.xpm new file mode 100644 index 0000000..543cc1a --- /dev/null +++ b/app/bin/bitmaps/doc-export-bmap.xpm @@ -0,0 +1,162 @@ +static char *doc_export_bmap_x16[] = { + "16 16 23 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #336666", + "4 c #336699", + "5 c #3399CC", + "6 c #663333", + "7 c #666633", + "8 c #666666", + "9 c #669933", + "A c #6699CC", + "B c #996633", + "C c #996666", + "D c #999966", + "E c #999999", + "F c #CC0000", + "G c #CC9966", + "H c #CC9999", + "I c #CCCC99", + "J c #CCCCCC", + "K c #FFCCCC", + "L c #808080", + "2888888888872 ", + "8KH2788881JI2 ", + "8DIJKEJKKKHI2 ", + "8E99I8KKKKK82 ", + "8I99DHKKKKK22 ", + "8CII7JKKKKKHF ", + "8J2K7JKKKKKKFF ", + "8KKD2KKKIHHGFFFF", + "4LKK0KKKHHHGFFFF", + "4AAK2KKKKKKKFF ", + "4AAH2KIHHHK8F ", + "4AA32KCBBBI02 ", + "4AA4LKCBBBI62 ", + "4AAAKDIHHHKH2 ", + "4AAAKK88C2EI2 ", + "45558EEEEEED2 "}; + +static char *doc_export_bmap_x24[] = { + "24 24 30 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #330000", + "4 c #333300", + "5 c #333333", + "6 c #336699", + "7 c #339933", + "8 c #3399CC", + "9 c #663333", + "A c #666633", + "B c #666666", + "C c #666699", + "D c #669933", + "E c #6699CC", + "F c #996633", + "G c #996666", + "H c #999966", + "I c #999999", + "J c #CC0000", + "K c #CC3333", + "L c #CC6666", + "M c #CC9966", + "N c #CC9999", + "O c #CCCC99", + "P c #CCCCCC", + "Q c #FFCC99", + "R c #FFCCCC", + "S c #808080", + "3000000000000000005 ", + "5RRRROOOOOOOOPRRRP5 ", + "5RRN5SSNNNNNNB5IRP5 ", + "5RGNRRRRORRRRRROBP5 ", + "5OSOHOROBRRRRRRRGO5 ", + "5BR77DOBORRRRRRROI5 ", + "5AOD7DOBRRRRRRRROS5 ", + "5BRODHINRRRRRRRRP5 ", + "5OHRRRHNRRRRRRRRRP J ", + "5RI9PRHNRRRRRRRRRRJJJ ", + "5RRRAIGORRRRRRRRRR JJJJ ", + "5RRRRHBORRRRQLLLLKJJJJJJ", + "5SORRR0ORRRRQLLLLKJJJJJJ", + "5EEBRR4ORRRRRRRRRR JJJJ ", + "5EEECRBPRRRRRRRRRRJJJ ", + "5EEE8RBPRRRRRRRRPG J ", + "5EEEENGPRO9999FRR5 ", + "5EEEEHGPRNFMMMFPRB5 ", + "5EEEESONRNFMMMFPOH5 ", + "5EEEECR9RO9999FRIN5 ", + "5EEEE6RIBRRRRRRR4P5 ", + "5EEEE8RRO3BNNNB0PP5 ", + "5EEEEEIRRRROOOPRRP5 ", + "2111110BBBBBBBBBBB5 "}; + +static char *doc_export_bmap_x32[] = { + "32 32 26 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #336666", + "4 c #336699", + "5 c #339933", + "6 c #339999", + "7 c #3399CC", + "8 c #663333", + "9 c #666633", + "A c #666666", + "B c #669933", + "C c #669966", + "D c #6699CC", + "E c #996633", + "F c #996666", + "G c #999966", + "H c #999999", + "I c #CC0000", + "J c #CC9966", + "K c #CC9999", + "L c #CCCC99", + "M c #CCCCCC", + "N c #FFCCCC", + "O c #808080", + "2000000000000000000000002 ", + "0NNNNNNNNNNNNNNNNNNNNNNN0 ", + "0NNNNMHFFFFFFFFFFOHLNNNN0 ", + "0NNNH2GKKKLLLLLLLKH9ALNN0 ", + "0NNFAMNNNNNMNNNNNNNNK2LN0 ", + "0NHANNLNNNLANNNNNNNNNHAN0 ", + "0N2LG5BLNNALNNNNNNNNNN2M0 ", + "0KANB55BMKHNNNNNNNNNNNAL0 ", + "0KOLB55BN9MNNNNNNNNNNNFK0 ", + "0LANLBBCL9NNNNNNNNNNNNFA2 ", + "0M2MNLMNKGNNNNNNNNNNNNKA ", + "0NAHNNNNKGNNNNNNNNNNNNNN II ", + "0NLAALNNKGNNNNNNNNNNNNN IIII ", + "0NNNK2HNHHNNNNNNNNNNNNN IIII ", + "0NNNNMFAHHNNNNNNNNNNNNN IIIII ", + "0NNNNNNGAHNNNNNNNIIIIIIIIIIIIIII", + "13LNNNNN2GNNNNNNNIIIIIIIIIIIIIII", + "1DD3KNNNAFNNNNNNNNNNNNN IIIII ", + "1DDDDHNNGHNNNNNNNNNNNNN IIII ", + "1DDDDDKNHHNNNNNNNNNNNNN IIII ", + "1DDDDDANHHNNNNNNNNNNNNM II ", + "1DDDDD4MHHNNNKKKKKKKNNH2 ", + "1DDDDD7LHHNNMEEEEEE8NNGF2 ", + "1DDDDDDLHGNNMEJJJJJ8NNGK0 ", + "1DDDDDDKL8NNMEJJJJJ8NNFK0 ", + "1DDDDDDHN2LNMEEEEEE8NNAL0 ", + "1DDDDDDANHANNKKKKKKLNL2M0 ", + "1DDDDDD3NNAFMNNNNNNNMAHN0 ", + "1DDDDDD6LNNH2FKLLLLH2ONN0 ", + "1DDDDDDDKNNNMKFAAAAGLNNN0 ", + "1DDDDDDD3NNNNNNNNNNNNNNN0 ", + "122222222AAAAAAAAAAAAAAA0 "}; + +static char **doc_export_bmap_xpm[3] = { doc_export_bmap_x16, doc_export_bmap_x24, doc_export_bmap_x32 }; + diff --git a/app/bin/bitmaps/doc-export-dxf.xpm b/app/bin/bitmaps/doc-export-dxf.xpm new file mode 100644 index 0000000..7ac2c54 --- /dev/null +++ b/app/bin/bitmaps/doc-export-dxf.xpm @@ -0,0 +1,100 @@ +static char *doc_export_dxf_x16[] = { + "16 16 7 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #996666", + "4 c #CC0000", + "5 c #CC3333", + "1111111111111 ", + "11 11 11 11 1 ", + "1 1 1 1 1 ", + "1111111111111 ", + "11 11 11 11 1 ", + "1 1 1 1 2 ", + "11111111111144 ", + "11 11 112325 44 ", + "1 1 1 44444444", + "11111111111144 ", + "1 1 1 1 4 ", + "1 1 1 1 1 ", + "1111111111111 ", + "1 1 1 1 1 ", + "1 1 1 1 1 ", + "1111111111111 "}; + +static char *doc_export_dxf_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996666", + "3 c #CC0000", + "11111111111111111111 ", + "11111111111111111111 ", + "11 1 11 1 11 ", + "11 1 11 1 11 ", + "11 1 11 1 11 ", + "11111111111111111111 ", + "11 1 11 1 11 ", + "11 1 11 1 1 ", + "11 1 11 1 33 ", + "111111111111111112333 ", + "11111111111111111 333 ", + "11 1 11 33333333333 ", + "11 1 11 33333333333 ", + "11 1 11 1 333 ", + "111111111111111112333 ", + "11 1 11 1 33 ", + "11 1 11 1 1 ", + "11 1 11 1 11 ", + "11111111111111111111 ", + "11 1 11 1 11 ", + "11 1 11 1 11 ", + "11 1 11 1 11 ", + "11 1 11 1 11 ", + "11111111111111111111 "}; + +static char *doc_export_dxf_x32[] = { + "32 32 5 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #CC0000", + " 1 11 11 11 11 ", + "11111111111111111111111111 ", + " 1 1 1 11 11 ", + " 1 1 1 11 11 ", + " 1 1 1 11 11 ", + " 1 1 1 11 11 ", + " 1 11 11 11 11 ", + "11111111111111111111111111 ", + " 1 1 1 11 11 ", + " 1 1 1 11 11 ", + " 1 1 1 11 ", + " 1 1 1 11 33 ", + " 1 11 11 11 333 ", + "11111111111111111111111 33333 ", + " 1 1 1 1 3333 ", + " 1 1 1 333333333333333 ", + " 1 1 1 333333333333333 ", + " 1 1 1 32 33333 ", + " 1 11 11 11 3333 ", + "1111111111111111111111123333 ", + " 1 1 1 1 33 ", + " 1 1 1 1 ", + " 1 1 1 1 11 ", + " 1 1 1 1 11 ", + "11111111111111111111111111 ", + "11111111111111111111111111 ", + " 1 1 1 1 11 ", + " 1 1 1 1 11 ", + " 1 1 1 1 11 ", + " 1 1 1 1 11 ", + " 1111111111111111111111111 ", + " 1111111111111111111111111 "}; + +static char **doc_export_dxf_xpm[3] = { doc_export_dxf_x16, doc_export_dxf_x24, doc_export_dxf_x32 }; + diff --git a/app/bin/bitmaps/doc-export-svg.xpm b/app/bin/bitmaps/doc-export-svg.xpm new file mode 100644 index 0000000..72c85d3 --- /dev/null +++ b/app/bin/bitmaps/doc-export-svg.xpm @@ -0,0 +1,114 @@ +static char *doc_export_svg_x16[] = { + "16 16 10 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003366", + "3 c #003399", + "4 c #006600", + "5 c #0066CC", + "6 c #0066FF", + "7 c #CC0000", + "8 c #008000", + " 888 ", + " 888888400000 ", + " 8 011 ", + "88 00 88 ", + "88 00 88 ", + "8800 88 7 ", + " 41 8 77 ", + " 048888 77777777", + " 0 77777777", + " 00 6 77 ", + " 00 666 7 ", + " 036 6 ", + " 300 6 ", + " 6 00230000 ", + " 66 32000 ", + " 666666666 "}; + +static char *doc_export_svg_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003366", + "3 c #003399", + "4 c #006600", + "5 c #0066CC", + "6 c #0066FF", + "7 c #CC0000", + "8 c #008000", + " 888 ", + " 88888888 ", + " 888 88840000000 ", + " 888 0111 ", + " 88 000 88 ", + "88 00 88 ", + "88 00 88 ", + "88 0 88 ", + " 8800 88 7 ", + " 880 88 777 ", + " 448 888 7777 ", + " 048888888 77777777777", + " 0 8888 77777777777", + " 0 7777 ", + " 0 66 7777 ", + " 00 66 7 ", + " 0 6 6 ", + " 056 66 ", + " 520 6 ", + " 6 000026 ", + " 6 00002000000 ", + " 66 5300000 ", + " 6666666666666 ", + " 6666666666666 "}; + +static char *doc_export_svg_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003300", + "3 c #003366", + "4 c #003399", + "5 c #006600", + "6 c #0066CC", + "7 c #0066FF", + "8 c #CC0000", + "9 c #008000", + " 99 ", + " 99999999 ", + " 999999999999 00000000 ", + " 9999 9950000000000 ", + " 999 0000000 ", + " 999 0000299 ", + " 99 00000 99 ", + "999 0000 99 ", + "999 0000 99 ", + "999 000 99 ", + " 99 000 99 ", + " 995000 999 88 ", + " 99200 999 8888 ", + " 9005 9999 88888 ", + " 029999999999 88888 ", + " 002999999999 888888888888888", + " 000 99999 888888888888888", + " 000 88888 ", + " 000 7 88888 ", + " 000 777 88888 ", + " 00 77777 88 ", + " 000 777777 ", + " 000677 777 ", + " 0036 777 ", + " 63000 777 ", + " 76300000677 ", + " 777 00000146 ", + " 777 00000000000000 ", + " 777 3431000000 ", + " 777 777 ", + " 7777777777777777777 ", + "777777777777777777777 "}; + +static char **doc_export_svg_xpm[3] = { doc_export_svg_x16, doc_export_svg_x24, doc_export_svg_x32 }; + diff --git a/app/bin/bitmaps/doc-export-xtc.xpm b/app/bin/bitmaps/doc-export-xtc.xpm new file mode 100644 index 0000000..6afb7c7 --- /dev/null +++ b/app/bin/bitmaps/doc-export-xtc.xpm @@ -0,0 +1,108 @@ +static char *doc_export_xtc_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996666", + "3 c #CC0000", + "4 c #CC3333", + "5 c #CC9999", + "6 c #FFCCCC", + "7 c #FFFFFF", + "111111111111 ", + "177777777771 ", + "177777777771 ", + "177777777771 ", + "177777777771 ", + "1777777777713 ", + "17777777777133 ", + "1777777755543333", + "177777776662 33 ", + "17777777777133 ", + "1777777777713 ", + "177777777771 ", + "177777777771 ", + "177777777771 ", + "177777777771 ", + "111111111111 "}; + +static char *doc_export_xtc_x24[] = { + "24 24 7 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #CC0000", + "4 c #FFCCCC", + "5 c #FFFFFF", + " 1111111111111111 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 33 ", + "15555555555555551 3333 ", + "15555555555555551 3333 ", + "155555555555433333333333", + "15555555555544442333333 ", + "15555555555555551 333 ", + "15555555555555551 333 ", + "15555555555555551 3 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + "15555555555555551 ", + " 1111111111111111 "}; + +static char *doc_export_xtc_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #CC0000", + "4 c #CC3333", + "5 c #CC9999", + "6 c #FFCCCC", + "7 c #FFFFFF", + " ", + " 1111111111111111111111 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 333 ", + " 1777777777777777777771 3333 ", + " 1777777777777777777771 33333 ", + " 177777777777777766666233333333 ", + " 1777777777777776333333333333333", + " 177777777777777655555433333333 ", + " 1777777777777777777771 3333 ", + " 1777777777777777777771 33333 ", + " 1777777777777777777771 333 ", + " 1777777777777777777771 3 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1777777777777777777771 ", + " 1111111111111111111111 ", + " "}; + +static char **doc_export_xtc_xpm[3] = { doc_export_xtc_x16, doc_export_xtc_x24, doc_export_xtc_x32 }; + diff --git a/app/bin/bitmaps/doc-export.xpm b/app/bin/bitmaps/doc-export.xpm new file mode 100644 index 0000000..e594e38 --- /dev/null +++ b/app/bin/bitmaps/doc-export.xpm @@ -0,0 +1,119 @@ +static char *doc_export_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #999999", + "4 c #CC0000", + "5 c #CC6666", + "6 c #CC9999", + "7 c #CCCCCC", + "8 c #FFCCCC", + "9 c #FFFFFF", + "A c #C0C0C0", + "111111111111 ", + "199999999991 ", + "199999999991 ", + "193333333391 ", + "193777777391 ", + "1937777773914 ", + "19377777739144 ", + "1937777765824444", + "19377777A582444 ", + "19377777739144 ", + "1937777773914 ", + "193333333391 ", + "199999999991 ", + "199999999991 ", + "199999999991 ", + "111111111111 "}; + +static char *doc_export_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #999999", + "4 c #CC0000", + "5 c #CC6666", + "6 c #CC9999", + "7 c #CCCCCC", + "8 c #FFCCCC", + "9 c #FFFFFF", + "A c #C0C0C0", + " 1111111111111111 ", + "199999999999999991 ", + "199999999999999991 ", + "199999999999999991 ", + "199999999999999991 ", + "199333333333333991 ", + "199377777777773991 ", + "199377777777773991 ", + "19937777777777399144 ", + "199377777777773991444 ", + "199377777777773991 4444 ", + "199377777777A44444444444", + "19937777777776588244444 ", + "199377777777773991 444 ", + "199377777777773991444 ", + "199377777777773991 4 ", + "199377777777773991 ", + "199333333333333991 ", + "199999999999999991 ", + "199999999999999991 ", + "199999999999999991 ", + "199999999999999991 ", + "199999999999999991 ", + " 1111111111111111 "}; + +static char *doc_export_x32[] = { + "32 32 12 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #993333", + "3 c #999999", + "4 c #CC0000", + "5 c #CC3333", + "6 c #CC6666", + "7 c #CC9999", + "8 c #CCCCCC", + "9 c #FFCCCC", + "A c #FFFFFF", + " ", + " 1111111111111111111111 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAA33333333333333AAA1 ", + " 1AA3888888888888883AA1 ", + " 1AA3888888888888883AA1 ", + " 1AA3888888888888883AA1 ", + " 1AA3888888888888883AA1 444 ", + " 1AA3888888888888883AA1 4444 ", + " 1AA3888888888888883AA1 44444 ", + " 1AA388888888888877699244444444 ", + " 1AA3888888888888444444444444444", + " 1AA388888888888866677544444444 ", + " 1AA3888888888888883AA1 4444 ", + " 1AA3888888888888883AA1 44444 ", + " 1AA3888888888888883AA1 444 ", + " 1AA3888888888888883AA1 4 ", + " 1AA3888888888888883AA1 ", + " 1AA3888888888888883AA1 ", + " 1AA3333333333333333AA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1AAAAAAAAAAAAAAAAAAAA1 ", + " 1111111111111111111111 ", + " "}; + +static char **doc_export_xpm[3] = { doc_export_x16, doc_export_x24, doc_export_x32 }; + diff --git a/app/bin/bitmaps/doc-import-xtc.xpm b/app/bin/bitmaps/doc-import-xtc.xpm new file mode 100644 index 0000000..4b00631 --- /dev/null +++ b/app/bin/bitmaps/doc-import-xtc.xpm @@ -0,0 +1,123 @@ +static char *doc_import_xtc_x16[] = { + "16 16 13 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #336666", + "3 c #339966", + "4 c #666666", + "5 c #669966", + "6 c #999999", + "7 c #99CC99", + "8 c #99CCCC", + "9 c #CCCCCC", + "A c #FFFFFF", + "B c #C0C0C0", + " 4444444444444", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 49AAAAAAAAAA4", + " 486AAAAAAAAA4", + "1112B739AAAAAAA4", + "1112B759AAAAAAA4", + " 496AAAAAAAAA4", + " 4BAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4444444444444"}; + +static char *doc_import_xtc_x24[] = { + "24 24 13 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #336633", + "3 c #339966", + "4 c #666666", + "5 c #669966", + "6 c #669999", + "7 c #999999", + "8 c #99CC99", + "9 c #CCCCCC", + "A c #FFFFFF", + "B c #C0C0C0", + " 444444444444444444", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 498AAAAAAAAAAAAAAA4", + " 4516AAAAAAAAAAAAAA4", + " 4A8139AAAAAAAAAAAA4", + "111111111119AAAAAAAAAAA4", + "111112775119AAAAAAAAAAA4", + " 4A7159AAAAAAAAAAAA4", + " 4517AAAAAAAAAAAAAA4", + " 49BAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4AAAAAAAAAAAAAAAAA4", + " 4444444444444444444"}; + +static char *doc_import_xtc_x32[] = { + "32 32 14 1", + " c None", + "0 c #000000", + "1 c #006633", + "2 c #009933", + "3 c #339933", + "4 c #339966", + "5 c #666666", + "6 c #669966", + "7 c #669999", + "8 c #99CC99", + "9 c #CCCCCC", + "A c #CCFFCC", + "B c #CCFFFF", + "C c #FFFFFF", + " 55555555555555555555555 ", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5939CCCCCCCCCCCCCCCCCCCC5", + " 56228CCCCCCCCCCCCCCCCCCC5", + " 5C6226CCCCCCCCCCCCCCCCCC5", + " 59982239CCCCCCCCCCCCCCCC5", + " 22222222222222BCCCCCCCCCCCCCCC5", + " 22222222222223CCCCCCCCCCCCCCCC5", + " 5CC7226ACCCCCCCCCCCCCCCC5", + " 594228CCCCCCCCCCCCCCCCCC5", + " 56239CCCCCCCCCCCCCCCCCCC5", + " 596ACCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 55555555555555555555555 "}; + +static char **doc_import_xtc_xpm[3] = { doc_import_xtc_x16, doc_import_xtc_x24, doc_import_xtc_x32 }; + diff --git a/app/bin/bitmaps/doc-import.xpm b/app/bin/bitmaps/doc-import.xpm new file mode 100644 index 0000000..0b10537 --- /dev/null +++ b/app/bin/bitmaps/doc-import.xpm @@ -0,0 +1,123 @@ +static char *doc_import_x16[] = { + "16 16 13 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #336666", + "3 c #339966", + "4 c #666666", + "5 c #669966", + "6 c #999999", + "7 c #99CC99", + "8 c #99CCCC", + "9 c #CCCCCC", + "A c #FFFFFF", + "B c #C0C0C0", + " 4444444444444", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4A666666666A4", + " 49699999996A4", + " 48599999996A4", + "1112B537999996A4", + "1112B537999996A4", + " 49399999996A4", + " 4B699999996A4", + " 4A699999996A4", + " 4AA66666666A4", + " 4AAAAAAAAAAA4", + " 4AAAAAAAAAAA4", + " 4444444444444"}; + +static char *doc_import_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #336633", + "3 c #339966", + "4 c #666666", + "5 c #669966", + "6 c #999999", + "7 c #99CC99", + "8 c #CCCCCC", + "9 c #FFFFFF", + "A c #C0C0C0", + " 444444444444444444", + " 4999999999999999994", + " 4999999999999999994", + " 4999999999999999994", + " 4999999999999999994", + " 4999999999999999994", + " 4996666666666666994", + " 4996888888888886994", + " 4876888888888886994", + " 4613888888888886994", + " 49713A8888888886994", + "11111111111A888888886994", + "11111266311A888888886994", + " 49613A8888888886994", + " 4515888888888886994", + " 48A6888888888886994", + " 4996888888888886994", + " 4996888888888886994", + " 4999666666666666994", + " 4999999999999999994", + " 4999999999999999994", + " 4999999999999999994", + " 4999999999999999994", + " 4444444444444444444"}; + +static char *doc_import_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #006633", + "2 c #009933", + "3 c #339933", + "4 c #339966", + "5 c #666666", + "6 c #669966", + "7 c #669999", + "8 c #999999", + "9 c #99CC99", + "A c #CCCCCC", + "B c #CCFFCC", + "C c #FFFFFF", + "D c #C0C0C0", + " 55555555555555555555555 ", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCC88888888888888888CCC5", + " 5CCC8AAAAAAAAAAAAAAA8CCC5", + " 5CCC8AAAAAAAAAAAAAAA8CCC5", + " 5B4A8AAAAAAAAAAAAAAA8CCC5", + " 56226AAAAAAAAAAAAAAA8CCC5", + " 5C7226DAAAAAAAAAAAAA8CCC5", + " 5AA92239AAAAAAAAAAAA8CCC5", + " 22222222222222DAAAAAAAAAAA8CCC5", + " 22222222222222DAAAAAAAAAAA8CCC5", + " 5CC7224DAAAAAAAAAAAA8CCC5", + " 5A4226AAAAAAAAAAAAAA8CCC5", + " 56226AAAAAAAAAAAAAAA8CCC5", + " 5A6B8AAAAAAAAAAAAAAA8CCC5", + " 5CCC8AAAAAAAAAAAAAAA8CCC5", + " 5CCC8AAAAAAAAAAAAAAA8CCC5", + " 5CCC8AAAAAAAAAAAAAAA8CCC5", + " 5CCC88888888888888888CCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 5CCCCCCCCCCCCCCCCCCCCCCC5", + " 55555555555555555555555 "}; + +static char **doc_import_xpm[3] = { doc_import_x16, doc_import_x24, doc_import_x32 }; + diff --git a/app/bin/bitmaps/doc-new.xpm b/app/bin/bitmaps/doc-new.xpm new file mode 100644 index 0000000..cd4dbc1 --- /dev/null +++ b/app/bin/bitmaps/doc-new.xpm @@ -0,0 +1,127 @@ +static char *doc_new_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #00CC33", + "3 c #00CC66", + "4 c #00FF66", + "5 c #33CC66", + "6 c #666666", + "7 c #669966", + "8 c #66CC99", + "9 c #99CC99", + "A c #CCCCCC", + "B c #CCFFCC", + "C c #FFFFFF", + "D c #C0C0C0", + " 666666666666 ", + " 6CCA9CCCCCC6 ", + " 6CC52ACCCCC6 ", + " 6D71278CCCC6 ", + " 6544444BCCC6 ", + " 6AD139DCCCC6 ", + " 6CC12ACCCCC6 ", + " 6CCA9CCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 6CCCCCCCCCC6 ", + " 666666666666 "}; + +static char *doc_new_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #00CC33", + "3 c #00CC66", + "4 c #00FF66", + "5 c #33CC66", + "6 c #666666", + "7 c #66CC66", + "8 c #66CC99", + "9 c #99CC99", + "A c #CCCCCC", + "B c #CCFFCC", + "C c #FFFFFF", + " 666666666666666666 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCC87ACCCCCCCCC6 ", + " 6CCCC347CCCCCCCCC6 ", + " 6CCCC547CCCCCCCCC6 ", + " 6C87734211ACCCCCC6 ", + " 6C344444449CCCCCC6 ", + " 6C522342229CCCCCC6 ", + " 6CCCB547CCCCCCCCC6 ", + " 6CCCB547CCCCCCCCC6 ", + " 6CCCC779CCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 6CCCCCCCCCCCCCCCC6 ", + " 666666666666666666 "}; + +static char *doc_new_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #00CC33", + "3 c #00FF66", + "4 c #339933", + "5 c #666666", + "6 c #669966", + "7 c #66CC99", + "8 c #99CC99", + "9 c #CCCCCC", + "A c #CCFFCC", + "B c #CCFFFF", + "C c #FFFFFF", + "D c #C0C0C0", + " 555555555555555555555555 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCC8111DCCCCCCCCCCCC5 ", + " 5CCCCC8232DCCCCCCCCCCCC5 ", + " 5CCCCC8232DCCCCCCCCCCCC5 ", + " 5CCAAA82328AAACCCCCCCCC5 ", + " 5C822223322221ACCCCCCCC5 ", + " 5C823333333332ACCCCCCCC5 ", + " 5C823333333332ACCCCCCCC5 ", + " 5C988842326888BCCCCCCCC5 ", + " 5CCCCC62329CCCCCCCCCCCC5 ", + " 5CCCCC72329CCCCCCCCCCCC5 ", + " 5CCCCC82229CCCCCCCCCCCC5 ", + " 5CCCCC9DDDBCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 5CCCCCCCCCCCCCCCCCCCCCC5 ", + " 555555555555555555555555 "}; + +static char **doc_new_xpm[3] = { doc_new_x16, doc_new_x24, doc_new_x32 }; + diff --git a/app/bin/bitmaps/doc-open.xpm b/app/bin/bitmaps/doc-open.xpm new file mode 100644 index 0000000..992c9bf --- /dev/null +++ b/app/bin/bitmaps/doc-open.xpm @@ -0,0 +1,136 @@ +static char *doc_open_x16[] = { + "16 16 17 1", + " c None", + "0 c #000000", + "1 c #663300", + "2 c #666600", + "3 c #666633", + "4 c #996633", + "5 c #996666", + "6 c #999966", + "7 c #999999", + "8 c #CC9966", + "9 c #CCCC66", + "A c #CCCC99", + "B c #CCCCCC", + "C c #FFCC99", + "D c #FFFFFF", + "E c #C0C0C0", + "F c #808080", + " ", + " ", + "2466666677F ", + "3C7BBBBBBBE7431 ", + "3C7DDDDDDDDBA61 ", + "3C7DDDDDDDDD761 ", + "3C51111111111113", + "3A3CCCCCCCCCCCC3", + "386CCCCCCCCCCC93", + "369CCCCCCCCCCC81", + "33CCCCCCCCCCCC4 ", + "24CCCCCCCCCCCC2 ", + "28CCCCCCCCCCCC3 ", + "368888888888862 ", + "222222222222221 ", + " "}; + +static char *doc_open_x24[] = { + "24 24 18 1", + " c None", + "0 c #000000", + "1 c #663300", + "2 c #666600", + "3 c #666633", + "4 c #666666", + "5 c #996633", + "6 c #996666", + "7 c #999933", + "8 c #999966", + "9 c #999999", + "A c #CC9966", + "B c #CC9999", + "C c #CCCC66", + "D c #CCCC99", + "E c #FFCC99", + "F c #FFFFFF", + "G c #C0C0C0", + " ", + " ", + " ", + "355888888869 ", + "3CE9GGGGGGGGGGG941111 ", + "3CE9FFFFFFFFFFFFBBAA51 ", + "3CE9FFFFFFFFFFFFFGDE81 ", + "3CE9FFFFFFFFFFFFFFGE81 ", + "3CE9FFFFFFFFFFFFFFGE81 ", + "3CE988888888888888675333", + "3CE5CDDDDDDDDDDDDDDDDDA3", + "3CE3EEEEEEEEEEEEEEEEEEA1", + "3CC8EEEEEEEEEEEEEEEEEE5 ", + "3CACEEEEEEEEEEEEEEEEEE2 ", + "3C5EEEEEEEEEEEEEEEEEEE3 ", + "3A5EEEEEEEEEEEEEEEEEEA3 ", + "3A8EEEEEEEEEEEEEEEEEE71 ", + "37CEEEEEEEEEEEEEEEEEE3 ", + "33EEEEEEEEEEEEEEEEEEE3 ", + "35EEEEEEEEEEEEEEEEEEC3 ", + "25AAAAAAAAAAAAAAAAAA71 ", + "222222222222222222222 ", + " ", + " "}; + +static char *doc_open_x32[] = { + "32 32 18 1", + " c None", + "0 c #000000", + "1 c #663300", + "2 c #666600", + "3 c #666633", + "4 c #996633", + "5 c #996666", + "6 c #999933", + "7 c #999966", + "8 c #999999", + "9 c #CC9966", + "A c #CC9999", + "B c #CCCC66", + "C c #CCCC99", + "D c #CCCCCC", + "E c #FFCC99", + "F c #FFFFFF", + "G c #C0C0C0", + " ", + " ", + " ", + " ", + "134444444444433 ", + "17EECGGGGGGGGG8888888 ", + "17EEGDFFFFFFFFFFFFFFD8311112 ", + "17EEGFFFFFFFFFFFFFFFFFAEEEE4 ", + "17EEGFFFFFFFFFFFFFFFFFFAEEE4 ", + "17EEGFFFFFFFFFFFFFFFFFFFGEE4 ", + "17EEGFFFFFFFFFFFFFFFFFFFDCE4 ", + "17EEGFFFFFFFFFFFFFFFFFFFDCE4 ", + "17EEGGGGGGGGGGGGGGGGGGGG8793111 ", + "17EE7799999999999999999999999941", + "17EE5CEEEEEEEEEEEEEEEEEEEEEEEE4 ", + "17EE3EEEEEEEEEEEEEEEEEEEEEEEEE2 ", + "17EC6EEEEEEEEEEEEEEEEEEEEEEEEE3 ", + "17E99EEEEEEEEEEEEEEEEEEEEEEEEB3 ", + "17E4EEEEEEEEEEEEEEEEEEEEEEEEE71 ", + "17E3EEEEEEEEEEEEEEEEEEEEEEEEE4 ", + "17B7EEEEEEEEEEEEEEEEEEEEEEEEE2 ", + "1799EEEEEEEEEEEEEEEEEEEEEEEEB3 ", + "174EEEEEEEEEEEEEEEEEEEEEEEEE92 ", + "174EEEEEEEEEEEEEEEEEEEEEEEEE61 ", + "147EEEEEEEEEEEEEEEEEEEEEEEEE2 ", + "14BEEEEEEEEEEEEEEEEEEEEEEEEE3 ", + "13EEEEEEEEEEEEEEEEEEEEEEEEEB3 ", + "12999999999999999999999999941 ", + " 222222222222222222222222222 ", + " ", + " ", + " "}; + +static char **doc_open_xpm[3] = { doc_open_x16, doc_open_x24, doc_open_x32 }; + diff --git a/app/bin/bitmaps/doc-print.xpm b/app/bin/bitmaps/doc-print.xpm new file mode 100644 index 0000000..853014f --- /dev/null +++ b/app/bin/bitmaps/doc-print.xpm @@ -0,0 +1,108 @@ +static char *doc_print_x16[] = { + "16 16 8 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CCCCCC", + "4 c #FFFFFF", + "5 c #C0C0C0", + "6 c #808080", + " 111111111111 ", + " 144444444441 ", + " 144444444441 ", + " 144444444441 ", + " 144444444441 ", + " 666666666666666", + "6255555555555556", + "6333333333333336", + "6333333333333336", + "6333333333333336", + "6311111111111136", + "6316111111654136", + "6512666666624136", + "6616111111165166", + " 166666666341 ", + " 111111111111 "}; + +static char *doc_print_x24[] = { + "24 24 8 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CCCCCC", + "4 c #FFFFFF", + "5 c #C0C0C0", + "6 c #808080", + " 1111111111111111 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 144444444444444441 ", + " 6666666666666666666666 ", + "625555555555555555555526", + "653333333333333333333356", + "653333333333333333333356", + "653333333333333333333356", + "653333333333333333333356", + "653333333333333333333356", + "653111111111111111111356", + "653136666666666634441356", + "653142222222222255441356", + "653142222222222225441356", + "662136666666666664441266", + " 136666666666666241 ", + " 142222222222233441 ", + " 145555555555544441 ", + " 1111111111111111 "}; + +static char *doc_print_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " ", + " 2222222222222222222222 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 2555555555555555555552 ", + " 777777777777777777777777777777 ", + " 7666666666666666666666666666677", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444444444444444444444444444437", + " 3444222222222222222222222244437", + " 3444254444444444444455555244437", + " 3444267777777777777765555244437", + " 3444246666666666666666655244437", + " 3444246666666666666666655244437", + " 7444267777777777777773555244437", + " 777725444444444444444555527777 ", + " 2311111111111111111152 ", + " 2544444444444444555552 ", + " 2377777777777777455552 ", + " 2222222222222222222222 ", + " "}; + +static char **doc_print_xpm[3] = { doc_print_x16, doc_print_x24, doc_print_x32 }; + diff --git a/app/bin/bitmaps/doc-revert.xpm b/app/bin/bitmaps/doc-revert.xpm new file mode 100644 index 0000000..4af778a --- /dev/null +++ b/app/bin/bitmaps/doc-revert.xpm @@ -0,0 +1,134 @@ +static char *doc_revert_x16[] = { + "16 16 17 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996633", + "3 c #CC6633", + "4 c #CC9900", + "5 c #CC9933", + "6 c #CC9966", + "7 c #CC9999", + "8 c #CCCC33", + "9 c #CCCC99", + "A c #CCCCCC", + "B c #FFCC00", + "C c #FFCC33", + "D c #FFCCCC", + "E c #FFFFCC", + "F c #FFFFFF", + " 111111111111 ", + " 1FFFFFFFFFF1 ", + " 1FFFFFFFFFF1 ", + " 1FFFADFFFFF1 ", + " 1FF639FFFFF1 ", + " 1D5BB529FFF1 ", + " 1F65B5B86FF1 ", + " 1FF93665C7F1 ", + " 1FFFDAFA55E1 ", + " 1FFFFFFF7491 ", + " 1FFFFFFFD561 ", + " 1FFFFFFFF251 ", + " 1FFFFFFFF621 ", + " 1FFFFFFFFFF1 ", + " 1FFFFFFFFFF1 ", + " 111111111111 "}; + +static char *doc_revert_x24[] = { + "24 24 17 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996600", + "3 c #996633", + "4 c #CC6633", + "5 c #CC9900", + "6 c #CC9933", + "7 c #CC9966", + "8 c #CC9999", + "9 c #CCCC99", + "A c #CCCCCC", + "B c #FFCC00", + "C c #FFCC33", + "D c #FFCCCC", + "E c #FFFFCC", + "F c #FFFFFF", + " 111111111111111111 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFD8FFFFFFFFF1 ", + " 1FFFF863FFFFFFFFF1 ", + " 1FFD6CB37AFFFFFFF1 ", + " 1FA6BBBBB568FFFFF1 ", + " 1FF76BBBBBBB7FFFF1 ", + " 1FFFA6B2736BB7FFF1 ", + " 1FFFFE72FF96B69FF1 ", + " 1FFFFFF9FFF96B3FF1 ", + " 1FFFFFFFFFFF7B6DF1 ", + " 1FFFFFFFFFFFD6B8F1 ", + " 1FFFFFFFFFFFF7B3F1 ", + " 1FFFFFFFFFFFFA62F1 ", + " 1FFFFFFFFFFFFE66F1 ", + " 1FFFFFFFFFFFFF34E1 ", + " 1FFFFFFFFFFFFFAAF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFF1 ", + " 111111111111111111 "}; + +static char *doc_revert_x32[] = { + "32 32 17 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996600", + "3 c #996633", + "4 c #CC6633", + "5 c #CC9900", + "6 c #CC9933", + "7 c #CC9966", + "8 c #CC9999", + "9 c #CCCC99", + "A c #CCCCCC", + "B c #FFCC00", + "C c #FFCC33", + "D c #FFCCCC", + "E c #FFFFCC", + "F c #FFFFFF", + " 111111111111111111111111 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFE7DFFFFFFFFFFFF1 ", + " 1FFFFFF965AFFFFFFFFFFFF1 ", + " 1FFFFE76B59FFFFFFFFFFFF1 ", + " 1FFF96BBBB6328FFFFFFFFF1 ", + " 1FF86BBBBBBBBB68FFFFFFF1 ", + " 1FFF76BBBBBBBBBC7FFFFFF1 ", + " 1FFFFA6BB5266BBBB7FFFFF1 ", + " 1FFFFFF7C5AFA66BBC8FFFF1 ", + " 1FFFFFFF849FFF96BB6DFFF1 ", + " 1FFFFFFFFAAFFFF96BB7FFF1 ", + " 1FFFFFFFFFFFFFFF7BB6FFF1 ", + " 1FFFFFFFFFFFFFFFF6B6AFF1 ", + " 1FFFFFFFFFFFFFFFF7BB7FF1 ", + " 1FFFFFFFFFFFFFFFFD6B3FF1 ", + " 1FFFFFFFFFFFFFFFFF3B3FF1 ", + " 1FFFFFFFFFFFFFFFFF8B6FF1 ", + " 1FFFFFFFFFFFFFFFFFA66DF1 ", + " 1FFFFFFFFFFFFFFFFFD66AF1 ", + " 1FFFFFFFFFFFFFFFFFF87EF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 1FFFFFFFFFFFFFFFFFFFFFF1 ", + " 111111111111111111111111 "}; + +static char **doc_revert_xpm[3] = { doc_revert_x16, doc_revert_x24, doc_revert_x32 }; + diff --git a/app/bin/bitmaps/doc-save-as.xpm b/app/bin/bitmaps/doc-save-as.xpm new file mode 100644 index 0000000..2ded960 --- /dev/null +++ b/app/bin/bitmaps/doc-save-as.xpm @@ -0,0 +1,135 @@ +static char *doc_save_as_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #996666", + "A c #999966", + "B c #9999CC", + "C c #CC9966", + "D c #FFCC66", + " ", + "111111 ", + "11111111 ", + "111111111 ", + " 1111 1 ", + " 111111 95 ", + " 111111 9DC5", + " 1111 9DD9 ", + " 1169DD9 ", + "2222222235DD9222", + "267B67B65CA98772", + "236736735C557442", + "2367367356547442", + "2367367367447442", + "2222222222222222", + " "}; + +static char *doc_save_as_x24[] = { + "24 24 18 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #996666", + "A c #999966", + "B c #9999CC", + "C c #99CCCC", + "D c #CC9966", + "E c #FF9966", + "F c #FFCC66", + "G c #808080", + " ", + " ", + "11111111111 ", + "111111111111 ", + "1111111111111 ", + " 11111 ", + " 1111 ", + " 1111111111 55 ", + " 1111111111 5DA5 ", + " 11111111 5DFFA5", + " 111111 5DFFE9 ", + " 11111 5DFFE9 ", + " 1111 5DFFF9 ", + " 11 5DFFF9 ", + "22222222222225AFFF922222", + "2C7C7C6C7C88GDDAF9C7CC72", + "286B4C0C4B775FFDG4C68862", + "286B4C0C4B775DD9C3C68862", + "286B4C0C4B777574C3C68862", + "286B4C0C4B77B4C3C3C68862", + "287C5C2C5C77C5C4C4C78872", + "222222222222222222222222", + " ", + " "}; + +static char *doc_save_as_x32[] = { + "32 32 19 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #996666", + "A c #999966", + "B c #999999", + "C c #9999CC", + "D c #99CCCC", + "E c #CC9966", + "F c #FF9966", + "G c #FFCC66", + "H c #808080", + " ", + " ", + " 111111 ", + " 1111111111111 ", + " 111111111111111 ", + " 1111111111111111 ", + " 1111111111111111 ", + " 111111 ", + " 11111 ", + " 111 1111 111 5 ", + " 111111111111 5A5 ", + " 111111111111 5EGE5 ", + " 1111111111 5EGGGE5 ", + " 1111111111 5EGGGGF9 ", + " 11111111 5EGGGGF9 ", + " 111111 5EGGGGF9 ", + " 11111 5EGGGGF9 ", + " 1111 5EGGGGF9 ", + " 222222222222222325EGGGGF922222 ", + "2DDDDDDDDDDDDDDDDB9EGGGFHDDDDDD2", + "2D8DD8DD8DD7DD7DBEGEEGFHDD7DD7D2", + "2D4CD4CD4CD3DD3DHFGGEEH2DD0DD0D2", + "2D4CD4CD4CD3DD3DHFGGFHD0DD0DD0D2", + "2D4CD4CD4CD3DD3DHEEE5DD0DD0DD0D2", + "2D4CD4CD4CD3DD3DC57B2DD0DD0DD0D2", + "2D4CD4CD4CD3DD3DD3DD0DD0DD0DD0D2", + "2D4CD4CD4CD3DD3DD3DD0DD0DD0DD0D2", + "2D6DD6DD6DD4DD4DD4DD3DD3DD3DD3D2", + "2DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD2", + "22222222222222222222222222222222", + " ", + " "}; + +static char **doc_save_as_xpm[3] = { doc_save_as_x16, doc_save_as_x24, doc_save_as_x32 }; + diff --git a/app/bin/bitmaps/doc-save.xpm b/app/bin/bitmaps/doc-save.xpm new file mode 100644 index 0000000..f775f95 --- /dev/null +++ b/app/bin/bitmaps/doc-save.xpm @@ -0,0 +1,116 @@ +static char *doc_save_x16[] = { + "16 16 10 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666699", + "6 c #669999", + "7 c #6699CC", + "8 c #9999CC", + " ", + "111111 ", + "11111111 ", + "111111111 ", + " 1111 1 ", + " 111111 ", + " 111111 ", + " 1111 ", + " 11 ", + "2222222232222222", + "2568568567668662", + "2356356356446442", + "2356356356446442", + "2356356356446442", + "2222222222222222", + " "}; + +static char *doc_save_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #9999CC", + "A c #99CCCC", + " ", + " ", + "11111111111 ", + "111111111111 ", + "1111111111111 ", + " 11111 ", + " 1111 ", + " 1111111111 ", + " 1111111111 ", + " 11111111 ", + " 111111 ", + " 11111 ", + " 1111 ", + " 11 ", + "222222222222222222222222", + "2A7A7A6A7A88A7A7A7A7AA72", + "28694A0A497794A3A3A68862", + "28694A0A497794A3A3A68862", + "28694A0A497794A3A3A68862", + "28694A0A497794A3A3A68862", + "287A5A2A5A77A5A4A4A78872", + "222222222222222222222222", + " ", + " "}; + +static char *doc_save_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666699", + "6 c #669999", + "7 c #6699CC", + "8 c #9999CC", + "9 c #99CCCC", + " ", + " ", + " 111111 ", + " 1111111111111 ", + " 111111111111111 ", + " 1111111111111111 ", + " 1111111111111111 ", + " 111111 ", + " 11111 ", + " 111 1111 111 ", + " 111111111111 ", + " 111111111111 ", + " 1111111111 ", + " 1111111111 ", + " 11111111 ", + " 111111 ", + " 11111 ", + " 1111 ", + " 222222222222222322222222222222 ", + "29999999999999999999999999999992", + "29799799799699699699699699699692", + "29489489489399399399099099099092", + "29489489489399399399099099099092", + "29489489489399399399099099099092", + "29489489489399399399099099099092", + "29489489489399399399099099099092", + "29489489489399399399099099099092", + "29599599599499499499399399399392", + "29999999999999999999999999999992", + "22222222222222222222222222222222", + " ", + " "}; + +static char **doc_save_xpm[3] = { doc_save_x16, doc_save_x24, doc_save_x32 }; + diff --git a/app/bin/bitmaps/doc-setup.xpm b/app/bin/bitmaps/doc-setup.xpm new file mode 100644 index 0000000..c6c8e48 --- /dev/null +++ b/app/bin/bitmaps/doc-setup.xpm @@ -0,0 +1,110 @@ +static char *doc_setup_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + "22222222222 ", + "25555555552 ", + "25555555552 ", + "25555555552 ", + "25555555552 ", + "25555555552 ", + "255555552222222 ", + "255555552555552 ", + "255555552555552 ", + "2555555477777777", + "2555554366666667", + "2555554644444443", + "2555554622222223", + "2222227311111723", + " 711111227", + " 1111122 "}; + +static char *doc_setup_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + "2222222222222222 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555555552 ", + "2555555555552222222222 ", + "2555555555552555555552 ", + "2555555555552555555552 ", + "2555555555552555555552 ", + "2555555555552555555552 ", + "255555555544777777777777", + "255555555576666666666667", + "255555555574444444444443", + "255555555574444444444443", + "255555555574222222222243", + "255555555574277777735243", + "222222222274111111112247", + " 77222222223277", + " 1222222762 ", + " 2222222222 "}; + +static char *doc_setup_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " 22222222222222222222 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "2555555555555555555552 ", + "255555555555555522222222222222 ", + "255555555555555525555555555552 ", + "255555555555555525555555555552 ", + "255555555555555525555555555552 ", + "255555555555555525555555555552 ", + "255555555555555525555555555552 ", + "25555555555554447777777777777777", + "25555555555556366666666666666667", + "25555555555556644444444444444447", + "25555555555556644444444444444447", + "25555555555556644444444444444447", + "25555555555556642222222222222447", + "25555555555556642444444444555247", + "25555555555556642777777777455247", + " 2222222222227342777777777735247", + " 7772777777777745277", + " 27777777777742 ", + " 21111111125552 ", + " 22222222222222 "}; + +static char **doc_setup_xpm[3] = { doc_setup_x16, doc_setup_x24, doc_setup_x32 }; + diff --git a/app/bin/bitmaps/document-export.xpm b/app/bin/bitmaps/document-export.xpm deleted file mode 100644 index 8d632de..0000000 --- a/app/bin/bitmaps/document-export.xpm +++ /dev/null @@ -1,90 +0,0 @@ -/* XPM */ -static char * export_xpm[] = { -"16 16 71 1", -" c None", -". c #406C98", -"+ c #DDF0FB", -"@ c #D4E9F7", -"# c #D1E7F5", -"$ c #CEE4F4", -"% c #CCE2F3", -"& c #CCE1F2", -"* c #A7C2DC", -"= c #D6EBF7", -"- c #C5DFEF", -"; c #C1DBED", -"> c #BCD6EA", -", c #B6D0E8", -"' c #B3CDE6", -") c #B2CCE5", -"! c #9AB6D2", -"~ c #E5F6FF", -"{ c #D7ECF8", -"] c #C7E1EF", -"^ c #85A4C2", -"/ c #D7EDF8", -"( c #C8E2F0", -"_ c #D8EEF8", -": c #CAE4F1", -"< c #D9EEF9", -"[ c #CBE5F2", -"} c #8FAFCF", -"| c #83A5C7", -"1 c #DAEFF9", -"2 c #CDE7F2", -"3 c #81A3C5", -"4 c #105293", -"5 c #DAF0F9", -"6 c #CEE8F3", -"7 c #C0DAEB", -"8 c #AFCCE0", -"9 c #9AB9D4", -"0 c #88A9C9", -"a c #7FA1C3", -"b c #CCE1F0", -"c c #155493", -"d c #DBF0FA", -"e c #D0EAF4", -"f c #CFE8F3", -"g c #D4EAF6", -"h c #E1F3FD", -"i c #195793", -"j c #DBF1FA", -"k c #D1EBF4", -"l c #C1DCEB", -"m c #AFCBE0", -"n c #98B7D1", -"o c #84A4C4", -"p c #799BBD", -"q c #CBE0EF", -"r c #1E5993", -"s c #DCF1FA", -"t c #D2ECF5", -"u c #7597B9", -"v c #275D94", -"w c #DCF2FB", -"x c #D3EDF5", -"y c #84A4C0", -"z c #6B8DAF", -"A c #3D71A5", -"B c #DDF2FB", -"C c #D4EEF6", -"D c #D8EDF8", -"E c #E1F4FD", -"F c #DFF2FC", -" ......... ", -" .+@#$%&&*. ", -" .=-;>,')!~. ", -" .{]-;>,'^^^. ", -" ./(]-;>,')&. ", -" ._:(]-;>,'&. ", -" .<[:(]-;>}| ", -" .12[:(]-;3~4 ", -" .562[7890ab~c ", -" .de62fg1h~~~~i", -" .jke6lmnopq~r ", -" .stke62[:u~v ", -" .wxtke62[yzA ", -" .BCxtke62[D. ", -" .EBwsjd51 c #B6D0E8", -", c #B3CDE6", -"' c #9AB6D2", -") c #E5F6FF", -"! c #D7ECF8", -"~ c #C7E1EF", -"{ c #C1DBED", -"] c #85A4C2", -"^ c #D8EEF8", -"/ c #CAE4F1", -"( c #D9EEF9", -"_ c #CBE5F2", -": c #C8E2F0", -"< c #8FAFCF", -"[ c #83A5C7", -"} c #DAEFF9", -"| c #CDE7F2", -"1 c #81A3C5", -"2 c #105293", -"3 c #AFCCE0", -"4 c #9AB9D4", -"5 c #88A9C9", -"6 c #7FA1C3", -"7 c #CCE1F0", -"8 c #155493", -"9 c #DBF0FA", -"0 c #D0EAF4", -"a c #CFE8F3", -"b c #D4EAF6", -"c c #E1F3FD", -"d c #195793", -"e c #DBF1FA", -"f c #D1EBF4", -"g c #CEE8F3", -"h c #C1DCEB", -"i c #AFCBE0", -"j c #98B7D1", -"k c #84A4C4", -"l c #799BBD", -"m c #CBE0EF", -"n c #1E5993", -"o c #DCF1FA", -"p c #D2ECF5", -"q c #7597B9", -"r c #275D94", -"s c #84A4C0", -"t c #6B8DAF", -"u c #3D71A5", -"v c #DDF2FB", -"w c #D4EEF6", -"x c #D8EDF8", -"y c #E1F4FD", -"z c #DFF2FC", -" ......... ", -" .+@#$%&#*. ", -" .=-#;>,#'). ", -" .!~#{;>#]]]. ", -" .##########. ", -" .^/#~-{#>,&. ", -" .(_#:~-#;<[ ", -" .}|#/:~#{1)2 ", -" .#####34567)8 ", -" .90#|ab}c))))d", -" .ef#ghijklm)n ", -" .op#0g|#/q)r ", -" .########stu ", -" .vw#pf0#|_x. ", -" .yv#oe9#}(z. ", -" ............ "}; diff --git a/app/bin/bitmaps/document-import.xpm b/app/bin/bitmaps/document-import.xpm deleted file mode 100644 index 28dc3c8..0000000 --- a/app/bin/bitmaps/document-import.xpm +++ /dev/null @@ -1,92 +0,0 @@ -/* XPM */ -static char * import_xpm[] = { -"16 16 73 1", -" c None", -". c #406C98", -"+ c #DDF0FB", -"@ c #D4E9F7", -"# c #D1E7F5", -"$ c #CEE4F4", -"% c #CCE2F3", -"& c #CCE1F2", -"* c #A7C2DC", -"= c #D6EBF7", -"- c #C5DFEF", -"; c #C1DBED", -"> c #BCD6EA", -", c #B6D0E8", -"' c #B3CDE6", -") c #B2CCE5", -"! c #9AB6D2", -"~ c #E5F6FF", -"{ c #D7ECF8", -"] c #C7E1EF", -"^ c #85A4C2", -"/ c #D7EDF8", -"( c #C8E2F0", -"_ c #D8EEF8", -": c #94B4D1", -"< c #86A7C9", -"[ c #AECBE1", -"} c #D9EEF9", -"| c #81A3C5", -"1 c #E4F6FF", -"2 c #93B2D0", -"3 c #B6D2E6", -"4 c #155493", -"5 c #7FA1C3", -"6 c #CBE1F0", -"7 c #DEF2FC", -"8 c #A5C3DA", -"9 c #BED9EA", -"0 c #195793", -"a c #DFF2FC", -"b c #CFE7F4", -"c c #1E5993", -"d c #799BBD", -"e c #CAE0EF", -"f c #A4C2D9", -"g c #C0DBEB", -"h c #D4EAF7", -"i c #DBF1FA", -"j c #7597B9", -"k c #8BABC7", -"l c #B8D4E6", -"m c #CBE5F2", -"n c #CAE4F1", -"o c #D5EBF7", -"p c #DCF1FA", -"q c #86A6C1", -"r c #6F91B2", -"s c #ACC9DC", -"t c #CEE8F3", -"u c #CDE7F2", -"v c #D6ECF7", -"w c #DCF2FB", -"x c #D3EDF5", -"y c #D2ECF5", -"z c #D1EBF4", -"A c #D0EAF4", -"B c #DDF2FB", -"C c #D4EEF6", -"D c #D8EDF8", -"E c #E1F4FD", -"F c #DBF0FA", -"G c #DAF0F9", -"H c #DAEFF9", -" ......... ", -" .+@#$%&&* ", -" .=-;>,')!~ ", -" .{]-;>,'^^^. ", -" ./(]-;>,')&. ", -" ._:<[-;>,'&. ", -" .}|123-;>,%. ", -" 44556789-;>$. ", -"0~~~~1a/b]-;#. ", -" ccddeafg(]-h. ", -" .ij1klmn(]o. ", -" .pqrstumn(v. ", -" .wxyzAtumn{. ", -" .BCxyzAtumD. ", -" .EBwpiFGH}a. ", -" ............ "}; diff --git a/app/bin/bitmaps/document-importmod.xpm b/app/bin/bitmaps/document-importmod.xpm deleted file mode 100644 index d0efd02..0000000 --- a/app/bin/bitmaps/document-importmod.xpm +++ /dev/null @@ -1,71 +0,0 @@ -/* XPM */ -static char *importmod_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 49 1 ", -" c #27795F", -". c #305173", -"X c #1A6878", -"o c #07900F", -"O c #0E8E14", -"+ c #0B9C17", -"@ c #10971E", -"# c #0BA619", -"$ c #10A51D", -"% c #0DB61C", -"& c #159E22", -"* c #209E2D", -"= c #18A727", -"- c #16B627", -"; c #27AB35", -": c #30AF3B", -"> c #2AB437", -", c #31B63E", -"< c #36BD46", -"1 c #3CC44C", -"2 c #40C94E", -"3 c #44CB54", -"4 c #54DB64", -"5 c #195793", -"6 c #3B6D8D", -"7 c #39798B", -"8 c #3F6E9C", -"9 c #377C97", -"0 c #3D77A6", -"q c #3F7FBC", -"w c #37878B", -"e c #38938E", -"r c #378399", -"t c #3983A7", -"y c #6F91B2", -"u c #789ABC", -"i c #7FA1C3", -"p c #86A6C4", -"a c #96B4D1", -"s c #A7C4DB", -"d c #AECBE1", -"f c #B9D5E7", -"g c #C0DBEB", -"h c #C9E1EF", -"j c #CDE4F2", -"k c #D7EDF8", -"l c #DFF2FC", -"z c #E5F6FF", -"x c None", -/* pixels */ -"xxqqqqqqqqqxxxxx", -"xxt3111;<>sqxxxx", -"xxq1<<:O;#xxxx", -"xxq=aid=$=,1>txx", -"xxq=ilaf->44>txx", -"x5qiijlsg-31=0xx", -"5zzzzzzkjh1,#rxx", -"x5Xuuhlsf1111exx", -"xxw c #265299", -", c #243F67", -"' c #0F2D6C", -") c #082160", -" ...+.++. ", -" +.@@@@@@#. ", -"++++.@@@@@@@#$ ", -"+%%#.@#####@@#$ ", -"+%%#+@@@@@@@@%. ", -".%%#.@######@%. ", -".%%#.@@@@@@@@%. ", -".%&&&&&&&&&&&&&*", -"+%&=====-======&", -".%&=;;;;;;;;;;-&", -".%&=;;-;;;-;;;-&", -"$%&=;;;-;;;;;;-&", -".%*;;;>>;>;>>>;&", -"$%&;>>>;>;>>;>;&", -".,&,'>'>>>>''>'*", -"$&&&&&&&&&&&&&*)"}; diff --git a/app/bin/bitmaps/document-print.xpm b/app/bin/bitmaps/document-print.xpm deleted file mode 100644 index 69802d6..0000000 --- a/app/bin/bitmaps/document-print.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static char * document_print_xpm[] = { -"16 16 5 1", -" c None", -". c #BABDB6", -"+ c #EEEEEC", -"@ c #888A85", -"# c #D3D7CF", -" ", -" ........... ", -" .++++@++++. ", -" .+..@@@..+. ", -" .++@@@@@++. ", -" .+...@...+. ", -" .++++@++++. ", -" .+++++++++. ", -" @@@.........@@@", -" @+++++++++++++@", -" @+#+.+#+#+#+#+@", -" @+###########+@", -" @+.@@@@@@@@@.+@", -" @+...........+@", -" @+###########+@", -" @@@@@@@@@@@@@@@"}; diff --git a/app/bin/bitmaps/document-save.xpm b/app/bin/bitmaps/document-save.xpm deleted file mode 100644 index afc2ce6..0000000 --- a/app/bin/bitmaps/document-save.xpm +++ /dev/null @@ -1,35 +0,0 @@ -/* XPM */ -static char * document_save[] = { -"16 16 16 1", -" c None", -". c #193A55", -"+ c #192933", -"@ c #0A2342", -"# c #122735", -"$ c #536974", -"% c #A7BDC6", -"& c #5180AA", -"* c #244E77", -"= c #272925", -"- c #102C4B", -"; c #E6E6E6", -"> c #7095AB", -", c #2D5C8D", -"' c #6E6E6E", -") c #9B9C9B", -".+..@@@#. ", -"...$%%&*@ ", -"+=#---&%*#=====.", -"=%;%>,@>&-%;;;;=", -"=;;%%$@,&-'%;;;=", -"=;;@@@@,*@@@@;;=", -"=;;)@&***,&@$%;=", -"=;;;)@&,,>@$;;;=", -"=;;;%)@>&@$%;;;=", -"=;;;;;)#@$;;;;;=", -"=;;;;;;;;;;;;;;=", -"=))))))))))))))=", -"=))')')')')')')=", -"=))')')')')')')=", -"=))))))))))))))=", -"+==============+"}; diff --git a/app/bin/bitmaps/down.xpm b/app/bin/bitmaps/down.xpm new file mode 100644 index 0000000..8edaca4 --- /dev/null +++ b/app/bin/bitmaps/down.xpm @@ -0,0 +1,89 @@ +static char *down_x16[] = { + "8 16 2 1", + " c None", + "0 c #000000", + " ", + " ", + " ", + " ", + " ", + " ", + " 000000 ", + " 000000 ", + " 0000 ", + " 00 ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char *down_x24[] = { + "12 24 2 1", + " c None", + "0 c #000000", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " 0000000000 ", + " 0000000000 ", + " 0000000000 ", + " 00000000 ", + " 000000 ", + " 0000 ", + " 00 ", + " 0 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char *down_x32[] = { + "16 32 2 1", + " c None", + "0 c #000000", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " 0000000000000 ", + " 0000000000000 ", + " 0000000000000 ", + " 000000000000 ", + " 0000000000 ", + " 00000000 ", + " 000000 ", + " 0000 ", + " 000 ", + " 00 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char **down_xpm[3] = { down_x16, down_x24, down_x32 }; + diff --git a/app/bin/bitmaps/dpoly.xpm b/app/bin/bitmaps/dpoly.xpm deleted file mode 100644 index b46993e..0000000 --- a/app/bin/bitmaps/dpoly.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * dpoly_xpm[] = { -"16 16 3 1", -"X c None", -" c #FFFF00000000", -". c #000000000000", -" ..... XXXXXXXXX", -".XXXXXX..... XXX", -".XXXXXXXXX..XXXX", -".XXXXXXXX.XXXXXX", -".XXXXXX..XXXXXXX", -".XXXXX.XXXXXXXXX", -".XXX..XXXXXXXXXX", -".XX ...XXXXXXXXX", -".XXXXXX......XXX", -" XXXXXXXXXXXX.. ", -"X.XXXXXXXXXXXX.X", -"X.XXXXXXXXXX..XX", -"XX.XXXXXXXX.XXXX", -"XXX.XXXXXX.XXXXX", -"XXX.XXXX..XXXXXX", -"XXXX .. XXXXXXXX"}; diff --git a/app/bin/bitmaps/dpolyline.xpm b/app/bin/bitmaps/dpolyline.xpm deleted file mode 100644 index 7f01bda..0000000 --- a/app/bin/bitmaps/dpolyline.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dpolyline_xpm[] = { -"16 16 3 1", -"X c None", -" c #FFFF00000000", -". c #000000000000", -"XXXXXXXXXXXXXXXX", -"XXXXXXX .... XXX", -"XXXXXXXXXX..XXXX", -"XXXXXXXXX.XXXXXX", -"XXXXXXX..XXXXXXX", -"XXXXXX.XXXXXXXXX", -"XXXX..XXXXXXXXXX", -"XXX ...XXXXXXXXX", -"XXXXXXX......XXX", -" XXXXXXXXXXXX.. ", -"X.XXXXXXXXXXXX.X", -"X.XXXXXXXXXX..XX", -"XX.XXXXXXXX.XXXX", -"XXX.XXXXXX.XXXXX", -"XXX.XXXX..XXXXXX", -"XXXX .. XXXXXXXX"}; - diff --git a/app/bin/bitmaps/dtbledge.xpm b/app/bin/bitmaps/dtbledge.xpm deleted file mode 100644 index 7772d10..0000000 --- a/app/bin/bitmaps/dtbledge.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * dtbledge_xpm[] = { -"16 16 4 1", -"o c None", -". c #000000000000", -" c #0000FFFF0000", -"X c #861782078617", -" .", -" ..", -" .X", -" ..X", -" ..XX", -" .XXX", -" ..XXX", -" ..XXXX", -" .XXXXo", -" ..XXXXo", -" .XXXXoo", -"..........XXXooo", -"..........XXXooo", -"XXXXXXXX..XXoooo", -"XXXXXXXX..Xooooo", -"XXXXXXXX..Xooooo"}; diff --git a/app/bin/bitmaps/ease-broad.xpm b/app/bin/bitmaps/ease-broad.xpm new file mode 100644 index 0000000..646791e --- /dev/null +++ b/app/bin/bitmaps/ease-broad.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_broad_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" xxxx x ", +" x x x ", +" x x xxx xx xx xxx ", +" xxxx x x x x x x x x ", +" x x x x x x x x x ", +" x x x x x x xx x x ", +" xxxx x xx x x xxx ", +" "}; + +static char* ease_broad_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xxxxxx xx xxx xxxxx xxxxxx xxxxxx ", +" xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xxxxxx xx xxxxx xxxx x xxxxxx ", +" ", +" "}; + +static char* ease_broad_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xx xx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xxxxxxx xx ", +" xxxxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xxxxxxxx xx xxx xxxxxx xxxxxxx xxxxxx ", +" xxxxxxxx xx xxxx xxxxxxxx xxxxxxxx xxxxxxx ", +" xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xxxxxxxx xx xxxxxxxx xxxxxxxx xxxxxxx ", +" xxxxxxx xx xxxxxx xxxx xx xxxxxx ", +" ", +" ", +" ", +" "}; + +static char **ease_broad_xpm[3] = { ease_broad_x16, ease_broad_x24, ease_broad_x32 }; diff --git a/app/bin/bitmaps/ease-cornu.xpm b/app/bin/bitmaps/ease-cornu.xpm new file mode 100644 index 0000000..745f436 --- /dev/null +++ b/app/bin/bitmaps/ease-cornu.xpm @@ -0,0 +1,96 @@ +/* XPM */ +static char * ease_cornu_x16[] = { +"41 16 4 1", +" c None", +"x c #000000", +"# c #009999", +"$ c #FF9900", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x x x x x x x x x x x ", +"xxxxx xxx xxx xxx x x x xxx x x x", +" ", +" $$$ ### $$$$$ ", +" $ $ # # $$$$ $ ", +" $ $ $# ## ### ###$$# # $$$ $ ", +"$ $ $ # # # #$$#$# # # #$ $ $", +"$ $ $# #$$#$# # # # # $ $ $", +" $ $$$ # $#$# # # # # # #$ $ $ ", +" $ $### ## # # # ## $ $ ", +" $$$$$ $$$ "}; + +static char* ease_cornu_x24[] = { +"56 24 4 1", +" c None", +"x c #000000", +"# c #009999", +"- c #FF9900", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" --- ", +" ------ ##### ", +" --- -## ## ----- ", +" -- --- ## ----------- ", +" -- ---- ## ------ --- ", +" -- ---- ## ##### ## ### -##-### ## ## - -- ", +" -- ---- ## ## ## ###--##-### ## ## ## -- -- ", +" --- --- ## ## -##-##-- ## ## ## ## --- -- ", +" --- ## ## ##---## ## ## ## ## ## -- -- ", +" ----- #####---##### ## ## ## #### # --- ", +" ----- ------- ", +" ----- ", +" "}; + +static char* ease_cornu_x32[] = { +"66 32 4 1", +" c None", +"x c #000000", +"# c #009999", +"- c #FF9900", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" ----- ###### ", +" ------ ######## ", +" -- ## ## -------- ", +" -- ----## ------------- ", +" -- ----##-- ###### ## ### ## #### ## ## ---- ", +" -- -----## -- ######## ######## ######## ## ## --- ", +" -- -----## -- ## ## ### ## ### - ## ## ##-- -- ", +" -- -----## - ## ## ## -- ## -- ## ## ##--- -- ", +" -- ----## ## ## ## ----- ## ## ## ##---- -- ", +" -- ---## ## ## ## ## --- ## ## ## -##---- -- ", +" -- ######## ######## ## ## ## ########---- -- ", +" --- ###### - ###### ## ## ## ##### #---- --- ", +" ---- -------- -- ---- -- ", +" ------------ --- --- ", +" --- ---- ---- ", +" ------ ", +" "}; + +static char **ease_cornu_xpm[3] = { ease_cornu_x16, ease_cornu_x24, ease_cornu_x32 }; + diff --git a/app/bin/bitmaps/ease-gt-broad.xpm b/app/bin/bitmaps/ease-gt-broad.xpm new file mode 100644 index 0000000..b2dc1cc --- /dev/null +++ b/app/bin/bitmaps/ease-gt-broad.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_gtbroad_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" ", +" x xxxx x ", +" x x x x ", +" x x x xxx xx xx xxx ", +" x xxxx x x x x x x x x ", +" x x x x x x x x x x ", +" x x x x x x x xx x x ", +" x xxxx x xx xx x xx "}; + +static char* ease_gtbroad_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xxxxxx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xxxxxx xx xxx xxxxx xxxxxx xxxxxx ", +" xx xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xxxxxx xx xxxxx xxxx x xxxxxx ", +" ", +" "}; + +static char* ease_gtbroad_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xxxxxxx xx ", +" xx xxxxxxxx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xxxxxxxx xx xxx xxxxxx xxxxxxx xxxxxx ", +" xx xxxxxxxx xx xxxx xxxxxxxx xxxxxxxx xxxxxxx ", +" xx xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xxxxxxxx xx xxxxxxxx xxxxxxxx xxxxxxx ", +" xx xxxxxxx xx xxxxxx xxxx xx xxxxxx ", +" ", +" ", +" ", +" "}; + +static char **ease_gtbroad_xpm[3] = { ease_gtbroad_x16, ease_gtbroad_x24, ease_gtbroad_x32 }; diff --git a/app/bin/bitmaps/ease-gt-sharp.xpm b/app/bin/bitmaps/ease-gt-sharp.xpm new file mode 100644 index 0000000..bd12492 --- /dev/null +++ b/app/bin/bitmaps/ease-gt-sharp.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_gtsharp_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" x xxxxx x ", +" x x x ", +" x x xxx xx xxx xxx ", +" x xxxxx x x x x x x x x ", +" x x x x x x x x x ", +" x x x x x xx x xxx ", +" x xxxxx x x x x x x ", +" x "}; + +static char* ease_gtsharp_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xxxxx xx xxx xxxxxx xx xxx xxxxxx ", +" xx xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xxx xx ", +" xx xxxxxx xx xx xxxx x xx xx xxx ", +" xx ", +" xx "}; + +static char* ease_gtsharp_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xxxxxxx xx ", +" xx xxxxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xxxxxx xx xxx xxxxxxx xx xxx xxxxxx ", +" xx xxxxxx xxxxxxx xxxxxxxx xx xxxx xxxxxxx ", +" xx xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xxxxxxxx xx xx xxxxxxxx xx xxxxxxxx ", +" xx xxxxxxx xx xx xxxx xx xx xxxxxxx ", +" xx ", +" xx ", +" xx ", +" "}; + +static char **ease_gtsharp_xpm[3] = { ease_gtsharp_x16, ease_gtsharp_x24, ease_gtsharp_x32 }; diff --git a/app/bin/bitmaps/ease-lt-broad.xpm b/app/bin/bitmaps/ease-lt-broad.xpm new file mode 100644 index 0000000..ab043ee --- /dev/null +++ b/app/bin/bitmaps/ease-lt-broad.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_ltbroad_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" ", +" x xxxx x ", +" x x x x ", +" x x x xxx xx xx xxx ", +" x xxxx x x x x x x x x ", +" x x x x x x x x x x ", +" x x x x x x x xx x x ", +" x xxxx x xx xx x xx "}; + +static char* ease_ltbroad_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xxxxxx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xxxxxx xx xxx xxxxx xxxxxx xxxxxx ", +" xx xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xxxxxx xx xxxxx xxxx x xxxxxx ", +" ", +" "}; + +static char* ease_ltbroad_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xxxxxxx xx ", +" xx xxxxxxxx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xx xx xx ", +" xx xxxxxxxx xx xxx xxxxxx xxxxxxx xxxxxx ", +" xx xxxxxxxx xx xxxx xxxxxxxx xxxxxxxx xxxxxxx ", +" xx xx xx xxx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xxxxxxxx xx xxxxxxxx xxxxxxxx xxxxxxx ", +" xx xxxxxxx xx xxxxxx xxxx xx xxxxxx ", +" ", +" ", +" ", +" "}; + +static char **ease_ltbroad_xpm[3] = { ease_ltbroad_x16, ease_ltbroad_x24, ease_ltbroad_x32 }; diff --git a/app/bin/bitmaps/ease-lt-sharp.xpm b/app/bin/bitmaps/ease-lt-sharp.xpm new file mode 100644 index 0000000..93faf60 --- /dev/null +++ b/app/bin/bitmaps/ease-lt-sharp.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_ltsharp_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" x xxxxx x ", +" x x x ", +" x x xxx xx xxx xxx ", +" x xxxxx x x x x x x x x ", +" x x x x x x x x x ", +" x x x x x xx x xxx ", +" x xxxxx x x x x x x ", +" x "}; + +static char* ease_ltsharp_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xxxxx xx xxx xxxxxx xx xxx xxxxxx ", +" xx xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xxx xx ", +" xx xxxxxx xx xx xxxx x xx xx xxx ", +" xx ", +" xx "}; + +static char* ease_ltsharp_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xxxxxxx xx ", +" xx xxxxxxxx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xx xxxxxx xx xxx xxxxxxx xx xxx xxxxxx ", +" xx xxxxxx xxxxxxx xxxxxxxx xx xxxx xxxxxxx ", +" xx xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xxxxxxxx xx xx xxxxxxxx xx xxxxxxxx ", +" xx xxxxxxx xx xx xxxx xx xx xxxxxxx ", +" xx ", +" xx ", +" xx ", +" "}; + +static char **ease_ltsharp_xpm[3] = { ease_ltsharp_x16, ease_ltsharp_x24, ease_ltsharp_x32 }; diff --git a/app/bin/bitmaps/ease-none.xpm b/app/bin/bitmaps/ease-none.xpm new file mode 100644 index 0000000..b2fe985 --- /dev/null +++ b/app/bin/bitmaps/ease-none.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_none_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x x x x x x x x x x x ", +"xxxxx xxx xxx xxx x x x xxx x x x", +" ", +" x x ", +" xx x ", +" xxx x xx xxx xx ", +" x x x x x x x x x ", +" x xxx x x x x xxx ", +" x xx x x x x x ", +" x x xx x x xxx ", +" "}; + +static char* ease_none_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xx ", +" xx xx ", +" xxx xx ", +" xxxx xx ", +" xxxxxxx xxxxx xx xxx xxxxx ", +" xx xxxx xx xx xxx xx xx xx ", +" xx xxx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xxxxxxx ", +" xx xx xx xx xx xx xx ", +" xx xx xxxxx xx xx xxxxxx ", +" ", +" "}; + +static char* ease_none_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xx ", +" xx xx ", +" xx xx ", +" xxx xx ", +" xxxx xx ", +" xxxxx xx xxxxxx xx xxxx xxxxxx ", +" xx xxx xx xxxxxxxx xxxxxxxx xxxxxxxx ", +" xx xxxxx xx xx xxx xx xx xx ", +" xx xxxx xx xx xx xx xxxxxxxx ", +" xx xxx xx xx xx xx xxxxxxxx ", +" xx xx xx xx xx xx xx ", +" xx xx xxxxxxxx xx xx xxxxxxxx ", +" xx xx xxxxxx xx xx xxxxxxx ", +" ", +" ", +" ", +" "}; + +static char **ease_none_xpm[3] = { ease_none_x16, ease_none_x24, ease_none_x32 }; diff --git a/app/bin/bitmaps/ease-normal.xpm b/app/bin/bitmaps/ease-normal.xpm new file mode 100644 index 0000000..411a036 --- /dev/null +++ b/app/bin/bitmaps/ease-normal.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_normal_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x x x x x x x x x x x ", +"xxxxx xxx xxx xxx x x x xxx x x x", +" ", +" x x x ", +" xx x x ", +" xxx x xx xxx xxx xx xx x ", +" x x x x x x x x x x x x x ", +" x xxx x x x x x x x x x ", +" x xx x x x x x x x x x ", +" x x xx x x x x xxx x ", +" "}; + +static char* ease_normal_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xx xx xx ", +" xx xx xx ", +" xxx xx xx ", +" xxxx xx xx ", +" xxxxxxx xxxxx xx xxx xx xx xx xxxxxx xx ", +" xx xxxx xx xx xxx xx xxxxxxxx xx xx xx ", +" xx xxx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xxxxx xx xx xx xx xxxx x xx ", +" ", +" "}; + +static char* ease_normal_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xx xx xx ", +" xx xx xx ", +" xx xx xx ", +" xxx xx xx ", +" xxxx xx xx ", +" xxxxx xx xxxxxx xx xxx xx xx xx xxxxxxx xx ", +" xx xxx xx xxxxxxxx xxxxxxx xxxxxxxxxx xxxxxxxx xx ", +" xx xxxxx xx xx xxx xx xx xxx xxx xx xx xx ", +" xx xxxx xx xx xx xx xx xx xx xx xx ", +" xx xxx xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx xx xx xx ", +" xx xx xxxxxxxx xx xx xx xx xxxxxxxx xxx ", +" xx xx xxxxxx xx xx xx xx xxxx xx xxx ", +" ", +" ", +" ", +" "}; + +static char **ease_normal_xpm[3] = { ease_normal_x16, ease_normal_x24, ease_normal_x32 }; diff --git a/app/bin/bitmaps/ease-sharp.xpm b/app/bin/bitmaps/ease-sharp.xpm new file mode 100644 index 0000000..05c5c3b --- /dev/null +++ b/app/bin/bitmaps/ease-sharp.xpm @@ -0,0 +1,89 @@ +/* XPM */ +static char * ease_sharp_x16[] = { +"41 16 2 1", +" c None", +"x c #000000000000", +"xxxxx x ", +"x xxx", +"x xx xxx xx xxx xx xx xxx x ", +"xxxx x x x x x x x x x x x x x ", +"x x x xx xxxx x x x xxxx x x x ", +"x x xx x x x x x x x x x ", +"xxxxx x x xxx xxx x x x xxx x x x", +" ", +" xxxxx x ", +" x x ", +" x xxx xx xxx xxx ", +" xxxx x x x x x x x x ", +" x x x x x x x x ", +" x x x x xx x xxx ", +" xxxxx x x x x x x ", +" x "}; + +static char* ease_sharp_x24[] = { +"56 24 2 1", +" c None", +"x c #000000", +" ", +"xxxxxx ", +"xx ", +"xx x ", +"xx xx ", +"xxxx xxxxx xxxxx xxxx xxx xx xxxx xx xx xxxxxx", +"xx xx xx xx xx xx xxxxxxxx xx xx xxx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx xx xx ", +"xx xx xx xxxx xxxxxx xx xx xx xxxxxx xx xx xx ", +"xx xx xx xx xx xx xx xx xx xx xx xx ", +"xxxxxx xxx x xxxxx xxxxx xx xx xx xxxxx xx xx xxx", +" ", +" xxxxxx xx ", +" xx xx ", +" xx xx ", +" xx xx ", +" xxxxx xx xxx xxxxxx xx xxx xxxxxx ", +" xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xxx xx ", +" xxxxxx xx xx xxxx x xx xx xxx ", +" xx ", +" xx "}; + +static char* ease_sharp_x32[] = { +"66 32 2 1", +" c None", +"x c #000000", +" ", +"xxxxxxx ", +"xxxxxxx ", +"xx x ", +"xx xx ", +"xx xx ", +"xxxxx xxxxx xxxxxx xxxx xxxx xxx xxxx xx xx xxxxxx", +"xxxxx xxxxxx xxxxxxx xxxxxx xxxxxxxxxx xxxxxx xxxxxx xxxxxx", +"xx xx xx xxx xx xx xx xxx xxx xx xx xxx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xxxxxxx xx xx xx xxxxxxx xx xx xx ", +"xx xx xx xxx xx xx xx xx xx xx xx xx ", +"xxxxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xx xxxxxx xx xx xxxx", +"xxxxxxx xxx xx xxxxxx xxxxxx xx xx xx xxxxxx xx xx xxx", +" ", +" xxxxxxx xx ", +" xxxxxxxx xx ", +" xx xx ", +" xx xx ", +" xx xx ", +" xxxxxx xx xxx xxxxxxx xx xxx xxxxxx ", +" xxxxxx xxxxxxx xxxxxxxx xx xxxx xxxxxxx ", +" xx xxx xx xx xx xxx xx xx xx ", +" xx xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx ", +" xx xx xx xx xx xx xx xx ", +" xxxxxxxx xx xx xxxxxxxx xx xxxxxxxx ", +" xxxxxxx xx xx xxxx xx xx xxxxxxx ", +" xx ", +" xx ", +" xx ", +" "}; + +static char **ease_sharp_xpm[3] = { ease_sharp_x16, ease_sharp_x24, ease_sharp_x32 }; diff --git a/app/bin/bitmaps/ebroad.xpm b/app/bin/bitmaps/ebroad.xpm deleted file mode 100644 index 11bc4d6..0000000 --- a/app/bin/bitmaps/ebroad.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * ebroad_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -".........................................", -"........ .................... ........", -"........ ... ................... ........", -"........ ... . ... ... ... ........", -"........ .. .. . .. . .. . .. ........", -"........ ... . .... .. . .. . .. ........", -"........ ... . .... .. . . . .. ........", -"........ .. ..... ... . .. ........"}; diff --git a/app/bin/bitmaps/ecornu.xpm b/app/bin/bitmaps/ecornu.xpm deleted file mode 100644 index e32e56a..0000000 --- a/app/bin/bitmaps/ecornu.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * ecornu_xpm[] = { -"41 16 4 1", -". c None", -" c #000000000000", -"# c #FFFF00000000", -"$ c #808080000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... .. .... . .... .. .. . .... .. . .", -" .. . ... . .. .. .. . .. .. ", -".........................................", -"...$$$...###.....................$$$$$...", -"..$...$.#...#................$$$$.....$..", -".$..$..$#......##..###..###$$#..#.$$$..$.", -"$..$.$..#.....#..#.#$$#$#..#.#..#$...$..$", -"$..$...$#.....#$$#$#....#..#.#..#..$.$..$", -".$..$$$.#..$#$#..#.#....#..#.#..#$..$..$.", -"..$.....$###...##..#....#..#..##..$...$..", -"...$$$$$...........................$$$..."}; diff --git a/app/bin/bitmaps/edit-redo.xpm b/app/bin/bitmaps/edit-redo.xpm deleted file mode 100644 index 3d3a70c..0000000 --- a/app/bin/bitmaps/edit-redo.xpm +++ /dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char *edit_redo[] = { -/* columns rows colors chars-per-pixel */ -"16 16 7 1", -" c #4EE29B270680", -". c #73EAD2BE1616", -"X c #94FB9F050707", -"o c #A20EDAEE280A", -"O c #CC4BD6801D9D", -"+ c #AEC8ED136114", -"@ c None", -/* pixels */ -"@@@@@@@@@ @@@@@@", -"@@@@@@@@@ @@@@@", -"@@@@@@@@@ + @@@@", -"@@@@@@ ++ @@@", -"@@@@ X+++++.+ @@", -"@@@ ++ooooo..+ @", -"@@ o+ooooo....+ ", -"@ o+oooO.....+ @", -"@.+OOoooooO.o @@", -"@ +OX oo @@@", -"@ +X @@@@ o @@@@", -"@ o @@@@@ @@@@@", -"@ + @@@@@ @@@@@@", -"@ oX@@@@@@@@@@@@", -"@@ OX@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@" -}; diff --git a/app/bin/bitmaps/edit-undo.xpm b/app/bin/bitmaps/edit-undo.xpm deleted file mode 100644 index 4840284..0000000 --- a/app/bin/bitmaps/edit-undo.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char *edit_undo[] = { -/* columns rows colors chars-per-pixel */ -"16 16 6 1", -" c #BD4FA17C1684", -". c #C482A29B05D3", -"X c #ECB0D6B82037", -"o c #F318E3AA67FF", -"O c #FA79F1F1A77C", -"+ c None", -/* pixels */ -"++++++.+++++++++", -"+++++..+++++++++", -"++++.O.+++++++++", -"+++.OX.. +++++", -"++.OXXoooo ++++", -"+.OXXoXXXXoo +++", -".OXXXXXXXXXXX ++", -"+.OXXXXXXXXXo +", -"++.oXoooooXX.o.+", -"+++.oo.....oXo +", -"++++.o.++++.oo +", -"+++++..+++++.O +", -"++++++.+++++.o +", -"++++++++++++Xo++", -"++++++++++++o ++", -"++++++++++++++++" -}; diff --git a/app/bin/bitmaps/egtbroad.xpm b/app/bin/bitmaps/egtbroad.xpm deleted file mode 100644 index 1a6ca6d..0000000 --- a/app/bin/bitmaps/egtbroad.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * egtbroad_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -".........................................", -"..... ..... .................... .....", -"...... .... ... ................... .....", -"....... ... ... . ... ... ... .....", -"........ .. .. .. . .. . .. . .. .....", -"....... ... ... . .... .. . .. . .. .....", -"...... .... ... . .... .. . . . .. .....", -"..... ..... .. ..... .. . .. ......"}; diff --git a/app/bin/bitmaps/egtsharp.xpm b/app/bin/bitmaps/egtsharp.xpm deleted file mode 100644 index 63212a0..0000000 --- a/app/bin/bitmaps/egtsharp.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * egtsharp_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -"..... ...... . ......................", -"...... .... ...... ......................", -"....... ... ...... ... .. .. .....", -"........ ... . .. . .. . .. . .. ....", -"....... ........ . .. . .. . .... .. ....", -"...... ......... . .. . . . .... .....", -"..... ..... .. .. .. . . .... .......", -"................................. ......."}; diff --git a/app/bin/bitmaps/elev.xpm b/app/bin/bitmaps/elev.xpm deleted file mode 100644 index de8cd96..0000000 --- a/app/bin/bitmaps/elev.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * elev_xpm[] = { -"16 16 4 1", -" c None", -". c #FFFF00000000", -"X c #FFFF0000FFFF", -"o c #000000000000", -" . ", -" ... ", -" . . . XXXXX", -" . . . X", -" . X ", -" . X ", -" . X ", -" . X ", -" . XXXXX", -" o o o o ", -"ooooooooooooooo ", -" o o o o ", -" o o o o ", -" o o o o ", -"ooooooooooooooo ", -" o o o o "}; diff --git a/app/bin/bitmaps/elevation.xpm b/app/bin/bitmaps/elevation.xpm new file mode 100644 index 0000000..ab65147 --- /dev/null +++ b/app/bin/bitmaps/elevation.xpm @@ -0,0 +1,117 @@ +static char *elevation_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC6600", + "3 c #FF0000", + " ", + " 1 11111 ", + " 131 33 ", + " 13331 33 ", + " 1 33 ", + " 1 33 ", + " 1 11111 ", + " 1 ", + " ", + " 2 2 2 2 2 2 2 ", + " 00000000000000 ", + " 2 2 2 2 2 2 2 ", + " 00000000000000 ", + " 2 2 2 2 2 2 2 ", + " ", + " "}; + +static char *elevation_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #663300", + "2 c #666600", + "3 c #996600", + "4 c #996633", + "5 c #CC0000", + "6 c #CC3300", + "7 c #CC6600", + "8 c #CC6633", + "9 c #CC9933", + "A c #FF6633", + "B c #FF9933", + "C c #FFCC33", + " ", + " ", + " 5555555 ", + " 55555555 ", + " 555 ", + " 55 555 ", + " 5555 555 ", + " 555555 55 ", + " 5555555 555 ", + " 5 55 5 55555555 ", + " 55 55555555 ", + " 55 ", + " 55 ", + " 55 ", + " 55 ", + " 440440345640180090081 ", + " 0440440345640180090081 ", + " BB BB BC57C C C C ", + " BB BB BC5AC C C C ", + " BB BB BC C C C C ", + " 440440340240180090081 ", + " 0440440340240180090081 ", + " ", + " "}; + +static char *elevation_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #666600", + "4 c #990000", + "5 c #996600", + "6 c #996633", + "7 c #CC0000", + "8 c #CC3300", + "9 c #CC6600", + "A c #CC6633", + "B c #CC9933", + "C c #FF9933", + "D c #FFCC33", + " ", + " ", + " ", + " 777777777 ", + " 777777777 ", + " 777 ", + " 777 ", + " 77 7777 ", + " 7777 777 ", + " 777777 777 ", + " 77777777 777 ", + " 777777777 777 ", + " 77 777 77 7777777777 ", + " 777 7777777777 ", + " 777 7777777777 ", + " 777 ", + " 777 ", + " 777 ", + " 777 ", + " 777 ", + " BB BB 6B778B B B5 B6 ", + " 02200220013474500050005100310 ", + " DC CC D778D D D D ", + " DC CC D778D D D D ", + " DC CC D779D D D D ", + " DC CC D D D D D ", + " DC CC D D D D D ", + " 06500660036002A000B000A200630 ", + " 06500660036002A000B000A200630 ", + " D D D C D D ", + " ", + " "}; + +static char **elevation_xpm[3] = { elevation_x16, elevation_x24, elevation_x32 }; + diff --git a/app/bin/bitmaps/eltbroad.xpm b/app/bin/bitmaps/eltbroad.xpm deleted file mode 100644 index a2fb83a..0000000 --- a/app/bin/bitmaps/eltbroad.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * eltbroad_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -".........................................", -"........ .. .................... .....", -"....... ... ... ................... .....", -"...... .... ... . ... ... ... .....", -"..... ..... .. .. . .. . .. . .. .....", -"...... .... ... . .... .. . .. . .. .....", -"....... ... ... . .... .. . . . .. .....", -"........ .. .. ..... .. . .. ......"}; diff --git a/app/bin/bitmaps/eltsharp.xpm b/app/bin/bitmaps/eltsharp.xpm deleted file mode 100644 index 70985c1..0000000 --- a/app/bin/bitmaps/eltsharp.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * eltsharp_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -"..... ...... . ......................", -".... ...... ...... ......................", -"... ....... ...... ... .. .. .....", -".. ......... . .. . .. . .. . .. ....", -"... ............ . .. . .. . .... .. ....", -".... ........... . .. . . . .... .....", -"..... ..... .. .. .. . . .... .......", -"................................. ......."}; diff --git a/app/bin/bitmaps/enone.xpm b/app/bin/bitmaps/enone.xpm deleted file mode 100644 index bcc479e..0000000 --- a/app/bin/bitmaps/enone.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * enone_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... .. .... . .... .. .. . .... .. . .", -" .. . ... . .. .. .. . .. .. ", -".........................................", -".......... ... ..........................", -".......... .. ..........................", -".......... . .. .. ... ............", -".......... . . . .. . .. . .. ...........", -".......... . . .. . .. . ............", -".......... .. . .. . .. . ..............", -".......... ... .. .. .. .. ...........", -"........................................."}; diff --git a/app/bin/bitmaps/enormal.xpm b/app/bin/bitmaps/enormal.xpm deleted file mode 100644 index fa5890a..0000000 --- a/app/bin/bitmaps/enormal.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * enormal_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... .. .... . .... .. .. . .... .. . .", -" .. . ... . .. .. .. . .. .. ", -".........................................", -"..... ... ........................ ......", -"..... .. ........................ ......", -"..... . .. .. .. . ... .. ......", -"..... . . . .. . .. . .. .. . .. . ......", -"..... . . .. . .... .. .. . .. . ......", -"..... .. . .. . .... .. .. . .. . ......", -"..... ... .. .. .... .. .. .. .. .....", -"........................................."}; diff --git a/app/bin/bitmaps/esharp.xpm b/app/bin/bitmaps/esharp.xpm deleted file mode 100644 index b7129f0..0000000 --- a/app/bin/bitmaps/esharp.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * esharp_xpm[] = { -"41 16 2 1", -". c None", -" c #000000000000", -" .................................. .", -" ..................................... ", -" ...... ... .. .. . ... .. .. .", -" .. .. . .... .. . .. .. . .. . .. . .", -" ..... .. .. .. . .. .. . . .. . .", -" ..... . .... . .... .. .. . .... .. . .", -" .. . . ... . .. .. .. . .. .. ", -".........................................", -"........ . ..........................", -"....... ...... ..........................", -"....... ...... ... .. .. .........", -"........ . .. . .. . .. . .. ........", -"............ . .. . .. . .... .. ........", -"............ . .. . . . .... .........", -"....... .. .. .. . . .... ...........", -"............................. ..........."}; diff --git a/app/bin/bitmaps/exit.xpm b/app/bin/bitmaps/exit.xpm index ab8c191..7daf3ab 100644 --- a/app/bin/bitmaps/exit.xpm +++ b/app/bin/bitmaps/exit.xpm @@ -1,21 +1,94 @@ -/* XPM */ -static char*exit_xpm[]={ -"16 16 2 1", -". c None", -"# c #000000000000", -"................", -"................", -".###.#.#.#.###..", -".#...#.#.#..#...", -".#...#.#.#..#...", -".#...#.#.#..#...", -".#....#..#..#...", -".###..#..#..#...", -".#....#..#..#...", -".#...#.#.#..#...", -".#...#.#.#..#...", -".#...#.#.#..#...", -".###.#.#.#..#...", -"................", -"................", -"................"}; +static char *exit_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #FF0000", + " ", + " 1 ", + " 111 ", + " 11111 ", + " 1 ", + " 1 ", + " 1 ", + " 1 ", + " ", + " ", + " 000 0 0 0 000 ", + " 0 0 0 0 0 ", + " 00 0 0 0 ", + " 0 0 0 0 0 ", + " 000 0 0 0 0 ", + " "}; + +static char *exit_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #CC0000", + "3 c #808080", + " ", + " ", + " 22 ", + " 2222 ", + " 222222 ", + " 22222222 ", + " 22 ", + " 22 ", + " 22 ", + " 22 ", + " 22 ", + " 22 ", + " ", + " ", + " 00000 0 0 00 000000 ", + " 00 01 10 00 00 ", + " 00 030 00 00 ", + " 0000 303 00 00 ", + " 00 030 00 00 ", + " 00 01 10 00 00 ", + " 00000 0 0 00 00 ", + " ", + " ", + " "}; + +static char *exit_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " 11 ", + " 1111 ", + " 111111 ", + " 111111111 ", + " 11111111111 ", + " 11111111111111 ", + " 1111 1111 1111 ", + " 111 1111 111 ", + " 1111 1 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 111 ", + " ", + " ", + " ", + " 00000000 000 00 00 000000000", + " 00000000 000 000 00 00000000 ", + " 00 000000 00 000 ", + " 000 00000 00 000 ", + " 0000000 000 00 000 ", + " 0000000 0000 00 000 ", + " 00 00000 00 000 ", + " 00 000 000 00 000 ", + " 00000000 000 000 00 000 ", + " 00000000 00 000 00 000 ", + " "}; + +static char **exit_xpm[3] = { exit_x16, exit_x24, exit_x32 }; + diff --git a/app/bin/bitmaps/extend.xpm b/app/bin/bitmaps/extend.xpm index 4fb45d1..43490a0 100644 --- a/app/bin/bitmaps/extend.xpm +++ b/app/bin/bitmaps/extend.xpm @@ -1,23 +1,143 @@ -/* XPM */ -static char * extend_xpm[] = { -"16 16 4 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -"o c #0000FFFFFFFF", -" ", -" . ", -" ... ", -" . . . ", -" .X . X.", -" XXX.XXX", -" X . X ", -" X X . X ", -" X . X ", -"o o X X X. X ", -"oooooXX .X X ", -"o o X .. X ", -"o o... XX X ", -"o o X XX ", -"oooooXX ", -"o o X "}; +static char *extend_x16[] = { + "16 16 21 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366CC", + "3 c #3366FF", + "4 c #3399FF", + "5 c #666666", + "6 c #6666CC", + "7 c #6699FF", + "8 c #66CCFF", + "9 c #993333", + "A c #996666", + "B c #999999", + "C c #9999CC", + "D c #CC0000", + "E c #CC3333", + "F c #CC6633", + "G c #CC6666", + "H c #CCCCCC", + "I c #C0C0C0", + "J c #808080", + " D ", + " DDD ", + " GAE9 ", + " BJEJI ", + " BJD5 ", + " BBGJH ", + " HJFE5 ", + " BJEJB ", + " CJGEJH ", + " 46FJI ", + " 734832 ", + " 884438814 ", + " 343448 34 ", + " 8 8441 ", + " 411338 ", + " 44 8 "}; + +static char *extend_x24[] = { + "24 24 21 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366FF", + "3 c #3399FF", + "4 c #666666", + "5 c #6666CC", + "6 c #6699FF", + "7 c #66CCFF", + "8 c #993333", + "9 c #999999", + "A c #CC0000", + "B c #CC3300", + "C c #CC3333", + "D c #CC6633", + "E c #CC6666", + "F c #CC6699", + "G c #CC9999", + "H c #CCCCCC", + "I c #C0C0C0", + "J c #808080", + " ", + " AA ", + " AAAAA ", + " B AA ", + " 99EGJI ", + " J9DG4H ", + " 44A 4 ", + " HJIC94 ", + " 4GE99H ", + " H94AA44 ", + " JICG4 ", + " H44CE99 ", + " 9JGA 4I ", + " 75 EGJ4 ", + " 37 A9JH ", + " 62 7732 ", + " 77227 32 ", + " 7776223 7 1 7 ", + " 23323277 32 ", + " 236 7 76117 ", + " 77 77112 ", + " 76111117 ", + " 112117 ", + " 77 "}; + +static char *extend_x32[] = { + "32 32 18 1", + " c None", + "0 c #000000", + "1 c #0066FF", + "2 c #3366CC", + "3 c #3366FF", + "4 c #3399FF", + "5 c #666666", + "6 c #6699FF", + "7 c #66CCFF", + "8 c #999999", + "9 c #CC0000", + "A c #CC3300", + "B c #CC3333", + "C c #CC6666", + "D c #CC9999", + "E c #CCCCCC", + "F c #C0C0C0", + "G c #808080", + " ", + " 99 ", + " 999999 ", + " 99999999 ", + " 99 99 99 ", + " 5 99 5 ", + " EGECBEGE ", + " 5 998G ", + " 5 9955 ", + " E8G 9955 ", + " E88D9FG8 ", + " 559AEGFE ", + " EF5 99 5 ", + " E88D9 55 ", + " 5 CBE5 ", + " EE55 9B8GE ", + " 8G 99 5 ", + " 5ED9B55 ", + " 73 9CF5 ", + " 377 5FE ", + " 763 77 12 ", + " 7 347 741 ", + " 7633 7 147 ", + " 7 77334 7 11 ", + " 463333 7 431 ", + " 334337 77 1147 ", + " 7 77 711 ", + " 7 7 1136 ", + " 7 411 7 ", + " 11311147 ", + " 37 7 ", + " 7 "}; + +static char **extend_xpm[3] = { extend_x16, extend_x24, extend_x32 }; + diff --git a/app/bin/bitmaps/filled-box.xpm b/app/bin/bitmaps/filled-box.xpm new file mode 100644 index 0000000..cd85179 --- /dev/null +++ b/app/bin/bitmaps/filled-box.xpm @@ -0,0 +1,120 @@ +static char *filled_box_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #9999CC", + "3 c #99CCCC", + "4 c #99CCFF", + "5 c #99FFFF", + "6 c #CC0000", + "7 c #CC6666", + "8 c #CC6699", + "9 c #CC9999", + "A c #CC99CC", + " ", + " 00000000000000 ", + " 05555555542220 ", + " 05555555542860 ", + " 0555555555A271 ", + " 05555555592581 ", + " 05555554935540 ", + " 05555549355550 ", + " 05555483555550 ", + " 05554845555550 ", + " 05548455555550 ", + " 05484555555550 ", + " 04845555555550 ", + " 18455555555550 ", + " 00000000000000 ", + " "}; + +static char *filled_box_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #9999CC", + "2 c #99CCCC", + "3 c #99CCFF", + "4 c #99FFFF", + "5 c #CC0000", + "6 c #CC3333", + "7 c #CC6666", + "8 c #CC6699", + "9 c #CC9999", + "A c #CC99CC", + " ", + " ", + " 0000000000000000000000 ", + " 0444444444444433333340 ", + " 0444444444444415555640 ", + " 0444444444444433317540 ", + " 0444444444444444292530 ", + " 0444444444444441942530 ", + " 04444444444444A1443530 ", + " 0444444444444914443230 ", + " 0444444444439244444440 ", + " 0444444444392444444440 ", + " 0444444443824444444440 ", + " 0444444438344444444440 ", + " 0444444383444444444440 ", + " 0444443834444444444440 ", + " 0444438344444444444440 ", + " 0444283444444444444440 ", + " 0442934444444444444440 ", + " 0429344444444444444440 ", + " 0314444444444444444440 ", + " 0000000000000000000000 ", + " ", + " "}; + +static char *filled_box_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #9999CC", + "2 c #99CCCC", + "3 c #99CCFF", + "4 c #99FFFF", + "5 c #CC0000", + "6 c #CC3333", + "7 c #CC3366", + "8 c #CC6666", + "9 c #CC6699", + "A c #CC9999", + "B c #CC99CC", + " ", + " ", + " 000000000000000000000000000000 ", + " 000000000000000000000000000000 ", + " 004444444444444444444444444400 ", + " 004444444444444444436555558400 ", + " 004444444444444444436555556400 ", + " 004444444444444444444436555400 ", + " 004444444444444444444265A85300 ", + " 00444444444444444444265A485300 ", + " 0044444444444444444255B4495300 ", + " 0044444444444444441551444A5300 ", + " 004444444444444441552444431300 ", + " 0044444444444444A5524444444400 ", + " 004444444444444A56244444444400 ", + " 00444444444443A562444444444400 ", + " 0044444444443A5634444444444400 ", + " 004444444443857344444444444400 ", + " 004444444438583444444444444400 ", + " 004444444385834444444444444400 ", + " 004444443758344444444444444400 ", + " 004444436593444444444444444400 ", + " 004444265A34444444444444444400 ", + " 00444265A344444444444444444400 ", + " 0044255A4444444444444444444400 ", + " 004155144444444444444444444400 ", + " 003651444444444444444444444400 ", + " 004224444444444444444444444400 ", + " 000000000000000000000000000000 ", + " 000000000000000000000000000000 ", + " ", + " "}; + +static char **filled_box_xpm[3] = { filled_box_x16, filled_box_x24, filled_box_x32 }; + diff --git a/app/bin/bitmaps/filled-polygon.xpm b/app/bin/bitmaps/filled-polygon.xpm new file mode 100644 index 0000000..2620b74 --- /dev/null +++ b/app/bin/bitmaps/filled-polygon.xpm @@ -0,0 +1,121 @@ +static char *filled_polygon_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #669999", + "7 c #6699CC", + "8 c #66CCCC", + "9 c #66CCFF", + "A c #99FFFF", + " ", + " 01220144 ", + " 17799AAA93 ", + " 17AAAAAAAA84 ", + " 29AAAAAAAAA83 ", + " 4AAAAAAAAAAA83 ", + "06AAAAAAAAAAAA71", + " 4AAAAAAAAAAAA82", + " 19AAAAAAAAAAA82", + " 17AAAAAAAAAAA82", + " 4AAAAAAAAAAA82", + " 19AAAAAAAAAA92", + " 1179AAAAAAAA92", + " 1279AAAA9752", + " 227640210 ", + " 00 "}; + +static char *filled_polygon_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #336699", + "7 c #339999", + "8 c #669999", + "9 c #6699CC", + "A c #66CCCC", + "B c #66CCFF", + "C c #99FFFF", + " ", + " 0032 ", + " 0033105599A62 ", + " 299ABBCCCCCCB62 ", + " 06CCCCCCCCCCCCB5 ", + " 3ACCCCCCCCCCCCCB5 ", + " 2BCCCCCCCCCCCCCCB5 ", + " 07CCCCCCCCCCCCCCCCB5 ", + " 3ACCCCCCCCCCCCCCCCCB4 ", + " 1BCCCCCCCCCCCCCCCCCCB4 ", + " 3BCCCCCCCCCCCCCCCCCCC4 ", + " 08CCCCCCCCCCCCCCCCCCC4 ", + " 2CCCCCCCCCCCCCCCCCCC4 ", + " 3BCCCCCCCCCCCCCCCCCC5 ", + " 07CCCCCCCCCCCCCCCCCC5 ", + " 2BCCCCCCCCCCCCCCCCC5 ", + " 3ACCCCCCCCCCCCCCCCC5 ", + " 07CCCCCCCCCCCCCCCCC5 ", + " 45BCCCCCCCCCCCCCCC5 ", + " 35BCCCCCCCCCCCCC5 ", + " 36BCCCCCCCBA850 ", + " 028BBA952230 ", + " 22230 ", + " "}; + +static char *filled_polygon_x32[] = { + "32 32 12 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333366", + "3 c #336666", + "4 c #336699", + "5 c #339999", + "6 c #669999", + "7 c #6699CC", + "8 c #66CCCC", + "9 c #66CCFF", + "A c #99FFFF", + " ", + " 0000 ", + " 000000000000 ", + " 0000000000447789300 ", + " 004477999AAAAAAA9300 ", + " 008AAAAAAAAAAAAAAA9100 ", + " 019AAAAAAAAAAAAAAAA9100 ", + " 05AAAAAAAAAAAAAAAAAA9100 ", + " 008AAAAAAAAAAAAAAAAAAA810 ", + " 029AAAAAAAAAAAAAAAAAAAA800 ", + " 006AAAAAAAAAAAAAAAAAAAAAA800 ", + " 009AAAAAAAAAAAAAAAAAAAAAAA700 ", + " 02AAAAAAAAAAAAAAAAAAAAAAAAA700 ", + " 009AAAAAAAAAAAAAAAAAAAAAAAAA30 ", + " 008AAAAAAAAAAAAAAAAAAAAAAAAA40 ", + " 04AAAAAAAAAAAAAAAAAAAAAAAAA40 ", + " 009AAAAAAAAAAAAAAAAAAAAAAAA50 ", + " 008AAAAAAAAAAAAAAAAAAAAAAAA60 ", + " 04AAAAAAAAAAAAAAAAAAAAAAAA60 ", + " 009AAAAAAAAAAAAAAAAAAAAAAA60 ", + " 007AAAAAAAAAAAAAAAAAAAAAAA60 ", + " 04AAAAAAAAAAAAAAAAAAAAAAA60 ", + " 009AAAAAAAAAAAAAAAAAAAAAA60 ", + " 0069AAAAAAAAAAAAAAAAAAAAA60 ", + " 0027AAAAAAAAAAAAAAAAAAAA70 ", + " 00038AAAAAAAAAAAAAAAAAA70 ", + " 00038AAAAAAAAAAAAAA9840 ", + " 00049AAAAAAA997520000 ", + " 00059A98630000000 ", + " 00010000000 ", + " 0000 ", + " "}; + +static char **filled_polygon_xpm[3] = { filled_polygon_x16, filled_polygon_x24, filled_polygon_x32 }; + diff --git a/app/bin/bitmaps/flip.xpm b/app/bin/bitmaps/flip.xpm deleted file mode 100644 index 03966eb..0000000 --- a/app/bin/bitmaps/flip.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * flip_xpm[] = { -"16 16 4 1", -"# c None", -". c #0000ffffffff", -"b c #000000000000", -"a c #ffff00000000", -".######a#######b", -"..#####a######bb", -"...####a#####bbb", -"....###a####bbbb", -".....##a###bbbbb", -"......#a##bbbbbb", -".......a#bbbbbbb", -".......abbbbbbbb", -".......abbbbbbbb", -".......a#bbbbbbb", -"......#a##bbbbbb", -".....##a###bbbbb", -"....###a####bbbb", -"...####a#####bbb", -"..#####a######bb", -".######a#######b"}; diff --git a/app/bin/bitmaps/funnel.xpm b/app/bin/bitmaps/funnel.xpm new file mode 100644 index 0000000..ef7cd23 --- /dev/null +++ b/app/bin/bitmaps/funnel.xpm @@ -0,0 +1,62 @@ +/* XPM */ +static char *funnel_xpm[] = { +"16 16 43 1", +" c None", +". c #216262", +"+ c #123737", +"@ c #030A0A", +"# c #000000", +"$ c #010303", +"% c #050E0E", +"& c #091C1C", +"* c #0F2E2E", +"= c #164242", +"- c #1C5353", +"; c #76D1D1", +"> c #82D5D5", +", c #79D2D2", +"' c #62CBCB", +") c #65CCCC", +"! c #75D1D1", +"~ c #80D5D5", +"{ c #5FCACA", +"] c #52C5C5", +"^ c #42C0C0", +"/ c #39ACAC", +"( c #3BB1B1", +"_ c #57C7C7", +": c #7BD3D3", +"< c #89D8D8", +"[ c #7ED4D4", +"} c #60CACA", +"| c #43C0C0", +"1 c #4BC3C3", +"2 c #86D7D7", +"3 c #71D0D0", +"4 c #46C1C1", +"5 c #50C5C5", +"6 c #49C2C2", +"7 c #4CC3C3", +"8 c #5EC9C9", +"9 c #000101", +"0 c #040B0B", +"a c #020606", +"b c #72D0D0", +"c c #010404", +"d c #313333", +" ", +" .+@###$%&*=-. ", +" .;;;>,')!~;;. ", +" .+;{]^/(^_:-. ", +" +<;[}|1:;2- ", +" +@;;345;;=- ", +" @#;;6_;*= ", +" ##;78&* ", +" ##'%& ", +" #'% ", +" #'% ", +" #'% ", +" 9'0 ", +" $'a ", +" #bc ", +" ##d "}; diff --git a/app/bin/bitmaps/funnelclear.xpm b/app/bin/bitmaps/funnelclear.xpm new file mode 100644 index 0000000..45d948f --- /dev/null +++ b/app/bin/bitmaps/funnelclear.xpm @@ -0,0 +1,124 @@ +/* XPM */ +static char * funnelclear_xpm[] = { +"16 16 105 2", +" c None", +". c #216262", +"+ c #123737", +"@ c #030A0A", +"# c #000000", +"$ c #010303", +"% c #050E0E", +"& c #091C1C", +"* c #0F2E2E", +"= c #164242", +"- c #1C5353", +"; c #76D1D1", +"> c #82D5D5", +", c #79D2D2", +"' c #62CBCB", +") c #65CCCC", +"! c #75D1D1", +"~ c #80D5D5", +"{ c #7AAEAE", +"] c #9D5E5E", +"^ c #6DA5A5", +"/ c #39ACAC", +"( c #3BB1B1", +"_ c #42C0C0", +": c #57C7C7", +"< c #8AB6B6", +"[ c #A21717", +"} c #7D4747", +"| c #92BABA", +"1 c #9F6464", +"2 c #FF7777", +"3 c #9C6060", +"4 c #6CA5A5", +"5 c #4BC3C3", +"6 c #7BD3D3", +"7 c #86B4B4", +"8 c #A16767", +"9 c #F87070", +"0 c #A70000", +"a c #9C0101", +"b c #FE7676", +"c c #D44C4C", +"d c #FA7272", +"e c #965C5C", +"f c #70AAAA", +"g c #85B4B4", +"h c #9B6464", +"i c #EA6262", +"j c #E45C5C", +"k c #A30000", +"l c #8C0303", +"m c #990000", +"n c #EF6767", +"o c #BE3636", +"p c #E65E5E", +"q c #955F5F", +"r c #996464", +"s c #D74F4F", +"t c #CD4545", +"u c #A00000", +"v c #A10000", +"w c #880000", +"x c #940000", +"y c #DB5353", +"z c #B72E2E", +"A c #C63D3D", +"B c #BA3131", +"C c #9F1515", +"D c #A81E1E", +"E c #9B0000", +"F c #9C0000", +"G c #830000", +"H c #8F0000", +"I c #B42525", +"J c #A21111", +"K c #A51414", +"L c #970000", +"M c #980000", +"N c #910000", +"O c #8B0000", +"P c #AF1515", +"Q c #AC1111", +"R c #920000", +"S c #8C0000", +"T c #8D0000", +"U c #B81111", +"V c #870000", +"W c #C41111", +"X c #800202", +"Y c #820000", +"Z c #D01111", +"` c #7C6161", +" . c #5A0606", +".. c #570000", +"+. c #720000", +"@. c #D81111", +"#. c #6C0000", +"$. c #5FAFAF", +"%. c #020606", +"&. c #340000", +"*. c #5F0000", +"=. c #270000", +"-. c #6AC2C2", +";. c #360000", +">. c #313333", +" ", +" . + @ # # # $ % & * = - . ", +" . ; ; ; > , ' ) ! ~ ; ; . ", +" . + ; { ] ^ / ( _ : < [ } ", +" + | 1 2 3 4 5 6 7 8 9 0 0 ", +" + a b c d e f g h i c j k ", +" l m n o p q r s o t u v ", +" w x y z A B C D E F ", +" G H I J J K L M ", +" N O P Q Q Q R N ", +" S T U U U U U U T S ", +" V V W W W X V W W W V V ", +" Y Z Z Z ` .G Y Z Z Z Y ", +" ..+.@.#.$.%. ..+.@.+... ", +" # &.*.=.-.$ # # ;.*.&.# ", +" # # >. "}; diff --git a/app/bin/bitmaps/go.xpm b/app/bin/bitmaps/go.xpm index b8a5478..deb8a81 100644 --- a/app/bin/bitmaps/go.xpm +++ b/app/bin/bitmaps/go.xpm @@ -1,22 +1,135 @@ -/* XPM */ -static char * go_xpm[] = { -"16 16 3 1", -" c None", -"X c #000000000000", -"o c #0000FFFF0000", -" XXXXX ", -" XXXXXXXXX ", -" XXoooooooXX ", -" XXoooooooooXX ", -" XoooooooooooX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -" XoooooooooooX ", -" XXoooooooooXX ", -" XXoooooooXX ", -" XXXXXXXXX ", -" XXXXX ", -" "}; +static char *go_x16[] = { + "16 16 16 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #006633", + "4 c #009933", + "5 c #339933", + "6 c #33CC33", + "7 c #33CC66", + "8 c #66CC66", + "9 c #66CC99", + "A c #99CC99", + "B c #99FF99", + "C c #99FFCC", + "D c #CCFFCC", + "E c #008000", + " 00 ", + " 1221 ", + " 11577511 ", + " 015788887510 ", + " 12678898887620 ", + " 14788AAAA877E0 ", + " 1478AACCA98740 ", + " 1478ACDDB98740 ", + " 1478ABCCA98740 ", + " 14789ABBA887E0 ", + " 147789AA9876E0 ", + " 11578888877410 ", + " 1377777631 ", + " 01476410 ", + " 1111 ", + " "}; + +static char *go_x24[] = { + "24 24 18 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #006633", + "4 c #009900", + "5 c #009933", + "6 c #00CC33", + "7 c #339933", + "8 c #33CC33", + "9 c #33CC66", + "A c #66CC66", + "B c #66CC99", + "C c #99CC99", + "D c #99FF99", + "E c #99FFCC", + "F c #CCFFCC", + "G c #008000", + " ", + " 0110 ", + " 138721 ", + " 1279999711 ", + " 11799999999510 ", + " 015899AAAAAA99821 ", + " 125899AAABBAAA998510 ", + " 15899AABCCCBBAA986G0 ", + " 1589AABCCCCCCAA998G0 ", + " 1589AACCEEECCBAA98G0 ", + " 1599ABCCEFEECCAA9850 ", + " 1599ABCEEFFECCAA9850 ", + " 1599ABCDEFFECCAA9850 ", + " 1599AACCEEEECBAA9850 ", + " 1589AABCCCCCCBAA98G0 ", + " 15899AABCCCCBAA996G0 ", + " 14689AAABBBBAA9986G0 ", + " 1G899AAAAAAA9986G1 ", + " 117999AAAA998511 ", + " 128999999711 ", + " 015888821 ", + " 115G10 ", + " 10 ", + " "}; + +static char *go_x32[] = { + "32 32 18 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #006633", + "4 c #009900", + "5 c #009933", + "6 c #00CC33", + "7 c #339933", + "8 c #33CC33", + "9 c #33CC66", + "A c #66CC66", + "B c #66CC99", + "C c #99CC99", + "D c #99FF99", + "E c #99FFCC", + "F c #CCFFCC", + "G c #008000", + " ", + " 11 ", + " 115310 ", + " 015888721 ", + " 138999998711 ", + " 1179999999998511 ", + " 1158999AAAAA9999831 ", + " 01G8899AAAAAAAAA9998511 ", + " 1258899AAAAAAAAAAA99986G1 ", + " 146899AAAABCCCBBAAA99886G0 ", + " 156899AAABCCCCCCBAAA9986G0 ", + " 15899AAABCCCCCCCCBAA9986G0 ", + " 15899AABCCCEEEDCCBAAA988G0 ", + " 15899AABCCEEEEEDCCBAA998G0 ", + " 1589AAACCCEEFFEECCBAA998G0 ", + " 1589AAACCDEFFFEECCBAA99850 ", + " 1589AAACCCEFFFEECCBAA998G0 ", + " 15899AABCCEEEEEDCCBAA998G0 ", + " 15899AABCCCEEEECCCAAA988G0 ", + " 15899AAABCCCCCCCCBAA9986G0 ", + " 156899AABCCCCCCCBAAA9986G0 ", + " 156899AAAABCCCBBAAA99886G0 ", + " 1G68899AAAAABAAAAAA9986520 ", + " 1158899AAAAAAAAA99986511 ", + " 1G88999AAAAAA9998711 ", + " 11589999999999821 ", + " 11789999998510 ", + " 1278888511 ", + " 0136511 ", + " 111 ", + " ", + " "}; + +static char **go_xpm[3] = { go_x16, go_x24, go_x32 }; + diff --git a/app/bin/bitmaps/helix.xpm b/app/bin/bitmaps/helix.xpm new file mode 100644 index 0000000..d02bb29 --- /dev/null +++ b/app/bin/bitmaps/helix.xpm @@ -0,0 +1,95 @@ +static char *helix_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + " 1111 ", + " 1111111111 ", + " 11 11 11 ", + " 11 111111111 1 ", + "11111 1111", + "111 2222222 11", + "11 2222 22111", + "112 11111", + "111 1111 12", + "22111 1112", + "221 111111111 22", + "2211 1 22 ", + " 2 11111222222 ", + " 22 1122 ", + " 2222 ", + " 2222 "}; + +static char *helix_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + " 11 ", + " 11111111111 ", + " 111 1111 ", + " 11 11 ", + " 11 11111111 1 ", + " 1 1111 11 11111 1 ", + " 11 111 111 1 ", + " 1 11 22 111 ", + " 111 22222222222 11 ", + " 11 222 222111 ", + " 11 22 1111 ", + " 112 1111 21 ", + " 111 1111111 11 ", + " 1211 1122", + " 22 111 111 2 ", + " 21 1111111111111 2 ", + " 221 1111111 2 ", + " 22 11 22 ", + " 2 1111 2222 ", + " 22 11111222222 ", + " 22 ", + " 22 ", + " 222222 ", + " 22 "}; + +static char *helix_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + " 1 ", + " 1111111111111 ", + " 111111111111111111 ", + " 11111 11111 ", + " 111 1111 ", + " 111 1111111 111 ", + " 111 111111111111111 11 ", + " 11 1111111 11 11111111 11 ", + " 111 11111 11111 11 ", + " 11 111 11111 ", + " 11111 22222222222 1111 ", + " 1111 22222222222222222 111 ", + " 111 222222 2222221111 ", + " 111 2222 211111 ", + " 111222 1111211 ", + " 11122 1111111 211 ", + " 1111 1111111111 111 ", + " 12111 111111 1112 ", + " 2121111 111122 ", + " 211 11111 11111 22 ", + " 2211 1111111111111111111 22 ", + " 22111 111111111111111 222 ", + " 22 111 11 222 ", + " 222 1111 22222 ", + " 22 111111 222222 ", + " 22 11111111222222222 ", + " 222 11111222222 ", + " 2222 ", + " 22222 ", + " 2222222 ", + " 22222222 ", + " 2222 "}; + +static char **helix_xpm[3] = { helix_x16, helix_x24, helix_x32 }; + diff --git a/app/bin/bitmaps/hndldto.xpm b/app/bin/bitmaps/hndldto.xpm deleted file mode 100644 index f49fef6..0000000 --- a/app/bin/bitmaps/hndldto.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * hndldto_xpm[] = { -"16 16 2 1", -" c None", -". c #000000000000", -" . . ", -" .. ", -" . ... ", -" .. . . ", -" . .. ", -" . ...... . ", -"... ....... ... ", -" . ........ . ", -" . .. . ", -"..... .. ...... ", -" . .. . . ", -" .. ", -" .. ", -" .. ", -" .. ", -" "}; diff --git a/app/bin/bitmaps/join-line.xpm b/app/bin/bitmaps/join-line.xpm new file mode 100644 index 0000000..1912e9a --- /dev/null +++ b/app/bin/bitmaps/join-line.xpm @@ -0,0 +1,99 @@ +static char *join_line_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + "3 c #800000", + " ", + " 00", + " 0 ", + " 0 ", + " 0 ", + " 223 ", + " 222 ", + " 222 ", + " 2 ", + " 2 ", + " 2 ", + " 2 2 ", + " 222 ", + " 022 ", + " 00000 22 ", + " 000 "}; + +static char *join_line_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #800000", + " ", + " 0 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 0 ", + " 00 ", + " 2223 ", + " 2222 ", + " 2222 ", + " 22 ", + " 2 ", + " 22 ", + " 22 ", + " 22 ", + " 22 ", + " 2 22 ", + " 22222 ", + " 222 ", + " 0122 ", + " 0000 22 ", + " 000000 ", + " "}; + +static char *join_line_x32[] = { + "32 32 6 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #990000", + "3 c #CC0000", + "4 c #800000", + " ", + " 0 ", + " 0 ", + " 0 ", + " 0 ", + " 0 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 21 ", + " 333333 ", + " 3333333 ", + " 33333 ", + " 33 33 ", + " 333 ", + " 33 ", + " 33 ", + " 333 ", + " 333 ", + " 333 ", + " 333 ", + " 333 ", + " 33 333 ", + " 33 3333 ", + " 33333 ", + " 3333 ", + " 04333 ", + " 0000 333 ", + " 0000000 3 ", + " 00000 ", + " "}; + +static char **join_line_xpm[3] = { join_line_x16, join_line_x24, join_line_x32 }; + diff --git a/app/bin/bitmaps/join.xpm b/app/bin/bitmaps/join.xpm index b42f2cb..944e443 100644 --- a/app/bin/bitmaps/join.xpm +++ b/app/bin/bitmaps/join.xpm @@ -1,22 +1,117 @@ -/* XPM */ -static char * join_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ", -" . .", -" . ", -" . . .", -" . ", -" . . .", -" . ", -" XXX . .", -". . XX ", -"..... X X X ", -". . X X ", -". .XXXX ", -". . X ", -"..... X ", -". . "}; +static char *join_x16[] = { + "16 16 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #990000", + "6 c #996600", + "7 c #CC0000", + "8 c #CC3300", + "9 c #CC6600", + "A c #CC9900", + "B c #800000", + " 66 0 ", + " 66A2A", + " 20 0 ", + " A4964 ", + " 3 46 ", + " 7777B ", + " 777 ", + " 77 ", + " 7 ", + " 7 ", + " 7 77 ", + " 9161777 ", + "0406977 ", + " A A6157 ", + "04006 ", + " 9 A "}; + +static char *join_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " 0 ", + " 8558827 ", + " 338818 ", + " 00 0 ", + " 825 0 ", + " 7288538 ", + " 00 158 ", + " 6666660 ", + " 6666664 ", + " 66666 ", + " 66 666 ", + " 666 6 ", + " 666 ", + " 666 ", + " 6 666 ", + " 66 666 ", + " 666666 ", + " 7 33066666 ", + " 02007 666 ", + " 8 8866666 ", + " 8 8500466 ", + " 350005 ", + " 15 8 ", + " 8 "}; + +static char *join_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #990000", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + "9 c #800000", + " ", + " 20 00 ", + " 855888558 ", + " 00 05 ", + " 0 0 ", + " 0 0 ", + " 88388 0 ", + " 03888758 ", + " 0 038 ", + " 64666 0 ", + " 666666660 ", + " 666666664 ", + " 666666 ", + " 666 666 ", + " 666 666 ", + " 6666 ", + " 6666 ", + " 6666 ", + " 6666 ", + " 66 6666 ", + " 66 6666 ", + " 666 66666 ", + " 87096666666 ", + " 88 0320666666 ", + " 0100038 66666 ", + " 78 8 666666 ", + " 88 88 46666 ", + " 88 7000 666 ", + " 57000033 ", + " 02300 88 ", + " 8 8 ", + " 8 "}; + +static char **join_xpm[3] = { join_x16, join_x24, join_x32 }; + diff --git a/app/bin/bitmaps/joinline.xpm b/app/bin/bitmaps/joinline.xpm deleted file mode 100644 index 06e22f8..0000000 --- a/app/bin/bitmaps/joinline.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * joinline_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ", -" ", -" .", -" ..", -" ...", -" ... ", -" ... ", -" XXX ", -" X X ", -" X X X ", -".....X X ", -".....XXXX ", -"..... X ", -" X ", -" "}; \ No newline at end of file diff --git a/app/bin/bitmaps/l1.xbm b/app/bin/bitmaps/l1.xbm index e332794..031edd1 100644 --- a/app/bin/bitmaps/l1.xbm +++ b/app/bin/bitmaps/l1.xbm @@ -1,6 +1,78 @@ -#define l1_width 14 -#define l1_height 16 -static char l1_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x50, 0x00, - 0x48, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l1_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x80, 0x03, + 0xC0, 0x03, + 0xE0, 0x03, + 0x80, 0x03, + 0x80, 0x03, + 0x80, 0x03, + 0x80, 0x03, + 0x80, 0x03, + 0x80, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l1_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1E, 0x00, + 0x00, 0x1E, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x1D, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l1_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xF0, 0x00, 0x00, + 0x00, 0xF8, 0x00, 0x00, + 0x00, 0xFC, 0x00, 0x00, + 0x00, 0xFE, 0x00, 0x00, + 0x00, 0xE6, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l10.xbm b/app/bin/bitmaps/l10.xbm index 0cf7dc8..10920b9 100644 --- a/app/bin/bitmaps/l10.xbm +++ b/app/bin/bitmaps/l10.xbm @@ -1,6 +1,78 @@ -#define l10_width 14 -#define l10_height 16 -static char l10_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x18, - 0x89, 0x14, 0x88, 0x12, 0x88, 0x11, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l10_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3F, + 0x7C, 0x33, + 0x70, 0x33, + 0x70, 0x33, + 0x70, 0x33, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l10_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xE0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xF0, 0x39, 0x06, + 0xD8, 0x39, 0x06, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x06, + 0xC0, 0x31, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l10_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0x80, 0x03, 0xFF, 0x00, + 0xC0, 0x03, 0xEF, 0x01, + 0xE0, 0x83, 0xC7, 0x01, + 0xF0, 0x83, 0xC3, 0x03, + 0xF8, 0x83, 0xC3, 0x03, + 0x98, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xC7, 0x01, + 0x80, 0x03, 0xEF, 0x01, + 0x80, 0x03, 0xFF, 0x00, + 0x80, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l11.xbm b/app/bin/bitmaps/l11.xbm index c38f98b..ce82cfe 100644 --- a/app/bin/bitmaps/l11.xbm +++ b/app/bin/bitmaps/l11.xbm @@ -1,6 +1,78 @@ -#define l11_width 14 -#define l11_height 16 -static char l11_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x0C, 0x06, 0x0A, 0x05, - 0x89, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l11_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1C, + 0x78, 0x1E, + 0x7C, 0x1F, + 0x70, 0x1C, + 0x70, 0x1C, + 0x70, 0x1C, + 0x70, 0x1C, + 0x70, 0x1C, + 0x70, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l11_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0x81, 0x03, + 0xE0, 0xC1, 0x03, + 0xE0, 0xC1, 0x03, + 0xF0, 0xE1, 0x03, + 0xD8, 0xB1, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l11_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0xC0, 0x03, 0x78, 0x00, + 0xE0, 0x03, 0x7C, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0xF8, 0x03, 0x7F, 0x00, + 0x98, 0x03, 0x73, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x80, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l12.xbm b/app/bin/bitmaps/l12.xbm index 19b8726..e660ef3 100644 --- a/app/bin/bitmaps/l12.xbm +++ b/app/bin/bitmaps/l12.xbm @@ -1,6 +1,78 @@ -#define l12_width 14 -#define l12_height 16 -static char l12_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, - 0x09, 0x08, 0x08, 0x04, 0x08, 0x02, 0x08, 0x01, 0x88, 0x00, 0x88, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l12_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3F, + 0x7C, 0x33, + 0x70, 0x30, + 0x70, 0x38, + 0x70, 0x1C, + 0x70, 0x0E, + 0x70, 0x07, + 0x70, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l12_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xE0, 0x71, 0x07, + 0xE0, 0x39, 0x06, + 0xF0, 0x39, 0x0E, + 0xD8, 0x01, 0x0E, + 0xC0, 0x01, 0x0E, + 0xC0, 0x01, 0x07, + 0xC0, 0x81, 0x07, + 0xC0, 0x81, 0x03, + 0xC0, 0xC1, 0x01, + 0xC0, 0xE1, 0x01, + 0xC0, 0xF1, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x79, 0x00, + 0xC0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l12_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFE, 0x00, + 0x80, 0x03, 0xFF, 0x01, + 0xC0, 0x83, 0xE7, 0x03, + 0xE0, 0x83, 0xC3, 0x03, + 0xF0, 0xC3, 0x83, 0x03, + 0xF8, 0xC3, 0x83, 0x03, + 0x98, 0x03, 0x80, 0x03, + 0x80, 0x03, 0xC0, 0x03, + 0x80, 0x03, 0xC0, 0x03, + 0x80, 0x03, 0xE0, 0x01, + 0x80, 0x03, 0xF0, 0x01, + 0x80, 0x03, 0xF8, 0x00, + 0x80, 0x03, 0x78, 0x00, + 0x80, 0x03, 0x3C, 0x00, + 0x80, 0x03, 0x1E, 0x00, + 0x80, 0x03, 0x0F, 0x00, + 0x80, 0x83, 0x07, 0x00, + 0x80, 0x83, 0x07, 0x00, + 0x80, 0xC3, 0xFF, 0x03, + 0x80, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l13.xbm b/app/bin/bitmaps/l13.xbm index 812bbe3..a11c7f7 100644 --- a/app/bin/bitmaps/l13.xbm +++ b/app/bin/bitmaps/l13.xbm @@ -1,6 +1,78 @@ -#define l13_width 14 -#define l13_height 16 -static char l13_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x0A, 0x10, - 0x09, 0x10, 0x08, 0x0E, 0x08, 0x10, 0x08, 0x10, 0x88, 0x10, 0x08, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l13_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3B, + 0x7C, 0x38, + 0x70, 0x18, + 0x70, 0x3C, + 0x70, 0x38, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l13_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xE0, 0x71, 0x07, + 0xE0, 0x39, 0x07, + 0xF0, 0x01, 0x07, + 0xD8, 0x01, 0x07, + 0xC0, 0x01, 0x07, + 0xC0, 0x81, 0x03, + 0xC0, 0xC1, 0x07, + 0xC0, 0x01, 0x07, + 0xC0, 0x01, 0x0E, + 0xC0, 0x01, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l13_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0x80, 0x03, 0xFF, 0x00, + 0xC0, 0x83, 0xE7, 0x01, + 0xE0, 0x83, 0xC7, 0x01, + 0xF0, 0x83, 0xC3, 0x03, + 0xF8, 0x03, 0xC0, 0x03, + 0x98, 0x03, 0xC0, 0x01, + 0x80, 0x03, 0xE0, 0x01, + 0x80, 0x03, 0xFC, 0x00, + 0x80, 0x03, 0xFC, 0x00, + 0x80, 0x03, 0xE0, 0x01, + 0x80, 0x03, 0xC0, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0x83, 0xC7, 0x03, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x03, 0xFF, 0x01, + 0x80, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l14.xbm b/app/bin/bitmaps/l14.xbm index 63f2e44..765ca93 100644 --- a/app/bin/bitmaps/l14.xbm +++ b/app/bin/bitmaps/l14.xbm @@ -1,6 +1,78 @@ -#define l14_width 14 -#define l14_height 16 -static char l14_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x0C, 0x0C, 0x0A, 0x0A, - 0x09, 0x09, 0x88, 0x08, 0x88, 0x1F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l14_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1C, + 0x78, 0x1C, + 0x7C, 0x1E, + 0x70, 0x1E, + 0x70, 0x1F, + 0x70, 0x1B, + 0xF0, 0x3F, + 0x70, 0x18, + 0x70, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l14_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0x81, 0x03, + 0xE0, 0x81, 0x03, + 0xE0, 0xC1, 0x03, + 0xF0, 0xC1, 0x03, + 0xD8, 0xE1, 0x03, + 0xC0, 0xE1, 0x03, + 0xC0, 0xF1, 0x03, + 0xC0, 0xB1, 0x03, + 0xC0, 0xB9, 0x03, + 0xC0, 0x99, 0x03, + 0xC0, 0xFD, 0x0F, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l14_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xF0, 0x00, + 0x80, 0x03, 0xF0, 0x00, + 0xC0, 0x03, 0xF8, 0x00, + 0xE0, 0x03, 0xF8, 0x00, + 0xF0, 0x03, 0xFC, 0x00, + 0xF8, 0x03, 0xFC, 0x00, + 0x98, 0x03, 0xFE, 0x00, + 0x80, 0x03, 0xEE, 0x00, + 0x80, 0x03, 0xEF, 0x00, + 0x80, 0x83, 0xE7, 0x00, + 0x80, 0x83, 0xE7, 0x00, + 0x80, 0xC3, 0xE3, 0x00, + 0x80, 0xC3, 0xE1, 0x00, + 0x80, 0xE3, 0xFF, 0x03, + 0x80, 0xE3, 0xFF, 0x03, + 0x80, 0x03, 0xE0, 0x00, + 0x80, 0x03, 0xE0, 0x00, + 0x80, 0x03, 0xE0, 0x00, + 0x80, 0x03, 0xE0, 0x00, + 0x80, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l15.xbm b/app/bin/bitmaps/l15.xbm index 4d66f1b..7850754 100644 --- a/app/bin/bitmaps/l15.xbm +++ b/app/bin/bitmaps/l15.xbm @@ -1,6 +1,78 @@ -#define l15_width 14 -#define l15_height 16 -static char l15_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x1F, 0x8C, 0x00, 0x8A, 0x00, - 0x89, 0x0F, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x88, 0x10, 0x08, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l15_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x3F, + 0x78, 0x07, + 0x7C, 0x07, + 0x70, 0x1F, + 0x70, 0x3B, + 0x70, 0x30, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l15_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xF1, 0x07, + 0xE0, 0x71, 0x00, + 0xE0, 0x71, 0x00, + 0xF0, 0x31, 0x00, + 0xD8, 0x31, 0x00, + 0xC0, 0xF9, 0x03, + 0xC0, 0x79, 0x07, + 0xC0, 0x39, 0x07, + 0xC0, 0x01, 0x0E, + 0xC0, 0x01, 0x0E, + 0xC0, 0x01, 0x0E, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l15_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFF, 0x03, + 0x80, 0x03, 0xFF, 0x03, + 0xC0, 0x03, 0x07, 0x00, + 0xE0, 0x03, 0x07, 0x00, + 0xF0, 0x83, 0x07, 0x00, + 0xF8, 0x83, 0x07, 0x00, + 0x98, 0x83, 0x7F, 0x00, + 0x80, 0x83, 0xFF, 0x01, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x03, 0xC0, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0xC3, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x03, 0xFF, 0x00, + 0x80, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l16.xbm b/app/bin/bitmaps/l16.xbm index 84366d3..88e94f6 100644 --- a/app/bin/bitmaps/l16.xbm +++ b/app/bin/bitmaps/l16.xbm @@ -1,6 +1,78 @@ -#define l16_width 14 -#define l16_height 16 -static char l16_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x00, 0x8A, 0x00, - 0x89, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l16_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3F, + 0x7C, 0x03, + 0x70, 0x1F, + 0x70, 0x3F, + 0x70, 0x33, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l16_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xE0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xF0, 0x39, 0x00, + 0xD8, 0x39, 0x00, + 0xC0, 0x39, 0x00, + 0xC0, 0xF9, 0x03, + 0xC0, 0x79, 0x07, + 0xC0, 0x39, 0x07, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x31, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l16_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFC, 0x00, + 0x80, 0x03, 0xFF, 0x01, + 0xC0, 0x03, 0xEF, 0x01, + 0xE0, 0x83, 0xC7, 0x03, + 0xF0, 0x83, 0xC3, 0x03, + 0xF8, 0x83, 0x03, 0x00, + 0x98, 0xC3, 0x03, 0x00, + 0x80, 0xC3, 0x7F, 0x00, + 0x80, 0xC3, 0xFF, 0x01, + 0x80, 0xC3, 0xEF, 0x01, + 0x80, 0xC3, 0xC7, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0x83, 0x83, 0x03, + 0x80, 0x83, 0xC7, 0x03, + 0x80, 0x83, 0xEF, 0x01, + 0x80, 0x03, 0xFF, 0x01, + 0x80, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l17.xbm b/app/bin/bitmaps/l17.xbm index 0881871..df3fb94 100644 --- a/app/bin/bitmaps/l17.xbm +++ b/app/bin/bitmaps/l17.xbm @@ -1,6 +1,78 @@ -#define l17_width 14 -#define l17_height 16 -static char l17_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x1F, 0x0C, 0x10, 0x0A, 0x08, - 0x09, 0x08, 0x08, 0x04, 0x08, 0x04, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l17_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x3F, + 0x78, 0x38, + 0x7C, 0x18, + 0x70, 0x1C, + 0x70, 0x0C, + 0x70, 0x0E, + 0x70, 0x0E, + 0x70, 0x06, + 0x70, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l17_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xF9, 0x0F, + 0xE0, 0x01, 0x0F, + 0xE0, 0x01, 0x07, + 0xF0, 0x81, 0x03, + 0xD8, 0x81, 0x03, + 0xC0, 0xC1, 0x01, + 0xC0, 0xC1, 0x01, + 0xC0, 0xC1, 0x01, + 0xC0, 0xE1, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l17_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC3, 0xFF, 0x03, + 0x80, 0xC3, 0xFF, 0x03, + 0xC0, 0x03, 0xC0, 0x03, + 0xE0, 0x03, 0xE0, 0x01, + 0xF0, 0x03, 0xE0, 0x01, + 0xF8, 0x03, 0xF0, 0x00, + 0x98, 0x03, 0xF0, 0x00, + 0x80, 0x03, 0x78, 0x00, + 0x80, 0x03, 0x78, 0x00, + 0x80, 0x03, 0x38, 0x00, + 0x80, 0x03, 0x3C, 0x00, + 0x80, 0x03, 0x3C, 0x00, + 0x80, 0x03, 0x1C, 0x00, + 0x80, 0x03, 0x1E, 0x00, + 0x80, 0x03, 0x1E, 0x00, + 0x80, 0x03, 0x1E, 0x00, + 0x80, 0x03, 0x1E, 0x00, + 0x80, 0x03, 0x0E, 0x00, + 0x80, 0x03, 0x0E, 0x00, + 0x80, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l18.xbm b/app/bin/bitmaps/l18.xbm index 3e9074c..7ab0b30 100644 --- a/app/bin/bitmaps/l18.xbm +++ b/app/bin/bitmaps/l18.xbm @@ -1,6 +1,78 @@ -#define l18_width 14 -#define l18_height 16 -static char l18_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, - 0x89, 0x10, 0x08, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x88, 0x10, 0x08, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l18_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3F, + 0x7C, 0x3B, + 0x70, 0x3F, + 0x70, 0x1E, + 0x70, 0x3F, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l18_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xE0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xF0, 0x39, 0x07, + 0xD8, 0x39, 0x07, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x06, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l18_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0x80, 0x03, 0xFF, 0x00, + 0xC0, 0x83, 0xEF, 0x01, + 0xE0, 0x83, 0xC7, 0x01, + 0xF0, 0x83, 0xC3, 0x03, + 0xF8, 0x83, 0xC3, 0x03, + 0x98, 0x83, 0xC7, 0x01, + 0x80, 0x03, 0xEF, 0x01, + 0x80, 0x03, 0xFE, 0x00, + 0x80, 0x03, 0xFF, 0x00, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x03, 0xFF, 0x01, + 0x80, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l19.xbm b/app/bin/bitmaps/l19.xbm index 71beff5..08aee34 100644 --- a/app/bin/bitmaps/l19.xbm +++ b/app/bin/bitmaps/l19.xbm @@ -1,6 +1,78 @@ -#define l19_width 14 -#define l19_height 16 -static char l19_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0F, 0x8C, 0x10, 0x8A, 0x10, - 0x89, 0x10, 0x08, 0x1F, 0x08, 0x10, 0x08, 0x10, 0x08, 0x08, 0x08, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l19_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x78, 0x3F, + 0x7C, 0x33, + 0x70, 0x33, + 0x70, 0x3F, + 0x70, 0x3E, + 0x70, 0x30, + 0x70, 0x3B, + 0x70, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l19_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x01, + 0xE0, 0x71, 0x07, + 0xE0, 0x39, 0x07, + 0xF0, 0x39, 0x06, + 0xD8, 0x39, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x0F, + 0xC0, 0x71, 0x0F, + 0xC0, 0xE1, 0x0F, + 0xC0, 0x01, 0x0E, + 0xC0, 0x01, 0x06, + 0xC0, 0x01, 0x06, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x03, + 0xC0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l19_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0x80, 0x03, 0xFF, 0x00, + 0xC0, 0x83, 0xEF, 0x01, + 0xE0, 0x83, 0xC7, 0x01, + 0xF0, 0xC3, 0x83, 0x03, + 0xF8, 0xC3, 0x83, 0x03, + 0x98, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0xC3, 0x83, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xE7, 0x03, + 0x80, 0x03, 0xFF, 0x03, + 0x80, 0x03, 0xFE, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0x03, 0x80, 0x03, + 0x80, 0x83, 0xC3, 0x03, + 0x80, 0x83, 0xC3, 0x01, + 0x80, 0x83, 0xE7, 0x01, + 0x80, 0x03, 0xFF, 0x00, + 0x80, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l2.xbm b/app/bin/bitmaps/l2.xbm index 5efcb45..4ab709c 100644 --- a/app/bin/bitmaps/l2.xbm +++ b/app/bin/bitmaps/l2.xbm @@ -1,6 +1,78 @@ -#define l2_width 14 -#define l2_height 16 -static char l2_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, - 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0xF8, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l2_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xC0, 0x03, + 0xE0, 0x07, + 0x60, 0x06, + 0x00, 0x06, + 0x00, 0x07, + 0x80, 0x03, + 0xC0, 0x01, + 0xE0, 0x00, + 0xE0, 0x07, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l2_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x3B, 0x00, + 0xC0, 0x31, 0x00, + 0xC0, 0x71, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x3C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x0E, 0x00, + 0x00, 0x0F, 0x00, + 0x80, 0x07, 0x00, + 0x80, 0x03, 0x00, + 0xC0, 0x03, 0x00, + 0xC0, 0x7F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l2_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0x01, 0x00, + 0x00, 0xFE, 0x03, 0x00, + 0x00, 0xCF, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0xC0, 0x03, 0x00, + 0x00, 0xE0, 0x03, 0x00, + 0x00, 0xF0, 0x01, 0x00, + 0x00, 0xF0, 0x00, 0x00, + 0x00, 0x78, 0x00, 0x00, + 0x00, 0x3C, 0x00, 0x00, + 0x00, 0x1E, 0x00, 0x00, + 0x00, 0x0F, 0x00, 0x00, + 0x00, 0x0F, 0x00, 0x00, + 0x80, 0xFF, 0x07, 0x00, + 0x80, 0xFF, 0x07, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l20.xbm b/app/bin/bitmaps/l20.xbm index 3b89521..9da3bef 100644 --- a/app/bin/bitmaps/l20.xbm +++ b/app/bin/bitmaps/l20.xbm @@ -1,6 +1,78 @@ -#define l20_width 14 -#define l20_height 16 -static char l20_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, - 0x90, 0x14, 0x88, 0x12, 0x84, 0x11, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l20_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xC0, 0x33, + 0xE0, 0x33, + 0x70, 0x33, + 0x38, 0x33, + 0x1C, 0x3F, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l20_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x33, 0x07, + 0x1C, 0x3F, 0x06, + 0x00, 0x3F, 0x06, + 0x00, 0x3F, 0x0E, + 0x80, 0x3B, 0x0E, + 0xC0, 0x3B, 0x0E, + 0xC0, 0x39, 0x0E, + 0xE0, 0x38, 0x0E, + 0xF0, 0x38, 0x06, + 0x78, 0x38, 0x06, + 0x38, 0x30, 0x07, + 0x3C, 0x70, 0x07, + 0xFC, 0xE7, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l20_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x3C, 0x1F, 0xEF, 0x01, + 0x1C, 0x9E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xCF, 0x83, 0x03, + 0x80, 0xCF, 0x83, 0x03, + 0xC0, 0xC7, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0x78, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xC7, 0x01, + 0x3C, 0x00, 0xEF, 0x01, + 0xFE, 0x1F, 0xFF, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l21.xbm b/app/bin/bitmaps/l21.xbm index 4c21534..32d81cc 100644 --- a/app/bin/bitmaps/l21.xbm +++ b/app/bin/bitmaps/l21.xbm @@ -1,6 +1,78 @@ -#define l21_width 14 -#define l21_height 16 -static char l21_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, - 0x90, 0x04, 0x08, 0x04, 0x04, 0x04, 0x02, 0x04, 0x01, 0x04, 0x3F, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l21_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1E, + 0xCC, 0x1F, + 0xC0, 0x1C, + 0xE0, 0x1C, + 0x70, 0x1C, + 0x38, 0x1C, + 0x1C, 0x1C, + 0xFC, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l21_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0xC3, 0x03, + 0x1C, 0xC3, 0x03, + 0x1C, 0xE7, 0x03, + 0x00, 0xB7, 0x03, + 0x00, 0x87, 0x03, + 0x80, 0x83, 0x03, + 0xC0, 0x83, 0x03, + 0xC0, 0x81, 0x03, + 0xE0, 0x80, 0x03, + 0xF0, 0x80, 0x03, + 0x78, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x3C, 0x80, 0x03, + 0xFC, 0x87, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l21_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x70, 0x00, + 0xF8, 0x0F, 0x70, 0x00, + 0x3C, 0x1F, 0x78, 0x00, + 0x1C, 0x1E, 0x7C, 0x00, + 0x1E, 0x1C, 0x7E, 0x00, + 0x1E, 0x1C, 0x7F, 0x00, + 0x00, 0x1C, 0x73, 0x00, + 0x00, 0x1E, 0x70, 0x00, + 0x00, 0x1E, 0x70, 0x00, + 0x00, 0x0F, 0x70, 0x00, + 0x80, 0x0F, 0x70, 0x00, + 0xC0, 0x07, 0x70, 0x00, + 0xC0, 0x03, 0x70, 0x00, + 0xE0, 0x01, 0x70, 0x00, + 0xF0, 0x00, 0x70, 0x00, + 0x78, 0x00, 0x70, 0x00, + 0x3C, 0x00, 0x70, 0x00, + 0x3C, 0x00, 0x70, 0x00, + 0xFE, 0x1F, 0x70, 0x00, + 0xFE, 0x1F, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l22.xbm b/app/bin/bitmaps/l22.xbm index 1d3d0b8..9cfc394 100644 --- a/app/bin/bitmaps/l22.xbm +++ b/app/bin/bitmaps/l22.xbm @@ -1,6 +1,78 @@ -#define l22_width 14 -#define l22_height 16 -static char l22_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x81, 0x00, 0xBF, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l22_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xC0, 0x30, + 0xE0, 0x38, + 0x70, 0x1C, + 0x38, 0x0E, + 0x1C, 0x07, + 0xFC, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l22_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x3B, 0x06, + 0x1C, 0x3F, 0x0E, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x80, 0x03, 0x07, + 0xC0, 0x83, 0x07, + 0xC0, 0x81, 0x03, + 0xE0, 0xC0, 0x01, + 0xF0, 0xE0, 0x01, + 0x78, 0xF0, 0x00, + 0x38, 0x70, 0x00, + 0x3C, 0x78, 0x00, + 0xFC, 0xFF, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l22_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFE, 0x00, + 0xF8, 0x0F, 0xFF, 0x01, + 0x3C, 0x9F, 0xE7, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x0F, 0xE0, 0x01, + 0x80, 0x0F, 0xF0, 0x01, + 0xC0, 0x07, 0xF8, 0x00, + 0xC0, 0x03, 0x78, 0x00, + 0xE0, 0x01, 0x3C, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0x78, 0x00, 0x0F, 0x00, + 0x3C, 0x80, 0x07, 0x00, + 0x3C, 0x80, 0x07, 0x00, + 0xFE, 0xDF, 0xFF, 0x03, + 0xFE, 0xDF, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l23.xbm b/app/bin/bitmaps/l23.xbm index 27bb4ad..efb4ac4 100644 --- a/app/bin/bitmaps/l23.xbm +++ b/app/bin/bitmaps/l23.xbm @@ -1,6 +1,78 @@ -#define l23_width 14 -#define l23_height 16 -static char l23_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, - 0x10, 0x10, 0x08, 0x0E, 0x04, 0x10, 0x02, 0x10, 0x81, 0x10, 0x3F, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l23_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3B, + 0xCC, 0x38, + 0xC0, 0x18, + 0xE0, 0x3C, + 0x70, 0x38, + 0x38, 0x33, + 0x1C, 0x3F, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l23_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x3B, 0x07, + 0x1C, 0x07, 0x07, + 0x00, 0x07, 0x07, + 0x00, 0x07, 0x07, + 0x80, 0x83, 0x03, + 0xC0, 0xC3, 0x07, + 0xC0, 0x01, 0x07, + 0xE0, 0x00, 0x0E, + 0xF0, 0x00, 0x0E, + 0x78, 0x38, 0x0E, + 0x38, 0x38, 0x07, + 0x3C, 0x70, 0x07, + 0xFC, 0xE7, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l23_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x3C, 0x9F, 0xE7, 0x01, + 0x1C, 0x9E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x1C, 0xC0, 0x03, + 0x00, 0x1C, 0xC0, 0x01, + 0x00, 0x1E, 0xE0, 0x01, + 0x00, 0x1E, 0xFC, 0x00, + 0x00, 0x0F, 0xFC, 0x00, + 0x80, 0x0F, 0xE0, 0x01, + 0xC0, 0x07, 0xC0, 0x03, + 0xC0, 0x03, 0x80, 0x03, + 0xE0, 0x01, 0x80, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0x78, 0xC0, 0x83, 0x03, + 0x3C, 0x80, 0xC7, 0x03, + 0x3C, 0x80, 0xE7, 0x01, + 0xFE, 0x1F, 0xFF, 0x01, + 0xFE, 0x1F, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l24.xbm b/app/bin/bitmaps/l24.xbm index 8b2efc5..8fd49ae 100644 --- a/app/bin/bitmaps/l24.xbm +++ b/app/bin/bitmaps/l24.xbm @@ -1,6 +1,78 @@ -#define l24_width 14 -#define l24_height 16 -static char l24_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, - 0x10, 0x09, 0x88, 0x08, 0x84, 0x1F, 0x02, 0x08, 0x01, 0x08, 0x3F, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l24_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1C, + 0xCC, 0x1E, + 0xC0, 0x1E, + 0xE0, 0x1F, + 0x70, 0x1B, + 0xB8, 0x3F, + 0x1C, 0x18, + 0xFC, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l24_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0x83, 0x03, + 0x1C, 0xC3, 0x03, + 0x1C, 0xC7, 0x03, + 0x00, 0xE7, 0x03, + 0x00, 0xE7, 0x03, + 0x80, 0xF3, 0x03, + 0xC0, 0xB3, 0x03, + 0xC0, 0xB9, 0x03, + 0xE0, 0x98, 0x03, + 0xF0, 0xFC, 0x0F, + 0x78, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x3C, 0x80, 0x03, + 0xFC, 0x87, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l24_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xF0, 0x00, + 0xF8, 0x0F, 0xF0, 0x00, + 0x3C, 0x1F, 0xF8, 0x00, + 0x1C, 0x1E, 0xF8, 0x00, + 0x1E, 0x1C, 0xFC, 0x00, + 0x1E, 0x1C, 0xFC, 0x00, + 0x00, 0x1C, 0xFE, 0x00, + 0x00, 0x1E, 0xEE, 0x00, + 0x00, 0x1E, 0xEF, 0x00, + 0x00, 0x8F, 0xE7, 0x00, + 0x80, 0x8F, 0xE7, 0x00, + 0xC0, 0xC7, 0xE3, 0x00, + 0xC0, 0xC3, 0xE1, 0x00, + 0xE0, 0xE1, 0xFF, 0x03, + 0xF0, 0xE0, 0xFF, 0x03, + 0x78, 0x00, 0xE0, 0x00, + 0x3C, 0x00, 0xE0, 0x00, + 0x3C, 0x00, 0xE0, 0x00, + 0xFE, 0x1F, 0xE0, 0x00, + 0xFE, 0x1F, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l25.xbm b/app/bin/bitmaps/l25.xbm index f4751dc..6bf1e2b 100644 --- a/app/bin/bitmaps/l25.xbm +++ b/app/bin/bitmaps/l25.xbm @@ -1,6 +1,78 @@ -#define l25_width 14 -#define l25_height 16 -static char l25_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, - 0x90, 0x0F, 0x08, 0x10, 0x04, 0x10, 0x02, 0x10, 0x81, 0x10, 0x3F, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l25_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x07, + 0xCC, 0x07, + 0xC0, 0x1F, + 0xE0, 0x3B, + 0x70, 0x30, + 0x38, 0x33, + 0x1C, 0x3F, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l25_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF1, 0x07, + 0xB8, 0x73, 0x00, + 0x1C, 0x73, 0x00, + 0x1C, 0x37, 0x00, + 0x00, 0x37, 0x00, + 0x00, 0xFF, 0x03, + 0x80, 0x7B, 0x07, + 0xC0, 0x3B, 0x07, + 0xC0, 0x01, 0x0E, + 0xE0, 0x00, 0x0E, + 0xF0, 0x00, 0x0E, + 0x78, 0x38, 0x06, + 0x38, 0x38, 0x07, + 0x3C, 0x70, 0x07, + 0xFC, 0xE7, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l25_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFF, 0x03, + 0xF8, 0x0F, 0xFF, 0x03, + 0x3C, 0x1F, 0x07, 0x00, + 0x1C, 0x1E, 0x07, 0x00, + 0x1E, 0x9C, 0x07, 0x00, + 0x1E, 0x9C, 0x07, 0x00, + 0x00, 0x9C, 0x7F, 0x00, + 0x00, 0x9E, 0xFF, 0x01, + 0x00, 0x9E, 0xE7, 0x01, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x0F, 0xC0, 0x03, + 0xC0, 0x07, 0x80, 0x03, + 0xC0, 0x03, 0x80, 0x03, + 0xE0, 0x01, 0x80, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0x78, 0xC0, 0xC3, 0x03, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xE7, 0x01, + 0xFE, 0x1F, 0xFF, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l26.xbm b/app/bin/bitmaps/l26.xbm index 9e67365..ebed83b 100644 --- a/app/bin/bitmaps/l26.xbm +++ b/app/bin/bitmaps/l26.xbm @@ -1,6 +1,78 @@ -#define l26_width 14 -#define l26_height 16 -static char l26_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, - 0x90, 0x0F, 0x88, 0x10, 0x84, 0x10, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l26_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x03, + 0xC0, 0x1F, + 0xE0, 0x3F, + 0x70, 0x33, + 0x38, 0x33, + 0x1C, 0x3F, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l26_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x33, 0x07, + 0x1C, 0x3F, 0x00, + 0x00, 0x3F, 0x00, + 0x00, 0x3F, 0x00, + 0x80, 0xFB, 0x03, + 0xC0, 0x7B, 0x07, + 0xC0, 0x39, 0x07, + 0xE0, 0x38, 0x0E, + 0xF0, 0x38, 0x0E, + 0x78, 0x38, 0x0E, + 0x38, 0x30, 0x07, + 0x3C, 0x70, 0x07, + 0xFC, 0xE7, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l26_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFC, 0x00, + 0xF8, 0x0F, 0xFF, 0x01, + 0x3C, 0x1F, 0xEF, 0x01, + 0x1C, 0x9E, 0xC7, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0x03, 0x00, + 0x00, 0xDC, 0x03, 0x00, + 0x00, 0xDE, 0x7F, 0x00, + 0x00, 0xDE, 0xFF, 0x01, + 0x00, 0xCF, 0xEF, 0x01, + 0x80, 0xCF, 0xC7, 0x03, + 0xC0, 0xC7, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0x78, 0x80, 0x83, 0x03, + 0x3C, 0x80, 0xC7, 0x03, + 0x3C, 0x80, 0xEF, 0x01, + 0xFE, 0x1F, 0xFF, 0x01, + 0xFE, 0x1F, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l27.xbm b/app/bin/bitmaps/l27.xbm index abdbb55..d611f65 100644 --- a/app/bin/bitmaps/l27.xbm +++ b/app/bin/bitmaps/l27.xbm @@ -1,6 +1,78 @@ -#define l27_width 14 -#define l27_height 16 -static char l27_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, - 0x10, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x02, 0x3F, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l27_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x38, + 0xCC, 0x18, + 0xC0, 0x1C, + 0xE0, 0x0C, + 0x70, 0x0E, + 0x38, 0x0E, + 0x1C, 0x06, + 0xFC, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l27_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF9, 0x0F, + 0xB8, 0x03, 0x0F, + 0x1C, 0x03, 0x07, + 0x1C, 0x87, 0x03, + 0x00, 0x87, 0x03, + 0x00, 0xC7, 0x01, + 0x80, 0xC3, 0x01, + 0xC0, 0xC3, 0x01, + 0xC0, 0xE1, 0x00, + 0xE0, 0xE0, 0x00, + 0xF0, 0xE0, 0x00, + 0x78, 0xE0, 0x00, + 0x38, 0xE0, 0x00, + 0x3C, 0x70, 0x00, + 0xFC, 0x77, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l27_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC7, 0xFF, 0x03, + 0xF8, 0xCF, 0xFF, 0x03, + 0x3C, 0x1F, 0xC0, 0x03, + 0x1C, 0x1E, 0xE0, 0x01, + 0x1E, 0x1C, 0xE0, 0x01, + 0x1E, 0x1C, 0xF0, 0x00, + 0x00, 0x1C, 0xF0, 0x00, + 0x00, 0x1E, 0x78, 0x00, + 0x00, 0x1E, 0x78, 0x00, + 0x00, 0x0F, 0x38, 0x00, + 0x80, 0x0F, 0x3C, 0x00, + 0xC0, 0x07, 0x3C, 0x00, + 0xC0, 0x03, 0x1C, 0x00, + 0xE0, 0x01, 0x1E, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0x78, 0x00, 0x1E, 0x00, + 0x3C, 0x00, 0x1E, 0x00, + 0x3C, 0x00, 0x0E, 0x00, + 0xFE, 0x1F, 0x0E, 0x00, + 0xFE, 0x1F, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l28.xbm b/app/bin/bitmaps/l28.xbm index ceb8a68..d5ae122 100644 --- a/app/bin/bitmaps/l28.xbm +++ b/app/bin/bitmaps/l28.xbm @@ -1,6 +1,78 @@ -#define l28_width 14 -#define l28_height 16 -static char l28_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0x90, 0x10, 0x08, 0x0F, 0x84, 0x10, 0x82, 0x10, 0x81, 0x10, 0x3F, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l28_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x3B, + 0xC0, 0x3F, + 0xE0, 0x1E, + 0x70, 0x3F, + 0x38, 0x33, + 0x1C, 0x3F, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l28_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x33, 0x07, + 0x1C, 0x3F, 0x07, + 0x00, 0x3F, 0x07, + 0x00, 0x3F, 0x07, + 0x80, 0x73, 0x07, + 0xC0, 0xE3, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x38, 0x06, + 0xF0, 0x38, 0x0E, + 0x78, 0x38, 0x0E, + 0x38, 0x38, 0x06, + 0x3C, 0x70, 0x07, + 0xFC, 0xE7, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l28_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x3C, 0x9F, 0xEF, 0x01, + 0x1C, 0x9E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x00, 0x9C, 0xC7, 0x01, + 0x00, 0x1E, 0xEF, 0x01, + 0x00, 0x1E, 0xFE, 0x00, + 0x00, 0x0F, 0xFF, 0x00, + 0x80, 0x8F, 0xE7, 0x01, + 0xC0, 0x87, 0xC3, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0x78, 0xC0, 0x83, 0x03, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xE7, 0x01, + 0xFE, 0x1F, 0xFF, 0x01, + 0xFE, 0x1F, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l29.xbm b/app/bin/bitmaps/l29.xbm index 84c6512..7b23c07 100644 --- a/app/bin/bitmaps/l29.xbm +++ b/app/bin/bitmaps/l29.xbm @@ -1,6 +1,78 @@ -#define l29_width 14 -#define l29_height 16 -static char l29_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0x90, 0x10, 0x08, 0x1F, 0x04, 0x10, 0x02, 0x10, 0x01, 0x08, 0x3F, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l29_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xC0, 0x33, + 0xE0, 0x3F, + 0x70, 0x3E, + 0x38, 0x30, + 0x1C, 0x3B, + 0xFC, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l29_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x01, + 0xB8, 0x73, 0x07, + 0x1C, 0x3B, 0x07, + 0x1C, 0x3F, 0x06, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x0E, + 0x80, 0x3B, 0x0F, + 0xC0, 0x73, 0x0F, + 0xC0, 0xE1, 0x0F, + 0xE0, 0x00, 0x0E, + 0xF0, 0x00, 0x06, + 0x78, 0x00, 0x06, + 0x38, 0x38, 0x07, + 0x3C, 0x70, 0x03, + 0xFC, 0xF7, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l29_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x3C, 0x9F, 0xEF, 0x01, + 0x1C, 0x9E, 0xC7, 0x01, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x8F, 0xE7, 0x03, + 0xC0, 0x07, 0xFF, 0x03, + 0xC0, 0x03, 0xFE, 0x03, + 0xE0, 0x01, 0x80, 0x03, + 0xF0, 0x00, 0x80, 0x03, + 0x78, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xC3, 0x01, + 0x3C, 0x80, 0xE7, 0x01, + 0xFE, 0x1F, 0xFF, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l3.xbm b/app/bin/bitmaps/l3.xbm index be5c0d1..070b9bb 100644 --- a/app/bin/bitmaps/l3.xbm +++ b/app/bin/bitmaps/l3.xbm @@ -1,6 +1,78 @@ -#define l3_width 14 -#define l3_height 16 -static char l3_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x00, 0x01, - 0x00, 0x01, 0xE0, 0x00, 0x00, 0x01, 0x00, 0x01, 0x08, 0x01, 0xF0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l3_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xC0, 0x03, + 0x60, 0x07, + 0x00, 0x07, + 0x00, 0x03, + 0x80, 0x07, + 0x00, 0x07, + 0x60, 0x06, + 0xE0, 0x07, + 0xC0, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l3_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x3B, 0x00, + 0xC0, 0x39, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x3E, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x70, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x39, 0x00, + 0x80, 0x3B, 0x00, + 0x00, 0x1F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l3_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0x00, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0x8F, 0x03, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0x80, 0x03, 0x00, + 0x00, 0xC0, 0x03, 0x00, + 0x00, 0xF8, 0x01, 0x00, + 0x00, 0xF8, 0x01, 0x00, + 0x00, 0xC0, 0x03, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x00, 0x8F, 0x07, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0xFE, 0x03, 0x00, + 0x00, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l30.xbm b/app/bin/bitmaps/l30.xbm index f7ab137..324f979 100644 --- a/app/bin/bitmaps/l30.xbm +++ b/app/bin/bitmaps/l30.xbm @@ -1,6 +1,78 @@ -#define l30_width 14 -#define l30_height 16 -static char l30_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x18, - 0xA0, 0x14, 0x9C, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l30_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3F, + 0xE0, 0x33, + 0x60, 0x33, + 0xF0, 0x33, + 0xE0, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l30_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x80, 0x3B, 0x06, + 0x80, 0x3B, 0x06, + 0x80, 0x3B, 0x0E, + 0xC0, 0x39, 0x0E, + 0xE0, 0x3B, 0x0E, + 0x80, 0x3B, 0x0E, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x06, + 0x1C, 0x3F, 0x06, + 0x9C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l30_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x3C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x9E, 0xC3, 0x03, + 0x00, 0xCE, 0x83, 0x03, + 0x00, 0xCF, 0x83, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0x00, 0xCF, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x3C, 0x9E, 0xC7, 0x01, + 0x3C, 0x0F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l31.xbm b/app/bin/bitmaps/l31.xbm index 5ca3354..e379ca6 100644 --- a/app/bin/bitmaps/l31.xbm +++ b/app/bin/bitmaps/l31.xbm @@ -1,6 +1,78 @@ -#define l31_width 14 -#define l31_height 16 -static char l31_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x20, 0x05, - 0xA0, 0x04, 0x1C, 0x04, 0x20, 0x04, 0x20, 0x04, 0x21, 0x04, 0x1E, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l31_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xEC, 0x1E, + 0xE0, 0x1F, + 0x60, 0x1C, + 0xF0, 0x1C, + 0xE0, 0x1C, + 0xCC, 0x1C, + 0xFC, 0x1C, + 0x78, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l31_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0xC3, 0x03, + 0x9C, 0xC3, 0x03, + 0x80, 0xE3, 0x03, + 0x80, 0xB3, 0x03, + 0x80, 0x83, 0x03, + 0xC0, 0x81, 0x03, + 0xE0, 0x83, 0x03, + 0x80, 0x83, 0x03, + 0x00, 0x87, 0x03, + 0x00, 0x87, 0x03, + 0x1C, 0x87, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l31_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0x3C, 0x0F, 0x78, 0x00, + 0x3C, 0x0E, 0x7C, 0x00, + 0x1C, 0x1E, 0x7E, 0x00, + 0x00, 0x1E, 0x7F, 0x00, + 0x00, 0x0E, 0x73, 0x00, + 0x00, 0x0F, 0x70, 0x00, + 0xE0, 0x07, 0x70, 0x00, + 0xE0, 0x07, 0x70, 0x00, + 0x00, 0x0F, 0x70, 0x00, + 0x00, 0x1E, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x3C, 0x1E, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0xF8, 0x0F, 0x70, 0x00, + 0xF0, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l32.xbm b/app/bin/bitmaps/l32.xbm index c083094..3cbaaac 100644 --- a/app/bin/bitmaps/l32.xbm +++ b/app/bin/bitmaps/l32.xbm @@ -1,6 +1,78 @@ -#define l32_width 14 -#define l32_height 16 -static char l32_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, - 0x20, 0x08, 0x1C, 0x04, 0x20, 0x02, 0x20, 0x01, 0xA1, 0x00, 0x9E, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l32_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3F, + 0xE0, 0x33, + 0x60, 0x30, + 0xF0, 0x38, + 0xE0, 0x1C, + 0xCC, 0x0E, + 0xFC, 0x07, + 0x78, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l32_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x06, + 0x80, 0x3B, 0x0E, + 0x80, 0x03, 0x0E, + 0x80, 0x03, 0x0E, + 0xC0, 0x01, 0x07, + 0xE0, 0x83, 0x07, + 0x80, 0x83, 0x03, + 0x00, 0xC7, 0x01, + 0x00, 0xE7, 0x01, + 0x1C, 0xF7, 0x00, + 0x9C, 0x73, 0x00, + 0xB8, 0x7B, 0x00, + 0xF0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l32_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFE, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x3C, 0x8F, 0xE7, 0x03, + 0x3C, 0x8E, 0xC3, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0x0E, 0x80, 0x03, + 0x00, 0x0F, 0xC0, 0x03, + 0xE0, 0x07, 0xC0, 0x03, + 0xE0, 0x07, 0xE0, 0x01, + 0x00, 0x0F, 0xF0, 0x01, + 0x00, 0x1E, 0xF8, 0x00, + 0x00, 0x1C, 0x78, 0x00, + 0x00, 0x1C, 0x3C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x0F, 0x00, + 0x3C, 0x9E, 0x07, 0x00, + 0x3C, 0x8F, 0x07, 0x00, + 0xF8, 0xCF, 0xFF, 0x03, + 0xF0, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l33.xbm b/app/bin/bitmaps/l33.xbm index 241eac5..8d318c6 100644 --- a/app/bin/bitmaps/l33.xbm +++ b/app/bin/bitmaps/l33.xbm @@ -1,6 +1,78 @@ -#define l33_width 14 -#define l33_height 16 -static char l33_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x20, 0x10, - 0x20, 0x10, 0x1C, 0x0E, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l33_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3B, + 0xE0, 0x38, + 0x60, 0x18, + 0xF0, 0x3C, + 0xE0, 0x38, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l33_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x07, + 0x80, 0x03, 0x07, + 0x80, 0x03, 0x07, + 0x80, 0x03, 0x07, + 0xC0, 0x81, 0x03, + 0xE0, 0xC3, 0x07, + 0x80, 0x03, 0x07, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l33_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x3C, 0x8F, 0xE7, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x0E, 0xC0, 0x01, + 0x00, 0x0F, 0xE0, 0x01, + 0xE0, 0x07, 0xFC, 0x00, + 0xE0, 0x07, 0xFC, 0x00, + 0x00, 0x0F, 0xE0, 0x01, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x3C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l34.xbm b/app/bin/bitmaps/l34.xbm index 552eafd..4e90020 100644 --- a/app/bin/bitmaps/l34.xbm +++ b/app/bin/bitmaps/l34.xbm @@ -1,6 +1,78 @@ -#define l34_width 14 -#define l34_height 16 -static char l34_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x20, 0x0A, - 0x20, 0x09, 0x9C, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x21, 0x08, 0x1E, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l34_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xEC, 0x1C, + 0xE0, 0x1E, + 0x60, 0x1E, + 0xF0, 0x1F, + 0xE0, 0x1B, + 0xCC, 0x3F, + 0xFC, 0x18, + 0x78, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l34_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0x83, 0x03, + 0x9C, 0xC3, 0x03, + 0x80, 0xC3, 0x03, + 0x80, 0xE3, 0x03, + 0x80, 0xE3, 0x03, + 0xC0, 0xF1, 0x03, + 0xE0, 0xB3, 0x03, + 0x80, 0xBB, 0x03, + 0x00, 0x9F, 0x03, + 0x00, 0xFF, 0x0F, + 0x1C, 0x87, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l34_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xF0, 0x00, + 0xF8, 0x07, 0xF0, 0x00, + 0x3C, 0x0F, 0xF8, 0x00, + 0x3C, 0x0E, 0xF8, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x00, 0x1E, 0xFC, 0x00, + 0x00, 0x0E, 0xFE, 0x00, + 0x00, 0x0F, 0xEE, 0x00, + 0xE0, 0x07, 0xEF, 0x00, + 0xE0, 0x87, 0xE7, 0x00, + 0x00, 0x8F, 0xE7, 0x00, + 0x00, 0xDE, 0xE3, 0x00, + 0x00, 0xDC, 0xE1, 0x00, + 0x00, 0xFC, 0xFF, 0x03, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1E, 0x1C, 0xE0, 0x00, + 0x3C, 0x1E, 0xE0, 0x00, + 0x3C, 0x0F, 0xE0, 0x00, + 0xF8, 0x0F, 0xE0, 0x00, + 0xF0, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l35.xbm b/app/bin/bitmaps/l35.xbm index 4bf7b2f..f8de169 100644 --- a/app/bin/bitmaps/l35.xbm +++ b/app/bin/bitmaps/l35.xbm @@ -1,6 +1,78 @@ -#define l35_width 14 -#define l35_height 16 -static char l35_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA0, 0x00, - 0xA0, 0x0F, 0x1C, 0x10, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l35_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xEC, 0x07, + 0xE0, 0x07, + 0x60, 0x1F, + 0xF0, 0x3B, + 0xE0, 0x30, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l35_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF1, 0x07, + 0xB8, 0x73, 0x00, + 0x9C, 0x73, 0x00, + 0x80, 0x33, 0x00, + 0x80, 0x33, 0x00, + 0x80, 0xFB, 0x03, + 0xC0, 0x79, 0x07, + 0xE0, 0x3B, 0x07, + 0x80, 0x03, 0x0E, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x1C, 0x3F, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l35_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFF, 0x03, + 0xF8, 0x07, 0xFF, 0x03, + 0x3C, 0x0F, 0x07, 0x00, + 0x3C, 0x0E, 0x07, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x00, 0x9E, 0x07, 0x00, + 0x00, 0x8E, 0x7F, 0x00, + 0x00, 0x8F, 0xFF, 0x01, + 0xE0, 0x87, 0xE7, 0x01, + 0xE0, 0x87, 0xC3, 0x03, + 0x00, 0x0F, 0xC0, 0x03, + 0x00, 0x1E, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0xC3, 0x03, + 0x3C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l36.xbm b/app/bin/bitmaps/l36.xbm index a048e6d..c3c19eb 100644 --- a/app/bin/bitmaps/l36.xbm +++ b/app/bin/bitmaps/l36.xbm @@ -1,6 +1,78 @@ -#define l36_width 14 -#define l36_height 16 -static char l36_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA0, 0x00, - 0xA0, 0x0F, 0x9C, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l36_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3F, + 0xE0, 0x03, + 0x60, 0x1F, + 0xF0, 0x3F, + 0xE0, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l36_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x80, 0x3B, 0x00, + 0x80, 0x3B, 0x00, + 0x80, 0x3B, 0x00, + 0xC0, 0xF9, 0x03, + 0xE0, 0x7B, 0x07, + 0x80, 0x3B, 0x07, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x9C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l36_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFC, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x3C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x9E, 0x03, 0x00, + 0x00, 0xCE, 0x03, 0x00, + 0x00, 0xCF, 0x7F, 0x00, + 0xE0, 0xC7, 0xFF, 0x01, + 0xE0, 0xC7, 0xEF, 0x01, + 0x00, 0xCF, 0xC7, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0x83, 0x03, + 0x3C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l37.xbm b/app/bin/bitmaps/l37.xbm index cd58fcd..df579f5 100644 --- a/app/bin/bitmaps/l37.xbm +++ b/app/bin/bitmaps/l37.xbm @@ -1,6 +1,78 @@ -#define l37_width 14 -#define l37_height 16 -static char l37_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x20, 0x08, - 0x20, 0x08, 0x1C, 0x04, 0x20, 0x04, 0x20, 0x02, 0x21, 0x02, 0x1E, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l37_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xEC, 0x38, + 0xE0, 0x18, + 0x60, 0x1C, + 0xF0, 0x0C, + 0xE0, 0x0E, + 0xCC, 0x0E, + 0xFC, 0x06, + 0x78, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l37_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF9, 0x0F, + 0xB8, 0x03, 0x0F, + 0x9C, 0x03, 0x07, + 0x80, 0x83, 0x03, + 0x80, 0x83, 0x03, + 0x80, 0xC3, 0x01, + 0xC0, 0xC1, 0x01, + 0xE0, 0xC3, 0x01, + 0x80, 0xE3, 0x00, + 0x00, 0xE7, 0x00, + 0x00, 0xE7, 0x00, + 0x1C, 0xE7, 0x00, + 0x9C, 0xE3, 0x00, + 0xB8, 0x73, 0x00, + 0xF0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l37_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC3, 0xFF, 0x03, + 0xF8, 0xC7, 0xFF, 0x03, + 0x3C, 0x0F, 0xC0, 0x03, + 0x3C, 0x0E, 0xE0, 0x01, + 0x1C, 0x1E, 0xE0, 0x01, + 0x00, 0x1E, 0xF0, 0x00, + 0x00, 0x0E, 0xF0, 0x00, + 0x00, 0x0F, 0x78, 0x00, + 0xE0, 0x07, 0x78, 0x00, + 0xE0, 0x07, 0x38, 0x00, + 0x00, 0x0F, 0x3C, 0x00, + 0x00, 0x1E, 0x3C, 0x00, + 0x00, 0x1C, 0x1C, 0x00, + 0x00, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x3C, 0x1E, 0x1E, 0x00, + 0x3C, 0x0F, 0x0E, 0x00, + 0xF8, 0x0F, 0x0E, 0x00, + 0xF0, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l38.xbm b/app/bin/bitmaps/l38.xbm index d47e1ea..424b263 100644 --- a/app/bin/bitmaps/l38.xbm +++ b/app/bin/bitmaps/l38.xbm @@ -1,6 +1,78 @@ -#define l38_width 14 -#define l38_height 16 -static char l38_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, - 0xA0, 0x10, 0x1C, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l38_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3F, + 0xE0, 0x3B, + 0x60, 0x3F, + 0xF0, 0x1E, + 0xE0, 0x3F, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l38_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x80, 0x3B, 0x07, + 0x80, 0x3B, 0x07, + 0x80, 0x3B, 0x07, + 0xC0, 0x71, 0x07, + 0xE0, 0xE3, 0x03, + 0x80, 0x73, 0x07, + 0x00, 0x3F, 0x06, + 0x00, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x9C, 0x3B, 0x06, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l38_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x3C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x9E, 0xC3, 0x03, + 0x00, 0x8E, 0xC7, 0x01, + 0x00, 0x0F, 0xEF, 0x01, + 0xE0, 0x07, 0xFE, 0x00, + 0xE0, 0x07, 0xFF, 0x00, + 0x00, 0x8F, 0xE7, 0x01, + 0x00, 0x9E, 0xC3, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x3C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l39.xbm b/app/bin/bitmaps/l39.xbm index 459ad96..51d14ab 100644 --- a/app/bin/bitmaps/l39.xbm +++ b/app/bin/bitmaps/l39.xbm @@ -1,6 +1,78 @@ -#define l39_width 14 -#define l39_height 16 -static char l39_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA0, 0x10, - 0xA0, 0x10, 0x1C, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x21, 0x08, 0x1E, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l39_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xEC, 0x3F, + 0xE0, 0x33, + 0x60, 0x33, + 0xF0, 0x3F, + 0xE0, 0x3E, + 0xCC, 0x30, + 0xFC, 0x3B, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l39_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x01, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x07, + 0x80, 0x3B, 0x06, + 0x80, 0x3B, 0x0E, + 0x80, 0x3B, 0x0E, + 0xC0, 0x39, 0x0F, + 0xE0, 0x73, 0x0F, + 0x80, 0xE3, 0x0F, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x06, + 0x1C, 0x07, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x03, + 0xF0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l39_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x3C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0xDE, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xCE, 0x83, 0x03, + 0x00, 0xCF, 0x83, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0xE0, 0x87, 0xC3, 0x03, + 0x00, 0x8F, 0xE7, 0x03, + 0x00, 0x1E, 0xFF, 0x03, + 0x00, 0x1C, 0xFE, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x3C, 0x9E, 0xC3, 0x01, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l4.xbm b/app/bin/bitmaps/l4.xbm index ea52f95..411ad63 100644 --- a/app/bin/bitmaps/l4.xbm +++ b/app/bin/bitmaps/l4.xbm @@ -1,6 +1,78 @@ -#define l4_width 14 -#define l4_height 16 -static char l4_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, 0xA0, 0x00, - 0x90, 0x00, 0x88, 0x00, 0xF8, 0x01, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l4_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x80, 0x03, + 0x80, 0x03, + 0xC0, 0x03, + 0xC0, 0x03, + 0xE0, 0x03, + 0x60, 0x03, + 0xF0, 0x07, + 0x00, 0x03, + 0x00, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l4_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1E, 0x00, + 0x00, 0x1E, 0x00, + 0x00, 0x1F, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x1F, 0x00, + 0x80, 0x1D, 0x00, + 0xC0, 0x1D, 0x00, + 0xC0, 0x1C, 0x00, + 0xE0, 0x7F, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l4_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0xE0, 0x01, 0x00, + 0x00, 0xE0, 0x01, 0x00, + 0x00, 0xF0, 0x01, 0x00, + 0x00, 0xF0, 0x01, 0x00, + 0x00, 0xF8, 0x01, 0x00, + 0x00, 0xF8, 0x01, 0x00, + 0x00, 0xFC, 0x01, 0x00, + 0x00, 0xDC, 0x01, 0x00, + 0x00, 0xDE, 0x01, 0x00, + 0x00, 0xCF, 0x01, 0x00, + 0x00, 0xCF, 0x01, 0x00, + 0x80, 0xC7, 0x01, 0x00, + 0x80, 0xC3, 0x01, 0x00, + 0xC0, 0xFF, 0x07, 0x00, + 0xC0, 0xFF, 0x07, 0x00, + 0x00, 0xC0, 0x01, 0x00, + 0x00, 0xC0, 0x01, 0x00, + 0x00, 0xC0, 0x01, 0x00, + 0x00, 0xC0, 0x01, 0x00, + 0x00, 0xC0, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l40.xbm b/app/bin/bitmaps/l40.xbm index f8d17da..8ee8e0f 100644 --- a/app/bin/bitmaps/l40.xbm +++ b/app/bin/bitmaps/l40.xbm @@ -1,6 +1,78 @@ -#define l40_width 14 -#define l40_height 16 -static char l40_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x18, - 0x92, 0x14, 0x91, 0x12, 0xBF, 0x11, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l40_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3F, + 0x78, 0x33, + 0x78, 0x33, + 0x7C, 0x33, + 0x6C, 0x33, + 0xFE, 0x33, + 0x60, 0x3F, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l40_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xE0, 0x39, 0x06, + 0xF0, 0x39, 0x06, + 0xF0, 0x39, 0x0E, + 0xF8, 0x39, 0x0E, + 0xD8, 0x39, 0x0E, + 0xDC, 0x39, 0x0E, + 0xCC, 0x39, 0x0E, + 0xFE, 0x3F, 0x06, + 0xC0, 0x39, 0x06, + 0xC0, 0x31, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l40_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0x80, 0x07, 0xFF, 0x00, + 0xC0, 0x07, 0xEF, 0x01, + 0xC0, 0x87, 0xC7, 0x01, + 0xE0, 0x87, 0xC3, 0x03, + 0xE0, 0x87, 0xC3, 0x03, + 0xF0, 0xC7, 0x83, 0x03, + 0x70, 0xC7, 0x83, 0x03, + 0x78, 0xC7, 0x83, 0x03, + 0x3C, 0xC7, 0x83, 0x03, + 0x3C, 0xC7, 0x83, 0x03, + 0x1E, 0xC7, 0x83, 0x03, + 0x0E, 0xC7, 0x83, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0xFF, 0x9F, 0xC3, 0x03, + 0x00, 0x87, 0xC3, 0x03, + 0x00, 0x87, 0xC7, 0x01, + 0x00, 0x07, 0xEF, 0x01, + 0x00, 0x07, 0xFF, 0x00, + 0x00, 0x07, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l41.xbm b/app/bin/bitmaps/l41.xbm index 2029d0a..8535fda 100644 --- a/app/bin/bitmaps/l41.xbm +++ b/app/bin/bitmaps/l41.xbm @@ -1,6 +1,78 @@ -#define l41_width 14 -#define l41_height 16 -static char l41_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x18, 0x06, 0x14, 0x05, - 0x92, 0x04, 0x11, 0x04, 0x3F, 0x04, 0x10, 0x04, 0x10, 0x04, 0x10, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l41_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1C, + 0x70, 0x1E, + 0x78, 0x1F, + 0x78, 0x1C, + 0x7C, 0x1C, + 0x6C, 0x1C, + 0xFE, 0x1C, + 0x60, 0x1C, + 0x60, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l41_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0x81, 0x03, + 0xC0, 0xC1, 0x03, + 0xE0, 0xC1, 0x03, + 0xE0, 0xE1, 0x03, + 0xF0, 0xB1, 0x03, + 0xF0, 0x81, 0x03, + 0xF8, 0x81, 0x03, + 0xD8, 0x81, 0x03, + 0xDC, 0x81, 0x03, + 0xCC, 0x81, 0x03, + 0xFE, 0x87, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l41_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x70, 0x00, + 0x80, 0x07, 0x70, 0x00, + 0xC0, 0x07, 0x78, 0x00, + 0xC0, 0x07, 0x7C, 0x00, + 0xE0, 0x07, 0x7E, 0x00, + 0xE0, 0x07, 0x7F, 0x00, + 0xF0, 0x07, 0x73, 0x00, + 0x70, 0x07, 0x70, 0x00, + 0x78, 0x07, 0x70, 0x00, + 0x3C, 0x07, 0x70, 0x00, + 0x3C, 0x07, 0x70, 0x00, + 0x1E, 0x07, 0x70, 0x00, + 0x0E, 0x07, 0x70, 0x00, + 0xFF, 0x1F, 0x70, 0x00, + 0xFF, 0x1F, 0x70, 0x00, + 0x00, 0x07, 0x70, 0x00, + 0x00, 0x07, 0x70, 0x00, + 0x00, 0x07, 0x70, 0x00, + 0x00, 0x07, 0x70, 0x00, + 0x00, 0x07, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l42.xbm b/app/bin/bitmaps/l42.xbm index b5be599..1b1b742 100644 --- a/app/bin/bitmaps/l42.xbm +++ b/app/bin/bitmaps/l42.xbm @@ -1,6 +1,78 @@ -#define l42_width 14 -#define l42_height 16 -static char l42_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, - 0x12, 0x08, 0x11, 0x04, 0x3F, 0x02, 0x10, 0x01, 0x90, 0x00, 0x90, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l42_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3F, + 0x78, 0x33, + 0x78, 0x30, + 0x7C, 0x38, + 0x6C, 0x1C, + 0xFE, 0x0E, + 0x60, 0x07, + 0x60, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l42_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x39, 0x06, + 0xE0, 0x39, 0x0E, + 0xF0, 0x01, 0x0E, + 0xF0, 0x01, 0x0E, + 0xF8, 0x01, 0x07, + 0xD8, 0x81, 0x07, + 0xDC, 0x81, 0x03, + 0xCC, 0xC1, 0x01, + 0xFE, 0xE7, 0x01, + 0xC0, 0xF1, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x79, 0x00, + 0xC0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l42_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFE, 0x00, + 0x80, 0x07, 0xFF, 0x01, + 0xC0, 0x87, 0xE7, 0x03, + 0xC0, 0x87, 0xC3, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0xF0, 0x07, 0x80, 0x03, + 0x70, 0x07, 0xC0, 0x03, + 0x78, 0x07, 0xC0, 0x03, + 0x3C, 0x07, 0xE0, 0x01, + 0x3C, 0x07, 0xF0, 0x01, + 0x1E, 0x07, 0xF8, 0x00, + 0x0E, 0x07, 0x78, 0x00, + 0xFF, 0x1F, 0x3C, 0x00, + 0xFF, 0x1F, 0x1E, 0x00, + 0x00, 0x07, 0x0F, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0xC7, 0xFF, 0x03, + 0x00, 0xC7, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l43.xbm b/app/bin/bitmaps/l43.xbm index 23ea804..1512650 100644 --- a/app/bin/bitmaps/l43.xbm +++ b/app/bin/bitmaps/l43.xbm @@ -1,6 +1,78 @@ -#define l43_width 14 -#define l43_height 16 -static char l43_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x14, 0x10, - 0x12, 0x10, 0x11, 0x0E, 0x3F, 0x10, 0x10, 0x10, 0x90, 0x10, 0x10, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l43_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3B, + 0x78, 0x38, + 0x78, 0x18, + 0x7C, 0x3C, + 0x6C, 0x38, + 0xFE, 0x33, + 0x60, 0x3F, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l43_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x39, 0x07, + 0xE0, 0x01, 0x07, + 0xF0, 0x01, 0x07, + 0xF0, 0x01, 0x07, + 0xF8, 0x81, 0x03, + 0xD8, 0xC1, 0x07, + 0xDC, 0x01, 0x07, + 0xCC, 0x01, 0x0E, + 0xFE, 0x07, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l43_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0x80, 0x07, 0xFF, 0x00, + 0xC0, 0x87, 0xE7, 0x01, + 0xC0, 0x87, 0xC7, 0x01, + 0xE0, 0x87, 0xC3, 0x03, + 0xE0, 0x07, 0xC0, 0x03, + 0xF0, 0x07, 0xC0, 0x01, + 0x70, 0x07, 0xE0, 0x01, + 0x78, 0x07, 0xFC, 0x00, + 0x3C, 0x07, 0xFC, 0x00, + 0x3C, 0x07, 0xE0, 0x01, + 0x1E, 0x07, 0xC0, 0x03, + 0x0E, 0x07, 0x80, 0x03, + 0xFF, 0x1F, 0x80, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0x00, 0xC7, 0x83, 0x03, + 0x00, 0x87, 0xC7, 0x03, + 0x00, 0x87, 0xE7, 0x01, + 0x00, 0x07, 0xFF, 0x01, + 0x00, 0x07, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l44.xbm b/app/bin/bitmaps/l44.xbm index f55e45c..7a96e04 100644 --- a/app/bin/bitmaps/l44.xbm +++ b/app/bin/bitmaps/l44.xbm @@ -1,6 +1,78 @@ -#define l44_width 14 -#define l44_height 16 -static char l44_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x18, 0x0C, 0x14, 0x0A, - 0x12, 0x09, 0x91, 0x08, 0xBF, 0x1F, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l44_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1C, + 0x70, 0x1C, + 0x78, 0x1E, + 0x78, 0x1E, + 0x7C, 0x1F, + 0x6C, 0x1B, + 0xFE, 0x3F, + 0x60, 0x18, + 0x60, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l44_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xE0, 0xC1, 0x03, + 0xE0, 0xC1, 0x03, + 0xF0, 0xE1, 0x03, + 0xF0, 0xE1, 0x03, + 0xF8, 0xF1, 0x03, + 0xD8, 0xB1, 0x03, + 0xDC, 0xB9, 0x03, + 0xCC, 0x99, 0x03, + 0xFE, 0xFF, 0x0F, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l44_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xF0, 0x00, + 0x80, 0x07, 0xF0, 0x00, + 0xC0, 0x07, 0xF8, 0x00, + 0xC0, 0x07, 0xF8, 0x00, + 0xE0, 0x07, 0xFC, 0x00, + 0xE0, 0x07, 0xFC, 0x00, + 0xF0, 0x07, 0xFE, 0x00, + 0x70, 0x07, 0xEE, 0x00, + 0x78, 0x07, 0xEF, 0x00, + 0x3C, 0x87, 0xE7, 0x00, + 0x3C, 0x87, 0xE7, 0x00, + 0x1E, 0xC7, 0xE3, 0x00, + 0x0E, 0xC7, 0xE1, 0x00, + 0xFF, 0xFF, 0xFF, 0x03, + 0xFF, 0xFF, 0xFF, 0x03, + 0x00, 0x07, 0xE0, 0x00, + 0x00, 0x07, 0xE0, 0x00, + 0x00, 0x07, 0xE0, 0x00, + 0x00, 0x07, 0xE0, 0x00, + 0x00, 0x07, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l45.xbm b/app/bin/bitmaps/l45.xbm index 8509e7c..d326cc1 100644 --- a/app/bin/bitmaps/l45.xbm +++ b/app/bin/bitmaps/l45.xbm @@ -1,6 +1,78 @@ -#define l45_width 14 -#define l45_height 16 -static char l45_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1F, 0x98, 0x00, 0x94, 0x00, - 0x92, 0x0F, 0x11, 0x10, 0x3F, 0x10, 0x10, 0x10, 0x90, 0x10, 0x10, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l45_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x3F, + 0x70, 0x07, + 0x78, 0x07, + 0x78, 0x1F, + 0x7C, 0x3B, + 0x6C, 0x30, + 0xFE, 0x33, + 0x60, 0x3F, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l45_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xF1, 0x07, + 0xC0, 0x71, 0x00, + 0xE0, 0x71, 0x00, + 0xE0, 0x31, 0x00, + 0xF0, 0x31, 0x00, + 0xF0, 0xF9, 0x03, + 0xF8, 0x79, 0x07, + 0xD8, 0x39, 0x07, + 0xDC, 0x01, 0x0E, + 0xCC, 0x01, 0x0E, + 0xFE, 0x07, 0x0E, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l45_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFF, 0x03, + 0x80, 0x07, 0xFF, 0x03, + 0xC0, 0x07, 0x07, 0x00, + 0xC0, 0x07, 0x07, 0x00, + 0xE0, 0x87, 0x07, 0x00, + 0xE0, 0x87, 0x07, 0x00, + 0xF0, 0x87, 0x7F, 0x00, + 0x70, 0x87, 0xFF, 0x01, + 0x78, 0x87, 0xE7, 0x01, + 0x3C, 0x87, 0xC3, 0x03, + 0x3C, 0x07, 0xC0, 0x03, + 0x1E, 0x07, 0x80, 0x03, + 0x0E, 0x07, 0x80, 0x03, + 0xFF, 0x1F, 0x80, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0x00, 0xC7, 0xC3, 0x03, + 0x00, 0x87, 0xC3, 0x03, + 0x00, 0x87, 0xE7, 0x01, + 0x00, 0x07, 0xFF, 0x00, + 0x00, 0x07, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l46.xbm b/app/bin/bitmaps/l46.xbm index 873164e..5313ab6 100644 --- a/app/bin/bitmaps/l46.xbm +++ b/app/bin/bitmaps/l46.xbm @@ -1,6 +1,78 @@ -#define l46_width 14 -#define l46_height 16 -static char l46_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x00, 0x94, 0x00, - 0x92, 0x0F, 0x91, 0x10, 0xBF, 0x10, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l46_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3F, + 0x78, 0x03, + 0x78, 0x1F, + 0x7C, 0x3F, + 0x6C, 0x33, + 0xFE, 0x33, + 0x60, 0x3F, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l46_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xE0, 0x39, 0x00, + 0xF0, 0x39, 0x00, + 0xF0, 0x39, 0x00, + 0xF8, 0xF9, 0x03, + 0xD8, 0x79, 0x07, + 0xDC, 0x39, 0x07, + 0xCC, 0x39, 0x0E, + 0xFE, 0x3F, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x31, 0x07, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l46_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0xFC, 0x00, + 0x80, 0x07, 0xFF, 0x01, + 0xC0, 0x07, 0xEF, 0x01, + 0xC0, 0x87, 0xC7, 0x03, + 0xE0, 0x87, 0xC3, 0x03, + 0xE0, 0x87, 0x03, 0x00, + 0xF0, 0xC7, 0x03, 0x00, + 0x70, 0xC7, 0x7F, 0x00, + 0x78, 0xC7, 0xFF, 0x01, + 0x3C, 0xC7, 0xEF, 0x01, + 0x3C, 0xC7, 0xC7, 0x03, + 0x1E, 0xC7, 0x83, 0x03, + 0x0E, 0xC7, 0x83, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0x00, 0x87, 0x83, 0x03, + 0x00, 0x87, 0xC7, 0x03, + 0x00, 0x87, 0xEF, 0x01, + 0x00, 0x07, 0xFF, 0x01, + 0x00, 0x07, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l47.xbm b/app/bin/bitmaps/l47.xbm index 61043f1..e635d03 100644 --- a/app/bin/bitmaps/l47.xbm +++ b/app/bin/bitmaps/l47.xbm @@ -1,6 +1,78 @@ -#define l47_width 14 -#define l47_height 16 -static char l47_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1F, 0x18, 0x10, 0x14, 0x08, - 0x12, 0x08, 0x11, 0x04, 0x3F, 0x04, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l47_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x3F, + 0x70, 0x38, + 0x78, 0x18, + 0x78, 0x1C, + 0x7C, 0x0C, + 0x6C, 0x0E, + 0xFE, 0x0E, + 0x60, 0x06, + 0x60, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l47_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xF9, 0x0F, + 0xC0, 0x01, 0x0F, + 0xE0, 0x01, 0x07, + 0xE0, 0x81, 0x03, + 0xF0, 0x81, 0x03, + 0xF0, 0xC1, 0x01, + 0xF8, 0xC1, 0x01, + 0xD8, 0xC1, 0x01, + 0xDC, 0xE1, 0x00, + 0xCC, 0xE1, 0x00, + 0xFE, 0xE7, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0xE1, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l47_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC7, 0xFF, 0x03, + 0x80, 0xC7, 0xFF, 0x03, + 0xC0, 0x07, 0xC0, 0x03, + 0xC0, 0x07, 0xE0, 0x01, + 0xE0, 0x07, 0xE0, 0x01, + 0xE0, 0x07, 0xF0, 0x00, + 0xF0, 0x07, 0xF0, 0x00, + 0x70, 0x07, 0x78, 0x00, + 0x78, 0x07, 0x78, 0x00, + 0x3C, 0x07, 0x38, 0x00, + 0x3C, 0x07, 0x3C, 0x00, + 0x1E, 0x07, 0x3C, 0x00, + 0x0E, 0x07, 0x1C, 0x00, + 0xFF, 0x1F, 0x1E, 0x00, + 0xFF, 0x1F, 0x1E, 0x00, + 0x00, 0x07, 0x1E, 0x00, + 0x00, 0x07, 0x1E, 0x00, + 0x00, 0x07, 0x0E, 0x00, + 0x00, 0x07, 0x0E, 0x00, + 0x00, 0x07, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l48.xbm b/app/bin/bitmaps/l48.xbm index 0a04953..977b660 100644 --- a/app/bin/bitmaps/l48.xbm +++ b/app/bin/bitmaps/l48.xbm @@ -1,6 +1,78 @@ -#define l48_width 14 -#define l48_height 16 -static char l48_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, - 0x92, 0x10, 0x11, 0x0F, 0xBF, 0x10, 0x90, 0x10, 0x90, 0x10, 0x10, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l48_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3F, + 0x78, 0x3B, + 0x78, 0x3F, + 0x7C, 0x1E, + 0x6C, 0x3F, + 0xFE, 0x33, + 0x60, 0x3F, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l48_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x03, + 0xC0, 0x71, 0x07, + 0xE0, 0x31, 0x07, + 0xE0, 0x39, 0x07, + 0xF0, 0x39, 0x07, + 0xF0, 0x39, 0x07, + 0xF8, 0x71, 0x07, + 0xD8, 0xE1, 0x03, + 0xDC, 0x71, 0x07, + 0xCC, 0x39, 0x06, + 0xFE, 0x3F, 0x0E, + 0xC0, 0x39, 0x0E, + 0xC0, 0x39, 0x06, + 0xC0, 0x71, 0x07, + 0xC0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l48_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0x80, 0x07, 0xFF, 0x00, + 0xC0, 0x87, 0xEF, 0x01, + 0xC0, 0x87, 0xC7, 0x01, + 0xE0, 0x87, 0xC3, 0x03, + 0xE0, 0x87, 0xC3, 0x03, + 0xF0, 0x87, 0xC7, 0x01, + 0x70, 0x07, 0xEF, 0x01, + 0x78, 0x07, 0xFE, 0x00, + 0x3C, 0x07, 0xFF, 0x00, + 0x3C, 0x87, 0xE7, 0x01, + 0x1E, 0x87, 0xC3, 0x03, + 0x0E, 0xC7, 0x83, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0xFF, 0xDF, 0x83, 0x03, + 0x00, 0xC7, 0x83, 0x03, + 0x00, 0x87, 0xC3, 0x03, + 0x00, 0x87, 0xE7, 0x01, + 0x00, 0x07, 0xFF, 0x01, + 0x00, 0x07, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l49.xbm b/app/bin/bitmaps/l49.xbm index 14b9914..e930612 100644 --- a/app/bin/bitmaps/l49.xbm +++ b/app/bin/bitmaps/l49.xbm @@ -1,6 +1,78 @@ -#define l49_width 14 -#define l49_height 16 -static char l49_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0F, 0x98, 0x10, 0x94, 0x10, - 0x92, 0x10, 0x11, 0x1F, 0x3F, 0x10, 0x10, 0x10, 0x10, 0x08, 0x10, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l49_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x70, 0x1E, + 0x70, 0x3F, + 0x78, 0x33, + 0x78, 0x33, + 0x7C, 0x3F, + 0x6C, 0x3E, + 0xFE, 0x30, + 0x60, 0x3B, + 0x60, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l49_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0xE1, 0x01, + 0xC0, 0x71, 0x07, + 0xE0, 0x39, 0x07, + 0xE0, 0x39, 0x06, + 0xF0, 0x39, 0x0E, + 0xF0, 0x39, 0x0E, + 0xF8, 0x39, 0x0F, + 0xD8, 0x71, 0x0F, + 0xDC, 0xE1, 0x0F, + 0xCC, 0x01, 0x0E, + 0xFE, 0x07, 0x06, + 0xC0, 0x01, 0x06, + 0xC0, 0x39, 0x07, + 0xC0, 0x71, 0x03, + 0xC0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l49_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x07, 0x7E, 0x00, + 0x80, 0x07, 0xFF, 0x00, + 0xC0, 0x87, 0xEF, 0x01, + 0xC0, 0x87, 0xC7, 0x01, + 0xE0, 0xC7, 0x83, 0x03, + 0xE0, 0xC7, 0x83, 0x03, + 0xF0, 0xC7, 0x83, 0x03, + 0x70, 0xC7, 0x83, 0x03, + 0x78, 0xC7, 0x83, 0x03, + 0x3C, 0x87, 0xC3, 0x03, + 0x3C, 0x87, 0xE7, 0x03, + 0x1E, 0x07, 0xFF, 0x03, + 0x0E, 0x07, 0xFE, 0x03, + 0xFF, 0x1F, 0x80, 0x03, + 0xFF, 0x1F, 0x80, 0x03, + 0x00, 0x87, 0xC3, 0x03, + 0x00, 0x87, 0xC3, 0x01, + 0x00, 0x87, 0xE7, 0x01, + 0x00, 0x07, 0xFF, 0x00, + 0x00, 0x07, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l5.xbm b/app/bin/bitmaps/l5.xbm index da409be..4d43af0 100644 --- a/app/bin/bitmaps/l5.xbm +++ b/app/bin/bitmaps/l5.xbm @@ -1,6 +1,78 @@ -#define l5_width 14 -#define l5_height 16 -static char l5_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x08, 0x00, 0x08, 0x00, - 0xF8, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x08, 0x01, 0xF0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l5_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xE0, 0x07, + 0xE0, 0x00, + 0xE0, 0x00, + 0xE0, 0x03, + 0x60, 0x07, + 0x00, 0x06, + 0x60, 0x06, + 0xE0, 0x07, + 0xC0, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l5_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x80, 0x3F, 0x00, + 0x80, 0x03, 0x00, + 0x80, 0x03, 0x00, + 0x80, 0x01, 0x00, + 0x80, 0x01, 0x00, + 0xC0, 0x1F, 0x00, + 0xC0, 0x3B, 0x00, + 0xC0, 0x39, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x70, 0x00, + 0xC0, 0x31, 0x00, + 0xC0, 0x39, 0x00, + 0x80, 0x3B, 0x00, + 0x00, 0x1F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l5_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFE, 0x07, 0x00, + 0x00, 0xFE, 0x07, 0x00, + 0x00, 0x0E, 0x00, 0x00, + 0x00, 0x0E, 0x00, 0x00, + 0x00, 0x0F, 0x00, 0x00, + 0x00, 0x0F, 0x00, 0x00, + 0x00, 0xFF, 0x00, 0x00, + 0x00, 0xFF, 0x03, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x87, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l50.xbm b/app/bin/bitmaps/l50.xbm index 981e2c8..834ab8f 100644 --- a/app/bin/bitmaps/l50.xbm +++ b/app/bin/bitmaps/l50.xbm @@ -1,6 +1,78 @@ -#define l50_width 14 -#define l50_height 16 -static char l50_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x18, - 0x9F, 0x14, 0xA0, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l50_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3F, + 0x1C, 0x33, + 0x7C, 0x33, + 0xEC, 0x33, + 0xC0, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l50_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x03, + 0x38, 0x70, 0x07, + 0x38, 0x30, 0x07, + 0x18, 0x38, 0x06, + 0x18, 0x38, 0x06, + 0xFC, 0x39, 0x0E, + 0xBC, 0x3B, 0x0E, + 0x9C, 0x3B, 0x0E, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x06, + 0x1C, 0x3B, 0x06, + 0x9C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l50_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0x7E, 0x00, + 0xF8, 0x1F, 0xFF, 0x00, + 0x38, 0x00, 0xEF, 0x01, + 0x38, 0x80, 0xC7, 0x01, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xC3, 0x03, + 0xFC, 0xC3, 0x83, 0x03, + 0xFC, 0xCF, 0x83, 0x03, + 0x3C, 0xCF, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x00, 0xDE, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9E, 0xC3, 0x03, + 0x1C, 0x9E, 0xC7, 0x01, + 0x3C, 0x0F, 0xEF, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l51.xbm b/app/bin/bitmaps/l51.xbm index ac2e9a2..8081e2f 100644 --- a/app/bin/bitmaps/l51.xbm +++ b/app/bin/bitmaps/l51.xbm @@ -1,6 +1,78 @@ -#define l51_width 14 -#define l51_height 16 -static char l51_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x04, 0x01, 0x06, 0x01, 0x05, - 0x9F, 0x04, 0x20, 0x04, 0x20, 0x04, 0x20, 0x04, 0x21, 0x04, 0x1E, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l51_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1C, + 0x1C, 0x1E, + 0x1C, 0x1F, + 0x7C, 0x1C, + 0xEC, 0x1C, + 0xC0, 0x1C, + 0xCC, 0x1C, + 0xFC, 0x1C, + 0x78, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l51_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0x83, 0x03, + 0x38, 0xC0, 0x03, + 0x38, 0xC0, 0x03, + 0x18, 0xE0, 0x03, + 0x18, 0xB0, 0x03, + 0xFC, 0x81, 0x03, + 0xBC, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0x00, 0x87, 0x03, + 0x00, 0x87, 0x03, + 0x00, 0x87, 0x03, + 0x1C, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l51_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0x70, 0x00, + 0xF8, 0x1F, 0x70, 0x00, + 0x38, 0x00, 0x78, 0x00, + 0x38, 0x00, 0x7C, 0x00, + 0x3C, 0x00, 0x7E, 0x00, + 0x3C, 0x00, 0x7F, 0x00, + 0xFC, 0x03, 0x73, 0x00, + 0xFC, 0x0F, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x00, 0x1E, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1E, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0xF0, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l52.xbm b/app/bin/bitmaps/l52.xbm index 266c9a4..1547b10 100644 --- a/app/bin/bitmaps/l52.xbm +++ b/app/bin/bitmaps/l52.xbm @@ -1,6 +1,78 @@ -#define l52_width 14 -#define l52_height 16 -static char l52_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x1F, 0x08, 0x20, 0x04, 0x20, 0x02, 0x20, 0x01, 0xA1, 0x00, 0x9E, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l52_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3F, + 0x1C, 0x33, + 0x7C, 0x30, + 0xEC, 0x38, + 0xC0, 0x1C, + 0xCC, 0x0E, + 0xFC, 0x07, + 0x78, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l52_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x03, + 0x38, 0x70, 0x07, + 0x38, 0x38, 0x06, + 0x18, 0x38, 0x0E, + 0x18, 0x00, 0x0E, + 0xFC, 0x01, 0x0E, + 0xBC, 0x03, 0x07, + 0x9C, 0x83, 0x07, + 0x00, 0x87, 0x03, + 0x00, 0xC7, 0x01, + 0x00, 0xE7, 0x01, + 0x1C, 0xF3, 0x00, + 0x9C, 0x73, 0x00, + 0xB8, 0x7B, 0x00, + 0xF0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l52_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0xFE, 0x00, + 0xF8, 0x1F, 0xFF, 0x01, + 0x38, 0x80, 0xE7, 0x03, + 0x38, 0x80, 0xC3, 0x03, + 0x3C, 0xC0, 0x83, 0x03, + 0x3C, 0xC0, 0x83, 0x03, + 0xFC, 0x03, 0x80, 0x03, + 0xFC, 0x0F, 0xC0, 0x03, + 0x3C, 0x0F, 0xC0, 0x03, + 0x1C, 0x1E, 0xE0, 0x01, + 0x00, 0x1E, 0xF0, 0x01, + 0x00, 0x1C, 0xF8, 0x00, + 0x00, 0x1C, 0x78, 0x00, + 0x00, 0x1C, 0x3C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1E, 0x0F, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x3C, 0x8F, 0x07, 0x00, + 0xF8, 0xC7, 0xFF, 0x03, + 0xF0, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l53.xbm b/app/bin/bitmaps/l53.xbm index 232b96c..a9620b9 100644 --- a/app/bin/bitmaps/l53.xbm +++ b/app/bin/bitmaps/l53.xbm @@ -1,6 +1,78 @@ -#define l53_width 14 -#define l53_height 16 -static char l53_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x01, 0x10, - 0x1F, 0x10, 0x20, 0x0E, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l53_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3B, + 0x1C, 0x38, + 0x7C, 0x18, + 0xEC, 0x3C, + 0xC0, 0x38, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l53_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x03, + 0x38, 0x70, 0x07, + 0x38, 0x38, 0x07, + 0x18, 0x00, 0x07, + 0x18, 0x00, 0x07, + 0xFC, 0x01, 0x07, + 0xBC, 0x83, 0x03, + 0x9C, 0xC3, 0x07, + 0x00, 0x07, 0x07, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x1C, 0x3B, 0x0E, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l53_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0x7E, 0x00, + 0xF8, 0x1F, 0xFF, 0x00, + 0x38, 0x80, 0xE7, 0x01, + 0x38, 0x80, 0xC7, 0x01, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x00, 0xC0, 0x03, + 0xFC, 0x03, 0xC0, 0x01, + 0xFC, 0x0F, 0xE0, 0x01, + 0x3C, 0x0F, 0xFC, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x00, 0x1E, 0xE0, 0x01, + 0x00, 0x1C, 0xC0, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDE, 0x83, 0x03, + 0x1C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l54.xbm b/app/bin/bitmaps/l54.xbm index e68e643..68a392e 100644 --- a/app/bin/bitmaps/l54.xbm +++ b/app/bin/bitmaps/l54.xbm @@ -1,6 +1,78 @@ -#define l54_width 14 -#define l54_height 16 -static char l54_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x08, 0x01, 0x0C, 0x01, 0x0A, - 0x1F, 0x09, 0xA0, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x21, 0x08, 0x1E, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l54_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1C, + 0x1C, 0x1C, + 0x1C, 0x1E, + 0x7C, 0x1E, + 0xEC, 0x1F, + 0xC0, 0x1B, + 0xCC, 0x3F, + 0xFC, 0x18, + 0x78, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l54_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0x83, 0x03, + 0x38, 0x80, 0x03, + 0x38, 0xC0, 0x03, + 0x18, 0xC0, 0x03, + 0x18, 0xE0, 0x03, + 0xFC, 0xE1, 0x03, + 0xBC, 0xF3, 0x03, + 0x9C, 0xB3, 0x03, + 0x00, 0xBF, 0x03, + 0x00, 0x9F, 0x03, + 0x00, 0xFF, 0x0F, + 0x1C, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l54_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0xF0, 0x00, + 0xF8, 0x1F, 0xF0, 0x00, + 0x38, 0x00, 0xF8, 0x00, + 0x38, 0x00, 0xF8, 0x00, + 0x3C, 0x00, 0xFC, 0x00, + 0x3C, 0x00, 0xFC, 0x00, + 0xFC, 0x03, 0xFE, 0x00, + 0xFC, 0x0F, 0xEE, 0x00, + 0x3C, 0x0F, 0xEF, 0x00, + 0x1C, 0x9E, 0xE7, 0x00, + 0x00, 0x9E, 0xE7, 0x00, + 0x00, 0xDC, 0xE3, 0x00, + 0x00, 0xDC, 0xE1, 0x00, + 0x00, 0xFC, 0xFF, 0x03, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1E, 0x1E, 0xE0, 0x00, + 0x1C, 0x1E, 0xE0, 0x00, + 0x3C, 0x0F, 0xE0, 0x00, + 0xF8, 0x07, 0xE0, 0x00, + 0xF0, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l55.xbm b/app/bin/bitmaps/l55.xbm index 6b29ef2..8c35927 100644 --- a/app/bin/bitmaps/l55.xbm +++ b/app/bin/bitmaps/l55.xbm @@ -1,6 +1,78 @@ -#define l55_width 14 -#define l55_height 16 -static char l55_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x81, 0x00, 0x81, 0x00, - 0x9F, 0x0F, 0x20, 0x10, 0x20, 0x10, 0x20, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l55_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x3F, + 0x1C, 0x07, + 0x1C, 0x07, + 0x7C, 0x1F, + 0xEC, 0x3B, + 0xC0, 0x30, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l55_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xF3, 0x07, + 0x38, 0x70, 0x00, + 0x38, 0x70, 0x00, + 0x18, 0x30, 0x00, + 0x18, 0x30, 0x00, + 0xFC, 0xF9, 0x03, + 0xBC, 0x7B, 0x07, + 0x9C, 0x3B, 0x07, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x1C, 0x3B, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l55_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0xFF, 0x03, + 0xF8, 0x1F, 0xFF, 0x03, + 0x38, 0x00, 0x07, 0x00, + 0x38, 0x00, 0x07, 0x00, + 0x3C, 0x80, 0x07, 0x00, + 0x3C, 0x80, 0x07, 0x00, + 0xFC, 0x83, 0x7F, 0x00, + 0xFC, 0x8F, 0xFF, 0x01, + 0x3C, 0x8F, 0xE7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDE, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l56.xbm b/app/bin/bitmaps/l56.xbm index 20eedef..e8f4d59 100644 --- a/app/bin/bitmaps/l56.xbm +++ b/app/bin/bitmaps/l56.xbm @@ -1,6 +1,78 @@ -#define l56_width 14 -#define l56_height 16 -static char l56_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x00, 0x81, 0x00, - 0x9F, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l56_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3F, + 0x1C, 0x03, + 0x7C, 0x1F, + 0xEC, 0x3F, + 0xC0, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l56_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x03, + 0x38, 0x70, 0x07, + 0x38, 0x30, 0x07, + 0x18, 0x38, 0x00, + 0x18, 0x38, 0x00, + 0xFC, 0x39, 0x00, + 0xBC, 0xFB, 0x03, + 0x9C, 0x7B, 0x07, + 0x00, 0x3F, 0x07, + 0x00, 0x3F, 0x0E, + 0x00, 0x3F, 0x0E, + 0x1C, 0x3B, 0x0E, + 0x9C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l56_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0xFC, 0x00, + 0xF8, 0x1F, 0xFF, 0x01, + 0x38, 0x00, 0xEF, 0x01, + 0x38, 0x80, 0xC7, 0x03, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0x03, 0x00, + 0xFC, 0xC3, 0x03, 0x00, + 0xFC, 0xCF, 0x7F, 0x00, + 0x3C, 0xCF, 0xFF, 0x01, + 0x1C, 0xDE, 0xEF, 0x01, + 0x00, 0xDE, 0xC7, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x9E, 0x83, 0x03, + 0x1C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xEF, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l57.xbm b/app/bin/bitmaps/l57.xbm index a9b7d42..5149c54 100644 --- a/app/bin/bitmaps/l57.xbm +++ b/app/bin/bitmaps/l57.xbm @@ -1,6 +1,78 @@ -#define l57_width 14 -#define l57_height 16 -static char l57_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x01, 0x10, 0x01, 0x08, - 0x1F, 0x08, 0x20, 0x04, 0x20, 0x04, 0x20, 0x02, 0x21, 0x02, 0x1E, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l57_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x3F, + 0x1C, 0x38, + 0x1C, 0x18, + 0x7C, 0x1C, + 0xEC, 0x0C, + 0xC0, 0x0E, + 0xCC, 0x0E, + 0xFC, 0x06, + 0x78, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l57_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xFB, 0x0F, + 0x38, 0x00, 0x0F, + 0x38, 0x00, 0x07, + 0x18, 0x80, 0x03, + 0x18, 0x80, 0x03, + 0xFC, 0xC1, 0x01, + 0xBC, 0xC3, 0x01, + 0x9C, 0xC3, 0x01, + 0x00, 0xE7, 0x00, + 0x00, 0xE7, 0x00, + 0x00, 0xE7, 0x00, + 0x1C, 0xE3, 0x00, + 0x9C, 0xE3, 0x00, + 0xB8, 0x73, 0x00, + 0xF0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l57_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xDF, 0xFF, 0x03, + 0xF8, 0xDF, 0xFF, 0x03, + 0x38, 0x00, 0xC0, 0x03, + 0x38, 0x00, 0xE0, 0x01, + 0x3C, 0x00, 0xE0, 0x01, + 0x3C, 0x00, 0xF0, 0x00, + 0xFC, 0x03, 0xF0, 0x00, + 0xFC, 0x0F, 0x78, 0x00, + 0x3C, 0x0F, 0x78, 0x00, + 0x1C, 0x1E, 0x38, 0x00, + 0x00, 0x1E, 0x3C, 0x00, + 0x00, 0x1C, 0x3C, 0x00, + 0x00, 0x1C, 0x1C, 0x00, + 0x00, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1E, 0x1E, 0x00, + 0x1C, 0x1E, 0x1E, 0x00, + 0x3C, 0x0F, 0x0E, 0x00, + 0xF8, 0x07, 0x0E, 0x00, + 0xF0, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l58.xbm b/app/bin/bitmaps/l58.xbm index 01fb1bd..3fe4ad7 100644 --- a/app/bin/bitmaps/l58.xbm +++ b/app/bin/bitmaps/l58.xbm @@ -1,6 +1,78 @@ -#define l58_width 14 -#define l58_height 16 -static char l58_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x9F, 0x10, 0x20, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l58_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3F, + 0x1C, 0x3B, + 0x7C, 0x3F, + 0xEC, 0x1E, + 0xC0, 0x3F, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l58_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x03, + 0x38, 0x70, 0x07, + 0x38, 0x30, 0x07, + 0x18, 0x38, 0x07, + 0x18, 0x38, 0x07, + 0xFC, 0x39, 0x07, + 0xBC, 0x73, 0x07, + 0x9C, 0xE3, 0x03, + 0x00, 0x77, 0x07, + 0x00, 0x3F, 0x06, + 0x00, 0x3F, 0x0E, + 0x1C, 0x3B, 0x0E, + 0x9C, 0x3B, 0x06, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l58_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0x7E, 0x00, + 0xF8, 0x1F, 0xFF, 0x00, + 0x38, 0x80, 0xEF, 0x01, + 0x38, 0x80, 0xC7, 0x01, + 0x3C, 0x80, 0xC3, 0x03, + 0x3C, 0x80, 0xC3, 0x03, + 0xFC, 0x83, 0xC7, 0x01, + 0xFC, 0x0F, 0xEF, 0x01, + 0x3C, 0x0F, 0xFE, 0x00, + 0x1C, 0x1E, 0xFF, 0x00, + 0x00, 0x9E, 0xE7, 0x01, + 0x00, 0x9C, 0xC3, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDE, 0x83, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l59.xbm b/app/bin/bitmaps/l59.xbm index 8f5b367..9459753 100644 --- a/app/bin/bitmaps/l59.xbm +++ b/app/bin/bitmaps/l59.xbm @@ -1,6 +1,78 @@ -#define l59_width 14 -#define l59_height 16 -static char l59_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x9F, 0x10, 0x20, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x21, 0x08, 0x1E, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l59_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0x1C, 0x3F, + 0x1C, 0x33, + 0x7C, 0x33, + 0xEC, 0x3F, + 0xC0, 0x3E, + 0xCC, 0x30, + 0xFC, 0x3B, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l59_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF8, 0xE3, 0x01, + 0x38, 0x70, 0x07, + 0x38, 0x38, 0x07, + 0x18, 0x38, 0x06, + 0x18, 0x38, 0x0E, + 0xFC, 0x39, 0x0E, + 0xBC, 0x3B, 0x0F, + 0x9C, 0x73, 0x0F, + 0x00, 0xE7, 0x0F, + 0x00, 0x07, 0x0E, + 0x00, 0x07, 0x06, + 0x1C, 0x03, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x03, + 0xF0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l59_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x1F, 0x7E, 0x00, + 0xF8, 0x1F, 0xFF, 0x00, + 0x38, 0x80, 0xEF, 0x01, + 0x38, 0x80, 0xC7, 0x01, + 0x3C, 0xC0, 0x83, 0x03, + 0x3C, 0xC0, 0x83, 0x03, + 0xFC, 0xC3, 0x83, 0x03, + 0xFC, 0xCF, 0x83, 0x03, + 0x3C, 0xCF, 0x83, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x00, 0x9E, 0xE7, 0x03, + 0x00, 0x1C, 0xFF, 0x03, + 0x00, 0x1C, 0xFE, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x9E, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x01, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l6.xbm b/app/bin/bitmaps/l6.xbm index 89efd19..325c80c 100644 --- a/app/bin/bitmaps/l6.xbm +++ b/app/bin/bitmaps/l6.xbm @@ -1,6 +1,78 @@ -#define l6_width 14 -#define l6_height 16 -static char l6_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x00, 0x08, 0x00, - 0xF8, 0x00, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l6_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xC0, 0x03, + 0xE0, 0x07, + 0x60, 0x00, + 0xE0, 0x03, + 0xE0, 0x07, + 0x60, 0x06, + 0x60, 0x06, + 0xE0, 0x07, + 0xC0, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l6_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x3B, 0x00, + 0x80, 0x39, 0x00, + 0xC0, 0x01, 0x00, + 0xC0, 0x01, 0x00, + 0xC0, 0x01, 0x00, + 0xC0, 0x1F, 0x00, + 0xC0, 0x3B, 0x00, + 0xC0, 0x39, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0x80, 0x39, 0x00, + 0x80, 0x3B, 0x00, + 0x00, 0x1F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l6_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0xFE, 0x03, 0x00, + 0x00, 0xDE, 0x03, 0x00, + 0x00, 0x8F, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x07, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, + 0x80, 0xFF, 0x00, 0x00, + 0x80, 0xFF, 0x03, 0x00, + 0x80, 0xDF, 0x03, 0x00, + 0x80, 0x8F, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x00, 0x07, 0x07, 0x00, + 0x00, 0x8F, 0x07, 0x00, + 0x00, 0xDF, 0x03, 0x00, + 0x00, 0xFE, 0x03, 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, }; + diff --git a/app/bin/bitmaps/l60.xbm b/app/bin/bitmaps/l60.xbm index 29692e4..11b9cc7 100644 --- a/app/bin/bitmaps/l60.xbm +++ b/app/bin/bitmaps/l60.xbm @@ -1,6 +1,78 @@ -#define l60_width 14 -#define l60_height 16 -static char l60_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x18, - 0x9F, 0x14, 0xA1, 0x12, 0xA1, 0x11, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l60_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0x0C, 0x33, + 0x7C, 0x33, + 0xFC, 0x33, + 0xCC, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l60_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x1C, 0x38, 0x06, + 0x1C, 0x38, 0x06, + 0x1C, 0x38, 0x0E, + 0xFC, 0x39, 0x0E, + 0xBC, 0x3B, 0x0E, + 0x9C, 0x3B, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x06, + 0x1C, 0x3F, 0x06, + 0x98, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l60_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x78, 0x0F, 0xEF, 0x01, + 0x3C, 0x9E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x80, 0xC3, 0x03, + 0x1E, 0xC0, 0x83, 0x03, + 0xFE, 0xC3, 0x83, 0x03, + 0xFE, 0xCF, 0x83, 0x03, + 0x7E, 0xCF, 0x83, 0x03, + 0x3E, 0xDE, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1C, 0x9C, 0xC3, 0x03, + 0x3C, 0x9E, 0xC7, 0x01, + 0x7C, 0x0F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xE0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l61.xbm b/app/bin/bitmaps/l61.xbm index 22973a9..1983790 100644 --- a/app/bin/bitmaps/l61.xbm +++ b/app/bin/bitmaps/l61.xbm @@ -1,6 +1,78 @@ -#define l61_width 14 -#define l61_height 16 -static char l61_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x01, 0x06, 0x01, 0x05, - 0x9F, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x1E, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l61_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1E, + 0x0C, 0x1F, + 0x7C, 0x1C, + 0xFC, 0x1C, + 0xCC, 0x1C, + 0xCC, 0x1C, + 0xFC, 0x1C, + 0x78, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l61_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0xC3, 0x03, + 0x98, 0xC3, 0x03, + 0x1C, 0xE0, 0x03, + 0x1C, 0xB0, 0x03, + 0x1C, 0x80, 0x03, + 0xFC, 0x81, 0x03, + 0xBC, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0x1C, 0x87, 0x03, + 0x1C, 0x87, 0x03, + 0x1C, 0x87, 0x03, + 0x98, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l61_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0x70, 0x00, + 0xF8, 0x0F, 0x70, 0x00, + 0x78, 0x0F, 0x78, 0x00, + 0x3C, 0x1E, 0x7C, 0x00, + 0x1C, 0x1E, 0x7E, 0x00, + 0x1C, 0x00, 0x7F, 0x00, + 0x1E, 0x00, 0x73, 0x00, + 0xFE, 0x03, 0x70, 0x00, + 0xFE, 0x0F, 0x70, 0x00, + 0x7E, 0x0F, 0x70, 0x00, + 0x3E, 0x1E, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1C, 0x1C, 0x70, 0x00, + 0x3C, 0x1E, 0x70, 0x00, + 0x7C, 0x0F, 0x70, 0x00, + 0xF8, 0x0F, 0x70, 0x00, + 0xE0, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l62.xbm b/app/bin/bitmaps/l62.xbm index 0447b20..93573ec 100644 --- a/app/bin/bitmaps/l62.xbm +++ b/app/bin/bitmaps/l62.xbm @@ -1,6 +1,78 @@ -#define l62_width 14 -#define l62_height 16 -static char l62_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x1F, 0x08, 0x21, 0x04, 0x21, 0x02, 0x21, 0x01, 0xA1, 0x00, 0x9E, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l62_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0x0C, 0x33, + 0x7C, 0x30, + 0xFC, 0x38, + 0xCC, 0x1C, + 0xCC, 0x0E, + 0xFC, 0x07, + 0x78, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l62_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x06, + 0x1C, 0x38, 0x0E, + 0x1C, 0x00, 0x0E, + 0x1C, 0x00, 0x0E, + 0xFC, 0x01, 0x07, + 0xBC, 0x83, 0x07, + 0x9C, 0x83, 0x03, + 0x1C, 0xC7, 0x01, + 0x1C, 0xE7, 0x01, + 0x1C, 0xF7, 0x00, + 0x98, 0x73, 0x00, + 0xB8, 0x7B, 0x00, + 0xF0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l62_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0xFE, 0x00, + 0xF8, 0x0F, 0xFF, 0x01, + 0x78, 0x8F, 0xE7, 0x03, + 0x3C, 0x9E, 0xC3, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0xC0, 0x83, 0x03, + 0x1E, 0x00, 0x80, 0x03, + 0xFE, 0x03, 0xC0, 0x03, + 0xFE, 0x0F, 0xC0, 0x03, + 0x7E, 0x0F, 0xE0, 0x01, + 0x3E, 0x1E, 0xF0, 0x01, + 0x1E, 0x1C, 0xF8, 0x00, + 0x1E, 0x1C, 0x78, 0x00, + 0x1E, 0x1C, 0x3C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1C, 0x1C, 0x0F, 0x00, + 0x3C, 0x9E, 0x07, 0x00, + 0x7C, 0x8F, 0x07, 0x00, + 0xF8, 0xCF, 0xFF, 0x03, + 0xE0, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l63.xbm b/app/bin/bitmaps/l63.xbm index 8fb46f9..6b95b4d 100644 --- a/app/bin/bitmaps/l63.xbm +++ b/app/bin/bitmaps/l63.xbm @@ -1,6 +1,78 @@ -#define l63_width 14 -#define l63_height 16 -static char l63_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x01, 0x10, - 0x1F, 0x10, 0x21, 0x0E, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l63_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3B, + 0x0C, 0x38, + 0x7C, 0x18, + 0xFC, 0x3C, + 0xCC, 0x38, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l63_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x07, + 0x1C, 0x00, 0x07, + 0x1C, 0x00, 0x07, + 0x1C, 0x00, 0x07, + 0xFC, 0x81, 0x03, + 0xBC, 0xC3, 0x07, + 0x9C, 0x03, 0x07, + 0x1C, 0x07, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x98, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l63_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x78, 0x8F, 0xE7, 0x01, + 0x3C, 0x9E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x00, 0xC0, 0x03, + 0x1E, 0x00, 0xC0, 0x01, + 0xFE, 0x03, 0xE0, 0x01, + 0xFE, 0x0F, 0xFC, 0x00, + 0x7E, 0x0F, 0xFC, 0x00, + 0x3E, 0x1E, 0xE0, 0x01, + 0x1E, 0x1C, 0xC0, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0xDC, 0x83, 0x03, + 0x3C, 0x9E, 0xC7, 0x03, + 0x7C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xE0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l64.xbm b/app/bin/bitmaps/l64.xbm index 8fec658..e2a6cc5 100644 --- a/app/bin/bitmaps/l64.xbm +++ b/app/bin/bitmaps/l64.xbm @@ -1,6 +1,78 @@ -#define l64_width 14 -#define l64_height 16 -static char l64_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x01, 0x0C, 0x01, 0x0A, - 0x1F, 0x09, 0xA1, 0x08, 0xA1, 0x1F, 0x21, 0x08, 0x21, 0x08, 0x1E, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l64_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1C, + 0x0C, 0x1E, + 0x7C, 0x1E, + 0xFC, 0x1F, + 0xCC, 0x1B, + 0xCC, 0x3F, + 0xFC, 0x18, + 0x78, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l64_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0x83, 0x03, + 0x98, 0xC3, 0x03, + 0x1C, 0xC0, 0x03, + 0x1C, 0xE0, 0x03, + 0x1C, 0xE0, 0x03, + 0xFC, 0xF1, 0x03, + 0xBC, 0xB3, 0x03, + 0x9C, 0xBB, 0x03, + 0x1C, 0x9F, 0x03, + 0x1C, 0xFF, 0x0F, + 0x1C, 0x87, 0x03, + 0x98, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l64_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0xF0, 0x00, + 0xF8, 0x0F, 0xF0, 0x00, + 0x78, 0x0F, 0xF8, 0x00, + 0x3C, 0x1E, 0xF8, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x1C, 0x00, 0xFC, 0x00, + 0x1E, 0x00, 0xFE, 0x00, + 0xFE, 0x03, 0xEE, 0x00, + 0xFE, 0x0F, 0xEF, 0x00, + 0x7E, 0x8F, 0xE7, 0x00, + 0x3E, 0x9E, 0xE7, 0x00, + 0x1E, 0xDC, 0xE3, 0x00, + 0x1E, 0xDC, 0xE1, 0x00, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1C, 0x1C, 0xE0, 0x00, + 0x3C, 0x1E, 0xE0, 0x00, + 0x7C, 0x0F, 0xE0, 0x00, + 0xF8, 0x0F, 0xE0, 0x00, + 0xE0, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l65.xbm b/app/bin/bitmaps/l65.xbm index 34b6f4a..3ab1ce6 100644 --- a/app/bin/bitmaps/l65.xbm +++ b/app/bin/bitmaps/l65.xbm @@ -1,6 +1,78 @@ -#define l65_width 14 -#define l65_height 16 -static char l65_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x81, 0x00, 0x81, 0x00, - 0x9F, 0x0F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l65_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x07, + 0x0C, 0x07, + 0x7C, 0x1F, + 0xFC, 0x3B, + 0xCC, 0x30, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l65_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF1, 0x07, + 0xB8, 0x73, 0x00, + 0x98, 0x73, 0x00, + 0x1C, 0x30, 0x00, + 0x1C, 0x30, 0x00, + 0x1C, 0xF8, 0x03, + 0xFC, 0x79, 0x07, + 0xBC, 0x3B, 0x07, + 0x9C, 0x03, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x3F, 0x06, + 0x98, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l65_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0xFF, 0x03, + 0xF8, 0x0F, 0xFF, 0x03, + 0x78, 0x0F, 0x07, 0x00, + 0x3C, 0x1E, 0x07, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x1C, 0x80, 0x07, 0x00, + 0x1E, 0x80, 0x7F, 0x00, + 0xFE, 0x83, 0xFF, 0x01, + 0xFE, 0x8F, 0xE7, 0x01, + 0x7E, 0x8F, 0xC3, 0x03, + 0x3E, 0x1E, 0xC0, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0xDC, 0xC3, 0x03, + 0x3C, 0x9E, 0xC3, 0x03, + 0x7C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xE0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l66.xbm b/app/bin/bitmaps/l66.xbm index 1e28cf3..1abbf7c 100644 --- a/app/bin/bitmaps/l66.xbm +++ b/app/bin/bitmaps/l66.xbm @@ -1,6 +1,78 @@ -#define l66_width 14 -#define l66_height 16 -static char l66_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x00, 0x81, 0x00, - 0x9F, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l66_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0x0C, 0x03, + 0x7C, 0x1F, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l66_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x1C, 0x38, 0x00, + 0x1C, 0x38, 0x00, + 0x1C, 0x38, 0x00, + 0xFC, 0xF9, 0x03, + 0xBC, 0x7B, 0x07, + 0x9C, 0x3B, 0x07, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x98, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l66_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0xFC, 0x00, + 0xF8, 0x0F, 0xFF, 0x01, + 0x78, 0x0F, 0xEF, 0x01, + 0x3C, 0x9E, 0xC7, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x80, 0x03, 0x00, + 0x1E, 0xC0, 0x03, 0x00, + 0xFE, 0xC3, 0x7F, 0x00, + 0xFE, 0xCF, 0xFF, 0x01, + 0x7E, 0xCF, 0xEF, 0x01, + 0x3E, 0xDE, 0xC7, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0x9C, 0x83, 0x03, + 0x3C, 0x9E, 0xC7, 0x03, + 0x7C, 0x8F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xE0, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l67.xbm b/app/bin/bitmaps/l67.xbm index bbc56bf..8cce97c 100644 --- a/app/bin/bitmaps/l67.xbm +++ b/app/bin/bitmaps/l67.xbm @@ -1,6 +1,78 @@ -#define l67_width 14 -#define l67_height 16 -static char l67_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x01, 0x10, 0x01, 0x08, - 0x1F, 0x08, 0x21, 0x04, 0x21, 0x04, 0x21, 0x02, 0x21, 0x02, 0x1E, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l67_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x38, + 0x0C, 0x18, + 0x7C, 0x1C, + 0xFC, 0x0C, + 0xCC, 0x0E, + 0xCC, 0x0E, + 0xFC, 0x06, + 0x78, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l67_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF9, 0x0F, + 0xB8, 0x03, 0x0F, + 0x98, 0x03, 0x07, + 0x1C, 0x80, 0x03, + 0x1C, 0x80, 0x03, + 0x1C, 0xC0, 0x01, + 0xFC, 0xC1, 0x01, + 0xBC, 0xC3, 0x01, + 0x9C, 0xE3, 0x00, + 0x1C, 0xE7, 0x00, + 0x1C, 0xE7, 0x00, + 0x1C, 0xE7, 0x00, + 0x98, 0xE3, 0x00, + 0xB8, 0x73, 0x00, + 0xF0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l67_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0xC7, 0xFF, 0x03, + 0xF8, 0xCF, 0xFF, 0x03, + 0x78, 0x0F, 0xC0, 0x03, + 0x3C, 0x1E, 0xE0, 0x01, + 0x1C, 0x1E, 0xE0, 0x01, + 0x1C, 0x00, 0xF0, 0x00, + 0x1E, 0x00, 0xF0, 0x00, + 0xFE, 0x03, 0x78, 0x00, + 0xFE, 0x0F, 0x78, 0x00, + 0x7E, 0x0F, 0x38, 0x00, + 0x3E, 0x1E, 0x3C, 0x00, + 0x1E, 0x1C, 0x3C, 0x00, + 0x1E, 0x1C, 0x1C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1C, 0x1C, 0x1E, 0x00, + 0x3C, 0x1E, 0x1E, 0x00, + 0x7C, 0x0F, 0x0E, 0x00, + 0xF8, 0x0F, 0x0E, 0x00, + 0xE0, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l68.xbm b/app/bin/bitmaps/l68.xbm index db31fa9..e32b8c2 100644 --- a/app/bin/bitmaps/l68.xbm +++ b/app/bin/bitmaps/l68.xbm @@ -1,6 +1,78 @@ -#define l68_width 14 -#define l68_height 16 -static char l68_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x9F, 0x10, 0x21, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l68_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0x0C, 0x3B, + 0x7C, 0x3F, + 0xFC, 0x1E, + 0xCC, 0x3F, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l68_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x1C, 0x38, 0x07, + 0x1C, 0x38, 0x07, + 0x1C, 0x38, 0x07, + 0xFC, 0x71, 0x07, + 0xBC, 0xE3, 0x03, + 0x9C, 0x73, 0x07, + 0x1C, 0x3F, 0x06, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x98, 0x3B, 0x06, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l68_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x78, 0x8F, 0xEF, 0x01, + 0x3C, 0x9E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x80, 0xC3, 0x03, + 0x1E, 0x80, 0xC7, 0x01, + 0xFE, 0x03, 0xEF, 0x01, + 0xFE, 0x0F, 0xFE, 0x00, + 0x7E, 0x0F, 0xFF, 0x00, + 0x3E, 0x9E, 0xE7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0xDC, 0x83, 0x03, + 0x3C, 0x9E, 0xC3, 0x03, + 0x7C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xE0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l69.xbm b/app/bin/bitmaps/l69.xbm index 2d79bc7..8df10ca 100644 --- a/app/bin/bitmaps/l69.xbm +++ b/app/bin/bitmaps/l69.xbm @@ -1,6 +1,78 @@ -#define l69_width 14 -#define l69_height 16 -static char l69_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x81, 0x10, 0x81, 0x10, - 0x9F, 0x10, 0x21, 0x1F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x08, 0x1E, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l69_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0x0C, 0x33, + 0x7C, 0x33, + 0xFC, 0x3F, + 0xCC, 0x3E, + 0xCC, 0x30, + 0xFC, 0x3B, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l69_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x01, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x07, + 0x1C, 0x38, 0x06, + 0x1C, 0x38, 0x0E, + 0x1C, 0x38, 0x0E, + 0xFC, 0x39, 0x0F, + 0xBC, 0x73, 0x0F, + 0x9C, 0xE3, 0x0F, + 0x1C, 0x07, 0x0E, + 0x1C, 0x07, 0x06, + 0x1C, 0x07, 0x06, + 0x98, 0x3B, 0x07, + 0xB8, 0x73, 0x03, + 0xF0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l69_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x07, 0x7E, 0x00, + 0xF8, 0x0F, 0xFF, 0x00, + 0x78, 0x8F, 0xEF, 0x01, + 0x3C, 0x9E, 0xC7, 0x01, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0xC0, 0x83, 0x03, + 0x1E, 0xC0, 0x83, 0x03, + 0xFE, 0xC3, 0x83, 0x03, + 0xFE, 0xCF, 0x83, 0x03, + 0x7E, 0x8F, 0xC3, 0x03, + 0x3E, 0x9E, 0xE7, 0x03, + 0x1E, 0x1C, 0xFF, 0x03, + 0x1E, 0x1C, 0xFE, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1C, 0x9C, 0xC3, 0x03, + 0x3C, 0x9E, 0xC3, 0x01, + 0x7C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xE0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l7.xbm b/app/bin/bitmaps/l7.xbm index 28b2698..a86a7cc 100644 --- a/app/bin/bitmaps/l7.xbm +++ b/app/bin/bitmaps/l7.xbm @@ -1,6 +1,78 @@ -#define l7_width 14 -#define l7_height 16 -static char l7_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x01, 0x80, 0x00, - 0x80, 0x00, 0x40, 0x00, 0x40, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l7_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xE0, 0x07, + 0x00, 0x07, + 0x00, 0x03, + 0x80, 0x03, + 0x80, 0x01, + 0xC0, 0x01, + 0xC0, 0x01, + 0xC0, 0x00, + 0xC0, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l7_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xC0, 0x7F, 0x00, + 0x00, 0x78, 0x00, + 0x00, 0x38, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x1C, 0x00, + 0x00, 0x0E, 0x00, + 0x00, 0x0E, 0x00, + 0x00, 0x0E, 0x00, + 0x00, 0x07, 0x00, + 0x00, 0x07, 0x00, + 0x00, 0x07, 0x00, + 0x00, 0x07, 0x00, + 0x00, 0x07, 0x00, + 0x80, 0x03, 0x00, + 0x80, 0x03, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l7_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xFF, 0x07, 0x00, + 0x80, 0xFF, 0x07, 0x00, + 0x00, 0x80, 0x07, 0x00, + 0x00, 0xC0, 0x03, 0x00, + 0x00, 0xC0, 0x03, 0x00, + 0x00, 0xE0, 0x01, 0x00, + 0x00, 0xE0, 0x01, 0x00, + 0x00, 0xF0, 0x00, 0x00, + 0x00, 0xF0, 0x00, 0x00, + 0x00, 0x70, 0x00, 0x00, + 0x00, 0x78, 0x00, 0x00, + 0x00, 0x78, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, + 0x00, 0x3C, 0x00, 0x00, + 0x00, 0x3C, 0x00, 0x00, + 0x00, 0x3C, 0x00, 0x00, + 0x00, 0x3C, 0x00, 0x00, + 0x00, 0x1C, 0x00, 0x00, + 0x00, 0x1C, 0x00, 0x00, + 0x00, 0x1C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l70.xbm b/app/bin/bitmaps/l70.xbm index 16b4c70..cfa65e6 100644 --- a/app/bin/bitmaps/l70.xbm +++ b/app/bin/bitmaps/l70.xbm @@ -1,6 +1,78 @@ -#define l70_width 14 -#define l70_height 16 -static char l70_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x18, - 0x90, 0x14, 0x88, 0x12, 0x88, 0x11, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l70_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3F, + 0x60, 0x33, + 0x70, 0x33, + 0x30, 0x33, + 0x38, 0x33, + 0x38, 0x33, + 0x18, 0x3F, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l70_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x03, + 0x80, 0x77, 0x07, + 0x80, 0x33, 0x07, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x06, + 0xE0, 0x38, 0x0E, + 0xE0, 0x38, 0x0E, + 0xE0, 0x38, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x06, + 0x70, 0x38, 0x06, + 0x70, 0x30, 0x07, + 0x38, 0x70, 0x07, + 0x38, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l70_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0xFE, 0x1F, 0xFF, 0x00, + 0x00, 0x1E, 0xEF, 0x01, + 0x00, 0x8F, 0xC7, 0x01, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x87, 0xC3, 0x03, + 0x80, 0xC7, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xC0, 0xC1, 0x83, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xE0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0xF0, 0x80, 0xC7, 0x01, + 0x70, 0x00, 0xEF, 0x01, + 0x70, 0x00, 0xFF, 0x00, + 0x70, 0x00, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l71.xbm b/app/bin/bitmaps/l71.xbm index 12223f5..eeb2d63 100644 --- a/app/bin/bitmaps/l71.xbm +++ b/app/bin/bitmaps/l71.xbm @@ -1,6 +1,78 @@ -#define l71_width 14 -#define l71_height 16 -static char l71_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x04, 0x20, 0x06, 0x10, 0x05, - 0x90, 0x04, 0x08, 0x04, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l71_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1C, + 0xE0, 0x1E, + 0x60, 0x1F, + 0x70, 0x1C, + 0x30, 0x1C, + 0x38, 0x1C, + 0x38, 0x1C, + 0x18, 0x1C, + 0x18, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l71_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0x87, 0x03, + 0x80, 0xC7, 0x03, + 0x80, 0xC3, 0x03, + 0xC0, 0xE1, 0x03, + 0xC0, 0xB1, 0x03, + 0xE0, 0x80, 0x03, + 0xE0, 0x80, 0x03, + 0xE0, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l71_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0x70, 0x00, + 0xFE, 0x1F, 0x70, 0x00, + 0x00, 0x1E, 0x78, 0x00, + 0x00, 0x0F, 0x7C, 0x00, + 0x00, 0x0F, 0x7E, 0x00, + 0x80, 0x07, 0x7F, 0x00, + 0x80, 0x07, 0x73, 0x00, + 0xC0, 0x03, 0x70, 0x00, + 0xC0, 0x03, 0x70, 0x00, + 0xC0, 0x01, 0x70, 0x00, + 0xE0, 0x01, 0x70, 0x00, + 0xE0, 0x01, 0x70, 0x00, + 0xE0, 0x00, 0x70, 0x00, + 0xF0, 0x00, 0x70, 0x00, + 0xF0, 0x00, 0x70, 0x00, + 0xF0, 0x00, 0x70, 0x00, + 0xF0, 0x00, 0x70, 0x00, + 0x70, 0x00, 0x70, 0x00, + 0x70, 0x00, 0x70, 0x00, + 0x70, 0x00, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l72.xbm b/app/bin/bitmaps/l72.xbm index 164f621..9ff206f 100644 --- a/app/bin/bitmaps/l72.xbm +++ b/app/bin/bitmaps/l72.xbm @@ -1,6 +1,78 @@ -#define l72_width 14 -#define l72_height 16 -static char l72_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, - 0x10, 0x08, 0x08, 0x04, 0x08, 0x02, 0x04, 0x01, 0x84, 0x00, 0x84, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l72_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3F, + 0x60, 0x33, + 0x70, 0x30, + 0x30, 0x38, + 0x38, 0x1C, + 0x38, 0x0E, + 0x18, 0x07, + 0x18, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l72_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x03, + 0x80, 0x77, 0x07, + 0x80, 0x3B, 0x06, + 0xC0, 0x39, 0x0E, + 0xC0, 0x01, 0x0E, + 0xE0, 0x00, 0x0E, + 0xE0, 0x00, 0x07, + 0xE0, 0x80, 0x07, + 0x70, 0x80, 0x03, + 0x70, 0xC0, 0x01, + 0x70, 0xE0, 0x01, + 0x70, 0xF0, 0x00, + 0x70, 0x70, 0x00, + 0x38, 0x78, 0x00, + 0x38, 0xF8, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l72_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0xFE, 0x00, + 0xFE, 0x1F, 0xFF, 0x01, + 0x00, 0x9E, 0xE7, 0x03, + 0x00, 0x8F, 0xC3, 0x03, + 0x00, 0xCF, 0x83, 0x03, + 0x80, 0xC7, 0x83, 0x03, + 0x80, 0x07, 0x80, 0x03, + 0xC0, 0x03, 0xC0, 0x03, + 0xC0, 0x03, 0xC0, 0x03, + 0xC0, 0x01, 0xE0, 0x01, + 0xE0, 0x01, 0xF0, 0x01, + 0xE0, 0x01, 0xF8, 0x00, + 0xE0, 0x00, 0x78, 0x00, + 0xF0, 0x00, 0x3C, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0xF0, 0x00, 0x0F, 0x00, + 0xF0, 0x80, 0x07, 0x00, + 0x70, 0x80, 0x07, 0x00, + 0x70, 0xC0, 0xFF, 0x03, + 0x70, 0xC0, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l73.xbm b/app/bin/bitmaps/l73.xbm index 0031594..64dfbb4 100644 --- a/app/bin/bitmaps/l73.xbm +++ b/app/bin/bitmaps/l73.xbm @@ -1,6 +1,78 @@ -#define l73_width 14 -#define l73_height 16 -static char l73_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x08, 0x0E, 0x08, 0x10, 0x04, 0x10, 0x84, 0x10, 0x04, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l73_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3B, + 0x60, 0x38, + 0x70, 0x18, + 0x30, 0x3C, + 0x38, 0x38, + 0x38, 0x33, + 0x18, 0x3F, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l73_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x03, + 0x80, 0x77, 0x07, + 0x80, 0x3B, 0x07, + 0xC0, 0x01, 0x07, + 0xC0, 0x01, 0x07, + 0xE0, 0x00, 0x07, + 0xE0, 0x80, 0x03, + 0xE0, 0xC0, 0x07, + 0x70, 0x00, 0x07, + 0x70, 0x00, 0x0E, + 0x70, 0x00, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x07, + 0x38, 0x70, 0x07, + 0x38, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l73_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0xFE, 0x1F, 0xFF, 0x00, + 0x00, 0x9E, 0xE7, 0x01, + 0x00, 0x8F, 0xC7, 0x01, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x07, 0xC0, 0x03, + 0x80, 0x07, 0xC0, 0x01, + 0xC0, 0x03, 0xE0, 0x01, + 0xC0, 0x03, 0xFC, 0x00, + 0xC0, 0x01, 0xFC, 0x00, + 0xE0, 0x01, 0xE0, 0x01, + 0xE0, 0x01, 0xC0, 0x03, + 0xE0, 0x00, 0x80, 0x03, + 0xF0, 0x00, 0x80, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0x80, 0xC7, 0x03, + 0x70, 0x80, 0xE7, 0x01, + 0x70, 0x00, 0xFF, 0x01, + 0x70, 0x00, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l74.xbm b/app/bin/bitmaps/l74.xbm index be95f2c..c41ea54 100644 --- a/app/bin/bitmaps/l74.xbm +++ b/app/bin/bitmaps/l74.xbm @@ -1,6 +1,78 @@ -#define l74_width 14 -#define l74_height 16 -static char l74_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x08, 0x20, 0x0C, 0x10, 0x0A, - 0x10, 0x09, 0x88, 0x08, 0x88, 0x1F, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l74_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1C, + 0xE0, 0x1C, + 0x60, 0x1E, + 0x70, 0x1E, + 0x30, 0x1F, + 0x38, 0x1B, + 0xB8, 0x3F, + 0x18, 0x18, + 0x18, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l74_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0x87, 0x03, + 0x80, 0x87, 0x03, + 0x80, 0xC3, 0x03, + 0xC0, 0xC1, 0x03, + 0xC0, 0xE1, 0x03, + 0xE0, 0xE0, 0x03, + 0xE0, 0xF0, 0x03, + 0xE0, 0xB0, 0x03, + 0x70, 0xB8, 0x03, + 0x70, 0x98, 0x03, + 0x70, 0xFC, 0x0F, + 0x70, 0x80, 0x03, + 0x70, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x38, 0x80, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l74_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0xF0, 0x00, + 0xFE, 0x1F, 0xF0, 0x00, + 0x00, 0x1E, 0xF8, 0x00, + 0x00, 0x0F, 0xF8, 0x00, + 0x00, 0x0F, 0xFC, 0x00, + 0x80, 0x07, 0xFC, 0x00, + 0x80, 0x07, 0xFE, 0x00, + 0xC0, 0x03, 0xEE, 0x00, + 0xC0, 0x03, 0xEF, 0x00, + 0xC0, 0x81, 0xE7, 0x00, + 0xE0, 0x81, 0xE7, 0x00, + 0xE0, 0xC1, 0xE3, 0x00, + 0xE0, 0xC0, 0xE1, 0x00, + 0xF0, 0xE0, 0xFF, 0x03, + 0xF0, 0xE0, 0xFF, 0x03, + 0xF0, 0x00, 0xE0, 0x00, + 0xF0, 0x00, 0xE0, 0x00, + 0x70, 0x00, 0xE0, 0x00, + 0x70, 0x00, 0xE0, 0x00, + 0x70, 0x00, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l75.xbm b/app/bin/bitmaps/l75.xbm index 3524c94..58a6c52 100644 --- a/app/bin/bitmaps/l75.xbm +++ b/app/bin/bitmaps/l75.xbm @@ -1,6 +1,78 @@ -#define l75_width 14 -#define l75_height 16 -static char l75_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0xA0, 0x00, 0x90, 0x00, - 0x90, 0x0F, 0x08, 0x10, 0x08, 0x10, 0x04, 0x10, 0x84, 0x10, 0x04, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l75_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x3F, + 0xE0, 0x07, + 0x60, 0x07, + 0x70, 0x1F, + 0x30, 0x3B, + 0x38, 0x30, + 0x38, 0x33, + 0x18, 0x3F, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l75_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xF7, 0x07, + 0x80, 0x77, 0x00, + 0x80, 0x73, 0x00, + 0xC0, 0x31, 0x00, + 0xC0, 0x31, 0x00, + 0xE0, 0xF8, 0x03, + 0xE0, 0x78, 0x07, + 0xE0, 0x38, 0x07, + 0x70, 0x00, 0x0E, + 0x70, 0x00, 0x0E, + 0x70, 0x00, 0x0E, + 0x70, 0x38, 0x06, + 0x70, 0x38, 0x07, + 0x38, 0x70, 0x07, + 0x38, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l75_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0xFF, 0x03, + 0xFE, 0x1F, 0xFF, 0x03, + 0x00, 0x1E, 0x07, 0x00, + 0x00, 0x0F, 0x07, 0x00, + 0x00, 0x8F, 0x07, 0x00, + 0x80, 0x87, 0x07, 0x00, + 0x80, 0x87, 0x7F, 0x00, + 0xC0, 0x83, 0xFF, 0x01, + 0xC0, 0x83, 0xE7, 0x01, + 0xC0, 0x81, 0xC3, 0x03, + 0xE0, 0x01, 0xC0, 0x03, + 0xE0, 0x01, 0x80, 0x03, + 0xE0, 0x00, 0x80, 0x03, + 0xF0, 0x00, 0x80, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0xC3, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0x70, 0x80, 0xE7, 0x01, + 0x70, 0x00, 0xFF, 0x00, + 0x70, 0x00, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l76.xbm b/app/bin/bitmaps/l76.xbm index 83e8f59..9b385dc 100644 --- a/app/bin/bitmaps/l76.xbm +++ b/app/bin/bitmaps/l76.xbm @@ -1,6 +1,78 @@ -#define l76_width 14 -#define l76_height 16 -static char l76_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x00, 0x90, 0x00, - 0x90, 0x0F, 0x88, 0x10, 0x88, 0x10, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l76_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3F, + 0x60, 0x03, + 0x70, 0x1F, + 0x30, 0x3F, + 0x38, 0x33, + 0x38, 0x33, + 0x18, 0x3F, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l76_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x03, + 0x80, 0x77, 0x07, + 0x80, 0x33, 0x07, + 0xC0, 0x39, 0x00, + 0xC0, 0x39, 0x00, + 0xE0, 0x38, 0x00, + 0xE0, 0xF8, 0x03, + 0xE0, 0x78, 0x07, + 0x70, 0x38, 0x07, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x30, 0x07, + 0x38, 0x70, 0x07, + 0x38, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l76_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0xFC, 0x00, + 0xFE, 0x1F, 0xFF, 0x01, + 0x00, 0x1E, 0xEF, 0x01, + 0x00, 0x8F, 0xC7, 0x03, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x87, 0x03, 0x00, + 0x80, 0xC7, 0x03, 0x00, + 0xC0, 0xC3, 0x7F, 0x00, + 0xC0, 0xC3, 0xFF, 0x01, + 0xC0, 0xC1, 0xEF, 0x01, + 0xE0, 0xC1, 0xC7, 0x03, + 0xE0, 0xC1, 0x83, 0x03, + 0xE0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0x80, 0x83, 0x03, + 0xF0, 0x80, 0xC7, 0x03, + 0x70, 0x80, 0xEF, 0x01, + 0x70, 0x00, 0xFF, 0x01, + 0x70, 0x00, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l77.xbm b/app/bin/bitmaps/l77.xbm index 4e48354..c406f2d 100644 --- a/app/bin/bitmaps/l77.xbm +++ b/app/bin/bitmaps/l77.xbm @@ -1,6 +1,78 @@ -#define l77_width 14 -#define l77_height 16 -static char l77_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x1F, 0x20, 0x10, 0x10, 0x08, - 0x10, 0x08, 0x08, 0x04, 0x08, 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l77_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x3F, + 0xE0, 0x38, + 0x60, 0x18, + 0x70, 0x1C, + 0x30, 0x0C, + 0x38, 0x0E, + 0x38, 0x0E, + 0x18, 0x06, + 0x18, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l77_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xFF, 0x0F, + 0x80, 0x07, 0x0F, + 0x80, 0x03, 0x07, + 0xC0, 0x81, 0x03, + 0xC0, 0x81, 0x03, + 0xE0, 0xC0, 0x01, + 0xE0, 0xC0, 0x01, + 0xE0, 0xC0, 0x01, + 0x70, 0xE0, 0x00, + 0x70, 0xE0, 0x00, + 0x70, 0xE0, 0x00, + 0x70, 0xE0, 0x00, + 0x70, 0xE0, 0x00, + 0x38, 0x70, 0x00, + 0x38, 0x70, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l77_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0xDF, 0xFF, 0x03, + 0xFE, 0xDF, 0xFF, 0x03, + 0x00, 0x1E, 0xC0, 0x03, + 0x00, 0x0F, 0xE0, 0x01, + 0x00, 0x0F, 0xE0, 0x01, + 0x80, 0x07, 0xF0, 0x00, + 0x80, 0x07, 0xF0, 0x00, + 0xC0, 0x03, 0x78, 0x00, + 0xC0, 0x03, 0x78, 0x00, + 0xC0, 0x01, 0x38, 0x00, + 0xE0, 0x01, 0x3C, 0x00, + 0xE0, 0x01, 0x3C, 0x00, + 0xE0, 0x00, 0x1C, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0xF0, 0x00, 0x1E, 0x00, + 0x70, 0x00, 0x0E, 0x00, + 0x70, 0x00, 0x0E, 0x00, + 0x70, 0x00, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l78.xbm b/app/bin/bitmaps/l78.xbm index 731d05d..0674918 100644 --- a/app/bin/bitmaps/l78.xbm +++ b/app/bin/bitmaps/l78.xbm @@ -1,6 +1,78 @@ -#define l78_width 14 -#define l78_height 16 -static char l78_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, - 0x90, 0x10, 0x08, 0x0F, 0x88, 0x10, 0x84, 0x10, 0x84, 0x10, 0x04, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l78_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3F, + 0x60, 0x3B, + 0x70, 0x3F, + 0x30, 0x1E, + 0x38, 0x3F, + 0x38, 0x33, + 0x18, 0x3F, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l78_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x03, + 0x80, 0x77, 0x07, + 0x80, 0x33, 0x07, + 0xC0, 0x39, 0x07, + 0xC0, 0x39, 0x07, + 0xE0, 0x38, 0x07, + 0xE0, 0x70, 0x07, + 0xE0, 0xE0, 0x03, + 0x70, 0x70, 0x07, + 0x70, 0x38, 0x06, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x0E, + 0x70, 0x38, 0x06, + 0x38, 0x70, 0x07, + 0x38, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l78_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0xFE, 0x1F, 0xFF, 0x00, + 0x00, 0x9E, 0xEF, 0x01, + 0x00, 0x8F, 0xC7, 0x01, + 0x00, 0x8F, 0xC3, 0x03, + 0x80, 0x87, 0xC3, 0x03, + 0x80, 0x87, 0xC7, 0x01, + 0xC0, 0x03, 0xEF, 0x01, + 0xC0, 0x03, 0xFE, 0x00, + 0xC0, 0x01, 0xFF, 0x00, + 0xE0, 0x81, 0xE7, 0x01, + 0xE0, 0x81, 0xC3, 0x03, + 0xE0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0xC0, 0x83, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0x70, 0x80, 0xE7, 0x01, + 0x70, 0x00, 0xFF, 0x01, + 0x70, 0x00, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l79.xbm b/app/bin/bitmaps/l79.xbm index 4e5259a..c1d909b 100644 --- a/app/bin/bitmaps/l79.xbm +++ b/app/bin/bitmaps/l79.xbm @@ -1,6 +1,78 @@ -#define l79_width 14 -#define l79_height 16 -static char l79_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x0F, 0xA0, 0x10, 0x90, 0x10, - 0x90, 0x10, 0x08, 0x1F, 0x08, 0x10, 0x04, 0x10, 0x04, 0x08, 0x04, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l79_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xFC, 0x1E, + 0xE0, 0x3F, + 0x60, 0x33, + 0x70, 0x33, + 0x30, 0x3F, + 0x38, 0x3E, + 0x38, 0x30, + 0x18, 0x3B, + 0x18, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l79_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xFC, 0xE7, 0x01, + 0x80, 0x77, 0x07, + 0x80, 0x3B, 0x07, + 0xC0, 0x39, 0x06, + 0xC0, 0x39, 0x0E, + 0xE0, 0x38, 0x0E, + 0xE0, 0x38, 0x0F, + 0xE0, 0x70, 0x0F, + 0x70, 0xE0, 0x0F, + 0x70, 0x00, 0x0E, + 0x70, 0x00, 0x06, + 0x70, 0x00, 0x06, + 0x70, 0x38, 0x07, + 0x38, 0x70, 0x03, + 0x38, 0xF0, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l79_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x1F, 0x7E, 0x00, + 0xFE, 0x1F, 0xFF, 0x00, + 0x00, 0x9E, 0xEF, 0x01, + 0x00, 0x8F, 0xC7, 0x01, + 0x00, 0xCF, 0x83, 0x03, + 0x80, 0xC7, 0x83, 0x03, + 0x80, 0xC7, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xC0, 0xC3, 0x83, 0x03, + 0xC0, 0x81, 0xC3, 0x03, + 0xE0, 0x81, 0xE7, 0x03, + 0xE0, 0x01, 0xFF, 0x03, + 0xE0, 0x00, 0xFE, 0x03, + 0xF0, 0x00, 0x80, 0x03, + 0xF0, 0x00, 0x80, 0x03, + 0xF0, 0x80, 0xC3, 0x03, + 0xF0, 0x80, 0xC3, 0x01, + 0x70, 0x80, 0xE7, 0x01, + 0x70, 0x00, 0xFF, 0x00, + 0x70, 0x00, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l8.xbm b/app/bin/bitmaps/l8.xbm index cf07c8f..1054bfd 100644 --- a/app/bin/bitmaps/l8.xbm +++ b/app/bin/bitmaps/l8.xbm @@ -1,6 +1,78 @@ -#define l8_width 14 -#define l8_height 16 -static char l8_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, - 0x08, 0x01, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01, 0xF0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l8_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xC0, 0x03, + 0xE0, 0x07, + 0x60, 0x07, + 0xE0, 0x07, + 0xC0, 0x03, + 0xE0, 0x07, + 0x60, 0x06, + 0xE0, 0x07, + 0xC0, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l8_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x3B, 0x00, + 0x80, 0x39, 0x00, + 0xC0, 0x39, 0x00, + 0xC0, 0x39, 0x00, + 0xC0, 0x39, 0x00, + 0x80, 0x3B, 0x00, + 0x00, 0x1F, 0x00, + 0x80, 0x3B, 0x00, + 0xC0, 0x31, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x31, 0x00, + 0x80, 0x3B, 0x00, + 0x00, 0x1F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l8_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0x00, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xDF, 0x03, 0x00, + 0x00, 0x8F, 0x03, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x8F, 0x03, 0x00, + 0x00, 0xDE, 0x03, 0x00, + 0x00, 0xFC, 0x01, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0xFE, 0x03, 0x00, + 0x00, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l80.xbm b/app/bin/bitmaps/l80.xbm index 116c68f..8dc12d0 100644 --- a/app/bin/bitmaps/l80.xbm +++ b/app/bin/bitmaps/l80.xbm @@ -1,6 +1,78 @@ -#define l80_width 14 -#define l80_height 16 -static char l80_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, - 0xA1, 0x14, 0x9E, 0x12, 0xA1, 0x11, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l80_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xEC, 0x33, + 0xFC, 0x33, + 0x78, 0x33, + 0xFC, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l80_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x9C, 0x3B, 0x06, + 0x9C, 0x3B, 0x06, + 0x9C, 0x3B, 0x0E, + 0xB8, 0x3B, 0x0E, + 0xF0, 0x39, 0x0E, + 0xB8, 0x3B, 0x0E, + 0x1C, 0x3B, 0x0E, + 0x1C, 0x3F, 0x06, + 0x1C, 0x3F, 0x06, + 0x1C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l80_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0xCE, 0x83, 0x03, + 0x78, 0xCF, 0x83, 0x03, + 0xF0, 0xC7, 0x83, 0x03, + 0xF8, 0xC7, 0x83, 0x03, + 0x3C, 0xCF, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1C, 0x9E, 0xC7, 0x01, + 0x3C, 0x0F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l81.xbm b/app/bin/bitmaps/l81.xbm index 747787e..118901b 100644 --- a/app/bin/bitmaps/l81.xbm +++ b/app/bin/bitmaps/l81.xbm @@ -1,6 +1,78 @@ -#define l81_width 14 -#define l81_height 16 -static char l81_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, - 0xA1, 0x04, 0x1E, 0x04, 0x21, 0x04, 0x21, 0x04, 0x21, 0x04, 0x1E, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l81_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1E, + 0xEC, 0x1F, + 0xFC, 0x1C, + 0x78, 0x1C, + 0xFC, 0x1C, + 0xCC, 0x1C, + 0xFC, 0x1C, + 0x78, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l81_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0xC3, 0x03, + 0x98, 0xC3, 0x03, + 0x9C, 0xE3, 0x03, + 0x9C, 0xB3, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0xB8, 0x83, 0x03, + 0x1C, 0x83, 0x03, + 0x1C, 0x87, 0x03, + 0x1C, 0x87, 0x03, + 0x1C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l81_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0x7C, 0x0F, 0x78, 0x00, + 0x3C, 0x0E, 0x7C, 0x00, + 0x1C, 0x1E, 0x7E, 0x00, + 0x1C, 0x1E, 0x7F, 0x00, + 0x3C, 0x0E, 0x73, 0x00, + 0x78, 0x0F, 0x70, 0x00, + 0xF0, 0x07, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0xF8, 0x0F, 0x70, 0x00, + 0xF0, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l82.xbm b/app/bin/bitmaps/l82.xbm index e8758f9..74edb5d 100644 --- a/app/bin/bitmaps/l82.xbm +++ b/app/bin/bitmaps/l82.xbm @@ -1,6 +1,78 @@ -#define l82_width 14 -#define l82_height 16 -static char l82_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0x21, 0x08, 0x1E, 0x04, 0x21, 0x02, 0x21, 0x01, 0xA1, 0x00, 0x9E, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l82_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xEC, 0x33, + 0xFC, 0x30, + 0x78, 0x38, + 0xFC, 0x1C, + 0xCC, 0x0E, + 0xFC, 0x07, + 0x78, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l82_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x06, + 0x9C, 0x3B, 0x0E, + 0x9C, 0x03, 0x0E, + 0x9C, 0x03, 0x0E, + 0xB8, 0x03, 0x07, + 0xF0, 0x81, 0x07, + 0xB8, 0x83, 0x03, + 0x1C, 0xC3, 0x01, + 0x1C, 0xE7, 0x01, + 0x1C, 0xF7, 0x00, + 0x1C, 0x73, 0x00, + 0xB8, 0x7B, 0x00, + 0xF0, 0xF9, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l82_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFE, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x7C, 0x8F, 0xE7, 0x03, + 0x3C, 0x8E, 0xC3, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x3C, 0x0E, 0x80, 0x03, + 0x78, 0x0F, 0xC0, 0x03, + 0xF0, 0x07, 0xC0, 0x03, + 0xF8, 0x07, 0xE0, 0x01, + 0x3C, 0x0F, 0xF0, 0x01, + 0x1C, 0x1E, 0xF8, 0x00, + 0x1E, 0x1C, 0x78, 0x00, + 0x1E, 0x1C, 0x3C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x0F, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x3C, 0x8F, 0x07, 0x00, + 0xF8, 0xCF, 0xFF, 0x03, + 0xF0, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l83.xbm b/app/bin/bitmaps/l83.xbm index 8ccbf89..3f7a1a0 100644 --- a/app/bin/bitmaps/l83.xbm +++ b/app/bin/bitmaps/l83.xbm @@ -1,6 +1,78 @@ -#define l83_width 14 -#define l83_height 16 -static char l83_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, - 0x21, 0x10, 0x1E, 0x0E, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l83_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3B, + 0xEC, 0x38, + 0xFC, 0x18, + 0x78, 0x3C, + 0xFC, 0x38, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l83_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x07, + 0x9C, 0x03, 0x07, + 0x9C, 0x03, 0x07, + 0x9C, 0x03, 0x07, + 0xB8, 0x83, 0x03, + 0xF0, 0xC1, 0x07, + 0xB8, 0x03, 0x07, + 0x1C, 0x03, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l83_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xE7, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x1E, 0xC0, 0x03, + 0x3C, 0x0E, 0xC0, 0x01, + 0x78, 0x0F, 0xE0, 0x01, + 0xF0, 0x07, 0xFC, 0x00, + 0xF8, 0x07, 0xFC, 0x00, + 0x3C, 0x0F, 0xE0, 0x01, + 0x1C, 0x1E, 0xC0, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l84.xbm b/app/bin/bitmaps/l84.xbm index 5e0e1ba..0cce4be 100644 --- a/app/bin/bitmaps/l84.xbm +++ b/app/bin/bitmaps/l84.xbm @@ -1,6 +1,78 @@ -#define l84_width 14 -#define l84_height 16 -static char l84_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, - 0x21, 0x09, 0x9E, 0x08, 0xA1, 0x1F, 0x21, 0x08, 0x21, 0x08, 0x1E, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l84_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1C, + 0xEC, 0x1E, + 0xFC, 0x1E, + 0x78, 0x1F, + 0xFC, 0x1B, + 0xCC, 0x3F, + 0xFC, 0x18, + 0x78, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l84_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x81, 0x03, + 0xB8, 0x83, 0x03, + 0x98, 0xC3, 0x03, + 0x9C, 0xC3, 0x03, + 0x9C, 0xE3, 0x03, + 0x9C, 0xE3, 0x03, + 0xB8, 0xF3, 0x03, + 0xF0, 0xB1, 0x03, + 0xB8, 0xBB, 0x03, + 0x1C, 0x9B, 0x03, + 0x1C, 0xFF, 0x0F, + 0x1C, 0x87, 0x03, + 0x1C, 0x83, 0x03, + 0xB8, 0x83, 0x03, + 0xF0, 0x81, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l84_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xF0, 0x00, + 0xF8, 0x07, 0xF0, 0x00, + 0x7C, 0x0F, 0xF8, 0x00, + 0x3C, 0x0E, 0xF8, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x3C, 0x0E, 0xFE, 0x00, + 0x78, 0x0F, 0xEE, 0x00, + 0xF0, 0x07, 0xEF, 0x00, + 0xF8, 0x87, 0xE7, 0x00, + 0x3C, 0x8F, 0xE7, 0x00, + 0x1C, 0xDE, 0xE3, 0x00, + 0x1E, 0xDC, 0xE1, 0x00, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1E, 0xFC, 0xFF, 0x03, + 0x1E, 0x1C, 0xE0, 0x00, + 0x1C, 0x1E, 0xE0, 0x00, + 0x3C, 0x0F, 0xE0, 0x00, + 0xF8, 0x0F, 0xE0, 0x00, + 0xF0, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l85.xbm b/app/bin/bitmaps/l85.xbm index ee8ed02..420ea67 100644 --- a/app/bin/bitmaps/l85.xbm +++ b/app/bin/bitmaps/l85.xbm @@ -1,6 +1,78 @@ -#define l85_width 14 -#define l85_height 16 -static char l85_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, - 0xA1, 0x0F, 0x1E, 0x10, 0x21, 0x10, 0x21, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l85_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x07, + 0xEC, 0x07, + 0xFC, 0x1F, + 0x78, 0x3B, + 0xFC, 0x30, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l85_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF1, 0x07, + 0xB8, 0x73, 0x00, + 0x98, 0x73, 0x00, + 0x9C, 0x33, 0x00, + 0x9C, 0x33, 0x00, + 0x9C, 0xFB, 0x03, + 0xB8, 0x7B, 0x07, + 0xF0, 0x39, 0x07, + 0xB8, 0x03, 0x0E, + 0x1C, 0x03, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x3F, 0x06, + 0x1C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l85_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFF, 0x03, + 0xF8, 0x07, 0xFF, 0x03, + 0x7C, 0x0F, 0x07, 0x00, + 0x3C, 0x0E, 0x07, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x1C, 0x9E, 0x07, 0x00, + 0x3C, 0x8E, 0x7F, 0x00, + 0x78, 0x8F, 0xFF, 0x01, + 0xF0, 0x87, 0xE7, 0x01, + 0xF8, 0x87, 0xC3, 0x03, + 0x3C, 0x0F, 0xC0, 0x03, + 0x1C, 0x1E, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l86.xbm b/app/bin/bitmaps/l86.xbm index 49e4a8d..31ee6f1 100644 --- a/app/bin/bitmaps/l86.xbm +++ b/app/bin/bitmaps/l86.xbm @@ -1,6 +1,78 @@ -#define l86_width 14 -#define l86_height 16 -static char l86_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, - 0xA1, 0x0F, 0x9E, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l86_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xEC, 0x03, + 0xFC, 0x1F, + 0x78, 0x3F, + 0xFC, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l86_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x9C, 0x3B, 0x00, + 0x9C, 0x3B, 0x00, + 0x9C, 0x3B, 0x00, + 0xB8, 0xFB, 0x03, + 0xF0, 0x79, 0x07, + 0xB8, 0x3B, 0x07, + 0x1C, 0x3B, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x33, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l86_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFC, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x7C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x9E, 0x03, 0x00, + 0x3C, 0xCE, 0x03, 0x00, + 0x78, 0xCF, 0x7F, 0x00, + 0xF0, 0xC7, 0xFF, 0x01, + 0xF8, 0xC7, 0xEF, 0x01, + 0x3C, 0xCF, 0xC7, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x9C, 0x83, 0x03, + 0x1C, 0x9E, 0xC7, 0x03, + 0x3C, 0x8F, 0xEF, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l87.xbm b/app/bin/bitmaps/l87.xbm index bbba679..dcd52b5 100644 --- a/app/bin/bitmaps/l87.xbm +++ b/app/bin/bitmaps/l87.xbm @@ -1,6 +1,78 @@ -#define l87_width 14 -#define l87_height 16 -static char l87_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, - 0x21, 0x08, 0x1E, 0x04, 0x21, 0x04, 0x21, 0x02, 0x21, 0x02, 0x1E, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l87_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x38, + 0xEC, 0x18, + 0xFC, 0x1C, + 0x78, 0x0C, + 0xFC, 0x0E, + 0xCC, 0x0E, + 0xFC, 0x06, + 0x78, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l87_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF9, 0x0F, + 0xB8, 0x03, 0x0F, + 0x98, 0x03, 0x07, + 0x9C, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0x9C, 0xC3, 0x01, + 0xB8, 0xC3, 0x01, + 0xF0, 0xC1, 0x01, + 0xB8, 0xE3, 0x00, + 0x1C, 0xE3, 0x00, + 0x1C, 0xE7, 0x00, + 0x1C, 0xE7, 0x00, + 0x1C, 0xE3, 0x00, + 0xB8, 0x73, 0x00, + 0xF0, 0x71, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l87_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC3, 0xFF, 0x03, + 0xF8, 0xC7, 0xFF, 0x03, + 0x7C, 0x0F, 0xC0, 0x03, + 0x3C, 0x0E, 0xE0, 0x01, + 0x1C, 0x1E, 0xE0, 0x01, + 0x1C, 0x1E, 0xF0, 0x00, + 0x3C, 0x0E, 0xF0, 0x00, + 0x78, 0x0F, 0x78, 0x00, + 0xF0, 0x07, 0x78, 0x00, + 0xF8, 0x07, 0x38, 0x00, + 0x3C, 0x0F, 0x3C, 0x00, + 0x1C, 0x1E, 0x3C, 0x00, + 0x1E, 0x1C, 0x1C, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1E, 0x1C, 0x1E, 0x00, + 0x1C, 0x1E, 0x1E, 0x00, + 0x3C, 0x0F, 0x0E, 0x00, + 0xF8, 0x0F, 0x0E, 0x00, + 0xF0, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l88.xbm b/app/bin/bitmaps/l88.xbm index 17a4121..4d06b28 100644 --- a/app/bin/bitmaps/l88.xbm +++ b/app/bin/bitmaps/l88.xbm @@ -1,6 +1,78 @@ -#define l88_width 14 -#define l88_height 16 -static char l88_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0xA1, 0x10, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, 0xA1, 0x10, 0x1E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l88_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xEC, 0x3B, + 0xFC, 0x3F, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xFC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l88_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x98, 0x33, 0x07, + 0x9C, 0x3B, 0x07, + 0x9C, 0x3B, 0x07, + 0x9C, 0x3B, 0x07, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0xB8, 0x73, 0x07, + 0x1C, 0x3B, 0x06, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3B, 0x06, + 0xB8, 0x73, 0x07, + 0xF0, 0xE1, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l88_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8E, 0xC7, 0x01, + 0x78, 0x0F, 0xEF, 0x01, + 0xF0, 0x07, 0xFE, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x3C, 0x8F, 0xE7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l89.xbm b/app/bin/bitmaps/l89.xbm index 625081d..74b1448 100644 --- a/app/bin/bitmaps/l89.xbm +++ b/app/bin/bitmaps/l89.xbm @@ -1,6 +1,78 @@ -#define l89_width 14 -#define l89_height 16 -static char l89_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0xA1, 0x10, 0x1E, 0x1F, 0x21, 0x10, 0x21, 0x10, 0x21, 0x08, 0x1E, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l89_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xEC, 0x33, + 0xFC, 0x33, + 0x78, 0x3F, + 0xFC, 0x3E, + 0xCC, 0x30, + 0xFC, 0x3B, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l89_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE1, 0x01, + 0xB8, 0x73, 0x07, + 0x98, 0x3B, 0x07, + 0x9C, 0x3B, 0x06, + 0x9C, 0x3B, 0x0E, + 0x9C, 0x3B, 0x0E, + 0xB8, 0x3B, 0x0F, + 0xF0, 0x71, 0x0F, + 0xB8, 0xE3, 0x0F, + 0x1C, 0x03, 0x0E, + 0x1C, 0x07, 0x06, + 0x1C, 0x07, 0x06, + 0x1C, 0x3B, 0x07, + 0xB8, 0x73, 0x03, + 0xF0, 0xF1, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l89_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x3C, 0xCE, 0x83, 0x03, + 0x78, 0xCF, 0x83, 0x03, + 0xF0, 0xC7, 0x83, 0x03, + 0xF8, 0x87, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x03, + 0x1C, 0x1E, 0xFF, 0x03, + 0x1E, 0x1C, 0xFE, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x01, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x0F, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l9.xbm b/app/bin/bitmaps/l9.xbm index 14a43a4..281474c 100644 --- a/app/bin/bitmaps/l9.xbm +++ b/app/bin/bitmaps/l9.xbm @@ -1,6 +1,78 @@ -#define l9_width 14 -#define l9_height 16 -static char l9_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x08, 0x01, - 0x08, 0x01, 0xF0, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x00, 0x70, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l9_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xC0, 0x03, + 0xE0, 0x07, + 0x60, 0x06, + 0x60, 0x06, + 0xE0, 0x07, + 0xC0, 0x07, + 0x00, 0x06, + 0x60, 0x07, + 0xC0, 0x03, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l9_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x0F, 0x00, + 0x80, 0x3B, 0x00, + 0xC0, 0x39, 0x00, + 0xC0, 0x31, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x71, 0x00, + 0xC0, 0x79, 0x00, + 0x80, 0x7B, 0x00, + 0x00, 0x7F, 0x00, + 0x00, 0x70, 0x00, + 0x00, 0x30, 0x00, + 0x00, 0x30, 0x00, + 0xC0, 0x39, 0x00, + 0x80, 0x1B, 0x00, + 0x80, 0x0F, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l9_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 0x00, 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, 0x00, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xDF, 0x03, 0x00, + 0x00, 0x8F, 0x03, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x80, 0x07, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0xCF, 0x07, 0x00, + 0x00, 0xFE, 0x07, 0x00, + 0x00, 0xFC, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x00, 0x07, 0x00, + 0x00, 0x87, 0x07, 0x00, + 0x00, 0x87, 0x03, 0x00, + 0x00, 0xCF, 0x03, 0x00, + 0x00, 0xFE, 0x01, 0x00, + 0x00, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l90.xbm b/app/bin/bitmaps/l90.xbm index f251dbe..d56c618 100644 --- a/app/bin/bitmaps/l90.xbm +++ b/app/bin/bitmaps/l90.xbm @@ -1,6 +1,78 @@ -#define l90_width 14 -#define l90_height 16 -static char l90_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x18, - 0xA1, 0x14, 0xBE, 0x12, 0xA0, 0x11, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l90_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xCC, 0x33, + 0xFC, 0x33, + 0xF8, 0x33, + 0xC0, 0x33, + 0xEC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l90_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x1C, 0x3B, 0x06, + 0x1C, 0x3F, 0x06, + 0x1C, 0x3F, 0x0E, + 0x9C, 0x3F, 0x0E, + 0xB8, 0x3F, 0x0E, + 0xF0, 0x3F, 0x0E, + 0x00, 0x3F, 0x0E, + 0x00, 0x3B, 0x06, + 0x00, 0x3B, 0x06, + 0x9C, 0x33, 0x07, + 0xB8, 0x71, 0x07, + 0xF8, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l90_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x3C, 0xDF, 0x83, 0x03, + 0xF8, 0xDF, 0x83, 0x03, + 0xF0, 0xDF, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0x9C, 0xC3, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x8E, 0xC7, 0x01, + 0x3C, 0x0F, 0xEF, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l91.xbm b/app/bin/bitmaps/l91.xbm index 4df09a2..cb63233 100644 --- a/app/bin/bitmaps/l91.xbm +++ b/app/bin/bitmaps/l91.xbm @@ -1,6 +1,78 @@ -#define l91_width 14 -#define l91_height 16 -static char l91_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x04, 0x21, 0x06, 0x21, 0x05, - 0xA1, 0x04, 0x3E, 0x04, 0x20, 0x04, 0x20, 0x04, 0x10, 0x04, 0x0E, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l91_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1E, + 0xCC, 0x1F, + 0xCC, 0x1C, + 0xFC, 0x1C, + 0xF8, 0x1C, + 0xC0, 0x1C, + 0xEC, 0x1C, + 0x78, 0x1C, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l91_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x80, 0x03, + 0xB8, 0xC3, 0x03, + 0x9C, 0xC3, 0x03, + 0x1C, 0xE3, 0x03, + 0x1C, 0xB7, 0x03, + 0x1C, 0x87, 0x03, + 0x9C, 0x87, 0x03, + 0xB8, 0x87, 0x03, + 0xF0, 0x87, 0x03, + 0x00, 0x87, 0x03, + 0x00, 0x83, 0x03, + 0x00, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x81, 0x03, + 0xF8, 0x80, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l91_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0x7C, 0x0F, 0x78, 0x00, + 0x3C, 0x0E, 0x7C, 0x00, + 0x1E, 0x1C, 0x7E, 0x00, + 0x1E, 0x1C, 0x7F, 0x00, + 0x1E, 0x1C, 0x73, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1E, 0x1C, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x3C, 0x1F, 0x70, 0x00, + 0xF8, 0x1F, 0x70, 0x00, + 0xF0, 0x1F, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x00, 0x1C, 0x70, 0x00, + 0x1C, 0x1E, 0x70, 0x00, + 0x1C, 0x0E, 0x70, 0x00, + 0x3C, 0x0F, 0x70, 0x00, + 0xF8, 0x07, 0x70, 0x00, + 0xF0, 0x03, 0x70, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l92.xbm b/app/bin/bitmaps/l92.xbm index 16a5631..8323e42 100644 --- a/app/bin/bitmaps/l92.xbm +++ b/app/bin/bitmaps/l92.xbm @@ -1,6 +1,78 @@ -#define l92_width 14 -#define l92_height 16 -static char l92_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0x21, 0x08, 0x3E, 0x04, 0x20, 0x02, 0x20, 0x01, 0x90, 0x00, 0x8E, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l92_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xCC, 0x30, + 0xFC, 0x38, + 0xF8, 0x1C, + 0xC0, 0x0E, + 0xEC, 0x07, + 0x78, 0x3F, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l92_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x06, + 0x1C, 0x3B, 0x0E, + 0x1C, 0x07, 0x0E, + 0x1C, 0x07, 0x0E, + 0x9C, 0x07, 0x07, + 0xB8, 0x87, 0x07, + 0xF0, 0x87, 0x03, + 0x00, 0xC7, 0x01, + 0x00, 0xE3, 0x01, + 0x00, 0xF3, 0x00, + 0x9C, 0x73, 0x00, + 0xB8, 0x79, 0x00, + 0xF8, 0xF8, 0x0F, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l92_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFE, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x7C, 0x8F, 0xE7, 0x03, + 0x3C, 0x8E, 0xC3, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0x1C, 0x80, 0x03, + 0x1E, 0x1C, 0xC0, 0x03, + 0x1E, 0x1C, 0xC0, 0x03, + 0x1C, 0x1E, 0xE0, 0x01, + 0x3C, 0x1F, 0xF0, 0x01, + 0xF8, 0x1F, 0xF8, 0x00, + 0xF0, 0x1F, 0x78, 0x00, + 0x00, 0x1C, 0x3C, 0x00, + 0x00, 0x1C, 0x1E, 0x00, + 0x1C, 0x1E, 0x0F, 0x00, + 0x1C, 0x8E, 0x07, 0x00, + 0x3C, 0x8F, 0x07, 0x00, + 0xF8, 0xC7, 0xFF, 0x03, + 0xF0, 0xC3, 0xFF, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l93.xbm b/app/bin/bitmaps/l93.xbm index 72515dd..4be9859 100644 --- a/app/bin/bitmaps/l93.xbm +++ b/app/bin/bitmaps/l93.xbm @@ -1,6 +1,78 @@ -#define l93_width 14 -#define l93_height 16 -static char l93_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0x21, 0x10, - 0x21, 0x10, 0x3E, 0x0E, 0x20, 0x10, 0x20, 0x10, 0x90, 0x10, 0x0E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l93_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3B, + 0xCC, 0x38, + 0xCC, 0x18, + 0xFC, 0x3C, + 0xF8, 0x38, + 0xC0, 0x33, + 0xEC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l93_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x07, + 0x1C, 0x03, 0x07, + 0x1C, 0x07, 0x07, + 0x1C, 0x07, 0x07, + 0x9C, 0x87, 0x03, + 0xB8, 0xC7, 0x07, + 0xF0, 0x07, 0x07, + 0x00, 0x07, 0x0E, + 0x00, 0x03, 0x0E, + 0x00, 0x3B, 0x0E, + 0x9C, 0x3B, 0x07, + 0xB8, 0x71, 0x07, + 0xF8, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l93_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xE7, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x1C, 0xC0, 0x03, + 0x1E, 0x1C, 0xC0, 0x01, + 0x1E, 0x1C, 0xE0, 0x01, + 0x1E, 0x1C, 0xFC, 0x00, + 0x1C, 0x1E, 0xFC, 0x00, + 0x3C, 0x1F, 0xE0, 0x01, + 0xF8, 0x1F, 0xC0, 0x03, + 0xF0, 0x1F, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0x8E, 0xC7, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l94.xbm b/app/bin/bitmaps/l94.xbm index 5732695..65f4306 100644 --- a/app/bin/bitmaps/l94.xbm +++ b/app/bin/bitmaps/l94.xbm @@ -1,6 +1,78 @@ -#define l94_width 14 -#define l94_height 16 -static char l94_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x08, 0x21, 0x0C, 0x21, 0x0A, - 0x21, 0x09, 0xBE, 0x08, 0xA0, 0x1F, 0x20, 0x08, 0x10, 0x08, 0x0E, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l94_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1C, + 0xFC, 0x1C, + 0xCC, 0x1E, + 0xCC, 0x1E, + 0xFC, 0x1F, + 0xF8, 0x1B, + 0xC0, 0x3F, + 0xEC, 0x18, + 0x78, 0x18, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l94_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0x80, 0x03, + 0xB8, 0x83, 0x03, + 0x9C, 0xC3, 0x03, + 0x1C, 0xC3, 0x03, + 0x1C, 0xE7, 0x03, + 0x1C, 0xE7, 0x03, + 0x9C, 0xF7, 0x03, + 0xB8, 0xB7, 0x03, + 0xF0, 0xBF, 0x03, + 0x00, 0x9F, 0x03, + 0x00, 0xFF, 0x0F, + 0x00, 0x83, 0x03, + 0x9C, 0x83, 0x03, + 0xB8, 0x81, 0x03, + 0xF8, 0x80, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l94_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xF0, 0x00, + 0xF8, 0x07, 0xF0, 0x00, + 0x7C, 0x0F, 0xF8, 0x00, + 0x3C, 0x0E, 0xF8, 0x00, + 0x1E, 0x1C, 0xFC, 0x00, + 0x1E, 0x1C, 0xFC, 0x00, + 0x1E, 0x1C, 0xFE, 0x00, + 0x1E, 0x1C, 0xEE, 0x00, + 0x1E, 0x1C, 0xEF, 0x00, + 0x1C, 0x9E, 0xE7, 0x00, + 0x3C, 0x9F, 0xE7, 0x00, + 0xF8, 0xDF, 0xE3, 0x00, + 0xF0, 0xDF, 0xE1, 0x00, + 0x00, 0xFC, 0xFF, 0x03, + 0x00, 0xFC, 0xFF, 0x03, + 0x1C, 0x1E, 0xE0, 0x00, + 0x1C, 0x0E, 0xE0, 0x00, + 0x3C, 0x0F, 0xE0, 0x00, + 0xF8, 0x07, 0xE0, 0x00, + 0xF0, 0x03, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l95.xbm b/app/bin/bitmaps/l95.xbm index 33560b1..e8ab2c2 100644 --- a/app/bin/bitmaps/l95.xbm +++ b/app/bin/bitmaps/l95.xbm @@ -1,6 +1,78 @@ -#define l95_width 14 -#define l95_height 16 -static char l95_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0xA1, 0x00, 0xA1, 0x00, - 0xA1, 0x0F, 0x3E, 0x10, 0x20, 0x10, 0x20, 0x10, 0x90, 0x10, 0x0E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l95_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x07, + 0xCC, 0x07, + 0xCC, 0x1F, + 0xFC, 0x3B, + 0xF8, 0x30, + 0xC0, 0x33, + 0xEC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l95_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF0, 0x07, + 0xB8, 0x73, 0x00, + 0x9C, 0x73, 0x00, + 0x1C, 0x33, 0x00, + 0x1C, 0x37, 0x00, + 0x1C, 0xFF, 0x03, + 0x9C, 0x7F, 0x07, + 0xB8, 0x3F, 0x07, + 0xF0, 0x07, 0x0E, + 0x00, 0x07, 0x0E, + 0x00, 0x03, 0x0E, + 0x00, 0x3B, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x71, 0x07, + 0xF8, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l95_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFF, 0x03, + 0xF8, 0x07, 0xFF, 0x03, + 0x7C, 0x0F, 0x07, 0x00, + 0x3C, 0x0E, 0x07, 0x00, + 0x1E, 0x9C, 0x07, 0x00, + 0x1E, 0x9C, 0x07, 0x00, + 0x1E, 0x9C, 0x7F, 0x00, + 0x1E, 0x9C, 0xFF, 0x01, + 0x1E, 0x9C, 0xE7, 0x01, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x1F, 0xC0, 0x03, + 0xF8, 0x1F, 0x80, 0x03, + 0xF0, 0x1F, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1C, 0xDE, 0xC3, 0x03, + 0x1C, 0x8E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l96.xbm b/app/bin/bitmaps/l96.xbm index a959a68..b114e81 100644 --- a/app/bin/bitmaps/l96.xbm +++ b/app/bin/bitmaps/l96.xbm @@ -1,6 +1,78 @@ -#define l96_width 14 -#define l96_height 16 -static char l96_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x00, 0xA1, 0x00, - 0xA1, 0x0F, 0xBE, 0x10, 0xA0, 0x10, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l96_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x03, + 0xCC, 0x1F, + 0xFC, 0x3F, + 0xF8, 0x33, + 0xC0, 0x33, + 0xEC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l96_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x1C, 0x3B, 0x00, + 0x1C, 0x3F, 0x00, + 0x1C, 0x3F, 0x00, + 0x9C, 0xFF, 0x03, + 0xB8, 0x7F, 0x07, + 0xF0, 0x3F, 0x07, + 0x00, 0x3F, 0x0E, + 0x00, 0x3B, 0x0E, + 0x00, 0x3B, 0x0E, + 0x9C, 0x33, 0x07, + 0xB8, 0x71, 0x07, + 0xF8, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l96_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0xFC, 0x00, + 0xF8, 0x07, 0xFF, 0x01, + 0x7C, 0x0F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0x03, 0x00, + 0x1E, 0xDC, 0x03, 0x00, + 0x1E, 0xDC, 0x7F, 0x00, + 0x1E, 0xDC, 0xFF, 0x01, + 0x1C, 0xDE, 0xEF, 0x01, + 0x3C, 0xDF, 0xC7, 0x03, + 0xF8, 0xDF, 0x83, 0x03, + 0xF0, 0xDF, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1C, 0x9E, 0x83, 0x03, + 0x1C, 0x8E, 0xC7, 0x03, + 0x3C, 0x8F, 0xEF, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7C, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l97.xbm b/app/bin/bitmaps/l97.xbm index 1cd2c1e..75ab190 100644 --- a/app/bin/bitmaps/l97.xbm +++ b/app/bin/bitmaps/l97.xbm @@ -1,6 +1,78 @@ -#define l97_width 14 -#define l97_height 16 -static char l97_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x1F, 0x21, 0x10, 0x21, 0x08, - 0x21, 0x08, 0x3E, 0x04, 0x20, 0x04, 0x20, 0x02, 0x10, 0x02, 0x0E, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l97_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x3F, + 0xFC, 0x38, + 0xCC, 0x18, + 0xCC, 0x1C, + 0xFC, 0x0C, + 0xF8, 0x0E, + 0xC0, 0x0E, + 0xEC, 0x06, + 0x78, 0x06, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l97_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xF8, 0x0F, + 0xB8, 0x03, 0x0F, + 0x9C, 0x03, 0x07, + 0x1C, 0x83, 0x03, + 0x1C, 0x87, 0x03, + 0x1C, 0xC7, 0x01, + 0x9C, 0xC7, 0x01, + 0xB8, 0xC7, 0x01, + 0xF0, 0xE7, 0x00, + 0x00, 0xE7, 0x00, + 0x00, 0xE3, 0x00, + 0x00, 0xE3, 0x00, + 0x9C, 0xE3, 0x00, + 0xB8, 0x71, 0x00, + 0xF8, 0x70, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l97_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0xC3, 0xFF, 0x03, + 0xF8, 0xC7, 0xFF, 0x03, + 0x7C, 0x0F, 0xC0, 0x03, + 0x3C, 0x0E, 0xE0, 0x01, + 0x1E, 0x1C, 0xE0, 0x01, + 0x1E, 0x1C, 0xF0, 0x00, + 0x1E, 0x1C, 0xF0, 0x00, + 0x1E, 0x1C, 0x78, 0x00, + 0x1E, 0x1C, 0x78, 0x00, + 0x1C, 0x1E, 0x38, 0x00, + 0x3C, 0x1F, 0x3C, 0x00, + 0xF8, 0x1F, 0x3C, 0x00, + 0xF0, 0x1F, 0x1C, 0x00, + 0x00, 0x1C, 0x1E, 0x00, + 0x00, 0x1C, 0x1E, 0x00, + 0x1C, 0x1E, 0x1E, 0x00, + 0x1C, 0x0E, 0x1E, 0x00, + 0x3C, 0x0F, 0x0E, 0x00, + 0xF8, 0x07, 0x0E, 0x00, + 0xF0, 0x03, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l98.xbm b/app/bin/bitmaps/l98.xbm index bad329d..744aad6 100644 --- a/app/bin/bitmaps/l98.xbm +++ b/app/bin/bitmaps/l98.xbm @@ -1,6 +1,78 @@ -#define l98_width 14 -#define l98_height 16 -static char l98_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0xA1, 0x10, 0x3E, 0x0F, 0xA0, 0x10, 0xA0, 0x10, 0x90, 0x10, 0x0E, 0x0F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l98_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x3B, + 0xCC, 0x3F, + 0xFC, 0x1E, + 0xF8, 0x3F, + 0xC0, 0x33, + 0xEC, 0x3F, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l98_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x03, + 0xB8, 0x73, 0x07, + 0x9C, 0x33, 0x07, + 0x1C, 0x3B, 0x07, + 0x1C, 0x3F, 0x07, + 0x1C, 0x3F, 0x07, + 0x9C, 0x77, 0x07, + 0xB8, 0xE7, 0x03, + 0xF0, 0x77, 0x07, + 0x00, 0x3F, 0x06, + 0x00, 0x3B, 0x0E, + 0x00, 0x3B, 0x0E, + 0x9C, 0x3B, 0x06, + 0xB8, 0x71, 0x07, + 0xF8, 0xE0, 0x03, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l98_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC3, 0x03, + 0x1E, 0x9C, 0xC7, 0x01, + 0x1E, 0x1C, 0xEF, 0x01, + 0x1E, 0x1C, 0xFE, 0x00, + 0x1C, 0x1E, 0xFF, 0x00, + 0x3C, 0x9F, 0xE7, 0x01, + 0xF8, 0x9F, 0xC3, 0x03, + 0xF0, 0xDF, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x00, 0xDC, 0x83, 0x03, + 0x1C, 0xDE, 0x83, 0x03, + 0x1C, 0x8E, 0xC3, 0x03, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x01, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/l99.xbm b/app/bin/bitmaps/l99.xbm index 53b1b0e..b7d956a 100644 --- a/app/bin/bitmaps/l99.xbm +++ b/app/bin/bitmaps/l99.xbm @@ -1,6 +1,78 @@ -#define l99_width 14 -#define l99_height 16 -static char l99_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0xA1, 0x10, 0xA1, 0x10, - 0xA1, 0x10, 0x3E, 0x1F, 0x20, 0x10, 0x20, 0x10, 0x10, 0x08, 0x0E, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static char l99_x16[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x78, 0x1E, + 0xFC, 0x3F, + 0xCC, 0x33, + 0xCC, 0x33, + 0xFC, 0x3F, + 0xF8, 0x3E, + 0xC0, 0x30, + 0xEC, 0x3B, + 0x78, 0x1E, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; + +static char l99_x24[] = { + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0xF0, 0xE0, 0x01, + 0xB8, 0x73, 0x07, + 0x9C, 0x3B, 0x07, + 0x1C, 0x3B, 0x06, + 0x1C, 0x3F, 0x0E, + 0x1C, 0x3F, 0x0E, + 0x9C, 0x3F, 0x0F, + 0xB8, 0x77, 0x0F, + 0xF0, 0xE7, 0x0F, + 0x00, 0x07, 0x0E, + 0x00, 0x03, 0x06, + 0x00, 0x03, 0x06, + 0x9C, 0x3B, 0x07, + 0xB8, 0x71, 0x03, + 0xF8, 0xF0, 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, }; + +static char l99_x32[] = { + 0x00, 0x00, 0x00, 0x00, + 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, 0x03, 0x7E, 0x00, + 0xF8, 0x07, 0xFF, 0x00, + 0x7C, 0x8F, 0xEF, 0x01, + 0x3C, 0x8E, 0xC7, 0x01, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1E, 0xDC, 0x83, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x3C, 0x9F, 0xE7, 0x03, + 0xF8, 0x1F, 0xFF, 0x03, + 0xF0, 0x1F, 0xFE, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x00, 0x1C, 0x80, 0x03, + 0x1C, 0x9E, 0xC3, 0x03, + 0x1C, 0x8E, 0xC3, 0x01, + 0x3C, 0x8F, 0xE7, 0x01, + 0xF8, 0x07, 0xFF, 0x00, + 0xF0, 0x03, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; + diff --git a/app/bin/bitmaps/layers.xpm b/app/bin/bitmaps/layers.xpm new file mode 100644 index 0000000..60e1761 --- /dev/null +++ b/app/bin/bitmaps/layers.xpm @@ -0,0 +1,110 @@ +static char *layers_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " ", + " ", + " 177777777771 ", + " 0755555555541 ", + " 1455555555570 ", + " 13555555555411 ", + " 13333333333231 ", + " 01777777777371 ", + " 1666666666610 ", + " 17333333333720 ", + " 11122222222271 ", + " 133333333331 ", + " 0233333333371 ", + " 011111111111 ", + " ", + " "}; + +static char *layers_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " ", + " ", + " ", + " 100000000000000001 ", + " 165555555555555552 ", + " 155555555555555541 ", + " 165555555555555552 ", + " 155555555555555561 ", + " 165555555555555551001 ", + " 14444444444444443761 ", + " 11122222222222227631 ", + " 136666666666666661 ", + " 166666666666666631 ", + " 136666666666666661001 ", + " 133333333333333372320 ", + " 11122222222222222371 ", + " 0233333333333333320 ", + " 173333333333333371 ", + " 0233333333333333320 ", + " 173333333333333371 ", + " 00000000000000000 ", + " ", + " ", + " "}; + +static char *layers_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " ", + " ", + " ", + " ", + " 10000000000000000000001 ", + " 135555555555555555555561 ", + " 14555555555555555555551 ", + " 135555555555555555555561 ", + " 15555555555555555555551 ", + " 165555555555555555555561 ", + " 155555555555555555555410 ", + " 165555555555555555555531221 ", + " 155555555555555555555416671 ", + " 117277777777777777777727631 ", + " 173333333333333333336620 ", + " 026666666666666666666631 ", + " 136666666666666666666620 ", + " 026666666666666666666631000 ", + " 136666666666666666666622720 ", + " 1266666666666666666666313370 ", + " 100000000000000000000017330 ", + " 173333333333333333333320 ", + " 013333333333333333333330 ", + " 173333333333333333333320 ", + " 013333333333333333333330 ", + " 173333333333333333333320 ", + " 017777777777777777777770 ", + " 111111111111111111111110 ", + " ", + " ", + " ", + " "}; + +static char **layers_xpm[3] = { layers_x16, layers_x24, layers_x32 }; + diff --git a/app/bin/bitmaps/magnet.xpm b/app/bin/bitmaps/magnet.xpm index 99a31db..3d9a5ac 100644 --- a/app/bin/bitmaps/magnet.xpm +++ b/app/bin/bitmaps/magnet.xpm @@ -1,22 +1,139 @@ -/* XPM */ -static char * magnet_xpm[] = { -"16 16 3 1", -" c #FF0000", -". c None", -"X c #FFFF00", -"................", -"........ ......", -"....... ....", -"...... ...", -"..... ..", -"..... . .", -".... ... .", -"... ... .", -"..XXX ... ..", -".XXXXX... ..", -"..XXXX.. ...", -"...XX..XX ....", -"......XXXXX ....", -"......XXXXX.....", -"........XX......", -"................"}; +static char *magnet_x16[] = { + "16 16 18 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #666600", + "6 c #990000", + "7 c #999900", + "8 c #CC0000", + "9 c #CC3300", + "A c #CC9900", + "B c #CCCC00", + "C c #FF0000", + "D c #FF6600", + "E c #FFCC00", + "F c #FFFF00", + "G c #800000", + " 1110 ", + " 11888610 ", + " 16CCCCCCG0 ", + " 08CC836CCC30", + " 06CC83 13CC81", + " 3CC83 GCC1", + " 1CCC3 3CC1", + " 5DCC3 38C81", + "5BEDG1 38CC3 ", + " 5EA4 38CCG0 ", + " 55 18CC61 ", + " 18CC81 ", + " 5ACC83 ", + " 27FE93 ", + " 5AB5 ", + " 55 "}; + +static char *magnet_x24[] = { + "24 24 19 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #666600", + "6 c #990000", + "7 c #996600", + "8 c #999900", + "9 c #CC0000", + "A c #CC9900", + "B c #FF0000", + "C c #FF6600", + "D c #FF9900", + "E c #FFCC00", + "F c #FFFF00", + "G c #800000", + "H c #808000", + " 000 ", + " 3399G310 ", + " 019BBBBBBG1 ", + " 0GBBBBBBBBB91 ", + " 0GBBBBBBBBBBBB1 ", + " 06BBBBBG319BBBBB1 ", + " 03BBBBB31 GGBBBBG0", + " 3BBBBB3 6GBBB91", + " 1BBBBB3 G9BBB1", + " 19BBBBG 39BBB1", + " 29BBBB6G G9BBB60", + " 48DBBB93 GGBBBB1 ", + "58FFDB91 GBBBBG0 ", + " 5EFFE3 GBBBB91 ", + " 5EE72 3BBBBB1 ", + " 5H4 3BBBBB3 ", + " 2 3BBBBB3 ", + " 13BBBBBG1 ", + " HCBBBBG1 ", + " 5EECBB63 ", + " 48FFFD61 ", + " 5HEFA2 ", + " 45A5 ", + " 5 "}; + +static char *magnet_x32[] = { + "32 32 19 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #660000", + "4 c #663300", + "5 c #666600", + "6 c #990000", + "7 c #996600", + "8 c #CC0000", + "9 c #CC9900", + "A c #CCCC00", + "B c #FF0000", + "C c #FF3300", + "D c #FF6600", + "E c #FFCC00", + "F c #FFFF00", + "G c #800000", + "H c #808000", + " ", + " 013GGG010 ", + " 16BBBBBB8G00 ", + " 38BBBBBBBBBB30 ", + " 03BBBBBBBBBBBBB80 ", + " 03BBBBBBBBBBBBBBB80 ", + " 0GBBBBBBB88BBBBBBBB80 ", + " 03BBBBBBB83G3GBBBBBBBG0 ", + " 1BBBBBBB61 G38BBBBBB0 ", + " 1BBBBBBB61 G8BBBBBG0", + " 1BBBBBBB63 3BBBBB80", + " 08BBBBBB63 6GBBBB80", + " 06BBBBBB63 68BBBB81", + " 03BBBBBB83 8GBBBBBG0", + " 5CBBBBB83 3BBBBBB1 ", + " 5EECBBBB3 G8BBBBBG0 ", + " 5EFFECBBG1 G8BBBBB81 ", + " 5EFFFED81 G8BBBBBB1 ", + " 5EFFFE4 38BBBBBBG0 ", + " 5EFE5 38BBBBBB81 ", + " 5A5 18BBBBBB81 ", + " 5 18BBBBBB81 ", + " 08BBBBBBB3 ", + " 08BBBBBBB3 ", + " 59CBBBBBB3 ", + " 5AFECBBBB3 ", + " 59FFFECBBG ", + " 45EFFFEDG0 ", + " 5EFFE70 ", + " 5EE74 ", + " 5H2 ", + " 2 "}; + +static char **magnet_xpm[3] = { magnet_x16, magnet_x24, magnet_x32 }; + diff --git a/app/bin/bitmaps/magnifier.xpm b/app/bin/bitmaps/magnifier.xpm deleted file mode 100644 index 69a3faa..0000000 --- a/app/bin/bitmaps/magnifier.xpm +++ /dev/null @@ -1,89 +0,0 @@ -/* XPM */ -static char * magnifier_xpm[] = { -"16 16 70 1", -" c None", -". c #545454", -"+ c #555555", -"@ c #515151", -"# c #5E6063", -"$ c #94A3B1", -"% c #C5D5E6", -"& c #DFEAF4", -"* c #D9E3ED", -"= c #A2ACB6", -"- c #4D4D4D", -"; c #5A5D5F", -"> c #AEC1D5", -", c #C4D8EB", -"' c #E2ECF6", -") c #E4EDF6", -"! c #B8C8D9", -"~ c #5B5D60", -"{ c #494949", -"] c #919FAD", -"^ c #BBD2E8", -"/ c #D5E3F1", -"( c #D6E4F2", -"_ c #97A4B0", -": c #434343", -"< c #B6CBE0", -"[ c #C1D3E4", -"} c #3E3E3E", -"| c #BED4E9", -"1 c #C8DBED", -"2 c #383838", -"3 c #BCCFE1", -"4 c #CAD8E7", -"5 c #313131", -"6 c #939DA8", -"7 c #BFD5EA", -"8 c #DFE9F5", -"9 c #9EA6AD", -"0 c #373737", -"a c #444647", -"b c #C4D1DE", -"c c #D9E6F3", -"d c #E6EFF7", -"e c #D3D9DF", -"f c #3B3C3D", -"g c #262626", -"h c #3B3B3B", -"i c #3C3C3C", -"j c #ADADAF", -"k c #28292B", -"l c #91979D", -"m c #E3E8EE", -"n c #EDF3F9", -"o c #E5EAEF", -"p c #9EA0A3", -"q c #282829", -"r c #464647", -"s c #B8B8BC", -"t c #151516", -"u c #141414", -"v c #3D3D3D", -"w c #515153", -"x c #C4C4CC", -"y c #212122", -"z c #606064", -"A c #D1D1DD", -"B c #2E2E30", -"C c #DADAEA", -"D c #3F3F43", -"E c #151515", -" .+++++. ", -" @#$%&*=#@ ", -" -;>,'))'!~-", -" {]^/))))(_{", -" :<^^^^^^^[:", -" }|^^)))))1}", -" 23^))))))42", -" 5678))))'95", -" 0abc)))defg", -" hijklmnopq ", -" irst uuuuu ", -" vwxy ", -" }zAB ", -" 0CD ", -" Eu ", -" "}; diff --git a/app/bin/bitmaps/manage.xpm b/app/bin/bitmaps/manage.xpm new file mode 100644 index 0000000..12264cf --- /dev/null +++ b/app/bin/bitmaps/manage.xpm @@ -0,0 +1,110 @@ +static char *manage_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " 11 ", + " 1370 ", + " 101 1361 111 ", + " 247074432742 ", + " 134444444431 ", + " 24432734470 ", + " 1743744734310 ", + "1274424555144330", + "1344414555144630", + "111347355674611 ", + " 14471274470 ", + " 24444644431 ", + " 1463644677470 ", + " 171013410121 ", + " 0 0761 ", + " 101 "}; + +static char *manage_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " 00 ", + " 1331 ", + " 2440 ", + " 11 02441 111 ", + " 173100164431102431 ", + " 144473444444334441 ", + " 134444444444444421 ", + " 1644444444444431 ", + " 1344462102644431 ", + " 14446745547644410 ", + " 11134442455554244447201", + "076644442555555764444461", + "134444462555555734444461", + "013344441455555244447101", + " 0024443755553344420 ", + " 1344431732344461 ", + " 0744444336444461 ", + " 16444444444444471 ", + " 134466444444634442 ", + " 164311164447112441 ", + " 171 14431 11 ", + " 0 14470 ", + " 13620 ", + " 111 "}; + +static char *manage_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " ", + " 11221 ", + " 164430 ", + " 164430 ", + " 11 164431 11 ", + " 1331 02444410 2461 ", + " 164431112444444701244461 ", + " 144446364444444446444461 ", + " 13444444444444444444441 ", + " 134444444444444444441 ", + " 14444444373344444461 ", + " 14444431011003444441 ", + " 0744443074554707444431 ", + " 016444417555555306444421111 ", + " 1227644443045555555174444466620", + "02444444447255555555324444444430", + "07444444447255555555324444444430", + " 244444444305555555527444443332 ", + " 100074444603555555403444471000 ", + " 1344447065555412444431 ", + " 14444470233702444442 ", + " 13444443710234444440 ", + " 164444444444444444421 ", + " 13444444444444444444421 ", + " 174444444444444444444441 ", + " 164443123444444620164441 ", + " 14431 12444431 13471 ", + " 1121 174441 111 ", + " 074441 ", + " 074440 ", + " 13371 ", + " 000 "}; + +static char **manage_xpm[3] = { manage_x16, manage_x24, manage_x32 }; + diff --git a/app/bin/bitmaps/map.xpm b/app/bin/bitmaps/map.xpm index 5d47930..e123f7f 100644 --- a/app/bin/bitmaps/map.xpm +++ b/app/bin/bitmaps/map.xpm @@ -1,24 +1,169 @@ -/* XPM */ -static char * map_xpm[] = { -"16 16 5 1", -"o c None", -" c #000000000000", -". c #FFFFFFFFFFFF", -"X c #0000FFFFFFFF", -"Y c #FFFF7DF70000", -"................", -". ...... .....", -". . .... . ....", -". .. .. .. . ...", -". YY. ... .. ..", -". .YY. ... ... .", -". X.YY ..X ... .", -". XX.Y YXX X.. .", -". .XX. YYY YX. .", -". ..XX XX. YYX .", -". ...X X.. .YY .", -". ... .. ... .", -".. .. . . .. .", -"... . ... . .", -".... ..... .", -"................"}; +static char *map_x16[] = { + "16 16 28 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #003366", + "3 c #0099CC", + "4 c #00CCFF", + "5 c #330000", + "6 c #330033", + "7 c #333300", + "8 c #333366", + "9 c #660033", + "A c #663300", + "B c #666699", + "C c #990066", + "D c #993300", + "E c #993399", + "F c #996600", + "G c #CC0099", + "H c #CC3399", + "I c #CC6600", + "J c #CC9900", + "K c #CC9933", + "L c #CC99CC", + "M c #FF0099", + "N c #FF00CC", + "O c #FF33CC", + "P c #FF6699", + "Q c #FF9900", + "0 0 ", + "000 00000 ", + "00000 000 0 000 ", + "00 000 0QQ 00", + "0AQQ 0 Q0 QQ 0", + "DIQQQ7JQQ 0 Q70", + "50 7KP 0 QF0", + "00 5MNN 0 QJA", + "5CNNN9G NN044 0", + "6EN 0 N04 4B6", + "2344 1 40L OH8", + "00 4424 440NNN81", + "00 034 00 0", + "000 0 000000 0", + " 000000 000", + " 00 00"}; + +static char *map_x24[] = { + "24 24 29 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #003366", + "3 c #006666", + "4 c #006699", + "5 c #0099CC", + "6 c #00CCFF", + "7 c #330000", + "8 c #330033", + "9 c #333300", + "A c #336699", + "B c #660033", + "C c #660066", + "D c #663300", + "E c #6699CC", + "F c #66CCFF", + "G c #990066", + "H c #996600", + "I c #CC0099", + "J c #CC3399", + "K c #CC6600", + "L c #FF0099", + "M c #FF00CC", + "N c #FF3399", + "O c #FF33CC", + "P c #FF66CC", + "Q c #FF9900", + "R c #FF9933", + " ", + " 00 000 ", + " 0000 0000000 ", + " 0 000 000 0 00 ", + " 0 00000 DK 000 ", + " 0 00 QDKQQ 00", + " 0 QQ 0 Q7 QQ 00", + " 9QQQQQ 0 Q 0 QQ 00", + "HDQ QQ9QQQQ 0 Q 00", + " 0 9QRN 0 Q 00", + " 0 0MMMM 0 QQD0", + " 0 8MMMMM 0 QQHD", + " 0 MMMMLBM MMM0 666 00", + " BMMMM I0 MMC46 66 00", + " 1 0 MGE 6FB0", + " 3666 0 FGJ MOG8", + " 0 666662 66CIMMMMMA2", + " 0 6516 66 0GMMM 00", + " 0 0 66 00 00", + " 00 0 00000 00", + " 000 0 00 000 00", + " 000 0 00 00000", + " 00000 000", + " 0 "}; + +static char *map_x32[] = { + "32 32 29 1", + " c None", + "0 c #000000", + "1 c #006666", + "2 c #006699", + "3 c #0099CC", + "4 c #00CCCC", + "5 c #00CCFF", + "6 c #330000", + "7 c #333300", + "8 c #333366", + "9 c #663300", + "A c #666699", + "B c #66CCFF", + "C c #990066", + "D c #993399", + "E c #996600", + "F c #996699", + "G c #9999CC", + "H c #9999FF", + "I c #CC0099", + "J c #CC6600", + "K c #CC66CC", + "L c #CC9900", + "M c #FF0099", + "N c #FF00CC", + "O c #FF33CC", + "P c #FF6699", + "Q c #FF9900", + "R c #FF9933", + " ", + " 0 00 ", + " 000 000000 ", + " 0 000 00 00 000 ", + " 0 000 00 00 000 ", + " 0 000 00 EE 00 ", + " 0 00000 JJQQ 00 ", + " 0 00 QJEQQQQ 0 ", + " 0 QQQ 0 QQE0 QQQQ 0 ", + " 0 QQQQQQ 0 QQQ00 QQQ 0 ", + " 9QQQQQQQQJ0 QQQQQ 00 QQ 0 ", + " 7QQ QQLEQQQQQQ 00 QQ 0 ", + " 0 LEQQRP 00 QQQ 0 ", + " 0 6 NNNN 00 QQQ 0 ", + " 0 6NNNNNN 00 QQQ0 ", + " 0 ICNN NNNN 00 55 QQQ0 ", + " 0 NNNNNNICN NNNN00 555 0 ", + " 0MNNNNNNNI6 NNNC0555555 0 ", + " 0MNN 0 NNIA55 5555 0 ", + " 045 0 NIF5 55BK0 ", + " 055555 0 HIIB KON0 ", + " 03555555531 55DIN NNNOG0 ", + " 0 55555325 55558CNNNNNN 0 ", + " 0 55315555555 00NNNN 0 ", + " 0 055555 00 0 ", + " 00 0 55 0000 0 ", + " 000 0 000 000 0 ", + " 000 0 00 000 0 ", + " 000 0 00 000 0 ", + " 0000000 000 ", + " 000 0 ", + " "}; + +static char **map_xpm[3] = { map_x16, map_x24, map_x32 }; + diff --git a/app/bin/bitmaps/move.xpm b/app/bin/bitmaps/move.xpm index ab90555..5482a6b 100644 --- a/app/bin/bitmaps/move.xpm +++ b/app/bin/bitmaps/move.xpm @@ -1,23 +1,119 @@ -/* XPM */ -static char * move_xpm[] = { -"16 16 4 1", -" c None", -". c #0000FFFFFFFF", -"X c #000000000000", -"o c #FFFF00000000", -" . . X X ", -"...... XXXXXX ", -" . . X X ", -" . . o X X ", -" . . oX X ", -"...... XoXXXX ", -" . . Xo X ", -" . oooooooooXX ", -" . . Xo X ", -"...... XoXXXX ", -" . . oX X ", -" . . o X X ", -" . . X X ", -"...... XXXXXX ", -" . . X X ", -" "}; +static char *move_x16[] = { + "16 16 7 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099FF", + "3 c #CC0000", + "4 c #CCCCCC", + "5 c #808080", + " 1 1 5 5 ", + "21212 45454", + " 1 1 5 5 ", + "21212 45454", + " 1 1 5 5 ", + "21212 3 45454", + " 1 1 33 5 5 ", + "21212 333333 454", + " 1 1 33 5 5 ", + "21212 3 45454", + " 1 1 5 5 ", + "21212 45454", + " 1 1 5 5 ", + "21212 45454", + " 1 1 5 5 ", + " "}; + +static char *move_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #006699", + "2 c #009999", + "3 c #0099CC", + "4 c #00CCCC", + "5 c #666666", + "6 c #996666", + "7 c #999999", + "8 c #CC0000", + "9 c #CC3333", + "A c #CC6666", + "B c #CC9999", + "C c #C0C0C0", + "D c #808080", + " ", + " 1 1 55 5 ", + " 44144424 CD7CCD7C ", + " 1 1 55 5 ", + " 1 1 55 5 ", + " 44144424 CD7CCD7C ", + " 31 31 DD 5D ", + " 1 1 55 5 ", + " 44144314 B6DCCD7C ", + " 4144314 A86CCD7 ", + " 1 1 98 5 ", + " 4147666888888AA89BD7 ", + " 44147666988889A698BD7C ", + " 1 1 988 5 ", + " 31 31 A89 5D ", + " 44144424 B67CCD7C ", + " 1 1 55 5 ", + " 1 1 55 5 ", + " 44144424 CD7CCD7C ", + " 1 1 55 5 ", + " 1 1 55 5 ", + " 44144424 CD7CCD7C ", + " 31 31 DD 5D ", + " 1 1 5 "}; + +static char *move_x32[] = { + "32 32 14 1", + " c None", + "0 c #000000", + "1 c #006699", + "2 c #0099CC", + "3 c #00CCCC", + "4 c #666666", + "5 c #996666", + "6 c #999999", + "7 c #CC0000", + "8 c #CC3333", + "9 c #CC6666", + "A c #CC9999", + "B c #C0C0C0", + "C c #808080", + " ", + " 1 1 4 4 ", + " 1 12 4 46 ", + " 3313333133 BB4BBBBC6B ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 3313333133 BB4BBBBC6B ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 3313333133 BA4BBBBC6B ", + " 1 12 977A 46 ", + " 1 1 777 4 ", + " 1 1 877 4 ", + " 331368777777777777777779B46B ", + " 331367777777777777777778B46B ", + " 1 1 877 4 ", + " 1 1 777 4 ", + " 1 1 77 4 ", + " 3313333133 A95BBBBC6B ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 3313333133 BB4BBBBC6B ", + " 1 12 4 46 ", + " 1 1 4 4 ", + " 1 1 4 4 ", + " 3313333133 BB4BBBB46B ", + " 3313333133 BB4BBBB46B ", + " 1 1 4 4 ", + " "}; + +static char **move_xpm[3] = { move_x16, move_x24, move_x32 }; + diff --git a/app/bin/bitmaps/movedesc.xpm b/app/bin/bitmaps/movedesc.xpm deleted file mode 100644 index 520cfd6..0000000 --- a/app/bin/bitmaps/movedesc.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * movedesc_xpm[] = { -"16 16 4 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -"o c #0000FFFFFFFF", -" .. .. .. .. ", -" . . . . . ", -" . . .. .. . ", -" . . . . . ", -" .. ..X.. .. ", -" XXX ", -" X X X ", -" X X X ", -" X ", -" . . X . ", -"..oo..ooX o.oo..", -" .o o o Xo o. ", -" .o o ooXoo o. ", -" .o o o X o o. ", -"..oo..oo.oo.oo..", -" . . . . "}; diff --git a/app/bin/bitmaps/new-car.xpm b/app/bin/bitmaps/new-car.xpm new file mode 100644 index 0000000..c2fd649 --- /dev/null +++ b/app/bin/bitmaps/new-car.xpm @@ -0,0 +1,100 @@ +static char *new_car_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #339900", + "2 c #663300", + "3 c #808080", + " 11 ", + " 11 ", + " 111111 ", + " 111111 ", + " 11 ", + " 11 ", + " ", + " 22222222222222 ", + " 22222222222222 ", + " 22222222222222 ", + " 22222222222222 ", + " 22222222222222 ", + " 3 3 3 3 ", + " 30303 30303 ", + " 3 3 3 3 ", + " "}; + +static char *new_car_x24[] = { + "24 24 6 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #00CC33", + "3 c #00FF66", + "4 c #663300", + " ", + " 221 ", + " 231 ", + " 1231 ", + " 222332221 ", + " 233333331 ", + " 11123111 ", + " 1231 ", + " 1231 ", + " 11 ", + " ", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + "444444444444444444444444", + " 00 0 00 0 ", + " 0000000 000 000 ", + " 000 000 000 000 ", + " 0 "}; + +static char *new_car_x32[] = { + "32 32 6 1", + " c None", + "0 c #000000", + "1 c #009933", + "2 c #00CC33", + "3 c #00FF66", + "4 c #663300", + " ", + " 11111 ", + " 2331 ", + " 2331 ", + " 12331 ", + " 111123321111 ", + " 233333333331 ", + " 233333333331 ", + " 111123311111 ", + " 12331 ", + " 12331 ", + " 2221 ", + " 1111 ", + " ", + " ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + "4444444444444444444444444444444 ", + " 00 000 00 00 ", + " 00000000 00000000 ", + " 00000000 00000000 ", + " 000 000 000 000 ", + " "}; + +static char **new_car_xpm[3] = { new_car_x16, new_car_x24, new_car_x32 }; + diff --git a/app/bin/bitmaps/newcar.xpm b/app/bin/bitmaps/newcar.xpm deleted file mode 100644 index e1bc24a..0000000 --- a/app/bin/bitmaps/newcar.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * newcar_xpm[] = { -"16 16 4 1", -". c None", -"X c #800080008000", -"o c #000000000000", -" c #FFFFFFFF0000", -" ...X. X.X.... ", -"oooo... ..XX. ", -".. o... ...X .", -"...o ..o ..X ..", -"...o ooo. oo...", -"...o. ooo oo...", -"oooooooooooooo ", -"oooooooooooooo ", -"oooooooooooooo..", -"oooooooooooooooo", -"oooooooooooooooo", -"...oo.. oo ...o", -"..oooo.oooo ..o", -". oooo.oooo. o.", -" .oo.. oo...oo.", -" ...... ..... "}; diff --git a/app/bin/bitmaps/note.xpm b/app/bin/bitmaps/note.xpm new file mode 100644 index 0000000..51bf8c7 --- /dev/null +++ b/app/bin/bitmaps/note.xpm @@ -0,0 +1,114 @@ +static char *note_x16[] = { + "16 16 10 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #999999", + "3 c #CC9900", + "4 c #CC9933", + "5 c #CC9999", + "6 c #FFCC00", + "7 c #FFCC33", + "8 c #FFCC66", + " ", + " ", + " ", + " 444444444444 ", + " 46666666666344 ", + " 46888888886664 ", + " 47222222227664 ", + " 46522222566664 ", + " 46788888866664 ", + " 47111111117664 ", + " 46666666666664 ", + " 46666666666664 ", + " 47777777777774 ", + " ", + " ", + " "}; + +static char *note_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #999999", + "2 c #CC9900", + "3 c #CC9933", + "4 c #CC9999", + "5 c #CCCC66", + "6 c #FFCC00", + "7 c #FFCC33", + "8 c #FFCC66", + " ", + " ", + " ", + " ", + " ", + " 37777777777333333 ", + " 3666666666666666233 ", + " 36666666666666662223 ", + " 36788888888888766663 ", + " 36411111111111566663 ", + " 36666666666666666663 ", + " 36611111111156666663 ", + " 36688888888876666663 ", + " 36844444444444866663 ", + " 36544444444444566663 ", + " 36666666666666666663 ", + " 36666666666666666663 ", + " 36666666666666666663 ", + " 37777777777777777773 ", + " ", + " ", + " ", + " ", + " "}; + +static char *note_x32[] = { + "32 32 11 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #3399CC", + "3 c #999999", + "4 c #CC9900", + "5 c #CC9933", + "6 c #CCCC00", + "7 c #FFCC00", + "8 c #FFCC33", + "9 c #FFCC66", + " ", + " ", + " ", + " ", + " ", + " ", + " 55555555 ", + " 57777778888888888888855 ", + " 877777777777777777777445 ", + " 8777777777777777777774445 ", + " 87777777777777777777774465 ", + " 87799999999999999997777775 ", + " 87833333333333333337777775 ", + " 87777777777777777777777775 ", + " 87777777777777777777777775 ", + " 87782111111111128777777775 ", + " 87777777777777777777777775 ", + " 87777777777777777777777775 ", + " 87833333333333333337777775 ", + " 87799999999999999997777775 ", + " 87777777777777777777777775 ", + " 87777777777777777777777775 ", + " 87777777777777777777777775 ", + " 87777777777777777777777775 ", + " 58888887777777777777777775 ", + " 55555555555555555555 ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char *note_xpm[3] = { note_x16, note_x24, note_x32 }; + diff --git a/app/bin/bitmaps/ok.xpm b/app/bin/bitmaps/ok.xpm new file mode 100644 index 0000000..1671eae --- /dev/null +++ b/app/bin/bitmaps/ok.xpm @@ -0,0 +1,92 @@ +static char *ok_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #008000", + " ", + " 1 ", + " 11 ", + " 111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1 1111 ", + " 11 1111 ", + " 1111111 ", + " 111111 ", + " 1111 ", + " 111 ", + " 1 ", + " "}; + +static char *ok_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #008000", + " ", + " ", + " 1 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 1111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11 11111 ", + " 1111 11111 ", + " 11111 11111 ", + " 111111111 ", + " 11111111 ", + " 111111 ", + " 1111 ", + " 111 ", + " 1 ", + " ", + " "}; + +static char *ok_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #008000", + " ", + " ", + " ", + " 111 ", + " 1111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 11111 ", + " 111111 ", + " 111111 ", + " 1111111 ", + " 1 1111111 ", + " 111 1111111 ", + " 1111 1111111 ", + " 11111 1111111 ", + " 111111111111 ", + " 11111111111 ", + " 111111111 ", + " 11111111 ", + " 111111 ", + " 11111 ", + " 111 ", + " 11 ", + " ", + " ", + " "}; + +static char **ok_xpm[3] = { ok_x16, ok_x24, ok_x32 }; + diff --git a/app/bin/bitmaps/openbutt.xpm b/app/bin/bitmaps/openbutt.xpm deleted file mode 100644 index 99b9666..0000000 --- a/app/bin/bitmaps/openbutt.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * openbutt_xpm[] = { -"7 16 2 1", -" c None", -". c #000000000000", -" ", -" ", -" ", -" ", -" ", -" ", -".......", -" ..... ", -" ... ", -" . ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/app/bin/bitmaps/pan-zoom.xpm b/app/bin/bitmaps/pan-zoom.xpm new file mode 100644 index 0000000..a42beee --- /dev/null +++ b/app/bin/bitmaps/pan-zoom.xpm @@ -0,0 +1,94 @@ +static char *pan_zoom_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #FF0000", + "2 c #FF3333", + " ", + " 11 ", + " 1211 ", + " 111111 ", + " 11 ", + " 1 11 1 ", + " 11 11 11 ", + " 11111111111111 ", + " 11111111111111 ", + " 11 11 11 ", + " 1 11 1 ", + " 11 ", + " 122111 ", + " 1111 ", + " 11 ", + " "}; + +static char *pan_zoom_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #FF0000", + "2 c #FF3333", + " ", + " ", + " 11 ", + " 1111 ", + " 111111 ", + " 11111211 ", + " 11 ", + " 11 ", + " 1 11 1 ", + " 11 11 11 ", + " 111 11 111 ", + " 11111111111111111111 ", + " 11111111111111111111 ", + " 111 11 111 ", + " 11 11 11 ", + " 1 11 1 ", + " 11 ", + " 11 ", + " 11111111 ", + " 111111 ", + " 1111 ", + " 11 ", + " ", + " "}; + +static char *pan_zoom_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #CC0000", + " ", + " ", + " 11 ", + " 111111 ", + " 1111111111 ", + " 111111111111 ", + " 1111 111 111 ", + " 111 ", + " 111 ", + " 111 ", + " 11 111 11 ", + " 111 111 111 ", + " 1111 111 1111 ", + " 111 111 111 ", + " 1111111111111111111111111111 ", + " 11111111111111111111111111111 ", + " 1111111111111111111111111111 ", + " 111 111 111 ", + " 1111 111 1111 ", + " 111 111 111 ", + " 11 111 111 ", + " 111 ", + " 111 ", + " 111 ", + " 111 111 1 ", + " 1111 111 111 ", + " 11111111111 ", + " 111111111 ", + " 11111 ", + " 111 ", + " ", + " "}; + +static char **pan_zoom_xpm[3] = { pan_zoom_x16, pan_zoom_x24, pan_zoom_x32 }; + diff --git a/app/bin/bitmaps/pan.xpm b/app/bin/bitmaps/pan.xpm deleted file mode 100644 index 9575ec5..0000000 --- a/app/bin/bitmaps/pan.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * pan_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" XX ", -" XXXX ", -" XXXXXX. ", -" XX XX XX ", -" XX ", -" XX XX XX ", -" XXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXX ", -" XX XX XX ", -" XX ", -" XX XX XX ", -" XXXXXX ", -" XXXX ", -" XX ", -" "}; diff --git a/app/bin/bitmaps/parallel-line.xpm b/app/bin/bitmaps/parallel-line.xpm index 4ac471d..b490c84 100644 --- a/app/bin/bitmaps/parallel-line.xpm +++ b/app/bin/bitmaps/parallel-line.xpm @@ -1,22 +1,108 @@ -/* XPM */ -static char * parallel_line_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" ", -" ", -"................", -" X ", -" X X ", -" X X ", -" ", -" ", -" . . . ", -"................", -" . . . ", -" . . . ", -" . . . ", -"................", -" . . . "}; +static char *parallel_line_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + " ", + "000000000000000 ", + " ", + " 1 ", + " 111 ", + " 11111 ", + " 1 ", + " 1 ", + " 1 ", + " 2 2 2 2 2 2 ", + "000000000000000 ", + " 2 2 2 2 2 2 2 ", + " 2 2 2 2 2 2 2 ", + "000000000000000 ", + " 2 2 2 2 2 2 2 ", + " "}; + +static char *parallel_line_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666666", + "5 c #996600", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + " ", + " ", + " ", + " 4444444444444444444444 ", + " ", + " 66 ", + " 6666 ", + " 6666 6 ", + " 66 ", + " 66 ", + " 66 ", + " 66 ", + " 66 ", + " 7 ", + " 9 9 99 99 9 9 9 ", + " 0000000000000000000000 ", + " 9 9 99 99 9 9 9 ", + " 9 9 99 99 9 9 9 ", + " 9 9 99 99 9 9 9 ", + " 0300320320230230130031 ", + " 8 85 85 58 58 38 83 ", + " 9 9 9 9 9 9 9 ", + " ", + " "}; + +static char *parallel_line_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666666", + "5 c #996600", + "6 c #CC0000", + "7 c #CC6600", + "8 c #CC9900", + " ", + " ", + " ", + " ", + " 444444444444444444444444444444 ", + " ", + " ", + " 66 ", + " 6666 ", + " 66 6 66 ", + " 6 6 6 ", + " 6 ", + " 6 ", + " 6 ", + " 6 ", + " 6 ", + " 6 ", + " 6 ", + " ", + " 88 88 88 88 88 88 88 ", + " 000000000000000000000000000000 ", + " 88 88 88 88 88 88 88 ", + " 88 88 88 88 88 88 88 ", + " 88 88 88 88 88 88 88 ", + " 88 88 88 88 88 88 88 ", + " 575 575 77 77 573 575 377 ", + " 033202330033003300331023201330 ", + " 88 88 88 88 88 88 88 ", + " ", + " ", + " ", + " "}; + +static char **parallel_line_xpm[3] = { parallel_line_x16, parallel_line_x24, parallel_line_x32 }; + diff --git a/app/bin/bitmaps/parallel.xpm b/app/bin/bitmaps/parallel.xpm index eb816dc..a19f797 100644 --- a/app/bin/bitmaps/parallel.xpm +++ b/app/bin/bitmaps/parallel.xpm @@ -1,22 +1,116 @@ -/* XPM */ -static char * parallel_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -"................", -" . . . ", -" . . . ", -"................", -" . X . ", -" X X ", -" X X ", -" ", -" ", -" . . . ", -"................", -" . . . ", -" . . . ", -" . . . ", -"................", -" . . . "}; +static char *parallel_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #CC9966", + "3 c #CCCCCC", + "4 c #808080", + " 3 3 3 3 3 3 3 ", + "444444444444444 ", + " 3 3 3 3 3 3 3 ", + " 3 3 3 3 3 3 3 ", + "4444444 4444444 ", + " 3 3 3 1 3 3 3 ", + " 111 ", + " 11111 ", + " 1 ", + " 1 ", + " 2 2 2 1 2 2 2 ", + "0000000 0000000 ", + " 2 2 2 2 2 2 2 ", + " 2 2 2 2 2 2 2 ", + "000000000000000 ", + " 2 2 2 2 2 2 2 "}; + +static char *parallel_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #666666", + "4 c #996600", + "5 c #999999", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC6600", + "9 c #CC9900", + "A c #CC9999", + "B c #C0C0C0", + "C c #808080", + " B B B ", + " 55 5 5C 55 C5 5C 55 ", + "3CC33C33C33CC33C33C33CC3", + " BB B B BB B B BB ", + " BB B B BB B B BB ", + " BB B B BB B B BB ", + "3CC33C33C33CC33C33C33CC3", + " 55 5 5C 55 C5 5C 55 ", + " B B B AA B B ", + " 666 ", + " 666666 ", + " 666666 ", + " 66 ", + " 66 ", + " 66 ", + " 77 ", + " 99 9 9 99 9 9 99 ", + "000000000000000000000000", + " 99 9 9 99 9 9 99 ", + " 99 9 9 99 9 9 99 ", + " 99 9 9 99 9 9 99 ", + " 2400400420440140041044 ", + " 2400400420440140041044 ", + " 9 9 9 99 9 9 99 "}; + +static char *parallel_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666666", + "5 c #996600", + "6 c #999999", + "7 c #CC0000", + "8 c #CC6600", + "9 c #CC9900", + "A c #C0C0C0", + "B c #808080", + " ", + " AA AA AA AA AAA AA AA ", + " 46B44B6B4B6B446644B6B446B44B6B ", + " 46B44B6B4B6B446644B6B446B44B6B ", + " AA AA AA AA AAA AA AA ", + " AA AA AA AA AAA AA AA ", + " AA AA AA AA AAA AA AA ", + " AA AA AA AA AAA AA AA ", + " 46B44B6B4B6B446644B6B446B44B6B ", + " 46B44B6B4B6B446644B6B446B44B6B ", + " AA AA AA AA AAA AA AA ", + " ", + " 7777 ", + " 777777 ", + " 77777777 ", + " 77 77 777 ", + " 77 ", + " 77 ", + " 77 ", + " 77 ", + " 77 ", + " 99 99 9 99 9 99 99 ", + " 88 883 585 88 585 88 883 ", + " 0330033102330033002320033003310", + " 99 99 99 99 999 99 99 ", + " 99 99 99 99 999 99 99 ", + " 99 99 99 99 999 99 99 ", + " 99 99 99 99 999 99 99 ", + " 88 883 585 88 585 88 883 ", + " 0330033102330033002320033003310", + " 99 99 99 99 999 99 99 ", + " "}; + +static char **parallel_xpm[3] = { parallel_x16, parallel_x24, parallel_x32 }; + diff --git a/app/bin/bitmaps/parameter.xpm b/app/bin/bitmaps/parameter.xpm new file mode 100644 index 0000000..7a58a6f --- /dev/null +++ b/app/bin/bitmaps/parameter.xpm @@ -0,0 +1,104 @@ +static char *parameter_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #999999", + " 11111111111 ", + " 1 11 ", + " 1 11 ", + " 1 00000000 11 ", + " 1 1 ", + " 1 0 1 ", + " 1 00 1 ", + " 1 00 1 ", + " 1 000 1 ", + " 1 1 ", + " 1 00000000 1 ", + " 1 00 1 ", + " 1 00 1 ", + " 1 00 1 ", + " 1 1 ", + " 11111111111111 "}; + +static char *parameter_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " 7777777777777777 ", + " 234444444444444447 ", + " 2355555555555555537 ", + " 2355100000000000757 ", + " 23555555555555555557 ", + " 235555555555555445547 ", + " 2355555555555437455537 ", + " 2355555555432745555547 ", + " 2355377202765555555547 ", + " 2355544555555555555547 ", + " 2355455555555555555547 ", + " 2355323455555472455547 ", + " 2355554724532345555547 ", + " 355555562074555555547 ", + " 355556234547745555547 ", + " 355323555555432455547 ", + " 355455555555555555547 ", + " 355466336666666455547 ", + " 355666321366666655547 ", + " 355555555326555555547 ", + " 355555555553265555547 ", + " 355555555555562455547 ", + " 355555555555555555547 ", + " 222222222222222222227 "}; + +static char *parameter_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #666666", + "3 c #999999", + "4 c #CCCCCC", + "5 c #FFFFFF", + "6 c #C0C0C0", + "7 c #808080", + " 222222222222222222222 ", + " 73666666666666666666637 ", + " 74555555555555555555557 ", + " 745555555555555555555547 ", + " 7455500000000000000004547 ", + " 74555777777777777777745537 ", + " 74555555555555555555555557 ", + " 745555555555555555547555557 ", + " 7455555555555555547004555547 ", + " 7455555555555543100355555557 ", + " 7455554666637000265555555557 ", + " 7455530000001765555555555557 ", + " 7455546444455555555555555557 ", + " 7455555555555555555555555557 ", + " 7455537455555555554375555557 ", + " 7455531023555555420075555557 ", + " 7455555420074431013555555557 ", + " 7455555554300007455555555557 ", + " 7455555553101100345555555557 ", + " 7455554700245547002655555557 ", + " 7455570134555555532015555557 ", + " 7455544555555555555465555557 ", + " 7455555555555555555555555557 ", + " 7455537777227777777774555557 ", + " 7455570000000000000006555557 ", + " 7455555555531016555555555557 ", + " 7455555555555610135555555557 ", + " 7455555555555556200345555557 ", + " 7455555555555555542005555557 ", + " 7455555555555555555435555557 ", + " 7644444444444444444444444447 ", + " 7777777777777777777777777777 "}; + +static char **parameter_xpm[3] = { parameter_x16, parameter_x24, parameter_x32 }; + diff --git a/app/bin/bitmaps/paste.xpm b/app/bin/bitmaps/paste.xpm new file mode 100644 index 0000000..c820a4e --- /dev/null +++ b/app/bin/bitmaps/paste.xpm @@ -0,0 +1,107 @@ +static char *paste_x16[] = { + "16 16 8 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CCCCCC", + "4 c #FFFFFF", + "5 c #C0C0C0", + "6 c #808080", + " 6116 ", + " 666623326666 ", + "63333222233356 ", + "6444411111111111", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6444144444444441", + "6255144444444441", + " 111111111111111"}; + +static char *paste_x24[] = { + "24 24 8 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CCCCCC", + "4 c #FFFFFF", + "5 c #C0C0C0", + "6 c #808080", + " 66666 ", + " 6533336 ", + " 6111111333336111166 ", + "12444444522224444441 ", + "15444444444444444446 ", + "15444441111111111111111 ", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "154444144444444444444441", + "124444144444444444444441", + " 61111144444444444444441", + " 1111111111111111 "}; + +static char *paste_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CCCCCC", + "4 c #FFFFFF", + "5 c #C0C0C0", + "6 c #808080", + " 111111 ", + " 62555556 ", + " 6244444436 ", + " 6622222266333333662222266 ", + " 64444444442222223444444451 ", + " 64444444444444444444444436 ", + " 24444444444444444444444436 ", + " 244444441111111111111111111111 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 244444441444444444444444444441 ", + " 644444441444444444444444444441 ", + " 665555551444444444444444444441 ", + " 1111111444444444444444444441 ", + " 1111111111111111111111 "}; + +static char **paste_xpm[3] = { paste_x16, paste_x24, paste_x32 }; + diff --git a/app/bin/bitmaps/pause.xpm b/app/bin/bitmaps/pause.xpm new file mode 100644 index 0000000..da61446 --- /dev/null +++ b/app/bin/bitmaps/pause.xpm @@ -0,0 +1,147 @@ +static char* pause_x16[] = { + "16 16 20 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #009966", + "5 c #333333", + "6 c #336633", + "7 c #336666", + "8 c #339966", + "9 c #33CC99", + "A c #666666", + "B c #66CC99", + "C c #99CC99", + "D c #99CCCC", + "E c #CCCCCC", + "F c #CCFFCC", + "G c #CCFFFF", + "H c #FFFFFF", + "I c #808080", + " 0 ", + " 00000 ", + " 01133300 ", + " 001688887210 ", + " 01688888888821 ", + " 07CCCCDDDDDDC5 ", + " 0AEEEEEEEEEEE5 ", + " 0IHHHHHHHHHHG5 ", + " 0IHHHHHHHHHHG5 ", + " 0AFFFFFFFFFFD5 ", + " 07DDDDDDDDDDC2 ", + " 05BBBBBBBBBBB2 ", + " 128BBBBBB9720 ", + " 0128999810 ", + " 0134210 ", + " 020 "}; + +static char* pause_x24[] = { + "24 24 22 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #009966", + "5 c #333333", + "6 c #336633", + "7 c #336666", + "8 c #339966", + "9 c #33CC66", + "A c #33CC99", + "B c #666666", + "C c #669999", + "D c #66CC99", + "E c #99CCCC", + "F c #99FFCC", + "G c #CCCCCC", + "H c #CCFFCC", + "I c #CCFFFF", + "J c #FFFFFF", + "K c #808080", + " ", + " 000 ", + " 0012000 ", + " 0003333300 ", + " 0036777773210 ", + " 01278888888887100 ", + " 01278888888888888710 ", + " 05CCCCCCCCCCCCCCCCC0 ", + " 07EEEEEEEEEEEEEEEEE0 ", + " 0BGGGGGGGGGGGGGGGGG0 ", + " 0BIIIIIIIIIIIIIIIII0 ", + " 0KJJJJJJJJJJJJJJJJJ0 ", + " 0KJJJJJJJJJJJJJJJJJ0 ", + " 0BHHHHHHHHHHHHHHHHH0 ", + " 0BFFFFFFFFFFFFFFFFF0 ", + " 07EEEEEEEEEEEEEEEEE0 ", + " 07DDDDDDDDDDDDDDDDD0 ", + " 02DDDDDDDDDDDDDDDDC1 ", + " 027DDDDDDDDDDDDA620 ", + " 028AAAAAAAAA720 ", + " 0128AAAA9811 ", + " 013894110 ", + " 01210 ", + " 0 "}; + +static char* pause_x32[] = { + "32 32 22 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #009966", + "5 c #333333", + "6 c #336633", + "7 c #336666", + "8 c #339966", + "9 c #339999", + "A c #33CC66", + "B c #33CC99", + "C c #669966", + "D c #66CC99", + "E c #99CC99", + "F c #99CCCC", + "G c #99FFCC", + "H c #CCCCCC", + "I c #CCFFCC", + "J c #CCFFFF", + "K c #FFFFFF", + " ", + " ", + " 00000 ", + " 0023300 ", + " 00233333200 ", + " 011333333333210 ", + " 0013777777777776100 ", + " 006888888888888888600 ", + " 0168888888888888888888210 ", + " 018CCCCCCCCCCCCCCCCCCCCC810 ", + " 05EEEEEEEEEEEEEEEEEEEEEEE50 ", + " 05FFFFFFFFFFFFFFFFFFFFFFF50 ", + " 05HHHHHHHHHHHHHHHHHHHHHHH50 ", + " 05IIIIIIIIIIIIIIIIIIIIIII50 ", + " 05KKKKKKKKKKKKKKKKKKKKKKK50 ", + " 05KKKKKKKKKKKKKKKKKKKKKKK50 ", + " 06KKKKKKKKKKKKKKKKKKKKKKK60 ", + " 05JJJJJJJJJJJJJJJJJJJJJJJ50 ", + " 05IIIIIIIIIIIIIIIIIIIIIII50 ", + " 05GGGGGGGGGGGGGGGGGGGGGGG50 ", + " 05FFFFFFFFFFFFFFFFFFFFFFF50 ", + " 05FFFFFFFFFFFFFFFFFFFFFFF50 ", + " 05DDDDDDDDDDDDDDDDDDDDDDD50 ", + " 028DDDDDDDDDDDDDDDDDDDDD820 ", + " 0228DDDDDDDDDDDDDDDDD9220 ", + " 026BBBBBBBBBBBBBBB620 ", + " 028BBBBBBBBBBB820 ", + " 128AAAAAAA821 ", + " 0128AAA4210 ", + " 0134310 ", + " 010 ", + " "}; + +static char *pause_xpm[3] = { pause_x16, pause_x24, pause_x32 }; + diff --git a/app/bin/bitmaps/polygon.xpm b/app/bin/bitmaps/polygon.xpm new file mode 100644 index 0000000..cce796a --- /dev/null +++ b/app/bin/bitmaps/polygon.xpm @@ -0,0 +1,89 @@ +static char *polygon_x16[] = { + "16 16 2 1", + " c None", + "0 c #000000", + " ", + " 000000000 ", + " 000 00 ", + " 00 00 ", + " 0 00 ", + " 0 00 ", + "00 00", + " 0 00", + " 0 00", + " 00 00", + " 0 00", + " 0 00", + " 000 00", + " 000 000", + " 000000000 ", + " 00 "}; + +static char *polygon_x24[] = { + "24 24 2 1", + " c None", + "0 c #000000", + " ", + " 00000 ", + " 0000000000 00 ", + " 000 00 ", + " 0 0 ", + " 00 0 ", + " 0 0 ", + " 00 0 ", + " 00 0 ", + " 0 0 ", + " 0 0 ", + " 00 0 ", + " 0 0 ", + " 0 0 ", + " 00 0 ", + " 0 0 ", + " 0 0 ", + " 00 0 ", + " 00 0 ", + " 00 0 ", + " 000 0000 ", + " 000 000000 ", + " 000000 ", + " "}; + +static char *polygon_x32[] = { + "32 32 2 1", + " c None", + "0 c #000000", + " ", + " 000 ", + " 000000000000 ", + " 00000000000000 000 ", + " 000000 000 ", + " 000 000 ", + " 00 000 ", + " 00 00 ", + " 000 000 ", + " 00 000 ", + " 00 000 ", + " 00 000 ", + " 00 000 ", + " 00 00 ", + " 000 00 ", + " 00 00 ", + " 00 00 ", + " 000 00 ", + " 00 00 ", + " 00 00 ", + " 000 00 ", + " 00 00 ", + " 00 00 ", + " 000 00 ", + " 0000 00 ", + " 00000 00 ", + " 0000 00 ", + " 0000 0000000 ", + " 0000 0000000000 ", + " 00000000000 ", + " 0000 ", + " "}; + +static char **polygon_xpm[3] = { polygon_x16, polygon_x24, polygon_x32 }; + diff --git a/app/bin/bitmaps/polyline.xpm b/app/bin/bitmaps/polyline.xpm new file mode 100644 index 0000000..6611f44 --- /dev/null +++ b/app/bin/bitmaps/polyline.xpm @@ -0,0 +1,92 @@ +static char *polyline_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #0000FF", + " ", + " 1 ", + " 1 1 ", + "11111 11 ", + " 1 1111 11 ", + " 1 11 1 ", + " 1 11", + " 11 11", + " 11 11", + " 1 1 ", + " 11 11 ", + " 11 1 ", + " 11 11 ", + " 1 11111 ", + " 11111 ", + " "}; + +static char *polyline_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #0000FF", + " ", + " ", + " 1 ", + " 11 ", + " 111 1 ", + " 111111 11 ", + " 11 1111 11 ", + " 11 1111 1 ", + " 1 1 11 ", + " 1 11 ", + " 1 1 ", + " 11 1 ", + " 11 1 ", + " 1 11 ", + " 1 1 ", + " 1 11 ", + " 1 1 ", + " 11 11 ", + " 11 1 ", + " 11 1 ", + " 1 111111 ", + " 111111 ", + " ", + " "}; + +static char *polyline_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #0000FF", + " ", + " ", + " ", + " 11 ", + " 111 ", + " 111 11 ", + " 111111 11 ", + " 111111111 11 ", + " 11 11111 11 ", + " 11 111111 11 ", + " 11 1111 11 ", + " 11 1 11 ", + " 11 11 ", + " 11 11 ", + " 11 11 ", + " 11 11 ", + " 11 11 ", + " 11 11 ", + " 11 11 ", + " 11 111 ", + " 11 11 ", + " 111 111 ", + " 111 11 ", + " 111 11 ", + " 11 11 ", + " 11 11 ", + " 11 1111 ", + " 111 1111111111 ", + " 1111111111 ", + " 11 ", + " ", + " "}; + +static char **polyline_xpm[3] = { polyline_x16, polyline_x24, polyline_x32 }; + diff --git a/app/bin/bitmaps/profile.xpm b/app/bin/bitmaps/profile.xpm index df22abe..d446bb4 100644 --- a/app/bin/bitmaps/profile.xpm +++ b/app/bin/bitmaps/profile.xpm @@ -1,24 +1,121 @@ -/* XPM */ -static char * profile_xpm[] = { -"16 16 5 1", -" c None", -". c #FFFF00000000", -"X c #0000FFFFFFFF", -"o c #00000000FFFF", -"O c #000000000000", -" ", -" . ", -" .Xo ", -" .Xo ", -" .XXXo o ", -".XXXXo .Xo", -"OXXXXXo .XO", -"OXXXXXo .XXO", -"OXXXXXXo .XXXO", -"OXXXXXXXo .XXXXO", -"OXXXXXXXXoXXXXXO", -"OXXXXXXXXXXXXXXO", -"OXXXXXXXXXXXXXXO", -"OOOOOOOOOOOOOOOO", -" O O O ", -" O O O "}; +static char *profile_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #336666", + "4 c #336699", + "5 c #339999", + "6 c #669999", + "7 c #6699CC", + "8 c #66CCCC", + "9 c #66CCFF", + "A c #99CCFF", + " ", + " 0 ", + " 262 ", + " 05A71 ", + " 05A92 20120 ", + "004AA82238A98300", + " 05AAA58AAAAA50 ", + "005AAAAAAAAAA500", + "004AAAAAAAAAA400", + " 05AAAAAAAAAA50 ", + "004AAAAAAAAAA400", + " 05AAAAAAAAAA50 ", + " 00000000000000 ", + " 0 00 0 0 0 ", + " 0 0 0 ", + " "}; + +static char *profile_x24[] = { + "24 24 13 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #339999", + "7 c #669999", + "8 c #6699CC", + "9 c #66CCCC", + "A c #66CCFF", + "B c #99CCFF", + " ", + " ", + " 0 ", + " 1481 ", + " 04AB81 ", + " 06BBA4 ", + " 06BBB92 11210 ", + " 006BBBB50 128AA8630000", + "0006BBBBA3128ABBBBBB5000", + " 06BBBBB87ABBBBBBBB60 ", + " 06BBBBBBBBBBBBBBBB60 ", + " 006BBBBBBBBBBBBBBBB5000", + " 006BBBBBBBBBBBBBBBB5000", + " 06BBBBBBBBBBBBBBBB60 ", + " 06BBBBBBBBBBBBBBBB60 ", + "0006BBBBBBBBBBBBBBBB5000", + " 06BBBBBBBBBBBBBBBB60 ", + " 06BBBBBBBBBBBBBBBB60 ", + " 01444444444444444410 ", + " 000000000000000000 ", + " 0 00 0 0 00 ", + " 0 0 00 ", + " ", + " "}; + +static char *profile_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #336699", + "6 c #339999", + "7 c #669999", + "8 c #6699CC", + "9 c #66CCCC", + "A c #66CCFF", + "B c #99CCFF", + " ", + " ", + " ", + " 00 ", + " 2683 ", + " 029BB82 ", + " 06BBBB4 ", + " 06BBBBA2 ", + " 06BBBBB50 11200 ", + " 06BBBBBA1 017AA8511200 ", + " 0006BBBBBB83 016ABBBBBBA93000 ", + " 0006BBBBBBA2025ABBBBBBBBBB4000 ", + " 06BBBBBBB94ABBBBBBBBBBBB40 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 0006BBBBBBBBBBBBBBBBBBBBBB4000 ", + " 0006BBBBBBBBBBBBBBBBBBBBBB4000 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 0006BBBBBBBBBBBBBBBBBBBBBB4000 ", + " 0006BBBBBBBBBBBBBBBBBBBBBB4000 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 06BBBBBBBBBBBBBBBBBBBBBB40 ", + " 04888888888888888888888830 ", + " 00000000000000000000000000 ", + " 00 00 00 00 00 ", + " 00 0 00 0 00 ", + " 00 00 00 ", + " ", + " ", + " "}; + +static char **profile_xpm[3] = { profile_x16, profile_x24, profile_x32 }; + diff --git a/app/bin/bitmaps/protractor.xpm b/app/bin/bitmaps/protractor.xpm new file mode 100644 index 0000000..43fa250 --- /dev/null +++ b/app/bin/bitmaps/protractor.xpm @@ -0,0 +1,99 @@ +static char *protractor_x16[] = { + "16 16 5 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #990000", + "3 c #CC0000", + " ", + " 00 ", + " 00 ", + " 00 ", + " 0 ", + " 0 ", + " 01 ", + " 0033 ", + " 00 3 ", + " 00 33 ", + " 0 3 ", + " 000 3 ", + " 00000023 ", + " 000000 ", + " 00000 ", + " 0 "}; + +static char *protractor_x24[] = { + "24 24 6 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #CC0000", + "4 c #800000", + " ", + " 00 ", + " 000 ", + " 000 ", + " 00 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 010 ", + " 00033 ", + " 000 3 ", + " 000 33 ", + " 000 3 ", + " 000 3 ", + " 000 33 ", + " 000 33 ", + " 000000 33 ", + " 00000000 33 ", + " 00000042 ", + " 00000000 ", + " 0000000 ", + " 0000 ", + " "}; + +static char *protractor_x32[] = { + "32 32 5 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #990000", + "3 c #CC0000", + " ", + " 0 ", + " 000 ", + " 000 ", + " 000 ", + " 0000 ", + " 0000 ", + " 0000 ", + " 000 ", + " 000 ", + " 0000 ", + " 0000 ", + " 0001 ", + " 00033 ", + " 000 33 ", + " 0000 33 ", + " 0000 33 ", + " 0000 333 ", + " 0000 33 ", + " 000 33 ", + " 000 333 ", + " 0000 333 ", + " 00000 33 ", + " 000000000 33 ", + " 0000000000 333 ", + " 00000000023 ", + " 0000000000 ", + " 000000000 ", + " 000000000 ", + " 0000000 ", + " 00 ", + " "}; + +static char **protractor_xpm[3] = { protractor_x16, protractor_x24, protractor_x32 }; + diff --git a/app/bin/bitmaps/pull.xpm b/app/bin/bitmaps/pull.xpm deleted file mode 100644 index a25248e..0000000 --- a/app/bin/bitmaps/pull.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * pull_xpm[] = { -"16 16 4 1", -" c None", -". c #0000FFFFFFFF", -"X c #FFFF00000000", -"o c #000000000000", -" . . . . ", -"...... ......", -" . . . . ", -" . . . . ", -"...... ......", -" . . . . ", -" X X ", -" XX XX ", -"XXXXXXX XXXXXXX", -" XX XX ", -" o X o Xo ", -"ooo oooo oooo oo", -" o o o ", -" o o o ", -"oo oooo oooo ooo", -" o o o "}; diff --git a/app/bin/bitmaps/redo.xpm b/app/bin/bitmaps/redo.xpm new file mode 100644 index 0000000..045a8f2 --- /dev/null +++ b/app/bin/bitmaps/redo.xpm @@ -0,0 +1,104 @@ +static char *redo_x16[] = { + "16 16 7 1", + " c None", + "0 c #000000", + "1 c #006600", + "2 c #009900", + "3 c #00CC00", + "4 c #00FF00", + "5 c #008000", + " ", + " 1 ", + " 151 ", + " 11425 ", + " 1553344355 ", + " 5244444435 ", + " 5344511425 ", + " 5435 151 ", + " 5345 1 ", + " 145 ", + " 1235 ", + " 135 ", + " 525 ", + " 521 ", + " 51 ", + " "}; + +static char *redo_x24[] = { + "24 24 7 1", + " c None", + "0 c #000000", + "1 c #006600", + "2 c #009900", + "3 c #00CC00", + "4 c #00FF00", + "5 c #008000", + " ", + " ", + " 1 ", + " 151 ", + " 5425 ", + " 11544351 ", + " 552234444425 ", + " 553444444444425 ", + " 524444444444455 ", + " 52444421124435 ", + " 5444351 2455 ", + " 544425 55 ", + " 54421 5 ", + " 53435 ", + " 1445 ", + " 12435 ", + " 5345 ", + " 5335 ", + " 5421 ", + " 545 ", + " 141 ", + " 155 ", + " ", + " "}; + +static char *redo_x32[] = { + "32 32 7 1", + " c None", + "0 c #000000", + "1 c #006600", + "2 c #009900", + "3 c #00CC00", + "4 c #00FF00", + "5 c #008000", + " ", + " ", + " ", + " 1 ", + " 151 ", + " 2425 ", + " 244351 ", + " 1152444425 ", + " 552233444444355 ", + " 553444444444444425 ", + " 534444444444444435 ", + " 1244444444444444425 ", + " 5244444435113444351 ", + " 544444211 134425 ", + " 53444451 13351 ", + " 1244445 155 ", + " 544445 15 ", + " 54442 ", + " 534435 ", + " 14445 ", + " 54431 ", + " 13441 ", + " 53435 ", + " 5445 ", + " 1445 ", + " 5435 ", + " 5431 ", + " 542 ", + " 531 ", + " 111 ", + " ", + " "}; + +static char **redo_xpm[3] = { redo_x16, redo_x24, redo_x32 }; + diff --git a/app/bin/bitmaps/reflect.xpm b/app/bin/bitmaps/reflect.xpm new file mode 100644 index 0000000..47adaad --- /dev/null +++ b/app/bin/bitmaps/reflect.xpm @@ -0,0 +1,115 @@ +static char *reflect_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #006699", + "3 c #0099CC", + "4 c #333333", + "5 c #3399CC", + "6 c #33CCCC", + "7 c #33CCFF", + "8 c #666666", + "9 c #66CCFF", + "A c #99CCFF", + " ", + " 00 ", + " 00 ", + "33 00 00", + "3553 00 0040", + "36965 00 04840", + "36AA95 00 048840", + "36AAA95200888840", + "36AAA95100488840", + "36AA75 00 048840", + "36955 00 04840", + "3553 00 040", + "33 00 00", + " 00 ", + " 00 ", + " "}; + +static char *reflect_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #0099CC", + "2 c #333333", + "3 c #3399CC", + "4 c #33CCCC", + "5 c #33CCFF", + "6 c #666666", + "7 c #66CCFF", + "8 c #99CCFF", + " ", + " ", + " 00 ", + " 00 ", + " 1 00 0 ", + " 13 00 00 ", + " 1733 00 0060 ", + " 17753 00 02660 ", + " 178873 00 066660 ", + " 17888733 00 02666660 ", + " 178888773 00 026666660 ", + " 1788888873000266666660 ", + " 178888873 00 066666660 ", + " 17888873 00 02666660 ", + " 1788873 00 0266660 ", + " 178743 00 026660 ", + " 17731 00 0660 ", + " 173 00 060 ", + " 13 00 00 ", + " 1 00 0 ", + " 00 ", + " 00 ", + " ", + " "}; + +static char *reflect_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #0099CC", + "2 c #333333", + "3 c #3399CC", + "4 c #33CCCC", + "5 c #33CCFF", + "6 c #666666", + "7 c #66CCFF", + "8 c #99CCFF", + " ", + " ", + " ", + " 00 ", + " 00 ", + " 00 ", + " 1 00 00 ", + " 133 00 020 ", + " 14733 00 02620 ", + " 148753 00 026620 ", + " 1488873 00 0666620 ", + " 148888733 00 026666620 ", + " 1488888773 00 0266666620 ", + " 14888888873 00 006666666620 ", + " 1488888888733 00 0266666666620 ", + " 1488888888871 0002666666666620 ", + " 148888888873 00 0266666666620 ", + " 14888888873 00 06666666620 ", + " 1488888873 00 0266666620 ", + " 148888873 00 026666620 ", + " 14888743 00 02666620 ", + " 1488731 00 266620 ", + " 14873 00 06620 ", + " 1473 00 0220 ", + " 133 00 000 ", + " 3 00 00 ", + " 00 ", + " 00 ", + " 00 ", + " ", + " ", + " "}; + +static char **reflect_xpm[3] = { reflect_x16, reflect_x24, reflect_x32 }; + diff --git a/app/bin/bitmaps/rotate.xpm b/app/bin/bitmaps/rotate.xpm index 00b6b5a..d41ca61 100644 --- a/app/bin/bitmaps/rotate.xpm +++ b/app/bin/bitmaps/rotate.xpm @@ -1,23 +1,148 @@ -/* XPM */ -static char * rotate_xpm[] = { -"16 16 4 1", -" c None", -". c #0000FFFFFFFF", -"X c #FFFF00000000", -"o c #000000000000", -" . .XX ", -"....... XX ", -" . . XX ", -" . . X X", -"....... o X X", -" . . XX", -" . . o XXXX", -"....... ", -" . . o ", -" .o o o o o ", -".ooooooooooooooo", -" .o o o o o ", -" .oo o o o o ", -"..o..o. o o o ", -" ooooooooooooooo", -" o o o o o "}; +static char *rotate_x16[] = { + "16 16 24 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099CC", + "3 c #00CCCC", + "4 c #00CCFF", + "5 c #00FFFF", + "6 c #336699", + "7 c #3399CC", + "8 c #33CCCC", + "9 c #33CCFF", + "A c #6699CC", + "B c #66CCCC", + "C c #66CCFF", + "D c #996666", + "E c #999999", + "F c #99CCCC", + "G c #CC0000", + "H c #CC3333", + "I c #CC3366", + "J c #CC6666", + "K c #CC9999", + "L c #C0C0C0", + "M c #808080", + " 1 ", + "525435 ", + " 2437HG ", + "52543KGGG ", + " 1 11 GG ", + "52543 GG ", + " 2432 GGG ", + "52543 GG G ", + " 2432 G G ", + "52543BGG GGGG ", + " 298AH GGJ ", + "52BAJEEMEMEMEDE ", + " 2BIAEEMEMEMEME ", + " 2CB7FLLL L L L ", + " MMMMMMMMMMMMMM", + " LLLL L L L L "}; + +static char *rotate_x24[] = { + "24 24 19 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099CC", + "3 c #00CCCC", + "4 c #00CCFF", + "5 c #00FFFF", + "6 c #33CCFF", + "7 c #33FFFF", + "8 c #669999", + "9 c #6699CC", + "A c #66FFFF", + "B c #996699", + "C c #999999", + "D c #CC0000", + "E c #CC3333", + "F c #CC9999", + "G c #C0C0C0", + "H c #808080", + " ", + " 1 1 ", + " 5155525 ", + " 1 1 ", + " 1 32FDDDDD ", + " 5155525 DDD ", + " 1 1 DD ", + " 1 32 DD ", + " 5155525 DDDD ", + " 1 1 DD D ", + " 5155425 D ", + " 5155425 DD DD ", + " 1 1 DD ", + " 5155525 DD D DD ", + " 1 32 DD DD DDD ", + " 1 1 D DDD ", + " 515752FD G G G FEDG ", + " 18CCBCHHCHHCHCCHCHHCH ", + " 1HCEBCHHCHHCHCCHCHHCH ", + " 515562A G GG GG GG G ", + " 1 G91G G GG GG GG G ", + " HHHHHHHHHHHHHHHHHHHH ", + " CH C HC CC CC CC CC ", + " "}; + +static char *rotate_x32[] = { + "32 32 22 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #0099CC", + "3 c #00CCCC", + "4 c #00CCFF", + "5 c #00FFFF", + "6 c #3399CC", + "7 c #33FFFF", + "8 c #66CCCC", + "9 c #66FFFF", + "A c #996666", + "B c #996699", + "C c #999999", + "D c #99CCCC", + "E c #CC0000", + "F c #CC3333", + "G c #CC3366", + "H c #CC6666", + "I c #CC9999", + "J c #C0C0C0", + "K c #808080", + " ", + " 1 1 ", + " 32 32 ", + " 552555525 ", + " 1 1 ", + " 1 1 EEEEEE ", + " 542555425FEEEEEEE ", + " 542555425 EEEEE ", + " 1 1 EEEE ", + " 1 1 EEE ", + " 552555525 EEE ", + " 32 32 EEEEE ", + " 1 1 EEE EEE ", + " 1 1 E EE ", + " 552555525 EE EEE ", + " 1 1 EEE EE ", + " 1 1 E EEE ", + " 1 1 EE EE E ", + " 552555525 EEE EE EE EEE ", + " 1 1 E EEEEEEEE ", + " 1 1 EE EEEEEE ", + " 32 732CEE EEEE ", + " 552577567C J J J JIE JJ ", + " 1KKCAGCCKKCKKKCKKKCKKKCKKCKK ", + " 1KKHEBCCKKCKKKCKKKCKKKCKKCK ", + " 542598C29D J J J JJ JJ ", + " 542599429D J J J JJ JJ ", + " 1 JJ 1JJ J J J JJ JJ ", + " KKKKKKKKKKKKKKKKKKKKKKKKKKK ", + " CC CC CC C KC CC CC ", + " J JJ J J J JJ JJ ", + " "}; + +static char **rotate_xpm[3] = { rotate_x16, rotate_x24, rotate_x32 }; + diff --git a/app/bin/bitmaps/ruler.xpm b/app/bin/bitmaps/ruler.xpm index 55d4842..11dbde8 100644 --- a/app/bin/bitmaps/ruler.xpm +++ b/app/bin/bitmaps/ruler.xpm @@ -1,21 +1,89 @@ -/* XPM */ -static char * ruler_xpm[] = { -"16 16 2 1", -" c None", -". c #000000000000", -" .. ", -" . ", -" . ", -" . . ", -" . ... ", -" . ", -". ", -". ", -" .. ", -" .. . . ", -" .. . ", -" .. . ", -" .. . ", -" .. ", -" .. ", -" ."}; +static char *ruler_x16[] = { + "16 16 2 1", + " c None", + "0 c #000000", + " ", + " ", + " 0 ", + " 00 ", + " 0 ", + " 0 0 ", + " 0 0 ", + " 00 ", + " 0 00 0 00", + " 0 00 00 0 0 ", + " 0000 00 0 0 ", + " 000000 00 00 ", + " 000000 00 ", + " 0000 ", + " ", + " "}; + +static char *ruler_x24[] = { + "24 24 2 1", + " c None", + "0 c #000000", + " ", + " ", + " ", + " 0 ", + " 000 ", + " 000 ", + " 0 ", + " 0 ", + " 0 0 ", + " 0 0 ", + " 00 ", + " 00 ", + " 0 0 0 ", + " 0 0 0 0 ", + " 00 00 00 00 00 ", + " 000 00 00 00 0 ", + " 00000 0 0 0 ", + " 00000 0 00 ", + " 0000000 00 ", + " 0000000 ", + " 000 ", + " ", + " ", + " "}; + +static char *ruler_x32[] = { + "32 32 2 1", + " c None", + "0 c #000000", + " ", + " ", + " ", + " ", + " 00 ", + " 000 ", + " 00000 ", + " 00000 ", + " 000 ", + " 000 ", + " 00 000 ", + " 00 000 ", + " 000 000 ", + " 00 ", + " 00 ", + " 00 0 ", + " 000 0 ", + " 00 00 0 00 ", + " 00 0 0 000 ", + " 000 0 00 0 00 ", + " 0000 00 00 0 00 ", + " 00000000 0 00 00 ", + " 00000000 0 00 000 ", + " 00000000 0 00 ", + " 000000000 00 ", + " 00000000 000 ", + " 00000000 ", + " 000 ", + " ", + " ", + " ", + " "}; + +static char **ruler_xpm[3] = { ruler_x16, ruler_x24, ruler_x32 }; + diff --git a/app/bin/bitmaps/select.xpm b/app/bin/bitmaps/select.xpm index c630541..bd118c6 100644 --- a/app/bin/bitmaps/select.xpm +++ b/app/bin/bitmaps/select.xpm @@ -1,22 +1,106 @@ -/* XPM */ -static char * select_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" ", -" . . . . ", -"................", -" . . . . ", -" . . . ", -" . XX . ", -"... XXXXXX ..", -" . XXXXXXXX . ", -" XXXXXXXX ", -" XXXXXXX ", -" XXXXXX ", -" XXXXXX ", -" XXX XXX ", -" XX XXX ", -" XXX ", -" X "}; +static char *select_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #CC0000", + "3 c #CC6600", + "4 c #FF9999", + " ", + " ", + " ", + " 3 3 3 3 3 3 3 ", + "000000000000000 ", + " 3 3 3 3 3 ", + " 3 3 3 3 3 ", + "010000 222 0000 ", + " 3 3 3 224 3 3 ", + " 2424 ", + " 424 ", + " 424 ", + " 424 ", + " 4 ", + " ", + " "}; + +static char *select_x24[] = { + "24 24 9 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #663300", + "3 c #996600", + "4 c #CC0000", + "5 c #CC3300", + "6 c #CC6600", + "7 c #CC9900", + " ", + " ", + " ", + " ", + " 7 7 7 7 ", + " 33 26 62 33 26 62 33 ", + "022012002102201200210220", + " 77 7 7 77 7 7 77 ", + " 77 7 7 56 56 7 77 ", + " 77 7 7 4444444 7 77 ", + "022012002144444440210220", + " 33 26 6344444 62 33 ", + " 7 7 44 444 7 ", + " 44 444 ", + " 44 444 ", + " 4 444 ", + " 444 ", + " 444 ", + " 44 ", + " ", + " ", + " ", + " ", + " "}; + +static char *select_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #663300", + "3 c #996600", + "4 c #CC0000", + "5 c #CC6600", + "6 c #CC9900", + " ", + " ", + " ", + " ", + " ", + " ", + " 6 66 6 66 6 66 6 ", + " 031002300030003300332003200130 ", + " 000000000000000000000000000000 ", + " 52 35 5 55 353 53 25 ", + " 6 66 6 66 666 66 6 ", + " 6 66 6 44444444 66 6 ", + " 6 66 6 4444444444 66 6 ", + " 031002300030444444444403200130 ", + " 000000000000444444 00000000 ", + " 6 66 6 4444444 53 25 ", + " 6 6 6 444 4444 6 6 ", + " 444 4444 ", + " 444 4444 ", + " 44 4444 ", + " 4 4444 ", + " 4444 ", + " 4444 ", + " 4444 ", + " 444 ", + " 4 ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char **select_xpm[3] = { select_x16, select_x24, select_x32 }; + diff --git a/app/bin/bitmaps/sensor.xpm b/app/bin/bitmaps/sensor.xpm index 6ed65a3..207f4c4 100644 --- a/app/bin/bitmaps/sensor.xpm +++ b/app/bin/bitmaps/sensor.xpm @@ -1,22 +1,138 @@ -/* XPM */ -static char * sensor_xpm[] = { -"16 16 3 1", -" c None", -". c #00FFFF", -"+ c #FFFFFF", -" ", -" ", -" ..... ", -" +.......+ ", -" +++.....+++ ", -" .+++...+++. ", -" ...+++.+++... ", -" ....+++++.... ", -" .....+++..... ", -" ....+++++.... ", -" ...+++.+++... ", -" .+++...+++. ", -" +++.....+++ ", -" +.......+ ", -" ..... ", -" "}; +static char *sensor_x16[] = { + "16 16 18 1", + " c None", + "0 c #000000", + "1 c #00CCCC", + "2 c #336666", + "3 c #339966", + "4 c #339999", + "5 c #33CC99", + "6 c #33CCCC", + "7 c #666666", + "8 c #669966", + "9 c #669999", + "A c #66CCCC", + "B c #999999", + "C c #99CCCC", + "D c #CCCCCC", + "E c #CCFFCC", + "F c #CCFFFF", + "G c #FFFFFF", + " 77 ", + " 27444478 ", + " 941111114B ", + " 9GA111111AG9 ", + " 34AGA1111AGA43 ", + " 311AGA116GA114 ", + "74111AGA6GC11147", + "741111AGFC111143", + "7411111FGA111153", + "741111FCAGA11147", + " 3111EE11AGA1147", + " 341DF1111AGA53 ", + " 3CF111111AG9 ", + " 2D51111115BB ", + " 34455443 ", + " 773377 "}; + +static char *sensor_x24[] = { + "24 24 17 1", + " c None", + "0 c #000000", + "1 c #00CCCC", + "2 c #336666", + "3 c #339966", + "4 c #339999", + "5 c #33CC99", + "6 c #33CCCC", + "7 c #666666", + "8 c #669999", + "9 c #66CCCC", + "A c #999999", + "B c #99CCCC", + "C c #CCCCCC", + "D c #CCFFCC", + "E c #CCFFFF", + "F c #FFFFFF", + " ", + " 72777727 ", + " 734511115432 ", + " 34111111111143 ", + " 8D111111111111BC ", + " 3BFE11111111119F63 ", + " 241BFE111111119F6143 ", + " 3111BFE1111119F91114 ", + " 741111BFE11116F9111153 ", + " 7111111BFE116F91111112 ", + " 71111111DFE6EB11111114 ", + " 311111111DFFB1111111147", + " 3111111111FFD1111111147", + " 311111111EBDFD111111147", + " 71111111DD11DFD1111113 ", + " 2411111DD1111DFD111152 ", + " 741111BE111111DFD11147 ", + " 3411BE11111111DFD153 ", + " 31BE6111111111DFD3 ", + " 7AE611111111111DC2 ", + " 8841111111111532 ", + " 345111111543 ", + " 7234444327 ", + " 77 "}; + +static char *sensor_x32[] = { + "32 32 20 1", + " c None", + "0 c #000000", + "1 c #00CCCC", + "2 c #336666", + "3 c #339966", + "4 c #339999", + "5 c #33CC99", + "6 c #33CCCC", + "7 c #666666", + "8 c #669999", + "9 c #66CC99", + "A c #66CCCC", + "B c #999999", + "C c #99CC99", + "D c #99CCCC", + "E c #CCCCCC", + "F c #CCFFCC", + "G c #CCFFFF", + "H c #FFFFFF", + "I c #C0C0C0", + " ", + " 7777777777 ", + " 77777344477777 ", + " 777744111111543777 ", + " 77741111111111114377 ", + " 7B81111111111111111CB7 ", + " 77GHA11111111111111AHHB7 ", + " 774GHHA111111111111AHHG477 ", + " 7711GHHA1111111111AHHG11477 ", + " 774111GHHA111111116HHG111577 ", + " 7311111GHHA1111116HHG61111477 ", + " 774111111GHHA11116GHH611111577 ", + " 7751111116GHHA111GHH6111111177 ", + " 77111111116GHH61GHHA1111111147 ", + " 741111111116GHHGHHA11111111147 ", + " 7411111111116GHHHA1111111111477", + " 7411111111111DHHH61111111111477", + " 741111111111DHHHHH6111111111477", + " 73111111111DHHD6GHH61111111147 ", + " 7711111111DHHD116GHH6111111137 ", + " 774111111AHHE11116GHH611111577 ", + " 7411111AHHF1111116HHH61111477 ", + " 774111AHHG111111116HHG611177 ", + " 774116HHG11111111116HHG61477 ", + " 7746HHG6111111111116HHG577 ", + " 77GHG611111111111116HHB77 ", + " 7BG61111111111111119I77 ", + " 7774511111111111114777 ", + " 7774511111111547777 ", + " 7777344444437777 ", + " 777777777777 ", + " 7777 "}; + +static char **sensor_xpm[3] = { sensor_x16, sensor_x24, sensor_x32 }; + diff --git a/app/bin/bitmaps/signal.xpm b/app/bin/bitmaps/signal.xpm index 521adad..66f55c7 100644 --- a/app/bin/bitmaps/signal.xpm +++ b/app/bin/bitmaps/signal.xpm @@ -1,25 +1,106 @@ -/* XPM */ -static char * signal_xpm[] = { -"16 16 6 1", -" c None", -". c #000000", -"+ c #3A000B", -"@ c #C90328", -"# c #D9032B", -"$ c #F30431", -" .. ", -" .... ", -" .+$@+. ", -" .#$$#. ", -" .+$@+. ", -" .... ", -" .. ", -" .. ", -" .. ", -" .. ", -" .. ", -" .. ", -" .. ", -" .. ", -" ............ ", -" ............ "}; +static char *signal_x16[] = { + "16 16 7 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #CC0033", + "4 c #FF0033", + "5 c #800000", + " 00 ", + " 23321 ", + " 144441 ", + " 144445 ", + " 144441 ", + " 23321 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 0000000000 "}; + +static char *signal_x24[] = { + "24 24 8 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #990033", + "4 c #CC0033", + "5 c #FF0033", + "6 c #800000", + " ", + " 11110 ", + " 12555562 ", + " 15555552 ", + " 0655555541 ", + " 0355555541 ", + " 155555560 ", + " 13555541 ", + " 123321 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00000000000000 ", + " 00000000000000 "}; + +static char *signal_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #990033", + "4 c #CC0033", + "5 c #FF0033", + "6 c #800000", + " ", + " 000000 ", + " 0001662000 ", + " 00355554100 ", + " 003555555400 ", + " 015555555560 ", + " 0655555555400 ", + " 0655555555300 ", + " 005555555520 ", + " 006555555300 ", + " 0064554600 ", + " 00000000 ", + " 000000 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 000000000000000000 ", + " 000000000000000000 ", + " 000000000000000000 "}; + +static char **signal_xpm[3] = { signal_x16, signal_x24, signal_x32 }; + diff --git a/app/bin/bitmaps/snap-curs.xpm b/app/bin/bitmaps/snap-curs.xpm new file mode 100644 index 0000000..08b93d0 --- /dev/null +++ b/app/bin/bitmaps/snap-curs.xpm @@ -0,0 +1,102 @@ +static char *snap_curs_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #00CC00", + "2 c #808080", + " 1 1 1 1 ", + "1 1 1 1 1 1 1 1 ", + " 10000 1 1 ", + " 002 ", + " 0202 1 1 ", + "1 0 202 1 1 1 1 ", + " 1 202 1 1 ", + " 202 ", + " 1 1 201 1 ", + "1 1 1 1 1 1 1 1 ", + " 1 1 1 1 ", + " ", + " 1 1 1 1 ", + "1 1 1 1 1 1 1 1 ", + " 1 1 1 1 ", + " "}; + +static char *snap_curs_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #00CC00", + "2 c #330033", + "3 c #808080", + " ", + " ", + " ", + " 11 11 11 11 ", + " 1 1 1 1 1 1 1 1 ", + " 1 1 1 1 1 1 1 1 ", + " 11222222 11 11 ", + " 022223 ", + " 22223 ", + " 02223 ", + " 11023303 11 11 ", + " 1 031 3031 1 1 1 ", + " 1 1 303 1 1 1 ", + " 11 11 3031 11 ", + " 303 ", + " 30 ", + " ", + " 11 11 11 11 ", + " 1 1 1 1 1 1 1 1 ", + " 1 1 1 1 1 1 1 1 ", + " 11 11 11 11 ", + " ", + " ", + " "}; + +static char *snap_curs_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #006600", + "2 c #009900", + "3 c #00CC00", + "4 c #330000", + "5 c #330033", + "6 c #333300", + "7 c #333333", + "8 c #008000", + " ", + " 333 33 333 ", + " 33333 333333 33333 ", + " 33 33 3 3 33 3 ", + " 3 4413 33 33 33 3 ", + " 3 5555555555554 33 33 3 ", + " 33 455555555555 3 3 3 ", + " 33355555555583333 33333 ", + " 3555555555 ", + " 55555555 ", + " 555555554 ", + " 5555555554 ", + " 45555455551 ", + " 33335554 555583 33333 ", + " 33 554 155563 3 33 ", + " 3 68 33555513 33 3 ", + " 3 83 33 55556 33 3 ", + " 3 33 3 45555 33 3 ", + " 33 33 333327555 33 33 ", + " 333 3333455554 333 ", + " 55554 ", + " 55554 ", + " 555 ", + " 54 ", + " 3333 3333 3333 ", + " 33 3 33 33 33 33 ", + " 3 3 3 33 33 3 ", + " 3 3 33 33 33 3 ", + " 3 3 3 33 33 3 ", + " 3 3 33 33 33 33 ", + " 333 3333 3333 ", + " "}; + +static char **snap_curs_xpm[3] = { snap_curs_x16, snap_curs_x24, snap_curs_x32 }; + diff --git a/app/bin/bitmaps/snap-grid.xpm b/app/bin/bitmaps/snap-grid.xpm new file mode 100644 index 0000000..1139051 --- /dev/null +++ b/app/bin/bitmaps/snap-grid.xpm @@ -0,0 +1,92 @@ +static char *snap_grid_x16[] = { + "16 16 3 1", + " c None", + "0 c #000000", + "1 c #00CC00", + " ", + " 1111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1111111111111 ", + " ", + " "}; + +static char *snap_grid_x24[] = { + "24 24 3 1", + " c None", + "0 c #000000", + "1 c #00CC00", + " ", + " 111111111111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 111111111111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 111111111111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 111111111111111111111 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 1 1 1 1 1 ", + " 111111111111111111111 ", + " ", + " "}; + +static char *snap_grid_x32[] = { + "32 32 3 1", + " c None", + "0 c #000000", + "1 c #00CC00", + " ", + " 1111111111111111111111111111111", + " 11 11 11 11 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 111111111111111111111111111111 ", + " 111111111111111111111111111111 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 11 11 11 11 1 ", + " 111111111111111111111111111111 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 11 11 11 11 1 ", + " 111111111111111111111111111111 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1 11 11 1 1 ", + " 1111111111111111111111111111111", + " "}; + +static char **snap_grid_xpm[3] = { snap_grid_x16, snap_grid_x24, snap_grid_x32 }; + diff --git a/app/bin/bitmaps/snapcurs.xbm b/app/bin/bitmaps/snapcurs.xbm deleted file mode 100644 index 06db450..0000000 --- a/app/bin/bitmaps/snapcurs.xbm +++ /dev/null @@ -1,7 +0,0 @@ -#define snapcurs_width 16 -#define snapcurs_height 16 -// static unsigned char snapcurs_bits[] = { -static char snapcurs_bits[] = { - 0x00, 0x00, 0x44, 0x44, 0xaa, 0xaa, 0xfc, 0x40, 0xf8, 0x07, 0xfc, 0x47, - 0xfa, 0xab, 0xfc, 0x45, 0xf0, 0x03, 0x74, 0x47, 0xb2, 0xae, 0x44, 0x5c, - 0x00, 0x08, 0x44, 0x44, 0xaa, 0xaa, 0x44, 0x44}; diff --git a/app/bin/bitmaps/snapvis.xbm b/app/bin/bitmaps/snapvis.xbm deleted file mode 100644 index cab6ee5..0000000 --- a/app/bin/bitmaps/snapvis.xbm +++ /dev/null @@ -1,7 +0,0 @@ -#define snapvis_width 16 -#define snapvis_height 16 -// static unsigned char snapvis_bits[] = { -static char snapvis_bits[] = { - 0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, - 0xff, 0xff, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44, - 0x44, 0x44, 0x44, 0x44, 0xff, 0xff, 0x44, 0x44}; diff --git a/app/bin/bitmaps/split-draw.xpm b/app/bin/bitmaps/split-draw.xpm new file mode 100644 index 0000000..3e94832 --- /dev/null +++ b/app/bin/bitmaps/split-draw.xpm @@ -0,0 +1,95 @@ +static char *split_draw_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #808080", + " ", + " 2 ", + " 2 ", + " 2 ", + " 1 2 ", + " 11 2 ", + " 11 2 ", + " 111122 ", + " 2 111 ", + " 221111 ", + " 22 11 ", + " 22 11 ", + " 22 ", + " 22 ", + " 22 ", + " "}; + +static char *split_draw_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #808080", + " ", + " 2 ", + " 22 ", + " 22 ", + " 2 ", + " 2 ", + " 11 2 ", + " 11 2 ", + " 11 2 ", + " 11 2 ", + " 111111 2 ", + " 11111 ", + " 11 ", + " 2 111111 ", + " 22 11 ", + " 22 1 ", + " 22 1 ", + " 22 1 ", + " 22 1 ", + " 22 ", + " 22 ", + " 22 ", + " 2 ", + " "}; + +static char *split_draw_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #808080", + " ", + " ", + " 2 ", + " 222 ", + " 222 ", + " 222 ", + " 222 ", + " 222 ", + " 11 222 ", + " 11 222 ", + " 11 222 ", + " 11 222 ", + " 11 222 ", + " 11111 222 ", + " 11111111 22 ", + " 1111111 ", + " ", + " 22 11111111 ", + " 222 11111111 ", + " 222 11 ", + " 222 11 ", + " 22 11 ", + " 222 11 ", + " 222 11 ", + " 222 11 ", + " 222 ", + " 222 ", + " 222 ", + " 222 ", + " 22 ", + " ", + " "}; + +static char **split_draw_xpm[3] = { split_draw_x16, split_draw_x24, split_draw_x32 }; + diff --git a/app/bin/bitmaps/split.xpm b/app/bin/bitmaps/split.xpm new file mode 100644 index 0000000..1e0386a --- /dev/null +++ b/app/bin/bitmaps/split.xpm @@ -0,0 +1,107 @@ +static char *split_x16[] = { + "16 16 10 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #996666", + "3 c #999999", + "4 c #CC0000", + "5 c #CC3333", + "6 c #CC6666", + "7 c #C0C0C0", + "8 c #808080", + " ", + " 781 ", + " 71371 ", + " 4 83 88 ", + " 4 887317 ", + " 47887887 ", + " 444418718 ", + " 562 38 ", + " 38 17 ", + " 7317314444 ", + " 7887 834 ", + " 88 38 74 ", + " 38 313 4 ", + " 13313 ", + " 83 ", + " 7 "}; + +static char *split_x24[] = { + "24 24 7 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CC0000", + "4 c #C0C0C0", + "5 c #808080", + " ", + " 4 1 ", + " 251 ", + " 4 124 ", + " 3 451 4211 ", + " 33 4 124 52 ", + " 33 451 44114 ", + " 334 154 55 ", + " 33451 44114 ", + " 333333154 52 ", + " 3333333 441144 ", + " 4 55 ", + " 421 144 ", + " 12 333 ", + " 21 44513333333 ", + " 12 55 33 ", + " 21 451 433 ", + " 12 55 33 ", + " 21 421 4 33 ", + " 12 52 3 ", + " 1 421 4 ", + " 52 ", + " 1 4 ", + " "}; + +static char *split_x32[] = { + "32 32 7 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #999999", + "3 c #CC0000", + "4 c #C0C0C0", + "5 c #808080", + " ", + " ", + " 44 1 ", + " 25 ", + " 124 ", + " 4411 44 1 ", + " 33 55 421 ", + " 33 4 1144 52 ", + " 33 451 44 1 44 ", + " 33 15 25 ", + " 33 4 11 44 124 ", + " 33 421 421 4 ", + " 33333333 114 52 ", + " 33333333 1 4 1 44 ", + " 33333 411 ", + " 4 12 ", + " 421 11 4 ", + " 52 ", + " 4 1 44 333333333 ", + " 21 4411 33333333 ", + " 124 25 333 ", + " 4 11 44 1124 33 ", + " 55 421 33 ", + " 4 154 152 33 ", + " 4411 4 1 4 33 ", + " 55 21 33 ", + " 11 4 12 ", + " 4 1 4 ", + " 25 ", + " 1 4 ", + " 1 ", + " "}; + +static char **split_xpm[3] = { split_x16, split_x24, split_x32 }; + diff --git a/app/bin/bitmaps/splittrk.xpm b/app/bin/bitmaps/splittrk.xpm deleted file mode 100644 index 3a03c77..0000000 --- a/app/bin/bitmaps/splittrk.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static char * splittrk_xpm[] = { -"16 16 3 1", -" c None", -". c #000000000000", -"X c #FFFF00000000", -" . . ", -" . ", -" X . . .", -" X . . . ", -" X . . .", -" XXXX . . . ", -" . ", -" . . ", -" . . ", -" . ", -" . . . XXXX ", -". . . X ", -" . . . X ", -". . . X ", -" . ", -" . . "}; diff --git a/app/bin/bitmaps/sticky-doc.xpm b/app/bin/bitmaps/sticky-doc.xpm new file mode 100644 index 0000000..7b0e4cb --- /dev/null +++ b/app/bin/bitmaps/sticky-doc.xpm @@ -0,0 +1,130 @@ +static char *sticky_doc_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #666699", + "3 c #669999", + "4 c #996633", + "5 c #999999", + "6 c #CC6633", + "7 c #CC9900", + "8 c #CC9933", + "9 c #CC9999", + "A c #CCCC66", + "B c #FFCC00", + "C c #FFCC33", + "D c #FFCC66", + " ", + " ", + "4888888888884 ", + "4BBBBBBCBBBB764 ", + "4BBD59B99BBB7774", + "4BC2D95C95CBBBB4", + "4BC2CBA5CA5CBBB4", + "4BBC5ABD5CD5CBB4", + "4BBBC59BCABC3CB4", + "4BBBBB95CBBB5DB4", + "4BBBBBBA2ABD2CB4", + "4BBBBBBBC513DBB4", + "4BBBBBBBBBBBBBB4", + "4777777777777774", + " 444444444444444", + " "}; + +static char *sticky_doc_x24[] = { + "24 24 17 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #3366CC", + "3 c #666699", + "4 c #669999", + "5 c #996633", + "6 c #999999", + "7 c #CC6633", + "8 c #CC9900", + "9 c #CC9933", + "A c #CC9966", + "B c #CC9999", + "C c #CCCC66", + "D c #FFCC00", + "E c #FFCC33", + "F c #FFCC66", + " ", + " ", + " ", + "5555555555555555555 ", + "58DDDDDDDDDDDDDDDD85 ", + "58DDDDDDDDDDEDDDDD8875 ", + "58DDDC26ADD64EDDDD88885 ", + "58DDA13216EB13FDDDDDDD85", + "58DD32EE616EC22CDDDDDD95", + "58DD42CDDB13EF21ADDDDD95", + "58DDF21BDDA12FE316EDDD95", + "58DDDE316EDC22EE616EDD95", + "58DDDDE614EDFBDDE616DD95", + "58DDDDDDB12FDDDDDD61ED95", + "58DDDDDDDC21BDDDDD61ED95", + "58DDDDDDDDE316EDDF16DD95", + "58DDDDDDDDDE612BB21FDD95", + "58DDDDDDDDDDDC3112CDDD95", + "58DDDDDDDDDDDDDFFDDDDD95", + "58DDDDDDDDDDDDDDDDDDDD95", + "579999999999999999999955", + " 5555555555555555555555 ", + " ", + " "}; + +static char *sticky_doc_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #3366CC", + "3 c #666699", + "4 c #996633", + "5 c #999999", + "6 c #CC6633", + "7 c #CC9900", + "8 c #CC9966", + "9 c #CC9999", + "A c #CCCC66", + "B c #FFCC00", + "C c #FFCC33", + "D c #FFCC66", + " ", + " ", + " ", + " ", + " 444444444444444444444444 ", + " 4BBBBBBBBBBBBBBBBBBBBB764 ", + " 4BBBBBBBBBBBBBBBBBBBBBB7744 ", + " 4BBBBBBBBBBBBBCCBBBBBBB77744 ", + " 4BBBBBA315DBBB53DBBBBBB777774 ", + " 4BBBB511112ABC212ABBBBB7777774 ", + " 4BBBA115A3119BC3118BBBBBBBBBB4 ", + " 4BBB915BBC5115CC5119BBBBBBBBB4 ", + " 4BBB812DBBB5115CC5115CBBBBBBB4 ", + " 4BBBC3118BBB8113CB9115CBBBBBB4 ", + " 4BBBBC3119CBBA212DBA213DBBBBB4 ", + " 4BBBBBC5115CBBD313CBD212ABBBB4 ", + " 4BBBBBBB9113DBBC5DBBBC311CBBB4 ", + " 4BBBBBBBBA2128BBBBBBBBC319BBB4 ", + " 4BBBBBBBBBC3115CBBBBBBB915BBB4 ", + " 4BBBBBBBBBBC5115CBBBBBB915BBB4 ", + " 4BBBBBBBBBBBB9113DBBBBC219BBB4 ", + " 4BBBBBBBBBBBBBA2115CBA313CBBB4 ", + " 4BBBBBBBBBBBBBBC51111112DBBBB4 ", + " 4BBBBBBBBBBBBBBBBA31115CBBBBB4 ", + " 4BBBBBBBBBBBBBBBBBCDDCBBBBBBB4 ", + " 4BBBBBBBBBBBBBBBBBBBBBBBBBBBB4 ", + " 4BBBBBBBBBBBBBBBBBBBBBBBBBBBB4 ", + " 444444444444444444444444444444 ", + " ", + " ", + " ", + " "}; + +static char **sticky_doc_xpm[3] = { sticky_doc_x16, sticky_doc_x24, sticky_doc_x32 }; + diff --git a/app/bin/bitmaps/sticky-link.xpm b/app/bin/bitmaps/sticky-link.xpm new file mode 100644 index 0000000..b2a027b --- /dev/null +++ b/app/bin/bitmaps/sticky-link.xpm @@ -0,0 +1,138 @@ +static char *sticky_link_x16[] = { + "16 16 18 1", + " c None", + "0 c #000000", + "1 c #3366CC", + "2 c #666699", + "3 c #6666CC", + "4 c #669999", + "5 c #996600", + "6 c #996633", + "7 c #999999", + "8 c #CC6633", + "9 c #CC9900", + "A c #CC9933", + "B c #CC9966", + "C c #CC9999", + "D c #CCCC66", + "E c #FFCC00", + "F c #FFCC33", + "G c #FFCC66", + " ", + " ", + "68AAAAAAAAAA6 ", + "6EEEEEEEEEEE986 ", + "6EEEEEEEEEEE9996", + "6EEGCGEEEEFCGEE6", + "6ED7C4CEED2C7BE6", + "6E4GEEB777FEF1F6", + "6E1FEEF22GEEE3F6", + "6E77GC4FF77GB7E6", + "6EEC7BFEEEB77FE6", + "6EEEEEEEEEEEEEE6", + "6EEEEEEEEEEEEEE6", + "6A99999999999996", + " 666666666666666", + " "}; + +static char *sticky_link_x24[] = { + "24 24 19 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #3366CC", + "3 c #666699", + "4 c #6666CC", + "5 c #669999", + "6 c #996600", + "7 c #996633", + "8 c #999999", + "9 c #CC6633", + "A c #CC9900", + "B c #CC9933", + "C c #CC9966", + "D c #CC9999", + "E c #CCCC66", + "F c #FFCC00", + "G c #FFCC33", + "H c #FFCC66", + " ", + " ", + " ", + "7777777777777777777 ", + "7BFFFFFFFFFFFFFFFFA7 ", + "7BFFFFFFFFFFFFFFFFAA97 ", + "7BFFFFFFFFFFFFFFFFAAAA7 ", + "7BFFFFFFFFFFFFFFFFFFFFA7", + "7BFFH888EFFFFFFG888HFFA7", + "7BFG228418GFFGD12822HFA7", + "7BFD2GFFC22HG818GFG38FA7", + "7BF88FFFFG3142EFFFFD2GA7", + "7BF3DFFFFFD118GFFFFE1GA7", + "7BF83FFFG818D13HFFF85FA7", + "7BFE18D822CFFE218D81DFA7", + "7BFFD1118HFFFFGD2118GFA7", + "7BFFFGHFFFFFFFFFFGGFFFA7", + "7BFFFFFFFFFFFFFFFFFFFFA7", + "7BFFFFFFFFFFFFFFFFFFFFA7", + "7BFFFFFFFFFFFFFFFFFFFFA7", + "77BBBBBBBBBBBBBBBBBBBB97", + " 7777777777777777777777 ", + " ", + " "}; + +static char *sticky_link_x32[] = { + "32 32 18 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #3366CC", + "3 c #666699", + "4 c #6666CC", + "5 c #669999", + "6 c #996600", + "7 c #996633", + "8 c #999999", + "9 c #CC9900", + "A c #CC9933", + "B c #CC9966", + "C c #CC9999", + "D c #CCCC66", + "E c #FFCC00", + "F c #FFCC33", + "G c #FFCC66", + " ", + " ", + " ", + " ", + " 777777777777777777777777 ", + " 7EEEEEEEEEEEEEEEEEEEEEEA7 ", + " 7EEEEEEEEEEEEEEEEEEEEEE9977 ", + " 7EEEEEEEEEEEEEEEEEEEEEE99977 ", + " 7EEEEEEEEEEEEEEEEEEEEEE999997 ", + " 7EEEEEEEEEEEEEEEEEEEEEE9999997 ", + " 7EEEEEFFEEEEEEEEEEEEEEFFEEEEE7 ", + " 7EEEF82115DFEEEEEEEG81118FEEE7 ", + " 7EEF81111113FEEEEF81111115FEE7 ", + " 7EED12DEFB412BEEG3118GEG51CEE7 ", + " 7EE81DEEEEF811CD213GEEEEG12EE7 ", + " 7EE42EEEEEEEC11118FEEEEEE81FE7 ", + " 7EE22EEEEEEEF8112FEEEEEEE81GE7 ", + " 7EE51FEEEEEG312312DEEEEEE31FE7 ", + " 7EEC18EEEF8113GF8118FEEEB18EE7 ", + " 7EEF21488111CFEEEC21188811DEE7 ", + " 7EEEG411118GEEEEEEF811111BEEE7 ", + " 7EEEEFDCDFEEEEEEEEEEFCCCFEEEE7 ", + " 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ", + " 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ", + " 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ", + " 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ", + " 7EEEEEEEEEEEEEEEEEEEEEEEEEEEE7 ", + " 777777777777777777777777777777 ", + " ", + " ", + " ", + " "}; + +static char **sticky_link_xpm[3] = { sticky_link_x16, sticky_link_x24, sticky_link_x32 }; + diff --git a/app/bin/bitmaps/sticky-note-chain.xpm b/app/bin/bitmaps/sticky-note-chain.xpm deleted file mode 100644 index aa9445a..0000000 --- a/app/bin/bitmaps/sticky-note-chain.xpm +++ /dev/null @@ -1,84 +0,0 @@ -/* XPM */ -static char * sticky_note_chain_bits[] = { -"16 16 65 1", -" c None", -". c #CCB301", -"+ c #CAB101", -"@ c #FBEF9C", -"# c #F9EB8F", -"$ c #F8EA8D", -"% c #F8E98A", -"& c #F6E785", -"* c #F3E37C", -"= c #F0E074", -"- c #EEDD6F", -"; c #D5C44D", -"> c #C8AF01", -", c #FBED95", -"' c #F7E67E", -") c #F6E57C", -"! c #F5E47B", -"~ c #F4E379", -"{ c #F1E075", -"] c #ECDB70", -"^ c #E8D76A", -"/ c #E6D567", -"( c #CDBC45", -"_ c #FFF6BB", -": c #C6AD01", -"< c #FCEB84", -"[ c #B7A73A", -"} c #BFAE37", -"| c #AC9401", -"1 c #C3AA01", -"2 c #FBED97", -"3 c #EEDD7B", -"4 c #9D96F6", -"5 c #E1D26F", -"6 c #C0A701", -"7 c #006E6E", -"8 c #00FFFF", -"9 c #BCA401", -"0 c #AFA358", -"a c #ADA054", -"b c #B9A101", -"c c #B59E01", -"d c #FEF19E", -"e c #EDDD7C", -"f c #E5D575", -"g c #E5D571", -"h c #B29A01", -"i c #FFF2A1", -"j c #FEED87", -"k c #FDEC86", -"l c #FDEC85", -"m c #FBEA82", -"n c #FAE981", -"o c #F8E77F", -"p c #A89100", -"q c #FFF4AF", -"r c #FFF1A0", -"s c #FDF09C", -"t c #FDEF9B", -"u c #FCEE99", -"v c #FAEC92", -"w c #F9EA90", -"x c #FAEC96", -"y c #9D8600", -"z c #9C8500", -" ", -" ", -" ........... ", -" +@#$%&*=--;+ ", -" >,')!~{]^/(_> ", -" :<<<<<<<<<[}}| ", -" 1234445444''-1 ", -" 647887478874-6 ", -" 94800878a084=9 ", -" b47887478874*b ", -" cde444f444g{&c ", -" hijkl c #C8AF01", -", c #FBED95", -"' c #F7E67E", -") c #F6E57C", -"! c #F6E68A", -"~ c #ECE0A0", -"{ c #BABDB6", -"] c #EFE3A7", -"^ c #CDBC45", -"/ c #FFF6BB", -"( c #C6AD01", -"_ c #FBED97", -": c #F8E77F", -"< c #F8E88D", -"[ c #EDE0A0", -"} c #F5E68F", -"| c #F0E39B", -"1 c #888A85", -"2 c #BFAE37", -"3 c #AC9401", -"4 c #C3AA01", -"5 c #FCEE99", -"6 c #F7E78B", -"7 c #EBDE9C", -"8 c #F8EBA2", -"9 c #ECDB70", -"0 c #E8D76A", -"a c #E6D567", -"b c #EEDD6F", -"c c #C0A701", -"d c #FDF0A5", -"e c #DCD695", -"f c #EAE29B", -"g c #E8E098", -"h c #DACB69", -"i c #BCA401", -"j c #FDF3B6", -"k c #B9A101", -"l c #FEF4B7", -"m c #E0D986", -"n c #F5E47B", -"o c #F4E379", -"p c #F1E075", -"q c #F3E37C", -"r c #B59E01", -"s c #FFF3B4", -"t c #DECF6F", -"u c #F4E47D", -"v c #F5E47C", -"w c #F6E785", -"x c #B29A01", -"y c #FFF2A3", -"z c #FBEDA4", -"A c #F0E07C", -"B c #F3E27C", -"C c #F5E47D", -"D c #A89100", -"E c #FFF4AF", -"F c #FFF2A1", -"G c #FFF1A0", -"H c #FEF19E", -"I c #FDF09C", -"J c #FDEF9B", -"K c #FAEC92", -"L c #F9EA90", -"M c #FAEC96", -"N c #9D8600", -"O c #9C8500", -" ", -" ", -" ........... ", -" +@#$%&*==-;+ ", -" >,')!~={]=^/> ", -" (_:<[=}=|1{223 ", -" 4567=8=8=90ab4 ", -" cde=f=g=}h90bc ", -" ij1818=8={)))i ", -" kl=m=1f={nopqk ", -" rs1t)8={uvnowr ", -" xyz1=1{ABC)n%x ", -" DEFGHIJ5_,KLMD ", -" NOOOOOOOOOOOON ", -" ", -" "}; diff --git a/app/bin/bitmaps/sticky-note-text.xpm b/app/bin/bitmaps/sticky-note-text.xpm deleted file mode 100644 index 119f39b..0000000 --- a/app/bin/bitmaps/sticky-note-text.xpm +++ /dev/null @@ -1,86 +0,0 @@ -/* XPM */ -static char * sticky_note_text_bits[] = { -"16 16 67 1", -" c None", -". c #CCB301", -"+ c #CAB101", -"@ c #FBEF9C", -"# c #F9EB8F", -"$ c #F8EA8D", -"% c #F8E98A", -"& c #F6E785", -"* c #F3E37C", -"= c #F0E074", -"- c #EEDD6F", -"; c #D5C44D", -"> c #C8AF01", -", c #FBED95", -"' c #F7E67E", -") c #F6E57C", -"! c #F5E47B", -"~ c #F4E379", -"{ c #F1E075", -"] c #ECDB70", -"^ c #E8D76A", -"/ c #E6D567", -"( c #CDBC45", -"_ c #FFF6BB", -": c #C6AD01", -"< c #FBED97", -"[ c #F8E77F", -"} c #BFAE37", -"| c #AC9401", -"1 c #C3AA01", -"2 c #FCEE99", -"3 c #7E7E7E", -"4 c #979797", -"5 c #C0A701", -"6 c #FDEF9B", -"7 c #E5DC75", -"8 c #E4DB73", -"9 c #E4DA70", -"0 c #E3D86D", -"a c #E2D769", -"b c #EBDC70", -"c c #BCA401", -"d c #FDF09D", -"e c #B9A101", -"f c #FEF19E", -"g c #E5DD77", -"h c #EDDF75", -"i c #B59E01", -"j c #FFF1A0", -"k c #DED273", -"l c #E1D078", -"m c #B29A01", -"n c #FFF2A1", -"o c #FEED87", -"p c #FDEC86", -"q c #FDEC85", -"r c #FCEB84", -"s c #FBEA82", -"t c #FAE981", -"u c #A89100", -"v c #FFF4AF", -"w c #FDF09C", -"x c #FAEC92", -"y c #F9EA90", -"z c #FAEC96", -"A c #9D8600", -"B c #9C8500", -" ", -" ", -" ........... ", -" +@#$%&*=--;+ ", -" >,')!~{]^/(_> ", -" :<[')!~{]^}}}| ", -" 12334344{]^/-1 ", -" 567890ab~{]^-5 ", -" cd3334333443=c ", -" efgg789h)!~{*e ", -" ij3343kl')!~&i ", -" mnopqrst[')!%m ", -" uvnjfw62<,xyzu ", -" ABBBBBBBBBBBBA ", -" ", -" "}; diff --git a/app/bin/bitmaps/sticky-note.xpm b/app/bin/bitmaps/sticky-note.xpm new file mode 100644 index 0000000..fbd12e1 --- /dev/null +++ b/app/bin/bitmaps/sticky-note.xpm @@ -0,0 +1,124 @@ +static char *sticky_note_x16[] = { + "16 16 14 1", + " c None", + "0 c #000000", + "1 c #996600", + "2 c #996633", + "3 c #999999", + "4 c #CC6633", + "5 c #CC9900", + "6 c #CC9933", + "7 c #CC9966", + "8 c #CC9999", + "9 c #CCCC66", + "A c #FFCC00", + "B c #FFCC33", + "C c #FFCC66", + " ", + " ", + "2466666666662 ", + "2AAAAAAAAAAA542 ", + "2733333333375552", + "2BCCCCCCCCCBAAA2", + "2B88888888888CA2", + "2B88888888888CA2", + "2BCCCCCCCCCCBAA2", + "2733333333338AA2", + "2AAAAAAAAAAAAAA2", + "2733333333333392", + "2BCCCCCCCCCCCCB2", + "2655555555555552", + " 222222222222222", + " "}; + +static char *sticky_note_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #996600", + "3 c #996633", + "4 c #999999", + "5 c #CC6633", + "6 c #CC9900", + "7 c #CC9933", + "8 c #CC9999", + "9 c #CCCC66", + "A c #FFCC00", + "B c #FFCC33", + "C c #FFCC66", + " ", + " ", + " ", + "3333333333333333333 ", + "37AAAAAAAAAAAAAAAA63 ", + "37AAAAAAAAAAAAAAAA6653 ", + "37B11111111111114A66663 ", + "37B44444444444448AAAAA63", + "37AAAAAAAAAAAAAAAAAAAA63", + "37B88888888888888889AA63", + "37B11111111111111114AA63", + "37BCCCCCCCCCCCCCCCCCAA63", + "37AAAAAAAAAAAAAAAAAAAA63", + "37B1111111111111118AAA63", + "37B4444444444444449AAA63", + "37AAAAAAAAAAAAAAAAAAAA63", + "37B888888888888888888A63", + "37B111111111111111111A63", + "37BCCCCCCCCCCCCCCCCCCA63", + "37AAAAAAAAAAAAAAAAAAAA63", + "337777777777777777777753", + " 3333333333333333333333 ", + " ", + " "}; + +static char *sticky_note_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #0066CC", + "2 c #996600", + "3 c #996633", + "4 c #999999", + "5 c #CC9900", + "6 c #CC9933", + "7 c #CC9999", + "8 c #CCCC66", + "9 c #FFCC00", + "A c #FFCC33", + "B c #FFCC66", + " ", + " ", + " ", + " ", + " 333333333333333333333333 ", + " 3999999999999999999999963 ", + " 399999999999999999999995533 ", + " 3999999999999999999999955533 ", + " 39A111111111111111111B9555553 ", + " 39A111111111111111111B95555553 ", + " 39ABBBBBBBBBBBBBBBBBBA99999993 ", + " 399999999999999999999999999993 ", + " 39ABBBBBBBBBBBBBBBBBBBBBBA9993 ", + " 39A1111111111111111111111B9993 ", + " 39A1111111111111111111111B9993 ", + " 399999999999999999999999999993 ", + " 399999999999999999999999999993 ", + " 39A777777777777777777778999993 ", + " 39B111111111111111111114999993 ", + " 39B444444444444444444447999993 ", + " 399999999999999999999999999993 ", + " 399999999999999999999999999993 ", + " 39A111111111111111111111111993 ", + " 39A111111111111111111111111993 ", + " 39ABBBBBBBBBBBBBBBBBBBBBBBB993 ", + " 399999999999999999999999999993 ", + " 399999999999999999999999999993 ", + " 333333333333333333333333333333 ", + " ", + " ", + " ", + " "}; + +static char **sticky_note_xpm[3] = { sticky_note_x16, sticky_note_x24, sticky_note_x32 }; + diff --git a/app/bin/bitmaps/stop.xpm b/app/bin/bitmaps/stop.xpm index 5c66ba1..78fb1fc 100644 --- a/app/bin/bitmaps/stop.xpm +++ b/app/bin/bitmaps/stop.xpm @@ -1,22 +1,128 @@ -/* XPM */ -static char * stop_xpm[] = { -"16 16 3 1", -" c None", -"X c #000000000000", -"o c #FFFF00000000", -" XXXXXXX ", -" XXXXXXXXX ", -" XXoooooooXX ", -" XXoooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -"XXoooooooooooXX ", -" XXoooooooooXX ", -" XXoooooooXX ", -" XXXXXXXXX ", -" XXXXXXX ", -" "}; +static char *stop_x16[] = { + "16 16 14 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #990000", + "4 c #993300", + "5 c #993333", + "6 c #CC3333", + "7 c #CC6633", + "8 c #CC6666", + "9 c #CC9966", + "A c #CC9999", + "B c #FF9999", + "C c #800000", + " 00 ", + " 1221 ", + " 11566511 ", + " 015788886510 ", + " 12678888886620 ", + " 13688AAA9876C0 ", + " 14689ABAA886C0 ", + " 1478AABBA886C0 ", + " 14789ABBA886C0 ", + " 14688AAAA886C0 ", + " 136788A98876C0 ", + " 11568888876410 ", + " 1C677776C1 ", + " 11566411 ", + " 1111 ", + " "}; + +static char *stop_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #990000", + "4 c #993300", + "5 c #993333", + "6 c #CC3300", + "7 c #CC3333", + "8 c #CC6633", + "9 c #CC6666", + "A c #CC9966", + "B c #CC9999", + "C c #FF9999", + "D c #800000", + " ", + " 0110 ", + " 1D7721 ", + " 1277777511 ", + " 11578888877410 ", + " 01D77899999987721 ", + " 12677899999999877310 ", + " 13778999ABA9999776D0 ", + " 1377899BBBBBA99877D0 ", + " 147899ABBBBBB99977D0 ", + " 147899BBCCCBBA9977D0 ", + " 147899BBCCCCBA9987D0 ", + " 147899BBCCCCBA9977D0 ", + " 147899ABBCCBB99977D0 ", + " 1377999BBBBBA99877D0 ", + " 13778999BBBA999876D0 ", + " 136779999999998776D0 ", + " 1D77789999998776D1 ", + " 1157788998877411 ", + " 127777777511 ", + " 014777721 ", + " 113D10 ", + " 10 ", + " "}; + +static char *stop_x32[] = { + "32 32 16 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #660000", + "3 c #990000", + "4 c #993300", + "5 c #993333", + "6 c #CC0000", + "7 c #CC3300", + "8 c #CC3333", + "9 c #CC6633", + "A c #CC6666", + "B c #CC9966", + "C c #CC9999", + "D c #FF9999", + "E c #800000", + " ", + " 11 ", + " 113E10 ", + " 014888821 ", + " 128888888511 ", + " 1158889999888411 ", + " 11488999AAA999888E1 ", + " 01E88899AAAAAAAA9888411 ", + " 12388899AAAAAAAAAA98887E1 ", + " 1378899AAAABBBAAAAA98886E0 ", + " 137889AAAABCCCCBAAAA9887E0 ", + " 138899AAACCCCCCCBAAA9887E0 ", + " 14889AAABCCCCCCCCAAA9888E0 ", + " 14889AAACCCDDDDCCBAAA988E0 ", + " 14889AABCCDDDDDCCCAAA988E0 ", + " 14889AABCCDDDDDCCCAAA988E0 ", + " 17889AABCCDDDDDCCCAAA988E0 ", + " 17889AAACCCDDDDCCBAAA988E0 ", + " 17889AAABCCCCCCCCBAA9888E0 ", + " 138899AAACCCCCCCBAAA9887E0 ", + " 137889AAABCCCCCBAAAA9887E0 ", + " 1378899AAAABBBAAAAA98887E0 ", + " 1E78889AAAAAAAAAAA98887620 ", + " 11488899AAAAAAAA99887311 ", + " 1E888999AAAA99888521 ", + " 11488899999888821 ", + " 11588888888410 ", + " 1288888411 ", + " 01E7411 ", + " 111 ", + " ", + " "}; + +static char **stop_xpm[3] = { stop_x16, stop_x24, stop_x32 }; + diff --git a/app/bin/bitmaps/straight-line.xpm b/app/bin/bitmaps/straight-line.xpm new file mode 100644 index 0000000..9808d8d --- /dev/null +++ b/app/bin/bitmaps/straight-line.xpm @@ -0,0 +1,96 @@ +static char *straight_line_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + " 222 ", + " 222 ", + " 2 2 ", + " 22 ", + " 22 ", + " 22 ", + " 01 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " "}; + +static char *straight_line_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #800000", + " ", + " ", + " 2222 ", + " 22 ", + " 2 2 ", + " 2 2 ", + " 2 ", + " 22 ", + " 22 ", + " 22 ", + " 03 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " 00 ", + " ", + " "}; + +static char *straight_line_x32[] = { + "32 32 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " ", + " 22222 ", + " 2222222 ", + " 2222 ", + " 22222 ", + " 222 22 ", + " 222 22 ", + " 222 22 ", + " 222 ", + " 222 ", + " 222 ", + " 122 ", + " 002 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 0 ", + " ", + " "}; + +static char **straight_line_xpm[3] = { straight_line_x16, straight_line_x24, straight_line_x32 }; + diff --git a/app/bin/bitmaps/straight.xpm b/app/bin/bitmaps/straight.xpm index b5fc178..83e2f67 100644 --- a/app/bin/bitmaps/straight.xpm +++ b/app/bin/bitmaps/straight.xpm @@ -1,22 +1,133 @@ -/* XPM */ -static char * straight_xpm[] = { -"16 16 3 1", -" c None", -". c #FFFF00000000", -"X c #000000000000", -" .....", -" X ..", -" X X . .", -" X . X.", -" X . X .", -" X X . X ", -" X . X X ", -" X . X ", -" X X . X ", -" X . X X ", -" X X X ", -"X X X ", -" X X X ", -"X X X ", -" X ", -" X X "}; +static char *straight_x16[] = { + "16 16 18 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #666666", + "5 c #993333", + "6 c #996600", + "7 c #996633", + "8 c #996666", + "9 c #999999", + "A c #CC0000", + "B c #CC3333", + "C c #CC6600", + "D c #CC6666", + "E c #CC9900", + "F c #C0C0C0", + "G c #808080", + " AAA ", + " AAAA", + " 945AAA", + " G9A8AA", + " G8B94 ", + " FG8D8GF ", + " E49B8G ", + " 37A9G ", + " 62EC49 ", + " E32E 2E ", + " E13E 3 ", + " 63 E2 E ", + " C1EE0C ", + " 2E 2C ", + " 33 ", + " 03E "}; + +static char *straight_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #663300", + "4 c #666666", + "5 c #996600", + "6 c #999999", + "7 c #CC0000", + "8 c #CC3333", + "9 c #CC6600", + "A c #CC9900", + "B c #CC9999", + "C c #C0C0C0", + "D c #808080", + " ", + " 77777 ", + " 777 ", + " C 4 7777 ", + " 6D 77 7 ", + " C 4DB7 4 7 ", + " 6D4 8B44 ", + " C 4DB7 DD ", + " CD4 8B44CC ", + " A 4DB7 DD ", + " A52 8B44CC ", + " A 03A7 DD ", + " A50 AA246C ", + " 03A 53 ", + " A50 AA 0AA ", + " 3A 93 ", + " A90 AA 09A ", + " 1A 93 ", + " A90 AA 05A ", + " 39 A3 ", + " 0 AA 05A ", + " A30 ", + " 05A ", + " 0 "}; + +static char *straight_x32[] = { + "32 32 17 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #666666", + "6 c #996600", + "7 c #999999", + "8 c #CC0000", + "9 c #CC3333", + "A c #CC6600", + "B c #CC6666", + "C c #CC9900", + "D c #CC9999", + "E c #C0C0C0", + "F c #808080", + " ", + " 888888 ", + " 8888888 ", + " 8888 ", + " E 5 88888 ", + " E75 888 88 ", + " F7 888 88 ", + " EE 5 D988 5 88 ", + " 7F5 88D 5 ", + " 57D8887F ", + " E 55 988 57E ", + " EF5 88D755 E ", + " 5FD888 FF ", + " CC35 989 55EE ", + " 64 889E55 ", + " 00CC 8 FF ", + " C40 CC 55 E ", + " 44 C60 ", + " C 0 C 04C ", + " CA0 C 00 CC ", + " 2A A2 ", + " CC 0 CC 0C ", + " C2 CC 0 C ", + " 0AC 64 ", + " C 00 CC 06C ", + " 44 CC0 ", + " 04C 46 ", + " 0 C 0 CC ", + " C20 ", + " 1A ", + " 00 C ", + " "}; + +static char **straight_xpm[3] = { straight_x16, straight_x24, straight_x32 }; + diff --git a/app/bin/bitmaps/switch-ai.xpm b/app/bin/bitmaps/switch-ai.xpm new file mode 100644 index 0000000..34213ba --- /dev/null +++ b/app/bin/bitmaps/switch-ai.xpm @@ -0,0 +1,96 @@ +static char *switch_ai_x16[] = { + "16 16 4 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + " ", + " 2 ", + " 2 ", + " 2222 ", + " 2222 ", + " 2222 ", + " 2221 ", + " 2 00 ", + " 00 ", + " 0 ", + " 0 000 ", + " 00000 ", + " 00 00 ", + " 00 000 ", + " 00 000 ", + " 00000000"}; + +static char *switch_ai_x24[] = { + "24 24 4 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #CC0000", + " ", + "222 ", + " 222 ", + " 222 ", + " 222 ", + " 22222 ", + " 222222 ", + " 222222 ", + " 222222 ", + " 222222 ", + " 222210 ", + " 000 ", + " 000 ", + " 000 ", + " 000 ", + " 000 000 ", + " 00000000 ", + " 000 00 ", + " 000 00 ", + " 00000 00 ", + " 0 00000 ", + " 0 0000 ", + " 00000000000 ", + " 00 00 "}; + +static char *switch_ai_x32[] = { + "32 32 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #800000", + " ", + " 22 ", + " 222 ", + " 222 ", + " 2222 ", + " 2222 ", + " 2222 ", + " 2222222 ", + " 2222222 ", + " 22222222 ", + " 22222222 ", + " 22222222 ", + " 22222221 ", + " 2222230 ", + " 2221000 ", + " 0000 ", + " 0000 ", + " 0000 ", + " 0000 ", + " 0000 ", + " 0000 0000 ", + " 000 000000 ", + " 0000000000 ", + " 0000 00 ", + " 0000 00 ", + " 000000 00 ", + " 000 0000 00 ", + " 000 000000 ", + " 00 00000 ", + " 000000000000000 ", + " 00000000000000000", + " 000000000000000 "}; + +static char **switch_ai_xpm[3] = { switch_ai_x16, switch_ai_x24, switch_ai_x32 }; + diff --git a/app/bin/bitmaps/table-edge.xpm b/app/bin/bitmaps/table-edge.xpm new file mode 100644 index 0000000..1983460 --- /dev/null +++ b/app/bin/bitmaps/table-edge.xpm @@ -0,0 +1,114 @@ +static char *table_edge_x16[] = { + "16 16 11 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #006600", + "3 c #333333", + "4 c #336633", + "5 c #339933", + "6 c #33CC33", + "7 c #666666", + "8 c #999999", + "9 c #808080", + " ", + " 5 ", + " 666666666666630", + " 666666666666430", + " 666666666664770", + " 666666666647970", + " 666666666479970", + " 666666664799970", + "122222222399993 ", + " 8888888979993 ", + " 888888897993 ", + " 88888889793 ", + " 8888888973 ", + " 888888870 ", + " 000000000 ", + " "}; + +static char *table_edge_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #336633", + "3 c #339933", + "4 c #33CC33", + "5 c #666633", + "6 c #666666", + "7 c #999999", + "8 c #808080", + " ", + " ", + " 2 ", + " 4444444444444444444430 ", + " 4444444444444444444310 ", + " 4444444444444444443180 ", + " 4444444444444444431880 ", + " 4444444444444444318880 ", + " 4444444444444443188880 ", + " 4444444444444431888880 ", + " 4444444444444418888880 ", + " 4444444444444188888881 ", + " 333333333333188888881 ", + " 77777777777718888881 ", + " 7777777777771888881 ", + " 777777777777188881 ", + " 777777777777188810 ", + " 77777777777718851 ", + " 7777777777771861 ", + " 777777777777161 ", + " 77777777777701 ", + " 0000000000000 ", + " ", + " "}; + +static char *table_edge_x32[] = { + "32 32 10 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #336633", + "3 c #339933", + "4 c #33CC33", + "5 c #666633", + "6 c #666666", + "7 c #999999", + "8 c #808080", + " ", + " ", + " ", + " 4444444444444444444444444443 ", + " 444444444444444444444444444310 ", + " 444444444444444444444444444110 ", + " 444444444444444444444444441860 ", + " 444444444444444444444444428860 ", + " 444444444444444444444444268860 ", + " 444444444444444444444442688860 ", + " 444444444444444444444426888860 ", + " 444444444444444444444268888860 ", + " 444444444444444444443588888860 ", + " 444444444444444444431888888860 ", + " 444444444444444444318888888860 ", + " 44444444444444444318888888881 ", + " 2333333333333333318888888881 ", + " 888888888888888668888888810 ", + " 77777777777777766888888851 ", + " 7777777777777776688888861 ", + " 777777777777777668888861 ", + " 77777777777777766888861 ", + " 7777777777777776688861 ", + " 777777777777777688881 ", + " 77777777777777768881 ", + " 7777777777777776881 ", + " 777777777777777661 ", + " 77777777777777711 ", + " 000000000000000000 ", + " ", + " ", + " "}; + +static char **table_edge_xpm[3] = { table_edge_x16, table_edge_x24, table_edge_x32 }; + diff --git a/app/bin/bitmaps/text.xpm b/app/bin/bitmaps/text.xpm index 176621d..12bc092 100644 --- a/app/bin/bitmaps/text.xpm +++ b/app/bin/bitmaps/text.xpm @@ -1,21 +1,89 @@ -/* XPM */ -static char * text_xpm[] = { -"16 16 2 1", -" c None", -". c #000000000000", -" .. ", -" .. ", -" .... ", -" .... ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .......... ", -" ............ ", -" .. .. ", -" .. .. ", -" .. .. ", -".. ..", -"... ..."}; +static char *text_x16[] = { + "16 16 2 1", + " c None", + "0 c #000000", + " ", + " 0000 ", + " 000000 ", + " 000000 ", + " 0000000 ", + " 00000000 ", + " 000 000 ", + " 0000 0000 ", + " 0000 0000 ", + " 0000 00000 ", + " 000000000000 ", + " 000000000000 ", + " 0000 0000 ", + " 0000 0000 ", + "0000 0000", + "0000 0000"}; + +static char *text_x24[] = { + "24 24 2 1", + " c None", + "0 c #000000", + " ", + " 000000 ", + " 000000 ", + " 00000000 ", + " 00000000 ", + " 0000000000 ", + " 0000000000 ", + " 0000000000 ", + " 00000 00000 ", + " 00000 00000 ", + " 000000 000000 ", + " 00000 00000 ", + " 00000 000000 ", + " 00000 00000 ", + " 0000000000000000 ", + " 000000000000000000 ", + " 000000000000000000 ", + " 0000000000000000000 ", + " 000000 000000 ", + " 00000 00000 ", + " 000000 000000 ", + " 00000 00000 ", + "000000 000000", + " "}; + +static char *text_x32[] = { + "32 32 2 1", + " c None", + "0 c #000000", + " ", + " 00000000 ", + " 00000000 ", + " 000000000 ", + " 0000000000 ", + " 0000000000 ", + " 000000000000 ", + " 000000000000 ", + " 00000000000000 ", + " 00000000000000 ", + " 000000 000000 ", + " 0000000 0000000 ", + " 000000 0000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + " 000000 0000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + " 0000000000000000000000 ", + " 00000000000000000000000 ", + " 000000000000000000000000 ", + " 000000000000000000000000 ", + " 00000000000000000000000000 ", + " 0000000 0000000 ", + " 0000000 00000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + " 0000000 0000000 ", + "00000000 00000000", + " "}; + +static char **text_xpm[3] = { text_x16, text_x24, text_x32 }; + diff --git a/app/bin/bitmaps/top.xpm b/app/bin/bitmaps/top.xpm new file mode 100644 index 0000000..84d2152 --- /dev/null +++ b/app/bin/bitmaps/top.xpm @@ -0,0 +1,111 @@ +static char *top_x16[] = { + "16 16 9 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #990000", + "3 c #993333", + "4 c #996666", + "5 c #CC0000", + "6 c #FF0000", + "7 c #808080", + " ", + " ", + " 000000000 ", + " 214777777770", + " 22555377777770", + " 256666637777770", + " 566666663777770", + "2566666662777770", + "2566666662777770", + "2566666662777770", + " 266666654777770", + " 26666537777770", + " 2222477777770", + " 0000000000", + " ", + " "}; + +static char *top_x24[] = { + "24 24 10 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #990000", + "3 c #993333", + "4 c #996666", + "5 c #CC0000", + "6 c #FF0000", + "7 c #808080", + "8 c #800000", + " ", + " ", + " ", + " ", + " 000000000000000 ", + " 222847777777777770 ", + " 2556552377777777770 ", + " 26666666537777777770 ", + " 266666666663777777770 ", + " 2666666666665477777770 ", + " 2666666666666377777770 ", + " 2666666666666277777770 ", + "25666666666666277777770 ", + " 2666666666666377777770 ", + " 2666666666665377777770 ", + " 2566666666662777777770 ", + " 256666666654777777770 ", + " 25666666247777777770 ", + " 2225223777777777770 ", + " 100000000000000 ", + " ", + " ", + " ", + " "}; + +static char *top_x32[] = { + "32 32 9 1", + " c None", + "0 c #000000", + "1 c #660000", + "2 c #990000", + "3 c #993333", + "4 c #996666", + "5 c #CC0000", + "6 c #FF0000", + "7 c #808080", + " ", + " ", + " ", + " ", + " ", + " 00000000000000000000 ", + " 07777777777777777770 ", + " 222223477777777777777770 ", + " 2556666537777777777777770 ", + " 226666666662477777777777770 ", + " 2566666666666547777777777770 ", + " 25666666666666654777777777770 ", + " 26666666666666663777777777770 ", + " 256666666666666665477777777770 ", + " 266666666666666666377777777770 ", + " 266666666666666666377777777770 ", + " 266666666666666666377777777770 ", + " 266666666666666666377777777770 ", + " 256666666666666665377777777770 ", + " 256666666666666665477777777770 ", + " 26666666666666663777777777770 ", + " 2666666666666637777777777770 ", + " 2566666666666347777777777770 ", + " 225666666653777777777777770 ", + " 2225552247777777777777770 ", + " 2217777777777777777770 ", + " 00000000000000000000 ", + " ", + " ", + " ", + " ", + " "}; + +static char **top_xpm[3] = { top_x16, top_x24, top_x32 }; + diff --git a/app/bin/bitmaps/train.xpm b/app/bin/bitmaps/train.xpm index c94593e..bc9a846 100644 --- a/app/bin/bitmaps/train.xpm +++ b/app/bin/bitmaps/train.xpm @@ -1,22 +1,118 @@ -/* XPM */ -static char * train_xpm[]={ -"16 16 3 1", -". c None", -"# c #800080008000", -"a c #000000000000", -".....#..#.#.....", -"aaaa.......##...", -"...a........#...", -"...a...a...#....", -"...a..aaa..aa...", -"...a..aaa..aa...", -"aaaaaaaaaaaaaa..", -"aaaaaaaaaaaaaa..", -"aaaaaaaaaaaaaa..", -"aaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaa", -"...aa...aa.....a", -"..aaaa.aaaa....a", -"..aaaa.aaaa..aa.", -"...aa...aa...aa.", -"................"}; +static char *train_x16[] = { + "16 16 12 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #006666", + "5 c #009966", + "6 c #669933", + "7 c #999933", + "8 c #99CC33", + "9 c #CCCC33", + "A c #808080", + " ", + " AAAAAAAAA ", + " AAAAAAAAAAA ", + " AAAAAAAAAAAA ", + " AAAAAAAAAAAA ", + " AAAAA A ", + " 0 A ", + " 0000 0 ", + " 0 0 0 ", + " 3761111111111 ", + " 3985555555555 ", + " 3984444444444 ", + " 3971221221221 ", + " 000000000 00 ", + " 0000000000000 0", + " 0 0 0 "}; + +static char *train_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #009966", + "5 c #669933", + "6 c #999933", + "7 c #99CC33", + "8 c #FFFF33", + "9 c #808080", + " ", + " 9999999999 ", + " 999999999999999 ", + " 99999999999999999 ", + " 999999999999999999 ", + " 999999999999999999 ", + " 99999999999999999 ", + " 99999999999 99 ", + " 99 99 ", + " 99 ", + " 0000000 00 ", + " 0 00 ", + " 0 00 00 ", + " 0 00 00 ", + " 33573322222222222222 ", + " 33683344444444444444 ", + " 33683344444444444444 ", + " 33683333333333333333 ", + " 33683322222222222222 ", + " 333521000000000000000 ", + " 00000000 0000 00 ", + " 00 00000000 0000 00 00", + " 00 000 000 000 00 ", + " "}; + +static char *train_x32[] = { + "32 32 12 1", + " c None", + "0 c #000000", + "1 c #003300", + "2 c #003333", + "3 c #006633", + "4 c #009966", + "5 c #336633", + "6 c #669933", + "7 c #999933", + "8 c #CCCC33", + "9 c #FFFF33", + "A c #808080", + " ", + " ", + " AAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAAAAAAAAA ", + " AAAAAAAAAAAAAAAAA AAA ", + " AAAAAAAAAAA AA ", + " AA ", + " AA ", + " 0000 ", + " 00000000 0000 ", + " 00 0000 ", + " 00 000 0000 ", + " 00 000 0000 ", + " 33333330000000000000000000 ", + " 33587332222222222222222222 ", + " 33698333333333333333333333 ", + " 33698334444444444444444444 ", + " 33698334444444444444444444 ", + " 33698333333333333333333333 ", + " 33698332222222222222222222 ", + " 33333320011000011000011100 ", + " 0000 0000 0000 00 ", + " 0 000000000000000000 0 00 ", + " 000 000000000000000000 000 00 ", + " 000 00000 0000 0000 000 ", + " 000 00 00 0 ", + " "}; + +static char **train_xpm[3] = { train_x16, train_x24, train_x32 }; + diff --git a/app/bin/bitmaps/trim.xpm b/app/bin/bitmaps/trim.xpm new file mode 100644 index 0000000..ac679d6 --- /dev/null +++ b/app/bin/bitmaps/trim.xpm @@ -0,0 +1,99 @@ +static char *trim_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #666666", + "2 c #CC0000", + "3 c #808080", + "4 c #800000", + " ", + " 3 ", + " 22 3 ", + " 22 3 ", + " 22 2 3 ", + " 222 3 ", + " 22 3 ", + " 222221 ", + " 42222 ", + " 0 2222 ", + " 0 222 ", + " 00 2 2 ", + " 00 2 ", + " 00 2 ", + " 00 2 ", + " "}; + +static char *trim_x24[] = { + "24 24 5 1", + " c None", + "0 c #000000", + "1 c #990000", + "2 c #CC0000", + "3 c #808080", + " ", + " ", + " 3 ", + " 2 3 ", + " 2 3 ", + " 2 2 3 ", + " 22 22 3 ", + " 22 22 3 ", + " 2222 3 ", + " 222 3 ", + " 222222 3 ", + " 2222222 ", + " 122 222 ", + " 0 2222222 ", + " 0 2222 ", + " 0 22 2 ", + " 0 22 2 ", + " 00 22 2 ", + " 00 22 2 ", + " 00 22 ", + " 00 22 ", + " 00 2 ", + " 0 ", + " "}; + +static char *trim_x32[] = { + "32 32 5 1", + " c None", + "0 c #000000", + "1 c #CC0000", + "2 c #808080", + "3 c #800000", + " ", + " ", + " 2 ", + " 222 ", + " 11 222 ", + " 111 222 ", + " 111 222 ", + " 111 1 222 ", + " 111 111 222 ", + " 111 111 222 ", + " 111 111 222 ", + " 111111 222 ", + " 11111 222 ", + " 11111111 222 ", + " 1111111111 2 ", + " 111 1111 ", + " 3111 ", + " 003111111111 ", + " 000 11111111 ", + " 000 11111 ", + " 000 111111 ", + " 000 111 111 ", + " 000 111 111 ", + " 000 111 111 ", + " 000 11 111 ", + " 0000 111 ", + " 0000 111 ", + " 0000 1111 ", + " 000 11 ", + " 00 ", + " ", + " "}; + +static char **trim_xpm[3] = { trim_x16, trim_x24, trim_x32 }; + diff --git a/app/bin/bitmaps/tunnel.xpm b/app/bin/bitmaps/tunnel.xpm index 449080e..9b70b28 100644 --- a/app/bin/bitmaps/tunnel.xpm +++ b/app/bin/bitmaps/tunnel.xpm @@ -1,22 +1,118 @@ -/* XPM */ -static char * tunnel_xpm[] = { -"16 16 3 1", -" c None", -". c #00FFFF", -"+ c #000000", -" .. ", -" .. ", -" .. ", -" .. ", -"+ + .. ", -"++++++++.. + + ", -"+ + .. ", -"+ + .. ", -"+ + .. ", -"++++++++.. + + ", -"+ + .. ", -" .. ", -" .. ", -" .. ", -" .. ", -" "}; +static char *tunnel_x16[] = { + "16 16 11 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333333", + "3 c #663300", + "4 c #666666", + "5 c #993300", + "6 c #996600", + "7 c #999999", + "8 c #CC6600", + "9 c #808080", + " ", + " ", + " ", + " ", + " 00 ", + " 8 8 007 7 7 7 ", + "0303102999949499", + " 6 63027797 7 79", + " 8 8 0077 7 7 7 ", + "0000002444444444", + " 8 8 0077 7 7 7 ", + " 00 ", + " 0 ", + " ", + " ", + " "}; + +static char *tunnel_x24[] = { + "24 24 11 1", + " c None", + "0 c #000000", + "1 c #333300", + "2 c #333333", + "3 c #663300", + "4 c #666666", + "5 c #993300", + "6 c #996600", + "7 c #999999", + "8 c #CC6600", + "9 c #808080", + " ", + " ", + " ", + " ", + " ", + " ", + " 00 ", + " 00 ", + " 8 8 00 7 7 7 77 ", + " 35006000449949944994994", + " 35006000449949944994994", + " 88 8 0 77 7 7 77 ", + " 88 8 0 77 7 7 77 ", + " 66 6 02 79 97 79 77 ", + "013003000449949944994994", + " 88 8 0 77 7 7 77 ", + " 00 ", + " 00 ", + " 0 ", + " ", + " ", + " ", + " ", + " "}; + +static char *tunnel_x32[] = { + "32 32 13 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #663333", + "6 c #666666", + "7 c #993300", + "8 c #996600", + "9 c #999999", + "A c #CC6600", + "B c #808080", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " 00 ", + " 000 ", + " 00 ", + " AA AA 00 99 99 99 99 ", + " 488 884 003 99 99B 99 99B ", + " 14400441000566BB66BBB66BB66BBB6", + " AA AA 00 99 99 99 99 ", + " AA AA 00 99 99 99 99 ", + " AA AA 00 99 99 99 99 ", + " AA AA 00 99 99 99 99 ", + " 28700782000366BB66BBB66BB66BBB ", + " 28700782000366BB66BBB66BB66BBB ", + " AA AA 00 99 99 99 99 ", + " 000 ", + " 000 ", + " 0000 ", + " 0 ", + " ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char **tunnel_xpm[3] = { tunnel_x16, tunnel_x24, tunnel_x32 }; + diff --git a/app/bin/bitmaps/turnout-designer.xpm b/app/bin/bitmaps/turnout-designer.xpm new file mode 100644 index 0000000..00db9be --- /dev/null +++ b/app/bin/bitmaps/turnout-designer.xpm @@ -0,0 +1,129 @@ +static char *turnout_designer_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #666666", + "6 c #996600", + "7 c #999999", + "8 c #CC6600", + "9 c #CC9900", + "A c #CC9966", + "B c #CCCCCC", + "C c #C0C0C0", + "D c #808080", + " ", + " ", + " BBBBBBB ", + " B777777CB ", + " BC5500557B ", + " BBBBD3BBBB ", + " BD3B99640 ", + " BD3B64169 ", + " CD3B669 60", + " 9 9667D3B9 6168", + "10000077DB000000", + " 9 999ACC76 9 9 ", + "4424101244414240", + " 86646866684868 ", + " ", + " "}; + +static char *turnout_designer_x24[] = { + "24 24 17 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #666666", + "6 c #996600", + "7 c #999966", + "8 c #999999", + "9 c #CC6600", + "A c #CC9900", + "B c #CC9999", + "C c #CCCC99", + "D c #CCCCCC", + "E c #C0C0C0", + "F c #808080", + " ", + " ", + " ", + " ", + " DDEEEEEEEEEDD ", + " D50000000008D ", + " DE00000000008D ", + " DDEEE8005EEEDD ", + " DD008D ", + " D008D A40 ", + " D008DAAA016 ", + " D008D9424 AA ", + " D008846AA A0 ", + " A D008EAA AA024 ", + " AA A 925D008DAA 4409A ", + "0000000003D0088000000000", + " AA A A DEED826 AA A ", + " AA A A 7FF7 AA AA A ", + " 66 96040040 9 66 66 96 ", + "044041041140040440440420", + " AA A A A A AA AA A ", + " ", + " ", + " "}; + +static char *turnout_designer_x32[] = { + "32 32 14 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #666666", + "6 c #993300", + "7 c #996600", + "8 c #999999", + "9 c #CC6600", + "A c #CC9900", + "B c #CCCCCC", + "C c #C0C0C0", + " ", + " ", + " ", + " ", + " ", + " BBBBBBBBBBBBBBBBB ", + " BB5555555555555BB ", + " B80000000000000BB ", + " BB30000000000000BB ", + " BC55555500355555BB ", + " BBBBBBBB8003BBBBBBB ", + " B8003BB ", + " B8003BB A00 ", + " B8003BB AA 044 ", + " B8003BB A97007A ", + " B8003BB76077 AA ", + " B8003B827 AA A ", + " B8003BC A A 920 ", + " AA B8003BB A AA 019 ", + " A A 9700B8003BB A 0410AA ", + " 041014000200B8003B824000440440 ", + " 94 490079 BC888B8210079 77 ", + " A A AA BBBBCC87A A AA ", + " A A AA 74007A A A AA ", + " A A 770047 AA A A AA ", + " 000000000000000000000000000000 ", + " A A AA AA AA A A AA ", + " A A A A A A A A ", + " ", + " ", + " ", + " "}; + +static char **turnout_designer_xpm[3] = { turnout_designer_x16, turnout_designer_x24, turnout_designer_x32 }; + diff --git a/app/bin/bitmaps/turnout.xpm b/app/bin/bitmaps/turnout.xpm index 91d7af5..dc60fdb 100644 --- a/app/bin/bitmaps/turnout.xpm +++ b/app/bin/bitmaps/turnout.xpm @@ -1,21 +1,107 @@ -/* XPM */ -static char * turnout_xpm[] = { -"16 16 2 1", -" c None", -". c #000000000000", -" ", -" ", -" . . ", -" .. ", -" . ... ", -" .. . . ", -" . ... .. ", -" . .. . .. . ", -"............... ", -" . . .. . ", -" . ... . . ", -"............... ", -" . . . . ", -" ", -" ", -" "}; +static char *turnout_x16[] = { + "16 16 8 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC6600", + "6 c #CC9900", + " ", + " ", + " ", + " ", + " 64 ", + " 6414 ", + " 53236650", + " 541346 5234", + "2323002232301231", + " 54545543133535 ", + " 54533124453535 ", + "2323123232313130", + " ", + " ", + " ", + " "}; + +static char *turnout_x24[] = { + "24 24 8 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC6600", + "6 c #CC9900", + " ", + " ", + " ", + " ", + " ", + " ", + " 6 ", + " 6 32 ", + " 643036 ", + " 6602346 66 ", + " 6 32056 6 40 ", + " 6 33046 66 64035 ", + " 3404302014034043003243 ", + " 3404304224034030043043 ", + " 66 66 6 6 32046 66 6 ", + " 66 66 6322035 66 66 6 ", + "02303200003023032032032 ", + " 45 5405335 45 54 54 54 ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char *turnout_x32[] = { + "32 32 8 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #663300", + "4 c #996600", + "5 c #CC6600", + "6 c #CC9900", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " 6 ", + " 50 ", + " 6660035 ", + " 66121 6 ", + " 6 32056 66 ", + " 6 50046 6 6 0 ", + " 64004 66 66 32 ", + " 6 6 66 0310 6 66 62046 ", + " 54 500320044 5 45 0113054 ", + " 032003001300320030022002320320 ", + " 6 6 66 6 63014 66 66 ", + " 6 6 66 6 021066 66 66 ", + " 6 6 66 41006 66 66 66 ", + " 54 500330044 53 45 45 54 ", + " 032003001300320031023002300320 ", + " 6 6 66 6 6 66 66 66 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " "}; + +static char **turnout_xpm[3] = { turnout_x16, turnout_x24, turnout_x32 }; + diff --git a/app/bin/bitmaps/turntable.xpm b/app/bin/bitmaps/turntable.xpm new file mode 100644 index 0000000..c6e6375 --- /dev/null +++ b/app/bin/bitmaps/turntable.xpm @@ -0,0 +1,133 @@ +static char *turntable_x16[] = { + "16 16 17 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #663333", + "6 c #666633", + "7 c #666666", + "8 c #996600", + "9 c #999999", + "A c #CC6600", + "B c #CC9900", + "C c #CCCCCC", + "D c #FFFFFF", + "E c #C0C0C0", + "F c #808080", + " 1B ", + " 0 82B 000 ", + " 84 85033303 ", + " B446FF397793 ", + " B39DF3977DC3 ", + " 7DDF3977DDF3", + "88A5EDDF3977DDC3", + "4443CDDF3977DDD0", + "BBB3CDDF3977DDD3", + "1000EDDF3977DDC3", + "BBB49DDF3977DDE3", + " B3CDF3977DD3 ", + " B483CF3977CF3 ", + " 84 837373330 ", + " 0B82B03330 ", + " 04B "}; + +static char *turntable_x24[] = { + "24 24 17 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #666600", + "6 c #666633", + "7 c #666666", + "8 c #996600", + "9 c #999999", + "A c #CC6600", + "B c #CC9900", + "C c #CCCCCC", + "D c #FFFFFF", + "E c #C0C0C0", + "F c #808080", + " 0 B ", + " 48 ", + " 0 B20B 000 ", + " 2A 48300000030 ", + " B1 B8397799939F3 ", + " 467CD779993EDE3 ", + " B83CDD779993EDDC3 ", + " 3CDDD779993EDDD93 ", + " 0FDDDD779993EDDDD3 ", + " B B3EDDDD779993EDDDD90", + "040243CDDDD779993EDDDDC3", + " A 8A0DDDDD779993EDDDDC3", + " B BB3DDDDD779993EDDDDC3", + " A 8A3CDDDD779993EDDDDE3", + "040243CDDDD779993EDDDD90", + " B B39DDDD779993EDDDD7 ", + " 3CDDD779993EDDDC3 ", + " B2FDDD779993EDDD3 ", + " 443EDD779993EDDF3 ", + " B40 B37C779993EC73 ", + " 24 B41333777073 ", + " 0 B 08B 0300330 ", + " 48 ", + " 04B "}; + +static char *turntable_x32[] = { + "32 32 16 1", + " c None", + "0 c #000000", + "1 c #330000", + "2 c #333300", + "3 c #333333", + "4 c #663300", + "5 c #663333", + "6 c #666666", + "7 c #996600", + "8 c #999999", + "9 c #CC6600", + "A c #CC9900", + "B c #CCCCCC", + "C c #FFFFFF", + "D c #C0C0C0", + "E c #808080", + " 0 ", + " 04A ", + " 72 ", + " 0 AA 00AA 0000 ", + " 04A 47 3000000033 ", + " A71 A903D668888E3D33 ", + " A 02AA38BC668888E3CC83 ", + " 443BCCC668888E3CCCB6 ", + " A 08CCCC668888E3CCCCB3 ", + " 3ECCCCC668888E3CCCCCD3 ", + " 3BCCCCC668888E3CCCCCC6 ", + " 08CCCCCC668888E3CCCCCCD3 ", + " AA A 3BCCCCCC668888E3CCCCCCB3 ", + " 77 903CCCCCCC668888E3CCCCCCC6 ", + "04400403CCCCCCC668888E3CCCCCCC80", + " AA A0ECCCCCCC668888E3CCCCCCC83", + " AA A0ECCCCCCC668888E3CCCCCCCD3", + " AA A 6CCCCCCC668888E3CCCCCCC80", + "04400403CCCCCCC668888E3CCCCCCC80", + " 77 9 3BCCCCCC668888E3CCCCCCC6 ", + " AA A 3DCCCCCC668888E3CCCCCCB3 ", + " 6CCCCCC668888E3CCCCCC83 ", + " 3BCCCCC668888E3CCCCCB3 ", + " A13BCCCC668888E3CCCCC6 ", + " 743ECCCC668888E3CCCC83 ", + " A 09A5EBCC668888E3CCC86 ", + " 91 AA33DC668888E3CB63 ", + " 2A 74 363366666363 ", + " 0 A 09A 03000033 ", + " 90 ", + " 29 ", + " 0 AA "}; + +static char **turntable_xpm[3] = { turntable_x16, turntable_x24, turntable_x32 }; + diff --git a/app/bin/bitmaps/turntbl.xpm b/app/bin/bitmaps/turntbl.xpm deleted file mode 100644 index ca6f359..0000000 --- a/app/bin/bitmaps/turntbl.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static char * turntbl_xpm[] = { -"16 16 2 1", -" c None", -". c #000000000000", -" . ", -". .. ", -" . .. ..... ", -" . .. . . . ", -" . . . . . . ", -" . . . . ", -" . . . . .", -".... . . .", -" . . . . .", -".... . . .", -" . . . . .", -" . . . . ", -" . . . . . . ", -" . .. . . . ", -" . .. ..... ", -" .. "}; diff --git a/app/bin/bitmaps/undo.xpm b/app/bin/bitmaps/undo.xpm new file mode 100644 index 0000000..2450967 --- /dev/null +++ b/app/bin/bitmaps/undo.xpm @@ -0,0 +1,103 @@ +static char *undo_x16[] = { + "16 16 6 1", + " c None", + "0 c #000000", + "1 c #996600", + "2 c #CC6600", + "3 c #CC9900", + "4 c #FFCC00", + " ", + " 1 ", + " 11 ", + " 13411 ", + " 134443311 ", + " 1344444432 ", + " 1342114431 ", + " 11 1443 ", + " 1 1441 ", + " 141 ", + " 1331 ", + " 131 ", + " 131 ", + " 131 ", + " 11 ", + " "}; + +static char *undo_x24[] = { + "24 24 7 1", + " c None", + "0 c #000000", + "1 c #996600", + "2 c #CC6600", + "3 c #CC9900", + "4 c #FF9900", + "5 c #FFCC00", + " ", + " ", + " 1 ", + " 11 ", + " 12531 ", + " 1355311 ", + " 135555533311 ", + " 15555555555411 ", + " 13555555555531 ", + " 13553113555531 ", + " 2531 135552 ", + " 111 135551 ", + " 1 3553 ", + " 13551 ", + " 1551 ", + " 1353 ", + " 1531 ", + " 1551 ", + " 1351 ", + " 151 ", + " 151 ", + " 131 ", + " 11 ", + " "}; + +static char *undo_x32[] = { + "32 32 7 1", + " c None", + "0 c #000000", + "1 c #996600", + "2 c #CC6600", + "3 c #CC9900", + "4 c #FF9900", + "5 c #FFCC00", + " ", + " ", + " ", + " 1 ", + " 121 ", + " 12531 ", + " 135531 ", + " 13555551111 ", + " 135555555433211 ", + " 15555555555555531 ", + " 1355555555555555531 ", + " 255555555555555531 ", + " 135555112355555531 ", + " 125551 113555552 ", + " 1351 12555551 ", + " 121 2555531 ", + " 11 255551 ", + " 35552 ", + " 135531 ", + " 15551 ", + " 13551 ", + " 15531 ", + " 14531 ", + " 3551 ", + " 1551 ", + " 1551 ", + " 1351 ", + " 1351 ", + " 151 ", + " 111 ", + " ", + " "}; + +static char **undo_xpm[3] = { undo_x16, undo_x24, undo_x32 }; + diff --git a/app/bin/bitmaps/zoom-choose.xpm b/app/bin/bitmaps/zoom-choose.xpm new file mode 100644 index 0000000..4066455 --- /dev/null +++ b/app/bin/bitmaps/zoom-choose.xpm @@ -0,0 +1,127 @@ +static char *zoom_choose_x16[] = { + "16 16 13 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #333366", + "3 c #336666", + "4 c #666666", + "5 c #669999", + "6 c #6699CC", + "7 c #9999CC", + "8 c #99CCCC", + "9 c #99CCFF", + "A c #99FFFF", + "B c #CCFFFF", + " ", + " 13421 ", + " 249BBB93 ", + " 3BBBBBB92 ", + " 18500000650 ", + " 19934443981 ", + " 19B73438B81 ", + " 18BB415BB50 ", + " 3BBA5BBA3 ", + " 15ABBB931 ", + " 014431141 ", + " 0140 ", + " 0140 ", + " 0110 ", + " 010 ", + " "}; + +static char *zoom_choose_x24[] = { + "24 24 15 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #9999CC", + "A c #99CCCC", + "B c #99CCFF", + "C c #99FFFF", + "D c #CCFFFF", + " ", + " 02220 ", + " 227ABA832 ", + " 37DDDDDDC93 ", + " 29DDDDDDDDDA3 ", + " 4DDDDDDDDDDD72 ", + " 2AD755555556CB2 ", + " 2CD725555525DD2 ", + " 0DDD4555554BDD4 ", + " 2DDDB45554ADDD4 ", + " 2BDDDA4557DDDD1 ", + " 2ADDDD754CDDDB2 ", + " 4DDDDC4BDDDD72 ", + " 27DDDDDDDDDA2 ", + " 37CDDDDDD7350 ", + " 0279AA6222520 ", + " 00220 05520 ", + " 05520 ", + " 2552 ", + " 2552 ", + " 02550 ", + " 0220 ", + " 0 ", + " "}; + +static char *zoom_choose_x32[] = { + "32 32 16 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #666666", + "7 c #666699", + "8 c #669999", + "9 c #6699CC", + "A c #9999CC", + "B c #99CCCC", + "C c #99CCFF", + "D c #99FFFF", + "E c #CCFFFF", + " ", + " ", + " 31560130 ", + " 36BEEEEEC83 ", + " 3AEEEEEEEEEC64 ", + " 4CEEEEEEEEEEEE83 ", + " 4BEEEEEEEEEEEEED5 ", + " 5EEEEEEEEEEEEEEEC3 ", + " 3CEDAAAAAAAAAAABEE5 ", + " 2EED333333333339EEB3 ", + " 4EEEC4666666666EEEB3 ", + " 6EEEE956666665CEEEC3 ", + " 08EEEEE6666665BEEEEC3 ", + " 5EEEEEC566668EEEEEB3 ", + " 3EEEEEEB5665EEEEEE80 ", + " 3BEEEEEE865CEEEEEE5 ", + " 5EEEEEEE5AEEEEEEB3 ", + " 38EEEEEEDEEEEEED3 ", + " 4BEEEEEEEEEEED530 ", + " 38DEEEEEEEEB36630 ", + " 33BCCEECB7336663 ", + " 33300330 036660 ", + " 036660 ", + " 036663 ", + " 066630 ", + " 066630 ", + " 366630 ", + " 36660 ", + " 03630 ", + " 000 ", + " ", + " "}; + +static char **zoom_choose_xpm[3] = { zoom_choose_x16, zoom_choose_x24, zoom_choose_x32 }; + diff --git a/app/bin/bitmaps/zoom-extent.xpm b/app/bin/bitmaps/zoom-extent.xpm new file mode 100644 index 0000000..17688da --- /dev/null +++ b/app/bin/bitmaps/zoom-extent.xpm @@ -0,0 +1,125 @@ +static char *zoom_extent_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #669999", + "7 c #990000", + "8 c #9999CC", + "9 c #99CCCC", + "A c #99CCFF", + "B c #CC0000", + "C c #CCFFFF", + "D c #800000", + " B BBB ", + "BBBBB BBBBB", + "BBB BBB", + "BB B B BB", + " B B B BB", + " D2523 ", + " 2ACC60 ", + " 06CCC92 ", + " 4CCC81 ", + " 36A93 ", + " 2220 ", + " B 00 B ", + "BB BB 000 B BB", + "BBBB 00 BBB", + "BBB BBB", + "BBBBB BBBBB"}; + +static char *zoom_extent_x24[] = { + "24 24 12 1", + " c None", + "0 c #000000", + "1 c #333333", + "2 c #336666", + "3 c #666666", + "4 c #666699", + "5 c #669999", + "6 c #99CCCC", + "7 c #99CCFF", + "8 c #99FFFF", + "9 c #CC0000", + "A c #CCFFFF", + " ", + " 999999 999999 ", + " 999 99 ", + " 999 9 9 ", + " 9 9 9 9 ", + " 9 9 9 9 ", + " 9 9 9 9 ", + " 9 111 9 ", + " 1267621 ", + " 28AAA82 ", + " 16AAAAA61 ", + " 17AAAAA71 ", + " 16AAAAA61 ", + " 3AAAAA50 ", + " 147A752 ", + " 01010 ", + " 010 ", + " 9 99 010 9 9 ", + " 9 99 01 9 9 ", + " 9 99 010 9 9 ", + " 9 99 000 9 9 ", + " 999 99 ", + " 999999 999999 ", + " "}; + +static char *zoom_extent_x32[] = { + "32 32 15 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #99CCCC", + "A c #99CCFF", + "B c #99FFFF", + "C c #CC0000", + "D c #CCFFFF", + " ", + " CCCCCCCC CCCCCCCC ", + " CCCCCCCC CCCCCCCC ", + " CCCCC CCCC ", + " CCCCC CCCCC ", + " CCCCCC CCC CC ", + " CC CCC CCC CC ", + " CC CCC CCC CC ", + " CC CCC CCC CC ", + " CC CC ", + " 20012 ", + " 369DDD94 ", + " 06DDDDDDA4 ", + " 2ADDDDDDD82 ", + " 4DDDDDDDDA2 ", + " 5DDDDDDDDA2 ", + " 3DDDDDDDDA2 ", + " 2ADDDDDDD72 ", + " 4BDDDDDA3 ", + " 49DDA84 ", + " 210210 ", + " 050 ", + " CC 0220 CC ", + " CC CCC 050 CCC CC ", + " CC CCC 050 CCC CC ", + " CC CCC 0220 CCC CC ", + " CC CCC 020 CCC CC ", + " CCCCC 00 CCCCC ", + " CCCC CCCC ", + " CCCCCCCC CCCCCCCC ", + " CCCCCCCC CCCCCCCC ", + " "}; + +static char **zoom_extent_xpm[3] = { zoom_extent_x16, zoom_extent_x24, zoom_extent_x32 }; + diff --git a/app/bin/bitmaps/zoom-in.xpm b/app/bin/bitmaps/zoom-in.xpm new file mode 100644 index 0000000..8f66a29 --- /dev/null +++ b/app/bin/bitmaps/zoom-in.xpm @@ -0,0 +1,128 @@ +static char *zoom_in_x16[] = { + "16 16 15 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #6699CC", + "9 c #9999CC", + "A c #99CCCC", + "B c #99CCFF", + "C c #99FFFF", + "D c #CCFFFF", + " 00 ", + " 227752 ", + " 37DB9CB5 ", + " 5DDA0BDC3 ", + " 2ADDA0BDD70 ", + " 2B6000007A2 ", + " 2BA97089AA1 ", + " 2ADDA0BDD70 ", + " 4CDA0BDB2 ", + " 4ADDCA22 ", + " 20022252 ", + " 0250 ", + " 0250 ", + " 0520 ", + " 022 ", + " 0 "}; + +static char *zoom_in_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #9999CC", + "9 c #99CCCC", + "A c #99CCFF", + "B c #99FFFF", + "C c #CCFFFF", + " ", + " 0220220 ", + " 379BCA962 ", + " 39CCAAACC93 ", + " 2ACCC706CCC93 ", + " 27CCCC706CCCC70 ", + " 2ACCCC706CCCC92 ", + " 0CA888504888AB1 ", + " 3CA0000000009C3 ", + " 2CA6664026669C1 ", + " 2ACCCC706CCCCA2 ", + " 29CCCC706CCCC93 ", + " 3ACCC706CCCB4 ", + " 5CCCAAACCB52 ", + " 329CCCCB93250 ", + " 225541205520 ", + " 05520 ", + " 2552 ", + " 2552 ", + " 02550 ", + " 02550 ", + " 0520 ", + " 00 ", + " "}; + +static char *zoom_in_x32[] = { + "32 32 16 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #666666", + "7 c #666699", + "8 c #669999", + "9 c #6699CC", + "A c #9999CC", + "B c #99CCCC", + "C c #99CCFF", + "D c #99FFFF", + "E c #CCFFFF", + " ", + " 0000 ", + " 338AA9653 ", + " 4BEEEEEEEB53 ", + " 35CEEEEEEEEEEB4 ", + " 07EEEEE700CEEEE83 ", + " 3CEEEEE700CEEEEE7 ", + " 38EEEEEE700CEEEEEC3 ", + " 1EEEEEEE700CEEEEEE5 ", + " 4EEEEEEE700CEEEEEE90 ", + " 6EE8000000000000CEB3 ", + " 08EE8000000000000CEB3 ", + " 08EE8000000000000CEB3 ", + " 5EEEEEEE700CEEEEEEA2 ", + " 3DEEEEEE700CEEEEEE6 ", + " 3BEEEEEE700CEEEEEC4 ", + " 4CEEEEE700CEEEEE5 ", + " 6EEEEE977CEEEEB3 ", + " 38DEEEEEEEEEE8330 ", + " 33BEEEEEEEC63663 ", + " 3469AA853036663 ", + " 0000 036660 ", + " 036660 ", + " 066630 ", + " 066630 ", + " 36663 ", + " 36660 ", + " 036660 ", + " 03660 ", + " 030 ", + " 0 ", + " "}; + +static char **zoom_in_xpm[3] = { zoom_in_x16, zoom_in_x24, zoom_in_x32 }; + diff --git a/app/bin/bitmaps/zoom-out.xpm b/app/bin/bitmaps/zoom-out.xpm new file mode 100644 index 0000000..c37242d --- /dev/null +++ b/app/bin/bitmaps/zoom-out.xpm @@ -0,0 +1,127 @@ +static char *zoom_out_x16[] = { + "16 16 14 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #9999CC", + "9 c #99CCCC", + "A c #99CCFF", + "B c #99FFFF", + "C c #CCFFFF", + " 00 ", + " 227752 ", + " 37CCCCA5 ", + " 5CCCCCCB3 ", + " 29CCCCCCC70 ", + " 2A600000792 ", + " 2A988888991 ", + " 29CCCCCCC70 ", + " 4BCCCCCA2 ", + " 49CCB922 ", + " 20022252 ", + " 0250 ", + " 0250 ", + " 0520 ", + " 022 ", + " 0 "}; + +static char *zoom_out_x24[] = { + "24 24 14 1", + " c None", + "0 c #000000", + "1 c #003333", + "2 c #333333", + "3 c #333366", + "4 c #336666", + "5 c #666666", + "6 c #666699", + "7 c #669999", + "8 c #9999CC", + "9 c #99CCCC", + "A c #99CCFF", + "B c #99FFFF", + "C c #CCFFFF", + " ", + " 0220220 ", + " 379BCA962 ", + " 39CCCCCCC93 ", + " 2ACCCCCCCCC93 ", + " 27CCCCCCCCCCC70 ", + " 2ACCCCCCCCCCC92 ", + " 0CA888888888AB1 ", + " 3CA0000000009C3 ", + " 2CA6666666669C1 ", + " 2ACCCCCCCCCCCA2 ", + " 29CCCCCCCCCCC93 ", + " 3ACCCCCCCCCB4 ", + " 5CCCCCCCCB52 ", + " 329CCCCB93250 ", + " 225541205520 ", + " 05520 ", + " 2552 ", + " 2552 ", + " 02550 ", + " 02550 ", + " 0520 ", + " 00 ", + " "}; + +static char *zoom_out_x32[] = { + "32 32 16 1", + " c None", + "0 c #000000", + "1 c #000033", + "2 c #003333", + "3 c #333333", + "4 c #333366", + "5 c #336666", + "6 c #666666", + "7 c #666699", + "8 c #669999", + "9 c #6699CC", + "A c #9999CC", + "B c #99CCCC", + "C c #99CCFF", + "D c #99FFFF", + "E c #CCFFFF", + " ", + " 0000 ", + " 338AA9653 ", + " 4BEEEEEEEB53 ", + " 35CEEEEEEEEEEB4 ", + " 07EEEEEEEEEEEEE83 ", + " 3CEEEEEEEEEEEEEE7 ", + " 38EEEEEEEEEEEEEEEC3 ", + " 1EEEEEEEEEEEEEEEEE5 ", + " 4EEEEEEEEEEEEEEEEE90 ", + " 6EE8000000000000CEB3 ", + " 08EE8000000000000CEB3 ", + " 08EE8000000000000CEB3 ", + " 5EEEEEEEEEEEEEEEEEA2 ", + " 3DEEEEEEEEEEEEEEEE6 ", + " 3BEEEEEEEEEEEEEEEC4 ", + " 4CEEEEEEEEEEEEEE5 ", + " 6EEEEEEEEEEEEEB3 ", + " 38DEEEEEEEEEE8330 ", + " 33BEEEEEEEC63663 ", + " 3469AA853036663 ", + " 0000 036660 ", + " 036660 ", + " 066630 ", + " 066630 ", + " 36663 ", + " 36660 ", + " 036660 ", + " 03660 ", + " 030 ", + " 0 ", + " "}; + +static char **zoom_out_xpm[3] = { zoom_out_x16, zoom_out_x24, zoom_out_x32 }; + diff --git a/app/bin/bitmaps/zoom.xpm b/app/bin/bitmaps/zoom.xpm deleted file mode 100644 index 6b845a5..0000000 --- a/app/bin/bitmaps/zoom.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static char * zoom_xpm[] = { -"16 16 5 1", -" c None", -"- c #FFFFFFFFFFFF", -". c #000000000000", -"X c #0000FFFFFFFF", -"o c #FFFF7DF70000", -" ..... ", -" ..-XXXX.. ", -" .----XXX. ", -".--.---.--. ", -".-...-.---. ", -".--.-.----. ", -".---.-...-. ", -".XX.------. ", -" .XXX----. ", -" ..XXX--... ", -" ..... .o. ", -" .o. ", -" .o. ", -" .o. ", -" .. ", -" "}; diff --git a/app/bin/bitmaps/zoomin.xpm b/app/bin/bitmaps/zoomin.xpm deleted file mode 100644 index 4b6f8d5..0000000 --- a/app/bin/bitmaps/zoomin.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static char * zoomin_xpm[] = { -"16 16 5 1", -" c None", -"- c #FFFFFFFFFFFF", -". c #000000000000", -"X c #0000FFFFFFFF", -"o c #FFFF7DF70000", -" ..... ", -" ..-XXXX.. ", -" .----XXX. ", -".-.--.--.-. ", -"........... . ", -".-.--.--.-. ....", -"........... . ", -".X.--.--.-. ", -" .XXX----. ", -" ..XXX--.o. ", -" ..... .o. ", -" .o. ", -" .o. ", -" .o. ", -" .. ", -" "}; diff --git a/app/bin/bitmaps/zoomout.xpm b/app/bin/bitmaps/zoomout.xpm deleted file mode 100644 index 8d8d442..0000000 --- a/app/bin/bitmaps/zoomout.xpm +++ /dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static char * zoomout_xpm[] = { -"16 16 5 1", -" c None", -"- c #FFFFFFFFFFFF", -". c #000000000000", -"X c #0000FFFFFFFF", -"o c #FFFF7DF70000", -" ..... ", -" ..-XXXX.. ", -" .----XXX. ", -".---------. . ", -".-.--.--.-. ....", -"........... . ", -".-.--.--.-. ....", -".XX-------. . ", -" .XXX----. ", -" ..XXX--... ", -" ..... .o. ", -" .o. ", -" .o. ", -" .o. ", -" .. ", -" "}; diff --git a/app/bin/cJSON.c b/app/bin/cJSON.c index 1733811..ee641fc 100755 --- a/app/bin/cJSON.c +++ b/app/bin/cJSON.c @@ -1,4 +1,4 @@ -/* +/** Copyright (c) 2009-2017 Dave Gamble and cJSON contributors Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/app/bin/cJSON.h b/app/bin/cJSON.h index 8d45390..291d694 100755 --- a/app/bin/cJSON.h +++ b/app/bin/cJSON.h @@ -1,4 +1,4 @@ -/* +/** Copyright (c) 2009-2017 Dave Gamble and cJSON contributors Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/app/bin/cbezier.c b/app/bin/cbezier.c index 7f90a27..22c95ba 100644 --- a/app/bin/cbezier.c +++ b/app/bin/cbezier.c @@ -42,7 +42,7 @@ */ -#include "track.h" +#include "common.h" #include "draw.h" #include "ccurve.h" #include "cbezier.h" @@ -50,15 +50,14 @@ #include "cstraigh.h" #include "drawgeom.h" #include "cjoin.h" -#include "i18n.h" #include "common.h" +#include "track.h" #include "wcolors.h" -#include "math.h" -#include "utility.h" #include "param.h" #include "fileio.h" #include "layout.h" #include "cundo.h" +#include "compound.h" extern drawCmd_t tempD; @@ -385,7 +384,7 @@ EXPORT BOOL_T ConvertToArcs (coOrd pos[4], dynArr_t * segs, BOOL_T track, wDrawC end_point = getPoint(pos, t_e); //End of trial Arc PlotCurve( crvCmdFromChord, start_point, end_point, mid_point, - &(arc.curveData), TRUE ); //Find Arc through three points + &(arc.curveData), FALSE, 0.0 ); //Find Arc through three points arc.start = t_s; //remember start arc.end = t_e; //remember end @@ -615,7 +614,7 @@ EXPORT STATUS_T AdjustBezCurve( case C_DOWN: if (Da.state != PICK_POINT) return C_CONTINUE; - dd = 10000.0; + dd = DIST_INF; Da.selectPoint = -1; for (int i=0;i<4;i++) { d = FindDistance(Da.pos[i],pos); @@ -803,10 +802,6 @@ EXPORT STATUS_T AdjustBezCurve( } -struct extraData { - BezierData_t bezierData; - }; - /* * CmdBezModify * @@ -825,13 +820,12 @@ struct extraData { */ STATUS_T CmdBezModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG) { BOOL_T track = TRUE; - track_p t; double width = 1.0; long mode = 0; long cmd; - struct extraData *xx = GetTrkExtraData(trk); - cmd = (long)commandContext; + struct extraDataBezier_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataBezier_t); + cmd = VP2L(commandContext); Da.trackGauge = trackG; switch (action&0xFF) { @@ -854,30 +848,30 @@ STATUS_T CmdBezModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG) Da.selectTrack = trk; - for (int i=0;i<4;i++) Da.pos[i] = xx->bezierData.pos[i]; //Copy parms from old trk + for (int i=0;i<4;i++) Da.pos[i] = xx->pos[i]; //Copy parms from old trk InfoMessage(_("%s picked - now select a Point"),track?"Track":"Line"); Da.state = TRACK_SELECTED; DrawTrack(Da.selectTrack,&mainD,wDrawColorWhite); //Wipe out real track, draw replacement - return AdjustBezCurve(C_START, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); + return AdjustBezCurve(C_START, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); case wActionMove: if (Da.state == NONE) return C_CONTINUE; - return AdjustBezCurve(wActionMove, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); + return AdjustBezCurve(wActionMove, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); case C_DOWN: if (Da.state == TRACK_SELECTED) return C_CONTINUE; //Ignore until first up UndrawNewTrack( Da.selectTrack ); - return AdjustBezCurve(C_DOWN, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); + return AdjustBezCurve(C_DOWN, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); case C_MOVE: if (Da.state == TRACK_SELECTED) return C_CONTINUE; //Ignore until first up and down - return AdjustBezCurve(C_MOVE, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); + return AdjustBezCurve(C_MOVE, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); case C_UP: if (Da.state == TRACK_SELECTED) { Da.state = PICK_POINT; //First time up, next time pick a point } - return AdjustBezCurve(C_UP, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); //Run Adjust + return AdjustBezCurve(C_UP, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); //Run Adjust case C_TEXT: if ((action>>8) != 32) @@ -890,22 +884,18 @@ STATUS_T CmdBezModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG) return C_CANCEL; } UndoStart( _("Modify Bezier"), "newBezier - CR" ); - if (Da.track) t = NewBezierTrack( Da.pos, (trkSeg_p)Da.crvSegs_da.ptr, Da.crvSegs_da.cnt); - else t = NewBezierLine(Da.pos, (trkSeg_p)Da.crvSegs_da.ptr, Da.crvSegs_da.cnt,xx->bezierData.segsColor,xx->bezierData.segsWidth); - - if (Da.track) CopyAttributes( trk, t ); + UndoModify( trk ); - Da.state = NONE; //Must do before Delete for redraw - DeleteTrack(trk, TRUE); - - if (Da.track) { - for (int i=0;i<2;i++) { //Attach new track - if (Da.trk[i] != NULL && Da.ep[i] != -1) { //Like the old track - ConnectAbuttingTracks(t,i,Da.trk[i],Da.ep[i]); - } - } + Da.state = NONE; + wDrawColor color = wDrawColorBlack; + DIST_T width = 0; + if ( !Da.track ) { + color = xx->segsColor; + width = xx->segsWidth; } - DrawNewTrack( t ); + SetBezierData( trk, Da.pos, xx->segsColor, xx->segsWidth ); + + DrawNewTrack( trk ); UndoEnd(); InfoMessage(_("Modify Bezier Complete")); return C_TERMINATE; @@ -916,7 +906,7 @@ STATUS_T CmdBezModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG) return C_TERMINATE; case C_REDRAW: - return AdjustBezCurve(C_REDRAW, pos, Da.track, xx->bezierData.segsColor, xx->bezierData.segsWidth, InfoMessage); + return AdjustBezCurve(C_REDRAW, pos, Da.track, xx->segsColor, xx->segsWidth, InfoMessage); } return C_CONTINUE; @@ -961,7 +951,7 @@ DIST_T BezierOffsetLength(dynArr_t segs, double offset) { DIST_T BezierMinRadius(coOrd pos[4],dynArr_t segs) { - DIST_T r = 100000.0, rr; + DIST_T r = DIST_INF, rr; if (segs.cnt == 0 ) return r; for (int i = 0;i>8) { cmd = action>>8; - } else cmd = (long)commandContext; + } else cmd = VP2L(commandContext); Da.width = (double)lineWidth/mainD.dpi; @@ -1047,7 +1039,8 @@ STATUS_T CmdBezCurve( wAction_t action, coOrd pos ) int end = Da.state==POS_1?0:1; EPINX_T ep; if (Da.track) { - if ((MyGetKeyState() & (WKEY_SHIFT|WKEY_CTRL|WKEY_ALT)) == 0) { //Snap Track + if (lock) { + pos = movePos; if ((t = OnTrack(&p, FALSE, TRUE)) != NULL) { ep = PickUnconnectedEndPointSilent(p, t); if (ep != -1) { @@ -1066,16 +1059,9 @@ STATUS_T CmdBezCurve( wAction_t action, coOrd pos ) } } } else { //Snap Bez Line to Lines - if ((MyGetKeyState() & (WKEY_SHIFT|WKEY_CTRL|WKEY_ALT)) == 0) { - if ((t = OnTrack(&p,FALSE, FALSE)) != NULL) { - if (GetClosestEndPt(t,&p)) { - pos = p; - found = TRUE; - } - } - } + if (lock) + pos = movePos; } - if (!found) SnapPos( &pos ); if (Da.state == POS_1) { Da.pos[0] = pos; Da.pos[1] = pos; @@ -1101,12 +1087,15 @@ STATUS_T CmdBezCurve( wAction_t action, coOrd pos ) case wActionMove: DYNARR_RESET(trkSeg_t,anchors_da); - if ( Da.state != POS_1 && Da.state != POS_2) return C_CONTINUE; + lock = FALSE; + if ( Da.state != POS_1 && Da.state != POS_2) return C_CONTINUE; //Don't snap CPs if (Da.track) { - if ((MyGetKeyState() & (WKEY_SHIFT|WKEY_CTRL|WKEY_ALT)) == 0) { + if (((MyGetKeyState() & WKEY_ALT) == 0) == magneticSnap) { if ((t = OnTrack(&pos, FALSE, TRUE)) != NULL) { EPINX_T ep = PickUnconnectedEndPointSilent(pos, t); if (ep != -1) { + lock = TRUE; + movePos = pos; if (GetTrkGauge(t) == GetScaleTrackGauge(GetLayoutCurScale())) { pos = GetTrkEndPos(t, ep); CreateEndAnchor(pos,FALSE); @@ -1115,15 +1104,21 @@ STATUS_T CmdBezCurve( wAction_t action, coOrd pos ) } } } else { - if ((MyGetKeyState() & (WKEY_SHIFT|WKEY_CTRL|WKEY_ALT)) == 0) { + if (((MyGetKeyState() & WKEY_ALT) == 0) == magneticSnap) { if ((t = OnTrack(&pos,FALSE, FALSE)) != NULL) { CreateEndAnchor(pos,TRUE); + lock = TRUE; + movePos = pos; } } } - if (anchors_da.cnt) - return C_CONTINUE; - + if (!lock && SnapPos(&pos)) { + CreateEndAnchor(pos,TRUE); + lock = TRUE; + movePos = pos; + } + if (anchors_da.cnt) return C_CONTINUE; + /* no break */ case C_MOVE: if (Da.state == POS_1) { InfoMessage( _("Place 1st endpoint of Bezier - snap to %s"), Da.track?"unconnected track":"line" ); @@ -1224,8 +1219,8 @@ void UpdateParms(wDrawColor color,long width) { } -#include "bitmaps/bezier.xpm" -#include "bitmaps/dbezier.xpm" +#include "bitmaps/bezier-track.xpm" +#include "bitmaps/bezier-line.xpm" EXPORT void InitCmdBezier( wMenu_p menu ) { diff --git a/app/bin/cbezier.h b/app/bin/cbezier.h index 49b818f..74ef51f 100644 --- a/app/bin/cbezier.h +++ b/app/bin/cbezier.h @@ -21,8 +21,6 @@ */ #include "common.h" -#include "wlib.h" -#include "utility.h" extern dynArr_t tempEndPts_da; @@ -37,16 +35,16 @@ extern dynArr_t tempEndPts_da; extern wDrawColor lineColor; extern long lineWidth; -typedef void (*bezMessageProc)( char *, ... ); +typedef void (*bezMessageProc)( const char *, ... ); STATUS_T CmdBezCurve( wAction_t, coOrd); STATUS_T CmdBezModify(track_p, wAction_t, coOrd, DIST_T); STATUS_T CreateBezier( wAction_t, coOrd, BOOL_T, wDrawColor, DIST_T, long, bezMessageProc ); DIST_T BezierDescriptionDistance( coOrd, track_p, coOrd *, BOOL_T, BOOL_T * ); STATUS_T BezierDescriptionMove( track_p, wAction_t, coOrd ); -BOOL_T GetBezierMiddle( track_p, coOrd * ); + BOOL_T ConvertToArcs (coOrd[4], dynArr_t *, BOOL_T, wDrawColor, DIST_T); -track_p NewBezierTrack(coOrd[4], trkSeg_t *, int); +track_p NewBezierTrack(coOrd[4], trkSeg_p, int); double BezierLength(coOrd[4], dynArr_t); double BezierOffsetLength(dynArr_t,double offset); double BezierMinRadius(coOrd[4],dynArr_t); diff --git a/app/bin/cblock.c b/app/bin/cblock.c index b395306..0291b4a 100644 --- a/app/bin/cblock.c +++ b/app/bin/cblock.c @@ -46,24 +46,19 @@ * $Header: /home/dmarkle/xtrkcad-fork-cvs/xtrkcad/app/bin/cblock.c,v 1.5 2009-11-23 19:46:16 rheller Exp $ */ -#include -#include -#include - +#include "common.h" #include "compound.h" #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" -#include "messages.h" #include "param.h" #include "track.h" #include "trackx.h" -#include "utility.h" +#include "common-ui.h" -#ifdef WINDOWS +#ifdef UTFCONVERT #include "include/utf8convert.h" -#endif // WINDOWS +#endif // UTFCONVERT EXPORT TRKTYP_T T_BLOCK = -1; @@ -78,19 +73,20 @@ static void NoDrawString( drawCmd_p d, coOrd p, ANGLE_T a, char * s, wFont_p fp, FONTSIZE_T fontSize, wDrawColor color ) {} static void NoDrawBitMap( drawCmd_p d, coOrd p, wDrawBitMap_p bm, wDrawColor color) {} -static void NoDrawFillPoly( drawCmd_p d, int cnt, coOrd * pts, int * types, - wDrawColor color, wDrawWidth width, int fill, int open) {} +static void NoDrawPoly( drawCmd_p d, int cnt, coOrd * pts, int * types, + wDrawColor color, wDrawWidth width, drawFill_e eFillOpt ) {} static void NoDrawFillCircle( drawCmd_p d, coOrd p, DIST_T r, wDrawColor color ) {} +static void NoDrawRectangle( drawCmd_p d, coOrd orig, coOrd size, wDrawColor color, drawFill_e eFill ) {} static drawFuncs_t noDrawFuncs = { - 0, NoDrawLine, NoDrawArc, NoDrawString, NoDrawBitMap, - NoDrawFillPoly, - NoDrawFillCircle }; + NoDrawPoly, + NoDrawFillCircle, + NoDrawRectangle}; static drawCmd_t blockD = { NULL, @@ -108,10 +104,10 @@ static track_p first_block; static track_p last_block; static paramData_t blockPLs[] = { -/*0*/ { PD_STRING, blockName, "name", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof( blockName )}, -/*1*/ { PD_STRING, blockScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("Script"), 0, 0, sizeof( blockScript)} +/*0*/ { PD_STRING, blockName, "name", PDO_NOPREF | PDO_NOTBLANK, I2VP(200), N_("Name"), 0, 0, sizeof( blockName )}, +/*1*/ { PD_STRING, blockScript, "script", PDO_NOPREF, I2VP(350), N_("Script"), 0, 0, sizeof( blockScript)} }; -static paramGroup_t blockPG = { "block", 0, blockPLs, sizeof blockPLs/sizeof blockPLs[0] }; +static paramGroup_t blockPG = { "block", 0, blockPLs, COUNT( blockPLs ) }; static wWin_p blockW; static char blockEditName[STR_SHORT_SIZE]; @@ -120,11 +116,11 @@ static char blockEditSegs[STR_LONG_SIZE]; static track_p blockEditTrack; static paramData_t blockEditPLs[] = { -/*0*/ { PD_STRING, blockEditName, "name", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(blockEditName)}, -/*1*/ { PD_STRING, blockEditScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("Script"), 0, 0, sizeof(blockEditScript)}, -/*2*/ { PD_STRING, blockEditSegs, "segments", PDO_NOPREF, (void*)350, N_("Segments"), BO_READONLY }, +/*0*/ { PD_STRING, blockEditName, "name", PDO_NOPREF | PDO_NOTBLANK, I2VP(200), N_("Name"), 0, 0, sizeof(blockEditName)}, +/*1*/ { PD_STRING, blockEditScript, "script", PDO_NOPREF, I2VP(350), N_("Script"), 0, 0, sizeof(blockEditScript)}, +/*2*/ { PD_STRING, blockEditSegs, "segments", PDO_NOPREF, I2VP(350), N_("Segments"), BO_READONLY, 0, sizeof(blockEditSegs) }, }; -static paramGroup_t blockEditPG = { "block", 0, blockEditPLs, sizeof blockEditPLs/sizeof blockEditPLs[0] }; +static paramGroup_t blockEditPG = { "block", 0, blockEditPLs, COUNT( blockEditPLs ) }; static wWin_p blockEditW; typedef struct btrackinfo_t { @@ -133,12 +129,14 @@ typedef struct btrackinfo_t { } btrackinfo_t, *btrackinfo_p; static dynArr_t blockTrk_da; + #define blockTrk(N) DYNARR_N( btrackinfo_t , blockTrk_da, N ) #define tracklist(N) (&(xx->trackList))[N] typedef struct blockData_t { + extraDataBase_t base; char * name; char * script; BOOL_T IsHilite; @@ -149,7 +147,7 @@ typedef struct blockData_t { static blockData_p GetblockData ( track_p trk ) { - return (blockData_p) GetTrkExtraData(trk); + return GET_EXTRA_DATA( trk, T_BLOCK, blockData_t ); } static void DrawBlock (track_p t, drawCmd_p d, wDrawColor color ) @@ -393,9 +391,9 @@ static BOOL_T WriteBlock ( track_p t, FILE * f ) blockData_p xx = GetblockData(t); char *blockName = MyStrdup(xx->name); -#ifdef WINDOWS +#ifdef UTFCONVERT blockName = Convert2UTF8(blockName); -#endif // WINDOWS +#endif // UTFCONVERT rc &= fprintf(f, "BLOCK %d \"%s\" \"%s\"\n", GetTrkIndex(t), blockName, xx->script)>0; @@ -426,11 +424,12 @@ static BOOL_T ReadBlock ( char * line ) return FALSE; } -#ifdef WINDOWS +#ifdef UTFCONVERT ConvertUTF8ToSystem(name); -#endif // WINDOWS +#endif // UTFCONVERT + - DYNARR_RESET( btrackinfo_p , blockTrk_da ); + DYNARR_RESET( btrackinfo_t , blockTrk_da ); while ( (cp = GetNextLine()) != NULL ) { if ( IsEND( END_BLOCK ) ) { break; @@ -442,12 +441,12 @@ static BOOL_T ReadBlock ( char * line ) if ( strncmp( cp, "TRK", 3 ) == 0 ) { if (!GetArgs(cp+4,"d",&trkindex)) return FALSE; /*trk = FindTrack(trkindex);*/ - DYNARR_APPEND( btrackinfo_p *, blockTrk_da, 10 ); - blockTrk(blockTrk_da.cnt-1).i = trkindex; + DYNARR_APPEND( btrackinfo_t, blockTrk_da, 10 ); + DYNARR_LAST( btrackinfo_t, blockTrk_da ).i = trkindex; } } /*blockCheckContigiousPath(); save for ResolveBlockTracks */ - trk = NewTrack(index, T_BLOCK, tempEndPts_da.cnt, sizeof(blockData_t)+(sizeof(btrackinfo_t)*(blockTrk_da.cnt-1))+1); + trk = NewTrack(index, T_BLOCK, tempEndPts_da.cnt, sizeof(blockData_t)+(sizeof(btrackinfo_t)*(blockTrk_da.cnt))+1); for ( ep=0; eppos, endPtP->angle ); @@ -771,7 +770,7 @@ static STATUS_T CmdBlock (wAction_t action, coOrd pos ) { LOG( log_block, 1, ("*** CmdBlock(%08x,{%f,%f})\n",action,pos.x,pos.y)) - switch ((long)commandContext) { + switch (VP2L(commandContext)) { case BLOCK_CREATE: return CmdBlockCreate(action,pos); case BLOCK_EDIT: return CmdBlockEdit(action,pos); case BLOCK_DELETE: return CmdBlockDelete(action,pos); @@ -857,13 +856,10 @@ static POS_T blkhiliteBorder; static wDrawColor blkhiliteColor = 0; static void DrawBlockTrackHilite( void ) { - wPos_t x, y, w, h; if (blkhiliteColor==0) blkhiliteColor = wDrawColorGray(87); - w = (wPos_t)((blkhiliteSize.x/mainD.scale)*mainD.dpi+0.5); - h = (wPos_t)((blkhiliteSize.y/mainD.scale)*mainD.dpi+0.5); - mainD.CoOrd2Pix(&mainD,blkhiliteOrig,&x,&y); - wDrawFilledRectangle( mainD.d, x, y, w, h, blkhiliteColor, wDrawOptTemp|wDrawOptTransparent ); + // This is incomplete. We should be in temp drawing mode and clearing temp draw on UN_HILIGHT + DrawRectangle( &tempD, blkhiliteOrig, blkhiliteSize, blkhiliteColor, DRAW_TRANSPARENT ); } @@ -984,11 +980,11 @@ EXPORT void BlockMgmLoad( void ) static wIcon_p blockI = NULL; if ( blockI == NULL) - blockI = wIconCreatePixMap( block_xpm ); + blockI = wIconCreatePixMap( block_xpm[iconSize] ); TRK_ITERATE(trk) { if (GetTrkType(trk) != T_BLOCK) continue; - ContMgmLoad( blockI, BlockMgmProc, (void *)trk ); + ContMgmLoad( blockI, BlockMgmProc, trk ); } } @@ -998,7 +994,7 @@ EXPORT void InitCmdBlock( wMenu_p menu ) blockName[0] = '\0'; blockScript[0] = '\0'; AddMenuButton( menu, CmdBlockCreate, "cmdBlockCreate", _("Block"), - wIconCreatePixMap( block_xpm ), LEVEL0_50, + wIconCreatePixMap( block_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_BLOCK1, NULL ); ParamRegister( &blockPG ); } @@ -1008,6 +1004,10 @@ EXPORT void InitTrkBlock( void ) { T_BLOCK = InitObject ( &blockCmds ); log_block = LogFindIndex ( "block" ); + blockTrk_da.max = 0; + blockTrk_da.cnt = 0; + blockTrk_da.ptr = NULL; + last_block = NULL; } diff --git a/app/bin/ccontrol.c b/app/bin/ccontrol.c index 793acc3..a4f9b27 100644 --- a/app/bin/ccontrol.c +++ b/app/bin/ccontrol.c @@ -46,23 +46,19 @@ static const char rcsid[] = "@(#) : $Id$"; -#include -#include - #include "compound.h" +#include "cselect.h" #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" #include "layout.h" #include "param.h" #include "track.h" #include "trackx.h" -#ifdef WINDOWS +#include "common-ui.h" +#ifdef UTFCONVERT #include "include/utf8convert.h" -#endif // WINDOWS -#include "utility.h" -#include "messages.h" +#endif // UTFCONVERT EXPORT TRKTYP_T T_CONTROL = -1; @@ -85,6 +81,7 @@ static char controlOffScript[STR_LONG_SIZE]; #endif typedef struct controlData_t { + extraDataBase_t base; coOrd orig; BOOL_T IsHilite; char * name; @@ -94,7 +91,7 @@ typedef struct controlData_t { static controlData_p GetcontrolData ( track_p trk ) { - return (controlData_p) GetTrkExtraData(trk); + return GET_EXTRA_DATA( trk, T_CONTROL, controlData_t ); } #define RADIUS 6 @@ -310,9 +307,9 @@ static BOOL_T WriteControl ( track_p t, FILE * f ) controlData_p xx = GetcontrolData(t); char *controlName = MyStrdup(xx->name); -#ifdef WINDOWS +#ifdef UTFCONVERT controlName = Convert2UTF8(controlName); -#endif // WINDOWS +#endif // UTFCONVERT rc &= fprintf(f, "CONTROL %d %u %s %d %0.6f %0.6f \"%s\" \"%s\" \"%s\"\n", GetTrkIndex(t), GetTrkLayer(t), GetTrkScaleName(t), @@ -340,9 +337,9 @@ static BOOL_T ReadControl ( char * line ) return FALSE; } -#ifdef WINDOWS +#ifdef UTFCONVERT ConvertUTF8ToSystem(name); -#endif // WINDOWS +#endif // UTFCONVERT trk = NewTrack(index, T_CONTROL, 0, sizeof(controlData_t)); SetTrkVisible(trk, visible); @@ -422,18 +419,18 @@ static char controlEditOffScript[STR_LONG_SIZE]; static paramFloatRange_t r_1000_1000 = { -1000.0, 1000.0, 80 }; static paramData_t controlEditPLs[] = { #define I_CONTROLNAME (0) - /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(controlEditName) }, + /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF | PDO_NOTBLANK, I2VP(200), N_("Name"), 0, 0, sizeof(controlEditName) }, #define I_ORIGX (1) /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, #define I_ORIGY (2) /*2*/ { PD_FLOAT, &controlEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") }, #define I_CONTROLONSCRIPT (3) - /*3*/ { PD_STRING, controlEditOnScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("On Script"), 0, 0, sizeof(controlEditOnScript)}, + /*3*/ { PD_STRING, controlEditOnScript, "script", PDO_NOPREF, I2VP(350), N_("On Script"), 0, 0, sizeof(controlEditOnScript)}, #define I_CONTROLOFFSCRIPT (4) - /*4*/ { PD_STRING, controlEditOffScript, "script", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("Off Script"), 0, 0, sizeof(controlEditOffScript)}, + /*4*/ { PD_STRING, controlEditOffScript, "script", PDO_NOPREF, I2VP(350), N_("Off Script"), 0, 0, sizeof(controlEditOffScript)}, }; -static paramGroup_t controlEditPG = { "controlEdit", 0, controlEditPLs, sizeof controlEditPLs/sizeof controlEditPLs[0] }; +static paramGroup_t controlEditPG = { "controlEdit", 0, controlEditPLs, COUNT( controlEditPLs ) }; static wWin_p controlEditW; static void ControlEditOk ( void * junk ) @@ -524,6 +521,7 @@ static STATUS_T CmdControl ( wAction_t action, coOrd pos ) switch (action) { case C_START: InfoMessage(_("Place control")); + SetAllTrackSelect( FALSE ); create = FALSE; return C_CONTINUE; case C_DOWN: @@ -553,13 +551,9 @@ static POS_T ctlhiliteBorder; static wDrawColor ctlhiliteColor = 0; static void DrawControlTrackHilite( void ) { - wPos_t x, y, w, h; if (ctlhiliteColor==0) ctlhiliteColor = wDrawColorGray(87); - w = (wPos_t)((ctlhiliteSize.x/mainD.scale)*mainD.dpi+0.5); - h = (wPos_t)((ctlhiliteSize.y/mainD.scale)*mainD.dpi+0.5); - mainD.CoOrd2Pix(&mainD,ctlhiliteOrig,&x,&y); - wDrawFilledRectangle( mainD.d, x, y, w, h, ctlhiliteColor, wDrawOptTemp|wDrawOptTransparent ); + DrawRectangle( &tempD, ctlhiliteOrig, ctlhiliteSize, ctlhiliteColor, DRAW_TRANSPARENT ); } static int ControlMgmProc ( int cmd, void * data ) @@ -624,12 +618,12 @@ EXPORT void ControlMgmLoad ( void ) static wIcon_p controlI = NULL; if (controlI == NULL) { - controlI = wIconCreatePixMap( control_xpm ); + controlI = wIconCreatePixMap( control_xpm[iconSize] ); } TRK_ITERATE(trk) { if (GetTrkType(trk) != T_CONTROL) continue; - ContMgmLoad (controlI, ControlMgmProc, (void *) trk ); + ContMgmLoad (controlI, ControlMgmProc, trk ); } } @@ -638,7 +632,7 @@ EXPORT void ControlMgmLoad ( void ) EXPORT void InitCmdControl ( wMenu_p menu ) { AddMenuButton( menu, CmdControl, "cmdControl", _("Control"), - wIconCreatePixMap( control_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CONTROL, NULL ); + wIconCreatePixMap( control_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CONTROL, NULL ); } EXPORT void InitTrkControl ( void ) diff --git a/app/bin/ccornu.c b/app/bin/ccornu.c index fd51755..f447d64 100644 --- a/app/bin/ccornu.c +++ b/app/bin/ccornu.c @@ -79,18 +79,13 @@ #include "cstraigh.h" #include "drawgeom.h" #include "cjoin.h" -#include "i18n.h" #include "common.h" -#include "utility.h" -#include "math.h" #include "param.h" #include "layout.h" #include "cundo.h" -#include "messages.h" #include "cselect.h" #include "fileio.h" - -#include +#include "common-ui.h" extern drawCmd_t tempD; extern TRKTYP_T T_BEZIER; @@ -194,7 +189,7 @@ static char * CmdCornuHotBarProc( case HB_SELECT: CmdCornu( C_CANCEL, zero ); curCornu = trkseg; - DoCommandB( (void*)(intptr_t)cornuHotBarCmdInx ); + DoCommandB( I2VP(cornuHotBarCmdInx) ); return NULL; case HB_LISTTITLE: sprintf(message,_("%s FlexTrack"),GetScaleName(GetLayoutCurScale())); @@ -253,7 +248,7 @@ EXPORT void AddHotBarCornu( void ) hotB.txt.u.t.boxed = TRUE; hotB.txt.u.t.string = MyStrdup(_(" FLEX ")); hotB.txt.u.t.fontP = NULL; - hotB.txt.u.t.fontSize = 160.0*ratio; + hotB.txt.u.t.fontSize = 160*mainD.dpi/72.0*ratio; hotB.txt.u.t.angle = 0.0; char * label = MyMalloc(256); @@ -342,7 +337,7 @@ int createEndPoint( endHandle->end_curve = zero; endHandle->end_valid = TRUE; endHandle->mid_disp = 0.0; - DIST_T end_length = 20*trackGauge; + DIST_T end_length = tempD.scale*2.0; Translate(&endHandle->end_curve,pos0,angle,end_length); Translate(&endHandle->end_center,pos0,angle,end_length/2); if (radius>0.0) { @@ -358,7 +353,7 @@ int createEndPoint( Rotate(&cm,endHandle->end_curve,-a ); endHandle->mid_disp = cm.x-endHandle->end_curve.x; curveData_t curveData; - PlotCurve(crvCmdFromCenter,pos0,endHandle->end_center, endHandle->end_curve, &curveData, FALSE); + PlotCurve(crvCmdFromCenter,pos0,endHandle->end_center, endHandle->end_curve, &curveData, FALSE, 0.0); if (curveData.type == curveTypeStraight) { coOrd pos_line[2]; Translate(&pos_line[0],pos0,FindAngle(pos0,endHandle->end_curve)+90,trackGauge/2); @@ -486,7 +481,6 @@ static void CreateCornuEndAnchor(coOrd p, wBool_t lock) { anchors(i).u.c.a0 = 0.0; anchors(i).u.c.a1 = 360.0; anchors(i).width = 0; - } static void CreateCornuExtendAnchor(coOrd p, ANGLE_T a, wBool_t selected) { @@ -992,9 +986,6 @@ track_p CreateCornuFromPoints(coOrd pos[2],BOOL_T track_end[2]) { } -struct extraData { - cornuData_t cornuData; - }; ANGLE_T GetOpenAngle(coOrd pos[2],ANGLE_T angle[2],int moved) { ANGLE_T a = FindAngle(pos[1-moved],pos[moved]); @@ -1017,12 +1008,12 @@ static paramData_t cornuModPLs[] = { #define cornuModEndAnglePD (cornuModPLs[0]) #define cornuModEndAngle 0 - { PD_FLOAT, &cornuModCmdContext.angle, "End Angle", PDO_NORECORD|BO_ENTER, &r0_360, N_("End Angle") }, + { PD_FLOAT, &cornuModCmdContext.angle, "endangle", PDO_NORECORD|BO_ENTER, &r0_360, N_("End Angle") }, #define cornuModEndRadiusPD (cornuModPLs[1]) #define cornuModEndRadius 1 - { PD_FLOAT, &cornuModCmdContext.radius, "End Radius", PDO_DIM|PDO_NORECORD|BO_ENTER, &r10000_10000, N_("End Radius") }, + { PD_FLOAT, &cornuModCmdContext.radius, "endradius", PDO_DIM|PDO_NORECORD|BO_ENTER, &r10000_10000, N_("End Radius") }, }; -static paramGroup_t cornuModPG = { "cornuMod", 0, cornuModPLs, sizeof cornuModPLs/sizeof cornuModPLs[0] }; +static paramGroup_t cornuModPG = { "cornuMod", 0, cornuModPLs, COUNT( cornuModPLs ) }; /* * AdjustCornuCurve @@ -1050,7 +1041,7 @@ EXPORT STATUS_T AdjustCornuCurve( wControl_p controls[5]; //Always needs a NULL last entry char * labels[4]; - Da.cmdType = (long)commandContext; + Da.cmdType = VP2L(commandContext); if (Da.state != PICK_POINT && Da.state != POINT_PICKED && Da.state != TRACK_SELECTED) return C_CONTINUE; @@ -1095,6 +1086,7 @@ EXPORT STATUS_T AdjustCornuCurve( case wActionMove: if (Da.state == NONE || Da.state == PICK_POINT) { + wSetCursor(mainD.d,defaultCursor); DYNARR_RESET(trkSeg_t,anchors_da); for(int i=0;i<2;i++) { if (IsClose(FindDistance(pos,Da.pos[i]))) { @@ -1113,6 +1105,7 @@ EXPORT STATUS_T AdjustCornuCurve( d = FindDistance(DYNARR_N(coOrd,Da.mid_points,i),pos); if (IsClose(d)) { CreateCornuAnchor(DYNARR_N(coOrd,Da.mid_points,i),FALSE); + wSetCursor(mainD.d,wCursorNone); return C_CONTINUE; } } @@ -1121,6 +1114,7 @@ EXPORT STATUS_T AdjustCornuCurve( d = FindDistance(Da.endHandle[i].end_center,pos); if (IsClose(d)) { CreateCornuAnchor(Da.endHandle[i].end_center, FALSE); + wSetCursor(mainD.d,wCursorNone); return C_CONTINUE; } } @@ -1129,13 +1123,14 @@ EXPORT STATUS_T AdjustCornuCurve( d = FindDistance(Da.endHandle[i].end_curve,pos); if (IsClose(d)) { CreateCornuAnchor(Da.endHandle[i].end_curve, FALSE); + wSetCursor(mainD.d,wCursorNone); return C_CONTINUE; } } coOrd temp_pos = pos; if (IsClose(DistanceSegs(zero,0.0,Da.crvSegs_da.cnt,(trkSeg_p)Da.crvSegs_da.ptr,&temp_pos,NULL))) { CreateCornuAnchor(temp_pos, TRUE); - } + } else wSetCursor(mainD.d,defaultCursor); } return C_CONTINUE; @@ -1371,7 +1366,6 @@ EXPORT STATUS_T AdjustCornuCurve( if (((MyGetKeyState() & WKEY_SHIFT) != 0) && Da.selectTrack) { //Extend end locked SetUpCornuParms(&cp); CallCornuM(Da.mid_points,Da.ends,Da.pos,&cp,&Da.crvSegs_da,FALSE); - struct extraData *xx = GetTrkExtraData(Da.selectTrack); if (Da.radius[sel] == 0) { //Straight Da.extendSeg[sel].type = SEG_STRTRK; Da.extendSeg[sel].width = 0; @@ -1786,6 +1780,7 @@ EXPORT STATUS_T AdjustCornuCurve( if (anchors_da.cnt) { DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); } + if (Da.state == POINT_PICKED) wSetCursor(mainD.d,wCursorNone); return C_CONTINUE; case C_CANCEL: case C_FINISH: @@ -1826,7 +1821,6 @@ static void cornuModDlgUpdate( * */ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG ) { - struct extraData *xx = GetTrkExtraData(trk); Da.trackGauge = trackG; @@ -1871,11 +1865,11 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG else Da.ep[0] = -1; } if (prior) { - struct extraData *xx0 = GetTrkExtraData(prior); - Da.pos[0] = xx0->cornuData.pos[ep0]; //Copy parms from FIRST CORNU trk - Da.radius[0] = xx0->cornuData.r[ep0]; - Da.angle[0] = xx0->cornuData.a[ep0]; - Da.center[0] = xx0->cornuData.c[ep0]; + struct extraDataCornu_t *xx0 = GET_EXTRA_DATA(prior, T_CORNU, extraDataCornu_t); + Da.pos[0] = xx0->pos[ep0]; //Copy parms from FIRST CORNU trk + Da.radius[0] = xx0->r[ep0]; + Da.angle[0] = xx0->a[ep0]; + Da.center[0] = xx0->c[ep0]; } //Move to RHS @@ -1897,11 +1891,11 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG } if (next) { - struct extraData *xx1 = GetTrkExtraData(next); - Da.pos[1] = xx1->cornuData.pos[ep1]; //Copy parms from LAST CORNU trk - Da.radius[1] = xx1->cornuData.r[ep1]; - Da.angle[1] = xx1->cornuData.a[ep1]; - Da.center[1] = xx1->cornuData.c[ep1]; + struct extraDataCornu_t *xx1 = GET_EXTRA_DATA(next, T_CORNU, extraDataCornu_t); + Da.pos[1] = xx1->pos[ep1]; //Copy parms from LAST CORNU trk + Da.radius[1] = xx1->r[ep1]; + Da.angle[1] = xx1->a[ep1]; + Da.center[1] = xx1->c[ep1]; } InfoMessage(_("Now Select or Add (+Shift) a Point")); @@ -1987,7 +1981,7 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG Da.state = NONE; return C_TERMINATE; } - + CopyAttributes(Da.selectTrack,Da.trk[i]); } } BOOL_T end_point[2]; @@ -2008,7 +2002,7 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG Da.center[1].x,Da.center[1].y, Da.angle[0],Da.angle[1], FormatDistance(Da.radius[0]),FormatDistance(Da.radius[1])); - UndoUndo(); + UndoUndo(NULL); Da.state = NONE; return C_TERMINATE; } @@ -2038,7 +2032,7 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG Da.center[1].x,Da.center[1].y, Da.angle[0],Da.angle[1], FormatDistance(Da.radius[0]),FormatDistance(Da.radius[1])); - UndoUndo(); + UndoUndo(NULL); Da.state = NONE; return C_TERMINATE; } @@ -2073,7 +2067,7 @@ STATUS_T CmdCornuModify (track_p trk, wAction_t action, coOrd pos, DIST_T trackG if (Da.ep[i]>= 0) ConnectTracks(i==0?first_trk:trk1,i,Da.trk[i],Da.ep[i]); } else { - UndoUndo(); + UndoUndo(NULL); wBeep(); InfoMessage(_("Connected Track End Adjust for end %d failed"),i); return C_TERMINATE; @@ -2140,7 +2134,7 @@ DIST_T CornuOffsetLength(dynArr_t segs, double offset) { } DIST_T CornuMinRadius(coOrd pos[4],dynArr_t segs) { - DIST_T r = 100000.0, rr; + DIST_T r = DIST_INF, rr; if (segs.cnt == 0 ) return r; for (int i = 0;i empty end point pos = p; //Reset to initial - SnapPos( &pos ); + if (lock) SnapPos( &pos ); //Only snap if snapped in move if (Da.cmdType == cornuCmdCreateTrack || Da.cmdType == cornuCmdHotBar) { Da.trk[end] = NULL; Da.pos[end] = pos; @@ -2385,6 +2382,7 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) return C_CONTINUE; case wActionMove: + lock = FALSE; DYNARR_RESET(trkSeg_t,anchors_da); if (Da.state != NONE && Da.state != LOC_2) return C_CONTINUE; if (Da.trk[0] && Da.trk[1]) return C_CONTINUE; @@ -2421,6 +2419,9 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) Translate(&pos,tp.ttcenter,a,tp.ttradius); CreateCornuEndAnchor(pos,TRUE); } else CreateCornuEndAnchor(pos,TRUE); + } else if (SnapPos(&pos)) { + CreateCornuEndAnchor(pos,FALSE); + lock = TRUE; } return C_CONTINUE; @@ -2542,10 +2543,14 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) Da.pos[i] = zero; Da.endHandle[i].end_valid = FALSE; } + SetAllTrackSelect( FALSE ); } return rc; case C_REDRAW: + wSetCursor(mainD.d,defaultCursor); + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if ( Da.state != NONE ) { DrawCornuCurve(NULL,Da.ep1Segs,Da.ep1Segs_da_cnt,Da.ep2Segs,Da.ep2Segs_da_cnt,(trkSeg_t *)Da.crvSegs_da.ptr,Da.crvSegs_da_cnt, NULL, Da.extend[0]?&Da.extendSeg[0]:NULL,Da.extend[1]?&Da.extendSeg[1]:NULL,(trkSeg_t *)Da.midSegs.ptr,Da.midSegs.cnt,wDrawColorBlack); @@ -2554,6 +2559,8 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); if (MyGetKeyState()&WKEY_SHIFT) DrawHighlightBoxes(FALSE,FALSE,NULL); + if (Da.state == POINT_PICKED) wSetCursor(mainD.d,wCursorNone); + return C_CONTINUE; case C_CANCEL: @@ -2572,6 +2579,7 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) } //DYNARR_FREE(trkSeg_t,Da.crvSegs_da); } + SetAllTrackSelect( FALSE ); Da.state = NONE; if (infoSubst) { InfoSubstituteControls( NULL, NULL ); @@ -2589,12 +2597,12 @@ STATUS_T CmdCornu( wAction_t action, coOrd pos ) BOOL_T GetTracksFromCornuTrack(track_p trk, track_p newTracks[2]) { track_p trk_old = NULL; newTracks[0] = NULL, newTracks[1] = NULL; - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataCornu_t * xx = GET_EXTRA_DATA(trk, T_CORNU, extraDataCornu_t); if (!IsTrack(trk)) return FALSE; - for (int i=0; icornuData.arcSegs.cnt;i++) { + for (int i=0; iarcSegs.cnt;i++) { track_p bezTrack[2]; bezTrack[0] = NULL, bezTrack[1] = NULL; - trkSeg_p seg = &DYNARR_N(trkSeg_t,xx->cornuData.arcSegs,i); + trkSeg_p seg = &DYNARR_N(trkSeg_t,xx->arcSegs,i); if (seg->type == SEG_BEZTRK) { DYNARR_RESET(trkSeg_t,seg->bezSegs); FixUpBezierSeg(seg->u.b.pos,seg,TRUE); @@ -2690,7 +2698,7 @@ static STATUS_T cmdCornuCreate( /* no break */ case C_START: createState = 0; - commandContext = (void *)cornuCmdHotBar; + commandContext = I2VP(cornuCmdHotBar); rc = CmdCornu(C_START, pos); Da.prevSelected = -1; Da.selectEndHandle = -1; @@ -3039,14 +3047,14 @@ static STATUS_T CmdConvertFrom( } } -#include "bitmaps/convertto.xpm" -#include "bitmaps/convertfr.xpm" +#include "bitmaps/convert-to.xpm" +#include "bitmaps/convert-from.xpm" EXPORT void InitCmdCornu( wMenu_p menu ) { ButtonGroupBegin( _("Convert"), "cmdConvertSetCmd", _("Convert") ); - AddMenuButton( menu, CmdConvertTo, "cmdConvertTo", _("Convert To Cornu"), wIconCreatePixMap(convertto_xpm), LEVEL0_50, IC_STICKY|IC_LCLICK|IC_POPUP3|IC_WANT_MOVE,ACCL_CONVERTTO, NULL ); - AddMenuButton( menu, CmdConvertFrom, "cmdConvertFrom", _("Convert From Cornu"), wIconCreatePixMap(convertfr_xpm), LEVEL0_50, IC_STICKY|IC_LCLICK|IC_POPUP3|IC_WANT_MOVE,ACCL_CONVERTFR, NULL ); + AddMenuButton( menu, CmdConvertTo, "cmdConvertTo", _("Convert To Cornu"), wIconCreatePixMap(convert_to_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_LCLICK|IC_POPUP3|IC_WANT_MOVE,ACCL_CONVERTTO, NULL ); + AddMenuButton( menu, CmdConvertFrom, "cmdConvertFrom", _("Convert From Cornu"), wIconCreatePixMap(convert_from_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_LCLICK|IC_POPUP3|IC_WANT_MOVE,ACCL_CONVERTFR, NULL ); cornuHotBarCmdInx = AddMenuButton(menu, cmdCornuCreate, "cmdCornuCreate", "", NULL, LEVEL0_50, IC_STICKY|IC_POPUP3|IC_WANT_MOVE, 0, NULL); ButtonGroupEnd(); ParamCreateControls( &cornuModPG, cornuModDlgUpdate) ; diff --git a/app/bin/ccornu.h b/app/bin/ccornu.h index 2bd1f49..29b6171 100644 --- a/app/bin/ccornu.h +++ b/app/bin/ccornu.h @@ -7,9 +7,9 @@ #ifndef APP_BIN_CCORNU_H_ #define APP_BIN_CCORNU_H_ +#include "common.h" - -typedef void (*cornuMessageProc)( char *, ... ); +typedef void (*cornuMessageProc)( const char *, ... ); #define cornuCmdNone (0) #define cornuJoinTrack (1) diff --git a/app/bin/ccurve.c b/app/bin/ccurve.c index e119610..2308bd1 100644 --- a/app/bin/ccurve.c +++ b/app/bin/ccurve.c @@ -20,9 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include - #include "ccurve.h" #include "cjoin.h" @@ -30,17 +27,14 @@ #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" +#include "cselect.h" -#include "messages.h" -#include "param.h" #include "param.h" #include "track.h" -#include "utility.h" -#include "wlib.h" #include "cbezier.h" #include "ccornu.h" #include "layout.h" +#include "common-ui.h" /* * STATE INFO @@ -213,7 +207,7 @@ EXPORT STATUS_T CreateCurve( } } } else { - if ((t = OnTrack(&p, FALSE, FALSE)) != NULL) { + if (((t = OnTrack(&p, FALSE, FALSE)) != NULL) && IsClose(FindDistance(p,pos))) { if (!IsTrack(t)) { pos = p; found = TRUE; @@ -221,7 +215,8 @@ EXPORT STATUS_T CreateCurve( } } Da.down = TRUE; - if (!found) SnapPos( &pos ); + if (!found && !track) SnapPos( &pos ); + if (mode == crvCmdFromCenter) SnapPos( &pos ); Da.lock0 = found; if (Da.create_state == NOCURVE) @@ -279,7 +274,7 @@ EXPORT STATUS_T CreateCurve( DYNARR_RESET(trkSeg_t,*anchor_array); DYNARR_APPEND(trkSeg_t,*anchor_array,1); if (!Da.down) return C_CONTINUE; - if (Da.trk && !(MyGetKeyState() & WKEY_SHIFT)) { //Shift inhibits direction lock + if (Da.trk && track && !(MyGetKeyState() & WKEY_SHIFT)) { //Shift inhibits direction lock angle1 = NormalizeAngle(GetTrkEndAngle(Da.trk, Da.ep)); angle2 = NormalizeAngle(FindAngle(pos, Da.pos0)-angle1); if (mode ==crvCmdFromEP1 ) { @@ -302,7 +297,7 @@ EXPORT STATUS_T CreateCurve( DIST_T dp = FindDistance(Da.pos0, pos)*sin(D2R(angle2)); Translate( &pos, Da.pos0, angle1-90.0, dp ); } - } else SnapPos(&pos); + } else if (track) SnapPos(&pos); tempSegs_da.cnt =1; if (Da.trk && mode == crvCmdFromChord) { tempSegs(0).type = SEG_CRVTRK; @@ -400,7 +395,7 @@ EXPORT STATUS_T CreateCurve( } break; } - message( _("Drag on Red arrows to adjust curve") ); + //message( _("Drag on Red arrows to adjust curve") ); return C_CONTINUE; default: @@ -409,7 +404,16 @@ EXPORT STATUS_T CreateCurve( } } +static DIST_T desired_radius = 0.0; +static BOOL_T infoSubst = FALSE; +static paramFloatRange_t r_0_10000 = { 0.0, 100000.0 }; +static paramData_t curvePLs[] = { +#define curveRadPD (curvePLs[0]) +#define curveRadI 0 + { PD_FLOAT, &desired_radius, "radius", PDO_DIM, &r_0_10000, N_("Desired Radius") } +}; +static paramGroup_t curvePG = { "curvefixed", 0, curvePLs, COUNT( curvePLs ) }; static STATUS_T CmdCurve( wAction_t action, coOrd pos ) { @@ -417,39 +421,32 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) DIST_T d; static int segCnt; STATUS_T rc = C_CONTINUE; + wControl_p controls[2]; + char * labels[1]; + static BOOL_T lock; + static coOrd movePos; + switch (action) { case C_START: - curveMode = (long)commandContext; + lock = FALSE; + curveMode = VP2L(commandContext); Da.state = -1; Da.pos0 = pos; tempSegs_da.cnt = 0; segCnt = 0; STATUS_T rcode; DYNARR_RESET(trkSeg_t,anchors_da); + if (curvePLs[0].control==NULL) { + ParamCreateControls(&curvePG, NULL); + } + SetAllTrackSelect(FALSE); return CreateCurve( action, pos, TRUE, wDrawColorBlack, 0, curveMode, &anchors_da, InfoMessage ); case C_DOWN: if (Da.state == -1) { - BOOL_T found = FALSE; - if (curveMode != crvCmdFromCenter ) { - if (((MyGetKeyState() & WKEY_ALT)==0) == magneticSnap) { - if ((t = OnTrack(&pos,FALSE,TRUE))!=NULL) { - EPINX_T ep = PickUnconnectedEndPointSilent(pos, t); - if (ep != -1) { - if (GetTrkGauge(t) != GetScaleTrackGauge(GetLayoutCurScale())) { - wBeep(); - InfoMessage(_("Track is different gauge")); - return C_CONTINUE; - } - pos = GetTrkEndPos(t, ep); - found = TRUE; - } - } - } - } - if (!found) SnapPos( &pos ); + if (lock) pos = movePos; Da.pos0 = Da.pos1 = pos; Da.state = 0; rcode = CreateCurve( action, pos, TRUE, wDrawColorBlack, 0, curveMode, &anchors_da, InfoMessage ); @@ -458,12 +455,19 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) return rcode; //Da.pos0 = pos; } + if (infoSubst) { + sprintf(message, "desired_radius-%s", curScaleName); + wPrefSetFloat("misc", message, desired_radius); + InfoSubstituteControls(NULL, NULL); + } + infoSubst = FALSE; //This is where the user could adjust - if we allow that? tempSegs_da.cnt = segCnt; return C_CONTINUE; case wActionMove: + lock = FALSE; if ((Da.state<0) && (curveMode != crvCmdFromCenter)) { DYNARR_RESET(trkSeg_t,anchors_da); if (((MyGetKeyState() & WKEY_ALT)==0) == magneticSnap) { @@ -473,10 +477,17 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) if (ep != -1) { pos = GetTrkEndPos(t, ep); CreateEndAnchor(pos,&anchors_da,FALSE); + lock = TRUE; + movePos = pos; } } } } + if (!lock && SnapPos(&pos)) { + CreateEndAnchor(pos,&anchors_da,FALSE); + lock = TRUE; + movePos = pos; + } } return C_CONTINUE; @@ -490,8 +501,8 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) DYNARR_RESET(trkSeg_t,anchors_da); // SnapPos( &pos ); tempSegs_da.cnt = segCnt; - if (Da.trk) PlotCurve( curveMode, Da.pos0, Da.pos1, pos, &Da.curveData, FALSE ); - else PlotCurve( curveMode, Da.pos0, Da.pos1, pos, &Da.curveData, TRUE ); + if (Da.trk) PlotCurve( curveMode, Da.pos0, Da.pos1, pos, &Da.curveData, FALSE, desired_radius ); + else PlotCurve( curveMode, Da.pos0, Da.pos1, pos, &Da.curveData, TRUE, desired_radius ); if (Da.curveData.type == curveTypeStraight) { tempSegs(0).type = SEG_STRTRK; tempSegs(0).u.l.pos[0] = Da.pos0; @@ -514,14 +525,15 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) tempSegs(0).u.c.a1 = Da.curveData.a1; tempSegs_da.cnt = 1; segCnt = 1; + d = D2R(Da.curveData.a1); + if (d < 0.0) d = 2*M_PI+d; if ( d*Da.curveData.curveRadius > mapD.size.x+mapD.size.y ) { ErrorMessage( MSG_CURVE_TOO_LARGE ); tempSegs_da.cnt = 0; Da.curveData.type = curveTypeNone; - mainD.funcs->options = 0; return C_CONTINUE; } InfoMessage( _("Curved Track: Radius=%s Angle=%0.3f Length=%s"), @@ -532,13 +544,18 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) if (curveMode == crvCmdFromEP1 || curveMode == crvCmdFromChord) DrawArrowHeadsArray(&anchors_da,pos,FindAngle(Da.curveData.curvePos,pos),TRUE,wDrawColorRed); else if (curveMode == crvCmdFromTangent || curveMode == crvCmdFromCenter) { - CreateEndAnchor(Da.curveData.pos2,&anchors_da,FALSE); + if (Da.curveData.curveRadius == desired_radius) + CreateEndAnchor(Da.curveData.pos2,&anchors_da,TRUE); + else + CreateEndAnchor(Da.curveData.pos2,&anchors_da,FALSE); DrawArrowHeadsArray(&anchors_da,Da.curveData.pos2,FindAngle(Da.curveData.curvePos,Da.curveData.pos2)+90,TRUE,wDrawColorRed); } - CreateEndAnchor(Da.curveData.curvePos,&anchors_da,TRUE); + if (Da.curveData.curveRadius == desired_radius) + CreateEndAnchor(Da.curveData.curvePos,&anchors_da,TRUE); + else + CreateEndAnchor(Da.curveData.curvePos,&anchors_da,FALSE); } } - mainD.funcs->options = 0; return rc; case C_TEXT: if ( Da.state == 0 ) @@ -547,8 +564,8 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) case C_UP: if (Da.state<0) return C_CONTINUE; if (Da.state == 0 && ((curveMode != crvCmdFromChord) || (curveMode == crvCmdFromChord && !Da.trk))) { - SnapPos( &pos ); - Da.pos1 = pos; + //SnapPos( &pos ); + //Da.pos1 = pos; if ((d = FindDistance(Da.pos0,Da.pos1))options = 0; segCnt = tempSegs_da.cnt; - InfoMessage( _("Drag on Red arrows to adjust curve") ); + + sprintf(message, "desired_radius-%s", curScaleName); + wPrefGetFloat("misc", message, &desired_radius, desired_radius); + controls[0] = curveRadPD.control; + controls[1] = NULL; + labels[0] = N_("Desired Radius"); + InfoSubstituteControls(controls, labels); + infoSubst = TRUE; + curveRadPD.option |= PDO_NORECORD; + ParamLoadControls(&curvePG); + ParamGroupRecord(&curvePG); + //InfoMessage( _("Drag on Red arrows to adjust curve") ); + return C_CONTINUE; } else if ((curveMode == crvCmdFromChord && Da.state == 0 && Da.trk)) { pos = Da.middle; @@ -566,9 +594,8 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) ErrorMessage( MSG_TRK_TOO_SHORT, "Curved ", PutDim(fabs(minLength-d)) ); return C_TERMINATE; } - PlotCurve( curveMode, Da.pos0, Da.pos1, Da.middle, &Da.curveData, TRUE ); + PlotCurve( curveMode, Da.pos0, Da.pos1, Da.middle, &Da.curveData, TRUE, desired_radius ); } - mainD.funcs->options = 0; tempSegs_da.cnt = 0; segCnt = 0; Da.state = -1; @@ -590,6 +617,7 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) ErrorMessage( MSG_TRK_TOO_SHORT, "Curved ", PutDim(fabs(minLength-d)) ); return C_TERMINATE; } + UndoStart( _("Create Curved Track"), "newCurve - curve" ); t = NewCurvedTrack( Da.curveData.curvePos, Da.curveData.curveRadius, Da.curveData.a0, Da.curveData.a1, 0 ); @@ -607,7 +635,6 @@ static STATUS_T CmdCurve( wAction_t action, coOrd pos ) case C_REDRAW: if ( Da.state >= 0 ) { DrawSegs( &tempD, zero, 0.0, &tempSegs(0), tempSegs_da.cnt, trackGauge, wDrawColorBlack ); - mainD.funcs->options = 0; } if (anchors_da.cnt) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); @@ -668,12 +695,12 @@ static paramData_t helixPLs[] = { { PD_FLOAT, &helixGrade, "grade", 0, &r0_100, N_("Grade") }, { PD_FLOAT, &helixVertSep, "vertSep", PDO_DIM, &r0_1000000, N_("Vertical Separation") }, #define I_HELIXMSG (6) - { PD_MESSAGE, N_("Total Length"), NULL, PDO_DLGRESETMARGIN, (void*)200 } }; -static paramGroup_t helixPG = { "helix", PGO_PREFMISCGROUP, helixPLs, sizeof helixPLs/sizeof helixPLs[0] }; + { PD_MESSAGE, N_("Total Length"), NULL, PDO_DLGRESETMARGIN, I2VP(200) } }; +static paramGroup_t helixPG = { "helix", PGO_PREFMISCGROUP, helixPLs, COUNT( helixPLs ) }; static paramData_t circleRadiusPLs[] = { { PD_FLOAT, &circleRadius, "radius", PDO_DIM, &r1_10000 } }; -static paramGroup_t circleRadiusPG = { "circle", 0, circleRadiusPLs, sizeof circleRadiusPLs/sizeof circleRadiusPLs[0] }; +static paramGroup_t circleRadiusPG = { "circle", 0, circleRadiusPLs, COUNT( circleRadiusPLs ) }; static void ComputeHelix( @@ -684,7 +711,7 @@ static void ComputeHelix( DIST_T totTurns; DIST_T length; long updates = 0; - if ( h_inx < 0 || h_inx >= sizeof h_orders/sizeof h_orders[0] ) + if ( h_inx < 0 || h_inx >= COUNT( h_orders ) ) return; ParamLoadData( &helixPG ); totTurns = helixTurns + helixAngSep/360.0; @@ -809,6 +836,7 @@ static STATUS_T CmdCircleCommon( wAction_t action, coOrd pos, BOOL_T helix ) break; } } + SetAllTrackSelect( FALSE ); tempSegs_da.cnt = 0; return C_CONTINUE; @@ -932,7 +960,7 @@ static STATUS_T CmdCircleCommon( wAction_t action, coOrd pos, BOOL_T helix ) static STATUS_T CmdCircle( wAction_t action, coOrd pos ) { if ( action == C_START ) { - circleMode = (long)commandContext; + circleMode = VP2L(commandContext); } return CmdCircleCommon( action, pos, FALSE ); } @@ -943,32 +971,31 @@ static STATUS_T CmdHelix( wAction_t action, coOrd pos ) return CmdCircleCommon( action, pos, TRUE ); } -#include "bitmaps/curve1.xpm" -#include "bitmaps/curve2.xpm" -#include "bitmaps/curve3.xpm" -#include "bitmaps/curve4.xpm" -#include "bitmaps/bezier.xpm" +#include "bitmaps/curved-end.xpm" +#include "bitmaps/curved-tangent.xpm" +#include "bitmaps/curved-middle.xpm" +#include "bitmaps/curved-chord.xpm" +#include "bitmaps/bezier-track.xpm" #include "bitmaps/cornu.xpm" -#include "bitmaps/circle1.xpm" -#include "bitmaps/circle2.xpm" -#include "bitmaps/circle3.xpm" +#include "bitmaps/circle.xpm" +#include "bitmaps/circle-tangent.xpm" +#include "bitmaps/circle-center.xpm" EXPORT void InitCmdCurve( wMenu_p menu ) { - AddMenuButton( menu, CmdCornu, "cmdCornu", _("Cornu Curve"), wIconCreatePixMap(cornu_xpm), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CORNU, (void*)cornuCmdCreateTrack); - - ButtonGroupBegin( _("Curve Track"), "cmdCircleSetCmd", _("Curve Tracks") ); - AddMenuButton( menu, CmdCurve, "cmdCurveEndPt", _("Curve from End-Pt"), wIconCreatePixMap( curve1_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE1, (void*)0 ); - AddMenuButton( menu, CmdCurve, "cmdCurveTangent", _("Curve from Tangent"), wIconCreatePixMap( curve2_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE2, (void*)1 ); - AddMenuButton( menu, CmdCurve, "cmdCurveCenter", _("Curve from Center"), wIconCreatePixMap( curve3_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE3, (void*)2 ); - AddMenuButton( menu, CmdCurve, "cmdCurveChord", _("Curve from Chord"), wIconCreatePixMap( curve4_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE4, (void*)3 ); - AddMenuButton( menu, CmdBezCurve, "cmdBezier", _("Bezier Curve"), wIconCreatePixMap(bezier_xpm), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_BEZIER, (void*)bezCmdCreateTrack ); + ButtonGroupBegin( _("Curve Track"), "cmdCurveSetCmd", _("Curve Tracks") ); + AddMenuButton( menu, CmdCurve, "cmdCurveEndPt", _("Curve from End-Pt"), wIconCreatePixMap( curved_end_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE1, I2VP(0) ); + AddMenuButton( menu, CmdCurve, "cmdCurveTangent", _("Curve from Tangent"), wIconCreatePixMap( curved_tangent_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE2, I2VP(1) ); + AddMenuButton( menu, CmdCurve, "cmdCurveCenter", _("Curve from Center"), wIconCreatePixMap( curved_middle_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE3, I2VP(2) ); + AddMenuButton( menu, CmdCurve, "cmdCurveChord", _("Curve from Chord"), wIconCreatePixMap( curved_chord_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CURVE4, I2VP(3) ); + AddMenuButton( menu, CmdBezCurve, "cmdBezier", _("Bezier Curve"), wIconCreatePixMap( bezier_track_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_BEZIER, I2VP(bezCmdCreateTrack) ); + AddMenuButton( menu, CmdCornu, "cmdCornu", _("Cornu Curve"), wIconCreatePixMap( cornu_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ACCL_CORNU, I2VP(cornuCmdCreateTrack)); ButtonGroupEnd(); - ButtonGroupBegin( _("Circle Track"), "cmdCurveSetCmd", _("Circle Tracks") ); - AddMenuButton( menu, CmdCircle, "cmdCircleFixedRadius", _("Fixed Radius Circle"), wIconCreatePixMap( circle1_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE1, (void*)0 ); - AddMenuButton( menu, CmdCircle, "cmdCircleTangent", _("Circle from Tangent"), wIconCreatePixMap( circle2_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE2, (void*)1 ); - AddMenuButton( menu, CmdCircle, "cmdCircleCenter", _("Circle from Center"), wIconCreatePixMap( circle3_xpm ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE3, (void*)2 ); + ButtonGroupBegin( _("Circle Track"), "cmdCircleSetCmd", _("Circle Tracks") ); + AddMenuButton( menu, CmdCircle, "cmdCircleFixedRadius", _("Fixed Radius Circle"), wIconCreatePixMap( circle_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE1, I2VP(0) ); + AddMenuButton( menu, CmdCircle, "cmdCircleTangent", _("Circle from Tangent"), wIconCreatePixMap( circle_tangent_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE2, I2VP(1) ); + AddMenuButton( menu, CmdCircle, "cmdCircleCenter", _("Circle from Center"), wIconCreatePixMap( circle_center_xpm[iconSize] ), LEVEL0_50, IC_STICKY|IC_POPUP2, ACCL_CIRCLE3, I2VP(2) ); ButtonGroupEnd(); ParamRegister( &circleRadiusPG ); diff --git a/app/bin/ccurve.h b/app/bin/ccurve.h index 0c00c46..7ae4227 100644 --- a/app/bin/ccurve.h +++ b/app/bin/ccurve.h @@ -23,10 +23,8 @@ #ifndef HAVE_CCURVE_H #define HAVE_CCURVE_H -#include "draw.h" -#include "track.h" -#include "wlib.h" -#include "utility.h" +#include "common.h" +#include "track.h" //- curveType_e typedef struct { curveType_e type; @@ -48,10 +46,10 @@ typedef struct { #define circleCmdFromTangent (1) #define circleCmdFromCenter (2) -typedef void (*curveMessageProc)( char *, ... ); +typedef void (*curveMessageProc)( const char *, ... ); STATUS_T CreateCurve( wAction_t, coOrd, BOOL_T, wDrawColor, DIST_T, long, dynArr_t *,curveMessageProc ); int IsCurveCircle( track_p ); -void PlotCurve( long, coOrd, coOrd, coOrd, curveData_t *, BOOL_T ); +void PlotCurve( long, coOrd, coOrd, coOrd, curveData_t *, BOOL_T, DIST_T ); track_p NewCurvedTrack( coOrd, DIST_T, ANGLE_T, ANGLE_T, long ); DIST_T CurveDescriptionDistance( coOrd, track_p, coOrd *, BOOL_T, BOOL_T * ); STATUS_T CurveDescriptionMove( track_p, wAction_t, coOrd ); diff --git a/app/bin/cdraw.c b/app/bin/cdraw.c index 6bb4c4a..b6cc035 100644 --- a/app/bin/cdraw.c +++ b/app/bin/cdraw.c @@ -20,22 +20,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include "wlib.h" - +#include "common.h" #include "ccurve.h" #include "cbezier.h" #include "drawgeom.h" #include "fileio.h" -#include "i18n.h" -#include "messages.h" #include "param.h" #include "track.h" -#include "utility.h" #include "misc.h" - +#include "cselect.h" +#include "common-ui.h" extern TRKTYP_T T_BZRLIN; static wMenu_p drawModDelMI; @@ -76,23 +70,23 @@ EXPORT void LoadFontSizeList( wIndex_t curInx = 0, inx1; int inx; wListClear(list); - for (inx = 0; inx < sizeof fontSizeList / sizeof fontSizeList[0]; inx++) + for (inx = 0; inx < COUNT( fontSizeList ); inx++) { if ((inx == 0 || curFontSize > fontSizeList[inx - 1]) && (curFontSize < fontSizeList[inx])) { sprintf(message, "%ld", curFontSize); - curInx = wListAddValue(list, message, NULL, (void*)curFontSize); + curInx = wListAddValue(list, message, NULL, I2VP(curFontSize)); } sprintf(message, "%ld", fontSizeList[inx]); - inx1 = wListAddValue(list, message, NULL, (void*)fontSizeList[inx]); + inx1 = wListAddValue(list, message, NULL, I2VP(fontSizeList[inx])); if (curFontSize == fontSizeList[inx]) curInx = inx1; } - if (curFontSize > fontSizeList[(sizeof fontSizeList / sizeof fontSizeList[0]) - 1]) + if (curFontSize > fontSizeList[ COUNT( fontSizeList ) - 1]) { sprintf(message, "%ld", curFontSize); - curInx = wListAddValue(list, message, NULL, (void*)curFontSize); + curInx = wListAddValue(list, message, NULL, I2VP(curFontSize)); } wListSetIndex(list, curInx); wFlush(); @@ -106,7 +100,7 @@ long GetFontSize(wIndex_t inx) long GetFontSizeIndex(long size) { int i; - for (i = 0; i < sizeof fontSizeList / sizeof fontSizeList[0]; i++) + for (i = 0; i < COUNT( fontSizeList ); i++) { if (fontSizeList[i] == size) return(i); @@ -122,7 +116,7 @@ EXPORT void UpdateFontSizeList( long fontSize; if ( listInx >= 0 ) { - *fontSizeR = (long)wListGetItemContext( list, listInx ); + *fontSizeR = VP2L( wListGetItemContext( list, listInx )); } else { wListGetValues( list, message, sizeof message, NULL, NULL ); if ( message[0] != '\0' ) { @@ -154,13 +148,14 @@ EXPORT void UpdateFontSizeList( */ -struct extraData { +typedef struct extraDataDraw_t { + extraDataBase_t base; coOrd orig; ANGLE_T angle; drawLineType_e lineType; wIndex_t segCnt; trkSeg_t segs[1]; - }; + } extraDataDraw_t; static TRKTYP_T T_DRAW = -1; static track_p ignoredTableEdge; @@ -169,7 +164,7 @@ static track_p ignoredDraw; static void ComputeDrawBoundingBox( track_p t ) { - struct extraData * xx = GetTrkExtraData(t); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(t, T_DRAW, extraDataDraw_t); coOrd lo, hi; GetSegBounds( xx->orig, xx->angle, xx->segCnt, xx->segs, &lo, &hi ); @@ -185,12 +180,12 @@ static track_p MakeDrawFromSeg1( ANGLE_T angle, trkSeg_p sp ) { - struct extraData * xx; + struct extraDataDraw_t * xx; track_p trk; if ( sp->type == ' ' ) return NULL; trk = NewTrack( index, T_DRAW, 0, sizeof *xx ); - xx = GetTrkExtraData( trk ); + xx = GET_EXTRA_DATA( trk, T_DRAW, extraDataDraw_t ); xx->orig = pos; xx->angle = angle; xx->segCnt = 1; @@ -230,10 +225,10 @@ EXPORT track_p MakePolyLineFromSegs( ANGLE_T angle, dynArr_t * segsArr) { - struct extraData * xx; + struct extraDataDraw_t * xx; track_p trk; trk = NewTrack( 0, T_DRAW, 0, sizeof *xx ); - xx = GetTrkExtraData( trk ); + xx = GET_EXTRA_DATA( trk, T_DRAW, extraDataDraw_t ); xx->orig = pos; xx->angle = angle; xx->lineType = DRAWLINESOLID; @@ -458,7 +453,7 @@ void static CreateOriginAnchor(coOrd origin, wBool_t trans_selected) { EXPORT void DrawOriginAnchor(track_p trk) { if (!trk || GetTrkType(trk) != T_DRAW) return; - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if ((xx->orig.x != 0.0) || (xx->orig.y !=0.0) ) { DYNARR_RESET(trkSeg_t,anchors_da); CreateOriginAnchor(xx->orig,FALSE); @@ -470,11 +465,11 @@ EXPORT void DrawOriginAnchor(track_p trk) { static DIST_T DistanceDraw( track_p t, coOrd * p ) { - struct extraData * xx = GetTrkExtraData(t); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(t, T_DRAW, extraDataDraw_t); if ( ignoredTableEdge == t && xx->segs[0].type == SEG_TBLEDGE ) - return 100000.0; + return DIST_INF; if ( ignoredDraw == t ) - return 100000.0; + return DIST_INF; return DistanceSegs( xx->orig, xx->angle, xx->segCnt, xx->segs, p, NULL ); } @@ -507,26 +502,25 @@ static struct { wIndex_t dimenSize; descPivot_t pivot; wIndex_t fontSizeInx; - char text[STR_LONG_SIZE]; + char text[STR_HUGE_SIZE]; unsigned int layer; wIndex_t lineType; } drawData; -typedef enum { E0, E1, PP, CE, AL, A1, A2, RD, LN, HT, WT, LK, OI, RA, VC, LW, LT, CO, FL, OP, BX, BE, OR, DS, TP, TA, TS, TX, PV, LY } drawDesc_e; +typedef enum { E0, E1, PP, CE, AL, LA, A1, A2, RD, LN, HT, WT, PV, VC, LW, LT, CO, FL, OP, BX, BE, OR, DS, TP, TA, TS, TX, LK, OI, RA, LY } drawDesc_e; static descData_t drawDesc[] = { /*E0*/ { DESC_POS, N_("End Pt 1: X,Y"), &drawData.endPt[0] }, /*E1*/ { DESC_POS, N_("End Pt 2: X,Y"), &drawData.endPt[1] }, /*PP*/ { DESC_POS, N_("First Point: X,Y"), &drawData.endPt[0] }, /*CE*/ { DESC_POS, N_("Center: X,Y"), &drawData.center }, -/*AL*/ { DESC_FLOAT, N_("Angle"), &drawData.angle }, +/*AL*/ { DESC_FLOAT, N_("Angular Length"), &drawData.angle }, +/*LA*/ { DESC_FLOAT, N_("Line Angle"), &drawData.angle }, /*A1*/ { DESC_ANGLE, N_("CCW Angle"), &drawData.angle0 }, /*A2*/ { DESC_ANGLE, N_("CW Angle"), &drawData.angle1 }, /*RD*/ { DESC_DIM, N_("Radius"), &drawData.radius }, /*LN*/ { DESC_DIM, N_("Length"), &drawData.length }, /*HT*/ { DESC_DIM, N_("Height"), &drawData.height }, /*WT*/ { DESC_DIM, N_("Width"), &drawData.width }, -/*LK*/ { DESC_BOXED, N_("Keep Origin Relative"), &drawData.lock_origin}, -/*OI*/ { DESC_POS, N_("Rot Origin: X,Y"), &drawData.origin }, -/*RA*/ { DESC_FLOAT, N_("Rotate Angle"), &drawData.angle }, +/*PV*/ { DESC_PIVOT, N_("Pivot"), &drawData.pivot }, /*VC*/ { DESC_LONG, N_("Point Count"), &drawData.pointCount }, /*LW*/ { DESC_LONG, N_("Line Width"), &drawData.lineWidth }, /*LT*/ { DESC_LIST, N_("Line Type"), &drawData.lineType }, @@ -537,11 +531,13 @@ static descData_t drawDesc[] = { /*BE*/ { DESC_LIST, N_("Lumber"), &drawData.benchChoice }, /*OR*/ { DESC_LIST, N_("Orientation"), &drawData.benchOrient }, /*DS*/ { DESC_LIST, N_("Size"), &drawData.dimenSize }, -/*TP*/ { DESC_POS, N_("Origin: X,Y"), &drawData.endPt[0] }, -/*TA*/ { DESC_FLOAT, N_("Angle"), &drawData.angle }, +/*TP*/ { DESC_POS, N_("Text Origin: X,Y"), &drawData.endPt[0] }, +/*TA*/ { DESC_FLOAT, N_("Text Angle"), &drawData.angle }, /*TS*/ { DESC_EDITABLELIST, N_("Font Size"), &drawData.fontSizeInx }, /*TX*/ { DESC_TEXT, N_("Text"), &drawData.text }, -/*PV*/ { DESC_PIVOT, N_("Pivot"), &drawData.pivot }, +/*LK*/ { DESC_BOXED, N_("Lock To Origin"), &drawData.lock_origin}, +/*OI*/ { DESC_POS, N_("Rot Origin: X,Y"), &drawData.origin }, +/*RA*/ { DESC_FLOAT, N_("Rotate By"), &drawData.rotate_angle }, /*LY*/ { DESC_LAYER, N_("Layer"), &drawData.layer }, { DESC_NULL } }; static int drawSegInx; @@ -567,13 +563,16 @@ static int drawSegInx; * so that the object remains at the same place as the user specifies. * If the edit starts with origin {0,0}, it will be set unlocked, otherwise set locked. * - * AL- Angle will be set to 0.0 when the object is modified. The points of the objects will be rotated so that + * RA - Rotate By Angle will only be active if the Origin is locked. + * It will be set to 0.0 whenever the object is modified. + * + * At the end of the operations, the points of the objects will be rotated so that * rotated and adjusted so they don't need rotation to lie where the user left them. * */ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataDraw_t *xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); trkSeg_p segPtr; coOrd mid; long fontSize; @@ -590,7 +589,10 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) coOrd off; switch ( inx ) { case LW: - segPtr->width = drawData.lineWidth/mainD.dpi; + if (drawData.lineWidth<0) + segPtr->width = drawData.lineWidth; + else + segPtr->width = drawData.lineWidth/75.0; //Replace with absolute pixel break; case CO: segPtr->color = drawData.color; @@ -601,61 +603,42 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) coOrd off; off.x = drawData.endPt[0].x - drawData.oldE0.x; off.y = drawData.endPt[0].y - drawData.oldE0.y; - if (drawData.lock_origin) { - xx->orig.x +=off.x; - xx->orig.y +=off.y; - drawDesc[OI].mode |= DESC_CHANGE; - } else { - switch(segPtr->type) { //E0 does not alter length - translates - case SEG_STRLIN: - case SEG_DIMLIN: - case SEG_BENCH: - case SEG_TBLEDGE: - UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], xx->angle, xx->orig ); - drawData.endPt[1].x = off.x+drawData.endPt[1].x; - drawData.endPt[1].y = off.y+drawData.endPt[1].y; - UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); - drawDesc[E1].mode |= DESC_CHANGE; - break; - case SEG_CRVLIN: - case SEG_FILCRCL: - UNREORIGIN( segPtr->u.c.center, drawData.endPt[0], xx->angle, xx->orig ); - break; - case SEG_TEXT: - UNREORIGIN( segPtr->u.t.pos, drawData.endPt[0], xx->angle, xx->orig ); - break; - case SEG_POLY: - case SEG_FILPOLY: - break; //Note not used by POLYGONS - default:; - } - } - } else { //E1 - alters length - off.x = drawData.endPt[1].x - drawData.oldE1.x; - off.y = drawData.endPt[1].y - drawData.oldE1.y; - drawDesc[E1].mode |= DESC_CHANGE; - if (drawData.lock_origin) { - xx->orig.x +=off.x; - xx->orig.y +=off.y; - drawDesc[OI].mode |= DESC_CHANGE; - } else { - UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); + switch(segPtr->type) { //E0 does not alter length - translates + case SEG_STRLIN: + case SEG_DIMLIN: + case SEG_BENCH: + case SEG_TBLEDGE: + UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig ); + drawData.endPt[1].x = off.x+drawData.endPt[1].x; + drawData.endPt[1].y = off.y+drawData.endPt[1].y; + UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); + drawDesc[E1].mode |= DESC_CHANGE; + break; + case SEG_CRVLIN: + case SEG_FILCRCL: + UNREORIGIN( segPtr->u.c.center, drawData.endPt[0], 0.0, xx->orig ); + break; + case SEG_POLY: + case SEG_FILPOLY: + break; //Note not used by POLYGONS + default:; } + } else { + UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); } drawData.length = FindDistance( drawData.endPt[0], drawData.endPt[1] ); drawDesc[LN].mode |= DESC_CHANGE; break; - case OI: - off.x = drawData.origin.x - drawData.oldOrigin.x; - off.y = drawData.origin.y - drawData.oldOrigin.y; + case OI: ; + off.x = drawData.origin.x-xx->orig.x; + off.y = drawData.origin.y-xx->orig.y; xx->orig = drawData.origin; - if (!drawData.lock_origin) { + if (!drawData.lock_origin) { //Move the points so that the object is not moved switch(segPtr->type) { case SEG_POLY: case SEG_FILPOLY: for (int i=0;iu.p.cnt;i++) { - REORIGIN( pt, segPtr->u.p.pts[i].pt, xx->angle, drawData.oldOrigin); - UNREORIGIN( segPtr->u.p.pts[i].pt, pt, xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.p.pts[i].pt, segPtr->u.p.pts[i].pt, 0.0, off ); } break; case SEG_STRLIN: @@ -663,50 +646,40 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case SEG_BENCH: case SEG_TBLEDGE: for (int i=0;i<2;i++) { - UNREORIGIN( segPtr->u.l.pos[i], drawData.endPt[i], xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.l.pos[i], segPtr->u.l.pos[i], 0.0, off ); } break; case SEG_CRVLIN: case SEG_FILCRCL: - UNREORIGIN( segPtr->u.c.center, drawData.center, xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.c.center, segPtr->u.c.center, 0.0, off ); break; case SEG_TEXT: - UNREORIGIN( segPtr->u.t.pos, drawData.endPt[0], xx->angle, xx->orig ); - break; + UNREORIGIN( segPtr->u.t.pos, segPtr->u.t.pos, 0.0, off ); default:; } } else { - drawData.endPt[0].x += off.x; - drawData.endPt[0].y += off.y; switch(segPtr->type) { case SEG_STRLIN: case SEG_DIMLIN: case SEG_BENCH: case SEG_TBLEDGE: + REORIGIN( drawData.endPt[0], segPtr->u.l.pos[0], 0.0, xx->orig ); + REORIGIN( drawData.endPt[1], segPtr->u.l.pos[1], 0.0, xx->orig ); drawDesc[E0].mode |= DESC_CHANGE; - UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], xx->angle, xx->orig ); - drawData.endPt[1].x = off.x+drawData.endPt[1].x; - drawData.endPt[1].y = off.y+drawData.endPt[1].y; - UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); drawDesc[E1].mode |= DESC_CHANGE; break; case SEG_CRVLIN: case SEG_FILCRCL: - UNREORIGIN( segPtr->u.c.center, drawData.endPt[0], xx->angle, xx->orig ); - drawDesc[E0].mode |= DESC_CHANGE; + REORIGIN( drawData.center, segPtr->u.c.center, 0.0, xx->orig ); + drawDesc[CE].mode |= DESC_CHANGE; break; case SEG_TEXT: - UNREORIGIN( segPtr->u.t.pos, drawData.endPt[0], xx->angle, xx->orig ); - drawDesc[E0].mode |= DESC_CHANGE; + REORIGIN( drawData.endPt[0], segPtr->u.t.pos, 0.0, xx->orig ); + drawDesc[TP].mode |= DESC_CHANGE; break; case SEG_POLY: case SEG_FILPOLY: - for (int i=0;iu.p.cnt;i++) { - REORIGIN( pt, segPtr->u.p.pts[i].pt, xx->angle, drawData.oldOrigin); - pt.x += off.x; - pt.y += off.y; - UNREORIGIN( segPtr->u.p.pts[i].pt, pt, xx->angle, xx->orig ); - } + REORIGIN(drawData.endPt[0], segPtr->u.p.pts[0].pt, 0.0, xx->orig); drawDesc[PP].mode |= DESC_CHANGE; break; default:; @@ -734,15 +707,16 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) } } break; - case RA:; - ANGLE_T angle = NormalizeAngle(drawData.rotate_angle); - switch(segPtr->type) { + case RA:; //Only applies if "Lock" has been set + if (drawData.lock_origin) { + ANGLE_T angle = NormalizeAngle(drawData.rotate_angle); + switch(segPtr->type) { case SEG_POLY: case SEG_FILPOLY: for (int i=0;iu.p.cnt;i++) { - REORIGIN(pt,segPtr->u.p.pts[i].pt, angle, xx->orig); + UNREORIGIN(pt, segPtr->u.p.pts[i].pt, angle, drawData.origin); + REORIGIN(segPtr->u.p.pts[i].pt, pt, 0.0, drawData.origin); if (i == 0) drawData.endPt[0] = pt; - UNREORIGIN(segPtr->u.p.pts[i].pt, pt, 0.0, xx->orig); } drawDesc[PP].mode |= DESC_CHANGE; break; @@ -750,18 +724,18 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) coOrd end0, end1; Translate(&end0,segPtr->u.c.center,segPtr->u.c.a0,segPtr->u.c.radius); Translate(&end1,segPtr->u.c.center,segPtr->u.c.a0+segPtr->u.c.a1,segPtr->u.c.radius); - REORIGIN(end0, end0, angle, xx->orig ); - REORIGIN(end1, end1, angle, xx->orig ); - REORIGIN( drawData.center,segPtr->u.c.center, angle, xx->orig ); - drawData.angle0 = FindAngle( drawData.center, end0); + REORIGIN(drawData.center, segPtr->u.c.center, angle, drawData.origin); + REORIGIN(end0, end0, angle, drawData.origin); + REORIGIN(end1, end1, angle, drawData.origin); + segPtr->u.c.a0 = drawData.angle0 = FindAngle( drawData.center, end0); drawData.angle1 = FindAngle( drawData.center, end1); + UNREORIGIN(segPtr->u.c.center,drawData.center,0.0,drawData.origin); drawDesc[CE].mode |= DESC_CHANGE; drawDesc[A1].mode |= DESC_CHANGE; - drawDesc[A2].mode |= DESC_CHANGE; /*no break*/ case SEG_FILCRCL: - REORIGIN( drawData.center,segPtr->u.c.center, angle, xx->orig ); - UNREORIGIN( segPtr->u.c.center, drawData.center, 0.0, xx->orig); //Remove angle + REORIGIN(drawData.center, segPtr->u.c.center, angle, drawData.origin); //Remove angle + UNREORIGIN(segPtr->u.c.center, drawData.center, 0.0, drawData.origin); drawDesc[CE].mode |= DESC_CHANGE; break; case SEG_STRLIN: @@ -769,27 +743,36 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case SEG_BENCH: case SEG_TBLEDGE: for (int i=0;i<2;i++) { - REORIGIN( drawData.endPt[i], segPtr->u.l.pos[i], angle, xx->orig ); - UNREORIGIN(segPtr->u.l.pos[i], drawData.endPt[i], 0.0, xx->orig ); + REORIGIN( drawData.endPt[i], segPtr->u.l.pos[i], angle, drawData.origin ); + UNREORIGIN( segPtr->u.l.pos[i], drawData.endPt[i], 0.0, drawData.origin ); } drawDesc[E0].mode |= DESC_CHANGE; drawDesc[E1].mode |= DESC_CHANGE; break; - case SEG_TEXT: - + case SEG_TEXT:; + coOrd tp; + REORIGIN( tp, segPtr->u.t.pos, angle, drawData.origin ); + UNREORIGIN( segPtr->u.t.pos, tp, 0.0, drawData.origin ); + drawData.endPt[0] = tp; + drawData.angle = segPtr->u.t.angle += angle; + drawDesc[TA].mode |= DESC_CHANGE; + drawDesc[TP].mode |= DESC_CHANGE; break; default:; + } } xx->angle = drawData.rotate_angle = 0.0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; drawDesc[RA].mode |= DESC_CHANGE; break; - case AL:; - angle = NormalizeAngle(drawData.angle); + case AL: //Uses Pivot Point + case LA:; + ANGLE_T angle = NormalizeAngle(drawData.angle); switch(segPtr->type) { case SEG_POLY: case SEG_FILPOLY: break; //Doesn't Use - case SEG_CRVLIN: + case SEG_CRVLIN: //Uses as swept angle switch ( drawData.pivot ) { case DESC_PIVOT_FIRST: segPtr->u.c.a1 = drawData.angle; @@ -799,7 +782,7 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case DESC_PIVOT_SECOND: segPtr->u.c.a0 = NormalizeAngle( segPtr->u.c.a1+segPtr->u.c.a0-drawData.angle); segPtr->u.c.a1 = drawData.angle; - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); + drawData.angle0 = NormalizeAngle( segPtr->u.c.a0 ); drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); drawDesc[A1].mode |= DESC_CHANGE; drawDesc[A2].mode |= DESC_CHANGE; @@ -807,7 +790,7 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case DESC_PIVOT_MID: segPtr->u.c.a0 = NormalizeAngle( segPtr->u.c.a0+segPtr->u.c.a1/2.0-drawData.angle/2.0); segPtr->u.c.a1 = drawData.angle; - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); + drawData.angle0 = NormalizeAngle( segPtr->u.c.a0 ); drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); drawDesc[A1].mode |= DESC_CHANGE; drawDesc[A2].mode |= DESC_CHANGE; @@ -815,6 +798,8 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) default: break; } + drawData.length = 2*M_PI*segPtr->u.c.radius*segPtr->u.c.a1/360; + drawDesc[LN].mode = DESC_RO|DESC_CHANGE; break; case SEG_FILCRCL: break; //Doesn't Use @@ -822,9 +807,31 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case SEG_DIMLIN: case SEG_BENCH: case SEG_TBLEDGE: - Translate(&drawData.endPt[1],drawData.endPt[0],angle,drawData.length); - UNREORIGIN(segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); - drawDesc[E1].mode |= DESC_CHANGE; + switch ( drawData.pivot ) { + case DESC_PIVOT_FIRST: + Translate(&drawData.endPt[1],drawData.endPt[0],angle,drawData.length); + UNREORIGIN(segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); + drawDesc[E1].mode |= DESC_CHANGE; + break; + case DESC_PIVOT_MID:; + coOrd middle; + middle.x = (drawData.endPt[1].x+drawData.endPt[0].x)/2; + middle.y = (drawData.endPt[1].y+drawData.endPt[0].y)/2; + Translate(&drawData.endPt[0],middle,NormalizeAngle(angle+180),drawData.length/2); + Translate(&drawData.endPt[1],middle,angle,drawData.length/2); + UNREORIGIN(segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig ); + UNREORIGIN(segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); + drawDesc[E0].mode |= DESC_CHANGE; + drawDesc[E1].mode |= DESC_CHANGE; + break; + case DESC_PIVOT_SECOND: + Translate(&drawData.endPt[0],drawData.endPt[1],NormalizeAngle(angle+180),drawData.length); + UNREORIGIN(segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig ); + drawDesc[E0].mode |= DESC_CHANGE; + break; + default: + break; + } break; case SEG_TEXT: break; //Doesnt Use @@ -834,11 +841,7 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) case LN: if ( drawData.length <= minLength ) { ErrorMessage( MSG_OBJECT_TOO_SHORT ); - if ( segPtr->type != SEG_CRVLIN ) { - drawData.length = FindDistance( drawData.endPt[0], drawData.endPt[1] ); - } else { - drawData.length = fabs(segPtr->u.c.radius)*2*M_PI*segPtr->u.c.a1/360.0; - } + drawData.length = fabs(segPtr->u.c.radius)*2*M_PI*segPtr->u.c.a1/360.0; drawDesc[LN].mode |= DESC_CHANGE; break; } @@ -846,12 +849,12 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) switch ( drawData.pivot ) { case DESC_PIVOT_FIRST: Translate( &drawData.endPt[1], drawData.endPt[0], drawData.angle, drawData.length ); - UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); drawDesc[E1].mode |= DESC_CHANGE; break; case DESC_PIVOT_SECOND: Translate( &drawData.endPt[0], drawData.endPt[1], drawData.angle+180.0, drawData.length ); - UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig ); drawDesc[E0].mode |= DESC_CHANGE; break; case DESC_PIVOT_MID: @@ -859,32 +862,18 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) mid.y = (drawData.endPt[0].y+drawData.endPt[1].y)/2.0; Translate( &drawData.endPt[0], mid, drawData.angle+180.0, drawData.length/2.0 ); Translate( &drawData.endPt[1], mid, drawData.angle, drawData.length/2.0 ); - UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], xx->angle, xx->orig ); - UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig ); + UNREORIGIN( segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig ); drawDesc[E0].mode |= DESC_CHANGE; drawDesc[E1].mode |= DESC_CHANGE; break; default: break; } - } else { - - if ( drawData.angle < 0.0 || drawData.angle >= 360.0 ) { - ErrorMessage( MSG_CURVE_OUT_OF_RANGE ); - drawData.angle = segPtr->u.c.a1; - drawDesc[AL].mode |= DESC_CHANGE; - } else { - segPtr->u.c.a0 = NormalizeAngle( segPtr->u.c.a0+segPtr->u.c.a1/2.0-drawData.angle/2.0); - segPtr->u.c.a1 = drawData.angle; - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); - drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); - drawDesc[A1].mode |= DESC_CHANGE; - drawDesc[A2].mode |= DESC_CHANGE; - } } break; case CE: - UNREORIGIN( segPtr->u.c.center, drawData.center, xx->angle, xx->orig ); + UNREORIGIN( segPtr->u.c.center, drawData.center, 0.0, xx->orig ); break; case RD: if ( drawData.pivot == DESC_PIVOT_FIRST ) { @@ -896,82 +885,51 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) } drawDesc[CE].mode |= DESC_CHANGE; segPtr->u.c.radius = drawData.radius; - drawDesc[LN].mode |= DESC_CHANGE; + drawData.length = 2*M_PI*segPtr->u.c.radius*(segPtr->type==SEG_CRVLIN?segPtr->u.c.a1/360:1.0); + drawDesc[LN].mode = DESC_RO|DESC_CHANGE; break; - case A1: - switch ( drawData.pivot ) { - case DESC_PIVOT_FIRST: - segPtr->u.c.a1 = drawData.angle; - drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); - drawDesc[A2].mode |= DESC_CHANGE; - break; - case DESC_PIVOT_SECOND: - segPtr->u.c.a0 = NormalizeAngle( segPtr->u.c.a1+segPtr->u.c.a0-drawData.angle); - segPtr->u.c.a1 = drawData.angle; - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); - drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); - drawDesc[A1].mode |= DESC_CHANGE; - drawDesc[A2].mode |= DESC_CHANGE; - break; - case DESC_PIVOT_MID: - segPtr->u.c.a0 = NormalizeAngle( segPtr->u.c.a0+segPtr->u.c.a1/2.0-drawData.angle/2.0); - segPtr->u.c.a1 = drawData.angle; - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); - drawData.angle1 = NormalizeAngle( drawData.angle0+segPtr->u.c.a1 ); - drawDesc[A1].mode |= DESC_CHANGE; - drawDesc[A2].mode |= DESC_CHANGE; - break; - default: - break; - } + case A1: //Angle of first point of curve + segPtr->u.c.a0 = NormalizeAngle(drawData.angle0); + drawData.angle1 = NormalizeAngle(segPtr->u.c.a0+segPtr->u.c.a1); + drawDesc[A2].mode |= DESC_CHANGE; break; case A2: - segPtr->u.c.a0 = NormalizeAngle( drawData.angle1-segPtr->u.c.a1-xx->angle ); - drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); + segPtr->u.c.a0 = NormalizeAngle( drawData.angle1-segPtr->u.c.a1); + drawData.angle0 = NormalizeAngle( segPtr->u.c.a0 ); drawDesc[A1].mode |= DESC_CHANGE; break; case BE: - BenchUpdateOrientationList( (long)wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice ), (wList_p)drawDesc[OR].control0 ); + BenchUpdateOrientationList( VP2L( wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice)), (wList_p)drawDesc[OR].control0 ); if ( drawData.benchOrient < wListGetCount( (wList_p)drawDesc[OR].control0 ) ) wListSetIndex( (wList_p)drawDesc[OR].control0, drawData.benchOrient ); else drawData.benchOrient = 0; - segPtr->u.l.option = GetBenchData( (long)wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice ), drawData.benchOrient ); + segPtr->u.l.option = GetBenchData( VP2L(wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice)), drawData.benchOrient ); break; case OR: - segPtr->u.l.option = GetBenchData( (long)wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice ), drawData.benchOrient ); + segPtr->u.l.option = GetBenchData( VP2L(wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice)), drawData.benchOrient ); break; case DS: segPtr->u.l.option = drawData.dimenSize; break; - case TP: - UNREORIGIN( segPtr->u.t.pos, drawData.endPt[0], xx->angle, xx->orig ); + case TP:; + UNREORIGIN(segPtr->u.t.pos, drawData.endPt[0], 0.0, xx->orig ); break; case PP: off.x = drawData.endPt[0].x - drawData.oldE0.x; off.y = drawData.endPt[0].y - drawData.oldE0.y; - if (drawData.lock_origin) { - xx->orig.x +=off.x; - xx->orig.y +=off.y; - drawData.origin = xx->orig; - drawDesc[OI].mode |= DESC_CHANGE; - drawDesc[E0].mode |= DESC_CHANGE; - break; - } else { - for (int i=0;iu.p.cnt;i++) { - REORIGIN( pt, segPtr->u.p.pts[i].pt, xx->angle, xx->orig ); - pt.x += off.x; - pt.y += off.y; - if (i<5) drawData.endPt[i] = pt; - UNREORIGIN( segPtr->u.p.pts[i].pt, pt, 0.0, xx->orig ); + for (int i=0;iu.p.cnt;i++) { + REORIGIN( pt, segPtr->u.p.pts[i].pt, 0.0, xx->orig ); + pt.x += off.x; + pt.y += off.y; + if (i<5) { + drawData.endPt[i] = pt; } - xx->angle = 0.0; - drawDesc[AL].mode |= DESC_CHANGE; + UNREORIGIN( segPtr->u.p.pts[i].pt, pt, 0.0, xx->orig ); } break; case TA: - //segPtr->u.t.angle = NormalizeAngle( drawData.angle ); - xx->angle = NormalizeAngle( drawData.angle ); + segPtr->u.t.angle = NormalizeAngle( drawData.angle ); break; case TS: fontSize = (long)segPtr->u.t.fontSize; @@ -980,19 +938,36 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) break; case FL: if (segPtr->type == SEG_POLY && drawData.open) { + segPtr->u.p.polyType = POLYLINE; drawData.filled = FALSE; - drawDesc[FL].mode |= DESC_CHANGE; + drawDesc[FL].mode = DESC_RO|DESC_CHANGE; break; } if(drawData.filled) { - if (segPtr->type == SEG_POLY) segPtr->type = SEG_FILPOLY; - if (segPtr->type == SEG_CRVLIN) segPtr->type = SEG_FILCRCL; + if (segPtr->type == SEG_POLY) { + segPtr->type = SEG_FILPOLY; + segPtr->u.p.polyType = FREEFORM; + drawData.open = FALSE; + drawDesc[OP].mode = DESC_RO|DESC_CHANGE; + } + if (segPtr->type == SEG_CRVLIN) { + segPtr->type = SEG_FILCRCL; + drawData.length = 0.0; + drawDesc[LN].mode = DESC_RO|DESC_CHANGE; + } } else { - if (segPtr->type == SEG_FILPOLY) segPtr->type = SEG_POLY; + if (segPtr->type == SEG_FILPOLY) { + segPtr->type = SEG_POLY; + segPtr->u.p.polyType = FREEFORM; + drawData.open = FALSE; + drawDesc[OP].mode = DESC_CHANGE; + } if (segPtr->type == SEG_FILCRCL) { segPtr->type = SEG_CRVLIN; segPtr->u.c.a0 = 0.0; segPtr->u.c.a1 = 360.0; + drawData.length = 2*M_PI*segPtr->u.c.radius; + drawDesc[LN].mode = DESC_RO|DESC_CHANGE; } } break; @@ -1003,9 +978,17 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) break; } if (drawData.open) { - if (segPtr->type == SEG_POLY && segPtr->u.p.polyType == FREEFORM) segPtr->u.p.polyType = POLYLINE; + if (segPtr->type == SEG_POLY && segPtr->u.p.polyType == FREEFORM) { + segPtr->u.p.polyType = POLYLINE; + drawData.filled = FALSE; + drawDesc[FL].mode = DESC_RO|DESC_CHANGE; + } } else { - if (segPtr->type == SEG_POLY && segPtr->u.p.polyType == POLYLINE) segPtr->u.p.polyType = FREEFORM; + if (segPtr->type == SEG_POLY && segPtr->u.p.polyType == POLYLINE) { + segPtr->u.p.polyType = FREEFORM; + drawData.filled = FALSE; + drawDesc[FL].mode = DESC_CHANGE; + } } break; case BX: @@ -1015,6 +998,10 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) if ( wTextGetModified((wText_p)drawDesc[TX].control0 )) { int len = wTextGetSize((wText_p)drawDesc[TX].control0); MyFree( segPtr->u.t.string ); + if (len>STR_HUGE_SIZE-8) { //Truncate string to max + len = STR_HUGE_SIZE-8; + ErrorMessage( MSG_TEXT_TOO_LONG ); + } segPtr->u.t.string = (char *)MyMalloc(len+1); wTextGetText((wText_p)drawDesc[TX].control0, segPtr->u.t.string, len+1); segPtr->u.t.string[len] = '\0'; //Make sure of null term @@ -1025,6 +1012,13 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) SetTrkLayer( trk, drawData.layer); break; case LK: + if (drawData.lock_origin) { + drawDesc[RA].mode = 0; + } else { + drawDesc[RA].mode = DESC_RO; + } + drawData.rotate_angle = 0.0; + drawDesc[RA].mode |= DESC_CHANGE; break; case LT: xx->lineType = drawData.lineType; @@ -1034,7 +1028,7 @@ static void UpdateDraw( track_p trk, int inx, descData_p descUpd, BOOL_T final ) } drawData.oldE0 = drawData.endPt[0]; drawData.oldE1 = drawData.endPt[1]; - drawData.oldAngle = drawData.angle; + drawData.oldAngle = drawData.rotate_angle; drawData.oldOrigin = drawData.origin; ComputeDrawBoundingBox( trk ); DrawNewTrack( trk ); @@ -1045,7 +1039,7 @@ extern BOOL_T inDescribeCmd; static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataDraw_t *xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); coOrd pos = oldMarker; trkSeg_p segPtr; int inx; @@ -1057,14 +1051,17 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) if ( drawSegInx==-1 ) return; segPtr = &xx->segs[drawSegInx]; - for ( inx=0; inxcolor; drawData.layer = GetTrkLayer(trk); drawDesc[CO].mode = 0; - drawData.lineWidth = (long)floor(segPtr->width*mainD.dpi+0.5); + if (drawData.lineWidth<0) + drawData.lineWidth = (long)segPtr->width; + else + drawData.lineWidth = (long)floor(segPtr->width*75.0+0.5); drawDesc[LW].mode = 0; drawDesc[LY].mode = DESC_NOREDRAW; drawDesc[BE].mode = @@ -1076,7 +1073,7 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) if ((xx->orig.x == 0.0) && (xx->orig.y == 0.0)) drawData.lock_origin = FALSE; else drawData.lock_origin = TRUE; - drawData.rotate_angle = xx->angle; + drawData.rotate_angle = 0.0; drawDesc[LK].mode = 0; @@ -1090,13 +1087,19 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) drawData.length = FindDistance( drawData.endPt[0], drawData.endPt[1] ); drawData.angle = FindAngle( drawData.endPt[0], drawData.endPt[1] ); drawData.origin = xx->orig; + //Remove input Angle (if any) + UNREORIGIN(segPtr->u.l.pos[0], drawData.endPt[0], 0.0, xx->orig); + UNREORIGIN(segPtr->u.l.pos[1], drawData.endPt[1], 0.0, xx->orig); + xx->angle = 0.0; drawDesc[LN].mode = - drawDesc[AL].mode = + drawDesc[LA].mode = drawDesc[PV].mode = 0; drawDesc[E0].mode = drawDesc[OI].mode = 0; drawDesc[E1].mode = 0; drawDesc[RA].mode = 0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; + else drawDesc[RA].mode = 0; switch (segPtr->type) { case SEG_STRLIN: title = _("Straight Line"); @@ -1136,22 +1139,30 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) break; case SEG_CRVLIN: REORIGIN( drawData.center, segPtr->u.c.center, xx->angle, xx->orig ); + //Remove input Angle (if any) + UNREORIGIN(segPtr->u.c.center, drawData.center, 0.0, xx->orig); + xx->angle = 0.0; drawData.radius = fabs(segPtr->u.c.radius); drawData.origin = xx->orig; drawDesc[OI].mode = 0; - drawDesc[RA].mode = drawDesc[CE].mode = drawDesc[RD].mode = 0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; + else drawDesc[RA].mode = 0; drawDesc[LT].mode = 0; drawData.lineType = (wIndex_t)xx->lineType; if ( segPtr->u.c.a1 >= 360.0 ) { title = _("Circle"); drawDesc[FL].mode = 0; drawData.filled = FALSE; + drawDesc[LN].mode = DESC_RO; + drawData.length = 2*M_PI*segPtr->u.c.radius; } else { drawData.angle = segPtr->u.c.a1; drawData.angle0 = NormalizeAngle( segPtr->u.c.a0+xx->angle ); drawData.angle1 = NormalizeAngle( drawData.angle0+drawData.angle ); + drawDesc[LN].mode = DESC_RO; + drawData.length = 2*M_PI*segPtr->u.c.radius*segPtr->u.c.a1/360; drawDesc[AL].mode = drawDesc[A1].mode = drawDesc[A2].mode = 0; @@ -1161,12 +1172,18 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) break; case SEG_FILCRCL: REORIGIN( drawData.center, segPtr->u.c.center, xx->angle, xx->orig ); + //Remove input Angle (if any) + UNREORIGIN(segPtr->u.c.center, drawData.center, 0.0, xx->orig); + xx->angle = 0.0; drawData.radius = fabs(segPtr->u.c.radius); drawData.origin = xx->orig; drawDesc[OI].mode = - drawDesc[RA].mode = drawDesc[FL].mode = 0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; + else drawDesc[RA].mode = 0; drawData.filled = TRUE; + drawData.length = 0.0; + drawDesc[LN].mode = DESC_RO; drawDesc[CE].mode = drawDesc[RD].mode = 0; drawDesc[PV].mode = 0; @@ -1175,23 +1192,34 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) title = _("Filled Circle"); break; case SEG_POLY: + case SEG_FILPOLY:; + BOOL_T filled = FALSE; + if (segPtr->type == SEG_FILPOLY) filled = TRUE; REORIGIN(drawData.endPt[0],segPtr->u.p.pts[0].pt, xx->angle, xx->orig); + //Remove input Angle (if any) + for (int i=0;iu.p.cnt;i++) { + coOrd pt; + REORIGIN(pt,segPtr->u.p.pts[i].pt, xx->angle, xx->orig); + UNREORIGIN(segPtr->u.p.pts[i].pt, pt, 0.0, xx->orig); + } + xx->angle = 0.0; drawDesc[PP].mode = 0; drawData.pointCount = segPtr->u.p.cnt; drawDesc[VC].mode = DESC_RO; - drawData.filled = FALSE; + drawData.filled = filled; drawDesc[FL].mode = 0; drawData.angle = 0.0; - drawDesc[RA].mode = 0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; + else drawDesc[RA].mode = 0; drawData.origin = xx->orig; drawDesc[OI].mode = 0; - drawData.open=FALSE; - drawDesc[OP].mode = 0; + drawData.open= FALSE; + drawDesc[OP].mode = filled?DESC_RO:0; drawDesc[LT].mode = 0; drawData.lineType = (wIndex_t)xx->lineType; switch (segPtr->u.p.polyType) { case RECTANGLE: - title = _("Rectangle"); + title = filled?_("Filled Rectangle"):_("Rectangle"); drawDesc[OP].mode = DESC_IGNORE; drawDesc[VC].mode = DESC_IGNORE; drawData.width = FindDistance(segPtr->u.p.pts[0].pt, segPtr->u.p.pts[1].pt); @@ -1207,57 +1235,33 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) case POLYLINE: title = _("Polyline"); drawData.open=TRUE; + drawData.filled= FALSE; + drawDesc[FL].mode = DESC_RO; + drawDesc[OP].mode = 0; break; default: - title = _("Polygon"); - } - break; - case SEG_FILPOLY: - REORIGIN(drawData.endPt[0],segPtr->u.p.pts[0].pt, xx->angle, xx->orig); - drawDesc[PP].mode = 0; - drawData.pointCount = segPtr->u.p.cnt; - drawDesc[VC].mode = DESC_RO; - drawData.filled = TRUE; - drawDesc[FL].mode = 0; - drawDesc[LW].mode = DESC_IGNORE; - drawData.angle = xx->angle; - drawDesc[RA].mode = 0; - drawData.origin = xx->orig; - drawDesc[OI].mode = DESC_RO; - drawData.open = FALSE; - switch (segPtr->u.p.polyType) { - case RECTANGLE: - title =_("Filled Rectangle"); - drawDesc[VC].mode = DESC_IGNORE; - drawData.width = FindDistance(segPtr->u.p.pts[0].pt, segPtr->u.p.pts[1].pt); - drawDesc[WT].mode = 0; - drawData.height = FindDistance(segPtr->u.p.pts[0].pt, segPtr->u.p.pts[3].pt); - drawDesc[HT].mode = 0; - for(int i=0;i<4;i++) { - REORIGIN( drawData.endPt[i], segPtr->u.p.pts[i].pt, xx->angle, xx->orig ); - } - drawDesc[E0].mode = DESC_IGNORE; - drawData.origin = xx->orig; - break; - default: - title = _("Filled Polygon"); + title = filled?_("Filled Polygon"):_("Polygon"); } break; case SEG_TEXT: REORIGIN( drawData.endPt[0], segPtr->u.t.pos, xx->angle, xx->orig ); - drawData.angle = NormalizeAngle( xx->angle ); + UNREORIGIN( segPtr->u.t.pos, drawData.endPt[0], 0.0, xx->orig ); + xx->angle = 0.0; + drawData.angle = segPtr->u.t.angle; //Text Angle + drawData.origin = xx->orig; strncpy( drawData.text, segPtr->u.t.string, sizeof drawData.text ); drawData.text[sizeof drawData.text-1] ='\0'; drawData.boxed = segPtr->u.t.boxed; - drawData.origin = xx->orig; - drawDesc[E0].mode = drawDesc[TP].mode = drawDesc[TS].mode = drawDesc[TX].mode = drawDesc[TA].mode = - drawDesc[BX].mode = - drawDesc[RA].mode = - drawDesc[OI].mode = 0; + drawDesc[LK].mode = + drawDesc[OI].mode = + drawDesc[BX].mode = 0; + if (!drawData.lock_origin) drawDesc[RA].mode = DESC_RO; + else drawDesc[RA].mode = 0; + drawDesc[E0].mode = DESC_IGNORE; drawDesc[CO].mode = 0; /*Allow Text color setting*/ drawDesc[LW].mode = DESC_IGNORE; title = _("Text"); @@ -1272,7 +1276,7 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) drawData.oldE0 = drawData.endPt[0]; drawData.oldE1 = drawData.endPt[1]; - drawData.oldAngle = drawData.angle; + drawData.oldAngle = drawData.rotate_angle; drawData.oldOrigin = drawData.origin; @@ -1281,26 +1285,26 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) if ( segPtr->type==SEG_BENCH && drawDesc[BE].control0!=NULL && drawDesc[OR].control0!=NULL) { BenchLoadLists( (wList_p)drawDesc[BE].control0, (wList_p)drawDesc[OR].control0 ); wListSetIndex( (wList_p)drawDesc[BE].control0, drawData.benchChoice ); - BenchUpdateOrientationList( (long)wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice ), (wList_p)drawDesc[OR].control0 ); + BenchUpdateOrientationList( VP2L(wListGetItemContext((wList_p)drawDesc[BE].control0, drawData.benchChoice)), (wList_p)drawDesc[OR].control0 ); wListSetIndex( (wList_p)drawDesc[OR].control0, drawData.benchOrient ); } if ( (segPtr->type==SEG_STRLIN || segPtr->type==SEG_CRVLIN || segPtr->type==SEG_POLY) && drawDesc[LT].control0!=NULL) { wListClear( (wList_p)drawDesc[LT].control0 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("Solid"), NULL, (void*)0 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("Dash"), NULL, (void*)1 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("Dot"), NULL, (void*)2 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("DashDot"), NULL, (void*)3 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("DashDotDot"), NULL, (void*)4 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("CenterDot"), NULL, (void*)5 ); - wListAddValue( (wList_p)drawDesc[LT].control0, _("PhantomDot"), NULL, (void*)6 ); + wListAddValue( (wList_p)drawDesc[LT].control0, _("Solid"), NULL, I2VP(0 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("Dash"), NULL, I2VP(1 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("Dot"), NULL, I2VP(2 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("DashDot"), NULL, I2VP(3 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("DashDotDot"), NULL, I2VP(4 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("CenterDot"), NULL, I2VP(5 )); + wListAddValue( (wList_p)drawDesc[LT].control0, _("PhantomDot"), NULL, I2VP(6 )); wListSetIndex( (wList_p)drawDesc[LT].control0, drawData.lineType ); } if ( segPtr->type==SEG_DIMLIN && drawDesc[DS].control0!=NULL ) { wListClear( (wList_p)drawDesc[DS].control0 ); - wListAddValue( (wList_p)drawDesc[DS].control0, _("Tiny"), NULL, (void*)0 ); - wListAddValue( (wList_p)drawDesc[DS].control0, _("Small"), NULL, (void*)1 ); - wListAddValue( (wList_p)drawDesc[DS].control0, _("Medium"), NULL, (void*)2 ); - wListAddValue( (wList_p)drawDesc[DS].control0, _("Large"), NULL, (void*)3 ); + wListAddValue( (wList_p)drawDesc[DS].control0, _("Tiny"), NULL, I2VP(0 )); + wListAddValue( (wList_p)drawDesc[DS].control0, _("Small"), NULL, I2VP(1 )); + wListAddValue( (wList_p)drawDesc[DS].control0, _("Medium"), NULL, I2VP(2 )); + wListAddValue( (wList_p)drawDesc[DS].control0, _("Large"), NULL, I2VP(3 )); wListSetIndex( (wList_p)drawDesc[DS].control0, drawData.dimenSize ); } if ( segPtr->type==SEG_TEXT && drawDesc[TS].control0!=NULL ) { @@ -1311,7 +1315,7 @@ static void DescribeDraw( track_p trk, char * str, CSIZE_T len ) static void DrawDraw( track_p t, drawCmd_p d, wDrawColor color ) { - struct extraData * xx = GetTrkExtraData(t); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(t, T_DRAW, extraDataDraw_t); unsigned long NotSolid = ~(DC_NOTSOLIDLINE); d->options &= NotSolid; if (xx->lineType == DRAWLINESOLID) {} @@ -1329,7 +1333,7 @@ static void DrawDraw( track_p t, drawCmd_p d, wDrawColor color ) static void DeleteDraw( track_p t ) { /* Get rid of points if specified */ - struct extraData * xx = GetTrkExtraData(t); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(t, T_DRAW, extraDataDraw_t); if (xx->segs[0].type == SEG_POLY || xx->segs[0].type == SEG_FILPOLY) { MyFree(xx->segs[0].u.p.pts); @@ -1340,7 +1344,7 @@ static void DeleteDraw( track_p t ) static BOOL_T WriteDraw( track_p t, FILE * f ) { - struct extraData * xx = GetTrkExtraData(t); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(t, T_DRAW, extraDataDraw_t); BOOL_T rc = TRUE; rc &= fprintf(f, "DRAW %d %d %d 0 0 %0.6f %0.6f 0 %0.6f\n", GetTrkIndex(t), GetTrkLayer(t), xx->lineType, @@ -1359,7 +1363,7 @@ static BOOL_T ReadDraw( char * header ) ANGLE_T angle; wIndex_t layer; int lineType; - struct extraData * xx; + struct extraDataDraw_t * xx; if ( !GetArgs( header+5, paramVersion<3?"dXXpYf":paramVersion<9?"dLX00pYf":"dLd00pff", &index, &layer, &lineType, &orig, &elev, &angle ) ) @@ -1368,11 +1372,13 @@ static BOOL_T ReadDraw( char * header ) return FALSE; if (tempSegs_da.cnt == 1) { trk = MakeDrawFromSeg1( index, orig, angle, &tempSegs(0) ); + xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); + xx->lineType = lineType; SetTrkLayer( trk, layer ); } else { trk = NewTrack( index, T_DRAW, 0, sizeof *xx + (tempSegs_da.cnt-1) * sizeof *(trkSeg_p)0 ); SetTrkLayer( trk, layer ); - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); xx->orig = orig; xx->angle = angle; xx->segCnt = tempSegs_da.cnt; @@ -1384,27 +1390,88 @@ static BOOL_T ReadDraw( char * header ) } -static void MoveDraw( track_p trk, coOrd orig ) +static void MoveDraw( track_p trk, coOrd off ) { - struct extraData * xx = GetTrkExtraData(trk); - xx->orig.x += orig.x; - xx->orig.y += orig.y; + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); + + trkSeg_p segPtr = &xx->segs[0]; + + if (xx->orig.x == 0.0 && xx->orig.y == 0.0) { //No origin set + switch(segPtr->type) { + case SEG_POLY: + case SEG_FILPOLY: + for (int i=0;iu.p.cnt;i++) { + REORIGIN( segPtr->u.p.pts[i].pt, segPtr->u.p.pts[i].pt, 0.0, off ); + } + break; + case SEG_STRLIN: + case SEG_DIMLIN: + case SEG_BENCH: + case SEG_TBLEDGE: + for (int i=0;i<2;i++) { + REORIGIN( segPtr->u.l.pos[i], segPtr->u.l.pos[i], 0.0, off ); + } + break; + case SEG_CRVLIN: + case SEG_FILCRCL: + REORIGIN( segPtr->u.c.center, segPtr->u.c.center, 0.0, off ); + break; + case SEG_TEXT: + REORIGIN( segPtr->u.t.pos, segPtr->u.t.pos, 0.0, off ); + break; + default:; + } + + } else { + xx->orig.x += off.x; + xx->orig.y += off.y; + } ComputeDrawBoundingBox( trk ); } static void RotateDraw( track_p trk, coOrd orig, ANGLE_T angle ) { - struct extraData * xx = GetTrkExtraData(trk); - Rotate( &xx->orig, orig, angle ); - xx->angle = NormalizeAngle( xx->angle + angle ); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); + trkSeg_p segPtr = &xx->segs[0]; + if (xx->orig.x == 0.0 && xx->orig.y == 0.0) { //No origin set + switch(segPtr->type) { + case SEG_POLY: + case SEG_FILPOLY: + for (int i=0;iu.p.cnt;i++) { + Rotate(&segPtr->u.p.pts[i].pt, orig, angle ); + } + break; + case SEG_STRLIN: + case SEG_DIMLIN: + case SEG_BENCH: + case SEG_TBLEDGE: + for (int i=0;i<2;i++) { + Rotate( &segPtr->u.l.pos[i], orig, angle ); + } + break; + case SEG_CRVLIN: + case SEG_FILCRCL: + Rotate( &segPtr->u.c.center, orig, angle ); + segPtr->u.c.a0 = NormalizeAngle(segPtr->u.c.a0 + angle); + break; + case SEG_TEXT: + Rotate( &segPtr->u.t.pos, orig, angle ); + segPtr->u.t.angle = NormalizeAngle(segPtr->u.t.angle+angle+xx->angle); + break; + default:; + } + } else { + Rotate( &xx->orig, orig, angle ); + xx->angle = NormalizeAngle( xx->angle + angle ); + } ComputeDrawBoundingBox( trk ); } static void RescaleDraw( track_p trk, FLOAT_T ratio ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); xx->orig.x *= ratio; xx->orig.y *= ratio; RescaleSegs( xx->segCnt, xx->segs, ratio, ratio, ratio ); @@ -1422,7 +1489,8 @@ static drawModContext_t drawModCmdContext = { static BOOL_T infoSubst = FALSE; -static paramIntegerRange_t i0_100 = { 0, 100, 25 }; +static paramIntegerRange_t i100_100 = { -100, 100, 25 }; //Allow negative numbers +static paramFloatRange_t r0d001_10000 = { 0.001, 10000 }; static paramFloatRange_t r1_10000 = { 1, 10000 }; static paramFloatRange_t r0_10000 = { 0, 10000 }; static paramFloatRange_t r10000_10000 = {-10000, 10000}; @@ -1431,31 +1499,31 @@ static paramFloatRange_t r0_360 = { 0, 360, 80 }; static paramData_t drawModPLs[] = { #define drawModLengthPD (drawModPLs[0]) - { PD_FLOAT, &drawModCmdContext.length, "Length", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Length") }, + { PD_FLOAT, &drawModCmdContext.length, "Length", PDO_NOPREF|PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Length") }, #define drawModAnglePD (drawModPLs[1]) - { PD_FLOAT, &drawModCmdContext.abs_angle, "Angle", PDO_NORECORD|BO_ENTER, &r360_360, N_("Angle") }, + { PD_FLOAT, &drawModCmdContext.abs_angle, "Angle", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r360_360, N_("Angle") }, #define drawModRelAnglePD (drawModPLs[2]) #define drawModRelAngle 2 - { PD_FLOAT, &drawModCmdContext.rel_angle, "Rel Angle", PDO_NORECORD|BO_ENTER, &r360_360, N_("Relative Angle") }, + { PD_FLOAT, &drawModCmdContext.rel_angle, "RelAngle", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r360_360, N_("Relative Angle") }, #define drawModWidthPD (drawModPLs[3]) - { PD_FLOAT, &drawModCmdContext.width, "Width", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Width") }, + { PD_FLOAT, &drawModCmdContext.width, "Width", PDO_NOPREF|PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Width") }, #define drawModHeightPD (drawModPLs[4]) - { PD_FLOAT, &drawModCmdContext.height, "Height", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Height") }, + { PD_FLOAT, &drawModCmdContext.height, "Height", PDO_NOPREF|PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Height") }, #define drawModRadiusPD (drawModPLs[5]) #define drawModRadius 5 - { PD_FLOAT, &drawModCmdContext.radius, "Radius", PDO_DIM|PDO_NORECORD|BO_ENTER, &r10000_10000, N_("Radius") }, + { PD_FLOAT, &drawModCmdContext.radius, "Radius", PDO_NOPREF|PDO_DIM|PDO_NORECORD|BO_ENTER, &r0d001_10000, N_("Radius") }, #define drawModArcAnglePD (drawModPLs[6]) - { PD_FLOAT, &drawModCmdContext.arc_angle, "ArcAngle", PDO_NORECORD|BO_ENTER, &r360_360, N_("Arc Angle") }, + { PD_FLOAT, &drawModCmdContext.arc_angle, "ArcAngle", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r360_360, N_("Arc Angle") }, #define drawModRotAnglePD (drawModPLs[7) - { PD_FLOAT, &drawModCmdContext.rot_angle, "Rot Angle", PDO_NORECORD|BO_ENTER, &r0_360, N_("Rotate Angle") }, + { PD_FLOAT, &drawModCmdContext.rot_angle, "RotAngle", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r0_360, N_("Rotate Angle") }, #define drawModRotCenterXPD (drawModPLs[8]) #define drawModRotCenterInx 8 - { PD_FLOAT, &drawModCmdContext.rot_center.x, "Rot Center X,Y", PDO_NORECORD|BO_ENTER, &r0_10000, N_("Rot Center X") }, + { PD_FLOAT, &drawModCmdContext.rot_center.x, "RotCenterx", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Rot Center X,Y") }, #define drawModRotCenterYPD (drawModPLs[9]) - { PD_FLOAT, &drawModCmdContext.rot_center.y, " ", PDO_NORECORD|BO_ENTER, &r0_10000, N_("Rot Center Y") }, + { PD_FLOAT, &drawModCmdContext.rot_center.y, "RotCentery", PDO_NOPREF|PDO_NORECORD|BO_ENTER, &r0_10000, NULL }, }; -static paramGroup_t drawModPG = { "drawMod", 0, drawModPLs, sizeof drawModPLs/sizeof drawModPLs[0] }; +static paramGroup_t drawModPG = { "drawMod", 0, drawModPLs, COUNT( drawModPLs ) }; static void DrawModDlgUpdate( paramGroup_p pg, @@ -1472,7 +1540,7 @@ static void DrawModDlgUpdate( static STATUS_T ModifyDraw( track_p trk, wAction_t action, coOrd pos ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); STATUS_T rc = C_CONTINUE; wControl_p controls[5]; //Always needs a NULL last entry @@ -1649,6 +1717,7 @@ static STATUS_T ModifyDraw( track_p trk, wAction_t action, coOrd pos ) wMenuPushEnable( drawModLast,drawModCmdContext.rotate_state && (drawModCmdContext.prev_inx>=0)); wMenuPushEnable( drawModCenter,drawModCmdContext.rotate_state); break; + case wActionExtKey: case C_TEXT: ignoredDraw = trk ; rc = DrawGeomModify( action, pos, &drawModCmdContext ); @@ -1665,19 +1734,25 @@ static STATUS_T ModifyDraw( track_p trk, wAction_t action, coOrd pos ) xx->angle = drawModCmdContext.angle; xx->orig = drawModCmdContext.orig; ignoredDraw = NULL; + DrawNewTrack( trk ); ComputeDrawBoundingBox( trk ); - DYNARR_RESET(trkSeg_t,tempSegs_da); if ( infoSubst ) { InfoSubstituteControls( NULL, NULL ); infoSubst = FALSE; } break; - case C_CANCEL: case C_CONFIRM: - case C_TERMINATE: + case C_OK: + rc = DrawGeomModify( action, pos, &drawModCmdContext ); + ComputeDrawBoundingBox( trk ); + if ( infoSubst ) { + InfoSubstituteControls( NULL, NULL ); + infoSubst = FALSE; + } + break; + case C_CANCEL: rc = DrawGeomModify( action, pos, &drawModCmdContext ); drawModCmdContext.state = MOD_NONE; - DYNARR_RESET(trkSeg_t,tempSegs_da); if ( infoSubst ) { InfoSubstituteControls( NULL, NULL ); infoSubst = FALSE; @@ -1694,7 +1769,7 @@ static STATUS_T ModifyDraw( track_p trk, wAction_t action, coOrd pos ) static void UngroupDraw( track_p trk ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); int inx; if ( xx->segCnt <= 1 ) return; @@ -1715,7 +1790,7 @@ static ANGLE_T GetAngleDraw( EPINX_T * ep0, EPINX_T * ep1 ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); ANGLE_T angle; pos.x -= xx->orig.x; @@ -1732,20 +1807,23 @@ static ANGLE_T GetAngleDraw( static BOOL_T EnumerateDraw( track_p trk ) { - struct extraData * xx; + struct extraDataDraw_t * xx; int inx; trkSeg_p segPtr; if ( trk ) { - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if ( xx->segCnt < 1 ) - return TRUE; + return FALSE; + BOOL_T content = FALSE; for ( inx=0; inxsegCnt; inx++ ) { segPtr = &xx->segs[inx]; if ( segPtr->type == SEG_BENCH ) { CountBench( segPtr->u.l.option, FindDistance( segPtr->u.l.pos[0], segPtr->u.l.pos[1] ) ); + content = TRUE; } } + return content; } else { TotalBench(); } @@ -1758,10 +1836,47 @@ static void FlipDraw( coOrd orig, ANGLE_T angle ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); + + trkSeg_p segPtr = &xx->segs[0]; + BOOL_T reorigin = FALSE; + if (xx->orig.x == 0.0 && xx->orig.y == 0.0) { + reorigin = TRUE; + } FlipPoint( &xx->orig, orig, angle ); xx->angle = NormalizeAngle( 2*angle - xx->angle + 180.0 ); FlipSegs( xx->segCnt, xx->segs, zero, angle ); + + + if (reorigin) { + switch(segPtr->type) { + case SEG_POLY: + case SEG_FILPOLY: + for (int i=0;iu.p.cnt;i++) { + REORIGIN( segPtr->u.p.pts[i].pt, segPtr->u.p.pts[i].pt, xx->angle, xx->orig); + } + break; + case SEG_STRLIN: + case SEG_DIMLIN: + case SEG_BENCH: + case SEG_TBLEDGE: + for (int i=0;i<2;i++) { + REORIGIN( segPtr->u.l.pos[i], segPtr->u.l.pos[i], xx->angle, xx->orig); + } + break; + case SEG_CRVLIN: + case SEG_FILCRCL: + REORIGIN( segPtr->u.c.center, segPtr->u.c.center, xx->angle, xx->orig); + segPtr->u.c.a0 = NormalizeAngle(segPtr->u.c.a0 + xx->angle); + break; + case SEG_TEXT: + REORIGIN( segPtr->u.t.pos, segPtr->u.t.pos, xx->angle, xx->orig ); + break; + default:; + } + xx->orig.x = 0.0, xx->orig.y = 0.0, xx->angle = 0.0; + } + ComputeDrawBoundingBox( trk ); } @@ -1770,7 +1885,7 @@ static BOOL_T StoreDraw( void **data, long * len) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if (xx->segs[0].type == SEG_POLY || xx->segs[0].type == SEG_FILPOLY) { *data = xx->segs[0].u.p.pts; @@ -1785,7 +1900,7 @@ static BOOL_T ReplayDraw( void * data, long len) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if (xx->segs[0].type == SEG_POLY || xx->segs[0].type == SEG_FILPOLY) { xx->segs[0].u.p.pts = MyMalloc(len); @@ -1797,7 +1912,7 @@ static BOOL_T ReplayDraw( static BOOL_T QueryDraw( track_p trk, int query ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); switch(query) { case Q_IS_DRAW: return TRUE; @@ -1813,9 +1928,16 @@ static BOOL_T QueryDraw( track_p trk, int query ) case Q_GET_NODES: return TRUE; case Q_CAN_PARALLEL: - if ((xx->segs[0].type == SEG_STRLIN) || (xx->segs[0].type == SEG_CRVLIN || - ((xx->segs[0].type == SEG_POLY) && (xx->segs[0].u.p.polyType == POLYLINE)) - )) return TRUE; + case Q_MODIFY_CAN_SPLIT: + if ((xx->segs[0].type == SEG_STRLIN) || + (xx->segs[0].type == SEG_CRVLIN) || + (xx->segs[0].type == SEG_BEZLIN) || + (xx->segs[0].type == SEG_FILCRCL) || + (xx->segs[0].type == SEG_FILPOLY) || + (xx->segs[0].type == SEG_POLY) || + (xx->segs[0].type == SEG_BENCH) || + (xx->segs[0].type == SEG_TBLEDGE) + ) return TRUE; else return FALSE; default: return FALSE; @@ -1824,8 +1946,8 @@ static BOOL_T QueryDraw( track_p trk, int query ) static wBool_t CompareDraw( track_cp trk1, track_cp trk2 ) { - struct extraData *xx1 = GetTrkExtraData( trk1 ); - struct extraData *xx2 = GetTrkExtraData( trk2 ); + struct extraDataDraw_t *xx1 = GET_EXTRA_DATA( trk1, T_DRAW, extraDataDraw_t ); + struct extraDataDraw_t *xx2 = GET_EXTRA_DATA( trk2, T_DRAW, extraDataDraw_t ); char * cp = message + strlen(message); REGRESS_CHECK_POS( "Orig", xx1, xx2, orig ) REGRESS_CHECK_ANGLE( "Angle", xx1, xx2, angle ) @@ -1835,7 +1957,7 @@ static wBool_t CompareDraw( track_cp trk1, track_cp trk2 ) static BOOL_T GetParamsDraw( int inx, track_p trk, coOrd pos, trackParams_t * params ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if (inx != PARAMS_NODES ) return FALSE; DYNARR_RESET(coOrd,params->nodes); BOOL_T back = FALSE; @@ -1845,6 +1967,7 @@ static BOOL_T GetParamsDraw( int inx, track_p trk, coOrd pos, trackParams_t * pa if (xx->segs[0].u.p.polyType != POLYLINE) return FALSE; REORIGIN(start,xx->segs[0].u.p.pts[0].pt,xx->angle,xx->orig); REORIGIN(end,xx->segs[0].u.p.pts[xx->segs[0].u.p.cnt-1].pt,xx->angle,xx->orig); + params->ep = 1; if (FindDistance(pos,start)>FindDistance(pos,end)) back = TRUE; for (int i=0;isegs[0].u.p.cnt;i++) { DYNARR_APPEND(coOrd,params->nodes,xx->segs[0].u.p.cnt); @@ -1861,7 +1984,10 @@ static BOOL_T GetParamsDraw( int inx, track_p trk, coOrd pos, trackParams_t * pa case SEG_STRLIN:; REORIGIN(start,xx->segs[0].u.l.pos[0],xx->angle,xx->orig); REORIGIN(end,xx->segs[0].u.l.pos[1],xx->angle,xx->orig); - if (FindDistance(pos,start)>FindDistance(pos,end)) back = TRUE; + params->ep = 1; + if (FindDistance(pos,start)>FindDistance(pos,end)) { + back = TRUE; + } for (int i=0;i<2;i++) { DYNARR_APPEND(coOrd,params->nodes,2); REORIGIN(DYNARR_LAST(coOrd,params->nodes),xx->segs[0].u.l.pos[back?1-i:i],xx->angle,xx->orig); @@ -1896,6 +2022,7 @@ static BOOL_T GetParamsDraw( int inx, track_p trk, coOrd pos, trackParams_t * pa } params->lineOrig = DYNARR_N(coOrd,params->nodes,0); params->lineEnd = DYNARR_LAST(coOrd,params->nodes); + params->ep = 1; return TRUE; case SEG_BEZLIN: @@ -1962,6 +2089,309 @@ static BOOL_T GetParamsDraw( int inx, track_p trk, coOrd pos, trackParams_t * pa } +static BOOL_T SplitDraw( track_p trk, coOrd pos, EPINX_T ep, track_p *leftover, EPINX_T * ep0, EPINX_T * ep1 ) +{ + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); + + coOrd p0,p1; + DIST_T d; + BOOL_T polyline_trim = FALSE, new_last = ep; + + + DYNARR_SET(trkSeg_t, tempSegs_da, 1); + + tempSegs(0).type = -1; + + switch (xx->segs[0].type) { + case SEG_STRLIN: + case SEG_BENCH: + case SEG_TBLEDGE: + REORIGIN(p0,xx->segs[0].u.l.pos[0],xx->angle,xx->orig); + REORIGIN(p1,xx->segs[0].u.l.pos[1],xx->angle,xx->orig); + tempSegs(0).color = xx->segs[0].color; + tempSegs(0).width = xx->segs[0].width; + tempSegs_da.cnt = 1; + tempSegs(0).type = xx->segs[0].type; + tempSegs(0).u.l.pos[0] = 1-ep?p0:pos; + tempSegs(0).u.l.pos[1] = 1-ep?pos:p1; + xx->segs[0].u.l.pos[0] = 1-ep?pos:p0; + xx->segs[0].u.l.pos[1] = 1-ep?p1:pos; + break; + case SEG_CRVLIN: + case SEG_FILCRCL: ; + coOrd c; + REORIGIN(c, xx->segs[0].u.c.center, xx->angle, xx->orig); + coOrd c0,c1; + if (xx->segs[0].type == SEG_FILCRCL || + (xx->segs[0].type == SEG_CRVLIN && xx->segs[0].u.c.a1 >= 360.0)) { + Translate(&c0,c,FindAngle(c,pos),xx->segs[0].u.c.radius); + c1 = c0; + xx->segs[0].type = SEG_CRVLIN; + xx->segs[0].u.c.a0 = FindAngle(c,c0); + xx->segs[0].u.c.a1 = 355.0; + } else { + Translate(&c0,c,xx->segs[0].u.c.a0+xx->angle,xx->segs[0].u.c.radius); + Translate(&c1,c,xx->segs[0].u.c.a1+xx->segs[0].u.c.a0+xx->angle,xx->segs[0].u.c.radius); + tempSegs(0).color = xx->segs[0].color; + tempSegs(0).width = xx->segs[0].width; + tempSegs_da.cnt = 1; + tempSegs(0).type = SEG_CRVLIN; + tempSegs(0).u.c.center = c; + tempSegs(0).u.c.radius = xx->segs[0].u.c.radius; + if (ep) { + tempSegs(0).u.c.a0 = FindAngle(c,c0); + tempSegs(0).u.c.a1 = NormalizeAngle(FindAngle(c,pos)-tempSegs(0).u.c.a0); + } else { + tempSegs(0).u.c.a0 = FindAngle(c,pos); + tempSegs(0).u.c.a1 = NormalizeAngle(FindAngle(c,c1)-tempSegs(0).u.c.a0); + } + xx->segs[0].u.c.center = c; + if (ep) { + xx->segs[0].u.c.a0 = FindAngle(c,pos); + xx->segs[0].u.c.a1 = NormalizeAngle(FindAngle(c,c1)-xx->segs[0].u.c.a0); + } else { + xx->segs[0].u.c.a0 = FindAngle(c,c0); + xx->segs[0].u.c.a1 = NormalizeAngle(FindAngle(c,pos)-xx->segs[0].u.c.a0); + } + } + break; + case SEG_POLY: + case SEG_FILPOLY: + d = DIST_INF; + DIST_T dd; + BOOL_T onPoint = FALSE; + BOOL_T closeSeg = FALSE; + coOrd end; + int polyInx = -1; + for ( int inx=0; inxsegs[0].u.p.cnt-1; inx++ ) { + p0 = pos; + coOrd pl0,pl1; + REORIGIN(pl0,xx->segs[0].u.p.pts[inx].pt,xx->angle,xx->orig); + REORIGIN(pl1,xx->segs[0].u.p.pts[inx+1].pt,xx->angle,xx->orig); + dd = LineDistance( &p0, pl0, pl1 ); + if ( d > dd ) { + d = dd; + if (IsClose(FindDistance(pos,pl1))) { + polyInx = inx; + REORIGIN(pos,xx->segs[0].u.p.pts[inx].pt,xx->angle,xx->orig); + onPoint = TRUE; + break; + } else if (IsClose(FindDistance(pos,pl1))) { + polyInx = inx+1; + REORIGIN(pos,xx->segs[0].u.p.pts[inx+1].pt,xx->angle,xx->orig); + onPoint=TRUE; + break; + } else { + if (!IsClose(d)) continue; + polyInx = inx; + pos = p0; + break; + } + } + } + //If Closed, look at closing line + if ( !onPoint && (xx->segs[0].u.p.polyType != POLYLINE)) { + coOrd pl0,pl1; + p0 = pos; + REORIGIN(pl0,xx->segs[0].u.p.pts[xx->segs[0].u.p.cnt-1].pt,xx->angle,xx->orig); + REORIGIN(pl1,xx->segs[0].u.p.pts[0].pt,xx->angle,xx->orig); + dd = LineDistance( &p0, pl0, pl1 ); + if (d > dd) { + d = dd; + if (IsClose(d)) { + polyInx = xx->segs[0].u.p.cnt-1; + closeSeg=TRUE; + pos = p0; + } + } + } + //If Closed, split into a PolyLine + if (xx->segs[0].u.p.polyType != POLYLINE) { + if (!IsClose(d)) { + *leftover = NULL; + return FALSE; + } + end = pos; + REORIGIN(end,end,xx->angle,xx->orig); + + trkSeg_t temp; //Buffer for expanded array + temp.u.p.cnt = xx->segs[0].u.p.cnt + 2 - onPoint; + temp.u.p.pts = MyMalloc(temp.u.p.cnt*sizeof(pts_t)); + int j = 0; + temp.u.p.pts[j].pt = end; + temp.u.p.pts[j].pt_type = wPolyLineStraight; + j++; + /* After split */ + for (int i=polyInx+1;i<=xx->segs[0].u.p.cnt-1;i++,j++) { + temp.u.p.pts[j] = xx->segs[0].u.p.pts[i]; + REORIGIN(temp.u.p.pts[j].pt,temp.u.p.pts[j].pt,xx->angle,xx->orig); + } + /* Before split */ + for (int i=0;i<=polyInx;i++,j++) { + temp.u.p.pts[j] = xx->segs[0].u.p.pts[i]; + REORIGIN(temp.u.p.pts[j].pt,temp.u.p.pts[j].pt,xx->angle,xx->orig); + } + if (!onPoint) { + temp.u.p.pts[temp.u.p.cnt-1].pt = end; + } + temp.u.p.pts[temp.u.p.cnt-1].pt_type = wPolyLineStraight; + + //Swap Pts Array into existing track + MyFree(xx->segs[0].u.p.pts); + xx->segs[0].u.p.pts = temp.u.p.pts; + xx->segs[0].u.p.cnt = temp.u.p.cnt; + xx->segs[0].u.p.polyType = POLYLINE; + break; + } + //Check if on an end-point -> reject + if ((polyInx <= 0 || polyInx >= xx->segs[0].u.p.cnt-1) && onPoint ) { + *leftover = NULL; + return FALSE; + } + if (polyInx == 0 || (polyInx == 1 && onPoint )) { + //Between First End and Next -> Trim end + end = xx->segs[0].u.p.pts[0].pt; + REORIGIN(end,end,xx->angle,xx->orig); + if (onPoint) { + for (int i=0;i< xx->segs[0].u.p.cnt-1;i++) { + xx->segs[0].u.p.pts[i] = xx->segs[0].u.p.pts[i+1]; + REORIGIN(xx->segs[0].u.p.pts[i].pt,xx->segs[0].u.p.pts[i].pt,xx->angle,xx->orig); + } + --xx->segs[0].u.p.cnt; + } else { + xx->segs[0].u.p.pts[0].pt = pos; + for (int i=1;i< xx->segs[0].u.p.cnt;i++) { + REORIGIN(xx->segs[0].u.p.pts[i].pt,xx->segs[0].u.p.pts[i].pt,xx->angle,xx->orig); + } + } + tempSegs(0).color = xx->segs[0].color; + tempSegs(0).width = xx->segs[0].width; + tempSegs_da.cnt = 1; + tempSegs(0).type = SEG_STRLIN; + tempSegs(0).u.l.pos[0] = pos; + tempSegs(0).u.l.pos[1] = end; + polyline_trim = TRUE; + new_last = FALSE; + } else if (polyInx == xx->segs[0].u.p.cnt-2) { + //Between second last and last -> Trim the other end + end = xx->segs[0].u.p.pts[xx->segs[0].u.p.cnt-1].pt; + REORIGIN(end,end,xx->angle,xx->orig); + if (onPoint) { + --xx->segs[0].u.p.cnt; + for (int i=0;isegs[0].u.p.cnt;i++) { + REORIGIN(xx->segs[0].u.p.pts[i].pt,xx->segs[0].u.p.pts[i].pt,xx->angle,xx->orig); + } + } else { + xx->segs[0].u.p.pts[xx->segs[0].u.p.cnt-1].pt = pos; + for (int i=0;isegs[0].u.p.cnt;i++) { + REORIGIN(xx->segs[0].u.p.pts[i].pt,xx->segs[0].u.p.pts[i].pt,xx->angle,xx->orig); + } + } + tempSegs(0).color = xx->segs[0].color; + tempSegs(0).width = xx->segs[0].width; + tempSegs_da.cnt = 1; + tempSegs(0).type = SEG_STRLIN; + tempSegs(0).u.l.pos[0] = end; + tempSegs(0).u.l.pos[1] = pos; + polyline_trim = TRUE; + new_last = TRUE; + } else { + //Check that new line will have >=3 spots if not -> reject + if (xx->segs[0].u.p.cnt >3) { + tempSegs(0).color = xx->segs[0].color; + tempSegs(0).width = xx->segs[0].width; + tempSegs_da.cnt = 1; + tempSegs(0).type = SEG_POLY; + tempSegs(0).u.p.polyType = POLYLINE; + if (1-ep) + tempSegs(0).u.p.cnt = xx->segs[0].u.p.cnt - polyInx; + else + tempSegs(0).u.p.cnt = polyInx + 2 - onPoint; + tempSegs(0).u.p.pts = MyMalloc(tempSegs(0).u.p.cnt*sizeof(pts_t)); + int j = 0; + if (1-ep) { + tempSegs(0).u.p.pts[0].pt=pos; + tempSegs(0).u.p.pts[0].pt_type = wPolyLineStraight; + j = 1; + for (int i=polyInx+1;isegs[0].u.p.cnt;i++,j++) { + tempSegs(0).u.p.pts[j] = xx->segs[0].u.p.pts[i]; + REORIGIN(tempSegs(0).u.p.pts[j].pt,tempSegs(0).u.p.pts[j].pt,xx->angle,xx->orig); + } + } else { + for (int i=0;i<=polyInx+1;i++,j++) { + tempSegs(0).u.p.pts[j] = xx->segs[0].u.p.pts[i]; + REORIGIN(tempSegs(0).u.p.pts[j].pt,tempSegs(0).u.p.pts[j].pt,xx->angle,xx->orig); + } + if (!onPoint) { + tempSegs(0).u.p.pts[tempSegs(0).u.p.cnt-1].pt = pos; + tempSegs(0).u.p.pts[tempSegs(0).u.p.cnt-1].pt_type = wPolyLineStraight; + } + } + } else { + *leftover = NULL; + return FALSE; + } + polyline_trim = TRUE; + new_last = 1-ep; + int new_cnt, old_cnt = xx->segs[0].u.p.cnt; + if (1-ep) + new_cnt = polyInx + 2 - onPoint; + else + new_cnt = xx->segs[0].u.p.cnt-polyInx; + pts_t * newpts = MyMalloc(new_cnt*sizeof(pts_t)); + int j = 0; + if (1-ep) { + for (int i = 0; isegs[0].u.p.pts[i]; + REORIGIN(newpts[j].pt,newpts[i].pt,xx->angle,xx->orig); + } + if (!onPoint) { + newpts[new_cnt-1].pt = pos; + newpts[new_cnt-1].pt_type = wPolyLineStraight; + } + } else { + newpts[0].pt = pos; + newpts[0].pt_type = wPolyLineStraight; + j = 1; + for (int i=polyInx+1;isegs[0].u.p.pts[i]; + REORIGIN(newpts[j].pt,newpts[j].pt,xx->angle,xx->orig); + } + } + MyFree(xx->segs[0].u.p.pts); + xx->segs[0].u.p.cnt = new_cnt; + xx->segs[0].u.p.pts = newpts; + } + break; + default: + return FALSE; + } + *leftover = NULL; + if (tempSegs(0).type != -1) { + *leftover = MakeDrawFromSeg( zero, 0.0, &tempSegs(0) ); + struct extraDataDraw_t * yy = GET_EXTRA_DATA(*leftover, T_DRAW, extraDataDraw_t); + yy->lineType = xx->lineType; + if (tempSegs(0).type == SEG_POLY && tempSegs(0).u.p.pts) { + MyFree(tempSegs(0).u.p.pts); + tempSegs(0).u.p.cnt = 0; + tempSegs(0).u.p.pts = NULL; + } + } + + if (*leftover) { + //Polyline sets new_last to the end of the extra + if (polyline_trim && (ep != new_last)) { + *leftover = trk; + } + } + xx->orig = zero; + xx->angle = 0.0; + ComputeDrawBoundingBox(trk); + *ep0 = 1-ep; + *ep1 = ep; + return TRUE; +} + static BOOL_T MakeParallelDraw( track_p trk, coOrd pos, @@ -1973,21 +2403,25 @@ static BOOL_T MakeParallelDraw( BOOL_T track) { if (track) return FALSE; - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); ANGLE_T angle; DIST_T rad; - coOrd p0,p1; + + DYNARR_SET(trkSeg_t, tempSegs_da, 1); switch (xx->segs[0].type) { case SEG_STRLIN: - angle = FindAngle(xx->segs[0].u.l.pos[0],xx->segs[0].u.l.pos[1]); + angle = NormalizeAngle(FindAngle(xx->segs[0].u.l.pos[0],xx->segs[0].u.l.pos[1])+xx->angle); if ( NormalizeAngle( FindAngle( xx->segs[0].u.l.pos[0], pos ) - angle ) < 180.0 ) angle += 90; else angle -= 90; - Translate(&p0,xx->segs[0].u.l.pos[0], angle, sep); - Translate(&p1,xx->segs[0].u.l.pos[1], angle, sep); + coOrd p0,p1; + REORIGIN(p0,xx->segs[0].u.l.pos[0],xx->angle,xx->orig); + REORIGIN(p1,xx->segs[0].u.l.pos[1],xx->angle,xx->orig); + Translate(&p0,p0, angle, sep); + Translate(&p1,p1, angle, sep); tempSegs(0).color = xx->segs[0].color; tempSegs(0).width = xx->segs[0].width; tempSegs_da.cnt = 1; @@ -1996,7 +2430,7 @@ static BOOL_T MakeParallelDraw( tempSegs(0).u.l.pos[1] = p1; if (newTrkR) { *newTrkR = MakeDrawFromSeg( zero, 0.0, &tempSegs(0) ); - struct extraData * yy = GetTrkExtraData(*newTrkR); + struct extraDataDraw_t * yy = GET_EXTRA_DATA(*newTrkR, T_DRAW, extraDataDraw_t); yy->lineType = xx->lineType; } @@ -2005,7 +2439,10 @@ static BOOL_T MakeParallelDraw( return TRUE; break; case SEG_CRVLIN: - rad = FindDistance( pos, xx->segs[0].u.c.center ); + case SEG_FILCRCL:; + coOrd c; + REORIGIN(c, xx->segs[0].u.c.center, xx->angle, xx->orig); + rad = FindDistance( pos, c ); if ( rad > xx->segs[0].u.c.radius ) rad = xx->segs[0].u.c.radius + sep; else @@ -2014,13 +2451,13 @@ static BOOL_T MakeParallelDraw( tempSegs(0).width = xx->segs[0].width; tempSegs_da.cnt = 1; tempSegs(0).type = SEG_CRVLIN; - tempSegs(0).u.c.center = xx->segs[0].u.c.center; + tempSegs(0).u.c.center = c; tempSegs(0).u.c.radius = rad; - tempSegs(0).u.c.a0 = xx->segs[0].u.c.a0; + tempSegs(0).u.c.a0 = xx->segs[0].u.c.a0 + xx->angle; tempSegs(0).u.c.a1 = xx->segs[0].u.c.a1; if (newTrkR) { *newTrkR = MakeDrawFromSeg( zero, 0.0, &tempSegs(0) ); - struct extraData * yy = GetTrkExtraData(*newTrkR); + struct extraDataDraw_t * yy = GET_EXTRA_DATA(*newTrkR, T_DRAW, extraDataDraw_t); yy->lineType = xx->lineType; } if ( p0R ) PointOnCircle( p0R, xx->segs[0].u.c.center, rad, xx->segs[0].u.c.a0 ); @@ -2028,30 +2465,63 @@ static BOOL_T MakeParallelDraw( return TRUE; break; case SEG_POLY: - if (xx->segs[0].u.p.polyType != POLYLINE) return FALSE; - int inx2; + case SEG_FILPOLY: + pos.x -= xx->orig.x; + pos.y -= xx->orig.y; + Rotate( &pos, zero, -xx->angle ); coOrd p = pos; - angle = GetAngleSegs(1,&xx->segs[0],&p,NULL,NULL,NULL,&inx2,NULL); + int inx2; + angle = NormalizeAngle(GetAngleSegs(1,&xx->segs[0],&p,NULL,NULL,NULL,&inx2,NULL)+xx->angle); if ( NormalizeAngle( FindAngle( p, pos ) - angle ) < 180.0 ) { - sep = sep*1.0; - angle += 90; + angle = +90.0; } else { - angle -= 90; - sep = sep*1.0; + angle = -90.0; } tempSegs(0).color = xx->segs[0].color; tempSegs(0).width = xx->segs[0].width; tempSegs_da.cnt = 1; tempSegs(0).type = SEG_POLY; - tempSegs(0).u.p.polyType = POLYLINE; + tempSegs(0).u.p.polyType = xx->segs[0].type==SEG_POLY?xx->segs[0].u.p.polyType:POLYLINE; tempSegs(0).u.p.pts = memdup( xx->segs[0].u.p.pts, xx->segs[0].u.p.cnt*sizeof (pts_t) ); tempSegs(0).u.p.cnt = xx->segs[0].u.p.cnt; + ANGLE_T a,b; for (int i=0;isegs[0].u.p.cnt;i++) { - Translate(&tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i].pt,angle,sep); + REORIGIN(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i].pt,xx->angle, xx->orig); + } + for (int i=0;isegs[0].u.p.cnt;i++) { + if (xx->segs[0].u.p.polyType == POLYLINE) { + if (i==0) { + a = FindAngle(tempSegs(0).u.p.pts[0].pt,tempSegs(0).u.p.pts[1].pt); + b = 0; + } else if (i==xx->segs[0].u.p.cnt-1) { + a = NormalizeAngle(FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i-1].pt)+180.0); + b = 0; + } else { + a = FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i+1].pt); + b = DifferenceBetweenAngles(a,FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i-1].pt)+180.0)/2; + a = a + b; + } + } else { + if (i==0) { + a = FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i+1].pt); + b = DifferenceBetweenAngles(a,FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[xx->segs[0].u.p.cnt-1].pt)+180.0)/2; + a = a+b; + } else if (i==xx->segs[0].u.p.cnt-1) { + a = FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[0].pt); + b = DifferenceBetweenAngles(a,FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i-1].pt)+180.0)/2; + a = a+b; + } else { + a = FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i+1].pt); + b = DifferenceBetweenAngles(a,FindAngle(tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i-1].pt)+180.0)/2; + a = a+b; + } + } + + Translate(&tempSegs(0).u.p.pts[i].pt,tempSegs(0).u.p.pts[i].pt,a+angle,fabs(sep/cos(D2R(b)))); } if (newTrkR) { *newTrkR = MakeDrawFromSeg( zero, 0.0, &tempSegs(0) ); - struct extraData * yy = GetTrkExtraData(*newTrkR); + struct extraDataDraw_t * yy = GET_EXTRA_DATA(*newTrkR, T_DRAW, extraDataDraw_t); yy->lineType = xx->lineType; if (tempSegs(0).u.p.pts) MyFree(tempSegs(0).u.p.pts); } @@ -2078,7 +2548,7 @@ static trackCmd_t drawCmds = { RescaleDraw, NULL, GetAngleDraw, /* getAngle */ - NULL, /* split */ + SplitDraw, /* split */ NULL, /* traverse */ EnumerateDraw, NULL, /* redraw */ @@ -2106,14 +2576,14 @@ static trackCmd_t drawCmds = { EXPORT BOOL_T OnTableEdgeEndPt( track_p trk, coOrd * pos ) { track_p trk1; - struct extraData *xx; + struct extraDataDraw_t *xx; coOrd pos1 = *pos; ignoredTableEdge = trk; if ((trk1 = OnTrack( &pos1, FALSE, FALSE )) != NULL && GetTrkType(trk1) == T_DRAW) { ignoredTableEdge = NULL; - xx = GetTrkExtraData(trk1); + xx = GET_EXTRA_DATA(trk1, T_DRAW, extraDataDraw_t); if (xx->segCnt < 1) return FALSE; if (xx->segs[0].type == SEG_TBLEDGE) { @@ -2132,11 +2602,11 @@ EXPORT BOOL_T OnTableEdgeEndPt( track_p trk, coOrd * pos ) EXPORT BOOL_T GetClosestEndPt( track_p trk, coOrd * pos) { - struct extraData *xx; + struct extraDataDraw_t *xx; if (GetTrkType(trk) == T_DRAW) { ignoredTableEdge = NULL; - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if (xx->segCnt < 1) return FALSE; DIST_T dd0,dd1; @@ -2176,7 +2646,7 @@ EXPORT BOOL_T GetClosestEndPt( track_p trk, coOrd * pos) Rotate(&p1,xx->orig,xx->angle); } else if (GetTrkType(trk) == T_BZRLIN) { coOrd p0,p1; - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); p0 = xx->segs[0].u.b.pos[0]; p1 = xx->segs[0].u.b.pos[3]; dd0 = FindDistance(p00,p0); @@ -2212,38 +2682,38 @@ static wDrawColor benchColor; static paramData_t drawPLs[] = { #define drawLineWidthPD (drawPLs[0]) - { PD_LONG, &drawCmdContext.line_Width, "linewidth", PDO_NORECORD, &i0_100, N_("Line Width") }, + { PD_LONG, &drawCmdContext.line_Width, "linewidth", PDO_NORECORD, &i100_100, N_("Line Width") }, #define drawColorPD (drawPLs[1]) { PD_COLORLIST, &lineColor, "linecolor", PDO_NORECORD, NULL, N_("Color") }, #define drawBenchColorPD (drawPLs[2]) { PD_COLORLIST, &benchColor, "benchcolor", PDO_NORECORD, NULL, N_("Color") }, #define drawBenchChoicePD (drawPLs[3]) #ifdef WINDOWS - { PD_DROPLIST, &benchChoice, "benchlist", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, (void*)120, N_("Lumber Type") }, + { PD_DROPLIST, &benchChoice, "benchlist", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, I2VP(120), N_("Lumber Type") }, #else - { PD_DROPLIST, &benchChoice, "benchlist", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, (void*)145, N_("Lumber Type") }, + { PD_DROPLIST, &benchChoice, "benchlist", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, I2VP(145), N_("Lumber Type") }, #endif #define drawBenchOrientPD (drawPLs[4]) #ifdef WINDOWS - { PD_DROPLIST, &benchOrient, "benchorient", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, (void*)45, "", 0 }, + { PD_DROPLIST, &benchOrient, "benchorient", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, I2VP(45), "", 0 }, #else - { PD_DROPLIST, &benchOrient, "benchorient", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, (void*)105, "", 0 }, + { PD_DROPLIST, &benchOrient, "benchorient", PDO_NOPREF|PDO_NORECORD|PDO_LISTINDEX, I2VP(105), "", 0 }, #endif #define drawDimArrowSizePD (drawPLs[5]) - { PD_DROPLIST, &dimArrowSize, "arrowsize", PDO_NORECORD|PDO_LISTINDEX, (void*)80, N_("Size") }, + { PD_DROPLIST, &dimArrowSize, "arrowsize", PDO_NORECORD|PDO_LISTINDEX, I2VP(80), N_("Size") }, #define drawLengthPD (drawPLs[6]) - { PD_FLOAT, &drawCmdContext.length, "Length", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Length") }, + { PD_FLOAT, &drawCmdContext.length, "length", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Length") }, #define drawWidthPD (drawPLs[7]) - { PD_FLOAT, &drawCmdContext.width, "BoxWidth", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Width") }, + { PD_FLOAT, &drawCmdContext.width, "width", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Width") }, #define drawAnglePD (drawPLs[8]) #define drawAngleInx 8 - { PD_FLOAT, &drawCmdContext.angle, "Angle", PDO_NORECORD|BO_ENTER, &r360_360, N_("Angle") }, + { PD_FLOAT, &drawCmdContext.angle, "angle", PDO_NORECORD|BO_ENTER, &r360_360, N_("Angle") }, #define drawRadiusPD (drawPLs[9]) - { PD_FLOAT, &drawCmdContext.radius, "Radius", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Radius") }, + { PD_FLOAT, &drawCmdContext.radius, "radius", PDO_DIM|PDO_NORECORD|BO_ENTER, &r0_10000, N_("Radius") }, #define drawLineTypePD (drawPLs[10]) - { PD_DROPLIST, &drawCmdContext.lineType, "Type", PDO_DIM|PDO_NORECORD|BO_ENTER, (void*)0, N_("Line Type") }, + { PD_DROPLIST, &drawCmdContext.lineType, "type", PDO_DIM|PDO_NORECORD|BO_ENTER, I2VP(0), N_("Line Type") }, }; -static paramGroup_t drawPG = { "draw", 0, drawPLs, sizeof drawPLs/sizeof drawPLs[0] }; +static paramGroup_t drawPG = { "draw", 0, drawPLs, COUNT( drawPLs ) }; static char * objectName[] = { N_("Straight"), @@ -2289,12 +2759,13 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) drawBenchChoicePD.option |= PDO_NORECORD; drawBenchOrientPD.option |= PDO_NORECORD; drawDimArrowSizePD.option |= PDO_NORECORD; - drawCmdContext.Op = (wIndex_t)(long)commandContext; + drawCmdContext.Op = (wIndex_t)VP2L(commandContext); if ( drawCmdContext.Op < 0 || drawCmdContext.Op > OP_LAST ) { NoticeMessage( "cmdDraw: Op %d", _("Ok"), NULL, drawCmdContext.Op ); drawCmdContext.Op = OP_LINE; } - /*DrawGeomOp( (void*)(drawCmdContext.Op>=0?drawCmdContext.Op:OP_LINE) );*/ + SetAllTrackSelect( FALSE ); + /*DrawGeomOp( (drawCmdContext.Op>=0?drawCmdContext.Op:OP_LINE) );*/ infoSubst = TRUE; switch( drawCmdContext.Op ) { case OP_LINE: @@ -2352,7 +2823,7 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) BenchLoadLists( (wList_p)drawBenchChoicePD.control, (wList_p)drawBenchOrientPD.control ); ParamLoadControls( &drawPG ); - BenchUpdateOrientationList( (long)wListGetItemContext( (wList_p)drawBenchChoicePD.control, benchChoice ), (wList_p)drawBenchOrientPD.control ); + BenchUpdateOrientationList( VP2L(wListGetItemContext( (wList_p)drawBenchChoicePD.control, benchChoice )), (wList_p)drawBenchOrientPD.control ); wListSetIndex( (wList_p)drawBenchOrientPD.control, benchOrient ); InfoSubstituteControls( controls, labels ); drawBenchColorPD.option &= ~PDO_NORECORD; @@ -2393,7 +2864,7 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) return CmdBezCurve(act2, pos); } if ( drawCmdContext.Op == OP_BENCH ) { - drawCmdContext.benchOption = GetBenchData( (long)wListGetItemContext((wList_p)drawBenchChoicePD.control, benchChoice ), benchOrient ); + drawCmdContext.benchOption = GetBenchData( VP2L(wListGetItemContext((wList_p)drawBenchChoicePD.control, benchChoice )), benchOrient ); drawCmdContext.Color = benchColor; } else if ( drawCmdContext.Op == OP_DIMLINE ) { @@ -2416,19 +2887,14 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) case wActionRDown: case wActionRDrag: if (drawCmdContext.Op == OP_BEZLIN) return CmdBezCurve(act2, pos); - if (!((MyGetKeyState() & WKEY_ALT) != magneticSnap)) { - SnapPos( &pos ); - } return DrawGeomMouse( action, pos, &drawCmdContext); case wActionLUp: case wActionRUp: if (drawCmdContext.Op == OP_BEZLIN) return CmdBezCurve(act2, pos); - //if (!((MyGetKeyState() & WKEY_SHIFT) != 0)) { - // SnapPos( &pos ); Remove Snap at end of action - it will have been imposed in Geom if needed - //} + drawCmdContext.show = TRUE; int rc = DrawGeomMouse( action, pos, &drawCmdContext); // Put up text entry boxes ready for updates if the result was continue - if (rc == C_CONTINUE) { + if (rc == C_CONTINUE && drawCmdContext.show) { switch( drawCmdContext.Op ) { case OP_CIRCLE1: case OP_CIRCLE2: @@ -2519,8 +2985,9 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) case C_OK: if (drawCmdContext.Op == OP_BEZLIN) return CmdBezCurve(act2, pos); return DrawGeomMouse( (0x0D<<8|wActionText), pos, &drawCmdContext); - - /*DrawOk( NULL );*/ + case C_CONFIRM: + if (drawCmdContext.Op == OP_BEZLIN) return CmdBezCurve(act2, pos); + return DrawGeomMouse( (0x0D<<8|wActionText), pos, &drawCmdContext); case C_FINISH: if (drawCmdContext.Op == OP_BEZLIN) return CmdBezCurve(act2, pos); @@ -2540,29 +3007,32 @@ static STATUS_T CmdDraw( wAction_t action, coOrd pos ) } } -#include "bitmaps/dline.xpm" -#include "bitmaps/ddimlin.xpm" -#include "bitmaps/dbench.xpm" -#include "bitmaps/dtbledge.xpm" -#include "bitmaps/dcurve1.xpm" -#include "bitmaps/dcurve2.xpm" -#include "bitmaps/dcurve3.xpm" -#include "bitmaps/dcurve4.xpm" +#include "bitmaps/straight-line.xpm" +#include "bitmaps/dimension.xpm" +#include "bitmaps/benchwork.xpm" +#include "bitmaps/table-edge.xpm" + +#include "bitmaps/curved-line-end.xpm" +#include "bitmaps/curved-line-tangent.xpm" +#include "bitmaps/curved-line-middle.xpm" +#include "bitmaps/curved-line-chord.xpm" + /*#include "bitmaps/dcircle1.xpm"*/ -#include "bitmaps/dcircle2.xpm" -#include "bitmaps/dcircle3.xpm" +#include "bitmaps/circle-line-center.xpm" +#include "bitmaps/circle-line-tangent.xpm" /*#include "bitmaps/dflcrcl1.xpm"*/ -#include "bitmaps/dflcrcl2.xpm" -#include "bitmaps/dflcrcl3.xpm" -#include "bitmaps/dbox.xpm" -#include "bitmaps/dfilbox.xpm" -#include "bitmaps/dpoly.xpm" -#include "bitmaps/dfilpoly.xpm" -#include "bitmaps/dbezier.xpm" -#include "bitmaps/dpolyline.xpm" +#include "bitmaps/circle-filled-center.xpm" +#include "bitmaps/circle-filled-tangent.xpm" + +#include "bitmaps/box.xpm" +#include "bitmaps/filled-box.xpm" +#include "bitmaps/polygon.xpm" +#include "bitmaps/filled-polygon.xpm" +#include "bitmaps/bezier-line.xpm" +#include "bitmaps/polyline.xpm" typedef struct { - char **xpm; + char ***xpm; int OP; char * shortName; char * cmdName; @@ -2571,29 +3041,29 @@ typedef struct { } drawData_t; static drawData_t dlineCmds[] = { - { dline_xpm, OP_LINE, N_("Line"), N_("Draw Line"), "cmdDrawLine", ACCL_DRAWLINE }, - { ddimlin_xpm, OP_DIMLINE, N_("Dimension Line"), N_("Draw Dimension Line"), "cmdDrawDimLine", ACCL_DRAWDIMLINE }, - { dbench_xpm, OP_BENCH, N_("Benchwork"), N_("Draw Benchwork"), "cmdDrawBench", ACCL_DRAWBENCH }, - { dtbledge_xpm, OP_TBLEDGE, N_("Table Edge"), N_("Draw Table Edge"), "cmdDrawTableEdge", ACCL_DRAWTBLEDGE } }; + { straight_line_xpm, OP_LINE, N_("Line"), N_("Draw Line"), "cmdDrawLine", ACCL_DRAWLINE }, + { dimension_xpm, OP_DIMLINE, N_("Dimension Line"), N_("Draw Dimension Line"), "cmdDrawDimLine", ACCL_DRAWDIMLINE }, + { benchwork_xpm, OP_BENCH, N_("Benchwork"), N_("Draw Benchwork"), "cmdDrawBench", ACCL_DRAWBENCH }, + { table_edge_xpm, OP_TBLEDGE, N_("Table Edge"), N_("Draw Table Edge"), "cmdDrawTableEdge", ACCL_DRAWTBLEDGE } }; static drawData_t dcurveCmds[] = { - { dcurve1_xpm, OP_CURVE1, N_("Curve End"), N_("Draw Curve from End"), "cmdDrawCurveEndPt", ACCL_DRAWCURVE1 }, - { dcurve2_xpm, OP_CURVE2, N_("Curve Tangent"), N_("Draw Curve from Tangent"), "cmdDrawCurveTangent", ACCL_DRAWCURVE2 }, - { dcurve3_xpm, OP_CURVE3, N_("Curve Center"), N_("Draw Curve from Center"), "cmdDrawCurveCenter", ACCL_DRAWCURVE3 }, - { dcurve4_xpm, OP_CURVE4, N_("Curve Chord"), N_("Draw Curve from Chord"), "cmdDrawCurveChord", ACCL_DRAWCURVE4 }, - { dbezier_xpm, OP_BEZLIN, N_("Bezier Curve"), N_("Draw Bezier"), "cmdDrawBezierCurve", ACCL_DRAWBEZLINE } }; + { curved_line_end_xpm, OP_CURVE1, N_("Curve End"), N_("Draw Curve from End"), "cmdDrawCurveEndPt", ACCL_DRAWCURVE1 }, + { curved_line_tangent_xpm, OP_CURVE2, N_("Curve Tangent"), N_("Draw Curve from Tangent"), "cmdDrawCurveTangent", ACCL_DRAWCURVE2 }, + { curved_line_middle_xpm, OP_CURVE3, N_("Curve Center"), N_("Draw Curve from Center"), "cmdDrawCurveCenter", ACCL_DRAWCURVE3 }, + { curved_line_chord_xpm, OP_CURVE4, N_("Curve Chord"), N_("Draw Curve from Chord"), "cmdDrawCurveChord", ACCL_DRAWCURVE4 }, + { bezier_line_xpm, OP_BEZLIN, N_("Bezier Curve"), N_("Draw Bezier"), "cmdDrawBezierCurve", ACCL_DRAWBEZLINE } }; static drawData_t dcircleCmds[] = { /*{ dcircle1_xpm, OP_CIRCLE1, "Circle Fixed Radius", "Draw Fixed Radius Circle", "cmdDrawCircleFixedRadius", ACCL_DRAWCIRCLE1 },*/ - { dcircle3_xpm, OP_CIRCLE3, N_("Circle Tangent"), N_("Draw Circle from Tangent"), "cmdDrawCircleTangent", ACCL_DRAWCIRCLE2 }, - { dcircle2_xpm, OP_CIRCLE2, N_("Circle Center"), N_("Draw Circle from Center"), "cmdDrawCircleCenter", ACCL_DRAWCIRCLE3 }, + { circle_line_center_xpm, OP_CIRCLE3, N_("Circle Center"), N_("Draw Circle from Center"), "cmdDrawCircleCenter", ACCL_DRAWCIRCLE2 }, + { circle_line_tangent_xpm, OP_CIRCLE2, N_("Circle Tangent"), N_("Draw Circle from Tangent"), "cmdDrawCircleTangent", ACCL_DRAWCIRCLE3 }, /*{ dflcrcl1_xpm, OP_FILLCIRCLE1, "Circle Filled Fixed Radius", "Draw Fixed Radius Filled Circle", "cmdDrawFilledCircleFixedRadius", ACCL_DRAWFILLCIRCLE1 },*/ - { dflcrcl3_xpm, OP_FILLCIRCLE3, N_("Circle Filled Tangent"), N_("Draw Filled Circle from Tangent"), "cmdDrawFilledCircleTangent", ACCL_DRAWFILLCIRCLE2 }, - { dflcrcl2_xpm, OP_FILLCIRCLE2, N_("Circle Filled Center"), N_("Draw Filled Circle from Center"), "cmdDrawFilledCircleCenter", ACCL_DRAWFILLCIRCLE3 } }; + { circle_filled_center_xpm, OP_FILLCIRCLE3, N_("Circle Filled Center"), N_("Draw Filled Circle from Center"), "cmdDrawFilledCircleCenter", ACCL_DRAWFILLCIRCLE2 }, + { circle_filled_tangent_xpm, OP_FILLCIRCLE2, N_("Circle Filled Tangent"), N_("Draw Filled Circle from Tangent"), "cmdDrawFilledCircleTangent", ACCL_DRAWFILLCIRCLE3 } }; static drawData_t dshapeCmds[] = { - { dbox_xpm, OP_BOX, N_("Box"), N_("Draw Box"), "cmdDrawBox", ACCL_DRAWBOX }, - { dfilbox_xpm, OP_FILLBOX, N_("Filled Box"), N_("Draw Filled Box"), "cmdDrawFilledBox", ACCL_DRAWFILLBOX }, - { dpoly_xpm, OP_POLY, N_("Polygon"), N_("Draw Polygon"), "cmdDrawPolygon", ACCL_DRAWPOLY }, - { dfilpoly_xpm, OP_FILLPOLY, N_("Filled Polygon"), N_("Draw Filled Polygon"), "cmdDrawFilledPolygon", ACCL_DRAWFILLPOLYGON }, - { dpolyline_xpm, OP_POLYLINE, N_("PolyLine"), N_("Draw PolyLine"), "cmdDrawPolyline", ACCL_DRAWPOLYLINE }, + { box_xpm, OP_BOX, N_("Box"), N_("Draw Box"), "cmdDrawBox", ACCL_DRAWBOX }, + { filled_box_xpm, OP_FILLBOX, N_("Filled Box"), N_("Draw Filled Box"), "cmdDrawFilledBox", ACCL_DRAWFILLBOX }, + { polygon_xpm, OP_POLY, N_("Polygon"), N_("Draw Polygon"), "cmdDrawPolygon", ACCL_DRAWPOLY }, + { filled_polygon_xpm, OP_FILLPOLY, N_("Filled Polygon"), N_("Draw Filled Polygon"), "cmdDrawFilledPolygon", ACCL_DRAWFILLPOLYGON }, + { polyline_xpm, OP_POLYLINE, N_("PolyLine"), N_("Draw PolyLine"), "cmdDrawPolyline", ACCL_DRAWPOLYLINE }, }; typedef struct { @@ -2692,7 +3162,7 @@ static void DrawDlgUpdate( } if ( inx >= 0 && pg->paramPtr[inx].valueP == &benchChoice ) - BenchUpdateOrientationList( (long)wListGetItemContext( (wList_p)drawBenchChoicePD.control, (wIndex_t)*(long*)valueP ), (wList_p)drawBenchOrientPD.control ); + BenchUpdateOrientationList( VP2L(wListGetItemContext( (wList_p)drawBenchChoicePD.control, (wIndex_t)*(long*)valueP )), (wList_p)drawBenchOrientPD.control ); } EXPORT void InitCmdDraw( wMenu_p menu ) @@ -2714,8 +3184,8 @@ EXPORT void InitCmdDraw( wMenu_p menu ) ButtonGroupBegin( _(dsp->menuTitle), dsp->helpKey, _(dsp->stickyLabel) ); for ( inx2=0; inx2cnt; inx2++ ) { ddp = &dsp->data[inx2]; - icon = wIconCreatePixMap( ddp->xpm ); - AddMenuButton( menu, CmdDraw, ddp->helpKey, _(ddp->cmdName), icon, LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ddp->acclKey, (void *)(intptr_t)ddp->OP ); + icon = wIconCreatePixMap( ddp->xpm[iconSize] ); + AddMenuButton( menu, CmdDraw, ddp->helpKey, _(ddp->cmdName), icon, LEVEL0_50, IC_STICKY|IC_POPUP2|IC_WANT_MOVE, ddp->acclKey, I2VP(ddp->OP) ); } ButtonGroupEnd(); } @@ -2772,13 +3242,13 @@ EXPORT track_p NewText( tempSeg.type = SEG_TEXT; tempSeg.color = color; tempSeg.width = 0; - tempSeg.u.t.pos = zero; + tempSeg.u.t.pos = pos; tempSeg.u.t.angle = angle; tempSeg.u.t.fontP = NULL; tempSeg.u.t.fontSize = textSize; tempSeg.u.t.string = MyStrdup( text ); tempSeg.u.t.boxed = boxed; - trk = MakeDrawFromSeg1( index, pos, angle, &tempSeg ); + trk = MakeDrawFromSeg1( index, zero, 0.0, &tempSeg ); return trk; } @@ -2809,7 +3279,9 @@ EXPORT BOOL_T ReadText( char * line ) return TRUE; } -void MenuMode(int mode) { +void MenuMode(void * modeVP ) +{ + int mode = (int)VP2L(modeVP); if ( infoSubst ) { InfoSubstituteControls( NULL, NULL ); infoSubst = FALSE; @@ -2823,7 +3295,9 @@ void MenuMode(int mode) { } } -void MenuEnter(int key) { +void MenuEnter( void * keyVP ) +{ + int key = (int)VP2L(keyVP); int action; action = C_TEXT; action |= key<<8; @@ -2833,8 +3307,10 @@ void MenuEnter(int key) { DrawGeomModify(action,zero,&drawModCmdContext); } -void MenuLine(int key) { - struct extraData * xx = GetTrkExtraData(drawModCmdContext.trk); +void MenuLine( void * keyVP ) +{ + int key = (int)VP2L(keyVP); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(drawModCmdContext.trk, T_DRAW, extraDataDraw_t); if ( drawModCmdContext.type==SEG_STRLIN || drawModCmdContext.type==SEG_CRVLIN || drawModCmdContext.type==SEG_POLY ) { switch(key) { case '0': @@ -2865,7 +3341,7 @@ void MenuLine(int key) { EXPORT void SetLineType( track_p trk, int width ) { if (QueryTrack(trk, Q_IS_DRAW)) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataDraw_t * xx = GET_EXTRA_DATA(trk, T_DRAW, extraDataDraw_t); if ( xx->segs[0].type==SEG_STRLIN || xx->segs[0].type==SEG_CRVLIN || xx->segs[0].type==SEG_POLY) { switch(width) { case 0: @@ -2901,29 +3377,29 @@ EXPORT void InitTrkDraw( void ) AddParam( "TEXT", ReadText ); drawModDelMI = MenuRegister( "Modify Draw Edit Menu" ); - drawModClose = wMenuPushCreate( drawModDelMI, "", _("Close Polygon - 'g'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'g'); - drawModOpen = wMenuPushCreate( drawModDelMI, "", _("Make PolyLine - 'l'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'l'); - drawModFill = wMenuPushCreate( drawModDelMI, "", _("Fill Polygon - 'f'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'f'); - drawModEmpty = wMenuPushCreate( drawModDelMI, "", _("Empty Polygon - 'u'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'u'); + drawModClose = wMenuPushCreate( drawModDelMI, "", _("Close Polygon - 'g'"), 0, MenuEnter, I2VP( 'g')); + drawModOpen = wMenuPushCreate( drawModDelMI, "", _("Make PolyLine - 'l'"), 0, MenuEnter, I2VP( 'l')); + drawModFill = wMenuPushCreate( drawModDelMI, "", _("Fill Polygon - 'f'"), 0, MenuEnter, I2VP( 'f')); + drawModEmpty = wMenuPushCreate( drawModDelMI, "", _("Empty Polygon - 'u'"), 0, MenuEnter, I2VP( 'u')); wMenuSeparatorCreate( drawModDelMI ); - drawModPointsMode = wMenuPushCreate( drawModDelMI, "", _("Points Mode - 'p'"), 0, (wMenuCallBack_p)MenuMode, (void*) 0 ); - drawModDel = wMenuPushCreate( drawModDelMI, "", _("Delete Selected Point - 'Del'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 127 ); - drawModVertex = wMenuPushCreate( drawModDelMI, "", _("Vertex Point - 'v'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'v' ); - drawModRound = wMenuPushCreate( drawModDelMI, "", _("Round Corner - 'r'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'r' ); - drawModSmooth = wMenuPushCreate( drawModDelMI, "", _("Smooth Corner - 's'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 's' ); + drawModPointsMode = wMenuPushCreate( drawModDelMI, "", _("Points Mode - 'p'"), 0, MenuMode, I2VP( 0 )); + drawModDel = wMenuPushCreate( drawModDelMI, "", _("Delete Selected Point - 'Del'"), 0, MenuEnter, I2VP( 127 )); + drawModVertex = wMenuPushCreate( drawModDelMI, "", _("Vertex Point - 'v'"), 0, MenuEnter, I2VP( 'v' )); + drawModRound = wMenuPushCreate( drawModDelMI, "", _("Round Corner - 'r'"), 0, MenuEnter, I2VP( 'r' )); + drawModSmooth = wMenuPushCreate( drawModDelMI, "", _("Smooth Corner - 's'"), 0, MenuEnter, I2VP( 's' )); wMenuSeparatorCreate( drawModDelMI ); drawModLinMI = wMenuMenuCreate( drawModDelMI, "", _("LineType...") ); - drawModSolid = wMenuPushCreate( drawModLinMI, "", _("Solid Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '0' ); - drawModDot = wMenuPushCreate( drawModLinMI, "", _("Dashed Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '1' ); - drawModDash = wMenuPushCreate( drawModLinMI, "", _("Dotted Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '2' ); - drawModDashDot = wMenuPushCreate( drawModLinMI, "", _("Dash-Dot Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '3' ); - drawModDashDotDot = wMenuPushCreate( drawModLinMI, "", _("Dash-Dot-Dot Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '4' ); - drawModCenterDot = wMenuPushCreate( drawModLinMI, "", _("Center-Dot Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '5' ); - drawModPhantom = wMenuPushCreate( drawModLinMI, "", _("Phantom-Dot Line"), 0, (wMenuCallBack_p)MenuLine, (void*) '6' ); + drawModSolid = wMenuPushCreate( drawModLinMI, "", _("Solid Line"), 0, MenuLine, I2VP( '0' )); + drawModDot = wMenuPushCreate( drawModLinMI, "", _("Dashed Line"), 0, MenuLine, I2VP( '1' )); + drawModDash = wMenuPushCreate( drawModLinMI, "", _("Dotted Line"), 0, MenuLine, I2VP( '2' )); + drawModDashDot = wMenuPushCreate( drawModLinMI, "", _("Dash-Dot Line"), 0, MenuLine, I2VP( '3' )); + drawModDashDotDot = wMenuPushCreate( drawModLinMI, "", _("Dash-Dot-Dot Line"), 0, MenuLine, I2VP( '4' )); + drawModCenterDot = wMenuPushCreate( drawModLinMI, "", _("Center-Dot Line"), 0, MenuLine, I2VP( '5' )); + drawModPhantom = wMenuPushCreate( drawModLinMI, "", _("Phantom-Dot Line"), 0, MenuLine, I2VP( '6' )); wMenuSeparatorCreate( drawModDelMI ); - drawModriginMode = wMenuPushCreate( drawModDelMI, "", _("Origin Mode - 'o'"), 0, (wMenuCallBack_p)MenuMode, (void*) 1 ); - drawModOrigin = wMenuPushCreate( drawModDelMI, "", _("Reset Origin - '0'"), 0, (wMenuCallBack_p)MenuEnter, (void*) '0' ); - drawModLast = wMenuPushCreate( drawModDelMI, "", _("Origin to Selected - 'l'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'l' ); - drawModCenter = wMenuPushCreate( drawModDelMI, "", _("Origin to Middle - 'm'"), 0, (wMenuCallBack_p)MenuEnter, (void*) 'm'); + drawModriginMode = wMenuPushCreate( drawModDelMI, "", _("Origin Mode - 'o'"), 0, MenuMode, I2VP( 1 )); + drawModOrigin = wMenuPushCreate( drawModDelMI, "", _("Reset Origin - '0'"), 0, MenuEnter, I2VP( '0' )); + drawModLast = wMenuPushCreate( drawModDelMI, "", _("Origin to Selected - 'l'"), 0, MenuEnter, I2VP( 'l' )); + drawModCenter = wMenuPushCreate( drawModDelMI, "", _("Origin to Middle - 'm'"), 0, MenuEnter, I2VP( 'm')); } diff --git a/app/bin/celev.c b/app/bin/celev.c index 1da4b22..b80874f 100644 --- a/app/bin/celev.c +++ b/app/bin/celev.c @@ -19,18 +19,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include #include "cselect.h" #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" #include "param.h" #include "track.h" #include "ccurve.h" -#include "utility.h" static wWin_p elevW; @@ -53,12 +49,12 @@ static paramData_t elevationPLs[] = { #define I_HEIGHT (1) { PD_FLOAT, &elevHeightV, "value", PDO_DIM|PDO_DLGNEWCOLUMN, &r_1000_1000 }, #define I_COMPUTED (2) - { PD_MESSAGE, NULL, "computed", 0, (void*)80 }, + { PD_MESSAGE, NULL, "computed", 0, I2VP(80) }, #define I_GRADE (3) - { PD_MESSAGE, NULL, "grade", 0, (void*)80 }, + { PD_MESSAGE, NULL, "grade", 0, I2VP(80) }, #define I_STATION (4) - { PD_STRING, elevStationV, "station", PDO_DLGUNDERCMDBUTT|PDO_STRINGLIMITLENGTH, (void*)200, NULL, 0, 0, sizeof(elevStationV)} }; -static paramGroup_t elevationPG = { "elev", 0, elevationPLs, sizeof elevationPLs/sizeof elevationPLs[0] }; + { PD_STRING, elevStationV, "station", PDO_DLGUNDERCMDBUTT|PDO_STRINGLIMITLENGTH, I2VP(200), NULL, 0, 0, sizeof(elevStationV)} }; +static paramGroup_t elevationPG = { "elev", 0, elevationPLs, COUNT( elevationPLs ) }; static dynArr_t anchors_da; #define anchors(N) DYNARR_N(trkSeg_t,anchors_da,N) @@ -129,14 +125,14 @@ void static CreateMoveAnchor(coOrd pos) { static void LayoutElevW( paramData_t * pd, int inx, - wPos_t colX, - wPos_t * x, - wPos_t * y ) + wWinPix_t colX, + wWinPix_t * x, + wWinPix_t * y ) { - static wPos_t h = 0; + static wWinPix_t h = 0; switch ( inx ) { case I_HEIGHT: - h = wControlGetHeight( elevationPLs[I_MODE].control )/((sizeof elevModeLabels/sizeof elevModeLabels[0])-1); + h = wControlGetHeight( elevationPLs[I_MODE].control )/(COUNT( elevModeLabels )-1); #ifndef WINDOWS h += 3; #endif @@ -243,7 +239,6 @@ static void ElevSelect( track_p trk, EPINX_T ep ) int mode; DIST_T elevX, grade, elev, dist; long radio; - BOOL_T computedOk; BOOL_T gradeOk = TRUE; track_p trk1; EPINX_T ep1; @@ -296,69 +291,55 @@ static void ElevSelect( track_p trk, EPINX_T ep ) elevModeV = radio; ParamLoadControl( &elevationPG, I_MODE ); gradeOk = ComputeElev( trk, ep, FALSE, &elevX, &grade, TRUE ); - computedOk = TRUE; - if (oldElevationEvaluation || computedOk) { - sprintf( message, "%0.2f%s", round(PutDim( elevX )*100.0)/100.0, (units==UNITS_METRIC?"cm":"\"") ); - ParamLoadMessage( &elevationPG, I_COMPUTED, message ); - if (gradeOk) { - sprintf( message, "%0.1f%%", fabs(round(grade*1000.0)/10.0) ); - } else { - if ( EndPtIsDefinedElev(trk,ep) ) { - elev = GetElevation(trk); - dist = GetTrkLength(trk,ep,-1); + sprintf( message, "%0.2f%s", round(PutDim( elevX )*100.0)/100.0, (units==UNITS_METRIC?"cm":"\"") ); + ParamLoadMessage( &elevationPG, I_COMPUTED, message ); + if (gradeOk) { + sprintf( message, "%0.1f%%", fabs(round(grade*1000.0)/10.0) ); + } else { + if ( EndPtIsDefinedElev(trk,ep) ) { + elev = GetElevation(trk); + dist = GetTrkLength(trk,ep,-1); + if (dist>0.1) + sprintf( message, "%0.1f%%", fabs(round(((elev-elevX)/dist)*1000.0))/10.0 ); + else + sprintf( message, _("Undefined") ); + if ( (trk1=GetTrkEndTrk(trk,ep)) && (ep1=GetEndPtConnectedToMe(trk1,trk))>=0 ) { + elev = GetElevation(trk1); + dist = GetTrkLength(trk1,ep1,-1); if (dist>0.1) - sprintf( message, "%0.1f%%", fabs(round((elev-elevX)/dist)*1000.0)/10.0 ); + sprintf( message+strlen(message), " - %0.1f%%", fabs(round(((elev-elevX)/dist)*1000.0))/10.0 ); else - sprintf( message, _("Undefined") ); - if ( (trk1=GetTrkEndTrk(trk,ep)) && (ep1=GetEndPtConnectedToMe(trk1,trk))>=0 ) { - elev = GetElevation(trk1); - dist = GetTrkLength(trk1,ep1,-1); - if (dist>0.1) - sprintf( message+strlen(message), " - %0.1f%%", fabs(round((elev-elevX)/dist)*1000.0)/10.0 ); - else - sprintf( message+strlen(message), " - %s", _("Undefined") ); - } - } else { - strcpy( message, _("Undefined") ); + sprintf( message+strlen(message), " - %s", _("Undefined") ); } - } - ParamLoadMessage( &elevationPG, I_GRADE, message ); - if ( (mode&ELEV_MASK)!=ELEV_DEF ) { - elevHeightV = elevX; - ParamLoadControl( &elevationPG, I_HEIGHT ); + } else { + strcpy( message, _("Undefined") ); } } + ParamLoadMessage( &elevationPG, I_GRADE, message ); + if ( (mode&ELEV_MASK)!=ELEV_DEF ) { + elevHeightV = elevX; + ParamLoadControl( &elevationPG, I_HEIGHT ); + } wShow(elevW); } static BOOL_T GetPointElev(track_p trk, coOrd pos, DIST_T * height) { - DIST_T len, len1, elev0, elev1, dist0, dist1; + DIST_T elev0, elev1, dist0, dist1; if ( IsTrack( trk ) && GetTrkEndPtCnt(trk) == 2 ) { + if ( GetTrkLength( trk, 0, 1 ) < 0.1 ) + return FALSE; dist0 = FindDistance(pos,GetTrkEndPos(trk,0)); dist1 = FindDistance(pos,GetTrkEndPos(trk,1)); - if (EndPtIsDefinedElev(trk,0)) - elev0 = GetTrkEndElevHeight(trk,0); - else { - if (!GetTrkEndElevCachedHeight(trk,0,&elev0,&len)) { - if (GetTrkLength( trk, 0, 1 )<0.1) return FALSE; - ComputeElev( trk, 0, FALSE, &elev0, NULL, TRUE ); - } - } - if (EndPtIsDefinedElev(trk,1)) - elev1 = GetTrkEndElevHeight(trk,1); - else { - if (!GetTrkEndElevCachedHeight(trk,1,&elev1,&len1)) { - if (GetTrkLength( trk, 0, 1 )<0.1) return FALSE; - ComputeElev( trk, 0, FALSE, &elev0, NULL, TRUE ); - } - } - if (dist1+dist0 < 0.1) { + ComputeElev( trk, 0, FALSE, &elev0, NULL, FALSE ); + ComputeElev( trk, 1, FALSE, &elev1, NULL, FALSE ); + if (dist1+dist0 <= 0.1) { *height = elev0; return TRUE; } *height = ((elev1-elev0)*(dist0/(dist0+dist1)))+elev0; return TRUE; - } else if (GetTrkEndPtCnt(trk) == 1 && GetTrkEndElevCachedHeight(trk,0,&elev0,&len)) { + } else if (GetTrkEndPtCnt(trk) == 1 && + ComputeElev( trk, 0, FALSE, &elev0, NULL, FALSE ) ) { *height = elev0; return TRUE; } @@ -387,7 +368,7 @@ static STATUS_T CmdElevation( wAction_t action, coOrd pos ) ParamControlActive( &elevationPG, I_STATION, FALSE ); ParamLoadMessage( &elevationPG, I_COMPUTED, "" ); ParamLoadMessage( &elevationPG, I_GRADE, "" ); - InfoMessage( _("Click on end, +Shift to split, +Ctrl to move description") ); + InfoMessage( _("Click on end, +Shift to split, +Ctrl to move description, +Alt to show elevation") ); elevTrk = NULL; elevUndo = FALSE; CmdMoveDescription( action, pos ); @@ -396,7 +377,7 @@ static STATUS_T CmdElevation( wAction_t action, coOrd pos ) case wActionMove: DYNARR_RESET(trkSeg_t,anchors_da); if (MyGetKeyState()&WKEY_CTRL) { - commandContext = (void*) 1; //Just end points + commandContext = I2VP(1); //Just end points CmdMoveDescription( action, pos ); return C_CONTINUE; } @@ -414,43 +395,46 @@ static STATUS_T CmdElevation( wAction_t action, coOrd pos ) InfoMessage( _("Move to end or track crossing") ); return C_CONTINUE; } - if ((trk1 = OnTrack2(&p2,FALSE, TRUE, FALSE, trk0)) != NULL) { - if (IsClose(FindDistance(p0,p2))) { - if (GetEndPtConnectedToMe(trk0,trk1) == -1) { //Not simply connected to each other!!! - if (GetTrkEndPtCnt(trk1) == 2) { - if (GetPointElev(trk1,p2,&elev1)) { - if (MyGetKeyState()&WKEY_SHIFT) { - InfoMessage (_("Crossing - First %0.3f, Second %0.3f, Clearance %0.3f - Click to Split"), PutDim(elev0), PutDim(elev1), PutDim(fabs(elev0-elev1))); - } else - InfoMessage (_("Crossing - First %0.3f, Second %0.3f, Clearance %0.3f"), PutDim(elev0), PutDim(elev1), PutDim(fabs(elev0-elev1))); + if (((MyGetKeyState()&WKEY_ALT))) { //Add square with Alt + if ((trk1 = OnTrack2(&p2,FALSE, TRUE, FALSE, trk0)) != NULL) { + if (IsClose(FindDistance(p0,p2))) { + if (GetEndPtConnectedToMe(trk0,trk1) == -1) { //Not simply connected to each other!!! + if (GetTrkEndPtCnt(trk1) == 2) { + if (GetPointElev(trk1,p2,&elev1)) { + if (MyGetKeyState()&WKEY_SHIFT) { + InfoMessage (_("Crossing - First %0.3f, Second %0.3f, Clearance %0.3f - Click to Split"), PutDim(elev0), PutDim(elev1), PutDim(fabs(elev0-elev1))); + } else + InfoMessage (_("Crossing - First %0.3f, Second %0.3f, Clearance %0.3f"), PutDim(elev0), PutDim(elev1), PutDim(fabs(elev0-elev1))); + } + CreateSquareAnchor(p2); + return C_CONTINUE; } - CreateSquareAnchor(p2); - return C_CONTINUE; } } } } if ((ep0 = PickEndPoint( p0, trk0 )) != -1) { - if (IsClose(FindDistance(GetTrkEndPos(trk0,ep0),pos))) { - CreateEndAnchor(GetTrkEndPos(trk0,ep0),FALSE); - InfoMessage (_("Track End elevation %0.3f"), PutDim(elev0)); - } else if ((MyGetKeyState()&WKEY_SHIFT) && QueryTrack(trk0,Q_MODIFY_CAN_SPLIT) + if ((MyGetKeyState()&WKEY_SHIFT) && QueryTrack(trk0,Q_MODIFY_CAN_SPLIT) && !(QueryTrack(trk0,Q_IS_TURNOUT))) { InfoMessage( _("Click to split here - elevation %0.3f"), PutDim(elev0)); CreateSplitAnchor(p0,trk0); - } else { - InfoMessage( _("Track Point elevation %0.3f"), PutDim(elev0)); + } else if ((IsClose(FindDistance(GetTrkEndPos(trk0,ep0),p0)) + || (FindDistance(GetTrkEndPos(trk0,ep0),p0) -#include -#include - +#include "cselect.h" #include "compound.h" #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" #include "tbezier.h" #include "tcornu.h" #include "common.h" -#include "messages.h" #include "param.h" #include "shrtpath.h" #include "track.h" -#include "utility.h" +#include "common-ui.h" /***************************************************************************** @@ -54,13 +49,19 @@ static dynArr_t pathPtr_da; static char groupManuf[STR_SIZE]; static char groupDesc[STR_SIZE]; static char groupPartno[STR_SIZE]; -static char groupTitle[STR_SIZE]; +static char groupTitle[STR_LONG_SIZE]; static int groupCompoundCount = 0; extern TRKTYP_T T_BZRTRK; extern TRKTYP_T T_BZRLIN; extern TRKTYP_T T_CORNU; +/***************************************************************************** + * + * Ungroup + * + */ + typedef struct { int segInx; EPINX_T segEP; @@ -168,8 +169,8 @@ static void GroupCopyTitle( EXPORT void UngroupCompound( track_p trk ) { - struct extraData *xx = GetTrkExtraData(trk); - struct extraData *xx1; + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); + struct extraDataCompound_t *xx1; trkSeg_p sp; track_p trk0, trk1; int segCnt, segInx, segInx1; @@ -219,8 +220,13 @@ EXPORT void UngroupCompound( LOG( log_group, 1, ( "Ungroup( T%d )\n", GetTrkIndex(trk) ) ); epCnt = GetTrkEndPtCnt(trk); - for ( segCnt=0; segCntsegCnt&&IsSegTrack(&xx->segs[segCnt]); segCnt++ ); - ASSERT( (epCnt==0) == (segCnt==0) ); + segCnt = xx->segCnt; + int trackCount = 0; + for ( sp=xx->segs; sp<&xx->segs[xx->segCnt]; sp++ ) { + if (IsSegTrack(sp)) trackCount++; + } + //ASSERT( (epCnt==0) == (segCnt==0) ); + ASSERT( (epCnt==0) == (trackCount==0) ); turnoutChanged = FALSE; if ( epCnt > 0 ) { turnoutChanged = TRUE; @@ -253,7 +259,7 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep */ DYNARR_SET( int, refCount_da, segCnt+epCnt ); memset( refCount_da.ptr, 0, refCount_da.cnt * sizeof *(int*)0 ); - cp = (char *)xx->paths; + cp = (char *)GetPaths( trk ); while ( cp[0] ) { cp += strlen(cp)+1; while ( cp[0] ) { @@ -262,6 +268,10 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep segInx1 = FindEP( tempEndPts_da.cnt, &tempEndPts(0), pos ); if ( segInx1 >= 0 ) { segInx1 += segCnt; + if ( segInx1 >= refCount_da.cnt ) { + InputError( "Invalid segInx1 %d", TRUE, segInx1 ); + return; + } refCount(segInx1)++; } else { DYNARR_APPEND( trkEndPt_t, tempEndPts_da, 10 ); @@ -275,6 +285,10 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep segEP1 = 0; while ( cp[0] ) { GetSegInxEP( cp[0], &segInx, &segEP ); + if ( segInx1 >= refCount_da.cnt ) { + InputError( "Invalid segInx1 %d", TRUE, segInx1 ); + return; + } refCount(segInx)++; if ( refCount(segInx) > refCount(segInx1) ) AddMergePt( segInx, segEP ); @@ -314,7 +328,7 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep */ DYNARR_SET( int, refCount_da, segCnt ); memset( refCount_da.ptr, -1, segCnt * sizeof *(int*)0 ); - cp = (char *)xx->paths; + cp = (char *)GetPaths( trk ); while ( cp[0] ) { cp += strlen(cp)+1; while ( cp[0] ) { @@ -472,9 +486,11 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep Rotate( &orig, zero, xx->angle ); orig.x = xx->orig.x - orig.x; orig.y = xx->orig.y - orig.y; - trk1 = NewCompound( T_TURNOUT, 0, orig, xx->angle, xx->title, tempEndPts_da.cnt-epCnt1, &tempEndPts(epCnt1), NULL, pathPtr_da.cnt, &pathPtr(0), tempSegs_da.cnt, &tempSegs(0) ); - xx1 = GetTrkExtraData(trk1); + trk1 = NewCompound( T_TURNOUT, 0, orig, xx->angle, xx->title, tempEndPts_da.cnt-epCnt1, &tempEndPts(epCnt1), (PATHPTR_T)&pathPtr(0), tempSegs_da.cnt, &tempSegs(0) ); + xx1 = GET_EXTRA_DATA(trk1, T_TURNOUT, extraDataCompound_t); xx1->ungrouped = TRUE; + xx1->pathOverRide = xx->pathOverRide; + xx1->pathNoCombine = xx->pathNoCombine; SetTrkVisible( trk1, TRUE ); SetTrkNoTies( trk1, FALSE ); @@ -491,6 +507,8 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep */ for ( segInx=0; segInx= 0 ) continue; + if ( ! IsSegTrack( xx->segs+segInx ) ) + continue; SegProc( SEGPROC_NEWTRACK, xx->segs+segInx, &segProcData ); SetTrkScale( segProcData.newTrack.trk, GetTrkScale(trk) ); SetTrkBits( segProcData.newTrack.trk, TB_SELECTED ); @@ -503,7 +521,7 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep /* 9: reconnect tracks */ - cp = (char *)xx->paths; + cp = (char *)GetPaths( trk ); while ( cp[0] ) { cp += strlen(cp)+1; while ( cp[0] ) { @@ -566,7 +584,8 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep mp->trk = NULL; } } else { - DrawNewTrack( segTrack(segInx).trk ); + if ( segTrack(segInx).trk ) + DrawNewTrack( segTrack(segInx).trk ); } } wDrawDelayUpdate( mainD.d, FALSE ); @@ -575,7 +594,7 @@ LOG( log_group, 1, ( " EP%d = [%0.3f %0.3f] A%0.3f T%d.%d\n", ep, epp->pos.x, ep -EXPORT void DoUngroup( void ) +EXPORT void DoUngroup( void * unused ) { track_p trk = NULL; int ungroupCnt; @@ -612,6 +631,7 @@ static drawCmd_t groupD = { NULL, &tempSegDrawFuncs, DC_SEGTRACK, 1, 0.0, {0.0, 0.0}, {0.0, 0.0}, Pix2CoOrd, CoOrd2Pix }; static long groupSegCnt; static long groupReplace; +static long groupNoCombine; static double groupOriginX; static double groupOriginY; char * groupReplaceLabels[] = { N_("Replace with new group?"), NULL }; @@ -620,21 +640,23 @@ static wWin_p groupW; static paramIntegerRange_t r0_999999 = { 0, 999999 }; static paramFloatRange_t r_1000_1000 = { -1000.0, 1000.0, 80 }; static paramData_t groupPLs[] = { -/*0*/ { PD_STRING, groupManuf, "manuf", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)350, N_("Manufacturer"), 0, 0, sizeof(groupManuf)}, -/*1*/ { PD_STRING, groupDesc, "desc", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)230, N_("Description"), 0, 0, sizeof(groupDesc)}, -/*2*/ { PD_STRING, groupPartno, "partno", PDO_NOPREF|PDO_DLGHORZ|PDO_DLGIGNORELABELWIDTH|PDO_STRINGLIMITLENGTH, (void*)100, N_("#"), 0, 0, sizeof(groupPartno)}, +/*0*/ { PD_STRING, groupManuf, "manuf", PDO_NOPREF | PDO_NOTBLANK, I2VP(350), N_("Manufacturer"), 0, 0, sizeof(groupManuf)}, +/*1*/ { PD_STRING, groupDesc, "desc", PDO_NOPREF | PDO_NOTBLANK, I2VP(230), N_("Description"), 0, 0, sizeof(groupDesc)}, +/*2*/ { PD_STRING, groupPartno, "partno", PDO_NOPREF|PDO_DLGHORZ|PDO_DLGIGNORELABELWIDTH|PDO_NOTBLANK, I2VP(100), N_("#"), 0, 0, sizeof(groupPartno)}, /*3*/ { PD_LONG, &groupSegCnt, "segcnt", PDO_NOPREF, &r0_999999, N_("# Segments"), BO_READONLY }, #define I_GROUP_ORIGIN_OFFSET 4 /* Need to change if add above */ /*4*/ { PD_FLOAT, &groupOriginX, "orig", PDO_DIM, &r_1000_1000, N_("Offset X,Y:")}, /*5*/ { PD_FLOAT, &groupOriginY, "origy",PDO_DIM | PDO_DLGHORZ, &r_1000_1000, ""}, /*6*/ { PD_TOGGLE, &groupReplace, "replace", 0, groupReplaceLabels, "", BC_HORZ|BC_NOBORDER } }; -static paramGroup_t groupPG = { "group", 0, groupPLs, sizeof groupPLs/sizeof groupPLs[0] }; +static paramGroup_t groupPG = { "group", 0, groupPLs, COUNT( groupPLs ) }; typedef struct { track_p trk; int segStart; int segEnd; + int totalSegStart; //Where we are overall + int totalSegEnd; } groupTrk_t, * groupTrk_p; static dynArr_t groupTrk_da; #define groupTrk(N) DYNARR_N( groupTrk_t, groupTrk_da, N ) @@ -673,7 +695,6 @@ static char * FindPathBtwEP( EPINX_T ep2, BOOL_T * flip ) { - struct extraData * xx = GetTrkExtraData( trk ); char * cp; coOrd trkPos[2]; @@ -690,7 +711,8 @@ LOG( log_group, 2, ( " Group: Cornu path:%s \n", cp ) ) LOG( log_group, 3, (" Flip:%s Path= Seg=%d-\n", *flip?"T":"F", *cp ) ); return cp; } - cp = (char *)xx->paths; + struct extraDataCompound_t * xx = GET_EXTRA_DATA( trk, T_TURNOUT, extraDataCompound_t ); + cp = (char *)GetPaths( trk ); trkPos[0] = GetTrkEndPos(trk,ep1); Rotate( &trkPos[0], xx->orig, -xx->angle ); trkPos[0].x -= xx->orig.x; @@ -889,6 +911,10 @@ static int ConflictPaths( path_p path0, path_p path1 ) { + if ( groupNoCombine != 0 ) { + // No grouping + return TRUE; + } /* do these paths share an EP? */ if ( path0->ep1 == path1->ep1 ) return TRUE; if ( path0->ep1 == path1->ep2 ) return TRUE; @@ -903,7 +929,7 @@ static BOOL_T CheckPathEndPt( char cc, EPINX_T ep ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); wIndex_t segInx; EPINX_T segEP, epCnt; DIST_T d; @@ -925,9 +951,8 @@ static BOOL_T CheckPathEndPt( static BOOL_T CheckForBumper( track_p trk ) { - struct extraData *xx = GetTrkExtraData(trk); char * cp; - cp = (char *)xx->paths; + cp = (char *)GetPaths( trk ); while ( cp[0] ) { cp += strlen(cp)+1; while ( cp[0] ) { @@ -942,36 +967,10 @@ static BOOL_T CheckForBumper( return TRUE; } -typedef struct { - int inx; - wBool_t track; -} segInMap_t; -static dynArr_t segInMap_da; -#define segInMap(N) DYNARR_N( segInMap_t, segInMap_da, N) - -void AddToSegMap(int inx,wBool_t track) { - DYNARR_APPEND(segInMap_t,segInMap_da,10); - DYNARR_LAST(segInMap_t,segInMap_da).inx = inx; - DYNARR_LAST(segInMap_t,segInMap_da).track = track; -} - -void AddSegsToSegMap(int start, int end, wBool_t track) { - for (int i = start; i<= end; i++) { - AddToSegMap(i,track); - } -} - static dynArr_t trackSegs_da; #define trackSegs(N) DYNARR_N( trkSeg_t, trackSegs_da, N ) -trkSeg_p GetSegFromSegMap(int index) { - if (DYNARR_N( segInMap_t, segInMap_da, index).track) { - return &DYNARR_N(trkSeg_t,trackSegs_da,DYNARR_N( segInMap_t, segInMap_da, index).inx); - } else - return &DYNARR_N(trkSeg_t,tempSegs_da,DYNARR_N( segInMap_t, segInMap_da, index).inx); -} - static dynArr_t outputSegs_da; #define outputSegs(N) DYNARR_N( trkSeg_t, outputSegs_da, N) @@ -1004,10 +1003,12 @@ static void LogSeg( LogPrintf( "%c:\n", segP->type ); } } + + /* * GroupOk: create a TURNOUT or STRUCTURE from the selected objects * 1 - Add selected tracks to groupTrk[] - * - Add each group trk's segments to trackSeg[] or tempSegs[] + * - Add each group trk's segments to trackSeg[] * - Add all segs to segInMap[] * - if no track segments goto step 9 * 2 - Collect boundary endPts and sort them in tempEndPts[] @@ -1017,16 +1018,16 @@ static void LogSeg( * 4 - Flip tracks so sub-path elements match up * 5 - Create conflict map * 6 - Flip paths to minimize the number of flipped segments - * 7 - Build the path ('P') string + * 7 - Build the path ('P') string (new-P) * 8 - Build segment list, adjust endPts in tempEndPts[] - * 9 - create new TURNOUT/STRUCTURE definition + * 9 - create new TURNOUT/STRUCTURE definition * 10 - write defn to xtrkcad.cus * 11 - optionally replace grouped tracks with new defn */ -static void GroupOk( void * junk ) +static void GroupOk( void * unused ) { - struct extraData *xx = NULL; + struct extraDataCompound_t *xx = NULL; turnoutInfo_t * to; int inx; EPINX_T ep, epCnt, epN; @@ -1055,10 +1056,7 @@ static void GroupOk( void * junk ) int groupCnt; int pinx, pinx2, ginx, ginx2, gpinx2; trkEndPt_p endPtP; - PATHPTR_T path; - int pathLen; signed char pathChar; - char *oldLocale = NULL; DYNARR_RESET( trkSeg_t, trackSegs_da ); DYNARR_RESET( trkSeg_t, tempSegs_da ); @@ -1068,8 +1066,6 @@ static void GroupOk( void * junk ) DYNARR_RESET( trkEndPt_t, tempEndPts_da ); DYNARR_RESET( char, pathPtr_da ); - DYNARR_RESET( segInMap_t, segInMap_da); - ParamUpdate( &groupPG ); if ( groupManuf[0]==0 || groupDesc[0]==0 || groupPartno[0]==0 ) { NoticeMessage2( 0, MSG_GROUP_NONBLANK, _("Ok"), NULL ); @@ -1089,98 +1085,83 @@ static void GroupOk( void * junk ) */ trk = NULL; int InInx = -1; + BOOL_T hasTracks = FALSE; while ( TrackIterate( &trk ) ) { if ( GetTrkSelected( trk ) ) { - if ( IsTrack(trk) ) { - DYNARR_APPEND( groupTrk_t, groupTrk_da, 10 ); - groupP = &groupTrk(groupTrk_da.cnt-1); - groupP->trk = trk; - groupP->segStart = trackSegs_da.cnt; - if ( GetTrkType(trk) == T_TURNOUT ) { - xx = GetTrkExtraData(trk); - for ( pinx=0; pinxsegCnt; pinx++ ) { - segPtr = &xx->segs[pinx]; - if ( IsSegTrack(segPtr) ) { - DYNARR_APPEND( trkSeg_t, trackSegs_da, 10 ); - trackSegs(trackSegs_da.cnt-1) = *segPtr; - - AddToSegMap(trackSegs_da.cnt-1,TRUE); /* Single Track Seg - Note no Cornu*/ - - RotateSegs( 1, &trackSegs(trackSegs_da.cnt-1), zero, xx->angle ); - MoveSegs( 1, &trackSegs(trackSegs_da.cnt-1), xx->orig ); - - } else { - int start = tempSegs_da.cnt; - DrawSegs( &groupD, xx->orig, xx->angle, segPtr, 1, trackGauge, wDrawColorBlack ); - - AddSegsToSegMap(start,tempSegs_da.cnt-1,FALSE); /* Multiple Non-Track Segs */ - } - } - } else if (GetTrkType(trk) == T_BEZIER || GetTrkType(trk) == T_BZRLIN ) { - DYNARR_APPEND(trkSeg_t, trackSegs_da, 10); - segPtr = &trackSegs(trackSegs_da.cnt-1); + DYNARR_APPEND( groupTrk_t, groupTrk_da, 10 ); + groupP = &groupTrk(groupTrk_da.cnt-1); + groupP->trk = trk; + groupP->segStart = trackSegs_da.cnt; + groupP->totalSegStart = tempSegs_da.cnt+trackSegs_da.cnt; + if (IsTrack(trk)) hasTracks = TRUE; + if ( GetTrkType(trk) == T_TURNOUT || GetTrkType(trk) == T_STRUCTURE) { + xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); + for ( pinx=0; pinxsegCnt; pinx++ ) { + segPtr = &xx->segs[pinx]; + if ( IsSegTrack(segPtr) ) { + DYNARR_APPEND( trkSeg_t, trackSegs_da, 10 ); + trackSegs(trackSegs_da.cnt-1) = *segPtr; + hasTracks = TRUE; + RotateSegs( 1, &trackSegs(trackSegs_da.cnt-1), zero, xx->angle ); + MoveSegs( 1, &trackSegs(trackSegs_da.cnt-1), xx->orig ); + + } else { + DYNARR_APPEND( trkSeg_t, trackSegs_da, 10 ); + trackSegs(trackSegs_da.cnt-1) = *segPtr; + + RotateSegs( 1, &trackSegs(trackSegs_da.cnt-1), zero, xx->angle ); + MoveSegs( 1, &trackSegs(trackSegs_da.cnt-1), xx->orig ); - GetBezierSegmentFromTrack(trk,segPtr); - - AddToSegMap(trackSegs_da.cnt-1,TRUE); // Add Single Bezier Track - - } else if (GetTrkType(trk) == T_CORNU) { + } + } + } else if (GetTrkType(trk) == T_BEZIER || GetTrkType(trk) == T_BZRLIN ) { + DYNARR_APPEND(trkSeg_t, trackSegs_da, 10); + segPtr = &trackSegs(trackSegs_da.cnt-1); - int start = trackSegs_da.cnt; + GetBezierSegmentFromTrack(trk,segPtr); - GetBezierSegmentsFromCornu(trk,&trackSegs_da,TRUE); //Only give back Bezier - cant be undone + } else if (GetTrkType(trk) == T_CORNU) { - AddSegsToSegMap(start,trackSegs_da.cnt-1,TRUE); /* Add Multiple Track Segs */ + int start = trackSegs_da.cnt; - } else { - segCnt = tempSegs_da.cnt; - DrawTrack( trk, &groupD, wDrawColorBlack ); - DYNARR_APPEND( trkSeg_t, trackSegs_da, 10 ); - segPtr = &trackSegs(trackSegs_da.cnt-1); - *segPtr = tempSegs( segCnt ); - - AddToSegMap(trackSegs_da.cnt-1,TRUE); // Add One Track - - if ( tempSegs_da.cnt != segCnt+1 || - !IsSegTrack(segPtr) ) { - NoticeMessage2( 0, MSG_CANNOT_GROUP_TRACK, _("Ok"), NULL ); - wHide( groupW ); - return; - } + GetBezierSegmentsFromCornu(trk,&trackSegs_da,TRUE); //Only give back Bezier - cant be undone - tempSegs_da.cnt = segCnt; - } - groupP->segEnd = trackSegs_da.cnt-1; } else { - int start = tempSegs_da.cnt; - + if (IsTrack(trk)) hasTracks=TRUE; + segCnt = tempSegs_da.cnt; DrawTrack( trk, &groupD, wDrawColorBlack ); + DYNARR_APPEND( trkSeg_t, trackSegs_da, 10 ); + segPtr = &trackSegs(trackSegs_da.cnt-1); + *segPtr = tempSegs( segCnt ); + + if ( tempSegs_da.cnt != segCnt+1 ) { + NoticeMessage2( 0, MSG_CANNOT_GROUP_TRACK, _("Ok"), NULL, GetTrkTypeName(trk)); + wHide( groupW ); + return; + } - AddSegsToSegMap(start,tempSegs_da.cnt-1,FALSE); /* Multiple Non-Track Segs */ } + groupP->segEnd = trackSegs_da.cnt-1; } } if ( log_group >= 1 && logTable(log_group).level >= 4 ) { LogPrintf( "Track Segs:\n"); for ( int inx = 0; inx < trackSegs_da.cnt; inx++ ) { - LogPrintf( " %d: ", inx+1 ); - LogSeg( &trackSegs(inx) ); + if (IsSegTrack(&trackSegs(inx))) { + LogPrintf( " %d: ", inx+1 ); + LogSeg( &trackSegs(inx) ); + } } LogPrintf( "Other Segs:\n"); - for ( int inx = 0; inx < tempSegs_da.cnt; inx++ ) { - LogPrintf( " %d: ", inx+1 ); - LogSeg( &tempSegs(inx) ); - } -} -if ( log_group >= 1 && logTable(log_group).level >= 3 ) { - LogPrintf( "Combined Segs:\n" ); - for ( int inx = 0; inx0 ) { + if ( groupTrk_da.cnt>0 && hasTracks) { if ( groupTrk_da.cnt > 128 ) { NoticeMessage( MSG_TOOMANYSEGSINGROUP, _("Ok"), NULL ); wDrawDelayUpdate( mainD.d, FALSE ); @@ -1237,11 +1218,6 @@ if ( log_group >= 1 && logTable(log_group).level >= 4 ) { wHide( groupW ); return; } - if ( groupTrk_da.cnt == 1 && GetTrkType( groupTrk(0).trk ) == T_TURNOUT ) { - path = xx->paths; - pathLen = xx->pathLen; - goto groupSimpleTurnout; - } /* Make sure no turnouts in groupTrk list have a path end which is not an EndPt */ //TODO Add Trap Points (which are Turnouts with a bumper track) @@ -1493,13 +1469,13 @@ if ( log_group >= 1 && logTable(log_group).level >= 3 ) { memset( &segFlip(0), 0, trackSegs_da.cnt * sizeof segFlip(0) ); for ( pinx=0; pinxpath; *path; path++ ) { - inx = *path; + for ( PATHPTR_T pPaths=ppp->path; *pPaths; pPaths++ ) { + inx = *pPaths; if ( inx<0 ) inx = - inx; if ( inx > trackSegs_da.cnt ) AbortProg( "inx > trackSegs_da.cnt" ); - flip = *path<0; + flip = *pPaths<0; if ( ppp->flip ) flip = !flip; inx += groupTrk(ppp->groupInx).segStart - 1; @@ -1537,14 +1513,14 @@ LOG( log_group, 3, ( "\n" ) ); ppp = &pathElem( pinx2 ); LOG( log_group, 3, (" PE %d: GI %d, EP %d %d, Flip %d =", pinx2, ppp->groupInx, ppp->ep1, ppp->ep2, ppp->flip )); groupP = &groupTrk( ppp->groupInx ); - path = ppp->path; + PATHPTR_T pPaths = ppp->path; flip = ppp->flip; - if ( path == NULL ) + if ( pPaths == NULL ) AbortProg( "Missing Path T%d:%d.%d", GetTrkIndex(groupP->trk), ppp->ep2, ppp->ep1 ); - if ( flip ) path += strlen((char *)path)-1; - while ( *path && (path >= ppp->path) ) { //Add Guard for flip backwards + if ( flip ) pPaths += strlen((char *)pPaths)-1; + while ( *pPaths && (pPaths >= ppp->path) ) { //Add Guard for flip backwards DYNARR_APPEND( char, pathPtr_da, 10 ); - pathChar = *path; + pathChar = *pPaths; flip1 = flip; if ( pathChar < 0 ) { flip1 = !flip; @@ -1555,7 +1531,7 @@ LOG( log_group, 3, ( "\n" ) ); flip1 = ! flip1; if ( flip1 ) pathChar = - pathChar; pathPtr(pathPtr_da.cnt-1) = pathChar; - path += (flip?-1:1); + pPaths += (flip?-1:1); LOG( log_group, 3, (" %d", pathChar ) ); } LOG( log_group, 3, ("\n") ); @@ -1568,21 +1544,18 @@ LOG( log_group, 3, ( "\n" ) ); } DYNARR_APPEND( char, pathPtr_da, 10 ); pathPtr(pathPtr_da.cnt-1) = 0; - path = (PATHPTR_T)&pathPtr(0); - pathLen = pathPtr_da.cnt; -groupSimpleTurnout: /* * 8: Copy and Reorigin Segments - Start by putting them out in the original order */ DYNARR_RESET(trkSeg_t, outputSegs_da); - for (int i=0; ititle) )>0; - rc &= WriteCompoundPathsEndPtsSegs( f, path, outputSegs_da.cnt, &outputSegs(0), tempEndPts_da.cnt, &tempEndPts(0) ); + SetCLocale(); + rc &= fprintf( f, "TURNOUT %s \"%s\" %ld\n", curScaleName, PutTitle(to->title), options )>0; + rc &= WriteCompoundPathsEndPtsSegs( f, pPaths, outputSegs_da.cnt, &outputSegs(0), tempEndPts_da.cnt, &tempEndPts(0) ); + SetUserLocale(); } if ( groupReplace ) { /* @@ -1639,7 +1617,11 @@ groupSimpleTurnout: trackCount--; } } - trk = NewCompound( T_TURNOUT, 0, orig, 0.0, to->title, tempEndPts_da.cnt, &tempEndPts(0), NULL, pathLen, (char *)path, outputSegs_da.cnt, &outputSegs(0) ); + SelectRecount(); + trk = NewCompound( T_TURNOUT, 0, orig, 0.0, to->title, tempEndPts_da.cnt, &tempEndPts(0), pPaths, outputSegs_da.cnt, &outputSegs(0) ); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_TURNOUT, extraDataCompound_t); + xx->pathOverRide = FALSE; + xx->pathNoCombine = groupNoCombine; SetTrkVisible( trk, TRUE ); for ( ep=0; ep0; - rc &= WriteSegs( f, tempSegs_da.cnt, &tempSegs(0) ); + rc &= WriteSegs( f, trackSegs_da.cnt, &trackSegs(0) ); + SetUserLocale(); } if ( groupReplace ) { UndoStart( _("Group Tracks"), "group" ); @@ -1675,16 +1658,16 @@ groupSimpleTurnout: trackCount--; } } + SelectRecount(); orig.x = - orig.x; orig.y = - orig.y; - trk = NewCompound( T_STRUCTURE, 0, orig, 0.0, groupTitle, 0, NULL, NULL, 0, "", tempSegs_da.cnt, &tempSegs(0) ); + trk = NewCompound( T_STRUCTURE, 0, orig, 0.0, groupTitle, 0, NULL, NULL, trackSegs_da.cnt, &trackSegs(0) ); SetTrkVisible( trk, TRUE ); DrawNewTrack( trk ); EnableCommands(); } } if (f) fclose(f); - RestoreLocale(oldLocale); DoChangeNotification( CHANGE_PARAMS ); wHide( groupW ); wDrawDelayUpdate( mainD.d, FALSE ); @@ -1693,10 +1676,10 @@ groupSimpleTurnout: } -EXPORT void DoGroup( void ) +EXPORT void DoGroup( void * unused ) { track_p trk = NULL; - struct extraData *xx; + struct extraDataCompound_t *xx; TRKTYP_T trkType; xx = NULL; groupSegCnt = 0; @@ -1705,14 +1688,17 @@ EXPORT void DoGroup( void ) groupOriginY = 0.0; BOOL_T isTurnout = FALSE; + groupNoCombine = FALSE; while ( TrackIterate( &trk ) ) { if ( GetTrkSelected( trk ) ) { trkType = GetTrkType(trk); if ( IsTrack(trk) ) isTurnout = TRUE; if ( trkType == T_TURNOUT || trkType == T_STRUCTURE ) { - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, trkType, extraDataCompound_t); groupSegCnt += xx->segCnt; GroupCopyTitle( xtitle(xx) ); + if ( trkType == T_TURNOUT && GetTrkEndPtCnt(trk) > 2 && xx->pathNoCombine != 0 ) + groupNoCombine = TRUE; } else groupSegCnt += 1; } diff --git a/app/bin/chndldto.c b/app/bin/chndldto.c index a0f2d6b..abb6e32 100644 --- a/app/bin/chndldto.c +++ b/app/bin/chndldto.c @@ -21,17 +21,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include "ccurve.h" #include "cjoin.h" #include "compound.h" #include "cstraigh.h" #include "cundo.h" -#include "i18n.h" -#include "messages.h" #include "track.h" -#include "utility.h" +#include "draw.h" +#include "common-ui.h" #define PTRACE(X) @@ -351,9 +348,9 @@ PTRACE(( " a2=%0.1f rA1=%0.1f\n", angle2, reverseA1 )) } -#include "bitmaps/hndldto.xpm" +#include "bitmaps/turnout-designer.xpm" EXPORT void InitCmdHandLaidTurnout( wMenu_p menu ) { - AddMenuButton( menu, CmdHandLaidTurnout, "cmdHandLaidTurnout", _("HandLaidTurnout"), wIconCreatePixMap(hndldto_xpm), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_POPUP2, ACCL_HNDLDTO, NULL ); + AddMenuButton( menu, CmdHandLaidTurnout, "cmdHandLaidTurnout", _("HandLaidTurnout"), wIconCreatePixMap(turnout_designer_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_POPUP2, ACCL_HNDLDTO, NULL ); } diff --git a/app/bin/chotbar.c b/app/bin/chotbar.c index 0b9a327..379f31a 100644 --- a/app/bin/chotbar.c +++ b/app/bin/chotbar.c @@ -20,22 +20,21 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include - #include "compound.h" #include "fileio.h" -#include "messages.h" #include "ccornu.h" #include "track.h" +#include "draw.h" EXPORT DIST_T curBarScale = -1; EXPORT long hotBarLabels = 0; +EXPORT wWinPix_t hotBarHeight = 32; #include "bitmaps/hotbarl.xbm" #include "bitmaps/hotbarr.xbm" +#define HOTBAR_LEFT 2 + static wButton_p hotBarLeftB = NULL; static wButton_p hotBarRightB = NULL; static wMenu_p hotbarPopupM; @@ -49,8 +48,8 @@ static drawCmd_t hotBarD = { 0.0, {0.0, 0.0}, {0.0, 0.0}, Pix2CoOrd, CoOrd2Pix }; -static wPos_t hotBarDrawHeight = 28; -static wPos_t hotBarHeight = 28; +static wWinPix_t hotBarDrawHeight[] = {26, 32, 40}; +static wFontSize_t hotBarFontSize[] = {7, 8, 9}; typedef struct { DIST_T x; DIST_T w; @@ -75,23 +74,35 @@ static DIST_T hotBarWidth = 0.0; static void HotBarHighlight( int inx, DIST_T fixed_x ) { - wPos_t x0; - if ( inx == 0 && hotBarMap_da.cnt>0 && hotBarMap(0).isFixed) { - x0 = (wPos_t)0; - wDrawFilledRectangle( hotBarD.d, x0, 0, (wPos_t)(hotBarMap(0).w*hotBarD.dpi-2), hotBarHeight, wDrawColorBlack, wDrawOptTransparent ); - } else if ( inx >= hotBarCurrStart && inx < hotBarCurrEnd ) { - x0 = (wPos_t)((hotBarMap(inx).x-hotBarMap((int)hotBarCurrStart).x + (inx>0?fixed_x:0))*hotBarD.dpi); - wDrawFilledRectangle( hotBarD.d, x0, 0, (wPos_t)(hotBarMap(inx).w*hotBarD.dpi-2), hotBarHeight, wDrawColorBlack, wDrawOptTransparent ); - } + if ( inx > 0 && ( inx < hotBarCurrStart || inx >= hotBarCurrEnd ) ) + return; + coOrd orig, size; + hotBarD.scale = 1; + if ( inx == 0 && hotBarMap_da.cnt>0 && hotBarMap(0).isFixed) + orig.x = 0; + else + orig.x = hotBarMap(inx).x-hotBarMap(hotBarCurrStart).x + (inx>0?fixed_x:0); + orig.y = 0; + size.x = hotBarMap(inx).w - 2.0/hotBarD.dpi; + size.y = toolbarHeight; +#ifdef LATER + printf( "HotBarHilite fixed_x:%0.3f X0:%d/%0.3f X:%d/%0.3f+%0.3f X=%0.3f\n", + fixed_x, + hotBarCurrStart, hotBarMap(hotBarCurrStart).x, + inx, hotBarMap(inx).x, hotBarMap(inx).w, + orig.x ); +#endif + DrawRectangle( &hotBarD, orig, size, wDrawColorBlack, DRAW_TRANSPARENT ); } static wFont_p hotBarFp = NULL; static wFontSize_t hotBarFs = 8; +static wWinPix_t hotBarTextHeight = 11; -static void RedrawHotBar( wDraw_p dd, void * data, wPos_t w, wPos_t h ) +static void RedrawHotBar( wDraw_p dd, void * data, wWinPix_t w, wWinPix_t h ) { - DIST_T hh = (double)hotBarDrawHeight/hotBarD.dpi; + DIST_T hh = (double)(hotBarHeight + 1)/hotBarD.dpi; coOrd orig; int inx; hotBarMap_t * tbm; @@ -101,22 +112,29 @@ static void RedrawHotBar( wDraw_p dd, void * data, wPos_t w, wPos_t h ) DIST_T x; wDrawClear( hotBarD.d ); - wControlActive( (wControl_p)hotBarLeftB, hotBarCurrStart > 0 ); + if (hotBarCurrStart >0) + wControlActive( (wControl_p)hotBarLeftB, TRUE ); + else { + wButtonSetBusy(hotBarLeftB, FALSE); + wControlActive( (wControl_p)hotBarLeftB, FALSE ); + } + if (hotBarCurrStart < 0) { + wButtonSetBusy(hotBarRightB, FALSE); wControlActive( (wControl_p)hotBarRightB, FALSE ); return; } if ( hotBarLabels && !hotBarFp ) hotBarFp = wStandardFont( F_HELV, FALSE, FALSE ); - wPos_t textSize = wMessageGetHeight(0L); + DIST_T fixed_x = 0.0; if (hotBarCurrStart>0 && hotBarMap_da.cnt>0 && hotBarMap(0).isFixed) { //Do fixed element first - Cornu tbm = &hotBarMap(0); barScale = tbm->barScale; x = 0.0; - orig.y = hh/2.0*barScale - tbm->size.y/2.0 - tbm->orig.y; + orig.y = barScale/hotBarD.dpi + hh/2.0*barScale - tbm->size.y/2.0 - tbm->orig.y; if ( hotBarLabels ) { - orig.y += textSize/hotBarD.dpi*barScale; + orig.y += hotBarTextHeight/hotBarD.dpi*barScale; if ( tbm->labelW > tbm->objectW ) { fixed_x = tbm->labelW; x += (tbm->labelW-tbm->objectW)/2; @@ -139,13 +157,13 @@ static void RedrawHotBar( wDraw_p dd, void * data, wPos_t w, wPos_t h ) for ( inx=hotBarCurrStart; inx < hotBarMap_da.cnt; inx++ ) { tbm = &hotBarMap(inx); barScale = tbm->barScale; - x = tbm->x - hotBarMap(hotBarCurrStart).x + fixed_x; //Add space for fixed at start - if ( x + tbm->w + fixed_x > barWidth ) { + x = tbm->x - hotBarMap(hotBarCurrStart).x + fixed_x; + if ( x + tbm->w > barWidth ) { break; } - orig.y = hh/2.0*barScale - tbm->size.y/2.0 - tbm->orig.y; + orig.y = barScale/hotBarD.dpi + hh/2.0*barScale - tbm->size.y/2.0 - tbm->orig.y; if ( hotBarLabels ) { - orig.y += textSize/hotBarD.dpi*barScale; + orig.y += hotBarTextHeight/hotBarD.dpi*barScale; if ( tbm->labelW > tbm->objectW ) { x += (tbm->labelW-tbm->objectW)/2; } @@ -170,7 +188,12 @@ static void RedrawHotBar( wDraw_p dd, void * data, wPos_t w, wPos_t h ) HotBarHighlight( hotBarCurrSelect, fixed_x ); /* else hotBarCurrSelect = -1;*/ - wControlActive( (wControl_p)hotBarRightB, hotBarCurrEnd < hotBarMap_da.cnt ); + if (hotBarCurrEnd < hotBarMap_da.cnt) + wControlActive( (wControl_p)hotBarRightB, TRUE ); + else { + wButtonSetBusy(hotBarRightB, FALSE); + wControlActive( (wControl_p)hotBarRightB, FALSE ); + } wPrefSetInteger( "misc", "hotbar-start", hotBarCurrStart ); } @@ -187,7 +210,11 @@ static void DoHotBarRight( void * data ) } if ( inx >= hotBarMap_da.cnt ) inx = hotBarMap_da.cnt-1; - while ( inx > 1 && lastX - hotBarMap(inx-1).x <= barWidth ) + DIST_T fixed_x = 0.0; + if (hotBarCurrStart>0 && hotBarMap(0).isFixed) { + fixed_x = hotBarMap(0).w; + } + while ( (inx > 1) && ((lastX - hotBarMap(inx-1).x) < (barWidth - fixed_x)) ) inx--; if ( inx != hotBarCurrStart ) { hotBarCurrStart = inx; @@ -237,12 +264,12 @@ static void DoHotBarJump( int inx ) } -static void SelectHotBar( wDraw_p d, void * context, wAction_t action, wPos_t w, wPos_t h ) +static void SelectHotBar( wDraw_p d, void * context, wAction_t action, wDrawPix_t w, wDrawPix_t h ) { int inx; coOrd pos; DIST_T x; - wPos_t px; + wWinPix_t px; hotBarMap_t * tbm; char * titleP; @@ -279,11 +306,11 @@ static void SelectHotBar( wDraw_p d, void * context, wAction_t action, wPos_t w, return; tbm = &hotBarMap(inx); if (inx==0) { - px = (wPos_t)((tbm->x-hotBarMap(0).x)*hotBarD.dpi); + px = (wWinPix_t)((tbm->x-hotBarMap(0).x)*hotBarD.dpi); } else { - px = (wPos_t)(((tbm->x-hotBarMap(hotBarCurrStart).x)+fixed_x)*hotBarD.dpi); + px = (wWinPix_t)(((tbm->x-hotBarMap(hotBarCurrStart).x)+fixed_x)*hotBarD.dpi); } - px += (wPos_t)(tbm->w*hotBarD.dpi/2); + px += (wWinPix_t)(tbm->w*hotBarD.dpi/2); titleP = tbm->proc( HB_LISTTITLE, tbm->context, NULL, NULL ); px -= wLabelWidth( titleP ) / 2; wControlSetBalloon( (wControl_p)hotBarD.d, px, -20, titleP ); @@ -386,7 +413,7 @@ static BOOL_T HotBarSelectPlayback( char * line ) static void HotbarJump( int inx, const char * name, void * arg ) { - hotBarCurrStart = (int)(long)arg; + hotBarCurrStart = (int)VP2L(arg); RedrawHotBar( hotBarD.d, NULL, 0, 0 ); } @@ -412,19 +439,22 @@ EXPORT void AddHotBarElement( hotBarMap_t * tbm; coOrd textsize; - if ( contentsLabel && strncmp(contentsLabel, curContentsLabel, sizeof curContentsLabel) != 0 ) { - wMenuListAdd( hotBarML, hotBarMLcnt++, contentsLabel, (void*)(intptr_t)hotBarMap_da.cnt ); + if ( contentsLabel && strncmp(contentsLabel, curContentsLabel, sizeof curContentsLabel) != 0 && !isFixed ) { + wMenuListAdd( hotBarML, hotBarMLcnt++, contentsLabel, I2VP(hotBarMap_da.cnt) ); strncpy( curContentsLabel, contentsLabel, sizeof curContentsLabel ); } - if (barScale <= 0) { if (!isTrack) - barScale = size.y/((double)hotBarDrawHeight/hotBarD.dpi); + barScale = size.y/(((double)hotBarHeight-2.0)/hotBarD.dpi); else if (isTrack) { - barScale = (trackGauge>0.1)?trackGauge*24:10; - if (size.y >= size.x) - barScale = size.y/((double)hotBarDrawHeight/hotBarD.dpi); + // size.y += 2.0 * trackGauge; + barScale = (trackGauge>0.1)?trackGauge*(36-hotBarHeight/2):10.0; + // barScale = 2.0 / ((hotBarHeight-2.0) / hotBarD.dpi); + //if (size.y >= size.x) + if (size.y/barScale > ((double)hotBarHeight-2.0)/hotBarD.dpi) + barScale = (size.y+2.0*trackGauge)/(((double)hotBarHeight-2.0)/hotBarD.dpi); } + // orig.y += 1.0/hotBarD.dpi; } DYNARR_APPEND( hotBarMap_t, hotBarMap_da, 10 ); tbm = &hotBarMap(hotBarMap_da.cnt-1); @@ -465,27 +495,27 @@ static void ChangeHotBar( long changes ) if ( hotBarLabels && !hotBarFp ) hotBarFp = wStandardFont( F_HELV, FALSE, FALSE ); if (hotBarLeftB != NULL && curScaleName) { - hotBarWidth = 0.0; - hotBarMLcnt = 0; - wMenuListClear( hotBarML ); - DYNARR_RESET( hotBarMap_t, hotBarMap_da ); - curContentsLabel[0] = '\0'; - if ( programMode == MODE_DESIGN ) { - if (showFlexTrack) - AddHotBarCornu(); - AddHotBarTurnouts(); - AddHotBarStructures(); - } else { - AddHotBarCarDesc(); - } + hotBarWidth = 0.0; + hotBarMLcnt = 0; + wMenuListClear( hotBarML ); + DYNARR_RESET( hotBarMap_t, hotBarMap_da ); + curContentsLabel[0] = '\0'; + if ( programMode == MODE_DESIGN ) { + if (showFlexTrack) + AddHotBarCornu(); + AddHotBarTurnouts(); + AddHotBarStructures(); + } else { + AddHotBarCarDesc(); + } - if ( programModeOld != programMode ) { - hotBarCurrSelects[0] = hotBarCurrSelects[1] = -1; - programModeOld = programMode; - } - if (hotBarMap_da.cnt > 0 && (hotBarCurrStart >= hotBarMap_da.cnt||hotBarCurrStart < 0)) - hotBarCurrStart = 0; - RedrawHotBar( NULL, NULL, 0, 0 ); + if ( programModeOld != programMode ) { + hotBarCurrSelects[0] = hotBarCurrSelects[1] = -1; + programModeOld = programMode; + } + if (hotBarMap_da.cnt > 0 && (hotBarCurrStart >= hotBarMap_da.cnt||hotBarCurrStart < 0)) + hotBarCurrStart = 0; + RedrawHotBar( NULL, NULL, 0, 0 ); } } @@ -501,45 +531,52 @@ EXPORT void InitHotBar( void ) hotBarCurrStart = (int)v; hotbarPopupM = MenuRegister( "Hotbar Select" ); hotBarML = wMenuListCreate( hotbarPopupM, "", -1, HotbarJump ); + hotBarHeight = hotBarDrawHeight[iconSize]; + hotBarFs = hotBarFontSize[iconSize]; } EXPORT void LayoutHotBar( void * redraw ) { - wPos_t buttonWidth, winWidth, winHeight; + wWinPix_t buttonHeight, buttonWidth, winWidth, winHeight; + wWinPix_t hbHeight = hotBarHeight; BOOL_T initialize = FALSE; wWinGetSize( mainW, &winWidth, &winHeight ); - hotBarHeight = hotBarDrawHeight; + /** @prefs [Preference] LargeIcons=1.5 Sets Icon scaling limits 1.0 to 2.0 */ double scaleicon; wPrefGetFloat(PREFSECTION, LARGEICON, &scaleicon, 1.0); if (scaleicon<1.0) scaleicon=1.0; if (scaleicon>2.0) scaleicon=2.0; - if (scaleicon>1.0) { - hotBarHeight = hotBarHeight*scaleicon; - } + //if (scaleicon>1.0) { + // hotBarHeight = (wWinPix_t)(hotBarHeight); + //} + hotBarTextHeight = (wWinPix_t)round(wMessageGetHeight(0L) * (0.5 + (double)iconSize / 10.0)); + if ( hotBarLabels) { - hotBarHeight += wMessageGetHeight(0L); + hbHeight += hotBarTextHeight; } if (hotBarLeftB == NULL) { wIcon_p bm_p; if (winWidth < 50) return; bm_p = wIconCreateBitMap( 16, 16, turnbarl_bits, wDrawColorBlack ); - hotBarLeftB = wButtonCreate( mainW, 0, 0, "hotBarLeft", (char*)bm_p, BO_ICON, 0, DoHotBarLeft, NULL ); + hotBarLeftB = wButtonCreate( mainW, 0, 0, "hotBarLeft", (char*)bm_p, BO_ICON|BO_REPEAT, 0, DoHotBarLeft, NULL ); bm_p = wIconCreateBitMap( 16, 16, turnbarr_bits, wDrawColorBlack ); - hotBarRightB = wButtonCreate( mainW, 0, 0, "hotBarRight", (char*)bm_p, BO_ICON, 0, DoHotBarRight, NULL ); - hotBarD.d = wDrawCreate( mainW, 0, 0, NULL, BD_NOCAPTURE|BD_NOFOCUS, 100, hotBarHeight, NULL, RedrawHotBar, SelectHotBar ); + hotBarRightB = wButtonCreate( mainW, 0, 0, "hotBarRight", (char*)bm_p, BO_ICON|BO_REPEAT, 0, DoHotBarRight, NULL ); + hotBarD.d = wDrawCreate( mainW, 0, 0, NULL, BD_NOCAPTURE|BD_NOFOCUS, 100, hbHeight, NULL, RedrawHotBar, SelectHotBar ); hotBarD.dpi = wDrawGetDPI( hotBarD.d ); hotBarD.scale = 1.0; + wSetCursor(hotBarD.d,wCursorNormal); initialize = TRUE; } buttonWidth = wControlGetWidth((wControl_p)hotBarLeftB); - wControlSetPos( (wControl_p)hotBarLeftB, 0, toolbarHeight ); - wControlSetPos( (wControl_p)hotBarRightB, winWidth-20-buttonWidth, toolbarHeight ); - wControlSetPos( (wControl_p)hotBarD.d, buttonWidth, toolbarHeight ); - wDrawSetSize( hotBarD.d, winWidth-20-buttonWidth*2, hotBarHeight+2, redraw ); + buttonHeight = wControlGetHeight((wControl_p)hotBarLeftB); + wControlSetPos( (wControl_p)hotBarLeftB, HOTBAR_LEFT, toolbarHeight+(hbHeight-buttonHeight)/2 ); + wControlSetPos( (wControl_p)hotBarRightB, winWidth-20-buttonWidth+HOTBAR_LEFT+1, toolbarHeight+(hbHeight-buttonHeight)/2 ); + wControlSetPos( (wControl_p)hotBarD.d, buttonWidth+HOTBAR_LEFT+1, toolbarHeight ); + wDrawSetSize( hotBarD.d, winWidth-20-buttonWidth*2, hbHeight+2, redraw ); hotBarD.size.x = ((double)(winWidth-20-buttonWidth*2))/hotBarD.dpi*hotBarD.scale; - hotBarD.size.y = (double)hotBarDrawHeight/hotBarD.dpi*hotBarD.scale; //Exclude Label from calc + hotBarD.size.y = (double)hotBarHeight/hotBarD.dpi*hotBarD.scale; //Exclude Label from calc wControlShow( (wControl_p)hotBarLeftB, TRUE ); wControlShow( (wControl_p)hotBarRightB, TRUE ); wControlShow( (wControl_p)hotBarD.d, TRUE ); @@ -547,7 +584,7 @@ EXPORT void LayoutHotBar( void * redraw ) ChangeHotBar( CHANGE_PARAMS ); else if (!redraw) RedrawHotBar( NULL, NULL, 0, 0 ); - toolbarHeight += hotBarHeight+3; + toolbarHeight += hbHeight+3; } void HideHotBar( void ) diff --git a/app/bin/cjoin.c b/app/bin/cjoin.c index 71f4dae..a027327 100644 --- a/app/bin/cjoin.c +++ b/app/bin/cjoin.c @@ -30,16 +30,14 @@ #include "cstraigh.h" #include "cjoin.h" #include "ccornu.h" -#include "i18n.h" -#include "utility.h" -#include "math.h" -#include "messages.h" #include "param.h" #include "cundo.h" #include "cselect.h" #include "fileio.h" +#include "common-ui.h" static BOOL_T debug = 0; +/** @logcmd @showrefby join=n cjoin.c */ static int log_join = 0; typedef struct { curveType_e type; @@ -101,7 +99,7 @@ LOG( log_join, 2, ( /* 3 - cases: */ if (b >= 360.0-connectAngle/2.0 || b <= connectAngle/2.0) { /* CASE 1: antiparallel */ - FindPos( &off, NULL, pos1, pos0, a0, 10000.0 ); + FindPos( &off, NULL, pos1, pos0, a0, DIST_INF ); res->arcR = off.y/2.0; res->arcA1 = 180.0; LOG( log_join, 3, ("JwL: parallel: off.y=%0.3f\n", off.y ) ) @@ -115,7 +113,7 @@ LOG( log_join, 3, ("JwL: parallel: off.y=%0.3f\n", off.y ) ) } } else if (b >= 180.0-connectAngle/2.0 && b <= 180.0+connectAngle/2.0) { /* CASE 2: parallel, possibly colinear? */ - FindPos( &off, &beyond, pos0, pos1, a0, 100000.0 ); + FindPos( &off, &beyond, pos0, pos1, a0, DIST_INF ); LOG( log_join, 3, ("JwL: colinear? off.y=%0.3f\n", off.y ) ) if (off.y > -connectDistance && off.y < connectDistance) { res->type = curveTypeStraight; @@ -389,8 +387,8 @@ static STATUS_T DoMoveToJoin( coOrd pos ) } if ( (Dj.inp[Dj.joinMoveState].trk = OnTrack( &pos, TRUE, TRUE )) == NULL ) return C_CONTINUE; - if (!CheckTrackLayer( Dj.inp[Dj.joinMoveState].trk ) ) - return C_CONTINUE; + // if (Dj.joinMoveState == 0 && !CheckTrackLayerSilent( Dj.inp[Dj.joinMoveState].trk ) ) + // return C_CONTINUE; Dj.inp[Dj.joinMoveState].params.ep = PickUnconnectedEndPoint( pos, Dj.inp[Dj.joinMoveState].trk ); /* CHECKME */ if ( Dj.inp[Dj.joinMoveState].params.ep == -1 ) { #ifdef LATER @@ -477,6 +475,7 @@ static STATUS_T CmdJoinLine( tempSegs_da.cnt = 0; DYNARR_RESET(trkSeg_t,Dl.newLine); Dl.curr_line = NULL; + SetAllTrackSelect( FALSE ); return C_CONTINUE; case wActionMove: DYNARR_RESET(trkSeg_t,Dl.anchors_da); @@ -527,10 +526,18 @@ static STATUS_T CmdJoinLine( DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.polyType = POLYLINE; DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts = MyMalloc(sizeof(pts_t)*Dl.params.nodes.cnt); DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt = Dl.params.nodes.cnt; - //Copy in reverse as we want this point to be last - for (int i=0;i=0;i--,j++) { + DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt = DYNARR_N(coOrd,Dl.params.nodes,i); + DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt_type = wPolyLineStraight; + } + } else { + //Copy forwards to end up with this point last + for (int i=0; i=0;i--,j++) { + DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt = DYNARR_N(coOrd,Dl.params.nodes,i); + DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.pts[j].pt_type = wPolyLineStraight; + } } DYNARR_LAST(trkSeg_t,Dl.newLine).u.p.cnt += Dl.params.nodes.cnt-join_near; } @@ -653,7 +668,7 @@ static paramData_t joinPLs[] = { #define joinRadI 0 { PD_FLOAT, &desired_radius, "radius", PDO_DIM, &r_0_10000, N_("Desired Radius") } }; -static paramGroup_t joinPG = { "join-fixed", 0, joinPLs, sizeof joinPLs/sizeof joinPLs[0] }; +static paramGroup_t joinPG = { "joinfixed", 0, joinPLs, COUNT( joinPLs ) }; @@ -849,6 +864,11 @@ static STATUS_T CmdJoin( trackParams_t moveParams; if (!GetTrackParams( PARAMS_1ST_JOIN, trk, pos, &moveParams )) return C_CONTINUE; + if (moveParams.type == curveTypeBezier || moveParams.type == curveTypeCornu) { + if (!(easementVal<0)) { + return C_CONTINUE; + } + } ep = PickUnconnectedEndPointSilent(pos,trk); if (ep <0) return C_CONTINUE; if (IsClose(FindDistance(GetTrkEndPos(trk,ep),pos))) @@ -888,10 +908,17 @@ LOG( log_join, 1, ("JOIN: 1st track %d @[%0.3f %0.3f]\n", GetTrkIndex(Dj.inp[0].trk), Dj.inp[0].pos.x, Dj.inp[1].pos.y ) ) if (!GetTrackParams( PARAMS_1ST_JOIN, Dj.inp[0].trk, pos, &Dj.inp[0].params )) return C_CONTINUE; + if (Dj.inp[0].params.type == curveTypeBezier || Dj.inp[0].params.type == curveTypeCornu) { + if (!(easementVal<0 && Dj.cornuMode)) { + ErrorMessage( MSG_JOIN_NOTBEZIERORCORNU); + return C_CONTINUE; + } + } Dj.inp[0].realType = GetTrkType(Dj.inp[0].trk); InfoMessage( _("Select 2nd track") ); Dj.state = 1; - wPrefGetFloat("misc", "desired_radius", &desired_radius, desired_radius); + sprintf(message, "desired_radius-%s", curScaleName); + wPrefGetFloat("misc", message, &desired_radius, desired_radius); controls[0] = joinRadPD.control; controls[1] = NULL; labels[0] = N_("Desired Radius"); @@ -944,6 +971,12 @@ LOG( log_join, 1, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) ) return C_CONTINUE; } } + if (Dj.inp[1].params.type == curveTypeBezier || Dj.inp[1].params.type == curveTypeCornu) { + if (!(easementVal<0 && Dj.cornuMode)) { + ErrorMessage( MSG_JOIN_NOTBEZIERORCORNU); + return C_CONTINUE; + } + } rc = C_CONTINUE; if ( MergeTracks( Dj.inp[0].trk, Dj.inp[0].params.ep, Dj.inp[1].trk, Dj.inp[1].params.ep ) ) { @@ -1027,6 +1060,8 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) ) } coOrd pos1 = pos; if (AdjustPosToRadius(&pos1,desired_radius+(Dj.jointD[0].x), na0, na1)) { + // Make sure this is initialized + beyond = 1.0; if (Dj.inp[1].params.type == curveTypeStraight) { FindPos( &off, &beyond, pos1, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle, FindDistance(Dj.inp[1].params.lineOrig,Dj.inp[1].params.lineEnd) ); @@ -1079,7 +1114,7 @@ LOG( log_join, 3, ("P1=[%0.3f %0.3f]\n", pos.x, pos.y ) ) break; case curveTypeStraight: FindPos( &off, &beyond, pos, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle, - 100000 ); + DIST_INF ); Translate( &Dj.inp[1].pos, Dj.inp[1].params.lineOrig, Dj.inp[1].params.angle, off.x ); normalAngle = NormalizeAngle( Dj.inp[1].params.angle + @@ -1142,7 +1177,7 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n", switch ( Dj.inp[0].params.type ) { case curveTypeStraight: FindPos( &off, &beyond, Dj.inp_pos[0], Dj.inp[0].params.lineOrig, - Dj.inp[0].params.angle, 100000.0 ); + Dj.inp[0].params.angle, DIST_INF ); if (beyond < 0.0) { InfoMessage(_("Beyond end of 1st track")); goto errorReturn; @@ -1153,7 +1188,7 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n", break; case curveTypeCurve: if (IsCurveCircle(Dj.inp[0].trk)) { - d = 10000.0; + d = DIST_INF; } else { a = FindAngle( Dj.inp[0].params.arcP, Dj.inp_pos[0] ); if (Dj.inp[0].params.ep == 0) @@ -1185,7 +1220,7 @@ LOG( log_join, 3, (" -E POS0=[%0.3f %0.3f] POS1=[%0.3f %0.3f]\n", break; case curveTypeCurve: if (IsCurveCircle(Dj.inp[1].trk)) { - d = 10000.0; + d = DIST_INF; } else { a = FindAngle( Dj.inp[1].params.arcP, Dj.inp_pos[1] ); if (Dj.inp[1].params.ep == 0) @@ -1332,8 +1367,10 @@ errorReturn: Dj.state = 0; DYNARR_RESET(trkSeg_t,Dj.anchors); rc = C_TERMINATE; - if (easementVal == 0.0) - wPrefSetFloat("misc", "desired_radius", desired_radius); + if (easementVal == 0.0) { + sprintf(message, "desired_radius-%s", curScaleName); + wPrefSetFloat("misc", message, desired_radius); + } if ( (!JoinTracks( Dj.inp[0].trk, Dj.inp[0].params.ep, Dj.inp_pos[0], trk, ep, Dj.jRes.pos[0], &Dj.jointD[0] ) ) || (!JoinTracks( Dj.inp[1].trk, Dj.inp[1].params.ep, Dj.inp_pos[1], @@ -1350,12 +1387,15 @@ errorReturn: return rc; case C_CANCEL: + SetAllTrackSelect( FALSE ); if (infoSubst) InfoSubstituteControls(NULL, NULL); infoSubst = FALSE; break; case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if ( Dj.joinMoveState == 1 || Dj.state == 1 ) { DrawFillCircle( &tempD, Dj.inp[0].pos, 0.10*mainD.scale, selectedColor ); } else if (easementVal<0 && Dj.joinMoveState == 0) @@ -1367,6 +1407,7 @@ errorReturn: case C_TEXT: case C_OK: + SetAllTrackSelect( FALSE ); if (easementVal<0 && Dj.cornuMode) return CmdCornu(action,pos); if (infoSubst) @@ -1387,14 +1428,15 @@ errorReturn: */ #include "bitmaps/join.xpm" -#include "bitmaps/joinline.xpm" +#include "bitmaps/join-line.xpm" void InitCmdJoin( wMenu_p menu ) { ButtonGroupBegin( _("Join"), "cmdJoinSetCmd", _("Join") ); - joinCmdInx = AddMenuButton( menu, CmdJoin, "cmdJoinTrack", _("Join Track"), wIconCreatePixMap(join_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL ); - AddMenuButton( menu, CmdJoinLine, "cmdJoinLine", _("Join Lines"), wIconCreatePixMap(joinline_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL ); + joinCmdInx = AddMenuButton( menu, CmdJoin, "cmdJoinTrack", _("Join Track"), wIconCreatePixMap(join_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL ); + AddMenuButton( menu, CmdJoinLine, "cmdJoinLine", _("Join Lines"), wIconCreatePixMap(join_line_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_JOIN, NULL ); ButtonGroupEnd(); + /** @logcmd @showrefby join=n cjoin.c Log Join Lines and Tracks command */ log_join = LogFindIndex( "join" ); } diff --git a/app/bin/cjoin.h b/app/bin/cjoin.h index 8d9c7e3..eabdce0 100644 --- a/app/bin/cjoin.h +++ b/app/bin/cjoin.h @@ -23,8 +23,6 @@ #define HAVE_CJOIN_H #include "common.h" -#include "wlib.h" -#include "track.h" #define E_NOTREQ (0) #define E_REQ (1) @@ -48,6 +46,7 @@ void UndoJoint( track_p, EPINX_T, track_p, EPINX_T ); void DrawJointTrack( drawCmd_p, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T, BOOL_T, track_p, EPINX_T, EPINX_T, DIST_T, wDrawColor, long ); DIST_T JointDistance( coOrd *, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T ); coOrd GetJointSegEndPos( coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T, BOOL_T, EPINX_T, ANGLE_T * ); +DIST_T JointDescriptionDistance(coOrd pos, track_p trk, coOrd * dpos, BOOL_T show_hidden, BOOL_T * hidden); #endif // !HAVE_CJOIN_H diff --git a/app/bin/cmisc.c b/app/bin/cmisc.c index b41ae42..9685503 100644 --- a/app/bin/cmisc.c +++ b/app/bin/cmisc.c @@ -20,15 +20,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include "common.h" -#include "utility.h" #include "cundo.h" -#include "i18n.h" -#include "messages.h" #include "param.h" +#include "fileio.h" +#include "cselect.h" #include "track.h" +#include "common-ui.h" EXPORT wIndex_t describeCmdInx; EXPORT BOOL_T inDescribeCmd; @@ -45,8 +43,8 @@ static POS_T descBorder; static wDrawColor descColor = 0; static BOOL_T descUndoStarted; static BOOL_T descNeedDrawHilite; -static wPos_t describeW_posy; -static wPos_t describeCmdButtonEnd; +static wWinPix_t describeW_posy; +static wWinPix_t describeCmdButtonEnd; static wMenu_p descPopupM; @@ -60,65 +58,65 @@ static char * pivotLabels[] = { N_("First"), N_("Middle"), N_("End"), NULL }; static char * boxLabels[] = { "", NULL }; static paramData_t describePLs[] = { #define I_FLOAT_0 (0) - { PD_FLOAT, NULL, "F1", 0, &rdata }, - { PD_FLOAT, NULL, "F2", 0, &rdata }, - { PD_FLOAT, NULL, "F3", 0, &rdata }, - { PD_FLOAT, NULL, "F4", 0, &rdata }, - { PD_FLOAT, NULL, "F5", 0, &rdata }, - { PD_FLOAT, NULL, "F6", 0, &rdata }, - { PD_FLOAT, NULL, "F7", 0, &rdata }, - { PD_FLOAT, NULL, "F8", 0, &rdata }, - { PD_FLOAT, NULL, "F9", 0, &rdata }, - { PD_FLOAT, NULL, "F10", 0, &rdata }, - { PD_FLOAT, NULL, "F11", 0, &rdata }, - { PD_FLOAT, NULL, "F12", 0, &rdata }, - { PD_FLOAT, NULL, "F13", 0, &rdata }, - { PD_FLOAT, NULL, "F14", 0, &rdata }, - { PD_FLOAT, NULL, "F15", 0, &rdata }, - { PD_FLOAT, NULL, "F16", 0, &rdata }, - { PD_FLOAT, NULL, "F17", 0, &rdata }, - { PD_FLOAT, NULL, "F18", 0, &rdata }, - { PD_FLOAT, NULL, "F19", 0, &rdata }, - { PD_FLOAT, NULL, "F20", 0, &rdata }, - { PD_FLOAT, NULL, "F21", 0, &rdata }, - { PD_FLOAT, NULL, "F22", 0, &rdata }, - { PD_FLOAT, NULL, "F23", 0, &rdata }, - { PD_FLOAT, NULL, "F24", 0, &rdata }, - { PD_FLOAT, NULL, "F25", 0, &rdata }, - { PD_FLOAT, NULL, "F26", 0, &rdata }, - { PD_FLOAT, NULL, "F27", 0, &rdata }, - { PD_FLOAT, NULL, "F28", 0, &rdata }, - { PD_FLOAT, NULL, "F29", 0, &rdata }, - { PD_FLOAT, NULL, "F30", 0, &rdata }, - { PD_FLOAT, NULL, "F31", 0, &rdata }, - { PD_FLOAT, NULL, "F32", 0, &rdata }, - { PD_FLOAT, NULL, "F33", 0, &rdata }, - { PD_FLOAT, NULL, "F34", 0, &rdata }, - { PD_FLOAT, NULL, "F35", 0, &rdata }, - { PD_FLOAT, NULL, "F36", 0, &rdata }, - { PD_FLOAT, NULL, "F37", 0, &rdata }, - { PD_FLOAT, NULL, "F38", 0, &rdata }, - { PD_FLOAT, NULL, "F39", 0, &rdata }, - { PD_FLOAT, NULL, "F40", 0, &rdata }, + { PD_FLOAT, NULL, "F1", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F2", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F3", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F4", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F5", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F6", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F7", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F8", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F9", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F10", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F11", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F12", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F13", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F14", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F15", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F16", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F17", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F18", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F19", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F20", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F21", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F22", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F23", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F24", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F25", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F26", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F27", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F28", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F29", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F30", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F31", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F32", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F33", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F34", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F35", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F36", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F37", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F38", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F39", PDO_NOPREF, &rdata }, + { PD_FLOAT, NULL, "F40", PDO_NOPREF, &rdata }, #define I_FLOAT_N I_FLOAT_0+40 #define I_LONG_0 I_FLOAT_N - { PD_LONG, NULL, "I1", 0, &idata }, - { PD_LONG, NULL, "I2", 0, &idata }, - { PD_LONG, NULL, "I3", 0, &idata }, - { PD_LONG, NULL, "I4", 0, &idata }, - { PD_LONG, NULL, "I5", 0, &idata }, + { PD_LONG, NULL, "I1", PDO_NOPREF, &idata }, + { PD_LONG, NULL, "I2", PDO_NOPREF, &idata }, + { PD_LONG, NULL, "I3", PDO_NOPREF, &idata }, + { PD_LONG, NULL, "I4", PDO_NOPREF, &idata }, + { PD_LONG, NULL, "I5", PDO_NOPREF, &idata }, #define I_LONG_N I_LONG_0+5 #define I_STRING_0 I_LONG_N - { PD_STRING, NULL, "S1", 0, (void*)300 }, - { PD_STRING, NULL, "S2", 0, (void*)300 }, - { PD_STRING, NULL, "S3", 0, (void*)300 }, - { PD_STRING, NULL, "S4", 0, (void*)300 }, + { PD_STRING, NULL, "S1", PDO_NOPREF, I2VP(300) }, + { PD_STRING, NULL, "S2", PDO_NOPREF, I2VP(300) }, + { PD_STRING, NULL, "S3", PDO_NOPREF, I2VP(300) }, + { PD_STRING, NULL, "S4", PDO_NOPREF, I2VP(300) }, #define I_STRING_N I_STRING_0+4 #define I_LAYER_0 I_STRING_N - { PD_DROPLIST, NULL, "Y1", 0, (void*)150, NULL, 0 }, + { PD_DROPLIST, NULL, "Y1", PDO_NOPREF, I2VP(150), NULL, 0 }, #define I_LAYER_N I_LAYER_0+1 #define I_COLOR_0 I_LAYER_N @@ -126,22 +124,22 @@ static paramData_t describePLs[] = { #define I_COLOR_N I_COLOR_0+1 #define I_LIST_0 I_COLOR_N - { PD_DROPLIST, NULL, "L1", 0, (void*)150, NULL, 0 }, - { PD_DROPLIST, NULL, "L2", 0, (void*)150, NULL, 0 }, - { PD_DROPLIST, NULL, "L3", 0, (void*)150, NULL, 0 }, - { PD_DROPLIST, NULL, "L4", 0, (void*)150, NULL, 0 }, + { PD_DROPLIST, NULL, "L1", PDO_NOPREF, I2VP(150), NULL, 0 }, + { PD_DROPLIST, NULL, "L2", PDO_NOPREF, I2VP(150), NULL, 0 }, + { PD_DROPLIST, NULL, "L3", PDO_NOPREF, I2VP(150), NULL, 0 }, + { PD_DROPLIST, NULL, "L4", PDO_NOPREF, I2VP(150), NULL, 0 }, #define I_LIST_N I_LIST_0+4 #define I_EDITLIST_0 I_LIST_N - { PD_DROPLIST, NULL, "LE1", 0, (void*)150, NULL, BL_EDITABLE }, + { PD_DROPLIST, NULL, "LE1", PDO_NOPREF, I2VP(150), NULL, BL_EDITABLE }, #define I_EDITLIST_N I_EDITLIST_0+1 #define I_TEXT_0 I_EDITLIST_N - { PD_TEXT, NULL, "T1", 0, &tdata, NULL, BT_HSCROLL }, + { PD_TEXT, NULL, "T1", PDO_NOPREF, &tdata, NULL, BT_HSCROLL }, #define I_TEXT_N I_TEXT_0+1 #define I_PIVOT_0 I_TEXT_N - { PD_RADIO, NULL, "P1", 0, pivotLabels, N_("Pivot"), BC_HORZ|BC_NOBORDER, 0 }, + { PD_RADIO, NULL, "P1", PDO_NOPREF, pivotLabels, N_("Lock"), BC_HORZ|BC_NOBORDER, 0 }, #define I_PIVOT_N I_PIVOT_0+1 #define I_TOGGLE_0 I_PIVOT_N @@ -152,7 +150,7 @@ static paramData_t describePLs[] = { #define I_TOGGLE_N I_TOGGLE_0+4 }; -static paramGroup_t describePG = { "describe", 0, describePLs, sizeof describePLs/sizeof describePLs[0] }; +static paramGroup_t describePG = { "describe", 0, describePLs, COUNT( describePLs ) }; /** * A mapping table is used to map the index in the dropdown list to the layer @@ -198,8 +196,6 @@ SearchEditableLayerList(unsigned int layer) static void DrawDescHilite(BOOL_T selected) { - wPos_t x, y, w, h; - if (descNeedDrawHilite == FALSE) { return; } @@ -207,11 +203,7 @@ static void DrawDescHilite(BOOL_T selected) if (descColor==0) { descColor = wDrawColorGray(87); } - - w = (wPos_t)((descSize.x/mainD.scale)*mainD.dpi+0.5); - h = (wPos_t)((descSize.y/mainD.scale)*mainD.dpi+0.5); - mainD.CoOrd2Pix(&mainD,descOrig,&x,&y); - wDrawFilledRectangle(tempD.d, x, y, w, h, selected?descColor:wDrawColorBlue, wDrawOptTemp|wDrawOptTransparent); + DrawRectangle(&tempD, descOrig, descSize, selected?descColor:wDrawColorBlue, DRAW_TRANSPARENT); } @@ -248,26 +240,27 @@ static void DescribeUpdate( } UndoModify(descTrk); - descUpdateFunc(descTrk, ddp-descData, descData, FALSE); + descUpdateFunc(descTrk, (int)(ddp-descData), descData, FALSE); if (descTrk) { GetBoundingBox(descTrk, &hi, &lo); + if ((ddp->mode&DESC_NOREDRAW) == 0) { + descOrig = lo; + descSize = hi; + descOrig.x -= descBorder; + descOrig.y -= descBorder; + descSize.x -= descOrig.x-descBorder; + descSize.y -= descOrig.y-descBorder; + } + if (OFF_D(mapD.orig, mapD.size, descOrig, descSize)) { ErrorMessage(MSG_MOVE_OUT_OF_BOUNDS); } } - if ((ddp->mode&DESC_NOREDRAW) == 0) { - descOrig = lo; - descSize = hi; - descOrig.x -= descBorder; - descOrig.y -= descBorder; - descSize.x -= descOrig.x-descBorder; - descSize.y -= descOrig.y-descBorder; - } - for (inx = 0; inx < sizeof describePLs/sizeof describePLs[0]; inx++) { + for (inx = 0; inx < COUNT( describePLs ); inx++) { if ((describePLs[inx].option & PDO_DLGIGNORE) != 0) { continue; } @@ -283,6 +276,12 @@ static void DescribeUpdate( continue; } + if (ddp->mode&DESC_RO) { + wControlActive(ddp->control0, FALSE); + } else { + wControlActive(ddp->control0, TRUE); + } + ddp->mode &= ~DESC_CHANGE; if (ddp->type == DESC_POS) { //POS Has two fields if (ddp->mode&DESC_CHANGE2) { @@ -291,6 +290,7 @@ static void DescribeUpdate( ddp->mode |= DESC_CHANGE2; //First time } } + ParamLoadControl(&describePG, inx); } } @@ -351,7 +351,7 @@ static struct { */ static wControl_p AssignParamToDescribeDialog(descData_p ddp, void * valueP, char * label, - wPos_t sep) + wWinPix_t sep) { int inx; @@ -393,12 +393,12 @@ static wControl_p AssignParamToDescribeDialog(descData_p ddp, void * valueP, cha static void DescribeLayout( paramData_t * pd, int inx, - wPos_t colX, - wPos_t * x, - wPos_t * y) + wWinPix_t colX, + wWinPix_t * x, + wWinPix_t * y) { descData_p ddp; - wPos_t w, h; + wWinPix_t w, h; if (inx < 0) { return; @@ -463,7 +463,7 @@ void DoDescribe(char * title, track_p trk, descData_p data, descUpdate_t update) describeCmdButtonEnd = wControlBelow((wControl_p)describePG.helpB); } - for (inx=0; inxmode |= ro_mode; + ddp->mode |= DESC_RO; } for (ddp=data; ddp->type != DESC_NULL; ddp++) { @@ -488,7 +488,8 @@ void DoDescribe(char * title, track_p trk, descData_p data, descUpdate_t update) ddp->posy = describeW_posy; ddp->control0 = AssignParamToDescribeDialog(ddp, ddp->valueP, label, (ddp->type == DESC_POS?3:3)); - wControlActive(ddp->control0, ((ddp->mode|ro_mode)&DESC_RO)==0); + if (ddp->type != DESC_LAYER) + wControlActive(ddp->control0, (!(ddp->mode&DESC_RO))); switch (ddp->type) { case DESC_POS: @@ -496,21 +497,33 @@ void DoDescribe(char * title, track_p trk, descData_p data, descUpdate_t update) &((coOrd*)(ddp->valueP))->y, NULL, 0); - wControlActive(ddp->control1, ((ddp->mode|ro_mode)&DESC_RO)==0); + wControlActive(ddp->control1, (!(ddp->mode&DESC_RO))); break; case DESC_LAYER: - wListClear((wList_p)ddp->control0); // Rebuild list on each invovation + wListClear((wList_p)ddp->control0); // Rebuild list on each invocation - for (inx = 0; inxcontrol0, layerFormattedName, NULL, (void*)(long)inx); + if (ro_mode) { + char *layerFormattedName; + layerFormattedName = FormatLayerName(*(int *)(ddp->valueP)); + wListAddValue((wList_p)ddp->control0, layerFormattedName, NULL, I2VP(inx)); free(layerFormattedName); + *(int *)(ddp->valueP) = 0; + layerValue = (int *)(ddp->valueP); + wControlActive(ddp->control0, FALSE); + } else { + for (inx = 0; inxcontrol0, layerFormattedName, NULL, I2VP(inx)); + free(layerFormattedName); + } + + *(int *)(ddp->valueP) = SearchEditableLayerList(*(int *)(ddp->valueP)); + layerValue = (int *)(ddp->valueP); + wControlActive(ddp->control0, TRUE); } - *(int *)(ddp->valueP) = SearchEditableLayerList(*(int *)(ddp->valueP)); - layerValue = (int *)(ddp->valueP); break; default: @@ -528,7 +541,7 @@ void DoDescribe(char * title, track_p trk, descData_p data, descUpdate_t update) static void DescChange(long changes) { - if ((changes&CHANGE_UNITS) && describePG.win && wWinIsVisible(describePG.win)) { + if ((changes&CHANGE_UNITS) && describePG.win && wWinIsVisible(describePG.win)) { ParamLoadControls(&describePG); } } @@ -544,8 +557,8 @@ EXPORT void DescribeCancel(void) { if (describePG.win && wWinIsVisible(describePG.win)) { if (descTrk) { - if (!IsTrackDeleted(descTrk)) - descUpdateFunc(descTrk, -1, descData, TRUE); + ASSERT(!IsTrackDeleted(descTrk)); + descUpdateFunc(descTrk, -1, descData, TRUE); descTrk = NULL; } @@ -569,7 +582,7 @@ EXPORT STATUS_T CmdDescribe(wAction_t action, coOrd pos) switch (action) { case C_START: - InfoMessage(_("Select track to describe")); + InfoMessage(_("Select track to describe +Shift for Frozen")); wSetCursor(mainD.d,wCursorQuestion); descUndoStarted = FALSE; trk = NULL; @@ -577,11 +590,20 @@ EXPORT STATUS_T CmdDescribe(wAction_t action, coOrd pos) case wActionMove: trk = OnTrack(&pos, FALSE, FALSE); + if (trk && GetLayerFrozen(GetTrkLayer(trk)) && !(MyGetKeyState() & WKEY_SHIFT)) { + trk = NULL; + return C_CONTINUE; + } return C_CONTINUE; case C_DOWN: if ((trk = OnTrack(&pos, FALSE, FALSE)) != NULL) { + if (GetLayerFrozen(GetTrkLayer(trk)) && !(MyGetKeyState()& WKEY_SHIFT)) { + InfoMessage("Track is Frozen, Add Shift to Describe"); + trk = NULL; + return C_CONTINUE; + } if (describePG.win && wWinIsVisible(describePG.win) && descTrk) { descUpdateFunc(descTrk, -1, descData, TRUE); descTrk = NULL; @@ -613,7 +635,18 @@ EXPORT STATUS_T CmdDescribe(wAction_t action, coOrd pos) case C_REDRAW: if (describePG.win && wWinIsVisible(describePG.win) && descTrk) { + descNeedDrawHilite = TRUE; + coOrd lo,hi; + GetBoundingBox(descTrk,&hi,&lo); + descOrig = lo; + descSize = hi; + descOrig.x -= descBorder; + descOrig.y -= descBorder; + descSize.x -= descOrig.x-descBorder; + descSize.y -= descOrig.y-descBorder; + DrawDescHilite(TRUE); + if (descTrk && QueryTrack(descTrk, Q_IS_DRAW)) { DrawOriginAnchor(descTrk); } @@ -650,7 +683,7 @@ extern wIndex_t panCmdInx; void InitCmdDescribe(wMenu_p menu) { describeCmdInx = AddMenuButton(menu, CmdDescribe, "cmdDescribe", - _("Properties"), wIconCreatePixMap(describe_xpm), + _("Properties"), wIconCreatePixMap(describe_xpm[iconSize]), LEVEL0, IC_CANCEL|IC_POPUP|IC_WANT_MOVE|IC_CMDMENU, ACCL_DESCRIBE, NULL); RegisterChangeNotification(DescChange); ParamRegister(&describePG); @@ -658,8 +691,8 @@ void InitCmdDescribe(wMenu_p menu) void InitCmdDescribe2(wMenu_p menu) { descPopupM = MenuRegister( "Describe Context Menu" ); - wMenuPushCreate(descPopupM, "cmdSelectMode", GetBalloonHelpStr("cmdSelectMode"), 0, DoCommandB, (void*) (intptr_t) selectCmdInx); - wMenuPushCreate(descPopupM, "cmdModifyMode", GetBalloonHelpStr("cmdModifyMode"), 0, DoCommandB, (void*) (intptr_t) modifyCmdInx); - wMenuPushCreate(descPopupM, "cmdPanMode", GetBalloonHelpStr("cmdPanMode"), 0, DoCommandB, (void*) (intptr_t) panCmdInx); + wMenuPushCreate(descPopupM, "cmdSelectMode", GetBalloonHelpStr("cmdSelectMode"), 0, DoCommandB, I2VP(selectCmdInx)); + wMenuPushCreate(descPopupM, "cmdModifyMode", GetBalloonHelpStr("cmdModifyMode"), 0, DoCommandB, I2VP(modifyCmdInx)); + wMenuPushCreate(descPopupM, "cmdPanMode", GetBalloonHelpStr("cmdPanMode"), 0, DoCommandB, I2VP(panCmdInx)); } diff --git a/app/bin/cmisc2.c b/app/bin/cmisc2.c index c9daad2..128e52b 100644 --- a/app/bin/cmisc2.c +++ b/app/bin/cmisc2.c @@ -20,8 +20,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "common.h" #include "track.h" -#include "i18n.h" /***************************************************************************** * diff --git a/app/bin/cmodify.c b/app/bin/cmodify.c index 8f82012..1e66e74 100644 --- a/app/bin/cmodify.c +++ b/app/bin/cmodify.c @@ -20,8 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include "cjoin.h" #include "ccurve.h" #include "cbezier.h" @@ -29,14 +27,13 @@ #include "cstraigh.h" #include "cundo.h" #include "fileio.h" -#include "i18n.h" -#include "messages.h" #include "param.h" #include "track.h" -#include "utility.h" #include "drawgeom.h" #include "common.h" #include "layout.h" +#include "cselect.h" +#include "common-ui.h" static struct { track_p Trk; @@ -64,6 +61,7 @@ static BOOL_T modifyBezierMode; static BOOL_T modifyCornuMode; static BOOL_T modifyDrawMode; static BOOL_T modifyRulerMode; +static BOOL_T modifyProtractorMode; static BOOL_T modifyExtendMode; @@ -79,6 +77,7 @@ static void CreateEndAnchor(coOrd p, wBool_t lock) { anchors(i).u.c.a0 = 0.0; anchors(i).u.c.a1 = 360.0; anchors(i).width = 0; + wSetCursor(mainD.d,wCursorNone); } static void CreateCornuAnchor(coOrd p, wBool_t lock) { @@ -102,6 +101,7 @@ static void CreateCornuAnchor(coOrd p, wBool_t lock) { anchors(i).u.c.a0 = 0.0; anchors(i).u.c.a1 = 360.0; anchors(i).width = 0; + wSetCursor(mainD.d,wCursorNone); } @@ -172,7 +172,7 @@ static STATUS_T ModifyCornu(wAction_t action, coOrd pos) { } /* - * Picking a DRAW will allow point modifications until terminated with "Enter" + * Picking a DRAW will allow point modifications until terminated with "Enter"/"Space" */ static STATUS_T ModifyDraw(wAction_t action, coOrd pos) { STATUS_T rc = C_CONTINUE; @@ -189,21 +189,22 @@ static STATUS_T ModifyDraw(wAction_t action, coOrd pos) { break; case C_TEXT: //Delete or '0' - continues - if ((action>>8 !=32) && (action >>8 !=13)) + if ((action>>8 !=32) && (action >>8 !=13) && (action >>8 !=9)) return ModifyTrack( Dex.Trk, action, pos ); - //Enter/Space does not - if ((action>>8 !=32) && (action>>8 != 13)) return C_CONTINUE; + //Enter/Space/Tab does not + if ((action>>8 !=32) && (action>>8 != 13) && (action>>8 != 9)) return C_CONTINUE; + if (((action>>8) == 9 && (MyGetKeyState()&WKEY_SHIFT))) return C_TERMINATE; /*no break*/ case C_OK: - UndoStart( _("Modify Track"), "Modify( T%d[%d] )", GetTrkIndex(Dex.Trk), Dex.params.ep ); - UndoModify( Dex.Trk ); - rc = ModifyTrack( Dex.Trk, C_TEXT | (13<<8), pos ); + rc = ModifyTrack( Dex.Trk, C_OK, pos ); if (rc != C_CONTINUE) modifyDrawMode = FALSE; UndoEnd(); break; + case C_CONFIRM: + rc = ModifyTrack( Dex.Trk, action, pos ); + break; case C_CANCEL: case C_FINISH: - case C_CONFIRM: case C_TERMINATE: rc = ModifyTrack( Dex.Trk, action, pos ); Dex.Trk = NULL; @@ -218,6 +219,9 @@ static STATUS_T ModifyDraw(wAction_t action, coOrd pos) { menuPos = pos; rc = ModifyTrack( Dex.Trk, action, pos ); break; + case wActionExtKey: + rc = ModifyTrack( Dex.Trk, action, pos ); + break; default: break; } @@ -269,35 +273,46 @@ STATUS_T CmdModify( modifyCornuMode = FALSE; modifyDrawMode = FALSE; modifyExtendMode = FALSE; + modifyRulerMode = FALSE; + modifyProtractorMode = FALSE; + SetAllTrackSelect( FALSE ); return C_CONTINUE; case C_DOWN: + case C_LDOUBLE: DYNARR_RESET(trkSeg_t,anchors_da); + if (modifyProtractorMode) + return ModifyProtractor(C_DOWN, pos); if (modifyBezierMode) return ModifyBezier(C_DOWN, pos); if (modifyCornuMode) return ModifyCornu(C_DOWN, pos); if (modifyDrawMode) return ModifyDraw(C_DOWN, pos); - /*no break*/ - case C_LDOUBLE: + DYNARR_SET( trkSeg_t, tempSegs_da, 2 ); tempSegs(0).color = wDrawColorBlack; tempSegs(0).width = 0; tempSegs(1).color = wDrawColorBlack; tempSegs(1).width = 0; tempSegs_da.cnt = 0; - Dex.Trk = OnTrack( &pos, TRUE, FALSE ); + Dex.Trk = OnTrack( &pos, FALSE, FALSE ); //Dex.Trk = trk; if (Dex.Trk == NULL) { - if ( ModifyRuler( C_DOWN, pos ) == C_CONTINUE ) + if ( ModifyRuler( C_DOWN, pos ) == C_CONTINUE ) { modifyRulerMode = TRUE; + } else if (ModifyProtractor( C_DOWN, pos ) == C_CONTINUE ) { + modifyProtractorMode = TRUE; + } else { + InfoMessage("Not on object, or Ruler, or Protractor"); + wBeep(); + } return C_CONTINUE; } if (!CheckTrackLayer( Dex.Trk ) ) { Dex.Trk = NULL; - return C_CONTINUE; + return C_ERROR; } trackGauge = (IsTrack(Dex.Trk)?GetTrkGauge(Dex.Trk):0.0); if (QueryTrack( Dex.Trk, Q_CAN_MODIFY_CONTROL_POINTS )) { //Bezier @@ -374,6 +389,7 @@ STATUS_T CmdModify( if (modifyDrawMode) return ModifyDraw(wActionMove,pos); if (modifyBezierMode) return ModifyBezier(wActionMove, pos); track_p t; + wSetCursor(mainD.d,defaultCursor); if (((t=OnTrack(&pos,FALSE,TRUE))!= NULL) && CheckTrackLayerSilent( t )) { EPINX_T ep = PickUnconnectedEndPointSilent(pos, t); if (QueryTrack( t, Q_IS_CORNU )) { @@ -387,6 +403,7 @@ STATUS_T CmdModify( ANGLE_T a = tp.angle; Translate(&pos,tp.ttcenter,a,tp.ttradius); CreateRadiusAnchor(pos,a,FALSE); + wSetCursor(mainD.d,wCursorNone); } else if (QueryTrack(t,Q_CAN_EXTEND)) { if (ep != -1) { if (MyGetKeyState()&WKEY_CTRL) { @@ -418,15 +435,19 @@ STATUS_T CmdModify( } } } else if (((t=OnTrack(&pos,FALSE,FALSE))!= NULL) - && (!(GetLayerFrozen(GetTrkLayer(t)) && GetLayerModule(GetTrkLayer(t)))) + && (!(GetLayerFrozen(GetTrkLayer(t)) || GetLayerModule(GetTrkLayer(t)))) && (QueryTrack(t, Q_IS_DRAW ) && !QueryTrack(t, Q_IS_TEXT)) ) { CreateEndAnchor(pos,FALSE); + } else { + ModifyRuler (wActionMove, pos); } return C_CONTINUE; case C_MOVE: if ( modifyRulerMode ) return ModifyRuler( C_MOVE, pos ); + if ( modifyProtractorMode ) + return ModifyProtractor( C_MOVE, pos ); if (Dex.Trk == NULL) return C_CONTINUE; if ( modifyBezierMode ) @@ -439,7 +460,7 @@ STATUS_T CmdModify( goto extendTrackMove; tempSegs_da.cnt = 0; - SnapPos( &pos ); + if ((MyGetKeyState() & WKEY_ALT) == 0) SnapPos( &pos ); rc = ModifyTrack( Dex.Trk, C_MOVE, pos ); if ( rc != C_CONTINUE ) { rc = C_CONTINUE; @@ -453,6 +474,8 @@ STATUS_T CmdModify( return C_CONTINUE; if ( modifyRulerMode ) return ModifyRuler( C_MOVE, pos ); + if ( modifyProtractorMode) + return ModifyProtractor( C_UP, pos); if ( modifyBezierMode ) return ModifyBezier( C_UP, pos); if (modifyCornuMode) @@ -463,7 +486,7 @@ STATUS_T CmdModify( tempSegs_da.cnt = 0; - SnapPos( &pos ); + if ((MyGetKeyState() & WKEY_ALT) == 0) SnapPos( &pos ); UndoStart( _("Modify Track"), "Modify( T%d[%d] )", GetTrkIndex(Dex.Trk), Dex.params.ep ); UndoModify( Dex.Trk ); rc = ModifyTrack( Dex.Trk, C_UP, pos ); @@ -477,6 +500,7 @@ extendTrack: changeTrackMode = TRUE; modifyExtendMode = TRUE; modifyRulerMode = FALSE; + modifyProtractorMode = FALSE; modifyBezierMode = FALSE; modifyCornuMode = FALSE; modifyDrawMode = FALSE; @@ -486,7 +510,7 @@ extendTrack: if (Dex.Trk) { if (!CheckTrackLayer( Dex.Trk ) ) { Dex.Trk = NULL; - return C_CONTINUE; + return C_ERROR; } trackGauge = GetTrkGauge( Dex.Trk ); Dex.pos00 = pos; @@ -525,7 +549,7 @@ extendTrackMove: tempSegs_da.cnt = 0; Dex.valid = FALSE; if (Dex.Trk == NULL) return C_CONTINUE; - SnapPos( &pos ); + if ((MyGetKeyState() & WKEY_ALT) == 0) SnapPos( &pos ); if ( Dex.first && FindDistance( pos, Dex.pos00 ) <= minLength ) return C_CONTINUE; Dex.first = FALSE; @@ -543,9 +567,9 @@ extendTrackMove: Rotate(&pos,Dex.params.cornuCenter[Dex.params.ep],angle); } } else pos = Dex.pos00; //Only out from end - PlotCurve( crvCmdFromCornu, Dex.pos00, Dex.pos00x, pos, &Dex.curveData, FALSE ); + PlotCurve( crvCmdFromCornu, Dex.pos00, Dex.pos00x, pos, &Dex.curveData, FALSE, 0.0 ); } else - PlotCurve( crvCmdFromEP1, Dex.pos00, Dex.pos00x, pos, &Dex.curveData, TRUE ); + PlotCurve( crvCmdFromEP1, Dex.pos00, Dex.pos00x, pos, &Dex.curveData, TRUE, 0.0 ); curveType = Dex.curveData.type; if ( curveType == curveTypeStraight ) { Dex.r1 = 0.0; @@ -724,14 +748,17 @@ LOG( log_modify, 1, ("R = %0.3f, A0 = %0.3f, A1 = %0.3f\n", if ((action>>8) == 'c') { panCenter = pos; LOG( log_pan, 2, ( "PanCenter:Mod-%d %0.3f %0.3f\n", __LINE__, panCenter.x, panCenter.y ) ); - PanHere((void*)0); + PanHere(I2VP(0)); return C_CONTINUE; } if ((action>>8) == 'e') { - DoZoomExtents(0); + DoZoomExtents(I2VP(0)); + } + if ((action>>8) == 's') { + DoZoomExtents(I2VP(1)); } if ((action>>8) == '0' || (action>>8 == 'o')) { - PanMenuEnter('o'); + PanMenuEnter(I2VP('o')); } if ( !Dex.Trk ) return C_CONTINUE; @@ -792,14 +819,15 @@ extern wIndex_t describeCmdInx; void InitCmdModify( wMenu_p menu ) { - modifyCmdInx = AddMenuButton( menu, CmdModify, "cmdModify", _("Modify"), wIconCreatePixMap(extend_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE|IC_CMDMENU, ACCL_MODIFY, NULL ); + modifyCmdInx = AddMenuButton( menu, CmdModify, "cmdModify", _("Modify"), wIconCreatePixMap(extend_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE|IC_CMDMENU, ACCL_MODIFY, NULL ); + /** @logcmd @showrefby modify=n cmodify.c Log Modify command */ log_modify = LogFindIndex( "modify" ); modPopupM = MenuRegister( "Modify Context Menu" ); - wMenuPushCreate(modPopupM, "cmdSelectMode", GetBalloonHelpStr("cmdSelectMode"), 0, DoCommandB, (void*) (intptr_t) selectCmdInx); - wMenuPushCreate(modPopupM, "cmdDescribeMode", GetBalloonHelpStr("cmdDescribeMode"), 0, DoCommandB, (void*) (intptr_t) describeCmdInx); - wMenuPushCreate(modPopupM, "cmdPanMode", GetBalloonHelpStr("cmdPanMode"), 0, DoCommandB, (void*) (intptr_t) panCmdInx); + wMenuPushCreate(modPopupM, "cmdSelectMode", GetBalloonHelpStr("cmdSelectMode"), 0, DoCommandB, I2VP(selectCmdInx)); + wMenuPushCreate(modPopupM, "cmdDescribeMode", GetBalloonHelpStr("cmdDescribeMode"), 0, DoCommandB, I2VP(describeCmdInx)); + wMenuPushCreate(modPopupM, "cmdPanMode", GetBalloonHelpStr("cmdPanMode"), 0, DoCommandB, I2VP(panCmdInx)); wMenuSeparatorCreate(modPopupM); - wMenuPushCreate(modPopupM, "", _("Zoom In"), 0,(wMenuCallBack_p) DoZoomUp, (void*) 1); - wMenuPushCreate(modPopupM, "", _("Zoom Out"), 0, (wMenuCallBack_p) DoZoomDown, (void*) 1); - wMenuPushCreate(modPopupM, "", _("Pan center - 'c'"), 0, (wMenuCallBack_p) PanHere, (void*) 3); + wMenuPushCreate(modPopupM, "", _("Zoom In"), 0, DoZoomUp, I2VP(1)); + wMenuPushCreate(modPopupM, "", _("Zoom Out"), 0, DoZoomDown, I2VP(1)); + wMenuPushCreate(modPopupM, "", _("Pan center - 'c'"), 0, PanHere, I2VP(3)); } diff --git a/app/bin/cnote.c b/app/bin/cnote.c index 0a015f1..7e4c0f9 100644 --- a/app/bin/cnote.c +++ b/app/bin/cnote.c @@ -19,12 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "custom.h" #include "dynstring.h" #include "fileio.h" -#include "i18n.h" #include "misc.h" #include "param.h" #include "include/utf8convert.h" @@ -38,7 +36,7 @@ static paramData_t notePLs[] = { #define noteT ((wText_p)notePLs[I_NOTETEXT].control) { PD_TEXT, NULL, "text", PDO_DLGRESIZE, ¬eTextData } }; -static paramGroup_t notePG = { "note", 0, notePLs, sizeof notePLs/sizeof notePLs[0] }; +static paramGroup_t notePG = { "note", 0, notePLs, COUNT( notePLs ) }; void ClearNote(void) @@ -49,7 +47,7 @@ void ClearNote(void) } } -static void NoteOk(void * junk) +static void NoteOk(void * unused) { if (wTextGetModified(noteT)) { int len; @@ -63,7 +61,7 @@ static void NoteOk(void * junk) } -void DoNote(void) +void DoNote(void * unused) { if (noteW == NULL) { noteW = ParamCreateDialog(¬ePG, MakeWindowTitle(_("Note")), _("Ok"), NoteOk, @@ -84,26 +82,26 @@ BOOL_T WriteMainNote(FILE* f) char *noteText = mainText; if (noteText && *noteText) { -#ifdef WINDOWS +#ifdef UTFCONVERT char *out = NULL; if (RequiresConvToUTF8(mainText)) { - unsigned cnt = strlen(mainText) * 2 + 1; + size_t cnt = strlen(mainText) * 2 + 1; out = MyMalloc(cnt); - wSystemToUTF8(mainText, out, cnt); + wSystemToUTF8(mainText, out, (unsigned int)cnt); noteText = out; } -#endif // WINDOWS +#endif // UTFCONVERT char * sText = ConvertToEscapedText( noteText ); rc &= fprintf(f, "NOTE MAIN 0 0 0 0 0 \"%s\"\n", sText )>0; MyFree( sText ); -#ifdef WINDOWS +#ifdef UTFCONVERT if (out) { MyFree(out); } -#endif // WINDOWS +#endif // UTFCONVERT } return rc; } @@ -121,7 +119,7 @@ BOOL_T ReadMainNote(char *line) if (!GetArgs(line + 9, paramVersion < 3 ? "l" : - paramVersion < 12 ? "0000l": + paramVersion < VERSION_INLINENOTE ? "0000l": "0000lq", &size, &sNote)) { return FALSE; } @@ -130,7 +128,7 @@ BOOL_T ReadMainNote(char *line) MyFree(mainText); } - if ( paramVersion < 12 ) + if ( paramVersion < VERSION_INLINENOTE ) mainText = ReadMultilineText(); else mainText = sNote; diff --git a/app/bin/cnvdsgn.c b/app/bin/cnvdsgn.c index 6f75b11..fc4a827 100644 --- a/app/bin/cnvdsgn.c +++ b/app/bin/cnvdsgn.c @@ -1,12 +1,3 @@ -#include -#include -#include "common.h" -#include "utility.h" - -#include -#include - - /* XTrkCad - Model Railroad CAD * Copyright (C) 2005 Dave Bullis * @@ -25,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "utility.h" + #define GETMAXY \ if (lp->y0 > maxY) maxY = lp->y0; \ if (lp->y1 > maxY) maxY = lp->y1 diff --git a/app/bin/common-ui.h b/app/bin/common-ui.h new file mode 100644 index 0000000..893dbc7 --- /dev/null +++ b/app/bin/common-ui.h @@ -0,0 +1,31 @@ +/** \file common-ui.h + * Defnitions of message and other UI types + */ + +/* XTrkCad - Model Railroad CAD + * Copyright (C) 2021 Dave Bullis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* Do not include this file in header (.h) files */ + +#ifndef COMMON_UI_H +#define COMMON_UI_H + +#include "messages.h" + +#endif + diff --git a/app/bin/common.h b/app/bin/common.h index 2db961f..92620f2 100644 --- a/app/bin/common.h +++ b/app/bin/common.h @@ -1,5 +1,5 @@ /** \file common.h - * Defnitions of basic types + * Defnitions of basic types */ /* XTrkCad - Model Railroad CAD @@ -23,16 +23,98 @@ #ifndef COMMON_H #define COMMON_H -#include +// INCLUDES +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_MALLOC_H +#include +#endif + +#include "wlib.h" + +#ifndef WINDOWS +// Unix/Mac +#include +#include + +#define PATH_SEPARATOR "/" + +#else +// Windows +#include +#include +#include "include/dirent.h" +#include "direct.h" +#include "getopt.h" + +// DEFINES +#define UTFCONVERT +#define M_PI 3.14159265358979323846 + +#define F_OK (00) +#define W_OK (02) +#define R_OK (04) +#define PATH_SEPARATOR "\\" + +// ALIASES for WINDOWS +#define access _access +#define unlink(a) _unlink((a)) +#define rmdir(a) _rmdir((a)) +#define open(name, flag, mode) _open((name), (flag), (mode)) +#define close(file) _close((file)) +#define getpid() _getpid() +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#define mkdir( DIR, MODE ) _mkdir( (DIR) ) +#if _MSC_VER >1300 +#define strnicmp _strnicmp +#define stricmp _stricmp +#define strdup _strdup +#endif +// starting from Visual Studio 2015 round is in the runtime library, fake otherwise +#if ( _MSC_VER < 1900 ) +#define round(x) floor((x)+0.5) +#endif + +/* suppress warning from *.bmp about conversion of int to char */ +#pragma warning( disable : 4305 ) +/* suppress warning about array references */ +#pragma warning( disable : 6385 ) +#endif + +// We need to pass integer values via void* objects +// typically context vars (declared as void*) which sometimes pass pointers and some times integers +// For example see paramData_t.context. +// Also some wlib calls take a generic parameter, declared as void* but somethings used to pass integers +// These are used in logical pairs; VP=I2VP(INTEGER); ...a lot of code...; INTEGER=VP2L(VP); +// Note: we never use VP2L to manipulate integer-ized values of a pointer and all integer values we use fit in a long +#define I2VP(VAL) ((void*)(intptr_t)(VAL)) +#define VP2L(VAL) ((long)(intptr_t)(VAL)) + #ifndef TRUE #define TRUE (1) #define FALSE (0) #endif +#define DIST_INF 2.0E9 + #define NUM_LAYERS (99) +// TYPEDEFS + typedef double FLOAT_T; typedef double POS_T; typedef double DIST_T; @@ -72,19 +154,15 @@ enum paramFileState { PARAMFILE_UNLOADED = 0, PARAMFILE_NOTUSABLE, PARAMFILE_COM #define SCALE_ANY (-2) #define SCALE_DEMO (-1) +// DYNARRAY + typedef struct { int cnt; int max; void * ptr; } dynArr_t; -#if defined(WINDOWS) && ! defined(WIN32) -#define CHECK_SIZE(T,DA) \ - if ( (long)((DA).max) * (long)(sizeof *(T*)NULL) > 65500L ) \ - AbortProg( "Dynamic array too large at %s:%d", __FILE__, __LINE__ ); -#else #define CHECK_SIZE(T,DA) -#endif #define DYNARR_APPEND(T,DA,INCR) \ { if ((DA).cnt >= (DA).max) { \ @@ -130,16 +208,42 @@ typedef struct { if ((DA.cnt)>=I) (DA).cnt--; \ } - -#ifdef WINDOWS -#define M_PI 3.14159 -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#endif - -#if _MSC_VER >1300 - #define strdup _strdup -#endif +// Base DotsPerInch +#define BASE_DPI (75.0) + +// FILE VERSIONS - non-backward file format changes +// Descriptions added for Bezier, Cornu, Joint +#define VERSION_DESCRIPTION2 (12) +// Inline quoted text replaces multiline text in Notes and Cars +#define VERSION_INLINENOTE (12) +// END is replaced by END$SEGS, END$TRK, ... +#define VERSION_NONAKEDENDS (12) + + +// FORWARD TYPE DECLS +typedef struct drawCmd_t * drawCmd_p; +typedef struct track_t * track_p; +typedef struct trkSeg_t * trkSeg_p; +typedef struct traverseTrack_t * traverseTrack_p; +typedef struct trkEndPt_t * trkEndPt_p; + +// base class for extraData*_t: each of which must include this struct as the first element +typedef struct extraDataBase_t { + TRKTYP_T trkType; + } extraDataBase_t; +// We check if TRKTYP_T in trk, trk->extraDataBase and the code context (TRKTYP) match. +// If TRKTYP is T_NOTRACK then we are dealing with T_TURNOUT/T_STRUCTURE or T_BEZIER/T_BEZLIN which +// share a log of code and have the same extraData*_t structure. +#define GET_EXTRA_DATA(TRK,TRKTYP,TYPE) \ + ((TYPE*)GetTrkExtraData( (TRK), (TRKTYP) )) +extraDataBase_t * GetTrkExtraData( track_p, TRKTYP_T ); + +// COMMON INCLUDES +// If you add includes here, please remove them elsewhere + +#include "i18n.h" +#include "utility.h" +#include "misc.h" #endif diff --git a/app/bin/compound.c b/app/bin/compound.c index 627d2ef..b6d5847 100644 --- a/app/bin/compound.c +++ b/app/bin/compound.c @@ -21,11 +21,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include - - #include "tbezier.h" #include "cjoin.h" #include "common.h" @@ -33,39 +28,173 @@ #include "cundo.h" #include "dynstring.h" #include "fileio.h" -#include "i18n.h" #include "shrtpath.h" #include "track.h" -#include "utility.h" -#include "messages.h" +#include "draw.h" #include "include/paramfile.h" +#include "common-ui.h" /***************************************************************************** * - * Misc + * Paths * */ -//Convert the internal path segment into the external one - which is based on the index count of only the track segments -char ConvertPathSegToExternal(char signed pp, int segCnt,trkSeg_p segs) { +#ifndef NEWPATH +/* GetPaths() + * + * Return the paths for 'trk'. + * + * \param trk IN Get paths for track 'trk' + */ +EXPORT PATHPTR_T GetPaths( track_p trk ) +{ + struct extraDataCompound_t * xx = GET_EXTRA_DATA( trk, T_NOTRACK, extraDataCompound_t ); + if ( GetTrkType(trk) == T_STRUCTURE && xx->paths != NULL ) { + LogPrintf( "GetPaths( STRUCTURE, paths!=NULL )\n" ); + } + if ( GetTrkType(trk) == T_TURNOUT && xx->paths == NULL ) { + LogPrintf( "GetPaths( TURNOUT, paths==NULL )\n" ); + } + return xx->paths; +} +#endif - char signed new_pp; - int old_inx; - EPINX_T old_EP; - GetSegInxEP(pp,&old_inx,&old_EP); - int j = old_inx; - for (int i=0;ipaths ) + MyFree( xx->paths ); + if ( paths == NULL ) { + xx->paths = NULL; + } else { + wIndex_t pathLen = GetPathsLength( paths ); + xx->paths = memdup( paths, pathLen * sizeof *xx->paths ); + } + xx->currPath = NULL; + xx->currPathIndex = 0; +} +#endif + + +/* GetCurrPath() + * + * Return the current path for 'trk'. + * Current path is the .currPathIndex'th path + * If the .currPathIndex is greater then the number of paths, return the first + * + * \param trk IN + */ +EXPORT PATHPTR_T GetCurrPath( track_p trk ) +{ + struct extraDataCompound_t * xx = GET_EXTRA_DATA( trk, T_TURNOUT, extraDataCompound_t ); + if ( xx->currPath ) + return xx->currPath; + PATHPTR_T path = GetPaths( trk ); + for ( wIndex_t position = xx->currPathIndex; + position > 0 && path[0]; + path+=2, position-- ) { + for ( path += strlen( (char*)path ); path[0] || path[1]; path++ ); + } + if ( !path[0] ) { + xx->currPathIndex = 0; + path = GetPaths( trk ); + } + xx->currPath = path; + return xx->currPath; } -BOOL_T WriteCompoundPathsEndPtsSegs( + +EXPORT long GetCurrPathIndex( track_p trk ) +{ + if ( GetTrkType( trk ) != T_TURNOUT ) + return 0; + struct extraDataCompound_t * xx = GET_EXTRA_DATA( trk, T_TURNOUT, extraDataCompound_t ); + return xx->currPathIndex; +} + + +EXPORT void SetCurrPathIndex( track_p trk, long position ) +{ + if ( GetTrkType( trk ) != T_TURNOUT ) + return; + struct extraDataCompound_t * xx = GET_EXTRA_DATA( trk, T_TURNOUT, extraDataCompound_t ); + xx->currPathIndex = position; + xx->currPath = NULL; +} + +#ifndef NEWPATH +/* GetParamPaths() + * + * Return the paths for turnout parameter 'to'. + * + * \param to IN + */ +PATHPTR_T GetParamPaths( turnoutInfo_t * to ) +{ + return to->paths; +} + +/* SetParamPaths() + * + * Set paths for a Turnout Parameter 'to' + * Used when creating a new turnout def'n + * + * \param to IN + * \param paths IN + */ +void SetParamPaths( turnoutInfo_t * to, PATHPTR_T paths ) +{ + if ( paths ) { + wIndex_t len = GetPathsLength(paths); + to->paths = (PATHPTR_T)memdup( paths, len * ( sizeof * to->paths ) ); + } else { + to->paths = NULL; + } +} +#endif + +/***************************************************************************** + * + * + * + */ + +EXPORT BOOL_T WriteCompoundPathsEndPtsSegs( FILE * f, PATHPTR_T paths, wIndex_t segCnt, @@ -77,11 +206,13 @@ BOOL_T WriteCompoundPathsEndPtsSegs( PATHPTR_T pp; BOOL_T rc = TRUE; - for ( pp=paths; *pp; pp+=2 ) { - rc &= fprintf( f, "\tP \"%s\"", pp )>0; - for ( pp+=strlen((char *)pp)+1; pp[0]!=0 || pp[1]!=0; pp++ ) - rc &= fprintf( f, " %d", ConvertPathSegToExternal(pp[0],segCnt,segs) )>0; - rc &= fprintf( f, "\n" )>0; + if ( paths ) { + for ( pp=paths; *pp; pp+=2 ) { + rc &= fprintf( f, "\tP \"%s\"", pp )>0; + for ( pp+=strlen((char *)pp)+1; pp[0]!=0 || pp[1]!=0; pp++ ) + rc &= fprintf( f, " %d", pp[0] )>0; + rc &= fprintf( f, "\n" )>0; + } } for ( i=0; iorig, xx->angle, xx->segCnt, xx->segs, &lo, &hi ); hi.x += lo.x; @@ -290,7 +421,7 @@ EXPORT void CompoundClearDemoDefns( void ) void SetDescriptionOrig( track_p trk ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); int i, j; coOrd p0, p1; @@ -328,7 +459,7 @@ void DrawCompoundDescription( { wFont_p fp; coOrd p1; - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); char * desc; long layoutLabelsOption = layoutLabels; @@ -336,24 +467,30 @@ void DrawCompoundDescription( return; if ((labelEnable&LABELENABLE_TRKDESC)==0) return; - if ( (d->options&DC_SIMPLE) ) + if ( (d->options&(DC_SIMPLE|DC_SEGTRACK)) ) return; - if ( xx->special == TOpier ) { - desc = xx->u.pier.name; - } else { - if ( xx->flipped ) - layoutLabelsOption |= LABEL_FLIPPED; - if ( xx->ungrouped ) - layoutLabelsOption |= LABEL_UNGROUPED; - if ( xx->split ) - layoutLabelsOption |= LABEL_SPLIT; - FormatCompoundTitle( layoutLabelsOption, xtitle(xx) ); - desc = message; - } - p1 = xx->descriptionOrig; - Rotate( &p1, zero, xx->angle ); - p1.x += xx->orig.x + xx->descriptionOff.x; - p1.y += xx->orig.y + xx->descriptionOff.y; + if ( xx->special == TOpier ) { + desc = xx->u.pier.name; + } else { + if ( xx->flipped ) + layoutLabelsOption |= LABEL_FLIPPED; + if ( xx->ungrouped ) + layoutLabelsOption |= LABEL_UNGROUPED; + if ( xx->split ) + layoutLabelsOption |= LABEL_SPLIT; + FormatCompoundTitle( layoutLabelsOption, xtitle(xx) ); + desc = message; + } + p1 = xx->descriptionOrig; + Rotate( &p1, zero, xx->angle ); + coOrd p0; + p0.x = p1.x+xx->orig.x; + p0.y = p1.y+xx->orig.y; + p1.x += xx->orig.x + xx->descriptionOff.x; + p1.y += xx->orig.y + xx->descriptionOff.y; + if (color == drawColorPreviewSelected) { + DrawLine( d, p0, p1, 0, color ); + } fp = wStandardFont( F_TIMES, FALSE, FALSE ); DrawBoxedString( (xx->special==TOpier)?BOX_INVERT:BOX_NONE, d, p1, desc, fp, (wFontSize_t)descriptionFontSize, color, 0.0 ); } @@ -366,12 +503,12 @@ DIST_T CompoundDescriptionDistance( BOOL_T show_hidden, BOOL_T * hidden) { - struct extraData *xx = GetTrkExtraData(trk); coOrd p1; if (GetTrkType(trk) != T_TURNOUT && GetTrkType(trk) != T_STRUCTURE) - return 100000; + return DIST_INF; + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); if ( ((GetTrkBits( trk ) & TB_HIDEDESC) != 0 ) && !show_hidden) - return 100000; + return DIST_INF; p1 = xx->descriptionOrig; coOrd offset = xx->descriptionOff; if ( (GetTrkBits( trk ) & TB_HIDEDESC) != 0 ) offset = zero; @@ -380,6 +517,10 @@ DIST_T CompoundDescriptionDistance( p1.y += xx->orig.y + offset.y; if (hidden) *hidden = (GetTrkBits( trk ) & TB_HIDEDESC); *dpos = p1; + + coOrd tpos = pos; + if (DistanceCompound(trk,&tpos)orig, xx->angle, xx->segCnt, xx->segs, p, NULL ); } else if ( programMode != MODE_TRAIN || GetTrkEndPtCnt(t) <= 0 ) { d0 = DistanceSegs( xx->orig, xx->angle, xx->segCnt, xx->segs, p, NULL ); - if (programMode != MODE_TRAIN && GetTrkEndPtCnt(t) > 0 && d0 < 10000.0) { + if (programMode != MODE_TRAIN && GetTrkEndPtCnt(t) > 0 && d0 < DIST_INF) { ep = PickEndPoint( *p, t ); *p = GetTrkEndPos(t,ep); } @@ -492,11 +633,11 @@ DIST_T DistanceCompound( Rotate( &p0, xx->orig, -xx->angle ); p0.x -= xx->orig.x; p0.y -= xx->orig.y; - d0 = 1000000.0; - path = xx->pathCurr; - for ( path=xx->pathCurr+strlen((char *)xx->pathCurr)+1; path[0] || path[1]; path++ ) { + d0 = DIST_INF; + path = GetCurrPath( t ); + for ( path += strlen((char *)path)+1; path[0] || path[1]; path++ ) { if ( path[0] != 0 ) { - d1 = 1000000.0; + d1 = DIST_INF; GetSegInxEP( *path, &segInx, &segEP ); segProcData.distance.pos1 = p0; SegProc( SEGPROC_DISTANCE, &xx->segs[segInx], &segProcData ); @@ -506,7 +647,7 @@ DIST_T DistanceCompound( } } } - if ( d0 < 1000000.0 ) { + if ( d0 < DIST_INF ) { p2.x += xx->orig.x; p2.y += xx->orig.y; Rotate( &p2, xx->orig, xx->angle ); @@ -575,7 +716,7 @@ static descData_t compoundDesc[] = { static void UpdateCompound( track_p trk, int inx, descData_p descUpd, BOOL_T needUndoStart ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); const char * manufS, * nameS, * partnoS; char * mP, *nP, *pP; int mL, nL, pL; @@ -806,7 +947,7 @@ void DescribeCompound( char * str, CSIZE_T len ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); int fix; EPINX_T ep, epCnt; char * mP, *nP, *pP, *cnP; @@ -953,13 +1094,13 @@ void DescribeCompound( if ( compoundDesc[LT].control0!=NULL) { wListClear( (wList_p)compoundDesc[LT].control0 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("Solid"), NULL, (void*)0 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("Dash"), NULL, (void*)1 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("Dot"), NULL, (void*)2 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("DashDot"), NULL, (void*)3 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("DashDotDot"), NULL, (void*)4 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("CenterDot"), NULL, (void*)5 ); - wListAddValue( (wList_p)compoundDesc[LT].control0, _("PhantomDot"), NULL, (void*)6 ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("Solid"), NULL, I2VP(0) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("Dash"), NULL, I2VP(1) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("Dot"), NULL, I2VP(2) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("DashDot"), NULL, I2VP(3) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("DashDotDot"), NULL, I2VP(4) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("CenterDot"), NULL, I2VP(5) ); + wListAddValue( (wList_p)compoundDesc[LT].control0, _("PhantomDot"), NULL, I2VP(6) ); wListSetIndex( (wList_p)compoundDesc[LT].control0, compoundData.linetype ); } @@ -969,9 +1110,9 @@ void DescribeCompound( void DeleteCompound( track_p t ) { - struct extraData *xx = GetTrkExtraData(t); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(t, T_NOTRACK, extraDataCompound_t); FreeFilledDraw( xx->segCnt, xx->segs ); - MyFree( xx->segs ); + if (xx->segCnt>0) MyFree( xx->segs ); xx->segs = NULL; } @@ -980,42 +1121,34 @@ BOOL_T WriteCompound( track_p t, FILE * f ) { - struct extraData *xx = GetTrkExtraData(t); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(t, T_NOTRACK, extraDataCompound_t); EPINX_T ep, epCnt; long options; long position = 0; drawLineType_e lineType = 0; - PATHPTR_T path; BOOL_T rc = TRUE; options = (long)GetTrkWidth(t); if (xx->handlaid) - options |= 0x08; + options |= COMPOUND_OPTION_HANDLAID; if (xx->flipped) - options |= 0x10; + options |= COMPOUND_OPTION_FLIPPED; if (xx->ungrouped) - options |= 0x20; + options |= COMPOUND_OPTION_UNGROUPED; if (xx->split) - options |= 0x40; + options |= COMPOUND_OPTION_SPLIT; + if (xx->pathOverRide) + options |= COMPOUND_OPTION_PATH_OVERRIDE; + if (xx->pathNoCombine) + options |= COMPOUND_OPTION_PATH_NOCOMBINE; if ( ( GetTrkBits( t ) & TB_HIDEDESC ) != 0 ) - options |= 0x80; + options |= COMPOUND_OPTION_HIDEDESC; epCnt = GetTrkEndPtCnt(t); - if ( epCnt > -0 ) { - path = xx->paths; - while ( path != xx->pathCurr ) { - path += strlen((char*)path)+1; - while ( path[0] || path[1] ) - path++; - path += 2; - if ( *path == 0 ) - break; - position++; - } - } lineType = xx->lineType; rc &= fprintf(f, "%s %d %d %ld %ld %d %s %d %0.6f %0.6f 0 %0.6f \"%s\"\n", GetTrkTypeName(t), - GetTrkIndex(t), GetTrkLayer(t), options, position, lineType, + GetTrkIndex(t), GetTrkLayer(t), options, + GetCurrPathIndex(t), lineType, GetTrkScaleName(t), GetTrkVisible(t)|(GetTrkNoTies(t)?1<<2:0)|(GetTrkBridge(t)?1<<3:0), xx->orig.x, xx->orig.y, xx->angle, PutTitle(xtitle(xx)) )>0; @@ -1034,7 +1167,7 @@ BOOL_T WriteCompound( ; } rc &= fprintf( f, "\tD %0.6f %0.6f\n", xx->descriptionOff.x, xx->descriptionOff.y )>0; - rc &= WriteCompoundPathsEndPtsSegs( f, xpaths(xx), xx->segCnt, xx->segs, 0, NULL ); + rc &= WriteCompoundPathsEndPtsSegs( f, GetPaths( t ), xx->segCnt, xx->segs, 0, NULL ); return rc; } @@ -1048,7 +1181,7 @@ BOOL_T WriteCompound( */ EXPORT void SetCompoundLineType( track_p trk, int width ) { - struct extraData * xx = GetTrkExtraData(trk); + struct extraDataCompound_t * xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); switch(width) { case 0: xx->lineType = DRAWLINESOLID; @@ -1084,18 +1217,16 @@ EXPORT track_p NewCompound( char * title, EPINX_T epCnt, trkEndPt_t * epp, - DIST_T * radii, - int pathLen, - char * paths, + PATHPTR_T paths, wIndex_t segCnt, trkSeg_p segs ) { track_p trk; - struct extraData * xx; + struct extraDataCompound_t * xx; EPINX_T ep; trk = NewTrack( index, trkType, epCnt, sizeof (*xx) + 1 ); - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, trkType, extraDataCompound_t); xx->orig = pos; xx->angle = angle; xx->handlaid = FALSE; @@ -1107,12 +1238,7 @@ EXPORT track_p NewCompound( xx->title = MyStrdup( title ); xx->customInfo = NULL; xx->special = TOnormal; - if ( pathLen > 0 ) - xx->paths = memdup( paths, pathLen ); - else - xx->paths = (PATHPTR_T)""; - xx->pathLen = pathLen; - xx->pathCurr = xx->paths; + SetPaths( trk, paths ); xx->segCnt = segCnt; xx->segs = memdup( segs, segCnt * sizeof *segs ); trkSeg_p p = xx->segs; @@ -1120,17 +1246,8 @@ EXPORT track_p NewCompound( FixUpBezierSegs(xx->segs,xx->segCnt); ComputeCompoundBoundingBox( trk ); SetDescriptionOrig( trk ); -// if (radii) { -// xx->special = TOcurved; -// xx->u.curved.radii.max = 0; -// xx->u.curved.radii.cnt = 0; -// DYNARR_SET(DIST_T,xx->u.curved.radii,epCnt); -// } for ( ep=0; epu.curved.radii,ep) = radii[ep]; -// } } return trk; } @@ -1141,7 +1258,7 @@ BOOL_T ReadCompound( TRKTYP_T trkType ) { track_p trk; - struct extraData *xx; + struct extraDataCompound_t *xx; TRKINX_T index; BOOL_T visible; coOrd orig; @@ -1154,7 +1271,6 @@ BOOL_T ReadCompound( long options = 0; long position = 0; long lineType = 0; - PATHPTR_T path=NULL; if (paramVersion<3) { if ( !GetArgs( line, "dXsdpfq", @@ -1175,10 +1291,15 @@ BOOL_T ReadCompound( pathCnt = 0; if ( !ReadSegs() ) return FALSE; - path = pathPtr; - if ( tempEndPts_da.cnt > 0 && pathCnt <= 1 ) { - pathCnt = 10; - path = (PATHPTR_T)"Normal\01\0\0"; + if ( trkType == T_TURNOUT ) { + if ( tempEndPts_da.cnt <= 0 ) { + InputError( "Turnout defn without EndPoints", TRUE ); + return FALSE; + } + if ( pathCnt <= 1 ) { + InputError( "Turnout defn without a Path", TRUE ); + return FALSE; + } } if (paramVersion<6 && strlen( title ) > 2) { cp = strchr( title, '\t' ); @@ -1189,7 +1310,9 @@ BOOL_T ReadCompound( UpdateTitleMark( title, LookupScale(scale) ); } } - trk = NewCompound( trkType, index, orig, angle, title, 0, NULL, NULL, pathCnt, (char *)path, tempSegs_da.cnt, &tempSegs(0) ); + trk = NewCompound( trkType, index, orig, angle, title, 0, NULL, + pathCnt > 1 ? pathPtr : NULL, + tempSegs_da.cnt, &tempSegs(0) ); SetEndPts( trk, 0 ); if ( paramVersion < 3 ) { SetTrkVisible(trk, visible!=0); @@ -1203,14 +1326,16 @@ BOOL_T ReadCompound( SetTrkScale(trk, LookupScale( scale )); SetTrkLayer(trk, layer); SetTrkWidth(trk, (int)(options&3)); - xx = GetTrkExtraData(trk); - xx->handlaid = (int)((options&0x08)!=0); - xx->flipped = (int)((options&0x10)!=0); - xx->ungrouped = (int)((options&0x20)!=0); - xx->split = (int)((options&0x40)!=0); + xx = GET_EXTRA_DATA(trk, trkType, extraDataCompound_t); + xx->handlaid = (int)((options&COMPOUND_OPTION_HANDLAID)!=0); + xx->flipped = (int)((options&COMPOUND_OPTION_FLIPPED)!=0); + xx->ungrouped = (int)((options&COMPOUND_OPTION_UNGROUPED)!=0); + xx->split = (int)((options&COMPOUND_OPTION_SPLIT)!=0); + xx->pathOverRide = (int)((options&COMPOUND_OPTION_PATH_OVERRIDE)!=0); + xx->pathNoCombine = (int)((options&COMPOUND_OPTION_PATH_NOCOMBINE)!=0); xx->lineType = lineType; xx->descriptionOff = descriptionOff; - if ( ( options & 0x80 ) != 0 ) + if ( ( options & COMPOUND_OPTION_HIDEDESC ) != 0 ) SetTrkBits( trk, TB_HIDEDESC ); if (tempSpecial[0] != '\0') { @@ -1231,18 +1356,7 @@ BOOL_T ReadCompound( return FALSE; } } - if (pathCnt > 0) { - path = xx->pathCurr; - while ( position-- ) { - path += strlen((char *)path)+1; - while ( path[0] || path[1] ) - path++; - path += 2; - if ( *path == 0 ) - path = xx->paths; - } - } - xx->pathCurr = path; + SetCurrPathIndex( trk, position ); return TRUE; } @@ -1250,7 +1364,7 @@ void MoveCompound( track_p trk, coOrd orig ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); xx->orig.x += orig.x; xx->orig.y += orig.y; ComputeCompoundBoundingBox( trk ); @@ -1262,7 +1376,7 @@ void RotateCompound( coOrd orig, ANGLE_T angle ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); Rotate( &xx->orig, orig, angle ); xx->angle = NormalizeAngle( xx->angle + angle ); Rotate( &xx->descriptionOff, zero, angle ); @@ -1274,7 +1388,7 @@ void RescaleCompound( track_p trk, FLOAT_T ratio ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); xx->orig.x *= ratio; xx->orig.y *= ratio; xx->descriptionOff.x *= ratio; @@ -1290,7 +1404,7 @@ void FlipCompound( coOrd orig, ANGLE_T angle ) { - struct extraData *xx = GetTrkExtraData(trk); + struct extraDataCompound_t *xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); EPINX_T ep, epCnt; char * mP, *nP, *pP; int mL, nL, pL; @@ -1405,19 +1519,21 @@ typedef struct { char * type; char * name; FLOAT_T price; + DynString indexes; } enumCompound_t; static dynArr_t enumCompound_da; #define EnumCompound(N) DYNARR_N( enumCompound_t,enumCompound_da,N) BOOL_T EnumerateCompound( track_p trk ) { - struct extraData *xx; + struct extraDataCompound_t *xx; INT_T inx, inx2; int cmp; long listLabelsOption = listLabels; + char * index = MyMalloc(10); if ( trk != NULL ) { - xx = GetTrkExtraData(trk); + xx = GET_EXTRA_DATA(trk, T_NOTRACK, extraDataCompound_t); if ( xx->flipped ) listLabelsOption |= LABEL_FLIPPED; #ifdef LATER @@ -1428,11 +1544,14 @@ BOOL_T EnumerateCompound( track_p trk ) #endif FormatCompoundTitle( listLabelsOption, xtitle(xx) ); if (message[0] == '\0') - return TRUE; + return FALSE; //No content for (inx = 0; inx < enumCompound_da.cnt; inx++ ) { cmp = strcmp( EnumCompound(inx).name, message ); if ( cmp == 0 ) { EnumCompound(inx).count++; + sprintf(index,",%d",GetTrkIndex(trk)); + DynStringCatCStr(&(EnumCompound(inx).indexes),index); + MyFree(index); return TRUE; } else if ( cmp > 0 ) { break; @@ -1443,9 +1562,11 @@ BOOL_T EnumerateCompound( track_p trk ) EnumCompound(inx2) = EnumCompound(inx2-1); EnumCompound(inx).name = MyStrdup( message ); if (strlen(message) > (size_t)enumerateMaxDescLen) - enumerateMaxDescLen = strlen(message); + enumerateMaxDescLen = (int)strlen(message); EnumCompound(inx).type = GetTrkTypeName( trk ); EnumCompound(inx).count = 1; + DynStringMalloc(&(EnumCompound(inx).indexes),100); + DynStringPrintf(&(EnumCompound(inx).indexes),"%d",GetTrkIndex(trk)); FormatCompoundTitle( LABEL_MANUF|LABEL_DESCR|LABEL_PARTNO, xtitle(xx) ); wPrefGetFloat( "price list", message, &(EnumCompound(inx).price), 0.0 ); } else { @@ -1455,12 +1576,15 @@ BOOL_T EnumerateCompound( track_p trk ) if (EnumCompound(inx).type[0] == *type) { EnumerateList( EnumCompound(inx).count, EnumCompound(inx).price, - EnumCompound(inx).name ); + EnumCompound(inx).name, + DynStringSize(&(EnumCompound(inx).indexes))?DynStringToCStr(&(EnumCompound(inx).indexes)):NULL); } + DynStringFree(&(EnumCompound(inx).indexes)); } } DYNARR_RESET( enumCompound_t, enumCompound_da ); } + MyFree(index); return TRUE; } diff --git a/app/bin/compound.h b/app/bin/compound.h index b4c63ca..edcbb66 100644 --- a/app/bin/compound.h +++ b/app/bin/compound.h @@ -24,9 +24,9 @@ #define COMPOUND_H #include "common.h" -#include "track.h" +#include "track.h" //- PATHPTR_T drawLineType_e -typedef enum { TOnormal, TOadjustable, TOpierInfo, TOpier, TOcarDesc, TOlast, TOcurved } TOspecial_e; +typedef enum { TOnormal, TOadjustable, TOpierInfo, TOpier, TOcarDesc, TOlast } TOspecial_e; typedef struct { char * name; @@ -44,9 +44,6 @@ typedef union { FLOAT_T height; char * name; } pier; - struct { - dynArr_t radii; - } curved; } turnoutInfo_u; typedef struct turnoutInfo_t{ @@ -57,31 +54,32 @@ typedef struct turnoutInfo_t{ wIndex_t segCnt; trkSeg_p segs; wIndex_t endCnt; - trkEndPt_t * endPt; - wIndex_t pathLen; + trkEndPt_p endPt; PATHPTR_T paths; int paramFileIndex; char * customInfo; DIST_T barScale; TOspecial_e special; turnoutInfo_u u; + wBool_t pathOverRide; + wBool_t pathNoCombine; char * contentsLabel; } turnoutInfo_t; -#define xpaths(X) \ - (X->paths) #define xtitle(X) \ (X->title) -#ifndef PRIVATE_EXTRADATA -struct extraData { +typedef struct extraDataCompound_t { + extraDataBase_t base; coOrd orig; ANGLE_T angle; BOOL_T handlaid; BOOL_T flipped; BOOL_T ungrouped; BOOL_T split; + BOOL_T pathOverRide; + BOOL_T pathNoCombine; coOrd descriptionOrig; coOrd descriptionOff; coOrd descriptionSize; @@ -90,14 +88,12 @@ struct extraData { TOspecial_e special; turnoutInfo_u u; PATHPTR_T paths; - wIndex_t pathLen; - PATHPTR_T pathCurr; + PATHPTR_T currPath; + long currPathIndex; wIndex_t segCnt; - trkSeg_t * segs; - DIST_T * radii; + trkSeg_p segs; drawLineType_e lineType; - }; -#endif + } extraDataCompound_t; extern TRKTYP_T T_TURNOUT; extern TRKTYP_T T_STRUCTURE; @@ -118,11 +114,29 @@ extern turnoutInfo_t * curStructure; #define PIER "pier" #define CURVED "curvedends" +#define COMPOUND_OPTION_HANDLAID (0x0008) +#define COMPOUND_OPTION_FLIPPED (0x0010) +#define COMPOUND_OPTION_UNGROUPED (0x0020) +#define COMPOUND_OPTION_SPLIT (0x0040) +#define COMPOUND_OPTION_HIDEDESC (0x0080) +#define COMPOUND_OPTION_PATH_OVERRIDE (0x0100) +#define COMPOUND_OPTION_PATH_NOCOMBINE (0x0200) + + /* compound.c */ +PATHPTR_T GetPaths( track_p trk ); +wIndex_t GetPathsLength( PATHPTR_T paths ); +void SetPaths( track_p trk, PATHPTR_T paths ); +PATHPTR_T GetCurrPath( track_p trk ); +long GetCurrPathIndex( track_p trk ); +void SetCurrPathIndex( track_p trk, long position ); +PATHPTR_T GetParamPaths( turnoutInfo_t * to ); +void SetParamPaths( turnoutInfo_t * to, PATHPTR_T paths ); + #define FIND_TURNOUT (1<<11) #define FIND_STRUCT (1<<12) void FormatCompoundTitle( long, char *); -BOOL_T WriteCompoundPathsEndPtsSegs( FILE *, PATHPTR_T, wIndex_t, trkSeg_p, EPINX_T, trkEndPt_t *); +BOOL_T WriteCompoundPathsEndPtsSegs( FILE *, PATHPTR_T, wIndex_t, trkSeg_p, EPINX_T, trkEndPt_p); void ParseCompoundTitle( char *, char **, int *, char **, int *, char **, int * ); void FormatCompoundTitle( long, char *); void ComputeCompoundBoundingBox( track_p); @@ -135,7 +149,7 @@ void DrawCompoundDescription( track_p, drawCmd_p, wDrawColor ); DIST_T DistanceCompound( track_p, coOrd * ); void DescribeCompound( track_p, char *, CSIZE_T ); void DeleteCompound( track_p ); -track_p NewCompound( TRKTYP_T, TRKINX_T, coOrd, ANGLE_T, char *, EPINX_T, trkEndPt_t *, DIST_T *, int, char *, wIndex_t, trkSeg_p ); +track_p NewCompound( TRKTYP_T, TRKINX_T, coOrd, ANGLE_T, char *, EPINX_T, trkEndPt_p, PATHPTR_T, wIndex_t, trkSeg_p ); BOOL_T WriteCompound( track_p, FILE * ); BOOL_T ReadCompound( char *, TRKTYP_T ); void MoveCompound( track_p, coOrd ); @@ -147,8 +161,8 @@ void SetCompoundLineType( track_p trk, int width ); /* cgroup.c */ void UngroupCompound( track_p ); -void DoUngroup( void ); -void DoGroup( void ); +void DoUngroup( void * unused ); +void DoGroup( void * unused ); /* dcmpnd.c */ void UpdateTitleMark( char *, SCALEINX_T ); @@ -163,7 +177,7 @@ BOOL_T SplitTurnoutCheck(track_p,coOrd,EPINX_T ep,track_p *,EPINX_T *,EPINX_T *, void GetSegInxEP( signed char, int *, EPINX_T * ); void SetSegInxEP( signed char *, int, EPINX_T) ; wIndex_t CheckPaths( wIndex_t, trkSeg_p, PATHPTR_T ); -turnoutInfo_t * CreateNewTurnout( char *, char *, wIndex_t, trkSeg_p, wIndex_t, PATHPTR_T, EPINX_T, trkEndPt_t *, DIST_T *, wBool_t ); +turnoutInfo_t * CreateNewTurnout( char *, char *, wIndex_t, trkSeg_p, PATHPTR_T, EPINX_T, trkEndPt_p, wBool_t, long ); void DeleteTurnoutParams(int fileInx); turnoutInfo_t * TurnoutAdd( long, SCALEINX_T, wList_p, coOrd *, EPINX_T ); STATUS_T CmdTurnoutAction( wAction_t, coOrd ); diff --git a/app/bin/cparalle.c b/app/bin/cparalle.c index 27276b1..6825aea 100644 --- a/app/bin/cparalle.c +++ b/app/bin/cparalle.c @@ -20,17 +20,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include "ccurve.h" #include "cstraigh.h" +#include "cselect.h" #include "cundo.h" -#include "i18n.h" -#include "messages.h" #include "param.h" #include "track.h" -#include "utility.h" #include "layout.h" +#include "common-ui.h" static struct { track_p Trk; @@ -54,7 +51,7 @@ static paramData_t parSepPLs[] = { #define parFactorI 1 { PD_FLOAT, &parSepFactor, "factor", 0, &r_0_10, N_("Radius Factor") } }; -static paramGroup_t parSepPG = { "parallel", 0, parSepPLs, sizeof parSepPLs/sizeof parSepPLs[0] }; +static paramGroup_t parSepPG = { "parallel", 0, parSepPLs, COUNT( parSepPLs ) }; static STATUS_T CmdParallel(wAction_t action, coOrd pos) @@ -71,7 +68,7 @@ static STATUS_T CmdParallel(wAction_t action, coOrd pos) char * labels[3]; static DIST_T parRFactor; - parType = (long)commandContext; + parType = VP2L(commandContext); switch (action&0xFF) { @@ -104,6 +101,7 @@ static STATUS_T CmdParallel(wAction_t action, coOrd pos) parFactorPD.option &= ~PDO_NORECORD; Dpa.anchor_Trk = NULL; tempSegs_da.cnt = 0; + SetAllTrackSelect( FALSE ); return C_CONTINUE; case wActionMove: @@ -201,7 +199,7 @@ static STATUS_T CmdParallel(wAction_t action, coOrd pos) tempSegs_da.cnt = 0; if ((t0=OnTrack(&p, FALSE, TRUE)) != NULL) { ep0 = PickEndPoint(p, t0); - if (GetTrkEndTrk(t0,ep0) != NULL) { + if (ep0 < 0 || GetTrkEndTrk(t0,ep0) != NULL) { t0 = NULL; } else { p = GetTrkEndPos(t0, ep0); @@ -214,7 +212,7 @@ static STATUS_T CmdParallel(wAction_t action, coOrd pos) p = p1; if ((t1=OnTrack(&p, FALSE, TRUE)) != NULL) { ep1 = PickEndPoint(p, t1); - if (GetTrkEndTrk(t1,ep1) != NULL) { + if (ep1 < 0 || GetTrkEndTrk(t1,ep1) != NULL) { t1 = NULL; } else { p = GetTrkEndPos(t1, ep1); @@ -296,8 +294,8 @@ static STATUS_T CmdParallel(wAction_t action, coOrd pos) EXPORT void InitCmdParallel( wMenu_p menu ) { ButtonGroupBegin( _("Parallel"), "cmdParallelSetCmd", _("Parallel") ); - AddMenuButton( menu, CmdParallel, "cmdParallelTrack", _("Parallel Track"), wIconCreatePixMap(parallel_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_PARALLEL, (void*)0 ); - AddMenuButton( menu, CmdParallel, "cmdParallelLine", _("Parallel Line"), wIconCreatePixMap(parallel_line_xpm), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_PARALLEL, (void*)1 ); + AddMenuButton( menu, CmdParallel, "cmdParallelTrack", _("Parallel Track"), wIconCreatePixMap(parallel_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_PARALLEL, I2VP(0) ); + AddMenuButton( menu, CmdParallel, "cmdParallelLine", _("Parallel Line"), wIconCreatePixMap(parallel_line_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_POPUP|IC_WANT_MOVE, ACCL_PARALLEL, I2VP(1) ); ButtonGroupEnd(); ParamRegister( &parSepPG ); } diff --git a/app/bin/cprint.c b/app/bin/cprint.c index 066e649..a8ae0c1 100644 --- a/app/bin/cprint.c +++ b/app/bin/cprint.c @@ -20,22 +20,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include -#include -#include - #include "custom.h" #include "dynstring.h" #include "fileio.h" -#include "i18n.h" #include "layout.h" -#include "messages.h" #include "param.h" #include "track.h" -#include "utility.h" +#include "common-ui.h" #define PRINT_GAUDY (0) #define PRINT_PLAIN (1) @@ -57,13 +48,20 @@ static bitmap_t bm, bm0; #define BITMAP( BM, X, Y ) \ (BM).bm[ (X)-(BM).x0 + ((Y)-(BM).y0) * ((BM).x1-(BM).x0) ] -struct { +static struct { coOrd size; coOrd orig; ANGLE_T angle; } currPrintGrid, newPrintGrid; +EXPORT coOrd GetPrintOrig() { + return currPrintGrid.orig; +} + +EXPORT ANGLE_T GetPrintAngle() { + return currPrintGrid.angle; +} /* * GUI VARS */ @@ -104,7 +102,7 @@ static void PrintClear( void ); static void PrintMaxPageSize( void ); static void SelectAllPages(void); static void DoPrintMargin(void); -static bool PrintPageNumber( wPos_t x, wPos_t y, DIST_T width, DIST_T height ); +static bool PrintPageNumber( int x, int y, DIST_T width, DIST_T height ); static bool PrintNextPageNumbers(int x, int y, DIST_T pageW, DIST_T pageH); static char * printFormatLabels[] = { N_("Portrait"), N_("Landscape"), NULL }; @@ -114,25 +112,26 @@ static char * printRegistrationMarksLabels[] = { N_("Registration Marks (in 1:1 static char * printPageNumberLabels[] = { N_("Page Numbers"), NULL }; static char * printPhysSizeLabels[] = { N_("Ignore Page Margins"), NULL }; static char * printGridLabels[] = { N_("Snap Grid"), NULL }; -static char * printRulerLabels[] = { N_("Rulers"), NULL }; +static char * printRulerLabels[] = { N_("Layout Edge"), N_("Every Page"), N_("None"), NULL }; static char * printRoadbedLabels[] = { N_("Roadbed Outline"), NULL }; static char * printCenterLineLabels[] = { N_("Centerline below Scale 1:1"), NULL }; static paramIntegerRange_t rminScale_999 = { 1, 999, 0, PDO_NORANGECHECK_HIGH }; static paramFloatRange_t r0_ = { 0, 0, 0, PDO_NORANGECHECK_HIGH }; -static paramFloatRange_t r1_ = { 1, 0, 0, PDO_NORANGECHECK_HIGH }; -static paramFloatRange_t r_10_99999 = { -10, 99999, 0, PDO_NORANGECHECK_HIGH }; +static paramFloatRange_t r1_pgsz_x = { 1, 0, 0, 0 }; +static paramFloatRange_t r1_pgsz_y = { 1, 0, 0, 0 }; +static paramFloatRange_t r_100_99999 = { -100, 99999, 0, PDO_NORANGECHECK_HIGH }; static paramFloatRange_t r0_360 = { 0, 360 }; static paramData_t printPLs[] = { -/*0*/ { PD_LONG, &iPrintScale, "scale", 0, &rminScale_999, N_("Print Scale"), 0, (void*)1 }, -/*1*/ { PD_FLOAT, &newPrintGrid.size.x, "pagew", PDO_DIM|PDO_SMALLDIM|PDO_NORECORD|PDO_NOPREF, &r1_, N_("Page Width"), 0, (void*)2 }, -/*2*/ { PD_BUTTON, (void*)PrintMaxPageSize, "max", PDO_DLGHORZ, NULL, N_("Max") }, -/*3*/ { PD_FLOAT, &newPrintGrid.size.y, "pageh", PDO_DIM|PDO_SMALLDIM|PDO_NORECORD|PDO_NOPREF, &r1_, N_("Height"), 0, (void*)2 }, -/*4*/ { PD_BUTTON, (void*)PrintSnapShot, "snapshot", PDO_DLGHORZ, NULL, N_("Snap Shot") }, -/*5*/ { PD_RADIO, &printFormat, "format", 0, printFormatLabels, N_("Page Format"), BC_HORZ|BC_NOBORDER, (void*)1 }, +/*0*/ { PD_LONG, &iPrintScale, "scale", 0, &rminScale_999, N_("Print Scale"), 0, I2VP(1) }, +/*1*/ { PD_FLOAT, &newPrintGrid.size.x, "pagew", PDO_DIM|PDO_SMALLDIM|PDO_NORECORD|PDO_NOPREF, &r1_pgsz_x, N_("Page Width"), 0, I2VP(2) }, +/*2*/ { PD_BUTTON, PrintMaxPageSize, "max", PDO_DLGHORZ, NULL, N_("Max") }, +/*3*/ { PD_FLOAT, &newPrintGrid.size.y, "pageh", PDO_DIM|PDO_SMALLDIM|PDO_NORECORD|PDO_NOPREF, &r1_pgsz_y, N_("Height"), 0, I2VP(2) }, +/*4*/ { PD_BUTTON, PrintSnapShot, "snapshot", PDO_DLGHORZ, NULL, N_("Snap Shot") }, +/*5*/ { PD_RADIO, &printFormat, "format", 0, printFormatLabels, N_("Page Format"), BC_HORZ|BC_NOBORDER, I2VP(1) }, /*6*/ { PD_RADIO, &printOrder, "order", PDO_DLGBOXEND, printOrderLabels, N_("Print Order"), BC_HORZ|BC_NOBORDER }, -/*7*/ { PD_MESSAGE, N_("Print "), NULL, PDO_DLGRESETMARGIN| PDO_DLGNOLABELALIGN, (void*)0 }, -/*8*/ { PD_TOGGLE, &printGaudy, "style", PDO_DLGNOLABELALIGN, printGaudyLabels, NULL, BC_HORZ|BC_NOBORDER, (void*)1 }, +/*7*/ { PD_MESSAGE, N_("Print "), NULL, PDO_DLGRESETMARGIN| PDO_DLGNOLABELALIGN, I2VP(0) }, +/*8*/ { PD_TOGGLE, &printGaudy, "style", PDO_DLGNOLABELALIGN, printGaudyLabels, NULL, BC_HORZ|BC_NOBORDER, I2VP(1) }, #define I_REGMARKS (9) /*9*/ { PD_TOGGLE, &printRegistrationMarks, "registrationMarks", PDO_DLGNOLABELALIGN, printRegistrationMarksLabels, NULL, BC_HORZ|BC_NOBORDER }, #define I_PAGENUMBERS (10) @@ -140,28 +139,28 @@ static paramData_t printPLs[] = { #define I_GRID (11) /*11*/ { PD_TOGGLE, &printGrid, "grid", PDO_DLGNOLABELALIGN, printGridLabels, NULL, BC_HORZ|BC_NOBORDER }, #define I_RULER (12) -/*12*/ { PD_TOGGLE, &printRuler, "ruler", PDO_DLGNOLABELALIGN, printRulerLabels, NULL, BC_HORZ|BC_NOBORDER }, +/*12*/ { PD_RADIO, &printRuler, "ruler", 0, printRulerLabels, N_("Rulers:"), BC_HORZ|BC_NOBORDER }, #define I_CENTERLINE (13) /*13*/ { PD_TOGGLE, &printCenterLine, "centerLine", PDO_DLGNOLABELALIGN, printCenterLineLabels, NULL, BC_HORZ|BC_NOBORDER }, #define I_ROADBED (14) /*14*/{ PD_TOGGLE, &printRoadbed, "roadbed", PDO_DLGNOLABELALIGN, printRoadbedLabels, NULL, BC_HORZ|BC_NOBORDER }, #define I_ROADBEDWIDTH (15) /*15*/{ PD_FLOAT, &printRoadbedWidth, "roadbedWidth", PDO_DIM , &r0_, N_(" Width") }, -/*16*/ { PD_TOGGLE, &printPhysSize, "physsize", PDO_DLGNOLABELALIGN, printPhysSizeLabels, NULL, BC_HORZ | BC_NOBORDER, (void*)1 }, -/*17*/ { PD_BUTTON, (void*)DoPrintMargin, "margin", PDO_DLGHORZ|PDO_DLGBOXEND, NULL, N_("Margins") }, -/*18*/{ PD_FLOAT, &newPrintGrid.orig.x, "origx", PDO_DIM|PDO_DLGRESETMARGIN, &r_10_99999, N_("Origin: X"), 0, (void*)2 }, -/*19*/ { PD_FLOAT, &newPrintGrid.orig.y, "origy", PDO_DIM, &r_10_99999, N_("Y"), 0, (void*)2 }, -/*20*/ { PD_BUTTON, (void*)DoResetGrid, "reset", PDO_DLGHORZ, NULL, N_("Reset") }, -/*21*/ { PD_FLOAT, &newPrintGrid.angle, "origa", PDO_ANGLE|PDO_DLGBOXEND, &r0_360, N_("Angle"), 0, (void*)2 }, -/*22*/ { PD_BUTTON, (void*)DoPrintSetup, "setup", PDO_DLGCMDBUTTON, NULL, N_("Setup") }, -/*23*/ { PD_BUTTON, (void*)SelectAllPages, "selall", 0, NULL, N_("Select All") }, -/*24*/ { PD_BUTTON, (void*)PrintClear, "clear", 0, NULL, N_("Clear") }, +/*16*/ { PD_TOGGLE, &printPhysSize, "physsize", PDO_DLGNOLABELALIGN, printPhysSizeLabels, NULL, BC_HORZ | BC_NOBORDER, I2VP(1) }, +/*17*/ { PD_BUTTON, DoPrintMargin, "margin", PDO_DLGHORZ|PDO_DLGBOXEND, NULL, N_("Margins") }, +/*18*/{ PD_FLOAT, &newPrintGrid.orig.x, "origx", PDO_DIM|PDO_DLGRESETMARGIN, &r_100_99999, N_("Origin: X"), 0, I2VP(2) }, +/*19*/ { PD_FLOAT, &newPrintGrid.orig.y, "origy", PDO_DIM, &r_100_99999, N_("Y"), 0, I2VP(2) }, +/*20*/ { PD_BUTTON, DoResetGrid, "reset", PDO_DLGHORZ, NULL, N_("Reset") }, +/*21*/ { PD_FLOAT, &newPrintGrid.angle, "origa", PDO_ANGLE|PDO_DLGBOXEND, &r0_360, N_("Angle"), 0, I2VP(2) }, +/*22*/ { PD_BUTTON, DoPrintSetup, "setup", PDO_DLGCMDBUTTON, NULL, N_("Setup") }, +/*23*/ { PD_BUTTON, SelectAllPages, "selall", 0, NULL, N_("Select All") }, +/*24*/ { PD_BUTTON, PrintClear, "clear", 0, NULL, N_("Clear") }, #define I_PAGECNT (25) -/*25*/ { PD_MESSAGE, N_("0 pages"), NULL, 0, (void*)80 }, -/*26*/ { PD_MESSAGE, N_("selected"), NULL, 0, (void*)80 } +/*25*/ { PD_MESSAGE, N_("0 pages"), NULL, 0, I2VP(80) }, +/*26*/ { PD_MESSAGE, N_("selected"), NULL, 0, I2VP(80) } }; -static paramGroup_t printPG = { "print", PGO_PREFMISCGROUP, printPLs, sizeof printPLs/sizeof printPLs[0] }; +static paramGroup_t printPG = { "print", PGO_PREFMISCGROUP, printPLs, COUNT( printPLs ) }; static struct { double top, right, bottom, left; @@ -416,8 +415,8 @@ static void PrintGaudyBox( static void PrintPlainBox( - wPos_t x, - wPos_t y, + int x, + int y, coOrd *corners ) { coOrd p00, p01, p10, p11; @@ -507,11 +506,6 @@ static void PrintUpdate( int inx0 ) ParamLoadData( &printPG ); - if (newPrintGrid.size.x > maxPageSize.x+0.01 || - newPrintGrid.size.y > maxPageSize.y+0.01) { - NoticeMessage( MSG_PRINT_MAX_SIZE, _("Ok"), NULL, - FormatSmallDistance(maxPageSize.x), FormatSmallDistance(maxPageSize.y) ); - } if (newPrintGrid.size.x > maxPageSize.x) { newPrintGrid.size.x = maxPageSize.x; ParamLoadControl( &printPG, 1 ); @@ -521,8 +515,8 @@ static void PrintUpdate( int inx0 ) ParamLoadControl( &printPG, 3 ); } currPrintGrid = newPrintGrid; - for ( inx = 0; inx < sizeof printPLs/sizeof printPLs[0]; inx++ ) { - if ( inx != inx0 && printPLs[inx].context == (void*)2 ) + for ( inx = 0; inx < COUNT( printPLs ); inx++ ) { + if ( inx != inx0 && printPLs[inx].context == I2VP(2) ) ParamLoadControl( &printPG, inx ); } ChangeDim(); @@ -554,6 +548,8 @@ static void SetPageSize( BOOL_T doScale ) maxPageSize.x *= printScale; maxPageSize.y *= printScale; } + r1_pgsz_x.high = maxPageSize.x+0.0001; + r1_pgsz_y.high = maxPageSize.y+0.0001; } /** @@ -617,8 +613,8 @@ static paramData_t printMarginPLs[] = { #define I_PM_MESSAGE (4) { PD_MESSAGE, NULL, NULL, 0, NULL }, #define I_PM_RESET (5) - { PD_BUTTON, (void*) PrintMarginReset, "marginReset", PDO_DLGCMDBUTTON, NULL, N_("Reset") } }; -static paramGroup_t printMarginPG = { "printMargin", PGO_PREFMISCGROUP|PGO_NODEFAULTPROC, printMarginPLs, sizeof printMarginPLs/sizeof printMarginPLs[0] }; + { PD_BUTTON, PrintMarginReset, "marginReset", PDO_DLGCMDBUTTON, NULL, N_("Reset") } }; +static paramGroup_t printMarginPG = { "printMargin", PGO_PREFMISCGROUP|PGO_NODEFAULTPROC, printMarginPLs, COUNT( printMarginPLs ) }; static wLines_t aPmLines[] = { { 1, 25, 11, 94, 11 }, @@ -631,9 +627,9 @@ static int pmyoff=5; static void PrintMarginLayout( paramData_t * pd, int index, - wPos_t colX, - wPos_t * w, - wPos_t * h ) + wWinPix_t colX, + wWinPix_t * w, + wWinPix_t * h ) { if ( index < I_PM_FIRST || index > (I_PM_MESSAGE) ) return; @@ -641,7 +637,7 @@ static void PrintMarginLayout( *h = wControlGetPosY( printMarginPLs[I_PM_FIRST+2].control ) + wControlGetHeight( printMarginPLs[I_PM_FIRST+2].control ); return; } - wPos_t x0, y0; + wWinPix_t x0, y0; x0 = (aPmLines[index-I_PM_FIRST].x0+aPmLines[index-I_PM_FIRST].x1)/2; y0 = (aPmLines[index-I_PM_FIRST].y0+aPmLines[index-I_PM_FIRST].y1)/2; x0 -= pmxoff; @@ -690,8 +686,8 @@ static void DoPrintMarginOk( void * context ) sprintf( message, "%s-marginL", sPrinterName ); wPrefSetFloat( "printer", message, printMargin.left ); SetPageSize( TRUE ); - for ( int inx = 0; inx < sizeof printPLs/sizeof printPLs[0]; inx++ ) { - if ( printPLs[inx].context == (void*)2 ) + for ( int inx = 0; inx < COUNT( printPLs ); inx++ ) { + if ( printPLs[inx].context == I2VP(2) ) ParamLoadControl( &printPG, inx ); } DoPrintScale(); @@ -719,17 +715,17 @@ static void DoPrintMargin( void ) DoPrintSetup(); } if ( printMarginWin == NULL ) { - wPos_t x=10, y=10; + int x=10, y=10; printMarginWin = ParamCreateDialog( &printMarginPG, MakeWindowTitle(_("Print Margins")), _("Ok"), DoPrintMarginOk, NULL, TRUE, PrintMarginLayout, F_BLOCK, PrintMarginDlgUpdate ); if ( printMarginWin == NULL ) return; - for ( int i=0; i 0 && x <= bm.x1 && y > 0 && y <= bm.y1) { + x -= bm.x0-1; + y -= bm.y0-1; + if (x > 0 && x <= bm.x1-bm.x0 && y > 0 && y <= bm.y1-bm.y0) { DynStringPrintf(&formatted, "(%d/%d)", x, y); } else { DynStringCatCStr(&formatted, "(-/-)"); @@ -944,7 +942,7 @@ FormatPageNumber(int x, int y) */ static bool -PrintPageNumber(wPos_t x, wPos_t y, DIST_T width, DIST_T height) +PrintPageNumber(int x, int y, DIST_T width, DIST_T height) { coOrd printPosition; coOrd textSize; @@ -953,23 +951,26 @@ PrintPageNumber(wPos_t x, wPos_t y, DIST_T width, DIST_T height) wFont_p fp = wStandardFont(F_HELV, TRUE, FALSE); wFontSize_t fs = 64.0; - positionText = FormatPageNumber(x + 1, y + 1); + positionText = FormatPageNumber(x, y); - // even though we're printing into page_d, mainD must be used here - DrawTextSize(&mainD, positionText, fp, fs, TRUE, &textSize); + if (strcmp(positionText,"(-/-)") != 0) { + // even though we're printing into page_d, mainD must be used here + DrawTextSize(&mainD, positionText, fp, fs, TRUE, &textSize); - if (printFormat == PORTRAIT) { - printPosition.x = (width - textSize.x) / 2; - printPosition.y = (height - textSize.y) / 2; - } else { - printPosition.x = (height - textSize.x) / 2; - printPosition.y = (width - textSize.y) / 2; - } + if (printFormat == PORTRAIT) { + printPosition.x = (width - textSize.x) / 2; + printPosition.y = (height - textSize.y) / 2; + } else { + printPosition.x = (height - textSize.x) / 2; + printPosition.y = (width - textSize.y) / 2; + } - page_d.funcs->options |= wDrawOutlineFont; - DrawString(&page_d, printPosition, 0.0, positionText, fp, fs, - wDrawColorGray(70)); - page_d.funcs->options &= ~wDrawOutlineFont; + unsigned long options = page_d.options; + page_d.options |= DC_OUTLINE; + DrawString(&page_d, printPosition, 0.0, positionText, fp, fs, + wDrawColorGray(70)); + page_d.options = options; + } free(positionText); @@ -992,7 +993,9 @@ PrintNextPageNumberAt(int x, int y, coOrd position) wFontSize_t fs = 8.0; pageNumber = FormatPageNumber(x, y); - DrawString(&page_d, position, 0.0, pageNumber, fp, fs, wDrawColorBlack); + //Suppress garbage page numbers + if (strcmp(pageNumber,"(-/-)") != 0) + DrawString(&page_d, position, 0.0, pageNumber, fp, fs, wDrawColorBlack); free(pageNumber); } @@ -1020,7 +1023,7 @@ PrintNextPageNumbers(int x, int y, DIST_T pageW, DIST_T pageH) p00.x = pageH / 2.0 - 20.0 / 72.0; p00.y = pageW - 10.0 / 72.0; } - PrintNextPageNumberAt(x + 1, y + 2, p00); + PrintNextPageNumberAt(x, y + 1, p00); // below if (printFormat == PORTRAIT) { @@ -1028,7 +1031,7 @@ PrintNextPageNumbers(int x, int y, DIST_T pageW, DIST_T pageH) } else { p00.y = 10.0 / 72.0; } - PrintNextPageNumberAt(x + 1, y, p00); + PrintNextPageNumberAt(x, y-1, p00); // right if (printFormat == PORTRAIT) { @@ -1038,7 +1041,7 @@ PrintNextPageNumbers(int x, int y, DIST_T pageW, DIST_T pageH) p00.y = pageW / 2 + 10.0 / 72.0; p00.x = pageH - 20.0 / 72.0; } - PrintNextPageNumberAt(x + 2, y + 1, p00); + PrintNextPageNumberAt(x+1, y, p00); // left if (printFormat == PORTRAIT) { @@ -1046,7 +1049,7 @@ PrintNextPageNumbers(int x, int y, DIST_T pageW, DIST_T pageH) } else { p00.x = 10.0 / 72.0; } - PrintNextPageNumberAt(x, y + 1, p00); + PrintNextPageNumberAt(x-1, y, p00); return (TRUE); } @@ -1142,22 +1145,31 @@ static BOOL_T PrintPage( } } if (printRotate) { - wPrintClip( (wPos_t)(clipOrig.y*print_d.dpi), (wPos_t)(clipOrig.x*print_d.dpi), - (wPos_t)(clipSize.y*print_d.dpi), (wPos_t)(clipSize.x*print_d.dpi) ); + wPrintClip( (clipOrig.y*print_d.dpi), (clipOrig.x*print_d.dpi), + (clipSize.y*print_d.dpi), (clipSize.x*print_d.dpi) ); } else { - wPrintClip( (wPos_t)(clipOrig.x*print_d.dpi), (wPos_t)(clipOrig.y*print_d.dpi), - (wPos_t)(clipSize.x*print_d.dpi), (wPos_t)(clipSize.y*print_d.dpi) ); + wPrintClip( (clipOrig.x*print_d.dpi), (clipOrig.y*print_d.dpi), + (clipSize.x*print_d.dpi), (clipSize.y*print_d.dpi) ); } p[0].x = p[3].x = 0.0; p[1].x = p[2].x = roomSize.x; p[0].y = p[1].y = 0.0; p[2].y = p[3].y = roomSize.y; - DrawRuler( &print_d, p[0], p[1], 0.0, TRUE, FALSE, wDrawColorBlack ); - DrawRuler( &print_d, p[0], p[3], 0.0, TRUE, TRUE, wDrawColorBlack ); - DrawRuler( &print_d, p[1], p[2], 0.0, FALSE, FALSE, wDrawColorBlack ); - DrawRuler( &print_d, p[3], p[2], 0.0, FALSE, TRUE, wDrawColorBlack ); - if ( printRuler && currPrintGrid.angle == 0 ) { + BOOL_T left_clear = FALSE, right_clear = FALSE, base_clear = FALSE, top_clear = FALSE; + + if (currPrintGrid.orig.x <= -0.5*printScale) left_clear = TRUE; + if (currPrintGrid.orig.y <= -0.5*printScale) base_clear = TRUE; + if (clipOrig.x + clipSize.x > roomSize.x + 0.5*printScale) right_clear = TRUE; + if (clipOrig.y + clipSize.y > roomSize.y + 0.5*printScale) top_clear = TRUE; + + if (printRuler != 2) { /* Not None so Edge or Every */ + DrawRuler( &print_d, p[0], p[1], 0.0, TRUE, !base_clear, wDrawColorBlack ); + DrawRuler( &print_d, p[0], p[3], 0.0, TRUE, left_clear, wDrawColorBlack ); + DrawRuler( &print_d, p[1], p[2], 0.0, TRUE, right_clear, wDrawColorBlack ); + DrawRuler( &print_d, p[3], p[2], 0.0, TRUE, !top_clear, wDrawColorBlack ); + } + if ( printRuler==1 && currPrintGrid.angle == 0 ) { /* Every Page and not rotated origin */ if ( !printRotate ) { p[2] = p[3] = print_d.orig; p[3].x += print_d.size.x; @@ -1174,47 +1186,51 @@ static BOOL_T PrintPage( p[3].y = print_d.orig.y; } if ( p[2].x > 0 ) - minP.x = p[2].x + 0.4 * print_d.scale; + minP.x = p[2].x + 0.5 * print_d.scale; else minP.x = 0.0; if ( p[3].x < roomSize.x ) - maxP.x = p[3].x - 0.2 * print_d.scale; + maxP.x = p[3].x - 0.5 * print_d.scale; else maxP.x = roomSize.x; - if ( p[2].y > 0 ) - minP.y = p[2].y + 0.4 * print_d.scale; + if ( p[2].y > 0 ) + minP.y = p[2].y + 0.5 * print_d.scale; else minP.y = 0.0; if ( p[3].y < roomSize.y ) - maxP.y = p[3].y - 0.2 * print_d.scale; + maxP.y = p[3].y - 0.5 * print_d.scale; else maxP.y = roomSize.y; p[0].y = 0.0; p[1].y = maxP.y - minP.y; - if ( p[2].x > 0 ) { - p[0].x = p[1].x = p[2].x + 0.4 * print_d.scale; + if ( p[2].x > 0.5* print_d.scale ) { + p[0].x = p[1].x = p[2].x + 0.5* print_d.scale; DrawRuler( &print_d, p[0], p[1], minP.y, TRUE, TRUE, wDrawColorBlack ); } - if ( p[3].x < roomSize.x ) { - p[0].x = p[1].x = p[3].x - 0.2 * print_d.scale; - DrawRuler( &print_d, p[0], p[1], minP.y, FALSE, FALSE, wDrawColorBlack ); + if ( p[3].x < roomSize.x - 0.5 * print_d.scale ) { + p[0].x = p[1].x = p[3].x - 0.5 * print_d.scale; + DrawRuler( &print_d, p[0], p[1], minP.y, TRUE, FALSE, wDrawColorBlack ); } p[0].x = 0; p[1].x = maxP.x - minP.x; - if ( p[2].y > 0 ) { - p[0].y = p[1].y = p[2].y + 0.4 * print_d.scale; + if ( p[2].y > 0.5 * print_d.scale ) { + p[0].y = p[1].y = p[2].y + 0.5 * print_d.scale; DrawRuler( &print_d, p[0], p[1], minP.x, TRUE, FALSE, wDrawColorBlack ); } - if ( p[3].y < roomSize.y ) { - p[0].y = p[1].y = p[3].y - 0.2 * print_d.scale; - DrawRuler( &print_d, p[0], p[1], minP.x, FALSE, TRUE, wDrawColorBlack ); + if ( p[3].y < roomSize.y - 0.5 * print_d.scale) { + p[0].y = p[1].y = p[3].y - 0.5 * print_d.scale; + DrawRuler( &print_d, p[0], p[1], minP.x, TRUE, TRUE, wDrawColorBlack ); } } if (printGrid) DrawSnapGrid( &print_d, mapD.size, FALSE ); roadbedWidth = printRoadbed?printRoadbedWidth:0.0; - printCenterLines = printCenterLine; + if (printCenterLine) { + print_d.options |= DC_CENTERLINE; + } else { + print_d.options &= ~DC_CENTERLINE; + } DrawTracks( &print_d, print_d.scale, minP, maxP ); if (printRegistrationMarks && printScale == 1) DrawRegistrationMarks( &print_d ); @@ -1296,7 +1312,7 @@ static void DoResetGrid( void ) static void PrintGridRotate( void * pangle ) { - ANGLE_T angle = (ANGLE_T)(long)pangle; + ANGLE_T angle = (ANGLE_T)VP2L(pangle); currPrintGrid.orig = cmdMenuPos; currPrintGrid.angle += angle/1000; newPrintGrid = currPrintGrid; @@ -1330,9 +1346,9 @@ static void PrintDlgUpdate( void * valueP ) { if ( inx < 0 ) return; - if ( pg->paramPtr[inx].context == (void*)1 ) + if ( pg->paramPtr[inx].context == I2VP(1) ) DoPrintScale(); - else if ( pg->paramPtr[inx].context == (void*)2 ) + else if ( pg->paramPtr[inx].context == I2VP(2) ) PrintUpdate( inx ); ParamControlActive( &printPG, I_RULER, currPrintGrid.angle == 0 ); TempRedraw(); // PrintDlgUpdate @@ -1474,6 +1490,9 @@ LOG( log_print, 2, ( "Page size = %0.3f %0.3f\n", currPrintGrid.size.x, currPrin } } + +#include "bitmaps/doc-print.xpm" + EXPORT wIndex_t InitCmdPrint( wMenu_p menu ) { ParamRegister( &printPG ); @@ -1483,7 +1502,7 @@ EXPORT wIndex_t InitCmdPrint( wMenu_p menu ) printGridPopupM = MenuRegister( "Print Grid Rotate" ); AddRotateMenu( printGridPopupM, PrintGridRotate ); ParamRegister( &printMarginPG ); - return InitCommand( menu, CmdPrint, N_("Print..."), NULL, LEVEL0, IC_LCLICK|IC_POPUP3|IC_CMDMENU, ACCL_PRINT ); + return AddMenuButton( menu, CmdPrint, "cmdPrint", N_("Print..."), wIconCreatePixMap(doc_print_xpm[iconSize]), LEVEL0, IC_LCLICK|IC_POPUP3|IC_CMDMENU, ACCL_PRINT, NULL ); } /***************************************************************************** @@ -1495,10 +1514,6 @@ EXPORT wIndex_t InitCmdPrint( wMenu_p menu ) wDrawable_t printD, mainD; -void wDrawHilight( void * d, coOrd orig, coOrd size ) -{ - lprintf( "wDrawHilight (%0.3f %0.3f) (%0.3f %0.3f)\n", orig.x, orig.y, size.x, size.y ); -} void PrintPage( void * d, wIndex_t mode , wIndex_t x, wIndex_t y ) { lprintf( "printPage %dx%d at (%0.3f %0.3f)\n", x, y, orig.x, orig.y ); @@ -1563,7 +1578,7 @@ main( INT_T argc, char * argv[] ) mapD.size.x = 4*12; mapD.size.y = 3*12; printD.scale = 1.0; - for (i=0; i<(sizeof cmds)/(sizeof cmds[0]); i++) { + for (i=0; i -#include - #include "custom.h" #include "cselect.h" #include "cundo.h" -#include "i18n.h" #include "layout.h" -#include "messages.h" #include "param.h" #include "shrtpath.h" #include "track.h" +#include "common-ui.h" /* @@ -268,7 +264,7 @@ static void DrawProfile(drawCmd_p D, wFontSize_t fontSize, BOOL_T printVert) DYNARR_APPEND(pts_t, points_da, 10); pb.x = 0; points(points_da.cnt-1) = pb; - DrawPoly(D, points_da.cnt, points_da.ptr, NULL, profileColorFill, 1, 1, 0); + DrawPoly(D, points_da.cnt, points_da.ptr, NULL, profileColorFill, 1, DRAW_FILL); } pt.y = prof.minE-(2*LABELH+3.0/mainD.dpi)/prof.scaleY*D->scale; @@ -386,8 +382,8 @@ static void DrawProfile(drawCmd_p D, wFontSize_t fontSize, BOOL_T printVert) -static void ProfilePix2CoOrd(drawCmd_p, wPos_t, wPos_t, coOrd *); -static void ProfileCoOrd2Pix(drawCmd_p, coOrd, wPos_t*, wPos_t*); +static void ProfilePix2CoOrd(drawCmd_p, wDrawPix_t, wDrawPix_t, coOrd *); +static void ProfileCoOrd2Pix(drawCmd_p, coOrd, wDrawPix_t*, wDrawPix_t*); static drawCmd_t screenProfileD = { NULL, &screenDrawFuncs, @@ -400,8 +396,8 @@ static drawCmd_t screenProfileD = { static void ProfilePix2CoOrd( drawCmd_p d, - wPos_t xx, - wPos_t yy, + wDrawPix_t xx, + wDrawPix_t yy, coOrd * pos) { pos->x = (xx/d->dpi+d->orig.x)/prof.scaleX; @@ -412,12 +408,12 @@ static void ProfilePix2CoOrd( static void ProfileCoOrd2Pix( drawCmd_p d, coOrd pos, - wPos_t *xx, - wPos_t *yy) + wDrawPix_t *xx, + wDrawPix_t *yy) { - wPos_t x, y; - x = (wPos_t)((((pos.x*prof.scaleX)/d->scale-d->orig.x)*d->dpi+0.5)); - y = (wPos_t)(((((pos.y-prof.minE)*prof.scaleY)/d->scale-d->orig.y)*d->dpi+0.5)); + wDrawPix_t x, y; + x = ((((pos.x*prof.scaleX)/d->scale-d->orig.x)*d->dpi+0.5)); + y = (((((pos.y-prof.minE)*prof.scaleY)/d->scale-d->orig.y)*d->dpi+0.5)); if (d->angle == 0) { *xx = x; *yy = y; @@ -436,9 +432,9 @@ static void ProfileCoOrd2Pix( * Redraw profile window */ -static void RedrawProfileW(void) +static void RedrawProfileW( wDraw_p d, void * context, wWinPix_t x, wWinPix_t y ) { - wPos_t ww, hh; + wWinPix_t ww, hh; coOrd size; int divC; DIST_T maxE, rngE; @@ -676,10 +672,7 @@ static void DoProfilePrint(void * junk) p[1].x = p[2].x = PRINT_ABS2PAGEX(size.x+(printVert?PBR( printProfileFontSize)/4.0:PBR(printProfileFontSize))); p[2].y = p[3].y = PRINT_ABS2PAGEY(size.y+(printVert?PBT*2:PBT)); - DrawLine(&printProfileD, p[0], p[1], 0, drawColorBlack); - DrawLine(&printProfileD, p[1], p[2], 0, drawColorBlack); - DrawLine(&printProfileD, p[2], p[3], 0, drawColorBlack); - DrawLine(&printProfileD, p[3], p[0], 0, drawColorBlack); + DrawPoly( &printProfileD, 4, p, NULL, drawColorBlack, 0, DRAW_CLOSED ); DrawProfile(&printProfileD, printProfileFontSize, printVert); wPrintPageEnd(printProfileD.d); @@ -697,28 +690,28 @@ static wWin_p profileW; static BOOL_T profileUndo = FALSE; static void DoProfileChange(void *junk); static void DoProfileReset(void *junk); -static void DoProfileDone(void *); -static void DoProfileClear(void *); -static void DoProfilePrint(void *); -static void DoProfileChangeMode(void *); +static void DoProfileDone(void * junk); +static void DoProfileClear(void * junk); +static void DoProfilePrint(void * junk); +static void DoProfileChangeMode(void * junk); static void SelProfileW(wIndex_t, coOrd); static void CloseProfileWindow(paramGroup_p pg, int event, void *data); -static paramDrawData_t profileDrawData = { 300, 150, (wDrawRedrawCallBack_p)RedrawProfileW, SelProfileW, &screenProfileD }; +static paramDrawData_t profileDrawData = { 300, 150, RedrawProfileW, SelProfileW, &screenProfileD }; static paramData_t profilePLs[] = { { PD_DRAW, NULL, "canvas", PDO_DLGRESIZE, &profileDrawData }, #define I_PROFILEMSG (1) - { PD_MESSAGE, NULL, NULL, PDO_DLGIGNOREX, (void*)300 }, + { PD_MESSAGE, NULL, NULL, PDO_DLGIGNOREX, I2VP(300) }, #define I_CHANGEBUTTON 2 - { PD_BUTTON, (void*)DoProfileChange, "change", PDO_DLGCMDBUTTON, NULL, N_("Change") }, + { PD_BUTTON, DoProfileChange, "change", PDO_DLGCMDBUTTON, NULL, N_("Change") }, #define I_RESETBUTTON 3 - { PD_BUTTON, (void*)DoProfileReset, "reset", PDO_DLGCMDBUTTON, NULL, N_("Reset") }, + { PD_BUTTON, DoProfileReset, "reset", PDO_DLGCMDBUTTON, NULL, N_("Reset") }, #define I_CLEARBUTTON 4 - { PD_BUTTON, (void*)DoProfileClear, "clear", PDO_DLGCMDBUTTON, NULL, N_("Clear") }, + { PD_BUTTON, DoProfileClear, "clear", PDO_DLGCMDBUTTON, NULL, N_("Clear") }, #define I_PRINTBUTTON 5 - { PD_BUTTON, (void*)DoProfilePrint, "print", 0, NULL, N_("Print") } + { PD_BUTTON, DoProfilePrint, "print", 0, NULL, N_("Print") } }; -static paramGroup_t profilePG = { "profile", 0, profilePLs, sizeof profilePLs/sizeof profilePLs[0] }; +static paramGroup_t profilePG = { "profile", 0, profilePLs, COUNT( profilePLs ) }; #define CHANGEBUTTON ((wButton_p)profilePLs[I_CHANGEBUTTON].control) #define RESETBUTTON ((wButton_p)profilePLs[I_RESETBUTTON].control) @@ -742,6 +735,9 @@ static void SelProfileW( elev = pos.y; switch (action&0xFF) { + case C_START: + profileUndo = FALSE; + break; case C_DOWN: for (inx=0; inx=1) { lprintf(" = "); @@ -1383,9 +1379,9 @@ static void ProfileSelect(track_p trkN, EPINX_T epN) -static void ProfileSubCommand(wBool_t set, void* pcmd) +static void ProfileSubCommand(void* pcmd) { - long cmd = (long)pcmd; + long cmd = VP2L(pcmd); int mode; coOrd pos = oldMarker; DIST_T elev; @@ -1425,7 +1421,7 @@ static void ProfileSubCommand(wBool_t set, void* pcmd) } UpdateTrkEndElev(profilePopupTrk, profilePopupEp, mode, elev, NULL); ComputeProfElem(); - RedrawProfileW(); + RedrawProfileW( screenProfileD.d, NULL, 0, 0 ); TempRedraw(); // ProfileSubCommand } @@ -1454,7 +1450,7 @@ static STATUS_T CmdProfile(wAction_t action, coOrd pos) ParamLoadMessage(&profilePG, I_PROFILEMSG, _("Drag to change Elevation")); profElem_da.cnt = 0; station_da.cnt = 0; - RedrawProfileW(); + RedrawProfileW( screenProfileD.d, NULL, 0, 0 ); ClrAllTrkBitsRedraw(TB_PROFILEPATH, TRUE); pathStartTrk = NULL; SetAllTrackSelect(FALSE); @@ -1514,7 +1510,7 @@ static STATUS_T CmdProfile(wAction_t action, coOrd pos) static void ProfileChange(long changes) { if ((changes & CHANGE_UNITS) && screenProfileD.d) { - RedrawProfileW(); + RedrawProfileW( screenProfileD.d, NULL, 0, 0 ); } } @@ -1526,14 +1522,14 @@ EXPORT void InitCmdProfile(wMenu_p menu) ParamRegister(&profilePG); AddMenuButton(menu, CmdProfile, "cmdProfile", _("Profile"), - wIconCreatePixMap(profile_xpm), LEVEL0_50, IC_LCLICK|IC_CMDMENU|IC_POPUP3, + wIconCreatePixMap(profile_xpm[iconSize]), LEVEL0_50, IC_LCLICK|IC_CMDMENU|IC_POPUP3, ACCL_PROFILE, NULL); profilePopupM = MenuRegister("Profile Mode"); profilePopupToggles[0] = wMenuToggleCreate(profilePopupM, "", _("Define"), 0, - FALSE, ProfileSubCommand, (void*)0); + FALSE, ProfileSubCommand, I2VP(0)); profilePopupToggles[1] = wMenuToggleCreate(profilePopupM, "", _("Ignore"), 0, - FALSE, ProfileSubCommand, (void*)1); + FALSE, ProfileSubCommand, I2VP(1)); profilePopupToggles[2] = wMenuToggleCreate(profilePopupM, "", _("None"), 0, - FALSE, ProfileSubCommand, (void*)2); + FALSE, ProfileSubCommand, I2VP(2)); RegisterChangeNotification(ProfileChange); } diff --git a/app/bin/cpull.c b/app/bin/cpull.c index 7f27864..afdf834 100644 --- a/app/bin/cpull.c +++ b/app/bin/cpull.c @@ -20,16 +20,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include - #include "cselect.h" #include "compound.h" #include "cundo.h" #include "fileio.h" -#include "i18n.h" -#include "messages.h" #include "track.h" -#include "utility.h" +#include "draw.h" +#include "common-ui.h" int debugPull = 0; @@ -816,6 +813,8 @@ static STATUS_T CmdPull( return C_CONTINUE; case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if (anchors_da.cnt) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); if (t1 && t_turn1) @@ -856,11 +855,13 @@ static STATUS_T CmdPull( -#include "bitmaps/pull.xpm" +#include "bitmaps/connect.xpm" wMenuPush_p pullConnectMultiple; -void pullMenuEnter(int key) { +void pullMenuEnter( void * keyVP ) +{ + int key = (int)VP2L(keyVP); int action; action = C_TEXT; action |= key<<8; @@ -869,7 +870,7 @@ void pullMenuEnter(int key) { void InitCmdPull( wMenu_p menu ) { - AddMenuButton( menu, CmdPull, "cmdConnect", _("Connect Two Tracks"), wIconCreatePixMap(pull_xpm), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_LCLICK|IC_POPUP3|IC_CMDMENU|IC_WANT_MOVE, ACCL_CONNECT, NULL ); + AddMenuButton( menu, CmdPull, "cmdConnect", _("Connect Two Tracks"), wIconCreatePixMap(connect_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_LCLICK|IC_POPUP3|IC_CMDMENU|IC_WANT_MOVE, ACCL_CONNECT, NULL ); pullPopupM = MenuRegister( "Connect Options" ); - pullConnectMultiple = wMenuPushCreate( pullPopupM, "", _("Connect All Selected - 'S'"), 0, (wMenuCallBack_p)pullMenuEnter, (void*) 'S'); + pullConnectMultiple = wMenuPushCreate( pullPopupM, "", _("Connect All Selected - 'S'"), 0, pullMenuEnter, I2VP('S') ); } diff --git a/app/bin/cruler.c b/app/bin/cruler.c index d3f2926..eb6a77d 100644 --- a/app/bin/cruler.c +++ b/app/bin/cruler.c @@ -21,11 +21,216 @@ */ #include "cundo.h" +#include "cselect.h" #include "fileio.h" -#include "i18n.h" #include "param.h" #include "track.h" -#include "utility.h" +#include "misc.h" + +#define AN_OFF (0) +#define AN_FIRST (1) +#define AN_SECOND (2) +#define AN_ON (3) + + +static struct { + STATE_T state; + coOrd pos0; + coOrd pos1; + coOrd pos2; + BOOL_T isClose; + int modifyingEnd; + } An = { AN_OFF, { 0,0 }, { 0,0 } }; + + +void DrawAngle(drawCmd_p d, coOrd p0, coOrd p1, coOrd p2, wDrawColor color) { + char msg[512]; + trkSeg_t seg; + if ((An.state != AN_OFF) && !IsClose(FindDistance(p0,p1))) { + seg.type = SEG_STRLIN; + seg.width = 0; + seg.color = wDrawColorBlack; + seg.u.l.pos[0] = p0; + seg.u.l.pos[1] = p1; + DrawSegs(d,zero,0.0,&seg,1,trackGauge,color); + + if (!(IsClose(FindDistance(p0,p2)))) { + seg.type = SEG_STRLIN; + seg.width = 0; + seg.color = wDrawColorBlack; + seg.u.l.pos[0] = p0; + seg.u.l.pos[1] = p2; + DrawSegs(d,zero,0.0,&seg,1,trackGauge,color); + + DIST_T r = min(FindDistance(p0,p2),FindDistance(p0,p1))/2; + ANGLE_T a = DifferenceBetweenAngles(FindAngle(p0,p1),FindAngle(p0,p2)); + ANGLE_T a0; + + if (a>=0) + a0 = FindAngle(p0,p1); + else + a0 = FindAngle(p0,p2); + ANGLE_T a1 = fabs(DifferenceBetweenAngles(FindAngle(p0,p1),FindAngle(p0,p2))); + seg.type = SEG_CRVLIN; + seg.u.c.center = p0; + seg.u.c.radius = r; + seg.u.c.a0 = a0; + seg.u.c.a1 = a1; + DrawSegs(d,zero,0.0,&seg,1,trackGauge,color); + + coOrd p; + Translate(&p, p0, a1/2+a0, r ); + seg.type = SEG_TEXT; + seg.u.t.angle = 0.0; + sprintf(msg,"RA: %0.3f",a1); + seg.u.t.string = msg; + seg.u.t.pos = p; + seg.u.t.fontSize = 10.0*d->scale; + seg.u.t.fontP = NULL; + seg.u.t.boxed = FALSE; + DrawSegs(d,zero,0.0,&seg,1,trackGauge,color); + } + } + +} + + +static STATUS_T CmdAngle( wAction_t action, coOrd pos ) +{ + switch (action) { + + case C_START: + switch (An.state) { + case AN_OFF: + An.state = AN_ON; + break; + case AN_ON: + An.state = AN_OFF; + case AN_FIRST: + case AN_SECOND: + An.state = AN_OFF; + break; + } + return C_CONTINUE; + + case C_DOWN: + switch (An.state) { + case AN_OFF: + case AN_ON: + An.pos0 = An.pos1 = An.pos2 = pos; + An.state = AN_FIRST; + InfoMessage( "Drag out base line" ); + break; + case AN_FIRST: + An.pos2 = pos; + An.state = AN_SECOND; + InfoMessage( "Drag Angle" ); + break; + } + return C_CONTINUE; + + case C_MOVE: + //Lock to 90 degrees with CTRL + if (MyGetKeyState()&WKEY_CTRL) { + ANGLE_T line_angle; + if (An.state == AN_FIRST) line_angle = 0.0; + else line_angle = FindAngle(An.pos0,An.pos1); + DIST_T l = FindDistance(An.pos0, pos); + if (!IsClose(l)) { + ANGLE_T angle2 = NormalizeAngle(FindAngle(An.pos0, pos)-line_angle); + int oct = (int)((angle2 + 22.5) / 45.0); + l = fabs(l*cos(D2R(angle2-oct*45))); + Translate( &pos, An.pos0, oct*45.0+line_angle, l ); + } + } + switch (An.state) { + case AN_FIRST: + An.pos1 = An.pos2 = pos; + break; + case AN_SECOND: + An.pos2 = pos; + break; + default:; + } + if (An.state == AN_FIRST) + InfoMessage( "Base Angle %0.3f",FindAngle(An.pos0,An.pos1)); + if (An.state == AN_SECOND) + InfoMessage( "Base Angle %0.3f, Relative Angle %0.3f",FindAngle(An.pos0,An.pos1), + fabs(DifferenceBetweenAngles(FindAngle(An.pos0,An.pos1),FindAngle(An.pos0,An.pos2)))); + return C_CONTINUE; + + case C_UP: + if (An.state == AN_SECOND) return C_TERMINATE; + return C_CONTINUE; + + case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); + if (An.state != AN_OFF) { + if (!IsClose(FindDistance(An.pos1,An.pos2))) { + DrawAngle( &tempD, An.pos0, An.pos1, An.pos2, wDrawColorBlack ); + } + } + return C_CONTINUE; + + case C_CANCEL: + return C_TERMINATE; + + } + return C_CONTINUE; + +} + +STATUS_T ModifyProtractor( + wAction_t action, + coOrd pos ) +{ + switch (action&0xFF) { + case C_DOWN: + An.modifyingEnd = -1; + An.isClose = FALSE; + if ( An.state == AN_OFF ) + return C_ERROR; + if ( IsClose(FindDistance( pos, An.pos0 ))) { + An.modifyingEnd = 0; + } else if ( IsClose(FindDistance( pos, An.pos1 ))) { + An.modifyingEnd = 1; + } else if ( IsClose(FindDistance( pos, An.pos2 ))) { + An.modifyingEnd = 2; + } else + return C_ERROR; + break; + case C_MOVE: + if ( An.modifyingEnd == 0 ) { + An.pos0 = pos; + } else if (An.modifyingEnd == 1) { + An.pos1 = pos; + } else if (An.modifyingEnd == 2) { + An.pos2 = pos; + } + InfoMessage( "Base Angle %0.3f, Relative Angle %0.3f",FindAngle(An.pos0,An.pos1), + fabs(DifferenceBetweenAngles(FindAngle(An.pos0,An.pos1),FindAngle(An.pos0,An.pos2)))); + return C_CONTINUE; + case C_UP: + return C_CONTINUE; + case C_REDRAW: + DrawAngle( &tempD, An.pos0, An.pos1, An.pos2, An.isClose?wDrawColorBlue:wDrawColorBlack ); + break; + case wActionMove: + if ( IsClose(FindDistance( pos, An.pos0 )) || + IsClose(FindDistance( pos, An.pos1 )) || + IsClose(FindDistance( pos, An.pos2 )) ) { + An.isClose = TRUE; + } else + An.isClose = FALSE; + break; + default: + return C_ERROR; + } + return C_CONTINUE; +} + + /***************************************************************************** @@ -44,15 +249,23 @@ static struct { STATE_T state; coOrd pos0; coOrd pos1; + BOOL_T isClose; int modifyingEnd; } Dr = { DR_OFF, { 0,0 }, { 0,0 } }; + void RulerRedraw( BOOL_T demo ) { + if (programMode == MODE_TRAIN) return; if (Dr.state == DR_ON) - DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, wDrawColorBlack ); - if (demo) + DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, Dr.isClose?wDrawColorBlue:wDrawColorBlack ); + if (demo) { Dr.state = DR_OFF; + An.state = AN_OFF; + } + if (An.state != AN_OFF) + DrawAngle( &tempD, An.pos0, An.pos1, An.pos2, An.isClose?wDrawColorBlue:wDrawColorBlack); + } static STATUS_T CmdRuler( wAction_t action, coOrd pos ) @@ -60,6 +273,7 @@ static STATUS_T CmdRuler( wAction_t action, coOrd pos ) switch (action) { case C_START: + Dr.isClose = FALSE; switch (Dr.state) { case DR_OFF: Dr.state = DR_ON; @@ -87,19 +301,22 @@ static STATUS_T CmdRuler( wAction_t action, coOrd pos ) return C_TERMINATE; case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if (Dr.state == DR_ON) { - DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, wDrawColorBlack ); + DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, Dr.isClose?wDrawColorBlue:wDrawColorBlack ); } return C_CONTINUE; case C_CANCEL: return C_TERMINATE; - } + return C_CONTINUE; } + STATUS_T ModifyRuler( wAction_t action, coOrd pos ) @@ -109,25 +326,36 @@ STATUS_T ModifyRuler( Dr.modifyingEnd = -1; if ( Dr.state != DR_ON ) return C_ERROR; - if ( FindDistance( pos, Dr.pos0 ) < mainD.scale*0.25 ) { + if ( IsClose(FindDistance( pos, Dr.pos0 ))) { Dr.modifyingEnd = 0; - } else if ( FindDistance( pos, Dr.pos1 ) < mainD.scale*0.25 ) { + } else if ( IsClose(FindDistance( pos, Dr.pos1 ))) { Dr.modifyingEnd = 1; } else { return C_ERROR; } + break; case C_MOVE: if ( Dr.modifyingEnd == 0 ) { Dr.pos0 = pos; - } else { + } else if ( Dr.modifyingEnd == 1) { Dr.pos1 = pos; - } + } else return C_ERROR; InfoMessage( "%s", FormatDistance( FindDistance( Dr.pos0, Dr.pos1 ) ) ); return C_CONTINUE; case C_UP: return C_CONTINUE; case C_REDRAW: - DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, wDrawColorBlack ); + DrawRuler( &tempD, Dr.pos0, Dr.pos1, 0.0, TRUE, TRUE, Dr.isClose?wDrawColorBlue:wDrawColorBlack ); + break; + case wActionMove: + if ( IsClose(FindDistance( pos, Dr.pos0 )) || + IsClose(FindDistance( pos, Dr.pos1 ))) { + Dr.isClose = TRUE; + An.isClose = FALSE; + } else { + Dr.isClose = FALSE; + ModifyProtractor(wActionMove,pos); + } break; default: return C_ERROR; @@ -137,8 +365,12 @@ STATUS_T ModifyRuler( #include "bitmaps/ruler.xpm" +#include "bitmaps/protractor.xpm" void InitCmdRuler( wMenu_p menu ) { - AddMenuButton( menu, CmdRuler, "cmdRuler", _("Ruler"), wIconCreatePixMap(ruler_xpm), LEVEL0, IC_STICKY|IC_NORESTART, ACCL_RULER, NULL ); + ButtonGroupBegin( _("Measurement"), "cmdMeasureSetCmd", _("Measurement") ); + AddMenuButton( menu, CmdRuler, "cmdRuler", _("Ruler"), wIconCreatePixMap(ruler_xpm[iconSize]), LEVEL0, IC_STICKY|IC_POPUP|IC_NORESTART, ACCL_RULER, NULL ); + AddMenuButton( menu, CmdAngle, "cmdAngle", _("Protractor"), wIconCreatePixMap(protractor_xpm[iconSize]), LEVEL0, IC_STICKY|IC_POPUP|IC_NORESTART, ACCL_ANGLE, NULL ); + ButtonGroupEnd(); } diff --git a/app/bin/cselect.c b/app/bin/cselect.c index 4e4e8eb..1b153b9 100644 --- a/app/bin/cselect.c +++ b/app/bin/cselect.c @@ -20,29 +20,25 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include - +#include "common.h" #include "draw.h" #include "ccurve.h" #include "tcornu.h" #include "tbezier.h" #include "track.h" -#define PRIVATE_EXTRADATA #include "compound.h" #include "cselect.h" #include "cundo.h" #include "custom.h" #include "fileio.h" -#include "i18n.h" #include "layout.h" -#include "messages.h" #include "param.h" #include "track.h" -#include "utility.h" +#include "cjoin.h" #include "draw.h" #include "misc.h" #include "trackx.h" +#include "common-ui.h" #include "bitmaps/bmendpt.xbm" @@ -56,12 +52,12 @@ EXPORT wIndex_t selectCmdInx; EXPORT wIndex_t moveCmdInx; EXPORT wIndex_t rotateCmdInx; +EXPORT wIndex_t flipCmdInx; #define MAXMOVEMODE (3) static long moveMode = MAXMOVEMODE; static BOOL_T enableMoveDraw = TRUE; static BOOL_T move0B; -struct extraData { char junk[2000]; }; static wDrawBitMap_p endpt_bm; static wDrawBitMap_p angle_bm[4]; @@ -70,8 +66,8 @@ track_p IsInsideABox(coOrd pos); static track_p moveDescTrk; static coOrd moveDescPos; -int incrementalDrawLimit = 20; - static int microCount = 0; +int incrementalDrawLimit = 0; +static int microCount = 0; static dynArr_t tlist_da; @@ -128,6 +124,7 @@ void CreateArrowAnchor(coOrd pos,ANGLE_T a,DIST_T len) { anchors(i).u.l.pos[0] = pos; Translate(&anchors(i).u.l.pos[1],pos,NormalizeAngle(a-135),len); anchors(i).color = wDrawColorBlue; + wSetCursor(mainD.d,wCursorNone); } void static CreateRotateAnchor(coOrd pos) { @@ -146,6 +143,16 @@ void static CreateRotateAnchor(coOrd pos) { Translate(&head,pos,j*120,d*2); CreateArrowAnchor(head,NormalizeAngle((j*120)+90),d); } + DYNARR_APPEND(trkSeg_t,anchors_da,1); + i = anchors_da.cnt-1; + anchors(i).type = SEG_CRVLIN; + anchors(i).width = d/8; + anchors(i).u.c.center = pos; + anchors(i).u.c.a0 = 180.0; + anchors(i).u.c.a1 = 360.0; + anchors(i).u.c.radius = d/16; + anchors(i).color = wDrawColorAqua; + wSetCursor(mainD.d,wCursorNone); } void static CreateModifyAnchor(coOrd pos) { @@ -168,6 +175,7 @@ void static CreateModifyAnchor(coOrd pos) { anchors(i).u.c.a1 = 360.0; anchors(i).u.c.radius = d; anchors(i).color = wDrawColorPowderedBlue; + wSetCursor(mainD.d,wCursorNone); } @@ -193,6 +201,7 @@ void CreateDescribeAnchor(coOrd pos) { Translate(&anchors(i).u.l.pos[1],pos,180.0,d*1.5); anchors(i).color = wDrawColorPowderedBlue; } + wSetCursor(mainD.d,wCursorNone); } void CreateActivateAnchor(coOrd pos) { @@ -218,6 +227,7 @@ void CreateActivateAnchor(coOrd pos) { anchors(i).u.c.a1 = 360.0; anchors(i).u.c.radius = d; anchors(i).color = wDrawColorPowderedBlue; + wSetCursor(mainD.d,wCursorNone); } void static CreateMoveAnchor(coOrd pos) { @@ -225,6 +235,7 @@ void static CreateMoveAnchor(coOrd pos) { DrawArrowHeads(&DYNARR_N(trkSeg_t,anchors_da,anchors_da.cnt-5),pos,0,TRUE,wDrawColorBlue); DYNARR_SET(trkSeg_t,anchors_da,anchors_da.cnt+5); DrawArrowHeads(&DYNARR_N(trkSeg_t,anchors_da,anchors_da.cnt-5),pos,90,TRUE,wDrawColorBlue); + wSetCursor(mainD.d,wCursorNone); } void CreateEndAnchor(coOrd p, wBool_t lock) { @@ -382,7 +393,7 @@ EXPORT void SetAllTrackSelect( BOOL_T select ) selectedTrackCount = 0; trk = NULL; while ( TrackIterate( &trk ) ) { - if ((!select) || GetLayerVisible( GetTrkLayer( trk ))) { + if ((!select) || (GetLayerVisible( GetTrkLayer( trk )) && !GetLayerFrozen(GetTrkLayer( trk )) )) { if (select) selectedTrackCount++; if ((GetTrkSelected(trk)!=0) != select) { @@ -392,7 +403,7 @@ EXPORT void SetAllTrackSelect( BOOL_T select ) ClrTrkBits( trk, TB_SELECTED ); if (!doRedraw) SetTrkBits( trk, TB_SELREDRAW ); - DrawTrackAndEndPts( trk, wDrawColorBlack ); + DrawTrackAndEndPts( trk, wDrawColorBlack ); } } } @@ -405,20 +416,20 @@ EXPORT void SetAllTrackSelect( BOOL_T select ) } } -/* Invert selected state of all visible non-module objects. +/* Invert selected state of all visible non-module, non-frozen objects. * * \param none * \return none */ -EXPORT void InvertTrackSelect( void *ptr ) +EXPORT void InvertTrackSelect( void * unused ) { track_p trk; trk = NULL; while ( TrackIterate( &trk ) ) { if (GetLayerVisible( GetTrkLayer( trk )) && - !GetLayerModule(GetTrkLayer( trk ))) { + !GetLayerModule(GetTrkLayer( trk )) && !GetLayerFrozen(GetTrkLayer( trk )) ) { SelectOneTrack( trk, GetTrkSelected(trk)==0 ); } } @@ -428,7 +439,7 @@ EXPORT void InvertTrackSelect( void *ptr ) MainRedraw(); // InvertTrackSelect } -/* Select orphaned (ie single) track pieces. +/* Select orphaned (ie single) track pieces (ignore frozen and module) * * \param none * \return none @@ -444,7 +455,7 @@ EXPORT void OrphanedTrackSelect( void *ptr ) while( TrackIterate( &trk ) ) { cnt = 0; - if( GetLayerVisible( GetTrkLayer( trk ) && !GetLayerModule(GetTrkLayer(trk)))) { + if( GetLayerVisible( GetTrkLayer( trk ) && !GetLayerModule(GetTrkLayer(trk)) && !GetLayerFrozen(GetTrkLayer(trk)))) { for( ep = 0; ep < GetTrkEndPtCnt( trk ); ep++ ) { if( GetTrkEndTrk( trk, ep ) ) cnt++; @@ -480,12 +491,11 @@ static void SelectOneTrack( selectedTrackCount--; } SelectedTrackCountChange(); - DrawTrackAndEndPts( trk, wDrawColorBlack ); } -static void HighlightSelectedTracks( - track_p trk_ignore, BOOL_T box, BOOL_T invert ) +EXPORT void HighlightSelectedTracks( + track_p trk_ignore, BOOL_T keep, BOOL_T invert ) { track_p trk = NULL; if ( selectedTrackCount == 0 ) @@ -494,7 +504,9 @@ static void HighlightSelectedTracks( if (trk == trk_ignore) continue; if(GetTrkSelected(trk)) { if (!GetLayerVisible( GetTrkLayer( trk ))) continue; - if (invert) + if (keep) + DrawTrack(trk,&tempD,selectedColor); + else if (invert) DrawTrack(trk,&tempD,wDrawColorPreviewUnselected); else DrawTrack(trk,&tempD,wDrawColorPreviewSelected ); @@ -503,6 +515,11 @@ static void HighlightSelectedTracks( } +/* + * Select all tracks connected walking the tree until hitting ends or already selected tracks + * + * Ignore Frozen Tracks + */ static void SelectConnectedTracks( track_p trk, BOOL_T display_only ) { @@ -517,15 +534,17 @@ static void SelectConnectedTracks( if ( inx > 0 && (selectedTrackCount == 0) && !display_only ) return; trk = Tlist(inx); - if (inx!=0 && - GetTrkSelected(trk)) { - if (display_only) - DrawTrack(trk,&tempD,wDrawColorPreviewSelected ); - continue; - } else if (GetTrkSelected(trk)) { - if (display_only) - DrawTrack(trk,&tempD,wDrawColorPreviewUnselected); - continue; + if (!GetLayerFrozen(GetTrkLayer(trk))) { + if (inx!=0 && + GetTrkSelected(trk)) { + if (display_only) + DrawTrack(trk,&tempD,wDrawColorPreviewSelected ); + continue; + } else if (GetTrkSelected(trk)) { + if (display_only) + DrawTrack(trk,&tempD,wDrawColorPreviewUnselected); + continue; + } } for (ep=0; ep0) { - UndoStart( _("Delete Tracks"), "delete" ); + BOOL_T UndoStarted = FALSE; + if (!TestAllSelectedTracks(QueryTrack,(int)Q_ISTRAIN)) { // If all Cars, don't bother with UndoStart as there will be nothing to delete + UndoStarted = TRUE; + UndoStart( _("Delete Tracks"), "delete" ); + } wDrawDelayUpdate( mainD.d, TRUE ); wDrawDelayUpdate( mapD.d, TRUE ); DoSelectedTracks( DeleteTrack ); @@ -674,15 +725,26 @@ EXPORT void SelectDelete( void ) wDrawDelayUpdate( mapD.d, FALSE ); selectedTrackCount = 0; SelectedTrackCountChange(); - UndoEnd(); + if (UndoStarted) + UndoEnd(); } else { ErrorMessage( MSG_NO_SELECTED_TRK ); } + return 0; +} + +/* + * Called By Windows directly with Delete Key. We first try a simple Delete, and if that doesn't work saying "In Modify" we call Modify with a Text key for Delete + */ +EXPORT void TrySelectDelete( void ) { + if(SelectDelete() == 1) { + CmdModify((C_TEXT+(int)(127<<8)),zero); + } } BOOL_T flipHiddenDoSelectRecount; -static BOOL_T FlipHidden( track_p trk, BOOL_T junk ) +static BOOL_T FlipHidden( track_p trk, BOOL_T unused ) { EPINX_T i; track_p trk2; @@ -713,7 +775,7 @@ static BOOL_T FlipHidden( track_p trk, BOOL_T junk ) return TRUE; } -static BOOL_T FlipBridge( track_p trk, BOOL_T junk ) +static BOOL_T FlipBridge( track_p trk, BOOL_T unused ) { UndoModify( trk ); if (GetTrkBridge(trk)) { @@ -725,7 +787,7 @@ static BOOL_T FlipBridge( track_p trk, BOOL_T junk ) return TRUE; } -static BOOL_T FlipTies( track_p trk, BOOL_T junk ) +static BOOL_T FlipTies( track_p trk, BOOL_T unused ) { UndoModify( trk ); if (GetTrkNoTies(trk)) { @@ -737,7 +799,7 @@ static BOOL_T FlipTies( track_p trk, BOOL_T junk ) return TRUE; } -EXPORT void SelectTunnel( void ) +EXPORT void SelectTunnel( void * unused ) { if (SelectedTracksAreFrozen()) return; @@ -755,7 +817,7 @@ EXPORT void SelectTunnel( void ) SelectRecount(); } -EXPORT void SelectBridge( void ) +EXPORT void SelectBridge( void * unused ) { if (SelectedTracksAreFrozen()) return; @@ -772,7 +834,7 @@ EXPORT void SelectBridge( void ) MainRedraw(); // SelectBridge } -EXPORT void SelectTies( void ) +EXPORT void SelectTies( void * unused ) { if (SelectedTracksAreFrozen()) return; @@ -803,14 +865,14 @@ void SelectRecount( void ) } -static BOOL_T SetLayer( track_p trk, BOOL_T junk ) +static BOOL_T SetLayer( track_p trk, BOOL_T unused ) { UndoModify( trk ); SetTrkLayer( trk, curLayer ); return TRUE; } -EXPORT void MoveSelectedTracksToCurrentLayer( void ) +EXPORT void MoveSelectedTracksToCurrentLayer( void * unused ) { if (SelectedTracksAreFrozen()) return; @@ -823,20 +885,32 @@ EXPORT void MoveSelectedTracksToCurrentLayer( void ) } } -EXPORT void SelectCurrentLayer( void ) +EXPORT void SelectCurrentLayer( void * unused ) { track_p trk; trk = NULL; + if (GetLayerFrozen(curLayer)) return; while ( TrackIterate( &trk ) ) { - if ((!GetTrkSelected(trk)) && GetTrkLayer(trk) == curLayer ) { + if ((!GetTrkSelected(trk)) && GetTrkLayer(trk) == curLayer) { SelectOneTrack( trk, TRUE ); } } RedrawSelectedTracksBoundary(); } +EXPORT void DeselectLayer( unsigned int layer ) { + track_p trk; + trk = NULL; + while ( TrackIterate( &trk ) ) { + if ((GetTrkSelected(trk)) && GetTrkLayer(trk) == layer) { + SelectOneTrack( trk, FALSE ); + } + } + RedrawSelectedTracksBoundary(); +} + -static BOOL_T ClearElevation( track_p trk, BOOL_T junk ) +static BOOL_T ClearElevation( track_p trk, BOOL_T unused ) { EPINX_T ep; for ( ep=0; epd, FALSE );*/ } static BOOL_T AddSelectedTrack( - track_p trk, BOOL_T junk ) + track_p trk, BOOL_T unused ) { DYNARR_APPEND( track_p, tlist_da, 10 ); DYNARR_LAST( track_p, tlist_da ) = trk; return TRUE; } +static BOOL_T RemoveSelectedTrack(track_p trk) { + + for(int i=0;i lo.y ) layer_lo.y = lo.y; } } - wPos_t margin = (wPos_t)(10.5*mainD.scale/mainD.dpi); + wDrawPix_t margin = (10.5*mainD.scale/mainD.dpi); layer_hi.x +=margin; layer_hi.y +=margin; layer_lo.x -=margin; layer_lo.y -=margin; - wPos_t rect[4][2]; int type[4]; - coOrd top_left, bot_right; - top_left.x = layer_lo.x; top_left.y = layer_hi.y; - bot_right.x = layer_hi.x; bot_right.y = layer_lo.y; type[0] = type[1] = type[2] = type[3] = 0; - mainD.CoOrd2Pix(&mainD,layer_lo,&rect[0][0],&rect[0][1]); - mainD.CoOrd2Pix(&mainD,top_left,&rect[1][0],&rect[1][1]); - mainD.CoOrd2Pix(&mainD,layer_hi,&rect[2][0],&rect[2][1]); - mainD.CoOrd2Pix(&mainD,bot_right,&rect[3][0],&rect[3][1]); - wDrawPolygon(tempD.d,rect,(wPolyLine_e *)type,4,wDrawColorPowderedBlue,0,wDrawLineDash,wDrawOptTemp,0,0); + coOrd rect[4]; + // r3 r2 + // r0 r1 + rect[0].x = rect[3].x = layer_lo.x; + rect[1].x = rect[2].x = layer_hi.x; + rect[0].y = rect[1].y = layer_lo.y; + rect[2].y = rect[3].y = layer_hi.y; + DrawPoly(&tempD,4,rect,type,wDrawColorPowderedBlue,wDrawLineDash,DRAW_CLOSED); } void SetUpMenu2(coOrd pos, track_p trk) { @@ -1734,7 +1865,7 @@ static STATUS_T CmdMove( UndoStart( _("Move Tracks"), "move" ); base = zero; orig = pos; - + DYNARR_RESET(track_p,auto_select_da); GetMovedTracks(TRUE); SetMoveD( TRUE, base, 0.0 ); drawCount = 0; @@ -1747,7 +1878,7 @@ static STATUS_T CmdMove( drawEnable = enableMoveDraw; base.x = pos.x - orig.x; base.y = pos.y - orig.y; - SnapPos( &base ); + if ((MyGetKeyState() & WKEY_ALT) == 0) SnapPos( &base ); SetMoveD( TRUE, base, 0.0 ); if (((MyGetKeyState()&(WKEY_ALT)) == 0) == magneticSnap) { // ALT if (FindEndIntersection(base,zero,0.0,&t1,&ep1,&t2,&ep2)) { @@ -1776,6 +1907,7 @@ static STATUS_T CmdMove( } ep1 = -1; ep2 = -1; + RemoveEndCornus(); tlist_da.cnt = 0; return C_TERMINATE; @@ -1805,17 +1937,25 @@ static STATUS_T CmdMove( if ((action>>8) == 'c') { panCenter = pos; LOG( log_pan, 2, ( "PanCenter:Sel-%d %0.3f %0.3f\n", __LINE__, panCenter.x, panCenter.y ) ); - PanHere((void*)0); + PanHere(I2VP(0)); } if ((action>>8) == 'e') { - DoZoomExtents(0); + DoZoomExtents(I2VP(0)); + } + if ((action>>8 == 's')) { + DoZoomExtents(I2VP(1)); } if ((action>>8) == '0' || (action>>8 == 'o')) { - PanMenuEnter('o'); + PanMenuEnter(I2VP('o')); } + if ((action>>8) == 127 || (action>>8) == 8) + SelectDelete(); break; case C_REDRAW: /* DO_REDRAW */ + //Draw all existing highlight boxes only + DrawHighlightBoxes(FALSE, FALSE, NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if (anchors_da.cnt) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); if ( state == 0 ) @@ -1860,6 +2000,7 @@ static STATUS_T CmdMove( microCount = 0; MainRedraw(); // Micro step move } + RemoveEndCornus(); return C_CONTINUE; } break; @@ -1869,14 +2010,16 @@ static STATUS_T CmdMove( doingMove = FALSE; UndoEnd(); } + RemoveEndCornus(); tlist_da.cnt = 0; break; case C_CONFIRM: case C_CANCEL: if (doingMove) { doingMove = FALSE; - UndoUndo(); + UndoUndo(NULL); } + RemoveEndCornus(); tlist_da.cnt = 0; break; default: @@ -1889,8 +2032,9 @@ static STATUS_T CmdMove( static int rotateAlignState = 0; -static void RotateAlign( BOOL_T align ) +static void RotateAlign( void * alignVP ) { + BOOL_T align = (BOOL_T)VP2L(alignVP); rotateAlignState = 0; if (align) { rotateAlignState = 1; @@ -1951,6 +2095,7 @@ static STATUS_T CmdRotate( return C_TERMINATE; } UndoStart( _("Rotate Tracks"), "rotate" ); + DYNARR_RESET(track_p,auto_select_da); if ( rotateAlignState == 0 ) { drawnAngle = FALSE; angle = 0.0; @@ -2044,7 +2189,7 @@ static STATUS_T CmdRotate( ANGLE_T diff_angle = 0.0; base = pos; drawEnable = enableMoveDraw; - if ( FindDistance( orig, pos ) > (20.0/75.0)*mainD.scale ) { + if ( FindDistance( orig, pos ) > (20.0/BASE_DPI)*mainD.scale ) { ANGLE_T old_angle = angle; angle = FindAngle( orig, pos ); if (!drawnAngle) { @@ -2079,7 +2224,7 @@ static STATUS_T CmdRotate( angle = baseAngle+diff_angle; } Translate( &base, orig, angle, FindDistance(orig,pos) ); //Line one - Translate( &orig_base,orig, baseAngle, FindDistance(orig,pos)<=(60.0/75.00*mainD.scale)?FindDistance(orig,pos):60.0/75.00*mainD.scale ); //Line two + Translate( &orig_base,orig, baseAngle, FindDistance(orig,pos)<=(60.0/BASE_DPI*mainD.scale)?FindDistance(orig,pos):60.0/BASE_DPI*mainD.scale ); //Line two SetMoveD( FALSE, orig, NormalizeAngle( angle-baseAngle ) ); if (((MyGetKeyState()&(WKEY_ALT)) == WKEY_ALT) != magneticSnap) { //Just Shift if (FindEndIntersection(zero,orig,NormalizeAngle( angle-baseAngle ),&t1,&ep1,&t2,&ep2)) { @@ -2127,6 +2272,7 @@ static STATUS_T CmdRotate( } } UndoEnd(); + RemoveEndCornus(); tlist_da.cnt = 0; return C_TERMINATE; @@ -2154,30 +2300,35 @@ static STATUS_T CmdRotate( if ((action>>8) == 'd') { panCenter = pos; LOG( log_pan, 2, ( "PanCenter:Sel-%d %0.3f %0.3f\n", __LINE__, panCenter.x, panCenter.y ) ); - PanHere((void*)0); + PanHere(I2VP(0)); } if ((action>>8) == 'e') { - DoZoomExtents(0); + DoZoomExtents(I2VP(0)); + } + if ((action>>8) == 's') { + DoZoomExtents(I2VP(1)); } if ((action>>8) == '0' || (action>>8 == 'o')) { - PanMenuEnter('o'); + PanMenuEnter(I2VP('o')); } break; case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if (anchors_da.cnt) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); /* DO_REDRAW */ if ( state == 0 ) break; if ( rotateAlignState != 2 ) { - DIST_T width = mainD.scale*0.5; + DIST_T width = tempD.scale*0.15; DrawLine( &tempD, base, orig, 0, wDrawColorBlue ); if (drawnAngle) { - DrawLine( &tempD, orig_base, orig, (wDrawWidth)width, wDrawColorBlue ); + DrawLine( &tempD, orig_base, orig, (wDrawWidth)width/2, wDrawColorBlue ); ANGLE_T a = DifferenceBetweenAngles(FindAngle(orig, orig_base),FindAngle(orig, base)); DIST_T dist = FindDistance(orig,base); - if (dist>(60.0/75.0)*mainD.scale) dist = (60.0/75.0)*mainD.scale; + if (dist>(60.0/BASE_DPI)*mainD.scale) dist = (60.0/BASE_DPI)*mainD.scale; if (direction_set) { if (clockwise) { @@ -2211,6 +2362,7 @@ static STATUS_T CmdRotate( static void QuickMove( void* pos) { coOrd move_pos = *(coOrd*)pos; + DYNARR_RESET(track_p,auto_select_da); if ( SelectedTracksAreFrozen() ) return; wDrawDelayUpdate( mainD.d, TRUE ); @@ -2220,9 +2372,67 @@ static void QuickMove( void* pos) { wDrawDelayUpdate( mainD.d, FALSE ); } +static track_p SelectTrackByIndex(TRKINX_T ti, char * message ) { + track_p trk = FindTrack(ti); + if (trk) { + if (!GetLayerFrozen( GetTrkLayer( trk ) ) ) { + if (GetLayerModule(GetTrkLayer(trk))) { + DoModuleTracks(GetTrkLayer(trk),DrawSingleTrack,TRUE); + snprintf(message, STR_LONG_SIZE, "%s %d",_("In module layer:"),GetTrkLayer(trk)+1); + } else { + if (!GetLayerVisible(GetTrkLayer(trk))) FlipLayer(I2VP(GetTrkLayer(trk))); + if (!GetTrkVisible(trk) && drawTunnel==0 ) drawTunnel = 1; //Force DRAW_TUNNEL_DASH + SelectOneTrack(trk,TRUE); + } + } else { + snprintf(message, STR_LONG_SIZE, "%s %d",_("Frozen Layer:"),GetTrkLayer(trk)+1); + trk = NULL; + } + } else { + snprintf(message, STR_LONG_SIZE, "%s",_("Not found")); + } + return trk; +} + +EXPORT void SelectByIndex( void* string) { + char result[STR_LONG_SIZE] = ""; + char * message; + SetAllTrackSelect(FALSE); + char * cp = (char *)string; + cp = strtok(cp,","); + BOOL_T single = TRUE; + track_p trk = NULL; + while (cp) { + long ti = strtol(cp,&cp,0); + if (ti>0) { + message = MyMalloc(STR_LONG_SIZE); + trk = SelectTrackByIndex(ti, message); + if (!trk || message[0]) { + size_t len = strlen(result); + snprintf(result+len,(sizeof(result) - len),"I:%ld %s", ti, message); + MyFree(message); + } + } + cp = strtok(NULL,","); + if (cp) single = FALSE; + } + + DoZoomExtents(I2VP(1)); + if (strlen(result)) + InfoMessage(result); + else if (single && trk) { + char msg[STR_SIZE]; + DescribeTrack( trk, msg, sizeof msg ); + InfoMessage( msg ); + } else if (!single) { + InfoMessage(_("Multiple Selected")); + } +} + static void QuickRotate( void* pangle ) { - ANGLE_T angle = (ANGLE_T)(long)pangle; + ANGLE_T angle = (ANGLE_T)VP2L(pangle); + DYNARR_RESET(track_p,auto_select_da); if ( SelectedTracksAreFrozen() ) return; wDrawDelayUpdate( mainD.d, TRUE ); @@ -2236,8 +2446,24 @@ static void QuickRotate( void* pangle ) static wMenu_p moveDescM; static wMenuToggle_p moveDescMI; +static wMenuToggle_p moveDetailDescMI; + +static void ChangeDetailedFlag( void * mode ) +{ + wDrawDelayUpdate( mainD.d, TRUE ); + UndoStart( _("Toggle Detail"), "Modedetail( T%d )", GetTrkIndex(moveDescTrk) ); + UndoModify( moveDescTrk ); + UndrawNewTrack( moveDescTrk ); + if ( ( GetTrkBits( moveDescTrk ) & TB_DETAILDESC ) == 0 ) { + ClrTrkBits( moveDescTrk, TB_HIDEDESC ); + SetTrkBits( moveDescTrk, TB_DETAILDESC ); + } else + ClrTrkBits( moveDescTrk, TB_DETAILDESC ); + DrawNewTrack( moveDescTrk ); + wDrawDelayUpdate( mainD.d, FALSE ); +} -static void ChangeDescFlag( wBool_t set, void * mode ) +static void ChangeDescFlag( void * mode ) { wDrawDelayUpdate( mainD.d, TRUE ); UndoStart( _("Toggle Label"), "Modedesc( T%d )", GetTrkIndex(moveDescTrk) ); @@ -2251,9 +2477,13 @@ static void ChangeDescFlag( wBool_t set, void * mode ) wDrawDelayUpdate( mainD.d, FALSE ); } +/* + * Mode_o -1 = everything, 0 = elevations only, 1 = descriptions only + */ + track_p FindTrackDescription(coOrd pos, EPINX_T * ep_o, int * mode_o, BOOL_T show_hidden, BOOL_T * hidden_o) { track_p trk = NULL; - DIST_T d, dd = 10000; + DIST_T d, dd = DIST_INF; track_p trk1 = NULL; EPINX_T ep1=-1, ep=-1; BOOL_T hidden_t, hidden; @@ -2265,6 +2495,8 @@ track_p FindTrackDescription(coOrd pos, EPINX_T * ep_o, int * mode_o, BOOL_T sho continue; if ( (!GetTrkVisible(trk1)) && drawTunnel==0 ) continue; + if ( GetLayerFrozen( GetTrkLayer( trk1 ) )) + continue; if ( (labelEnable&LABELENABLE_ENDPT_ELEV)!=0 && *mode_o <= 0) { for ( ep1=0; ep1