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...> - 2006-12-01 19:41:46
|
Update of /cvsroot/roadmap/roadmap/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912/gtk2 Modified Files: roadmap_canvas.c Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_canvas.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_canvas.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roadmap_canvas.c 19 Nov 2006 21:24:19 -0000 1.15 --- roadmap_canvas.c 1 Dec 2006 16:15:15 -0000 1.16 *************** *** 48,51 **** --- 48,52 ---- char *name; + GdkLineStyle style; GdkGC *gc; }; *************** *** 58,61 **** --- 59,64 ---- static GdkGC *RoadMapGc; + static RoadMapPen CurrentPen; + static PangoLayout *RoadMapLayout = NULL; *************** *** 122,127 **** RoadMapPen roadmap_canvas_select_pen (RoadMapPen pen) { - static RoadMapPen CurrentPen; - RoadMapPen old_pen = CurrentPen; CurrentPen = pen; --- 125,128 ---- *************** *** 155,158 **** --- 156,160 ---- pen->name = strdup (name); pen->gc = gc; + pen->style = GDK_LINE_SOLID; pen->next = RoadMapPenList; *************** *** 180,190 **** void roadmap_canvas_set_thickness (int thickness) { gdk_gc_set_line_attributes ! (RoadMapGc, thickness, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND); } - void roadmap_canvas_erase (void) { --- 182,202 ---- + void roadmap_canvas_set_linestyle (const char *style) { + + if (strcasecmp (style, "dashed") == 0) { + CurrentPen->style = GDK_LINE_ON_OFF_DASH; + } else { + CurrentPen->style = GDK_LINE_SOLID; + } + } + void roadmap_canvas_set_thickness (int thickness) { gdk_gc_set_line_attributes ! (RoadMapGc, thickness, CurrentPen->style, ! CurrentPen->style == GDK_LINE_SOLID ? GDK_CAP_ROUND : GDK_CAP_BUTT, ! GDK_JOIN_ROUND); } void roadmap_canvas_erase (void) { |
|
From: Paul F. <pg...@us...> - 2006-12-01 19:41:09
|
Update of /cvsroot/roadmap/roadmap/src/agg_support In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912/agg_support Modified Files: roadmap_canvas.cpp Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/agg_support/roadmap_canvas.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_canvas.cpp 19 Aug 2006 17:14:37 -0000 1.6 --- roadmap_canvas.cpp 1 Dec 2006 16:15:15 -0000 1.7 *************** *** 233,236 **** --- 233,242 ---- } + void roadmap_canvas_set_linestyle (const char *style) { + + // unimplemented + + } + int roadmap_canvas_get_thickness (RoadMapPen pen) { |
|
From: Pascal F M. <pas...@us...> - 2006-11-29 23:55:25
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28872 Modified Files: rdmdownload Log Message: Use the latest UC Census Bureau's maps Index: rdmdownload =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmdownload,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rdmdownload 2 Jan 2006 17:54:55 -0000 1.4 --- rdmdownload 29 Nov 2006 23:55:20 -0000 1.5 *************** *** 20,24 **** shift ! TIGERURL=http://www2.census.gov/geo/tiger/tiger2005fe TIGEROPT1="-nd -np -r -N -P $TIGERDIR -A.zip" TIGEROPT2="-nd -np -r -N -P $TIGERDIR -A.ZIP" --- 20,24 ---- shift ! TIGERURL=http://www2.census.gov/geo/tiger/tiger2005se TIGEROPT1="-nd -np -r -N -P $TIGERDIR -A.zip" TIGEROPT2="-nd -np -r -N -P $TIGERDIR -A.ZIP" |
|
From: Pascal F M. <pas...@us...> - 2006-11-29 23:54:19
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28421 Modified Files: rdmgenmaps Log Message: Assume a reasonable default for the maps path Index: rdmgenmaps =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmgenmaps,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** rdmgenmaps 24 May 2006 21:06:29 -0000 1.10 --- rdmgenmaps 29 Nov 2006 23:54:13 -0000 1.11 *************** *** 32,36 **** FORMAT="--format=2002" ! MAPPATH="" OPTIONS="" TMPDIR=/var/tmp --- 32,36 ---- FORMAT="--format=2002" ! MAPPATH="/var/lib/roadmap" OPTIONS="" TMPDIR=/var/tmp |
|
From: Paul F. <pg...@us...> - 2006-11-27 00:39:05
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13151 Modified Files: README Log Message: detab Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** README 27 Nov 2006 00:35:20 -0000 1.110 --- README 27 Nov 2006 00:39:02 -0000 1.111 *************** *** 2457,2464 **** to display on map. ! <<Format:>> A comma-separated list of featurefile specifiers. ! A featurefile specifier is a semi-colon-separated list of ! display parameters: ! filename;spritename;labelcolor;labellevel;spritelevel,filename;spritename... <<Default:>> <empty> --- 2457,2464 ---- to display on map. ! <<Format:>> A comma-separated list of featurefile specifiers. ! A featurefile specifier is a semi-colon-separated list of ! display parameters: ! filename;spritename;labelcolor;labellevel;spritelevel,filename;spritename... <<Default:>> <empty> *************** *** 2469,2476 **** The label and sprite levels are integers, representing the zoom level above which the label or sprite, respectively, ! will not be drawn. Either the sprite name or the label ! color may be the string "NONE", which will suppress the ! sprite or the label, respectively. Either declutter level ! may be omitted. [Files.Make Backups] Enable/disable the creation of backup files. --- 2469,2476 ---- The label and sprite levels are integers, representing the zoom level above which the label or sprite, respectively, ! will not be drawn. Either the sprite name or the label ! color may be the string "NONE", which will suppress the ! sprite or the label, respectively. Either declutter level ! may be omitted. [Files.Make Backups] Enable/disable the creation of backup files. |
|
From: Paul F. <pg...@us...> - 2006-11-27 00:38:04
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6454/src Modified Files: roadmap_display.c Log Message: cause overflow text in signs to always truncate at the tail, rather than at the head, of the string. ("console boxes" don't truncate -- they wrap. the full solution would be to have the corner signs wrap in a similar way.) Index: roadmap_display.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** roadmap_display.c 19 Nov 2006 21:24:19 -0000 1.30 --- roadmap_display.c 27 Nov 2006 00:23:10 -0000 1.31 *************** *** 297,301 **** roadmap_log_push ("roadmap_display_sign"); ! roadmap_screen_text_extents (ROADMAP_TEXT_SIGNS, sign->content, RoadMapDisplayFontSize, &width, &ascent, &descent, NULL); --- 297,301 ---- roadmap_log_push ("roadmap_display_sign"); ! roadmap_screen_text_extents (ROADMAP_TEXT_SIGNS, sign->content, RoadMapDisplayFontSize, &width, &ascent, &descent, NULL); *************** *** 588,591 **** --- 588,592 ---- int count; int width, ascent, descent; + int canvas_width, canvas_height, left_side; RoadMapGuiPoint frame[4]; *************** *** 601,618 **** } ! roadmap_screen_text_extents (ROADMAP_TEXT_SIGNS, text, RoadMapDisplayFontSize, &width, &ascent, &descent, NULL); if (corner & ROADMAP_CANVAS_RIGHT) { ! frame[2].x = roadmap_canvas_width() - 5; frame[0].x = frame[2].x - width - 6; ! } else { ! if (corner & ROADMAP_CANVAS_BOTTOM) { ! frame[0].x = 5; ! } else { /* leave room for compass */ ! frame[0].x = 45; } frame[2].x = frame[0].x + width + 6; } frame[1].x = frame[0].x; --- 602,629 ---- } ! roadmap_screen_text_extents (ROADMAP_TEXT_SIGNS, text, RoadMapDisplayFontSize, &width, &ascent, &descent, NULL); + canvas_width = roadmap_canvas_width(); + canvas_height = roadmap_canvas_height(); + + if (corner & ROADMAP_CANVAS_BOTTOM) { + left_side = 5; + } else { /* leave room for compass */ + left_side = 45; + } if (corner & ROADMAP_CANVAS_RIGHT) { ! frame[2].x = canvas_width - 5; frame[0].x = frame[2].x - width - 6; ! if (frame[0].x < left_side) { ! frame[0].x = left_side; } + } else { + frame[0].x = left_side; frame[2].x = frame[0].x + width + 6; + if (frame[2].x > canvas_width) { + frame[2].x = canvas_width - 5; + } } frame[1].x = frame[0].x; *************** *** 620,625 **** if (corner & ROADMAP_CANVAS_BOTTOM) { ! frame[0].y = roadmap_canvas_height () - ascent - descent - 11; ! frame[1].y = roadmap_canvas_height () - 6; } else { frame[0].y = 6; --- 631,636 ---- if (corner & ROADMAP_CANVAS_BOTTOM) { ! frame[0].y = canvas_height - ascent - descent - 11; ! frame[1].y = canvas_height - 6; } else { frame[0].y = 6; *************** *** 629,632 **** --- 640,644 ---- frame[3].y = frame[0].y; + count = 4; roadmap_canvas_select_pen (RoadMapConsoleBackground); *************** *** 636,644 **** roadmap_canvas_draw_multiple_polygons (1, &count, frame, 0, 0); ! frame[0].x = frame[3].x - 3; ! frame[0].y = frame[3].y + 3; roadmap_screen_text(ROADMAP_TEXT_SIGNS, frame, ! ROADMAP_CANVAS_RIGHT|ROADMAP_CANVAS_TOP, RoadMapDisplayFontSize, text); } --- 648,656 ---- roadmap_canvas_draw_multiple_polygons (1, &count, frame, 0, 0); ! frame[0].x += 3; ! frame[0].y += 3; roadmap_screen_text(ROADMAP_TEXT_SIGNS, frame, ! ROADMAP_CANVAS_LEFT|ROADMAP_CANVAS_TOP, RoadMapDisplayFontSize, text); } |
|
From: Paul F. <pg...@us...> - 2006-11-27 00:35:23
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11492 Modified Files: README Log Message: document "feature" files, plus some other miscellaneous cleanup. Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** README 19 Nov 2006 21:25:03 -0000 1.109 --- README 27 Nov 2006 00:35:20 -0000 1.110 *************** *** 60,67 **** features have not been implemented yet. RoadMap can display the map around a specified street address, track a GPS position and identify ! the current street and the next intersection. A basic trip support is ! provided (waypoints and destination). RoadMap detects what is the next ! waypoint, provides a direction arrow and show the distance to this ! waypoint (and/or to the destination). The plan for the future is to implement some navigation features similar --- 60,67 ---- features have not been implemented yet. RoadMap can display the map around a specified street address, track a GPS position and identify ! the current street and the next intersection. Trip support is ! provided (waypoints, route following, and general landmarks). ! Large sets of "Point of Interest" features also can be displayed ! on the map. The plan for the future is to implement some navigation features similar *************** *** 116,124 **** RoadMap uses aptconvert to format the documentation (see previous section). - Support for a "Point of Interest" feature is in the way, where the plan - is to store the points in a SQLite database. RoadMap is not at this time - dependent on SQLite, even while using SQLite will be an option in the - future. - RoadMap can use the shapelib library (to decode the shape file format). The shape file format is only used for converting the Digital Charts of --- 116,119 ---- *************** *** 184,190 **** of gzip and tar tools on PocketPC. ! The screenshots feature of RoadMap is not available on Windows. ! The full-screen mode of RoadMap is not available on Windows. --- 179,185 ---- of gzip and tar tools on PocketPC. ! The screenshots feature of RoadMap is not available on Windows or GTK ! The full-screen mode of RoadMap is not available on Windows or GTK. *************** *** 577,583 **** also generates the necessary information and code for profiling. - [SQL=SQLITE] Use the sqlite library. This option has no practical effect - at this time. - [DESKTOP=GTK2|GPE|GTK|QT|QPE] Compiles RoadMap for a specific GUI environment. By default GTK, GTK2 and QT are built. The GPE environment --- 572,575 ---- *************** *** 2266,2270 **** <<Default:>> yes ! <<Comment:>> chooses whether streets are labelled at startup. They can still be toggled by command. --- 2258,2262 ---- <<Default:>> yes ! <<Comment:>> chooses whether streets are labeled at startup. They can still be toggled by command. *************** *** 2462,2481 **** <<Default:>> 125 ft ! [FeatureFiles.Path] List of files containing features to display on map. ! <<Format:>> A comma-separated list of filenames, each accompanied ! by their semi-colon-separated list of display parameters: ! filename;spritename;labelcolor;declutterlevel,filename;spritename... <<Default:>> <empty> ! <<Comment:>> The filename may include & and ~ as path shorthands, ! the spritename else should appear in the sprites file, the ! labelcolor will be used when writing the feature's name, and the ! declutter level is an integer, representing the zoom level above ! which the label will not be drawn. The spritename or the ! labelcolor may be the string "NONE", which will suppress the ! sprite or the label, respectively. The declutter value may be ! omitted. [Files.Make Backups] Enable/disable the creation of backup files. --- 2454,2476 ---- <<Default:>> 125 ft ! [FeatureFiles.Path] List of files containing "Point of Interest" features ! to display on map. ! <<Format:>> A comma-separated list of featurefile specifiers. ! A featurefile specifier is a semi-colon-separated list of ! display parameters: ! filename;spritename;labelcolor;labellevel;spritelevel,filename;spritename... <<Default:>> <empty> ! <<Comment:>> The filename may include & and ~ as path shorthands. ! The spritename should appear in the sprites file. The ! labelcolor will be used when writing the feature's name. ! The label and sprite levels are integers, representing the ! zoom level above which the label or sprite, respectively, ! will not be drawn. Either the sprite name or the label ! color may be the string "NONE", which will suppress the ! sprite or the label, respectively. Either declutter level ! may be omitted. [Files.Make Backups] Enable/disable the creation of backup files. *************** *** 3144,3147 **** --- 3139,3173 ---- user's preferences and session file are found.) + * FEATURE FILES + + Like the RoadMap trip data, feature data is stored in GPX format. Each + feature file should represent a related set of points of interest, like + ice cream shops, motels, campgrounds, or mountaintops. A single sprite + can be associated with each file, and will be used to represent its + contents on the map. Features will be labeled using the pen color + specified. Either or both of the sprite and label can be suppressed by + specifying the name "NONE". Feature labels and sprites can also be + selectively disabled as the map is zoomed out. An example feature file + specification, which uses ';' as its delimiter, might be: + &/icecream.gpx;ConeSprite;darkblue;350;750 + This says that the ice cream shops listed in the given file should + be drawn with the ConeSprite, labeled with a "darkblue" pen, the labels + should be eliminated above zoom level 350, and the sprites should + disappear above zoom 750. Likewise: + &/towns.gpx;NONE;black;350;350 + says that towns should be labeled in black, with no sprite, up to + zoom level 350. If a higher sprite declutter level is specified: + &/towns.gpx;NONE;black;350;1000 + then a small default sprite (with the name "PointOfInterest") will be + shown, up to the higher level. + + Multiple file specifications (including each file's associated (and + semicolon-separated) sprite name, pen color, and declutter levels) + should be separated by ',' characters. + + Note that unlike the maps, which are read and cached on an as-needed + basis, the feature files are read into memory in their entirety when + RoadMap starts, so there is a memory penalty for using large feature + files. TOOLS |
|
From: Paul F. <pg...@us...> - 2006-11-27 00:27:31
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/src Modified Files: roadmap_features.c Log Message: add an additional declutter value so that features can be suppressed entirely above a given level. Index: roadmap_features.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_features.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_features.c 4 Oct 2006 20:25:03 -0000 1.5 --- roadmap_features.c 27 Nov 2006 00:27:27 -0000 1.6 *************** *** 55,59 **** RoadMapPen pen; char * sprite; ! int declutter; RoadMapArea area; } RoadMapFeatureLists[MAX_FEATUREFILES], *RoadMapFeatureList; --- 55,60 ---- RoadMapPen pen; char * sprite; ! int label_declutter; ! int sprite_declutter; RoadMapArea area; } RoadMapFeatureLists[MAX_FEATUREFILES], *RoadMapFeatureList; *************** *** 65,78 **** static void roadmap_features_draw(const weepoint *w) { ! if (roadmap_math_declutter(RoadMapFeatureList->declutter)) { ! roadmap_landmark_draw_weepoint ! (w, RoadMapFeatureList->sprite, RoadMapFeatureList->pen); ! } else { ! /* Above a certain zoom level, turn off labels, and draw only ! * the sprite. If there was normally no sprite, provide one. ! */ ! roadmap_landmark_draw_weepoint ! (w, RoadMapFeatureList->sprite ? ! RoadMapFeatureList->sprite : "PointOfInterest", NULL); } } --- 66,87 ---- static void roadmap_features_draw(const weepoint *w) { ! RoadMapPen pen = RoadMapFeatureList->pen; ! char *sprite = RoadMapFeatureList->sprite; ! ! if ( ! roadmap_math_declutter(RoadMapFeatureList->label_declutter)) { ! pen = NULL; ! /* not drawing label? make sure there's a sprite */ ! if (sprite == NULL) { ! sprite = "PointOfInterest"; ! } ! } ! ! if ( RoadMapFeatureList->sprite_declutter >= 0 && ! ! roadmap_math_declutter(RoadMapFeatureList->sprite_declutter)) { ! sprite = NULL; ! } ! ! if (sprite != NULL || pen != NULL) { ! roadmap_landmark_draw_weepoint (w, sprite, pen); } } *************** *** 154,158 **** int ret; char pen_name[256]; ! char *color, *sprite, *declutter; const char *p; --- 163,167 ---- int ret; char pen_name[256]; ! char *color, *sprite, *l_declutter, *s_declutter; const char *p; *************** *** 223,227 **** RoadMapFeatureList->sprite = "PointOfInterest"; RoadMapFeatureList->pen = RoadMapLandmarksPen; ! RoadMapFeatureList->declutter = 550; if (semi && *semi) { /* sprite info */ --- 232,237 ---- RoadMapFeatureList->sprite = "PointOfInterest"; RoadMapFeatureList->pen = RoadMapLandmarksPen; ! RoadMapFeatureList->label_declutter = 550; ! RoadMapFeatureList->sprite_declutter = -1; if (semi && *semi) { /* sprite info */ *************** *** 259,276 **** if (semi) *semi++ = ';'; ! if (semi && *semi) { /* declutter info */ ! declutter = semi; ! semi = strchr(declutter, ';'); if (semi) *semi = '\0'; ! if (*declutter) { int de; ! de = atoi(declutter); if (de != 0) { ! RoadMapFeatureList->declutter = de; } } if (semi) *semi++ = ';'; } } --- 269,302 ---- if (semi) *semi++ = ';'; ! if (semi && *semi) { /* label declutter info */ ! l_declutter = semi; ! semi = strchr(l_declutter, ';'); if (semi) *semi = '\0'; ! if (*l_declutter) { int de; ! de = atoi(l_declutter); if (de != 0) { ! RoadMapFeatureList->label_declutter = de; } } if (semi) *semi++ = ';'; + + if (semi && *semi) { /* label declutter info */ + + s_declutter = semi; + semi = strchr(s_declutter, ';'); + if (semi) *semi = '\0'; + + if (*s_declutter) { + int de; + de = atoi(s_declutter); + if (de != 0) { + RoadMapFeatureList->sprite_declutter = de; + } + } + if (semi) *semi++ = ';'; + } } } |
|
From: Paul F. <pg...@us...> - 2006-11-27 00:25:22
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7619/src Modified Files: roadmap_trip.c Log Message: force a refresh when starting a "Move", to get the instructional console box repainted correctly. Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** roadmap_trip.c 20 Nov 2006 01:57:06 -0000 1.81 --- roadmap_trip.c 27 Nov 2006 00:25:19 -0000 1.82 *************** *** 1565,1572 **** if (!roadmap_math_point_is_visible (&waypointp->pos)) { ! /* Only set focus if the point we just added is off-screen. This ! * will take us there. ! */ ! roadmap_trip_set_focus_waypoint (waypointp); } --- 1565,1572 ---- if (!roadmap_math_point_is_visible (&waypointp->pos)) { ! /* Only set focus if the point we just added is off-screen. This ! * will take us there. ! */ ! roadmap_trip_set_focus_waypoint (waypointp); } *************** *** 1574,1578 **** if (where != PLACE_PERSONAL_MARK) { ! roadmap_trip_set_modified(1); } --- 1574,1578 ---- if (where != PLACE_PERSONAL_MARK) { ! roadmap_trip_set_modified(1); } *************** *** 2817,2826 **** if (pp != NULL) { ! /* force it to the start of the list */ ! roadmap_list_insert ! ( &RoadMapTripAreaPlaces, roadmap_list_remove(&pp->link)); ! roadmap_trip_waypoint_show_selected (); ! roadmap_trip_set_focus_waypoint (pp->wpt); ! roadmap_screen_refresh (); } } --- 2817,2826 ---- if (pp != NULL) { ! /* force it to the start of the list */ ! roadmap_list_insert ! ( &RoadMapTripAreaPlaces, roadmap_list_remove(&pp->link)); ! roadmap_trip_waypoint_show_selected (); ! roadmap_trip_set_focus_waypoint (pp->wpt); ! roadmap_screen_refresh (); } } *************** *** 2859,2872 **** i = 0; ROADMAP_LIST_FOR_EACH (&RoadMapTripAreaPlaces, elem, tmp) { ! char buf[128]; ! pp = (roadmap_place_pointer *)elem; ! wpt = pp->wpt; ! snprintf(buf, sizeof(buf), "%s%s%s%s%s", ! pp->list ? pp->list : "", ! pp->list ? " / " : "", ! wpt->shortname, ! wpt->description ? " - " : "", ! wpt->description ? wpt->description : ""); names[i] = strdup(buf); places[i++] = pp; --- 2859,2872 ---- i = 0; ROADMAP_LIST_FOR_EACH (&RoadMapTripAreaPlaces, elem, tmp) { ! char buf[128]; ! pp = (roadmap_place_pointer *)elem; ! wpt = pp->wpt; ! snprintf(buf, sizeof(buf), "%s%s%s%s%s", ! pp->list ? pp->list : "", ! pp->list ? " / " : "", ! wpt->shortname, ! wpt->description ? " - " : "", ! wpt->description ? wpt->description : ""); names[i] = strdup(buf); places[i++] = pp; *************** *** 2877,2881 **** while (i > 0) ! free(names[--i]); free (names); free (places); --- 2877,2881 ---- while (i > 0) ! free(names[--i]); free (names); free (places); *************** *** 2951,2957 **** if (count > 1) { ! roadmap_trip_waypoint_selection_dialog (); } else { ! roadmap_trip_waypoint_show_selected(); } --- 2951,2957 ---- if (count > 1) { ! roadmap_trip_waypoint_selection_dialog (); } else { ! roadmap_trip_waypoint_show_selected(); } *************** *** 3117,3120 **** --- 3117,3122 ---- w->description ? w->description : ""); + RoadMapTripRefresh = 1; + roadmap_screen_refresh (); |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:55:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7932 Added Files: zlibce.def Log Message: def file for the dll --- NEW FILE: zlibce.def --- LIBRARY ; WindowsCE compilers dose not support 'DESCRIPTION' ;DESCRIPTION "zlib compression library for Windows" EXPORTS adler32 @1 compress @2 crc32 @3 deflate @4 deflateCopy @5 deflateEnd @6 deflateInit2_ @7 deflateInit_ @8 deflateParams @9 deflateReset @10 deflateSetDictionary @11 gzclose @12 gzdopen @13 gzerror @14 gzflush @15 gzopen @16 gzread @17 gzwrite @18 inflate @19 inflateEnd @20 inflateInit2_ @21 inflateInit_ @22 inflateReset @23 inflateSetDictionary @24 inflateSync @25 uncompress @26 zlibVersion @27 gzprintf @28 gzputc @29 gzgetc @30 gzseek @31 gzrewind @32 gztell @33 gzeof @34 gzsetparams @35 zError @36 inflateSyncPoint @37 get_crc_table @38 compress2 @39 gzputs @40 gzgets @41 |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:55:21
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libpng In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7898 Added Files: png32ce.def Log Message: def file for the dll --- NEW FILE: png32ce.def --- ;------------------------------------------ ; LIBPNG module definition file for Windows ;------------------------------------------ LIBRARY lpngce EXPORTS ;Version 1.2.12 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 png_chunk_warning @4 ; png_convert_from_struct_tm @5 ; png_convert_from_time_t @6 png_create_info_struct @7 png_create_read_struct @8 png_create_write_struct @9 png_data_freer @10 png_destroy_info_struct @11 png_destroy_read_struct @12 png_destroy_write_struct @13 png_error @14 png_free @15 png_free_data @16 png_get_IHDR @17 png_get_PLTE @18 png_get_bKGD @19 png_get_bit_depth @20 png_get_cHRM @21 png_get_cHRM_fixed @22 png_get_channels @23 png_get_color_type @24 png_get_compression_buffer_size @25 png_get_compression_type @26 png_get_copyright @27 png_get_error_ptr @28 png_get_filter_type @29 png_get_gAMA @30 png_get_gAMA_fixed @31 png_get_hIST @32 png_get_header_ver @33 png_get_header_version @34 png_get_iCCP @35 png_get_image_height @36 png_get_image_width @37 png_get_interlace_type @38 png_get_io_ptr @39 png_get_libpng_ver @40 png_get_oFFs @41 png_get_pCAL @42 png_get_pHYs @43 png_get_pixel_aspect_ratio @44 png_get_pixels_per_meter @45 png_get_progressive_ptr @46 png_get_rgb_to_gray_status @47 png_get_rowbytes @48 png_get_rows @49 png_get_sBIT @50 png_get_sCAL @51 png_get_sPLT @52 png_get_sRGB @53 png_get_signature @54 png_get_tIME @55 png_get_tRNS @56 png_get_text @57 png_get_unknown_chunks @58 png_get_user_chunk_ptr @59 png_get_user_transform_ptr @60 png_get_valid @61 png_get_x_offset_microns @62 png_get_x_offset_pixels @63 png_get_x_pixels_per_meter @64 png_get_y_offset_microns @65 png_get_y_offset_pixels @66 png_get_y_pixels_per_meter @67 png_malloc @68 png_memcpy_check @69 png_memset_check @70 png_permit_empty_plte @71 png_process_data @72 png_progressive_combine_row @73 png_read_end @74 png_read_image @75 png_read_info @76 ; png_read_init is deprecated png_read_init @77 png_read_png @78 png_read_row @79 png_read_rows @80 png_read_update_info @81 png_reset_zstream @82 png_set_IHDR @83 png_set_PLTE @84 png_set_bKGD @85 png_set_background @86 png_set_bgr @87 png_set_cHRM @88 png_set_cHRM_fixed @89 png_set_compression_buffer_size @90 png_set_compression_level @91 png_set_compression_mem_level @92 png_set_compression_method @93 png_set_compression_strategy @94 png_set_compression_window_bits @95 png_set_crc_action @96 png_set_dither @97 png_set_error_fn @98 png_set_expand @99 png_set_filler @100 png_set_filter @101 png_set_filter_heuristics @102 png_set_flush @103 png_set_gAMA @104 png_set_gAMA_fixed @105 png_set_gamma @106 png_set_gray_1_2_4_to_8 @107 ; deprecated png_set_gray_to_rgb @108 png_set_hIST @109 png_set_iCCP @110 png_set_interlace_handling @111 png_set_invert_alpha @112 png_set_invert_mono @113 png_set_keep_unknown_chunks @114 png_set_oFFs @115 png_set_pCAL @116 png_set_pHYs @117 png_set_packing @118 png_set_packswap @119 png_set_palette_to_rgb @120 png_set_progressive_read_fn @121 png_set_read_fn @122 png_set_read_status_fn @123 png_set_read_user_chunk_fn @124 png_set_read_user_transform_fn @125 png_set_rgb_to_gray @126 png_set_rgb_to_gray_fixed @127 png_set_rows @128 png_set_sBIT @129 png_set_sCAL @130 png_set_sPLT @131 png_set_sRGB @132 png_set_sRGB_gAMA_and_cHRM @133 png_set_shift @134 png_set_sig_bytes @135 png_set_strip_16 @136 png_set_strip_alpha @137 png_set_swap @138 png_set_swap_alpha @139 png_set_tIME @140 png_set_tRNS @141 png_set_tRNS_to_alpha @142 png_set_text @143 png_set_unknown_chunk_location @144 png_set_unknown_chunks @145 png_set_user_transform_info @146 png_set_write_fn @147 png_set_write_status_fn @148 png_set_write_user_transform_fn @149 png_sig_cmp @150 png_start_read_image @151 png_warning @152 png_write_chunk @153 png_write_chunk_data @154 png_write_chunk_end @155 png_write_chunk_start @156 png_write_end @157 png_write_flush @158 png_write_image @159 png_write_info @160 png_write_info_before_PLTE @161 ; png_write_init is deprecated png_write_init @162 png_write_png @163 png_write_row @164 png_write_rows @165 ; png_read_init_2 and png_write_init_2 are deprecated. png_read_init_2 @166 png_write_init_2 @167 png_access_version_number @168 ; png_sig_bytes @169 ; png_libpng_ver @170 png_init_io @171 png_convert_to_rfc1123 @172 png_set_invalid @173 ; Added at version 1.0.12 ; For compatiblity with 1.0.7-1.0.11 png_info_init @174 png_read_init_3 @175 png_write_init_3 @176 png_info_init_3 @177 png_destroy_struct @178 ; Added at version 1.2.0 ; For use with PNG_USER_MEM_SUPPORTED ; png_destroy_struct_2 @179 ; png_create_read_struct_2 @180 ; png_create_write_struct_2 @181 ; png_malloc_default @182 ; png_free_default @183 ; MNG features ; png_permit_mng_features @184 ; MMX support ; png_mmx_support @185 ; png_get_mmx_flagmask @186 ; png_get_asm_flagmask @187 ; png_get_asm_flags @188 ; png_get_mmx_bitdepth_threshold @189 ; png_get_mmx_rowbytes_threshold @190 ; png_set_asm_flags @191 ; png_init_mmx_flags @192 ; Strip error numbers ; png_set_strip_error_numbers @193 ; Added at version 1.2.2 png_handle_as_unknown @179 png_zalloc @180 png_zfree @181 ; png_handle_as_unknown @194 ; png_zalloc @195 ; png_zfree @196 ; Added at version 1.2.6 png_malloc_warn @195 png_get_user_height_max @196 png_get_user_width_max @197 png_set_user_limits @198 ; Added at version 1.2.7 png_set_add_alpha @199 ; Added at version 1.2.9 png_get_uint_32 @200 png_save_uint_32 @201 png_get_uint_16 @202 png_save_uint_16 @203 png_get_int_32 @204 png_save_int_32 @205 png_get_uint_31 @206 png_set_expand_gray_1_2_4_to_8 @207 |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:39:50
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1232/libroadmap Modified Files: libroadmap.vcp Log Message: Update. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** libroadmap.vcp 17 Nov 2006 16:48:55 -0000 1.20 --- libroadmap.vcp 24 Nov 2006 15:39:44 -0000 1.21 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c - # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /FR /YX /M$(CECrtMTDebug) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /FR /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" *************** *** 824,827 **** --- 824,834 ---- "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_entry.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ "..\..\roadmap_win32.h"\ *************** *** 864,867 **** --- 871,881 ---- "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_entry.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ "..\..\roadmap_win32.h"\ *************** *** 2415,2418 **** --- 2429,2433 ---- "..\..\..\roadmap_dictionary.h"\ "..\..\..\roadmap_display.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_fuzzy.h"\ *************** *** 2440,2443 **** --- 2455,2459 ---- "..\..\..\roadmap_sprite.h"\ "..\..\..\roadmap_square.h"\ + "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_string.h"\ *************** *** 2473,2476 **** --- 2489,2493 ---- "..\..\..\roadmap_dictionary.h"\ "..\..\..\roadmap_display.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_fuzzy.h"\ *************** *** 2498,2501 **** --- 2515,2519 ---- "..\..\..\roadmap_sprite.h"\ "..\..\..\roadmap_square.h"\ + "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_string.h"\ *************** *** 3455,3458 **** --- 3473,3477 ---- "..\..\..\roadmap_dbread.h"\ "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_fuzzy.h"\ *************** *** 3461,3464 **** --- 3480,3484 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_navigate.h"\ *************** *** 3468,3471 **** --- 3488,3493 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_state.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_types.h"\ *************** *** 3493,3496 **** --- 3515,3519 ---- "..\..\..\roadmap_dbread.h"\ "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_fuzzy.h"\ *************** *** 3499,3502 **** --- 3522,3526 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_navigate.h"\ *************** *** 3506,3509 **** --- 3530,3535 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_state.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_types.h"\ *************** *** 4315,4320 **** "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_plugin.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_screen_obj.h"\ --- 4341,4346 ---- "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_screen_obj.h"\ *************** *** 4341,4346 **** "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_plugin.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_screen_obj.h"\ --- 4367,4372 ---- "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_screen_obj.h"\ *************** *** 4447,4450 **** --- 4473,4477 ---- "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 4486,4489 **** --- 4513,4517 ---- "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 4795,4798 **** --- 4823,4827 ---- "..\..\..\navigate\navigate_main.h"\ "..\..\..\navigate\navigate_plugin.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_address.h"\ *************** *** 4814,4817 **** --- 4843,4847 ---- "..\..\..\roadmap_line_route.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ *************** *** 4850,4853 **** --- 4880,4884 ---- "..\..\..\navigate\navigate_main.h"\ "..\..\..\navigate\navigate_plugin.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_address.h"\ *************** *** 4869,4872 **** --- 4900,4904 ---- "..\..\..\roadmap_line_route.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ *************** *** 4983,4986 **** --- 5015,5019 ---- "..\..\..\navigate\navigate_main.h"\ "..\..\..\navigate\navigate_plugin.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_gui.h"\ *************** *** 4995,4998 **** --- 5028,5032 ---- "..\..\..\navigate\navigate_main.h"\ "..\..\..\navigate\navigate_plugin.h"\ + "..\..\..\navigate\navigate_traffic.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_gui.h"\ *************** *** 5019,5022 **** --- 5053,5252 ---- # Begin Source File + SOURCE=..\..\..\navigate\navigate_traffic.c + + !IF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" + + DEP_CPP_NAVIGATE_T=\ + "..\..\..\navigate\navigate_traffic.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_db_line_route.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ + "..\..\..\roadmap_line_route.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug" + + DEP_CPP_NAVIGATE_T=\ + "..\..\..\navigate\navigate_traffic.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_db_line_route.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ + "..\..\..\roadmap_line_route.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug" + + DEP_CPP_NAVIGATE_T=\ + "..\..\..\navigate\navigate_traffic.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_db_line_route.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ + "..\..\..\roadmap_line_route.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" + + DEP_CPP_NAVIGATE_T=\ + "..\..\..\navigate\navigate_traffic.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_db_line_route.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ + "..\..\..\roadmap_line_route.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_NAVIGATE_T=\ + "..\..\..\navigate\navigate_traffic.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_db_line_route.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ + "..\..\..\roadmap_line_route.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_choice.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + SOURCE=..\..\..\editor\static\notes.c |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:39:18
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1165 Modified Files: editor_main.c Log Message: Bump version. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** editor_main.c 3 Nov 2006 12:43:02 -0000 1.20 --- editor_main.c 24 Nov 2006 15:39:15 -0000 1.21 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 pre1"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 pre4"; void editor_main_check_map (void) { |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:38:30
|
Update of /cvsroot/roadmap/roadmap_editor/src/ssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv789 Modified Files: ssd_container.c Log Message: Add sound. Index: ssd_container.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_container.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_container.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_container.c 24 Nov 2006 15:38:24 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- #include "roadmap_canvas.h" + #include "roadmap_sound.h" #include "ssd_widget.h" *************** *** 126,129 **** --- 127,135 ---- if (widget->callback) { + RoadMapSoundList list = roadmap_sound_list_create (); + if (roadmap_sound_list_add (list, "click.wav") != -1) { + roadmap_sound_play_list (list); + } + (*widget->callback) (widget, SSD_BUTTON_SHORT_CLICK); return 1; |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:37:58
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv395 Modified Files: navigate_traffic.c Log Message: Tweak congestion display settings. Index: navigate_traffic.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_traffic.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** navigate_traffic.c 24 Nov 2006 11:08:35 -0000 1.1 --- navigate_traffic.c 24 Nov 2006 15:37:54 -0000 1.2 *************** *** 366,370 **** } ! if (speed1 < (avg1 / 2)) { *override_pen = TrafficPens[cfcc][pen_type]; cache_set (fips, line, STATE_CONGESTION); --- 366,370 ---- } ! if (speed1 < (avg1 * 2 / 3)) { *override_pen = TrafficPens[cfcc][pen_type]; cache_set (fips, line, STATE_CONGESTION); *************** *** 382,386 **** } ! if (speed2 < (avg2 / 2)) { *override_pen = TrafficPens[cfcc][pen_type]; cache_set (fips, line, STATE_CONGESTION); --- 382,386 ---- } ! if (speed2 < (avg2 * 2 / 3)) { *override_pen = TrafficPens[cfcc][pen_type]; cache_set (fips, line, STATE_CONGESTION); |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:35:07
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/static In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31627 Modified Files: editor_dialog.c Log Message: Add speed to the road information. Index: editor_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/editor_dialog.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** editor_dialog.c 21 Nov 2006 09:28:10 -0000 1.11 --- editor_dialog.c 24 Nov 2006 15:35:01 -0000 1.12 *************** *** 345,348 **** --- 345,357 ---- ssd_widget_add (dialog, group); + group = ssd_container_new ("Speed group", NULL, + SSD_MIN_SIZE, SSD_MIN_SIZE, SSD_WIDGET_SPACE|SSD_END_ROW); + ssd_widget_set_color (group, NULL, NULL); + ssd_widget_add (group, + ssd_text_new ("Label", roadmap_lang_get("Speed"), -1, + SSD_TEXT_LABEL)); + ssd_widget_add (group, ssd_text_new ("Speed", "", -1, 0)); + ssd_widget_add (dialog, group); + group = ssd_container_new ("Time group", NULL, SSD_MIN_SIZE, SSD_MIN_SIZE, SSD_WIDGET_SPACE|SSD_END_ROW); *************** *** 986,989 **** --- 995,1012 ---- } + #ifdef SSD + if (selected_lines->lines[0].line.plugin_id == ROADMAP_PLUGIN_ID) { + int line = selected_lines->lines[0].line.line_id; + int avg_speed = roadmap_line_route_get_avg_speed (line, 0); + int cur_speed = roadmap_line_route_get_speed (line, 0); + + snprintf (str, sizeof(str), "%d (%d)", + avg_speed, cur_speed); + ssd_dialog_set_value ("Speed", str); + } else { + ssd_dialog_set_value ("Speed", ""); + } + #endif + snprintf (str, sizeof(str), "%d %s", total_length, roadmap_lang_get("meters")); |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:34:18
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31558 Modified Files: lang Log Message: Update. Index: lang =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/lang,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lang 15 Oct 2006 10:55:08 -0000 1.5 --- lang 24 Nov 2006 15:34:15 -0000 1.6 *************** *** 104,105 **** --- 104,111 ---- RoadMap=FreeMap Please free at least 5MB of space before synchronizing.=×× × ×¤× × ×פ××ת 5MB ×©× ×××ר×× ××¤× × ××צ××¢ ××¡× ×ר××. + Main Menu=תפר×× ×¨××©× + Traffic data=× ×ª×× × ×ª× ××¢× + Speed=×××ר×ת + Traffic preferences=× ×ª×× × ×ª× ××¢× + Use for calculating routes=××ש×× ×ס×××× × ×××× + Display traffic information=××¦× × ×ª×× × ×ª× ××¢× |
|
From: Ehud S. <esh...@us...> - 2006-11-24 15:34:01
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31197 Modified Files: sprites Log Message: Add X sprite. Index: sprites =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sprites,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sprites 24 Nov 2006 11:11:15 -0000 1.5 --- sprites 24 Nov 2006 15:33:57 -0000 1.6 *************** *** 189,190 **** --- 189,196 ---- F yellow 1 P -3,1 0,-6 3,1 + + S X + F DarkRed 2 + L 4,4 20,20 + L 20,4 4,20 + |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:13:27
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26044 Modified Files: roadmap_start.c Log Message: Add pointer registration priorities. Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** roadmap_start.c 21 Nov 2006 09:26:07 -0000 1.32 --- roadmap_start.c 24 Nov 2006 11:13:23 -0000 1.33 *************** *** 488,495 **** roadmap_start_set_destination}, - {"traffic", "Traffic data", NULL, NULL, - "Chage Traffic data settings", - roadmap_start_navigate}, - {"navigate", "Navigate", NULL, NULL, "Calculate route", --- 488,491 ---- *************** *** 1065,1069 **** RoadMapStartActions); ! roadmap_pointer_register_long_click (roadmap_start_long_click); roadmap_main_add_canvas (); --- 1061,1066 ---- RoadMapStartActions); ! roadmap_pointer_register_long_click ! (roadmap_start_long_click, POINTER_DEFAULT); roadmap_main_add_canvas (); *************** *** 1223,1227 **** roadmap_label_activate (); roadmap_sprite_initialize (); - roadmap_screen_obj_initialize (); roadmap_screen_set_initial_position (); --- 1220,1223 ---- *************** *** 1243,1246 **** --- 1239,1243 ---- navigate_main_initialize (); + roadmap_screen_obj_initialize (); roadmap_trip_restore_focus (); |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:12:33
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25852 Modified Files: roadmap_download.c Log Message: Fix default path for download dir. Index: roadmap_download.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_download.c 17 Nov 2006 16:55:31 -0000 1.12 --- roadmap_download.c 24 Nov 2006 11:12:29 -0000 1.13 *************** *** 1016,1020 **** void roadmap_download_initialize (void) { ! char default_destination[1024]; roadmap_config_declare --- 1016,1020 ---- void roadmap_download_initialize (void) { ! char *default_destination = roadmap_path_join (roadmap_path_user(), "maps"); roadmap_config_declare *************** *** 1023,1032 **** "http://www.freemap.co.il/roadmap/maps/" ROADMAP_FILE_NAME_FORMAT); - snprintf (default_destination, sizeof(default_destination), - "%s\\maps", roadmap_path_user()); - roadmap_config_declare ("preferences", ! &RoadMapConfigDestination, strdup(default_destination)); } --- 1023,1029 ---- "http://www.freemap.co.il/roadmap/maps/" ROADMAP_FILE_NAME_FORMAT); roadmap_config_declare ("preferences", ! &RoadMapConfigDestination, default_destination); } |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:11:49
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25448 Modified Files: Makefile Log Message: Calculate routes using traffic statistics. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Makefile 21 Nov 2006 09:18:10 -0000 1.24 --- Makefile 24 Nov 2006 11:11:46 -0000 1.25 *************** *** 216,219 **** --- 216,220 ---- navigate/navigate_bar.c \ navigate/navigate_plugin.c \ + navigate/navigate_traffic.c \ navigate/navigate_dglib.c \ |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:11:18
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25390 Modified Files: sprites Log Message: Add X sprite. Index: sprites =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sprites,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sprites 5 Jun 2006 09:15:47 -0000 1.4 --- sprites 24 Nov 2006 11:11:15 -0000 1.5 *************** *** 53,56 **** --- 53,62 ---- C 0,0 5 + S Selection + F blue 1 + D 0,0 5 + F black 1 + C 0,0 5 + S Highlight F yellow 1 *************** *** 176,177 **** --- 182,190 ---- L 13,1 12,3 3,12 1,13 + S Marker + F blue 1 + D 0,0 5 + F black 1 + C 0,0 6 + F yellow 1 + P -3,1 0,-6 3,1 |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:10:58
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25032 Modified Files: roadmap_pointer.c roadmap_pointer.h roadmap_screen.c roadmap_screen_obj.c Log Message: Add pointer registration priorities. Index: roadmap_pointer.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_pointer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_pointer.c 21 Nov 2006 09:24:20 -0000 1.7 --- roadmap_pointer.c 24 Nov 2006 11:10:52 -0000 1.8 *************** *** 50,54 **** #define MAX_CALLBACKS 10 ! static RoadMapPointerHandler pointer_callbacks[MAX_EVENTS][MAX_CALLBACKS]; --- 50,59 ---- #define MAX_CALLBACKS 10 ! typedef struct pointer_callback { ! RoadMapPointerHandler handler; ! int priority; ! } PointerCallback; ! ! static PointerCallback pointer_callbacks[MAX_EVENTS][MAX_CALLBACKS]; *************** *** 57,62 **** int res = 0; ! while ((i<MAX_CALLBACKS) && pointer_callbacks[event][i]) { ! res = (pointer_callbacks[event][i]) (point); if (res) break; i++; --- 62,67 ---- int res = 0; ! while ((i<MAX_CALLBACKS) && pointer_callbacks[event][i].handler) { ! res = (pointer_callbacks[event][i].handler) (point); if (res) break; i++; *************** *** 160,164 **** int i=0; for (i=0; i<MAX_CALLBACKS; i++) { ! if (pointer_callbacks[event][i] == handler) break; } --- 165,169 ---- int i=0; for (i=0; i<MAX_CALLBACKS; i++) { ! if (pointer_callbacks[event][i].handler == handler) break; } *************** *** 169,187 **** memmove (&pointer_callbacks[event][i], &pointer_callbacks[event][i+1], ! sizeof(void*) * (MAX_CALLBACKS - i - 1)); ! pointer_callbacks[event][MAX_CALLBACKS - 1] = NULL; } ! static void queue_callback (int event, void *handler) { ! if (pointer_callbacks[event][MAX_CALLBACKS-1]) { roadmap_log (ROADMAP_FATAL, "Too many callbacks for event: %d", event); } ! memmove (&pointer_callbacks[event][1], &pointer_callbacks[event][0], ! sizeof(void*) * (MAX_CALLBACKS-1)); ! pointer_callbacks[event][0] = handler; } --- 174,200 ---- memmove (&pointer_callbacks[event][i], &pointer_callbacks[event][i+1], ! sizeof(PointerCallback) * (MAX_CALLBACKS - i - 1)); ! pointer_callbacks[event][MAX_CALLBACKS - 1].handler = NULL; } ! static void queue_callback (int event, void *handler, int priority) { ! int i; ! ! if (pointer_callbacks[event][MAX_CALLBACKS-1].handler) { roadmap_log (ROADMAP_FATAL, "Too many callbacks for event: %d", event); } ! for (i=0; i<MAX_CALLBACKS; i++) { ! if (pointer_callbacks[event][i].priority <= priority) break; ! } ! ! memmove (&pointer_callbacks[event][i+1], &pointer_callbacks[event][i], ! sizeof(PointerCallback) * (MAX_CALLBACKS - i - 1)); ! ! pointer_callbacks[event][i].handler = handler; ! pointer_callbacks[event][i].priority = priority; } *************** *** 204,246 **** ! void roadmap_pointer_register_short_click (RoadMapPointerHandler handler) { ! queue_callback (SHORT_CLICK, handler); } ! void roadmap_pointer_register_long_click (RoadMapPointerHandler handler) { ! queue_callback (LONG_CLICK, handler); } ! void roadmap_pointer_register_pressed (RoadMapPointerHandler handler) { ! queue_callback (PRESSED, handler); } ! void roadmap_pointer_register_released (RoadMapPointerHandler handler) { ! queue_callback (RELEASED, handler); } ! void roadmap_pointer_register_drag_start (RoadMapPointerHandler handler) { ! queue_callback (DRAG_START, handler); } ! void roadmap_pointer_register_drag_motion (RoadMapPointerHandler handler) { ! queue_callback (DRAG_MOTION, handler); } ! void roadmap_pointer_register_drag_end (RoadMapPointerHandler handler) { ! queue_callback (DRAG_END, handler); } --- 217,266 ---- ! void roadmap_pointer_register_short_click (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (SHORT_CLICK, handler, priority); } ! void roadmap_pointer_register_long_click (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (LONG_CLICK, handler, priority); } ! void roadmap_pointer_register_pressed (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (PRESSED, handler, priority); } ! void roadmap_pointer_register_released (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (RELEASED, handler, priority); } ! void roadmap_pointer_register_drag_start (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (DRAG_START, handler, priority); } ! void roadmap_pointer_register_drag_motion (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (DRAG_MOTION, handler, priority); } ! void roadmap_pointer_register_drag_end (RoadMapPointerHandler handler, ! int priority) { ! queue_callback (DRAG_END, handler, priority); } Index: roadmap_screen_obj.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen_obj.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_screen_obj.c 21 Nov 2006 09:24:20 -0000 1.8 --- roadmap_screen_obj.c 24 Nov 2006 11:10:52 -0000 1.9 *************** *** 156,169 **** roadmap_screen_obj_decode_arg (arg, sizeof(arg), argv[i], argl[i]); ! image = roadmap_res_get (RES_BITMAP, RES_SKIN, arg); ! if (image == NULL) { ! roadmap_log (ROADMAP_ERROR, ! "screen object:'%s' can't load image:%s.", ! object->name, ! arg); } - object->images[object->states_count] = image; } --- 156,174 ---- roadmap_screen_obj_decode_arg (arg, sizeof(arg), argv[i], argl[i]); + if (!object->images[object->states_count]) { ! image = roadmap_res_get (RES_BITMAP, RES_SKIN, arg); ! if (image == NULL) { ! roadmap_log (ROADMAP_ERROR, ! "screen object:'%s' can't load image:%s.", ! object->name, ! arg); ! } ! object->images[object->states_count] = image; ! } else { ! object->sprites[object->states_count] = ! roadmap_object_string (arg, argl[i]); } } *************** *** 624,630 **** void roadmap_screen_obj_initialize (void) { ! roadmap_pointer_register_pressed (roadmap_screen_obj_pressed); ! roadmap_pointer_register_short_click (roadmap_screen_obj_short_click); ! roadmap_pointer_register_long_click (roadmap_screen_obj_long_click); roadmap_screen_obj_reload (); --- 629,638 ---- void roadmap_screen_obj_initialize (void) { ! roadmap_pointer_register_pressed ! (roadmap_screen_obj_pressed, POINTER_HIGH); ! roadmap_pointer_register_short_click ! (roadmap_screen_obj_short_click, POINTER_HIGH); ! roadmap_pointer_register_long_click ! (roadmap_screen_obj_long_click, POINTER_HIGH); roadmap_screen_obj_reload (); Index: roadmap_pointer.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_pointer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_pointer.h 21 Nov 2006 09:24:20 -0000 1.4 --- roadmap_pointer.h 24 Nov 2006 11:10:52 -0000 1.5 *************** *** 30,33 **** --- 30,37 ---- #include "roadmap_gui.h" + #define POINTER_DEFAULT 0 + #define POINTER_NORMAL 1 + #define POINTER_HIGH 2 + #define POINTER_HIGHEST 3 typedef int (*RoadMapPointerHandler) (RoadMapGuiPoint *point); *************** *** 36,45 **** const RoadMapGuiPoint *roadmap_pointer_position (void); ! void roadmap_pointer_register_short_click (RoadMapPointerHandler handler); ! void roadmap_pointer_register_long_click (RoadMapPointerHandler handler); ! void roadmap_pointer_register_drag_start (RoadMapPointerHandler handler); ! void roadmap_pointer_register_drag_motion (RoadMapPointerHandler handler); ! void roadmap_pointer_register_drag_end (RoadMapPointerHandler handler); ! void roadmap_pointer_register_pressed (RoadMapPointerHandler handler); void roadmap_pointer_unregister_short_click (RoadMapPointerHandler handler); --- 40,55 ---- const RoadMapGuiPoint *roadmap_pointer_position (void); ! void roadmap_pointer_register_short_click (RoadMapPointerHandler handler, ! int priority); ! void roadmap_pointer_register_long_click (RoadMapPointerHandler handler, ! int priority); ! void roadmap_pointer_register_drag_start (RoadMapPointerHandler handler, ! int priority); ! void roadmap_pointer_register_drag_motion (RoadMapPointerHandler handler, ! int priority); ! void roadmap_pointer_register_drag_end (RoadMapPointerHandler handler, ! int priority); ! void roadmap_pointer_register_pressed (RoadMapPointerHandler handler, ! int priority); void roadmap_pointer_unregister_short_click (RoadMapPointerHandler handler); Index: roadmap_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** roadmap_screen.c 21 Nov 2006 09:22:08 -0000 1.23 --- roadmap_screen.c 24 Nov 2006 11:10:52 -0000 1.24 *************** *** 1579,1586 **** ("preferences", &RoadMapConfigMapLabels, "on", "off", NULL); ! roadmap_pointer_register_short_click (&roadmap_screen_short_click); ! roadmap_pointer_register_drag_start (&roadmap_screen_drag_start); ! roadmap_pointer_register_drag_end (&roadmap_screen_drag_end); ! roadmap_pointer_register_drag_motion (&roadmap_screen_drag_motion); roadmap_canvas_register_configure_handler (&roadmap_screen_configure); --- 1579,1590 ---- ("preferences", &RoadMapConfigMapLabels, "on", "off", NULL); ! roadmap_pointer_register_short_click ! (&roadmap_screen_short_click, POINTER_DEFAULT); ! roadmap_pointer_register_drag_start ! (&roadmap_screen_drag_start, POINTER_DEFAULT); ! roadmap_pointer_register_drag_end ! (&roadmap_screen_drag_end, POINTER_DEFAULT); ! roadmap_pointer_register_drag_motion ! (&roadmap_screen_drag_motion, POINTER_DEFAULT); roadmap_canvas_register_configure_handler (&roadmap_screen_configure); |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:10:39
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25014 Modified Files: roadmap_config.c Log Message: Load configs using the clean state. Index: roadmap_config.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_config.c 21 Nov 2006 09:22:08 -0000 1.6 --- roadmap_config.c 24 Nov 2006 11:10:36 -0000 1.7 *************** *** 610,614 **** p = roadmap_path_next(file->set, p)) { ! loaded = roadmap_config_load (p, file, ROADMAP_CONFIG_SHARED); if (loaded) break; --- 610,614 ---- p = roadmap_path_next(file->set, p)) { ! loaded = roadmap_config_load (p, file, ROADMAP_CONFIG_CLEAN); if (loaded) break; |
|
From: Ehud S. <esh...@us...> - 2006-11-24 11:10:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/ssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24582 Modified Files: ssd_dialog.c Log Message: Add pointer registration priorities. Index: ssd_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_dialog.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_dialog.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_dialog.c 24 Nov 2006 11:09:56 -0000 1.4 *************** *** 811,817 **** if (!RoadMapDialogCurrent) { /* Grab pointer hooks */ ! roadmap_pointer_register_pressed (ssd_dialog_pressed); ! roadmap_pointer_register_short_click (ssd_dialog_short_click); ! roadmap_pointer_register_long_click (ssd_dialog_long_click); } --- 811,820 ---- if (!RoadMapDialogCurrent) { /* Grab pointer hooks */ ! roadmap_pointer_register_pressed ! (ssd_dialog_pressed, POINTER_HIGHEST); ! roadmap_pointer_register_short_click ! (ssd_dialog_short_click, POINTER_HIGHEST); ! roadmap_pointer_register_long_click ! (ssd_dialog_long_click, POINTER_HIGHEST); } |
