Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Paul F. <pg...@us...> - 2008-09-05 20:39:41
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18361 Added Files: README.xo_laptop Log Message: nitial XO readme --- NEW FILE: README.xo_laptop --- Maps -- The RoadMap activity on the XO is packaged with nothing but a set of US state outline maps. (That's all I have that's easy to package -- my apologies to the rest of the world!) RoadMap on the XO will attempt to find maps from the activity bundle directory itself, and also from _any_ directory called "RoadMap.maps" on an installed removeable device. i.e. it will search in "/media/*/RoadMap.maps". So if you download maps from http://roadmap.sourceforge.net/maps, or if you run buildmap_osm to fetch OpenStreetMap maps, you should put them under RoadMap.maps on your SD card or on a USB memory stick. (As an example -- I have maps for several New England states loaded on my XO. My SD card contains: $ ls /media/d0a9...ee70/RoadMap.maps ct/ ma/ me/ nh/ ri/ usdir.rdm vt/ GPS -- If you have a GPS device and want RoadMap to use it, you'll want to install gpsd to help: "yum install gpsd". If, instead, you'd prefer to access your GPS via the raw tty device, RoadMap will need to be able to open /dev/ttyUSB0 to read your gps device. In that case, you'll need to make that device world readable, by adding the following line to a udev config file: # cat /etc/udev/rules.d/99-local-ttyUSB0.rules: KERNEL=="ttyUSB0", NAME="%k", GROUP="root", MODE="0666" (You'll need to do this, or the "yum install gpsd" above, after every update of your XO's system software.) |
|
From: Paul F. <pg...@us...> - 2008-09-04 22:10:42
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21316 Modified Files: mk_activity Log Message: revert to using San Francisco as the starting point. one county packs a lot of punch. (unlike boston, where several counties intrude on the metro area.) Index: mk_activity =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mk_activity 4 Sep 2008 21:50:22 -0000 1.4 --- mk_activity 4 Sep 2008 22:10:33 -0000 1.5 *************** *** 69,73 **** if [ -d /usr/local/share/roadmap/maps ] then ! ln -s /usr/local/share/roadmap/maps/{SB,MA,usdir.rdm} $ACT/maps for state in NH VT # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA --- 69,75 ---- if [ -d /usr/local/share/roadmap/maps ] then ! ln -s /usr/local/share/roadmap/maps/{SB,usdir.rdm} $ACT/maps ! mkdir $ACT/maps/CA ! cp /usr/local/share/roadmap/maps/CA/usc06075.rdm $ACT/maps/CA for state in NH VT # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA *************** *** 112,123 **** ! # and move focus from san francisco default to 1cc in cambridge, MA ! sed -i \ ! -e "s/\(Focus.Name:\).*/\1 Hold/" \ ! -e "s/\(Hold.Position:\).*/\1 -71086473,42362964/" \ ! -e "s/\(General.Zoom:\).*/\1 2000/" \ ! -e "/Selection.Position:/d" \ ! -e "/Address.Position:/d" \ ! $ACT/config/session # and finally, copy in docs and licenses --- 114,125 ---- ! ## and move focus from san francisco default to 1cc in cambridge, MA ! #sed -i \ ! # -e "s/\(Focus.Name:\).*/\1 Hold/" \ ! # -e "s/\(Hold.Position:\).*/\1 -71086473,42362964/" \ ! # -e "s/\(General.Zoom:\).*/\1 2000/" \ ! # -e "/Selection.Position:/d" \ ! # -e "/Address.Position:/d" \ ! # $ACT/config/session # and finally, copy in docs and licenses |
|
From: Paul F. <pg...@us...> - 2008-09-04 21:50:24
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14478 Modified Files: mk_activity Log Message: remove bundle before recreating Index: mk_activity =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mk_activity 4 Sep 2008 21:15:42 -0000 1.3 --- mk_activity 4 Sep 2008 21:50:22 -0000 1.4 *************** *** 130,133 **** --- 130,134 ---- find $ACTNAME > MANIFEST mv MANIFEST $ACTNAME + rm ../RoadMap-$version.xo zip -r ../RoadMap-$version.xo $ACTNAME |
|
From: Paul F. <pg...@us...> - 2008-09-04 21:15:45
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2384 Modified Files: mk_activity Log Message: fix bundle creation, add MANIFEST file Index: mk_activity =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mk_activity 4 Sep 2008 20:59:51 -0000 1.2 --- mk_activity 4 Sep 2008 21:15:42 -0000 1.3 *************** *** 13,17 **** TOP=.. SRC=$TOP/src ! ACT=./tmp/RoadMap.activity RMROOT=./tmp/roadmap_root STUFF=./activity --- 13,18 ---- TOP=.. SRC=$TOP/src ! ACTNAME=RoadMap.activity ! ACT=./tmp/$ACTNAME RMROOT=./tmp/roadmap_root STUFF=./activity *************** *** 123,129 **** cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs ! version=$(sed -n 's/activity_version.*=//p' $STUFF/activity.info) # finally, bundle the bundle ! zip -r RoadMap-$version.xo $ACT --- 124,134 ---- cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs ! version=$(sed -n 's/activity_version.*=[[:space:]]*//p' $STUFF/activity.info) ! # finally, bundle the bundle ! cd tmp ! find $ACTNAME > MANIFEST ! mv MANIFEST $ACTNAME ! zip -r ../RoadMap-$version.xo $ACTNAME |
|
From: Paul F. <pg...@us...> - 2008-09-04 20:59:54
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29684 Modified Files: mk_activity Log Message: include MA maps in base activity, and add automatically version number to bundle name Index: mk_activity =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mk_activity 4 Sep 2008 18:48:19 -0000 1.1 --- mk_activity 4 Sep 2008 20:59:51 -0000 1.2 *************** *** 52,56 **** mv $RMROOT/usr/share/activities/$ACT/share/pixmaps $ACT/pixmaps mv $RMROOT/usr/share/activities/$ACT/share/roadmap $ACT/config ! cp $STUFF/config/* $ACT/config # disable the toolbar by default, but provide an example --- 52,56 ---- mv $RMROOT/usr/share/activities/$ACT/share/pixmaps $ACT/pixmaps mv $RMROOT/usr/share/activities/$ACT/share/roadmap $ACT/config ! cp $STUFF/config/{roadmap.screenobjects,sprites} $ACT/config # disable the toolbar by default, but provide an example *************** *** 68,73 **** if [ -d /usr/local/share/roadmap/maps ] then ! ln -s /usr/local/share/roadmap/maps/{SB,usdir.rdm} $ACT/maps ! for state in MA NH VT # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA do --- 68,73 ---- if [ -d /usr/local/share/roadmap/maps ] then ! ln -s /usr/local/share/roadmap/maps/{SB,MA,usdir.rdm} $ACT/maps ! for state in NH VT # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA do *************** *** 123,128 **** cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs # finally, bundle the bundle ! zip -r RoadMap.xo $ACT --- 123,129 ---- cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs + version=$(sed -n 's/activity_version.*=//p' $STUFF/activity.info) # finally, bundle the bundle ! zip -r RoadMap-$version.xo $ACT |
|
From: Paul F. <pg...@us...> - 2008-09-04 19:54:53
|
Update of /cvsroot/roadmap/roadmap/sugar/activity In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2893/activity Modified Files: activity.info Log Message: fix the servicename Index: activity.info =================================================================== RCS file: /cvsroot/roadmap/roadmap/sugar/activity/activity.info,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** activity.info 4 Sep 2008 18:48:19 -0000 1.1 --- activity.info 4 Sep 2008 19:54:49 -0000 1.2 *************** *** 1,5 **** [Activity] name = RoadMap ! service_name = org.x.RoadMap icon = RoadMap activity_version = 1 --- 1,5 ---- [Activity] name = RoadMap ! service_name = net.sourceforge.roadmap icon = RoadMap activity_version = 1 |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:48:23
|
Update of /cvsroot/roadmap/roadmap/sugar/activity In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10267/sugar/activity Added Files: RoadMap.svg activity.info sugarRoadMap Log Message: add support for sugar activity builds. i'm not convinced this should be a top-level directory, but i think we probably have a directory shake-up coming soon anyway. --- NEW FILE: sugarRoadMap --- #!/bin/sh debug=; test -d gtk2 && debug=yes if [ "$debug" ] then export SUGAR_BUNDLE_PATH=/home/olpc/Activities/RoadMap.activity else if [ $(whoami) = olpc ] then exec 2>/tmp/roadmap.log else exec 2>$SUGAR_ACTIVITY_ROOT/data/roadmap.log fi fi set -x #while [ -n "$2" ] ; do # case "$1" in # -b | --bundle-id) export SUGAR_BUNDLE_ID="$2" ;; # -a | --activity-id) export SUGAR_ACTIVITY_ID="$2" ;; # -o | --object-id) export SUGAR_OBJECT_ID="$2" ;; # -u | --uri) export SUGAR_URI="$2" ;; # *) echo unknown argument $1 $2 ;; # esac # shift;shift #done if [ ! "$SUGAR_BUNDLE_PATH" ] then export SUGAR_BUNDLE_PATH=. fi if [ "$SUGAR_ACTIVITY_ROOT" ] then USERDATA=$SUGAR_ACTIVITY_ROOT/data fi export LD_PRELOAD="$SUGAR_BUNDLE_PATH/lib/libsugarize.so" export LD_LIBRARY_PATH=$SUGAR_BUNDLE_PATH/lib export NET_WM_NAME="RoadMap" # attempt to pick up maps from any mounted device containing a # "RoadMap.maps" directory maps=$(ls -d $SUGAR_BUNDLE_PATH/maps \ $SUGAR_BUNDLE_PATH/maps/?? \ /media/*/RoadMap.maps \ /media/*/RoadMap.maps/??) if [ "$maps" ] then allmaps=$(echo $maps | sed 's/ /,/g') else allmaps=$SUGAR_BUNDLE_PATH/maps/... fi if [ ! "$debug" ] then exec roadmap \ $EXTRA_ROADMAP_ARGS \ --maps=$allmaps \ --config=$SUGAR_BUNDLE_PATH/config \ --userpath=$USERDATA \ --icons=$SUGAR_BUNDLE_PATH/pixmaps else exec gdb --args gtk2/gtkroadmap \ $EXTRA_ROADMAP_ARGS \ --maps=$allmaps \ --config=$SUGAR_BUNDLE_PATH/config \ --userpath=$USERDATA \ --icons=$SUGAR_BUNDLE_PATH/pixmaps fi --- NEW FILE: RoadMap.svg --- <?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ <!ENTITY stroke_color "#666666"> <!ENTITY fill_color "#ffffff"> <!ENTITY stroke_opacity "1"> <!ENTITY fill_opacity "1"> ]><svg height="45" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.45.1" sodipodi:docbase="/home/pgf/src/pdom/gps/roadmap/ndcvs/sugar/activity" sodipodi:docname="simpleRoadMap.svg" sodipodi:version="0.32" version="1.0" width="45" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"> <metadata id="metadata16"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> </cc:Work> </rdf:RDF> </metadata> <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" gridtolerance="10.0" guidetolerance="10.0" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="480" inkscape:window-width="640" objecttolerance="10.0" pagecolor="#ffffff"/> <defs id="defs13"/> <rect height="14.11365" id="rect3138" ry="0.43426618" style="fill:&fill_color;;fill-opacity:&fill_opacity;;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.934;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;" width="38.637459" x="2.5860298" y="1.6336505"/> <path d="M 8.3238071,6.2766696 C 8.5788169,6.5294076 8.773341,6.8310703 8.9704146,7.1279018 C 9.1289161,7.4262905 9.1756045,7.7579107 9.2351331,8.0849879 C 9.352776,8.312958 9.3864103,8.5637956 9.4365874,8.8109951 C 9.4662889,9.0618068 9.4738888,9.3149246 9.4858617,9.5668235 C 9.5566343,9.8006566 9.6208224,10.035716 9.681626,10.272401 C 9.7823823,10.517414 9.9331204,10.739748 10.066986,10.968532 C 10.165519,11.151962 10.283482,11.325677 10.38941,11.502104 L 8.8751293,12.406379 C 8.7657324,12.219988 8.6495328,12.035741 8.5434482,11.845895 C 8.4030489,11.604479 8.2457724,11.370773 8.1352532,11.114359 C 8.0734693,10.869223 8.0107105,10.62459 7.9267821,10.385522 C 7.9114891,10.134942 7.897353,9.8826516 7.880982,9.631194 C 7.8360001,9.3853526 7.8040448,9.140276 7.6837374,8.9154249 C 7.6348597,8.6056493 7.6019298,8.289419 7.4566863,8.0054537 C 7.2625761,7.7227569 7.0859997,7.4221374 6.8185944,7.1990651 L 8.3238071,6.2766696 z " id="path3142" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> <path d="M 14.235712,6.0959984 C 14.532727,6.0020396 14.841547,5.9718826 15.1483,5.9314483 C 15.41655,5.8687536 15.622573,5.9787057 15.867204,6.0572302 C 16.131376,6.1473187 16.370324,6.2903897 16.611884,6.419578 C 16.733462,6.6069886 16.872176,6.7895447 16.99619,6.9719752 C 17.158236,7.1448355 17.301157,7.3362051 17.450646,7.5205138 C 17.582045,7.7231405 17.735218,7.9058649 17.886331,8.0929312 C 18.053613,8.1969594 18.098701,8.3681662 18.187962,8.5187715 C 18.022109,9.1741949 16.898837,9.4271585 16.235212,9.7152387 C 15.998283,9.7889457 15.750735,9.7895774 15.505784,9.8030643 C 15.26559,9.807572 15.025338,9.8054686 14.78512,9.8048055 C 14.540211,9.8481082 14.320576,9.9687317 14.096569,10.067082 C 13.503625,10.332567 12.618743,10.886713 15.174352,9.4230854 L 13.536177,10.077259 C 14.195435,9.685598 14.78941,9.279243 15.470003,8.9684193 C 15.711044,8.8800063 15.947576,8.7666979 16.210565,8.7697514 C 16.44901,8.7696466 16.687616,8.7724816 16.925879,8.7610751 C 17.160539,8.7305723 17.401149,8.7317224 17.620354,8.6264761 C 18.751258,8.0533089 16.50945,9.1237688 16.603265,9.3181401 C 16.561198,9.2600681 16.484763,9.0550872 16.365812,8.990347 C 16.221776,8.804968 16.074041,8.6242939 15.945194,8.4274921 C 15.796216,8.2482886 15.652465,8.0635797 15.493358,7.8936445 C 15.36695,7.7197738 15.244395,7.5425301 15.124438,7.3654553 C 14.892572,7.250512 14.662779,7.1219613 14.411575,7.0479911 C 14.180029,6.9957919 13.98733,6.9067016 13.739312,6.979269 C 13.435787,7.0291747 13.128971,7.0669728 12.839932,7.1803743 L 14.235712,6.0959984 z " id="path3144" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> <path d="M 19.620775,12.645542 C 19.937459,12.436631 20.230272,12.194666 20.533389,11.967302 C 21.1622,11.443237 21.93724,11.092406 22.63318,10.703302 C 22.339941,10.951143 21.305611,11.454107 21.594545,11.20126 C 22.165591,10.670729 22.927457,10.359829 23.584688,9.9908861 C 23.869966,9.9915268 24.105715,9.8608599 24.359326,9.7545018 C 24.697872,9.6274566 25.035319,9.4977752 25.369666,9.3593459 C 26.201376,9.0341334 28.565857,7.6315138 24.826466,9.7277728 C 25.054917,9.5965635 25.253469,9.4279687 25.462065,9.2706405 C 26.691189,8.4719115 28.693811,7.3875494 26.023246,8.9093578 C 26.082081,8.8830521 26.10297,8.8221472 26.142833,8.7785419 L 27.752794,8.0529486 C 27.721858,8.1182335 27.713976,8.1944627 27.659987,8.2488034 C 27.635191,8.2750418 27.610395,8.3012802 27.5856,8.3275185 C 27.050565,8.635718 26.51553,8.9439175 25.980495,9.2521169 C 25.602141,9.4549224 27.464017,8.3887205 27.103654,8.622001 C 26.894858,8.7875907 26.690464,8.9563066 26.45385,9.0859179 C 25.651842,9.5632546 24.880481,10.131208 23.989742,10.440474 C 23.656456,10.576035 23.318894,10.700886 22.989492,10.845219 C 22.725773,10.932087 22.466401,11.023421 22.193256,11.078439 C 22.527917,10.880821 23.528083,10.2991 23.234498,10.553773 C 22.655784,11.068524 21.977599,11.514203 21.242602,11.790489 C 25.317614,9.3856005 22.575211,10.910217 22.163746,11.330643 C 21.852548,11.539842 21.563679,11.775651 21.264392,12.002441 L 19.620775,12.645542 z " id="path3146" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> <path d="M 32.138151,5.2953919 C 32.410166,5.4552967 32.705285,5.5775863 32.991026,5.7067304 C 33.187281,5.8293052 33.392752,5.9366946 33.592478,6.0516792 C 33.86967,6.0647062 33.962225,6.2431633 34.140065,6.3944098 C 34.211,6.5860821 34.240405,6.7962591 34.275475,6.9947378 C 34.392391,7.1671313 34.404572,7.3699783 34.451754,7.5642908 C 34.513336,7.7293742 34.581454,7.8980184 34.651481,8.0613831 C 34.74426,8.2789534 34.816417,8.5017851 34.888231,8.7266417 C 34.929593,8.9973628 35.103679,9.1559878 35.271861,9.3453319 C 35.419812,9.5086464 35.598806,9.6269463 35.773161,9.7587114 C 35.9708,9.8482485 36.135907,9.9820757 36.310137,10.10762 L 34.822596,11.060206 C 34.646245,10.935416 34.479601,10.801989 34.285433,10.703578 C 34.111822,10.565295 33.927879,10.443385 33.778774,10.275707 C 33.594323,10.055304 33.394804,9.861958 33.337786,9.5624402 C 33.263591,9.3418809 33.208262,9.1150949 33.100275,8.9058812 C 33.025549,8.7360443 32.959327,8.5564564 32.889973,8.3847566 C 32.851577,8.2041804 32.845853,8.0187318 32.734446,7.8602069 C 32.696744,7.6697329 32.642943,7.4755128 32.611009,7.2807561 C 32.461751,7.1966535 32.328147,7.0345718 32.121551,7.0208395 C 31.91908,6.9022996 31.713219,6.7887251 31.514597,6.6633474 C 31.223467,6.5344257 30.926778,6.4102528 30.651778,6.2471007 L 32.138151,5.2953919 z " id="path3148" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> <rect height="27.546658" id="rect3156" rx="1.2479817" ry="0" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.94042726;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;" transform="matrix(0.9982626,-5.8921749e-2,0.2040576,0.9789589,0,0)" width="3.4035833" x="31.123331" y="19.333595"/> <path d="M 24.478322,4.6840136 C 24.467738,4.98681 24.471974,5.2898858 24.472816,5.5928029 C 24.477445,5.7975 24.596308,5.9615069 24.684204,6.1373777 C 24.808488,6.3574042 24.919583,6.5848779 25.037473,6.8082052 C 25.142461,7.0744239 25.333979,7.2821058 25.510098,7.5010135 C 25.686137,7.6979803 25.788677,7.943424 25.904696,8.1754459 C 25.982689,8.3380285 26.115859,8.4511072 26.225816,8.5887703 C 26.385568,8.7047409 26.51541,8.8556627 26.658028,8.9891471 C 26.781794,9.1363168 26.960466,9.2211755 27.124454,9.3138754 C 27.318704,9.4080413 27.457295,9.5585086 27.610057,9.7023819 C 27.708984,9.7950385 27.793816,9.9001338 27.885562,9.9988655 L 26.367366,10.902118 C 26.277845,10.804893 26.187191,10.708176 26.098332,10.60993 C 25.945747,10.491767 25.804507,10.35288 25.630308,10.258386 C 25.454182,10.152382 25.262962,10.074148 25.144699,9.8939823 C 24.996597,9.7653104 24.847189,9.6297383 24.705674,9.4926717 C 24.594835,9.3514964 24.457147,9.2336838 24.38081,9.0662522 C 24.272149,8.8389569 24.176815,8.5996355 24.008406,8.406887 C 23.822046,8.1750282 23.619429,7.9543657 23.505477,7.6740384 C 23.39064,7.4576706 23.282682,7.2367743 23.16051,7.0241182 C 23.056072,6.8193983 22.918825,6.6295222 22.908136,6.390047 C 22.90897,6.0890017 22.9133,5.7877884 22.902631,5.4868681 L 24.478322,4.6840136 z " id="path3179" style="fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.93400002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:8.1;stroke-opacity:&stroke_opacity;;"/> <path d="M 12.802968,10.916021 L 14.72732,11.059628 L 16.190099,11.222675 L 13.4291,10.977106 L 12.802968,10.916021 z " id="path7245" style="color:#010101"/> <path d="M 7.5005297,44.642604 C 7.5005297,44.642604 10.458525,44.37633 7.5835072,31.178518 C 5.8080522,23.006161 12.659934,18.45531 20.66637,16.096548" id="path3190" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:&stroke_opacity;;"/> <path d="M 24.78118,44.375531 C 24.78118,44.375531 26.145215,42.219535 24.964948,38.467111 C 24.31672,36.4062 25.045411,38.512838 21.981656,32.325895 C 18.562711,25.421682 21.53257,20.88734 25.616307,17.849583 C 26.63724,17.090144 27.274109,16.644179 28.215586,15.990453" id="path3195" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:&stroke_opacity;;"/> <path d="M 15.776147,45.089864 C 15.776147,45.089864 16.886406,42.317466 16.874814,40.319062 C 16.8568,37.451413 16.548807,37.155454 14.65947,31.383001 C 12.809067,25.729503 15.033411,23.653596 17.415878,20.911991 C 19.798347,18.170387 23.433356,16.37067 27.216732,16.343884" id="path3215" style="color:#010101;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.70000005;stroke-miterlimit:4;stroke-dasharray:5.10000014, 5.10000014;stroke-dashoffset:3.4000001;stroke-opacity:&stroke_opacity;;"/> </svg> --- NEW FILE: activity.info --- [Activity] name = RoadMap service_name = org.x.RoadMap icon = RoadMap activity_version = 1 show_launcher = yes exec = sugarRoadMap #update_url=... |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:48:23
|
Update of /cvsroot/roadmap/roadmap/sugar/activity/config In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10267/sugar/activity/config Added Files: roadmap.screenobjects sprites Log Message: add support for sugar activity builds. i'm not convinced this should be a top-level directory, but i think we probably have a directory shake-up coming soon anyway. --- NEW FILE: roadmap.screenobjects --- # This file describes objects which can be displayed on the screen. # These objects can reflect the state of the program (e.g., which way # is north, how strong is the GPS signal), and/or allow actions to # be performed (e.g. zoom in, show the trip's destination). These # objects may be placed anywhere on the screen, but nothing prevents # them from being obscured by other popup messages and displays, so # their position should probably be along the sides of the screen. # # Syntax: # # N <name> Name of the object (unused, but starts a new object) # Specifying a name, and nothing else at all, will # define a null object which can be used to # override objects defined in other (e.g. system) # screenobjects files. # P <x> <y> The screen position of the sprite, measured from # the top left in pixels. Negative offsets measure # from the right and from the bottom. If the <x> or # <y> value begins with a 'C', then the remainder # is an offset from the center of the screen. # E <sprite> [text] The name of the sprite which will be drawn. # E <sprite> [text] Multiple sprites can be specified. Which one is # displayed is selected via the object's "state" # indicator. If "text" is specified, it will be # displayed with the sprite (assuming the sprite # has been defined to have text associated with it). # - The text can be divided into multiple lines. # Line breaks are indicated by inserting a '^'. # - The text can contain %-macros, just as defined # for other text displays, in order to display # dynamic content. The '|' "alternation" symbol # is also honored. See the documentation. # S <statename> The "state" indicator which will choose among # the listed sprites. For "constant" displays, this # is optional. # A <actionname> The action which should be invoked when the sprite # is selected. Optional. # R <angle> Sprites will normally rotate dynamically, either with # the screen, or based on an angle retrieved via the # state indicator. Specifying 'R' suppresses this # by forcing rotation to the given angle. (default 0) # B <x> <y> <x> <y> Optional -- the bounding box used to determine # whether a selection has taken place. (I.e., the # size of the sprite.) Normally the bounding box is # provided by the sprite itself, but irregularly # shaped sprites, combined with the rotation of the # sprite, may require that the box be overridden. # Note that the bounding box for any text associated # with the sprite is calculated and considered # separately. Also note that if sprite scaling is # used, this bounding box may need to be adjusted. # the Compass object shows which way is north. it changes from a # traditional "compass rose" to a simple arrow if "dynamic orientation" # is turned off. N Compass S get_orientation P 40 80 E Compass E Compass_fixed A toggleorientation # The GPS_reception object displays the relative GPS signal strength. # Selecting it will reposition the map to the current GPS position. N GPS_reception S get_GPS_reception P 40 150 E reception_na E reception_none %v/%s E reception_poor %v/%s E reception_good %v/%s A gps R # When the Download object is visible, it indicates that RoadMap is # willing to download maps from the network. N Download S get_download_enabled P -40, 80 E Download R # Uncomment this one to get an on-screen "Menu" icon. With this enabled, # you could then get rid of the normal drop-down menus, and the toolbar. # (You could also get rid of them and use a long-click to get menus.) # N Menus # P -20 -60 # E Menu # A ->Menus... # R 0 # The Direction_Next object points to the route's next waypoint, # relative to the current direction of travel (assuming the screen # is facing forward in the vehicle). N Direction_Next S get_direction_next P -40 150 E Direction_Next A nextpoint # # The Direction_2nd object points to waypoint after the next. # # relative to the current direction of travel. This can be # # useful to see which way the route will go at the next turning. N Direction_2nd S get_direction_2nd P -40 220 E Direction_2nd A 2ndpoint # The Direction_Dest object points to the route's last waypoint, # relative to the direction of travel. N Direction_Dest S get_direction_dest P -40 290 E Direction_Dest A destination # The ZoomIn/Out_Buttons do just that, when selected. #N ZoomIn_Button #P 20 -100 #E ZoomIn #A zoomin #R 0 #N ZoomOut_Button #P 20 -60 #E ZoomOut #A zoomout #R 0 # The next four are up/down/left/right controls, centered on # each edge of the screen, each rotated appropriately. # (Most devices have dedicated arrow keys, though, so these # are commented out by default.) # N UpArrow # P C0 20 # E PurpleTriangle # A up # R 0 # # N DownArrow # P C0 -20 # E PurpleTriangle # A down # R -180 # # N RightArrow # P -20 C0 # E PurpleTriangle # A right # R 90 # # N LeftArrow # P 20 C0 # E PurpleTriangle # A left # R -90 # # provide a labeled "button" to switch view modes # N 2D3D # P 20 180 # S view_mode # E TextBox 3D # E TextBox 2D # A toggleview # # show current time, along with either sunset or sunrise time # N daylight # P C-80 -40 # E InfoBox Time: %T^Sunset:^%E|Time: %T^Sunrise:^%M --- NEW FILE: sprites --- # # Sprites are small drawings (somewhat like icons) which RoadMap will put # on the screen in various roles. Some move, some are stationary. # # Syntax of the sprite description: # S <name> Start a sprite. The name is how RoadMap refers # to the sprite. These references are # hard-coded into RoadMap. # A <name> Defines this sprite as an alias for another sprite. # (An alias cannot itself have drawing directives). # F <color> <thickness> Start a new color plane. # X <percent> Optional scale factor, for resizing the entire sprite. # L <x>,<y> ... Defines a line. # P <x>,<y> ... Defines a (filled) polygon. # C <x>,<y> <radius> Defines a circle. # D <x>,<y> <radius> Defines a disk (i.e. a filled circle). # B <x>,<y> <x>,<y> Override the sprite's natural bounding box. # T <x>,<y> <s> text... Adds text to the sprite, of size 's'. "text" # can be ommitted, in cases where the sprite's # text will be provided by a screen object # definition. Text strings are fixed, with # no expansion of %-macros. # TR If the sprite has text, supply a backing rectangle # sized and positioned to match the text. # TB If the sprite has text, supply a box outline around # the text. # # The coordinates x and y are relative to the sprite's hot point. # Positive x and y values are towards the south-east. # # The natural "direction" for the sprite is north (e.g., for an arrow). # # The bounding box of sprite is normally calculated internally, # but can be overridden. If a sprite has text associated with # it, the text forms a second, separate, bounding box. Currently # these outlines are only used when sprite is referenced in # "roadmap.screenobjects". The bounding box can also be # overridden there. # # We use aliases to separate a sprite's usage from its actual drawing. # This makes it easier to change the representation of a specific object. S GPS A BlueDart S Friend A GreenTriangle S Selection A CrossHair S Direction A RedArrow S Destination A RedDotCircle S PointOfInterest A SmallRedDot S Waypoint A DarkGreenDot S Start A GreenTrianglePointer S RoutePoint A Circle-Pointer S SecondaryRoutePoint A Small-Circle-Pointer S PersonalLandmark A 5PointStar S TripLandmark A GreenSquare S Highlight A YellowDot S Kismet A RedDisk S Track A PurpleChevron S InactiveTrack A SmallPurpleChevron S BreadCrumb A PurpleDot S Departure A DottedSquare S Direction_Next A BigGreenDart S Direction_2nd A BigYellowDart S Direction_Dest A BigRedDart S ZoomIn A CirclePlus S ZoomOut A CircleMinus # The actual drawing sprites: S BlueDart F white 2 L 0,0 7,14 0,8 -7,14 F blue 1 P 0,1 6,13 0,10 -6,13 L 8,11 0,-3 -8,11 # same as "BlueDart", but with a bigger black # outline for visibility on low-contrast displays S OutlinedBlueDart F white 2 L 0,0 7,14 0,8 -7,14 L 11,17 0,-3 -11,17 0,14 11,17 F blue 1 P 0,1 6,13 0,10 -6,13 F black 1 L 11,17 0,-3 -11,17 0,14 11,17 S GreenTriangle F white 2 L 0,0 7,14 0,8 -7,14 F DarkGreen 2 L 0,1 6,13 0,10 -6,13 0,1 S PurpleTriangle F Purple 1 P 0,-10 -9,5 9,5 0,-10 S CrossHair F white 3 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 F black 1 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 S RedArrow F red 1 P -5,-20 0,-35 5,-20 F black 1 L -5,-20 0,-35 5,-20 -5,-20 S RedDotCircle F red 1 D 0,0 5 F black 1 C 0,0 5 C 0,0 7 S SmallRedDot F red 1 D 0,0 3 S GreenTrianglePointer F green 2 P 0,-9 -8,4 8,4 0,-9 F black 1 L 0,-9 -8,4 8,4 0,-9 L 1,-8 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-8 S GreenDot F green 1 D 0,0 5 F black 1 C 0,0 5 S DarkGreenDot F darkgreen 1 D 0,0 5 F black 1 C 0,0 5 S GreenSquare F black 1 L 5,5 5,-5 -5,-5 -5,5 5,5 F green 1 P 4,4 4,-4 -4,-4 -4,4 4,4 S PurpleChevron F purple 2 L -4,6 0,-6 4,6 S SmallPurpleChevron F purple 2 L -4,4 0,-4 4,4 S PurpleCross F purple 2 L -4,0 4,0 L 0,-4 0,4 S PurpleDot F purple 1 D 0,0 3 S 5PointStar F darkred 1 L 0,-9 5,7 L 5,7 -8,-3 L -8,-3 8,-3 L 8,-3 -5,7 L -5,7 0,-9 S YellowDot F yellow 1 D 0,0 5 F black 1 C 0,0 5 S RedDisk F red 1 D 0,0 10 S Circle F black 1 C 0,0 7 S Circle-Pointer F green 1 D 0,0 7 F black 1 C 0,0 7 C 0,0 1 L 1,-7 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-7 S Small-Circle-Pointer F green 1 D 0,0 6 F black 1 C 0,0 6 L 1,-6 1,-16 L 1,-16 -1,-16 L -1,-16 -1,-6 S DottedSquare F black 1 L 9,9 9,-9 -9,-9 -9,9 9,9 C 0,0 1 # These are very specific sprites we do not expect to change much. S Compass #F white 1 #D 0,0 13 F black 2 C 0,0 14 F white 1 C 0,0 15 F white 3 L -4,0 0,-13 4,0 L -4,0 0,13 4,0 F black 1 P -4,0 0,-13 4,0 F black 1 L -4,0 0,-13 4,0 L -4,0 0,13 4,0 L -17,0 -7,0 L 7,0 17,0 L 0,-13 0,-17 L 0,13 0,17 S Compass_fixed A BigBlackDart S BigBlackDart F black 1 P -9,13 0,8 9,13 0,-13 F white 1 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigGreenDart F green 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigYellowDart F yellow 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S BigRedDart F red 1 P -9,13 0,8 9,13 0,-13 F black 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S Download #F white 1 #D 0,0 14 F white 1 C 0,0 9 F red 1 C 0,0 8 P -7,-6 -12,4 -2,4 P 7,6 12,-4 2,-4 F white 1 L -7,-6 -12,4 L -7,-6 -2,4 L 7,6 12,-4 L 7,6 2,-4 F black 2 C 0,0 14 F white 1 C 0,0 15 # GPS Indication symbols: S Reception_na #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F white 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F DarkRed 2 L -9,-9 9,9 L 9,-9 -9,9 S reception_none #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F red 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 S reception_poor #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F yellow 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F black 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 S reception_good #F green 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 #F white 1 F green 1 P 10,-5 3,-12 0,-5 2,-3 P -5,0 -12,3 -5,10 -2,3 P -5,-10 -10,-5 0,5 5,0 F black 1 L 10,-5 3,-12 0,-5 2,-3 10,-5 L -5,0 -12,3 -5,10 -2,3 -5,0 L -5,-10 -10,-5 0,5 5,0 -5,-10 L 7,1 6,3 3,6 1,7 L 10,1 9,3 3,9 1,10 L 13,1 12,3 3,12 1,13 F white 1 TR F black 1 TB F black 2 T 0,20 10 # Red X S X F DarkRed 4 L 4,4 20,20 L 20,4 4,20 S CirclePlus #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F black 1 P -2,2 -2,12 2,12 2,2 12,2 12,-2 2,-2 2,-12 -2,-12 -2,-2 -12,-2 -12,2 F white 1 L -3,3 -3,12 3,12 3,3 12,3 12,-3 3,-3 3,-12 -3,-12 -3,-3 -12,-3 -12,3 -3,3 S CircleMinus #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 F black 1 P 12,2 12,-2 -12,-2 -12,2 F white 1 L 12,3 12,-3 -12,-3 -12,3 12,3 S Menu #F white 1 #D 0,0 15 F black 2 C 0,0 15 F white 1 C 0,0 16 P -5,-8 6,-8 2,8 -9,8 -5,-8 P 6,-8 5,7 8,7 6,-8 F black 1 L -5,-8 6,-8 2,8 -9,8 -5,-8 L 5,7 8,7 6,-8 L -3,-5 3,-5 L -3,-3 2,-3 L -4,-1 2,-1 L -5,1 1,1 L -5,3 1,3 # uncomment to add a text label # T 0,25 18 Menu # an empty textbox, which can be used as a screenobject S TextBox F white 1 TR F black 1 TB F black 2 T 0,0 20 # an empty textbox, which can be used as a screenobject S InfoBox F lightgreen 1 TR F black 1 TB F darkgreen 2 T 0,0 20 |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:48:22
|
Update of /cvsroot/roadmap/roadmap/sugar/libsugarize In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10267/sugar/libsugarize Added Files: Makefile libsugarize.c Log Message: add support for sugar activity builds. i'm not convinced this should be a top-level directory, but i think we probably have a directory shake-up coming soon anyway. --- NEW FILE: Makefile --- # i'm pretty sure this libsugarize thing is by Albert Cahalan. .PHONY: clean install xo CFLAGS:=-s -W -Wall -Os libsugarize.so: gcc $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib \ -shared -fpic -Wl,-soname,libsugarize.so \ -Wl,-z,initfirst -nostartfiles -o libsugarize.so \ libsugarize.c -lX11 -ldl -lc clean: rm -rf *.o core libsugarize.so --- NEW FILE: libsugarize.c --- ////////////////////////////////////////// // // gcc -W -Wall -I/usr/X11R6/include -L/usr/X11R6/lib -Os -shared -fpic -Wl,-soname,libsugarize.so -Wl,-z,initfirst -nostartfiles -o libsugarize.so libsugarize.c -lX11 -ldl -lc // // code from Albert Cahalan: // git://dev.laptop.org/users/albert/sugarize // #define _GNU_SOURCE // this is Linux source #include <dlfcn.h> #define XChangeProperty go_away #include<X11/Xlib.h> #undef XChangeProperty #include<string.h> #include<stdio.h> #include<stdlib.h> #include <sys/types.h> #include <unistd.h> static int (*xcp) (Display * dpy, Window win, Atom a_prop, Atom a_type, int format, int mode, void *data, int num); static Display *dpy2; static Window win2 = -1; static Atom a_activity; static Atom a_bundle; static Atom a_cardinal; static Atom a_string; static Atom a_pid; static Atom a_name; static Atom a_utf8; static int pid; static const char *sugar_activity; static const char *sugar_bundle; static const char *sugar_object; static const char *sugar_uri; static const char *net_wm_name; int XChangeProperty(Display * dpy, Window win, Atom a_prop, Atom a_type, int format, int mode, unsigned char *data, int num) { // printf("0x%08x %d %d\n",win,!!sugar_activity,!!sugar_bundle); if (!xcp) { xcp = dlsym(RTLD_NEXT, "XChangeProperty"); a_activity = XInternAtom(dpy, "_SUGAR_ACTIVITY_ID", 0); a_bundle = XInternAtom(dpy, "_SUGAR_BUNDLE_ID", 0); a_cardinal = XInternAtom(dpy, "CARDINAL", 0); a_string = XInternAtom(dpy, "STRING", 0); a_pid = XInternAtom(dpy, "_NET_WM_PID", 0); a_name = XInternAtom(dpy, "_NET_WM_NAME", 0); a_utf8 = XInternAtom(dpy, "UTF8_STRING", 0); pid = getpid(); } int ret = xcp(dpy, win, a_prop, a_type, format, mode, data, num); if (dpy == dpy2 && win == win2) return ret; dpy2 = dpy; win2 = win; if (net_wm_name && *net_wm_name) xcp(dpy, win, a_name, a_utf8, 8, PropModeReplace, (void *)net_wm_name, strlen(net_wm_name)); xcp(dpy, win, a_pid, a_cardinal, 32, PropModeReplace, (unsigned char *) &pid, 1); if (sugar_activity) xcp(dpy, win, a_activity, a_string, 8, PropModeReplace, (void *)sugar_activity, strlen(sugar_activity)); if (sugar_bundle) xcp(dpy, win, a_bundle, a_string, 8, PropModeReplace, (void *)sugar_bundle, strlen(sugar_bundle)); return ret; } void _init(int argc, char *argv[], char *envp[]) { (void)argc; (void)argv; int pos = 0; while (envp[pos]) { if (!memcmp ("SUGAR_BUNDLE_ID=", envp[pos], sizeof("SUGAR_BUNDLE_ID=") - 1)) sugar_bundle = envp[pos] + sizeof("SUGAR_BUNDLE_ID=") - 1; if (!memcmp ("SUGAR_ACTIVITY_ID=", envp[pos], sizeof("SUGAR_ACTIVITY_ID=") - 1)) sugar_activity = envp[pos] + sizeof("SUGAR_ACTIVITY_ID=") - 1; if (!memcmp ("SUGAR_OBJECT_ID=", envp[pos], sizeof("SUGAR_OBJECT_ID=") - 1)) sugar_object = envp[pos] + sizeof("SUGAR_OBJECT_ID=") - 1; if (!memcmp("SUGAR_URI=", envp[pos], sizeof("SUGAR_URI=") - 1)) sugar_uri = envp[pos] + sizeof("SUGAR_URI=") - 1; if (!memcmp("NET_WM_NAME=", envp[pos], sizeof("NET_WM_NAME=") - 1)) net_wm_name = envp[pos] + sizeof("NET_WM_NAME=") - 1; pos++; } } ///////////////// |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:48:22
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10267/sugar Added Files: mk_activity Log Message: add support for sugar activity builds. i'm not convinced this should be a top-level directory, but i think we probably have a directory shake-up coming soon anyway. --- NEW FILE: mk_activity --- #!/bin/bash # build a RoadMap executable configured to run on an XO laptop as # a sugar activity, tweak the normal default configuration files, # and create the zip RoadMap.xo bundle. # this could all be made _way_ better. volunteers? -pgf set -e test "$1" = clean && clean=clean TOP=.. SRC=$TOP/src ACT=./tmp/RoadMap.activity RMROOT=./tmp/roadmap_root STUFF=./activity rm -rf ./tmp mkdir -p ./tmp mkdir -p $ACT/{bin,activity,lib,docs,maps} cp $STUFF/sugarRoadMap $ACT/bin cp $STUFF/activity.info $STUFF/RoadMap.svg $ACT/activity # bring our development host's libexpat along, so we don't need to # "yum install" it. cp -a /usr/lib/libexpat.so* $ACT/lib # and bring along a copy of libsugarize.so make -C ./libsugarize clean libsugarize.so cp ./libsugarize/libsugarize.so $ACT/lib # force some variables for the local roadmap install cat >tmp/overrides.mk <<-EOF # created by mk_activity -- do not edit DESTDIR = $PWD/$RMROOT INSTALLDIR = /usr/share/activities/$ACT RUNTIME_ONLY = YES DESKTOP = GTK2 AGG = rgb565 # MODE=DEBUG # CFLAGS += -DSUGARIZED_ACTIVITY EOF # run a make in the src directory, but have it source the # overrides.mk file from here EXTERNAL_CONF=$PWD/tmp MANPAGES= \ make -C $SRC $clean all install mv $RMROOT/usr/share/activities/$ACT/bin/* $ACT/bin mv $RMROOT/usr/share/activities/$ACT/share/pixmaps $ACT/pixmaps mv $RMROOT/usr/share/activities/$ACT/share/roadmap $ACT/config cp $STUFF/config/* $ACT/config # disable the toolbar by default, but provide an example cp $SRC/roadmap.toolbar.ex $ACT/config touch $ACT/config/roadmap.toolbar mv $RMROOT/usr/share/activities/$ACT/applications/roadmap.desktop $ACT #prune some over-installation rm -rf $ACT/bin/rdm* $ACT/pixmaps/roadmap* $ACT/config/font.ttf mv $ACT/bin/gtkroadmap $ACT/bin/roadmap # provide some maps, which must already be installed on the build system mkdir -p tmp/RoadMap.maps if [ -d /usr/local/share/roadmap/maps ] then ln -s /usr/local/share/roadmap/maps/{SB,usdir.rdm} $ACT/maps for state in MA NH VT # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA do test -d /usr/local/share/roadmap/maps/$state && \ ln -s /usr/local/share/roadmap/maps/$state tmp/RoadMap.maps done else # in case we're building the bundle on the XO itself (unlikely) ln -s /home/olpc/Activities/RoadMap.activity/maps/{SB,usdir.rdm} $ACT/maps ln -s /media/disk/RoadMap.maps/{ma,nh,vt} tmp/RoadMap.maps fi # append some XO-specific config parameters to the default "preferences" ( echo \ "Labels.FontName: /usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf" echo \ "General.Sprite Scale: 200" echo \ "Navigation.Enable: no" echo \ "General.Progress Bar Delay: 500" echo \ "GPS.LostFixWarningTimeout: 5" echo \ "General.Busy Cursor Delay: 400" ) >>$ACT/config/preferences # edit preferences to get large font sizes for the XO -- the pixels are tiny sed -i \ -e "s/\(GPS.Font Size:\).*/\1 30/" \ -e "s/\(Display.Font Size:\).*/\1 30/" \ -e "s/\(Labels.Font Size:\).*/\1 20/" \ -e "s/\(Landmarks.Font Size:\).*/\1 30/" \ -e "s/\(Display.Rotate:\).*/\1 no/" \ $ACT/config/preferences # for the same reason, substitute a bigger GPS sprite sed -i \ -e "s/^A BlueDart/A OutlinedBlueDart/" \ $ACT/config/sprites # and move focus from san francisco default to 1cc in cambridge, MA sed -i \ -e "s/\(Focus.Name:\).*/\1 Hold/" \ -e "s/\(Hold.Position:\).*/\1 -71086473,42362964/" \ -e "s/\(General.Zoom:\).*/\1 2000/" \ -e "/Selection.Position:/d" \ -e "/Address.Position:/d" \ $ACT/config/session # and finally, copy in docs and licenses cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs # finally, bundle the bundle zip -r RoadMap.xo $ACT |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:46:50
|
Update of /cvsroot/roadmap/roadmap/sugar/activity/config In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9868/config Log Message: Directory /cvsroot/roadmap/roadmap/sugar/activity/config added to the repository |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:46:36
|
Update of /cvsroot/roadmap/roadmap/sugar/activity In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9852/activity Log Message: Directory /cvsroot/roadmap/roadmap/sugar/activity added to the repository |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:46:36
|
Update of /cvsroot/roadmap/roadmap/sugar/libsugarize In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9852/libsugarize Log Message: Directory /cvsroot/roadmap/roadmap/sugar/libsugarize added to the repository |
|
From: Paul F. <pg...@us...> - 2008-09-04 18:46:16
|
Update of /cvsroot/roadmap/roadmap/sugar In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9837/sugar Log Message: Directory /cvsroot/roadmap/roadmap/sugar added to the repository |
|
From: Paul F. <pg...@us...> - 2008-09-04 02:24:01
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14826 Modified Files: roadmap_start.c Log Message: add license info Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** roadmap_start.c 28 Jun 2008 19:18:28 -0000 1.146 --- roadmap_start.c 4 Sep 2008 02:23:55 -0000 1.147 *************** *** 197,206 **** static void roadmap_start_about (void) { ! roadmap_messagebox ("About", ! "RoadMap " ROADMAP_VERSION "\n" ! "(c) " ROADMAP_YEAR " Pascal Martin\n" ! "<pas...@in...>\n" ! "A Street navigation system\n" ! "for Linux & UNIX"); } --- 197,213 ---- static void roadmap_start_about (void) { ! roadmap_messagebox ( "About", ! "RoadMap " ROADMAP_VERSION "\n" ! "(c) " ROADMAP_YEAR " Pascal Martin, Paul Fox, Danny Backx and many others\n" ! "\n" ! "RoadMap is free software; you can\n" ! "redistribute it and/or modify it under the\n" ! "terms of version 2 (or later) of the GNU\n" ! "General Public License, as published by the\n" ! "Free Software Foundation. You should have\n" ! "received a copy of the GPL license along\n" ! "with this program.\n" ! ); ! } *************** *** 545,549 **** {"mapdownload", "Toggle Map Download", "Download", NULL, ! "Enable/Disable the map download mode", NULL, roadmap_start_toggle_download}, --- 552,556 ---- {"mapdownload", "Toggle Map Download", "Download", NULL, ! "Enable/Disable map download mode", NULL, roadmap_start_toggle_download}, |
|
From: Paul F. <pg...@us...> - 2008-09-02 16:11:24
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19147 Modified Files: buildus_county.c Log Message: remove unneeded static declaration of locals, and revert tabs to spaces Index: buildus_county.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildus_county.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** buildus_county.c 17 Aug 2008 08:43:41 -0000 1.7 --- buildus_county.c 2 Sep 2008 16:11:20 -0000 1.8 *************** *** 79,85 **** */ typedef struct { ! RoadMapString name; /**< */ ! RoadMapString symbol; /**< */ ! RoadMapArea edges; /**< */ } BuildUsState; --- 79,85 ---- */ typedef struct { ! RoadMapString name; /**< */ ! RoadMapString symbol; /**< */ ! RoadMapArea edges; /**< */ } BuildUsState; *************** *** 145,154 **** if (this_county->name != name) { ! static BuildMapDictionary county_dictionary; ! county_dictionary = buildmap_dictionary_open ("county"); buildmap_fatal (0, "non unique county FIPS code %d (%s, %s)", ! fips, ! buildmap_dictionary_get(county_dictionary, name), ! buildmap_dictionary_get(county_dictionary, this_county->name)); } return index; --- 145,154 ---- if (this_county->name != name) { ! BuildMapDictionary county_dictionary; ! county_dictionary = buildmap_dictionary_open ("county"); buildmap_fatal (0, "non unique county FIPS code %d (%s, %s)", ! fips, ! buildmap_dictionary_get(county_dictionary, name), ! buildmap_dictionary_get(county_dictionary, this_county->name)); } return index; *************** *** 203,215 **** } else if (State[StateCode[fips]].symbol != state_symbol) { ! static BuildMapDictionary BuildMapStateDictionary; BuildMapStateDictionary = buildmap_dictionary_open ("state"); buildmap_fatal (0, "invalid state FIPS (fips %d, state %s), not %s", ! fips, ! buildmap_dictionary_get(BuildMapStateDictionary, ! state_symbol), ! buildmap_dictionary_get(BuildMapStateDictionary, ! State[StateCode[fips]].symbol)); } --- 203,214 ---- } else if (State[StateCode[fips]].symbol != state_symbol) { ! BuildMapDictionary BuildMapStateDictionary; BuildMapStateDictionary = buildmap_dictionary_open ("state"); buildmap_fatal (0, "invalid state FIPS (fips %d, state %s), not %s", ! fips, ! buildmap_dictionary_get(BuildMapStateDictionary, state_symbol), ! buildmap_dictionary_get(BuildMapStateDictionary, ! State[StateCode[fips]].symbol)); } *************** *** 236,246 **** if (State[i].name != name) { ! static BuildMapDictionary state_dictionary; ! state_dictionary = buildmap_dictionary_open ("state"); buildmap_fatal (0, "state symbol conflict (%s %s %s)", ! buildmap_dictionary_get(state_dictionary, symbol), ! buildmap_dictionary_get(state_dictionary, State[i].name), ! buildmap_dictionary_get(state_dictionary, name)); } return; --- 235,245 ---- if (State[i].name != name) { ! BuildMapDictionary state_dictionary; ! state_dictionary = buildmap_dictionary_open ("state"); buildmap_fatal (0, "state symbol conflict (%s %s %s)", ! buildmap_dictionary_get(state_dictionary, symbol), ! buildmap_dictionary_get(state_dictionary, State[i].name), ! buildmap_dictionary_get(state_dictionary, name)); } return; *************** *** 250,254 **** if (StateCount == MAX_US_STATE - 1) { ! buildmap_fatal(0, "Cannot add more than %d states", MAX_US_STATE); } --- 249,253 ---- if (StateCount == MAX_US_STATE - 1) { ! buildmap_fatal(0, "Cannot add more than %d states", MAX_US_STATE); } |
|
From: Paul F. <pg...@us...> - 2008-09-02 16:10:01
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18294 Modified Files: roadmap_db_dictionary.h Log Message: remove extra struct element inadvertently added by previous commit Index: roadmap_db_dictionary.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_db_dictionary.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_db_dictionary.h 12 Jul 2008 09:49:14 -0000 1.2 --- roadmap_db_dictionary.h 2 Sep 2008 16:09:49 -0000 1.3 *************** *** 73,77 **** --- 73,79 ---- unsigned char count; /**< Quantity */ unsigned char position; /**< Position within the table */ + #if LATER // danny? unsigned char num_strings; /**< Number of strings contained in the table */ + #endif }; |
|
From: Danny B. <dan...@us...> - 2008-08-17 08:43:50
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6599 Modified Files: buildus_county.c Log Message: Add more verbose error messages, and one bounds check. Index: buildus_county.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildus_county.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** buildus_county.c 27 Nov 2007 13:44:06 -0000 1.6 --- buildus_county.c 17 Aug 2008 08:43:41 -0000 1.7 *************** *** 1,4 **** ! /* buildus_county.c - Build a county table & index for RoadMap. ! * * LICENSE: * --- 1,3 ---- ! /* * LICENSE: * *************** *** 20,23 **** --- 19,27 ---- * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + /** + * @file + * @brief Build a county table & index for RoadMap. * * SYNOPSYS: *************** *** 49,52 **** --- 53,57 ---- #include "buildus_county.h" + #include "roadmap_dictionary.h" struct RoadMapCity { *************** *** 70,84 **** #define MAX_US_STATE 100 typedef struct { ! ! RoadMapString name; ! RoadMapString symbol; ! ! RoadMapArea edges; ! } BuildUsState; static BuildUsState State[MAX_US_STATE+1]; ! static int StateCode[MAX_US_STATE+1]; static int StateMaxCode = 0; --- 75,89 ---- #define MAX_US_STATE 100 + /** + * @brief + */ typedef struct { ! RoadMapString name; /**< */ ! RoadMapString symbol; /**< */ ! RoadMapArea edges; /**< */ } BuildUsState; static BuildUsState State[MAX_US_STATE+1]; ! static int StateCode[MAX_US_STATE+1]; static int StateMaxCode = 0; *************** *** 88,92 **** static void buildus_county_register (void); ! static void buildus_county_initialize (void) { --- 93,99 ---- static void buildus_county_register (void); ! /** ! * @brief ! */ static void buildus_county_initialize (void) { *************** *** 109,113 **** } ! int buildus_county_add (int fips, RoadMapString name, RoadMapString state_symbol) { --- 116,126 ---- } ! /** ! * @brief Add a county to the tables ! * @param fips the US standard number to indicate this county ! * @param name the name of this county ! * @param state_symbol the state in which this county is ! * @return the internal representation (index into table) of this county ! */ int buildus_county_add (int fips, RoadMapString name, RoadMapString state_symbol) { *************** *** 118,122 **** RoadMapCounty *this_county; - if (CountyByFips == NULL) buildus_county_initialize (); --- 131,134 ---- *************** *** 133,137 **** if (this_county->name != name) { ! buildmap_fatal (0, "non unique county FIPS code"); } return index; --- 145,154 ---- if (this_county->name != name) { ! static BuildMapDictionary county_dictionary; ! county_dictionary = buildmap_dictionary_open ("county"); ! buildmap_fatal (0, "non unique county FIPS code %d (%s, %s)", ! fips, ! buildmap_dictionary_get(county_dictionary, name), ! buildmap_dictionary_get(county_dictionary, this_county->name)); } return index; *************** *** 186,191 **** } else if (State[StateCode[fips]].symbol != state_symbol) { ! buildmap_fatal (0, "invalid state FIPS"); } --- 203,215 ---- } else if (State[StateCode[fips]].symbol != state_symbol) { + static BuildMapDictionary BuildMapStateDictionary; + BuildMapStateDictionary = buildmap_dictionary_open ("state"); ! buildmap_fatal (0, "invalid state FIPS (fips %d, state %s), not %s", ! fips, ! buildmap_dictionary_get(BuildMapStateDictionary, ! state_symbol), ! buildmap_dictionary_get(BuildMapStateDictionary, ! State[StateCode[fips]].symbol)); } *************** *** 193,197 **** } ! void buildus_county_add_state (RoadMapString name, RoadMapString symbol) { --- 217,225 ---- } ! /** ! * @brief Add a US state ! * @param name the name of this state ! * @param symbol the standard two-character symbol representing this state ! */ void buildus_county_add_state (RoadMapString name, RoadMapString symbol) { *************** *** 199,206 **** RoadMapArea area_reset = {0, 0, 0, 0}; - if (CountyByFips == NULL) buildus_county_initialize (); - /* Search if that state is not yet known. */ --- 227,232 ---- *************** *** 210,215 **** if (State[i].name != name) { ! buildmap_fatal (0, "state symbol conflict"); } return; --- 236,246 ---- if (State[i].name != name) { + static BuildMapDictionary state_dictionary; ! state_dictionary = buildmap_dictionary_open ("state"); ! buildmap_fatal (0, "state symbol conflict (%s %s %s)", ! buildmap_dictionary_get(state_dictionary, symbol), ! buildmap_dictionary_get(state_dictionary, State[i].name), ! buildmap_dictionary_get(state_dictionary, name)); } return; *************** *** 217,222 **** } - StateCount += 1; State[StateCount].name = name; State[StateCount].symbol = symbol; --- 248,257 ---- } + if (StateCount == MAX_US_STATE - 1) { + buildmap_fatal(0, "Cannot add more than %d states", MAX_US_STATE); + } + + StateCount += 1; State[StateCount].name = name; State[StateCount].symbol = symbol; *************** *** 225,229 **** } ! void buildus_county_add_city (int fips, RoadMapString city) { --- 260,268 ---- } ! /** ! * @brief ! * @param fips ! * @param city ! */ void buildus_county_add_city (int fips, RoadMapString city) { *************** *** 234,241 **** struct RoadMapCity *this_city; - if (CountyByFips == NULL) buildus_county_initialize (); - /* First retrieve the county. */ --- 273,278 ---- *************** *** 274,278 **** } ! void buildus_county_set_position (int fips, const RoadMapArea *bounding_box) { --- 311,319 ---- } ! /** ! * @brief ! * @param fips ! * @param bounding_box ! */ void buildus_county_set_position (int fips, const RoadMapArea *bounding_box) { *************** *** 324,328 **** } ! static int buildmap_county_compare (const void *r1, const void *r2) { --- 365,374 ---- } ! /** ! * @brief ! * @param r1 ! * @param r2 ! * @return ! */ static int buildmap_county_compare (const void *r1, const void *r2) { *************** *** 342,345 **** --- 388,397 ---- } + /** + * @brief + * @param r1 + * @param r2 + * @return + */ static int buildmap_county_compare_city (const void *r1, const void *r2) { *************** *** 369,372 **** --- 421,427 ---- } + /** + * @brief + */ static void buildus_county_sort (void) { *************** *** 412,416 **** } ! static void buildus_county_save (void) { --- 467,473 ---- } ! /** ! * @brief ! */ static void buildus_county_save (void) { *************** *** 560,564 **** } ! static buildmap_db_module BuildUsCountyModule = { "county", --- 617,623 ---- } ! /** ! * @brief ! */ static buildmap_db_module BuildUsCountyModule = { "county", *************** *** 569,573 **** }; ! static void buildus_county_register (void) { buildmap_db_register (&BuildUsCountyModule); --- 628,634 ---- }; ! /** ! * @brief ! */ static void buildus_county_register (void) { buildmap_db_register (&BuildUsCountyModule); |
|
From: Danny B. <dan...@us...> - 2008-08-13 10:12:02
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29189/win32 Modified Files: .cvsignore Log Message: Should have left out the directory info. Index: .cvsignore =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 5 Aug 2008 05:42:46 -0000 1.2 --- .cvsignore 13 Aug 2008 10:11:58 -0000 1.3 *************** *** 1,2 **** roadmap.rsc ! win32/.depends.mk --- 1,2 ---- roadmap.rsc ! .depends.mk |
|
From: Paul F. <pg...@us...> - 2008-08-08 12:55:00
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20887 Modified Files: Makefile Log Message: remove rdmindex from default build. it's unfinished s/w. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** Makefile 4 Aug 2008 17:44:07 -0000 1.128 --- Makefile 8 Aug 2008 12:54:55 -0000 1.129 *************** *** 339,343 **** BUILD = else ! BUILD = buildmap buildmap_osm buildus buildplace dumpmap rdmindex endif --- 339,345 ---- BUILD = else ! BUILD = buildmap buildmap_osm buildus buildplace dumpmap ! # rdmindex -- removed from default build. it's unfinished s/w, and ! # its presence is confusing. endif |
|
From: Paul F. <pg...@us...> - 2008-08-08 12:50:49
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19299 Modified Files: buildmap_opt.c Log Message: harden against bad arg parsing Index: buildmap_opt.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_opt.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** buildmap_opt.c 3 Dec 2007 04:24:54 -0000 1.1 --- buildmap_opt.c 8 Aug 2008 12:50:44 -0000 1.2 *************** *** 163,166 **** --- 163,169 ---- if (!o) { retval = opt_dontexist; + if (o->type == opt_string) { + *str = NULL; + } } else { retval = 0; |
|
From: Paul F. <pg...@us...> - 2008-08-08 12:38:34
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14349 Modified Files: buildmap_osm_main.c Log Message: fix bad reference to uninitialized string Index: buildmap_osm_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** buildmap_osm_main.c 4 Aug 2008 23:25:51 -0000 1.8 --- buildmap_osm_main.c 8 Aug 2008 12:38:29 -0000 1.9 *************** *** 759,763 **** count = 1; ! } else if (inputfile) { exit(buildmap_osm_text_process_file(inputfile)); } else { --- 759,763 ---- count = 1; ! } else if (*inputfile) { exit(buildmap_osm_text_process_file(inputfile)); } else { |
|
From: Paul F. <pg...@us...> - 2008-08-07 04:09:16
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18879 Modified Files: roadmap.h roadmap_log.c Log Message: suppress some string constant to char* conversion warnings (apparently this conversion is now deprecated in c++) Index: roadmap_log.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_log.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** roadmap_log.c 7 May 2008 14:01:11 -0000 1.22 --- roadmap_log.c 7 Aug 2008 04:09:11 -0000 1.23 *************** *** 139,145 **** FILE *file, char saved, ! char *source, int line, ! char *format, va_list ap) { --- 139,145 ---- FILE *file, char saved, ! const char *source, int line, ! const char *format, va_list ap) { *************** *** 164,168 **** static void roadmap_redirect_one (struct roadmap_message_descriptor *category, ! char *format, va_list ap) { --- 164,168 ---- static void roadmap_redirect_one (struct roadmap_message_descriptor *category, ! const char *format, va_list ap) { *************** *** 179,183 **** ! void roadmap_log (int level, char *source, int line, char *format, ...) { FILE *file; --- 179,184 ---- ! void roadmap_log (int level, const char *source, ! int line, const char *format, ...) { FILE *file; *************** *** 241,245 **** void roadmap_check_allocated_with_source_line ! (char *source, int line, const void *allocated) { if (allocated == NULL) { --- 242,246 ---- void roadmap_check_allocated_with_source_line ! (const char *source, int line, const void *allocated) { if (allocated == NULL) { Index: roadmap.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roadmap.h 25 Jun 2008 21:45:17 -0000 1.26 --- roadmap.h 7 Aug 2008 04:09:11 -0000 1.27 *************** *** 47,51 **** void roadmap_log_reset_stack (void); ! void roadmap_log (int level, char *source, int line, char *format, ...); void roadmap_log_save_all (void); --- 47,51 ---- void roadmap_log_reset_stack (void); ! void roadmap_log (int level, const char *source, int line, const char *format, ...); void roadmap_log_save_all (void); *************** *** 97,101 **** /* This function is hidden by a macro: */ void roadmap_check_allocated_with_source_line ! (char *source, int line, const void *allocated); typedef void (* RoadMapCallback) (void); --- 97,101 ---- /* This function is hidden by a macro: */ void roadmap_check_allocated_with_source_line ! (const char *source, int line, const void *allocated); typedef void (* RoadMapCallback) (void); |
|
From: Danny B. <dan...@us...> - 2008-08-05 05:42:49
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19822 Added Files: .cvsignore Log Message: Tell CVS not to talk about files in here. --- NEW FILE: .cvsignore --- .depends.mk buildmap buildmap_osm buildplace buildus dumpmap rdmfriends rdmghost rdmindex rdmkismet rdmtrace rdmxchange sunrise |
|
From: Danny B. <dan...@us...> - 2008-08-05 05:42:49
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19822/win32 Modified Files: .cvsignore Log Message: Tell CVS not to talk about files in here. Index: .cvsignore =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 30 May 2008 18:28:53 -0000 1.1 --- .cvsignore 5 Aug 2008 05:42:46 -0000 1.2 *************** *** 1 **** --- 1,2 ---- roadmap.rsc + win32/.depends.mk |
