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: Ehud S. <esh...@us...> - 2007-01-22 17:02:49
|
Update of /cvsroot/roadmap/roadmap_editor/src/ssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11152 Modified Files: ssd_dialog.c ssd_keyboard.c ssd_menu.c ssd_widget.h Log Message: Various fixes for RC4. Index: ssd_keyboard.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_keyboard.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_keyboard.c 7 Jan 2007 10:19:00 -0000 1.4 --- ssd_keyboard.c 22 Jan 2007 17:02:45 -0000 1.5 *************** *** 97,101 **** SSD_KEYBOARD_LETTERS, SSD_KEYBOARD_MULTI, ! "×1×2×3×4×5×6×7×8×9×0××××××× ×ס-×¢\"פףצץקקר:ש,ת.||", SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE | SSD_KEY_SWITCH, NULL, --- 97,101 ---- SSD_KEYBOARD_LETTERS, SSD_KEYBOARD_MULTI, ! "×1×2×3×4×5×6×7×8×9×0××××××× ×ס-×¢\"פףצץק'ר:ש,ת.||", SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE | SSD_KEY_SWITCH, NULL, Index: ssd_widget.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_widget.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_widget.h 7 Jan 2007 10:19:00 -0000 1.4 --- ssd_widget.h 22 Jan 2007 17:02:45 -0000 1.5 *************** *** 49,53 **** /* Dialogs */ ! #define SSD_DIALOG_FLOAT 0x10000 /* Container flags */ --- 49,54 ---- /* Dialogs */ ! #define SSD_DIALOG_FLOAT 0x10000 ! #define SSD_DIALOG_TRANSPARENT 0x20000 /* Container flags */ Index: ssd_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_dialog.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ssd_dialog.c 7 Jan 2007 10:19:00 -0000 1.5 --- ssd_dialog.c 22 Jan 2007 17:02:45 -0000 1.6 *************** *** 857,861 **** RoadMapDialogCurrent = dialog; ! if (!RoadMapScreenFrozen && !(dialog->container->flags & SSD_DIALOG_FLOAT)) { roadmap_start_screen_refresh (0); RoadMapScreenFrozen = 1; --- 857,862 ---- RoadMapDialogCurrent = dialog; ! if (!RoadMapScreenFrozen && ! !(dialog->container->flags & (SSD_DIALOG_FLOAT|SSD_DIALOG_TRANSPARENT))) { roadmap_start_screen_refresh (0); RoadMapScreenFrozen = 1; *************** *** 902,906 **** dialog = RoadMapDialogCurrent; while (dialog) { ! if ( !(dialog->container->flags & SSD_DIALOG_FLOAT)) { ssd_dialog_draw (); return; --- 903,908 ---- dialog = RoadMapDialogCurrent; while (dialog) { ! if ( !(dialog->container->flags & ! (SSD_DIALOG_FLOAT|SSD_DIALOG_TRANSPARENT))) { ssd_dialog_draw (); return; Index: ssd_menu.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_menu.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_menu.c 7 Jan 2007 10:19:00 -0000 1.4 --- ssd_menu.c 22 Jan 2007 17:02:45 -0000 1.5 *************** *** 39,42 **** --- 39,49 ---- #include "ssd_menu.h" + static int close_button_callback (SsdWidget widget, const char *new_value) { + + ssd_dialog_hide_current (); + return 0; + } + + static int button_callback (SsdWidget widget, const char *new_value) { *************** *** 80,88 **** ! static void ssd_menu_new (const char *name, ! const char *items_file, ! const char *items[], ! const RoadMapAction *actions, ! int flags) { int i; --- 87,95 ---- ! static SsdWidget ssd_menu_new (const char *name, ! const char *items_file, ! const char *items[], ! const RoadMapAction *actions, ! int flags) { int i; *************** *** 96,104 **** if (flags & SSD_DIALOG_FLOAT) { ! container = ssd_container_new (name, NULL, SSD_MAX_SIZE, ! SSD_MIN_SIZE, 0); ssd_widget_set_size (dialog, SSD_MIN_SIZE, SSD_MIN_SIZE); ssd_widget_set_color (dialog, "#000000", "#ffffffaa"); ssd_widget_set_color (container, "#000000", NULL); } else { container = ssd_container_new (name, NULL, SSD_MAX_SIZE, SSD_MAX_SIZE, --- 103,118 ---- if (flags & SSD_DIALOG_FLOAT) { ! container = ssd_container_new (name, NULL, SSD_MAX_SIZE, SSD_MIN_SIZE, 0); ssd_widget_set_size (dialog, SSD_MIN_SIZE, SSD_MIN_SIZE); ssd_widget_set_color (dialog, "#000000", "#ffffffaa"); ssd_widget_set_color (container, "#000000", NULL); + + if (!(flags & SSD_CONTAINER_TITLE)) { + const char *close_icon[] = {"rm_quit"}; + + ssd_widget_add (container, + ssd_button_new ("close", "", close_icon, 1, + SSD_ALIGN_RIGHT, close_button_callback)); + } } else { container = ssd_container_new (name, NULL, SSD_MAX_SIZE, SSD_MAX_SIZE, *************** *** 168,171 **** --- 182,187 ---- ssd_widget_add (dialog, container); + + return dialog; } *************** *** 187,191 **** } ! ssd_menu_new (name, items_file, items, actions, flags); ssd_dialog_activate (name, NULL); --- 203,207 ---- } ! dialog = ssd_menu_new (name, items_file, items, actions, flags); ssd_dialog_activate (name, NULL); |
|
From: Ehud S. <esh...@us...> - 2007-01-22 17:02:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/skins/default In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10683 Modified Files: edit.png schema_day schema_night Log Message: Various fixes for RC4. Index: schema_day =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/skins/default/schema_day,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** schema_day 7 Jan 2007 09:44:51 -0000 1.1 --- schema_day 22 Jan 2007 17:01:53 -0000 1.2 *************** *** 3,28 **** Console.Foreground: black - Airports.Class: Area - Airports.Color: grey - Airports.Declutter: 4096 - Airports.Delta1: 0 - Airports.Thickness: 1 Freeways.Class: Road Freeways.Color: #000000 ! Freeways.Color1: #C63094 Freeways.Declutter: 2147483647 Freeways.Delta1: -2 ! Freeways.Freeways1: 0 ! Freeways.Freeways1: 0 ! Freeways.Freeways2: 0 ! Freeways.Thickness: 4 Highways.Class: Road Highways.Color: #000000 Highways.Color1: #FDBF6F ! Highways.Declutter: 1300 Highways.Delta1: -2 - Highways.Highways1: 0 - Highways.Highways1: 0 Highways.Thickness: 3 Hospitals.Class: Area Hospitals.Color: red --- 3,73 ---- Console.Foreground: black Freeways.Class: Road Freeways.Color: #000000 ! Freeways.Color1: #414182 Freeways.Declutter: 2147483647 Freeways.Delta1: -2 ! Freeways.Thickness: 6 ! Primary.Class: Road ! Primary.Color: #000000 ! Primary.Color1: #ae0a34 ! Primary.Declutter: 2147483647 ! Primary.Delta1: -2 ! Primary.Thickness: 6 ! Secondary.Class: Road ! Secondary.Color: #000000 ! Secondary.Color1: #22632b ! Secondary.Declutter: 1500 ! Secondary.Delta1: -2 ! Secondary.Thickness: 5 ! Ramps.Class: Road ! Ramps.Color: #000000 ! Ramps.Color1: #1e7546 ! Ramps.Declutter: 160 ! Ramps.Delta1: -2 ! Ramps.Thickness: 3 Highways.Class: Road Highways.Color: #000000 Highways.Color1: #FDBF6F ! Highways.Declutter: 350 Highways.Delta1: -2 Highways.Thickness: 3 + Exit.Class: Road + Exit.Color: #000000 + Exit.Color1: #FDBF6F + Exit.Declutter: 350 + Exit.Delta1: -2 + Exit.Thickness: 3 + Streets.Class: Road + Streets.Color: #000000 + Streets.Color1: white + Streets.Declutter: 100 + Streets.Delta1: -2 + Streets.Thickness: 2 + Pedestrian.Class: Road + Pedestrian.Color: DarkGrey + Pedestrian.Declutter: 160 + Pedestrian.Delta1: 0 + Pedestrian.Thickness: 1 + 4X4 Trails.Class: Road + 4X4 Trails.Color: DarkGrey + 4X4 Trails.Declutter: 160 + 4X4 Trails.Delta1: 0 + 4X4 Trails.Thickness: 1 + Trails.Class: Road + Trails.Color: DarkGrey + Trails.Declutter: 160 + Trails.Delta1: 0 + Trails.Thickness: 1 + Walkway.Class: Road + Walkway.Color: DarkGrey + Walkway.Declutter: 160 + Walkway.Delta1: 0 + Walkway.Thickness: 1 + Airports.Class: Area + Airports.Color: grey + Airports.Declutter: 4096 + Airports.Delta1: 0 + Airports.Thickness: 1 Hospitals.Class: Area Hospitals.Color: red *************** *** 45,56 **** Parks.Delta1: 0 Parks.Thickness: 1 - Ramps.Class: Road - Ramps.Color: #000000 - Ramps.Color1: #1e7546 - Ramps.Declutter: 160 - Ramps.Delta1: -2 - Ramps.Ramps1: 0 - Ramps.Ramps1: 0 - Ramps.Thickness: 3 Rivers.Class: Feature Rivers.Color: LightBlue --- 90,93 ---- *************** *** 73,87 **** Stations.Delta1: 0 Stations.Thickness: 1 - Streets.Class: Road - Streets.Color: #000000 - Streets.Color1: white - Streets.Declutter: 160 - Streets.Delta1: -2 - Streets.Streets1: 0 - Streets.Streets1: 0 - Streets.Thickness: 2 - Trails.Class: Road - Trails.Color: DarkGrey - Trails.Declutter: 160 - Trails.Delta1: 0 - Trails.Thickness: 1 --- 110,111 ---- Index: schema_night =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/skins/default/schema_night,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** schema_night 7 Jan 2007 09:44:51 -0000 1.1 --- schema_night 22 Jan 2007 17:01:53 -0000 1.2 *************** *** 3,88 **** Console.Foreground: navy ! Streets.Streets1: 0 ! Highways.Highways1: 0 ! Ramps.Ramps1: 0 ! Freeways.Freeways2: 0 Freeways.Freeways2: 0 Ramps.Ramps1: 0 Highways.Highways1: 0 Streets.Streets1: 0 Trails.Delta1: 0 ! Parks.Delta1: 0 ! Hospitals.Delta1: 0 Airports.Delta1: 0 ! Stations.Delta1: 0 Malls.Delta1: 0 ! Shore.Delta1: 0 Rivers.Delta1: 0 ! Lakes.Delta1: 0 Sea.Delta1: 0 Sea.Thickness: 1 - Sea.Declutter: 2147483647 - Sea.Color: SlateBlue - Sea.Class: Area - Parks.Thickness: 1 - Parks.Declutter: 4096 - Parks.Color: #afcf94 - Parks.Class: Area - Lakes.Thickness: 1 - Lakes.Declutter: 1300 - Lakes.Color: #9cb2ce - Lakes.Class: Area - Stations.Thickness: 1 - Stations.Declutter: 4096 - Stations.Color: grey - Stations.Class: Area - Airports.Thickness: 1 - Airports.Declutter: 4096 - Airports.Color: grey - Airports.Class: Area - Malls.Thickness: 1 - Malls.Declutter: 4096 - Malls.Color: yellow - Malls.Class: Area - Hospitals.Thickness: 1 - Hospitals.Declutter: 4096 - Hospitals.Color: red - Hospitals.Class: Area - Shore.Thickness: 2 - Shore.Declutter: 2147483647 - Shore.Color: LightSlateBlue Shore.Class: Feature ! Rivers.Thickness: 3 ! Rivers.Declutter: 300 ! Rivers.Color: #9cb2ce ! Rivers.Class: Feature ! Trails.Thickness: 1 ! Trails.Declutter: 160 ! Trails.Color: #a5968d ! Trails.Class: Road ! Streets.Thickness: 2 ! Streets.Declutter: 160 ! Streets.Delta1: -2 ! Streets.Color1: #c0ccda ! Streets.Color: #a0a0a0 ! Streets.Class: Road ! Highways.Thickness: 3 ! Highways.Declutter: 1300 ! Highways.Delta1: -2 ! Highways.Color1: #e9900c ! Highways.Color: #b0b0b0 ! Highways.Class: Road ! Ramps.Thickness: 3 ! Ramps.Declutter: 160 ! Ramps.Delta1: -2 ! Ramps.Color1: #3ea903 ! Ramps.Color: #ad8e21 ! Ramps.Class: Road ! Freeways.Thickness: 4 ! Freeways.Declutter: 2147483647 ! Freeways.Delta2: 1 ! Freeways.Color2: #000000 ! Freeways.Delta1: -2 ! Freeways.Color1: #dd4fff ! Freeways.Color: #ad8e21 ! Freeways.Class: Road --- 3,83 ---- Console.Foreground: navy ! Freeways.Class: Road ! Freeways.Color1: #dd4fff ! Freeways.Color2: #000000 ! Freeways.Color: #ad8e21 ! Freeways.Declutter: 2147483647 ! Freeways.Delta1: -2 ! Freeways.Delta2: 1 Freeways.Freeways2: 0 + Freeways.Thickness: 4 + Ramps.Class: Road + Ramps.Color1: #3ea903 + Ramps.Color: #ad8e21 + Ramps.Declutter: 160 + Ramps.Delta1: -2 Ramps.Ramps1: 0 + Ramps.Thickness: 3 + Highways.Class: Road + Highways.Color1: #e9900c + Highways.Color: #b0b0b0 + Highways.Declutter: 1300 + Highways.Delta1: -2 Highways.Highways1: 0 + Highways.Thickness: 3 + Streets.Class: Road + Streets.Color1: #c0ccda + Streets.Color: #a0a0a0 + Streets.Declutter: 160 + Streets.Delta1: -2 Streets.Streets1: 0 + Streets.Thickness: 2 + Trails.Class: Road + Trails.Color: #a5968d + Trails.Declutter: 160 Trails.Delta1: 0 ! Trails.Thickness: 1Airports.Class: Area ! Airports.Color: grey ! Airports.Declutter: 4096 Airports.Delta1: 0 ! Airports.Thickness: 1 ! Hospitals.Class: Area ! Hospitals.Color: red ! Hospitals.Declutter: 4096 ! Hospitals.Delta1: 0 ! Hospitals.Thickness: 1 ! Lakes.Class: Area ! Lakes.Color: #9cb2ce ! Lakes.Declutter: 1300 ! Lakes.Delta1: 0 ! Lakes.Thickness: 1 ! Malls.Class: Area ! Malls.Color: yellow ! Malls.Declutter: 4096 Malls.Delta1: 0 ! Malls.Thickness: 1 ! Parks.Class: Area ! Parks.Color: #afcf94 ! Parks.Declutter: 4096 ! Parks.Delta1: 0 ! Parks.Thickness: 1 ! Rivers.Class: Feature ! Rivers.Color: #9cb2ce ! Rivers.Declutter: 300 Rivers.Delta1: 0 ! Rivers.Thickness: 3 ! Sea.Class: Area ! Sea.Color: SlateBlue ! Sea.Declutter: 2147483647 Sea.Delta1: 0 Sea.Thickness: 1 Shore.Class: Feature ! Shore.Color: LightSlateBlue ! Shore.Declutter: 2147483647 ! Shore.Delta1: 0 ! Shore.Thickness: 2 ! Stations.Class: Area ! Stations.Color: grey ! Stations.Declutter: 4096 ! Stations.Delta1: 0 ! Stations.Thickness: 1 Index: edit.png =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/skins/default/edit.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjr2iAm and /tmp/cvs6wHO3f differ |
|
From: Ehud S. <esh...@us...> - 2007-01-22 17:00:39
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10166 Modified Files: editor_main.c Log Message: Bump version to RC4. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** editor_main.c 7 Jan 2007 10:14:02 -0000 1.22 --- editor_main.c 22 Jan 2007 17:00:35 -0000 1.23 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 rc2"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 rc4"; void editor_main_check_map (void) { |
|
From: Ehud S. <esh...@us...> - 2007-01-22 16:59:40
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/track In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9699 Modified Files: editor_track_known.c editor_track_main.c editor_track_util.c Log Message: Various fixes for RC4. Index: editor_track_util.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_util.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** editor_track_util.c 8 Oct 2006 20:02:46 -0000 1.14 --- editor_track_util.c 22 Jan 2007 16:59:32 -0000 1.15 *************** *** 668,672 **** if (roadmap_fuzzy_is_acceptable (*best) && ! !previous_street->opposite_street_direction) return count; /* search for a line in the opposite direction */ --- 668,673 ---- if (roadmap_fuzzy_is_acceptable (*best) && ! (!previous_street->valid || ! !previous_street->opposite_street_direction)) return count; /* search for a line in the opposite direction */ Index: editor_track_known.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_known.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** editor_track_known.c 15 Oct 2006 10:52:04 -0000 1.8 --- editor_track_known.c 22 Jan 2007 16:59:32 -0000 1.9 *************** *** 360,364 **** } ! if ((new_street->line_direction == confirmed_street->line_direction) && ((current_fuzzy >= before) || roadmap_fuzzy_is_certain(current_fuzzy))) { --- 360,365 ---- } ! if (current_fuzzy && ! (new_street->line_direction == confirmed_street->line_direction) && ((current_fuzzy >= before) || roadmap_fuzzy_is_certain(current_fuzzy))) { *************** *** 448,453 **** if (roadmap_fuzzy_is_good (result)) { ! if (roadmap_plugin_same_line (&confirmed_line->line, ! &RoadMapNeighbourhood[i].line)) { if (result < best) { --- 449,455 ---- if (roadmap_fuzzy_is_good (result)) { ! if (confirmed_street->valid && ! roadmap_plugin_same_line (&confirmed_line->line, ! &RoadMapNeighbourhood[i].line)) { if (result < best) { *************** *** 472,479 **** KnownCandidates[KnownCandidatesCount].count = 1; ! KnownCandidatesCount++; ! if (KnownCandidatesCount == MAX_PATHS) { ! roadmap_log (ROADMAP_ERROR, "ResolveCandidates - Reached max entries!"); ! break; } } --- 474,481 ---- KnownCandidates[KnownCandidatesCount].count = 1; ! KnownCandidatesCount++; ! if (KnownCandidatesCount == MAX_PATHS) { ! roadmap_log (ROADMAP_ERROR, "ResolveCandidates - Reached max entries!"); ! break; } } Index: editor_track_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** editor_track_main.c 7 Jan 2007 10:14:02 -0000 1.18 --- editor_track_main.c 22 Jan 2007 16:59:32 -0000 1.19 *************** *** 277,281 **** } ! line_id = create_new_line (0, end_point, -1, end_node.id, 4); if (road_type == ED_LINE_CONNECTION) { --- 277,282 ---- } ! line_id = create_new_line (0, end_point, -1, end_node.id, ! ROADMAP_ROAD_STREET); if (road_type == ED_LINE_CONNECTION) { *************** *** 472,477 **** } ! create_new_line ! (start_point, end_point, cur_node.id, cur_node.id, 4); start_point = end_point; --- 473,478 ---- } ! create_new_line (start_point, end_point, cur_node.id, cur_node.id, ! ROADMAP_ROAD_STREET); start_point = end_point; *************** *** 501,506 **** if ((i < (count -1)) || (start_point != (end_point -1))) { ! int line_id = ! create_new_line (start_point, end_point, -1, end_node_id, 4); if ((line_id != -1) && ((type == TRACK_ROAD_CONNECTION) || !EditorAllowNewRoads)) { --- 502,507 ---- if ((i < (count -1)) || (start_point != (end_point -1))) { ! int line_id = create_new_line (start_point, end_point, -1, ! end_node_id, ROADMAP_ROAD_STREET); if ((line_id != -1) && ((type == TRACK_ROAD_CONNECTION) || !EditorAllowNewRoads)) { |
|
From: Ehud S. <esh...@us...> - 2007-01-22 16:57:50
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8484 Modified Files: lang roadmap_address_ssd.c roadmap_dictionary.c roadmap_download.c roadmap_layer.c roadmap_screen_obj.c roadmap_start.c roadmap_street.c Log Message: Various fixes for RC4. Index: lang =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/lang,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lang 7 Jan 2007 10:01:12 -0000 1.7 --- lang 22 Jan 2007 16:56:55 -0000 1.8 *************** *** 82,90 **** Info=××××¢ Road type=ס×× ××××ש ! Freeways=××× ×¢×ר×× × Ramps=××××£ Highways=ר××× ×¨××©× Streets=ר××× ××©× × Trails=×××ש עפר Error downloading map update=×¢×××× ×××¤× × ×ש×. ×× × ×××× ×©×××ש×ר ××××ר ×רשת ×××× ××¨× ×. No city with that name could be found=×× × ××ª× ××צ×× ×¢×ר ××©× ××. --- 82,96 ---- Info=××××¢ Road type=ס×× ××××ש ! Freeways=×××ש ×××ר ! Primary=××× ×¢×ר×× × ! Secondary=××× ×¢×ר×× × ××©× × Ramps=××××£ Highways=ר××× ×¨××©× + Exit=×צ××× ××××ש ר××©× Streets=ר××× ××©× × + Pedestrian=××ר××× + 4X4 Trails=××¨× 4X4 Trails=×××ש עפר + Walkway=××××ת Error downloading map update=×¢×××× ×××¤× × ×ש×. ×× × ×××× ×©×××ש×ר ××××ר ×רשת ×××× ××¨× ×. No city with that name could be found=×× × ××ª× ××צ×× ×¢×ר ××©× ××. Index: roadmap_street.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_street.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_street.c 7 Jan 2007 10:01:12 -0000 1.12 --- roadmap_street.c 22 Jan 2007 16:56:55 -0000 1.13 *************** *** 557,560 **** --- 557,561 ---- static int current_mask_city = -1; + static int current_mask_fips = -1; static RoadMapDictionaryMask mask; int i; *************** *** 562,566 **** int range_count = RoadMapRangeActive->RoadMapByStreetCount; ! if (current_mask_city == city) return mask; if (mask) roadmap_dictionary_mask_free (mask); --- 563,568 ---- int range_count = RoadMapRangeActive->RoadMapByStreetCount; ! if ((current_mask_city == city) && ! (current_mask_fips == roadmap_locator_active ())) return mask; if (mask) roadmap_dictionary_mask_free (mask); *************** *** 596,599 **** --- 598,603 ---- } + current_mask_city = city; + current_mask_fips = roadmap_locator_active (); return mask; } Index: roadmap_download.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** roadmap_download.c 7 Jan 2007 10:01:12 -0000 1.14 --- roadmap_download.c 22 Jan 2007 16:56:55 -0000 1.15 *************** *** 52,56 **** ! #define ROADMAP_FILE_NAME_FORMAT "usc%05d.rdm" --- 52,56 ---- ! #define ROADMAP_FILE_NAME_FORMAT "usc%05d.rdm.gz" *************** *** 1021,1025 **** ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/dev1/" ROADMAP_FILE_NAME_FORMAT, NULL); --- 1021,1025 ---- ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/dev3/" ROADMAP_FILE_NAME_FORMAT, NULL); Index: roadmap_address_ssd.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address_ssd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_address_ssd.c 7 Jan 2007 10:01:12 -0000 1.2 --- roadmap_address_ssd.c 22 Jan 2007 16:56:55 -0000 1.3 *************** *** 76,79 **** --- 76,80 ---- void *data; const char *city; + char *prefix; } RoadMapAddressSearch; *************** *** 227,230 **** --- 228,234 ---- ssd_dialog_set_value ("input", str); + str[strlen(str) - 1] = '\0'; + search->prefix = strdup(str); + return 1; } *************** *** 255,258 **** --- 259,269 ---- } else { title = roadmap_lang_get ("Street"); + if (search->prefix && !strcmp(search->prefix, new_value)) { + ssd_dialog_set_value ("input", ""); + + free (search->prefix); + search->prefix = NULL; + return 0; + } } *************** *** 406,409 **** --- 417,421 ---- context->data = data; context->city = city; + context->prefix = NULL; if (!context->city) { Index: roadmap_layer.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_layer.c 7 Jan 2007 10:01:12 -0000 1.6 --- roadmap_layer.c 22 Jan 2007 16:56:55 -0000 1.7 *************** *** 357,360 **** --- 357,362 ---- category->pen_count > 1); + if (thickness > 40) thickness = 40; + roadmap_plugin_adjust_layer (i, thickness, category->pen_count); /* As a matter of taste, I do dislike roads with a filler Index: roadmap_dictionary.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dictionary.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_dictionary.c 7 Jan 2007 10:01:12 -0000 1.4 --- roadmap_dictionary.c 22 Jan 2007 16:56:55 -0000 1.5 *************** *** 728,739 **** roadmap_dictionary_build_substrees (dictionary); } ! subtrees_count = dictionary->subtrees_count; ! subtree_str[0] = ' '; ! strncpy(subtree_str + 1, str, sizeof(subtree_str) - 2); ! subtree_str[sizeof(subtree_str)-1] = '\0'; } for (subtree_index = -1; subtree_index < subtrees_count; subtree_index++) { int status; itr = str; --- 728,743 ---- roadmap_dictionary_build_substrees (dictionary); } ! ! if (strlen(str)) { ! subtrees_count = dictionary->subtrees_count; ! subtree_str[0] = ' '; ! strncpy(subtree_str + 1, str, sizeof(subtree_str) - 2); ! subtree_str[sizeof(subtree_str)-1] = '\0'; ! } } for (subtree_index = -1; subtree_index < subtrees_count; subtree_index++) { int status; + int subtree_start_pos; itr = str; *************** *** 744,747 **** --- 748,752 ---- cursor.tree_index = dictionary->subtrees[subtree_index]; cursor.position = (dictionary->tree + cursor.tree_index)->position; + subtree_start_pos = cursor.position; } *************** *** 769,773 **** if (((subtree_index == -1) && !strncmp (str, name, strlen(str))) || ! ((subtree_index != -1) && strstr (name, subtree_str))) { RoadMapString string; --- 774,780 ---- if (((subtree_index == -1) && !strncmp (str, name, strlen(str))) || ! ((subtree_index != -1) && ! !strncmp (name + subtree_start_pos, subtree_str, ! strlen(subtree_str)))) { RoadMapString string; *************** *** 782,792 **** continue; - } ! if (subtree_index != -1) { /* Make sure that this path really leads to strings which match */ struct roadmap_dictionary_tree *tree = dictionary->tree + cursor.tree_index; - RoadMapString string; while ((dictionary->reference[tree->first].type & 0x0f) == --- 789,799 ---- continue; ! } else { ! /* Make sure that this path really leads to strings which match */ + const char *name; struct roadmap_dictionary_tree *tree = dictionary->tree + cursor.tree_index; while ((dictionary->reference[tree->first].type & 0x0f) == *************** *** 803,810 **** } ! string = dictionary->reference[tree->first].index; ! if (!strstr(roadmap_dictionary_get (dictionary, string), ! subtree_str)) { continue; } --- 810,820 ---- } ! name = roadmap_dictionary_get ! (dictionary, dictionary->reference[tree->first].index); ! if (((subtree_index == -1) && strncmp (str, name, strlen(str))) || ! ((subtree_index != -1) && ! strncmp(name + subtree_start_pos, subtree_str, ! strlen(subtree_str)))) { continue; } Index: roadmap_screen_obj.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen_obj.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roadmap_screen_obj.c 24 Nov 2006 11:10:52 -0000 1.9 --- roadmap_screen_obj.c 22 Jan 2007 16:56:55 -0000 1.10 *************** *** 45,48 **** --- 45,49 ---- #include "roadmap_pointer.h" #include "roadmap_res.h" + #include "roadmap_sound.h" #include "roadmap_screen_obj.h" *************** *** 528,531 **** --- 529,542 ---- if (object->action) { + static RoadMapSoundList list; + + if (!list) { + list = roadmap_sound_list_create (SOUND_LIST_NO_FREE); + roadmap_sound_list_add (list, "click.wav"); + roadmap_res_get (RES_SOUND, 0, "click.wav"); + } + + roadmap_sound_play_list (list); + (*(object->action->callback)) (); } *************** *** 537,540 **** --- 548,552 ---- static int roadmap_screen_obj_long_click (RoadMapGuiPoint *point) { + static RoadMapSoundList list; RoadMapScreenObj object = RoadMapScreenObjSelected; *************** *** 545,552 **** --- 557,572 ---- RoadMapScreenObjSelected = NULL; + if (!list) { + list = roadmap_sound_list_create (SOUND_LIST_NO_FREE); + roadmap_sound_list_add (list, "click_long.wav"); + roadmap_res_get (RES_SOUND, 0, "click_long.wav"); + } + if (object->long_action) { + roadmap_sound_play_list (list); (*(object->long_action->callback)) (); } else if (object->action) { + roadmap_sound_play_list (list); (*(object->action->callback)) (); } Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** roadmap_start.c 7 Jan 2007 10:01:12 -0000 1.34 --- roadmap_start.c 22 Jan 2007 16:56:55 -0000 1.35 *************** *** 824,828 **** #ifdef SSD ssd_menu_activate ("Main Menu", "quick", RoadMapStartQuickMenu, NULL, ! RoadMapStartActions, SSD_CONTAINER_BORDER|SSD_CONTAINER_TITLE); #else if (QuickMenu == NULL) { --- 824,829 ---- #ifdef SSD ssd_menu_activate ("Main Menu", "quick", RoadMapStartQuickMenu, NULL, ! RoadMapStartActions, ! SSD_CONTAINER_BORDER|SSD_CONTAINER_TITLE|SSD_DIALOG_TRANSPARENT); #else if (QuickMenu == NULL) { |
|
From: Ehud S. <esh...@us...> - 2007-01-07 21:36:16
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15891 Modified Files: roadmap_main.cpp roadmap_net.c Log Message: Fix valgrind errors. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** roadmap_main.cpp 7 Jan 2007 10:24:18 -0000 1.25 --- roadmap_main.cpp 7 Jan 2007 21:36:12 -0000 1.26 *************** *** 197,201 **** roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { --- 197,201 ---- roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0", NULL); if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { *************** *** 883,887 **** ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); #else style |= WS_OVERLAPPEDWINDOW; --- 883,887 ---- ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0", NULL); #else style |= WS_OVERLAPPEDWINDOW; *************** *** 1400,1404 **** if (roadmap_dialog_activate ("Setup wizard", NULL)) { ! roadmap_config_declare ("preferences", &RoadMapConfigUser, ""); roadmap_config_declare_password ("preferences", &RoadMapConfigPassword, ""); roadmap_dialog_new_label ("main", ".Welcome to FreeMap!"); --- 1400,1404 ---- if (roadmap_dialog_activate ("Setup wizard", NULL)) { ! roadmap_config_declare ("preferences", &RoadMapConfigUser, "", NULL); roadmap_config_declare_password ("preferences", &RoadMapConfigPassword, ""); roadmap_dialog_new_label ("main", ".Welcome to FreeMap!"); Index: roadmap_net.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_net.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_net.c 14 Oct 2006 09:19:01 -0000 1.5 --- roadmap_net.c 7 Jan 2007 21:36:12 -0000 1.6 *************** *** 133,136 **** --- 133,137 ---- } + free(hostname); return fd; |
|
From: Ehud S. <esh...@us...> - 2007-01-07 21:35:34
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15476 Modified Files: navigate_instr.c Log Message: Fix destination detection. Index: navigate_instr.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_instr.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** navigate_instr.c 9 Aug 2006 07:35:19 -0000 1.5 --- navigate_instr.c 7 Jan 2007 21:35:27 -0000 1.6 *************** *** 375,379 **** result = ! roadmap_plugin_calc_length (position, &segment->line, &total_length); if (type == LINE_START) { --- 375,383 ---- result = ! roadmap_math_calc_line_length (position, ! &segment->from_pos, &segment->to_pos, ! segment->first_shape, segment->last_shape, ! segment->shape_itr, ! &total_length); if (type == LINE_START) { |
|
From: Ehud S. <esh...@us...> - 2007-01-07 21:34:43
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15063 Modified Files: roadmap_gps.c roadmap_math.c roadmap_math.h roadmap_plugin.c roadmap_screen.h roadmap_types.h Log Message: Fix valgrind errors. Index: roadmap_math.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_math.h 17 Jul 2006 06:29:37 -0000 1.8 --- roadmap_math.h 7 Jan 2007 21:34:40 -0000 1.9 *************** *** 144,147 **** --- 144,155 ---- void roadmap_math_get_context (RoadMapPosition *position, int *zoom); + int roadmap_math_calc_line_length (const RoadMapPosition *position, + const RoadMapPosition *from_pos, + const RoadMapPosition *to_pos, + int first_shape, + int last_shape, + RoadMapShapeItr shape_itr, + int *total_length); + #endif // INCLUDED__ROADMAP_MATH__H Index: roadmap_gps.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roadmap_gps.c 7 Jan 2007 10:01:12 -0000 1.15 --- roadmap_gps.c 7 Jan 2007 21:34:40 -0000 1.16 *************** *** 641,645 **** if (!source_item) { roadmap_config_declare ! ("preferences", &RoadMapConfigGPSSource, "COM1:"); } --- 641,645 ---- if (!source_item) { roadmap_config_declare ! ("preferences", &RoadMapConfigGPSSource, "COM1:", NULL); } Index: roadmap_types.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_types.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_types.h 7 Jan 2007 10:01:13 -0000 1.4 --- roadmap_types.h 7 Jan 2007 21:34:40 -0000 1.5 *************** *** 51,54 **** --- 51,55 ---- } RoadMapArea; + typedef void (*RoadMapShapeItr) (int shape, RoadMapPosition *position); /* The cfcc category codes: */ Index: roadmap_math.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_math.c 7 Jan 2007 10:01:12 -0000 1.12 --- roadmap_math.c 7 Jan 2007 21:34:40 -0000 1.13 *************** *** 1708,1709 **** --- 1708,1776 ---- } + + int roadmap_math_calc_line_length (const RoadMapPosition *position, + const RoadMapPosition *from_pos, + const RoadMapPosition *to_pos, + int first_shape, + int last_shape, + RoadMapShapeItr shape_itr, + int *total_length) { + + RoadMapPosition from; + RoadMapPosition to; + RoadMapPosition intersection; + int current_length = 0; + int length_result = 0; + int smallest_distance = 0x7fffffff; + int distance; + int i; + + if (first_shape <= -1) { + + from = *from_pos; + to = *to_pos; + } else { + + from = *from_pos; + to = *from_pos; + + for (i = first_shape; i <= last_shape; i++) { + + shape_itr (i, &to); + + distance = + roadmap_math_get_distance_from_segment + (position, &from, &to, &intersection, NULL); + + if (distance < smallest_distance) { + smallest_distance = distance; + length_result = current_length + + roadmap_math_distance (&from, &intersection); + } + + current_length += roadmap_math_distance (&from, &to); + from = to; + } + + to = *to_pos; + } + + distance = + roadmap_math_get_distance_from_segment + (position, &from, &to, &intersection, NULL); + + if (distance < smallest_distance) { + + length_result = current_length + + roadmap_math_distance (&from, &intersection); + } + + current_length += roadmap_math_distance (&from, &to); + + if (total_length) *total_length = current_length; + + return length_result; + } + + + Index: roadmap_plugin.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_plugin.c 9 Aug 2006 07:10:57 -0000 1.7 --- roadmap_plugin.c 7 Jan 2007 21:34:40 -0000 1.8 *************** *** 559,619 **** int last_shape; RoadMapShapeItr shape_itr; - RoadMapPosition from; - RoadMapPosition to; - RoadMapPosition intersection; - int current_length = 0; - int length_result = 0; - int smallest_distance = 0x7fffffff; - int distance; - int i; roadmap_plugin_get_line_points (line, &line_from_pos, &line_to_pos, &first_shape, &last_shape, &shape_itr); ! if (first_shape <= -1) { ! ! from = line_from_pos; ! to = line_to_pos; ! } else { ! ! from = line_from_pos; ! to = line_from_pos; ! ! for (i = first_shape; i <= last_shape; i++) { ! ! shape_itr (i, &to); ! ! distance = ! roadmap_math_get_distance_from_segment ! (position, &from, &to, &intersection, NULL); ! ! if (distance < smallest_distance) { ! smallest_distance = distance; ! length_result = current_length + ! roadmap_math_distance (&from, &intersection); ! } ! ! current_length += roadmap_math_distance (&from, &to); ! from = to; ! } ! ! to = line_to_pos; ! } ! ! distance = ! roadmap_math_get_distance_from_segment ! (position, &from, &to, &intersection, NULL); ! ! if (distance < smallest_distance) { ! ! length_result = current_length + ! roadmap_math_distance (&from, &intersection); ! } ! ! current_length += roadmap_math_distance (&from, &to); ! ! if (total_length) *total_length = current_length; ! ! return length_result; } --- 559,569 ---- int last_shape; RoadMapShapeItr shape_itr; roadmap_plugin_get_line_points (line, &line_from_pos, &line_to_pos, &first_shape, &last_shape, &shape_itr); ! return roadmap_math_calc_line_length (position, &line_from_pos, &line_to_pos, ! first_shape, last_shape, shape_itr, ! total_length); } Index: roadmap_screen.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_screen.h 18 Aug 2006 17:32:44 -0000 1.8 --- roadmap_screen.h 7 Jan 2007 21:34:40 -0000 1.9 *************** *** 67,71 **** typedef void (*RoadMapScreenSubscriber) (void); - typedef void (*RoadMapShapeItr) (int shape, RoadMapPosition *position); RoadMapScreenSubscriber roadmap_screen_subscribe_after_refresh --- 67,70 ---- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:52:21
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20205 Modified Files: Tag: BR-0_8_X buildmap_postgres.c Log Message: Add support for prefixes and the new road layers. Index: buildmap_postgres.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_postgres.c,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** buildmap_postgres.c 12 Oct 2006 17:58:31 -0000 1.13 --- buildmap_postgres.c 7 Jan 2007 10:52:17 -0000 1.13.2.1 *************** *** 68,72 **** /* ROADS */ ! static const char *roads_sql = "SELECT segments.id AS id, AsText(simplify(segments.the_geom, 0.00002)) AS the_geom, segments.road_type AS layer, segments.from_node AS from_node_id, segments.to_node AS to_node_id, streets.name AS street_name, streets.text2speech as text2speech, cities.name as city_name, fraddl, toaddl, fraddr, toaddr FROM segments LEFT JOIN streets ON segments.street_id = streets.id LEFT JOIN cities ON streets.city_id = cities.id WHERE segments.the_geom @ SetSRID ('BOX3D(34 29.2, 36.2 33.6)'::box3d, 4326);"; static const char *roads_route_sql = "SELECT segments.id AS id, segments.from_car_allowed AS from_car_allowed, segments.to_car_allowed AS to_car_allowed, segments.from_max_speed AS from_max_speed, segments.to_max_speed AS to_max_speed, segments.from_cross_time AS from_cross_time, segments.to_cross_time AS to_cross_time, segments.road_type AS layer FROM segments WHERE segments.the_geom @ SetSRID ('BOX3D(34 29.2, 36.2 33.6)'::box3d, 4326);"; static const char *country_borders_sql = "SELECT id AS id, AsText(simplify(the_geom, 0.00002)) AS the_geom FROM borders;"; --- 68,72 ---- /* ROADS */ ! static const char *roads_sql = "SELECT segments.id AS id, AsText(simplify(segments.the_geom, 0.00002)) AS the_geom, segments.road_type AS layer, segments.from_node AS from_node_id, segments.to_node AS to_node_id, street_types.name, streets.name AS street_name, streets.text2speech as text2speech, cities.name as city_name, fraddl, toaddl, fraddr, toaddr FROM segments LEFT JOIN streets ON segments.street_id = streets.id LEFT JOIN cities ON streets.city_id = cities.id LEFT JOIN street_types ON street_types.id = streets.type WHERE segments.the_geom @ SetSRID ('BOX3D(34 29.2, 36.2 33.6)'::box3d, 4326);"; static const char *roads_route_sql = "SELECT segments.id AS id, segments.from_car_allowed AS from_car_allowed, segments.to_car_allowed AS to_car_allowed, segments.from_max_speed AS from_max_speed, segments.to_max_speed AS to_max_speed, segments.from_cross_time AS from_cross_time, segments.to_cross_time AS to_cross_time, segments.road_type AS layer FROM segments WHERE segments.the_geom @ SetSRID ('BOX3D(34 29.2, 36.2 33.6)'::box3d, 4326);"; static const char *country_borders_sql = "SELECT id AS id, AsText(simplify(the_geom, 0.00002)) AS the_geom FROM borders;"; *************** *** 104,110 **** case 1: return ROADMAP_ROAD_STREET; case 2: return ROADMAP_ROAD_MAIN; ! case 3: return ROADMAP_ROAD_FREEWAY; case 4: return ROADMAP_ROAD_RAMP; ! case 5: return ROADMAP_ROAD_TRAIL; } --- 104,117 ---- case 1: return ROADMAP_ROAD_STREET; case 2: return ROADMAP_ROAD_MAIN; ! case 3: ! case 6: ! case 7: ! return ROADMAP_ROAD_FREEWAY; case 4: return ROADMAP_ROAD_RAMP; ! case 5: ! case 8: ! case 9: ! case 10: ! return ROADMAP_ROAD_TRAIL; } *************** *** 268,271 **** --- 275,280 ---- int layer; int column = 0; + char street_name[255] = {0}; + char *prefix; buildmap_set_line (irec); *************** *** 290,300 **** fedirp = str2dict (DictionaryPrefix, ""); ! fename = ! str2dict (DictionaryStreet, PQgetvalue(db_result, irec, column++)); t2s = str2dict (DictionaryText2Speech, PQgetvalue(db_result, irec, column++)); ! fetype = str2dict (DictionaryPrefix, ""); ! fedirs = str2dict (DictionaryPrefix, ""); from_point = buildmap_point_add (frlong, frlat, from_node_id); --- 299,317 ---- fedirp = str2dict (DictionaryPrefix, ""); ! prefix = PQgetvalue(db_result, irec, column++); ! ! if (strlen(prefix)) { ! sprintf(street_name, "%s ", prefix); ! } ! ! strcat(street_name, PQgetvalue(db_result, irec, column++)); ! ! fename = str2dict (DictionaryStreet, street_name); ! t2s = str2dict (DictionaryText2Speech, PQgetvalue(db_result, irec, column++)); ! fetype = str2dict (DictionaryType, ""); ! fedirs = str2dict (DictionarySuffix, ""); from_point = buildmap_point_add (frlong, frlat, from_node_id); |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:51:17
|
Update of /cvsroot/roadmap/roadmap_editor/src/fribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19785 Modified Files: fribidi_config.h Log Message: Index: fribidi_config.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/fribidi/fribidi_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fribidi_config.h 21 Apr 2006 16:35:05 -0000 1.1 --- fribidi_config.h 7 Jan 2007 10:51:14 -0000 1.2 *************** *** 20,23 **** --- 20,24 ---- #define MEM_OPTIMIZED + #define HAS_FRIBIDI_TAB_CHAR_TYPE_2_I 1 #define HAS_FRIBIDI_TAB_CHAR_TYPE_9_I 1 |
Update of /cvsroot/roadmap/roadmap_editor/src/libfribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18519 Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README THANKS TODO aclocal.m4 bootstrap config.guess config.h.in config.sub configure configure.in depcomp fribidi-config.in fribidi.c fribidi.h fribidi.pc.in fribidi.spec fribidi.spec.in fribidi_benchmark.c fribidi_bidi_types.c fribidi_char_sets.c fribidi_char_sets.h fribidi_char_sets.i fribidi_char_sets_cap_rtl.c fribidi_char_sets_cap_rtl.h fribidi_char_sets_cp1255.c fribidi_char_sets_cp1255.h fribidi_char_sets_cp1256.c fribidi_char_sets_cp1256.h fribidi_char_sets_isiri_3342.c fribidi_char_sets_isiri_3342.h fribidi_char_sets_iso8859_6.c fribidi_char_sets_iso8859_6.h fribidi_char_sets_iso8859_8.c fribidi_char_sets_iso8859_8.h fribidi_char_sets_utf8.c fribidi_char_sets_utf8.h fribidi_char_type.c fribidi_config.h fribidi_config.h.in fribidi_create_char_types.c fribidi_create_mirroring.c fribidi_main.c fribidi_mem.c fribidi_mem.h fribidi_mirroring.c fribidi_tab_char_type_2.i fribidi_tab_char_type_9.i fribidi_tab_mirroring.i fribidi_types.c fribidi_types.h fribidi_types.i fribidi_unicode.h fribidi_utils.c getopt.c getopt.h getopt1.c getopt_int.h gettext.h install-sh ltmain.sh missing packtab.c packtab.h run.tests wcwidth.c wcwidth.i Log Message: Import a cleaned libfribidi (builds as a dll) --- NEW FILE: fribidi_config.h --- #define FRIBIDI_PACKAGE "fribidi" #define FRIBIDI_VERSION "0.10.7" #define FRIBIDI_MAJOR_VERSION 0 #define FRIBIDI_MINOR_VERSION 10 #define FRIBIDI_MICRO_VERSION 7 #define FRIBIDI_INTERFACE_VERSION 2 #if 0 /* FRIBIDI_NO_CHARSETS */ #define FRIBIDI_NO_CHARSETS 1 #else /* NOT FRIBIDI_NO_CHARSETS */ #undef FRIBIDI_NO_CHARSETS #endif /* FRIBIDI_NO_CHARSETS */ #define TOSTR(x) #x #ifdef WIN32 #ifdef FRIBIDI_EXPORTS #define FRIBIDI_API __declspec(dllexport) #else #define FRIBIDI_API __declspec(dllimport) #endif #define snprintf _snprintf #else /* NOT WIN32 */ #define FRIBIDI_API #endif /* WIN32 */ #define FRIBIDI_TRUE 1 #define FRIBIDI_FALSE 0 #ifndef TRUE #define TRUE FRIBIDI_TRUE #endif /* TRUE */ #ifndef FALSE #define FALSE FRIBIDI_FALSE #endif /* FALSE */ #define FRIBIDI_SIZEOF_SHORT 2 #define FRIBIDI_SIZEOF_INT 4 #define FRIBIDI_SIZEOF_LONG 4 --- NEW FILE: run.tests --- #!/bin/bash # run.tests - Check that the algorithm does what it is supposed to # Copyright (C) 1999,2000 Dov Grobgeld, and # Copyright (C) 2001,2002 Behdad Esfahbod. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either # version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License # along with this library, in a file named COPYING; if not, write to the # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307, USA # # For licensing issues, contact <do...@im...> and # <fw...@sh...>. if test -z "$srcdir"; then srcdir=. test "${VERBOSE+set}" != "set" && VERBOSE=yes fi # See how redirections should work. if test -z "$VERBOSE"; then exec > /dev/null 2>&1 fi path=`dirname $0` if ! test -f "./fribidi"; then echo "run.tests: you must make fribidi first" exit 1 fi TEST () { testcase="$1" test="${testcase##*/}" test="${test%.input}" charset="${testcase#*_}" charset="${charset%%_*}" echo -n "=== $test === " if ! ./fribidi --charset "$charset" </dev/null >/dev/null 2>&1; then echo " [Character set not supported]" return 0 fi ./fribidi --test --charset "$charset" "$testcase" > "$test.output" reference="${testcase%.input}.reference"; test -f "$reference" || reference="tests/${reference##*/}" if diff "$test.output" "$reference"; then rm "$test.output" echo " [Passed]" return 0 else echo " [Failed]" return 1 fi } retval=0 for testcase in "$path/tests/"test_*.input; do TEST "$testcase" || retval=1 done exit $retval --- NEW FILE: fribidi_create_char_types.c --- /* FriBidi - Library of BiDi algorithm * Copyright (C) 2001,2002 Behdad Esfahbod. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this library, in a file named COPYING; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA * * For licensing issues, contact <fw...@sh...>. */ #include <stdlib.h> #include <stdio.h> #include <string.h> #include "packtab.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "fribidi_unicode.h" static void err (const char *msg) { fprintf (stderr, "fribidi_create_char_types: %s\n", msg); exit (1); } static void err2 (const char *fmt, const char *p) { fprintf (stderr, "fribidi_create_char_types: "); fprintf (stderr, fmt, p); fprintf (stderr, "\n"); exit (1); } /* *INDENT-OFF* */ struct { const char *name; int key; } type_names[] = { {"LTR", 0}, {"L", 0}, {"RTL", 1}, {"R", 1}, {"AL", 2}, {"ON", 3}, {"BN", 4}, {"AN", 5}, {"BS", 6}, {"B", 6}, {"CS", 7}, {"EN", 8}, {"ES", 9}, {"ET", 10}, {"LRE", 11}, {"LRO", 12}, {"NSM", 13}, {"PDF", 14}, {"RLE", 15}, {"RLO", 16}, {"SS", 17}, {"S", 17}, {"WS", 18}, }; /* *INDENT-ON* */ #define type_names_count (sizeof (type_names) / sizeof (type_names[0])) static char *names[type_names_count]; static char *unidata_file; static char get_type (const char *s) { int i; for (i = 0; i < type_names_count; i++) if (!strcmp (s, type_names[i].name)) return type_names[i].key; err2 ("type name `%s' not found", s); return 0; } #define table_name "FriBidiPropertyBlock" #define key_type_name "FriBidiPropCharType" #define macro_name "FRIBIDI_GET_TYPE" #define function_name "fribidi_get_type_internal" #define char_type_name "FriBidiCharType" #define char_name "FriBidiChar" #define prop_to_type_name "fribidi_prop_to_type" #define default_type "LTR" #define export_api "FRIBIDI_API" static int table[FRIBIDI_UNICODE_CHARS]; static void init_table (void) { int i; register FriBidiChar c; int deftype = get_type (default_type), RTL = get_type ("RTL"), AL = get_type ("AL"), BN = get_type ("BN"); for (i = 0; i < type_names_count; i++) names[i] = 0; for (i = type_names_count - 1; i >= 0; i--) names[type_names[i].key] = type_names[i].name; /* initialize table */ for (c = 0; c < FRIBIDI_UNICODE_CHARS; c++) table[c] = deftype; for (c = 0x0590; c < 0x0600; c++) table[c] = RTL; for (c = 0x07C0; c < 0x0900; c++) table[c] = RTL; for (c = 0xFB1D; c < 0xFB50; c++) table[c] = RTL; for (c = 0x0600; c < 0x07C0; c++) table[c] = AL; for (c = 0xFB50; c < 0xFDD0; c++) table[c] = AL; for (c = 0xFDF0; c < 0xFE00; c++) table[c] = AL; for (c = 0xFE70; c < 0xFF00; c++) table[c] = AL; for (c = 0x2060; c < 0x2070; c++) table[c] = BN; for (c = 0xFDD0; c < 0xFDF0; c++) table[c] = BN; for (c = 0xFFF0; c < 0xFFF9; c++) table[c] = BN; for (c = 0xFFFF; c < FRIBIDI_UNICODE_CHARS; c += 0x10000) table[c - 1] = table[c] = BN; if (FRIBIDI_UNICODE_CHARS > 0x10000) { for (c = 0x10800; c < 0x11000; c++) table[c] = RTL; for (c = 0xE0000; c < 0xE1000; c++) table[c] = BN; } } static void read_unicode_data (void) { char s[500], tp[10]; unsigned int i; FILE *f; printf ("Reading `UnicodeData.txt'\n"); if (!(f = fopen (unidata_file, "rt"))) err2 ("error: cannot open `%s' for reading", unidata_file); while (fgets (s, sizeof s, f)) { sscanf (s, "%x;%*[^;];%*[^;];%*[^;];%[^;]", &i, tp); table[i] = get_type (tp); } fclose (f); } static char * headermacro (const char *file) { char *t = strdup (file); char *p = t; while (*p) { if (*p >= 'a' && *p <= 'z') *p += 'A' - 'a'; else if ((*p < 'A' || *p > 'Z') && (*p < '0' || *p > '9')) *p = '_'; p++; } return t; } static void write_char_type (const char *file, int max_depth) { int i; FILE *f; char *FILENAME = headermacro (file); printf ("Writing `%s', it may take a few minutes\n", file); if (!(f = fopen (file, "wt"))) err2 ("error: cannot open `%s' for writing", file); fprintf (f, "/*\n" " This file was automatically created from UnicodeData.txt version %s\n" " by fribidi_create_char_types\n*/\n\n", FRIBIDI_UNICODE_VERSION); fprintf (f, "#ifndef %s\n#define %s\n\n#include \"fribidi.h\"\n\n", FILENAME, FILENAME); for (i = 0; i < type_names_count; i++) if (names[i]) fprintf (f, "#define %s FRIBIDI_PROP_TYPE_%s\n", names[i], names[i]); fprintf (f, "\n"); fprintf (f, "#define PACKTAB_UINT8 fribidi_uint8\n"); fprintf (f, "#define PACKTAB_UINT16 fribidi_uint16\n"); fprintf (f, "#define PACKTAB_UINT32 fribidi_uint32\n"); if (!pack_table (table, FRIBIDI_UNICODE_CHARS, sizeof (char), max_depth, 3, names, key_type_name, table_name, macro_name, f)) err ("error: insufficient memory, decrease max_depth"); for (i = type_names_count - 1; i >= 0; i--) if (names[i]) fprintf (f, "#undef %s\n", names[i]); fprintf (f, "/*======================================================================\n" " * %s() returns the bidi type of a character.\n" " *----------------------------------------------------------------------*/\n" "%s %s\n" "%s (%s uch)\n" "{\n" " if (uch < 0x%x)\n" " return %s[(unsigned char)%s (uch)];\n" " else\n" " return FRIBIDI_TYPE_%s;\n" " /* Non-Unicode chars */\n" "}\n" "\n", function_name, export_api, char_type_name, function_name, char_name, FRIBIDI_UNICODE_CHARS, prop_to_type_name, macro_name, default_type); fprintf (f, "\n#endif /* %s */\n", FILENAME); fclose (f); } int main (int argc, char **argv) { int max_depth; char file[50], *p; if (argc < 2) err ("usage: fribidi_create_char_types max_depth [UnicodeData.txt path]"); p = (argc >= 3) ? argv[2] : "unidata"; unidata_file = malloc (50 + strlen (p)); sprintf (unidata_file, "%s/UnicodeData.txt", p); max_depth = atoi (argv[1]); if (!max_depth) err ("invalid depth"); if (max_depth < 2 || max_depth > 9) err2 ("invalid max_depth `%s', max_depth should be between 2 and 9", argv[1]); sprintf (file, "fribidi_tab_char_type_%d.i", max_depth); init_table (); read_unicode_data (); write_char_type (file, max_depth); return 0; } --- NEW FILE: configure.in --- AC_PREREQ(2.56) dnl Define different version variables. dnl dnl Making releases: dnl FRIBIDI_MICRO_VERSION++; dnl FRIBIDI_INTERFACE_AGE++; dnl FRIBIDI_RPM_RELEASE = 1; dnl dnl If any functions have been added: dnl FRIBIDI_INTERFACE_AGE = 0; dnl FRIBIDI_INTERFACE_VERSION++; dnl FRIBIDI_BINARY_AGE++; dnl dnl If binary backwards compatibility has been broken: dnl FRIBIDI_BINARY_AGE = FRIBIDI_INTERFACE_AGE = 0; dnl dnl Building RPMs: dnl FRIBIDI_RPM_RELEASE++; dnl m4_define(fribidi_major_version, 0)dnl m4_define(fribidi_minor_version, 10)dnl m4_define(fribidi_micro_version, 7)dnl m4_define(fribidi_interface_version, 2)dnl m4_define(fribidi_interface_age, 7)dnl m4_define(fribidi_binary_age, 7)dnl m4_define(fribidi_rpm_release, 1)dnl dnl m4_define(fribidi_version, m4_if(m4_eval(fribidi_micro_version()),0, fribidi_major_version.fribidi_minor_version, fribidi_major_version.fribidi_minor_version.fribidi_micro_version))dnl AC_INIT([GNU FriBidi],fribidi_version(),[http://fribidi.org/bug]) AC_REVISION([$Id: configure.in,v 1.1 2007/01/07 10:49:10 eshabtai Exp $]) AC_CONFIG_SRCDIR(fribidi.c) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([gnu]) FRIBIDI_MAJOR_VERSION=fribidi_major_version() FRIBIDI_MINOR_VERSION=fribidi_minor_version() FRIBIDI_MICRO_VERSION=fribidi_micro_version() FRIBIDI_VERSION=fribidi_version() FRIBIDI_INTERFACE_VERSION=fribidi_interface_version() FRIBIDI_INTERFACE_AGE=fribidi_interface_age() FRIBIDI_BINARY_AGE=fribidi_binary_age() FRIBIDI_RPM_RELEASE=fribidi_rpm_release AC_SUBST(FRIBIDI_MAJOR_VERSION) AC_SUBST(FRIBIDI_MINOR_VERSION) AC_SUBST(FRIBIDI_MICRO_VERSION) AC_SUBST(FRIBIDI_VERSION) AC_SUBST(FRIBIDI_INTERFACE_VERSION) AC_SUBST(FRIBIDI_INTERFACE_AGE) AC_SUBST(FRIBIDI_BINARY_AGE) AC_SUBST(FRIBIDI_RPM_RELEASE) dnl libtool versioning. m4_define(lt_current, fribidi_interface_version())dnl m4_define(lt_revision, fribidi_interface_age())dnl m4_define(lt_age, fribidi_binary_age())dnl LT_VERSION_INFO=lt_current():lt_revision():lt_age() LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_CURRENT_MINUS_AGE) dnl Checks for programs. AC_PROG_AWK AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET dnl Checks for libraries dnl Initialize libtool AM_PROG_LIBTOOL dnl Checks for typedefs AC_CHECK_SIZEOF(short, 2) SIZEOF_SHORT=$ac_cv_sizeof_short AC_SUBST(SIZEOF_SHORT) AC_CHECK_SIZEOF(int, 4) SIZEOF_INT=$ac_cv_sizeof_int AC_SUBST(SIZEOF_INT) AC_CHECK_SIZEOF(long, 4) SIZEOF_LONG=$ac_cv_sizeof_long AC_SUBST(SIZEOF_LONG) dnl Checks for compiler characteristics changequote(,)dnl if test "x$GCC" = "xyes"; then case " $CFLAGS " in *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall " ;; esac case " $CFLAGS " in *[\ \ ]-pedantic[\ \ ]*) ;; *) CFLAGS="$CFLAGS -pedantic " ;; esac case " $CFLAGS " in *[\ \ ]strict-aliasing[\ \ ]*) ;; *) CFLAGS="$CFLAGS -fno-strict-aliasing " ;; esac fi changequote([,])dnl dnl Cygwin does not set srcdir to ".". if test x$srcdir = x; then xsrcdir=. else xsrcdir="$srcdir" fi dnl check for fribidi_tab_char_type_*.i files AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_2_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_3_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_4_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_5_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_6_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_7_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_8_I) AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_9_I) for n in 2 3 4 5 6 7 8 9; do if test -f "${srcdir}/fribidi_tab_char_type_$n.i" || test -f "./fribidi_tab_char_type_$n.i"; then AC_DEFINE_UNQUOTED(HAS_FRIBIDI_TAB_CHAR_TYPE_${n}_I) fi done echo "creating fribidi_tab_char_type_stamp" echo "time-stamp" > fribidi_tab_char_type_stamp dnl Check for configure options dnl --enable-debug AC_ARG_ENABLE(debug, dnl [ --enable-debug turn debugging information on [default=no]], [case "${enableval}" in yes) AC_DEFINE(DEBUG,1, [Define to 1 if you want to include debug code in the library]) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; esac]) dnl --enable-malloc AC_ARG_ENABLE(malloc, dnl [ --enable-malloc do not allocate chunks of memory [default=no]], [case "${enableval}" in yes) AC_DEFINE(USE_SIMPLE_MALLOC,1, [Define to 1 if you prefer simple malloc instead of chunk memory]) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-malloc) ;; esac]) dnl --enable-memopt AC_ARG_ENABLE(memopt, dnl [ --enable-memopt optimize for memory usage [default=no]], [case "${enableval}" in yes) AC_DEFINE(MEM_OPTIMIZED,1, [Define to 1 if you want to optimize for memory instead of speed]) memopt=true ;; no) memopt=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-memopt) ;; esac],[memopt=false]) dnl --without-charsets AC_ARG_WITH(charsets, dnl [ --without-charsets exclude character set converters from library causes command-line tool to use iconv], [case "${withval}" in yes) AC_DEFINE(FRIBIDI_NO_CHARSETS,1, [Define to 1 if you do not want character set conversion routines]) charsets=true ;; no) charsets=false ;; *) AC_MSG_ERROR(bad value ${withval} for --without-charsets) ;; esac],[charsets=true]) if test x"$charsets" = xfalse; then FRIBIDI_NO_CHARSETS=1 else FRIBIDI_NO_CHARSETS=0 fi AC_SUBST(FRIBIDI_NO_CHARSETS) AC_DEFINE(FRIBIDI_EXPORTS,1, [Define to 1]) AC_OUTPUT([ Makefile fribidi_config.h fribidi-config fribidi.pc fribidi.spec ],[case "$CONFIG_FILES" in *fribidi-config*)chmod +x fribidi-config;; esac]) --- NEW FILE: fribidi_tab_char_type_2.i --- /* This file was automatically created from UnicodeData.txt version 4.1.0 by fribidi_create_char_types */ #ifndef FRIBIDI_TAB_CHAR_TYPE_2_I #define FRIBIDI_TAB_CHAR_TYPE_2_I #include "fribidi.h" #define LTR FRIBIDI_PROP_TYPE_LTR #define RTL FRIBIDI_PROP_TYPE_RTL #define AL FRIBIDI_PROP_TYPE_AL #define ON FRIBIDI_PROP_TYPE_ON #define BN FRIBIDI_PROP_TYPE_BN #define AN FRIBIDI_PROP_TYPE_AN #define BS FRIBIDI_PROP_TYPE_BS #define CS FRIBIDI_PROP_TYPE_CS #define EN FRIBIDI_PROP_TYPE_EN [...5549 lines suppressed...] #undef BN #undef ON #undef AL #undef RTL #undef LTR /*====================================================================== * fribidi_get_type_internal() returns the bidi type of a character. *----------------------------------------------------------------------*/ FRIBIDI_API FriBidiCharType fribidi_get_type_internal (FriBidiChar uch) { if (uch < 0x110000) return fribidi_prop_to_type[(unsigned char)FRIBIDI_GET_TYPE (uch)]; else return FRIBIDI_TYPE_LTR; /* Non-Unicode chars */ } #endif /* FRIBIDI_TAB_CHAR_TYPE_2_I */ --- NEW FILE: config.guess --- #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. timestamp='2005-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software [...1420 lines suppressed...] /bin/universe = `(/bin/universe) 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` UNAME_MACHINE = ${UNAME_MACHINE} UNAME_RELEASE = ${UNAME_RELEASE} UNAME_SYSTEM = ${UNAME_SYSTEM} UNAME_VERSION = ${UNAME_VERSION} EOF exit 1 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: --- NEW FILE: fribidi_bidi_types.c --- #include <stdio.h> #include <fribidi.h> int main (void) { FriBidiChar c; for (c = 0; c < FRIBIDI_UNICODE_CHARS; c++) printf ("0x%04lx %s\n", (long) c, fribidi_type_name (fribidi_get_type (c))); return 0; } --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ [...1042 lines suppressed...] test: fribidi "$(srcdir)/run.tests" .PHONY: test test.reference \ fribidi_tab_char_type_small fribidi_tab_char_type_large \ fribidi_tab_mirroring fribidi_tab tab # The last line above is a horrible hack. # GNU Coding Standards recommends that `make maintainer-clean' should not # remove the configure script. # We instead make configure call bootstrap. # Indent all C source and header files, using indent(1): indent: $(srcdir)/.indent.pro cd "$(srcdir)" && ./missing --run indent fribidi_*.[ch] .PHONY: indent # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: fribidi_main.c --- /* FriBidi - Library of BiDi algorithm * Copyright (C) 1999,2000 Dov Grobgeld, and * Copyright (C) 2001,2002 Behdad Esfahbod. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this library, in a file named COPYING; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA * * For licensing issues, contact <do...@im...> and * <fw...@sh...>. */ /*====================================================================== * A main program for fribidi. *----------------------------------------------------------------------*/ #ifdef HAVE_CONFIG_H #include <config.h> #endif /* HAVE_CONFIG_H */ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> #ifdef FRIBIDI_NO_CHARSETS #include <iconv.h> #endif #include "getopt.h" #include "fribidi.h" #define appname "fribidi" #define appversion VERSION extern char *fribidi_version_info; #define MAX_STR_LEN 65000 #define ALLOCATE(tp,ln) ((tp *) malloc (sizeof (tp) * (ln))) static void die (char *fmt, ...) { va_list ap; va_start (ap, fmt); if (fmt) { fprintf (stderr, "%s: ", appname); vfprintf (stderr, fmt, ap); } fprintf (stderr, "Try `%s --help' for more information.\n", appname); exit (-1); } fribidi_boolean do_break, do_pad, do_mirror, do_reorder_nsm, do_clean, show_input, show_changes; fribidi_boolean show_visual, show_basedir, show_ltov, show_vtol, show_levels; int text_width; char *char_set; char *bol_text, *eol_text; FriBidiCharType input_base_direction; #ifdef FRIBIDI_NO_CHARSETS iconv_t to_ucs4, from_ucs4; #else int char_set_num; #endif static void help (void) { /* Break help string into little ones, to assure ISO C89 conformance */ printf ("Usage: " appname " [OPTION]... [FILE]...\n" "A command line interface for the " FRIBIDI_PACKAGE " library,\n" "Converts a logical string to visual.\n" "\n" " -h, --help Display this information and exit\n" " -V, --version Display version information and exit\n" " -v, --verbose Verbose mode, same as --basedir --ltov --vtol \\\n" " --levels --changes\n"); printf (" -d, --debug Output debug information\n" " -t, --test Test " FRIBIDI_PACKAGE ", same as --clean --nobreak --showinput \\\n" " --reordernsm\n"); #ifdef FRIBIDI_NO_CHARSETS printf (" -c, --charset CS Specify character set, default is %s \\\n" " CS should be a valid iconv character set name\n", char_set); #else printf (" -c, --charset CS Specify character set, default is %s\n" " --charsetdesc CS Show descriptions for character set CS and exit\n" " --caprtl Old style: set character set to CapRTL\n", char_set); #endif printf (" --showinput Output the input string too\n" " --nopad Do not right justify RTL lines\n" " --nobreak Do not break long lines\n" " -w, --width W Screen width for padding, default is %d, but if \\\n" " enviroment variable COLUMNS is defined, its value \\\n" " will be used, --width overrides both of them.\\\n", text_width); printf (" -B, --bol BOL Output string BOL before the visual string\n" " -E, --eol EOL Output string EOL after the visual string\n" " --rtl Force base direction to RTL\n" " --ltr Force base direction to LTR\n" " --wrtl Set base direction to RTL if no strong character found\n"); printf (" --wltr Set base direction to LTR if no strong character found \\\n" " (default)\n" " --nomirror Turn mirroring off, to do it later\n" " --reordernsm Reorder NSM sequences to follow their base character\n" " --clean Remove explicit format codes in visual string \\\n" " output, currently does not affect other outputs\n" " --basedir Output Base Direction\n"); printf (" --ltov Output Logical to Visual position map\n" " --vtol Output Visual to Logical position map\n" " --levels Output Embedding Levels\n" " --changes Output information about changes between \\\n" " logical and visual string (start, length)\n" " --novisual Do not output the visual string, to be used with \\\n" " --basedir, --ltov, --vtol, --levels, --changes\n"); printf (" All string indexes are zero based\n" "\n" "Output:\n" " For each line of input, output something like this:\n" " [input-str` => '][BOL][[padding space]visual-str][EOL]\n" " [\\n base-dir][\\n ltov-map][\\n vtol-map][\\n levels][\\n changes]\n"); #ifndef FRIBIDI_NO_CHARSETS { int i; printf ("\n" "Available character sets:\n"); for (i = 1; i <= FRIBIDI_CHAR_SETS_NUM; i++) printf (" * %-10s: %-25s%1s\n", fribidi_char_set_name (i), fribidi_char_set_title (i), (fribidi_char_set_desc (i) ? "X" : "")); printf (" X: Character set has descriptions, use --charsetdesc to see\n"); } #endif printf ("\nReport bugs online at <http://fribidi.org/bug>.\n"); exit (0); } static void version (void) { printf ("%s", fribidi_version_info); exit (0); } int main (int argc, char *argv[]) { int exit_val; fribidi_boolean file_found; char *s; FILE *IN; text_width = 80; do_break = FRIBIDI_TRUE; do_pad = FRIBIDI_TRUE; do_mirror = FRIBIDI_TRUE; do_clean = FRIBIDI_FALSE; do_reorder_nsm = FRIBIDI_FALSE; show_input = FRIBIDI_FALSE; show_visual = FRIBIDI_TRUE; show_basedir = FRIBIDI_FALSE; show_ltov = FRIBIDI_FALSE; show_vtol = FRIBIDI_FALSE; show_levels = FRIBIDI_FALSE; show_changes = FRIBIDI_FALSE; char_set = "UTF-8"; bol_text = NULL; eol_text = NULL; input_base_direction = FRIBIDI_TYPE_ON; if ((s = getenv ("COLUMNS"))) { int i; i = atoi (s); if (i > 0) text_width = i; } #define CHARSETDESC 257 #define CAPRTL 258 /* Parse the command line with getopt library */ /* Must set argv[0], getopt uses it to generate error messages */ argv[0] = appname; while (1) { int option_index = 0, c; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"version", 0, 0, 'V'}, {"verbose", 0, 0, 'v'}, {"debug", 0, 0, 'd'}, {"test", 0, 0, 't'}, {"charset", 1, 0, 'c'}, #ifndef FRIBIDI_NO_CHARSETS {"charsetdesc", 1, 0, CHARSETDESC}, {"caprtl", 0, 0, CAPRTL}, #endif {"showinput", 0, &show_input, FRIBIDI_TRUE}, {"nopad", 0, &do_pad, FRIBIDI_FALSE}, {"nobreak", 0, &do_break, FRIBIDI_FALSE}, {"width", 1, 0, 'w'}, {"bol", 1, 0, 'B'}, {"eol", 1, 0, 'E'}, {"nomirror", 0, &do_mirror, FRIBIDI_FALSE}, {"reordernsm", 0, &do_reorder_nsm, FRIBIDI_TRUE}, {"clean", 0, &do_clean, FRIBIDI_TRUE}, {"ltr", 0, (int *) &input_base_direction, FRIBIDI_TYPE_L}, {"rtl", 0, (int *) &input_base_direction, FRIBIDI_TYPE_R}, {"wltr", 0, (int *) &input_base_direction, FRIBIDI_TYPE_WL}, {"wrtl", 0, (int *) &input_base_direction, FRIBIDI_TYPE_WR}, {"basedir", 0, &show_basedir, FRIBIDI_TRUE}, {"ltov", 0, &show_ltov, FRIBIDI_TRUE}, {"vtol", 0, &show_vtol, FRIBIDI_TRUE}, {"levels", 0, &show_levels, FRIBIDI_TRUE}, {"changes", 0, &show_changes, FRIBIDI_TRUE}, {"novisual", 0, &show_visual, FRIBIDI_FALSE}, {0, 0, 0, 0} }; c = getopt_long (argc, argv, "hVvdtc:w:B:E:", long_options, &option_index); if (c == -1) break; switch (c) { case 0: break; case 'h': help (); break; case 'V': version (); break; case 'v': show_basedir = FRIBIDI_TRUE; show_ltov = FRIBIDI_TRUE; show_vtol = FRIBIDI_TRUE; show_levels = FRIBIDI_TRUE; show_changes = FRIBIDI_TRUE; break; case 'w': text_width = atoi (optarg); if (text_width <= 0) die ("invalid screen width `%s'\n", optarg); break; case 'B': bol_text = optarg; break; case 'E': eol_text = optarg; break; case 'd': if (!fribidi_set_debug (FRIBIDI_TRUE)) die ("%s lib must be compiled with DEBUG option to enable\nturn debug info on.\n", FRIBIDI_PACKAGE); break; case 't': do_clean = FRIBIDI_TRUE; show_input = FRIBIDI_TRUE; do_break = FRIBIDI_FALSE; do_reorder_nsm = FRIBIDI_TRUE; break; case 'c': char_set = strdup (optarg); break; #ifndef FRIBIDI_NO_CHARSETS case CAPRTL: char_set = "CapRTL"; break; case CHARSETDESC: char_set = strdup (optarg); char_set_num = fribidi_parse_charset (char_set); if (!char_set_num) die ("unrecognized character set `%s'\n", char_set); if (!fribidi_char_set_desc (char_set_num)) die ("no description available for character set `%s'\n", fribidi_char_set_name (char_set_num)); else printf ("Descriptions for character set %s:\n" "\n" "%s", fribidi_char_set_title (char_set_num), fribidi_char_set_desc (char_set_num)); exit (0); break; #endif case ':': case '?': die (NULL); break; default: break; } } #ifdef FRIBIDI_NO_CHARSETS to_ucs4 = iconv_open ("WCHAR_T", char_set); from_ucs4 = iconv_open (char_set, "WCHAR_T"); #else char_set_num = fribidi_parse_charset (char_set); #endif #ifdef FRIBIDI_NO_CHARSETS if (to_ucs4 == (iconv_t) (-1) || from_ucs4 == (iconv_t) (-1)) #else if (!char_set_num) #endif die ("unrecognized character set `%s'\n", char_set); fribidi_set_mirroring (do_mirror); fribidi_set_reorder_nsm (do_reorder_nsm); exit_val = 0; file_found = FRIBIDI_FALSE; while (optind < argc || !file_found) { char *S_; S_ = optind < argc ? argv[optind++] : "-"; file_found = FRIBIDI_TRUE; /* Open the infile for reading */ if (S_[0] == '-' && !S_[1]) { IN = stdin; } else { IN = fopen (S_, "r"); if (!IN) { fprintf (stderr, "%s: %s: no such file or directory\n", appname, S_); exit_val = 1; continue; } } /* Read and process input one line at a time */ { char S_[MAX_STR_LEN]; int padding_width, break_width; padding_width = show_input ? (text_width - 10) / 2 : text_width; break_width = do_break ? padding_width : 3 * MAX_STR_LEN; while (fgets (S_, sizeof (S_) - 1, IN)) { char *new_line, *nl_found; FriBidiChar logical[MAX_STR_LEN]; char outstring[MAX_STR_LEN]; FriBidiCharType base; FriBidiStrIndex len; nl_found = ""; S_[sizeof (S_) - 1] = 0; len = strlen (S_); /* chop */ if (S_[len - 1] == '\n') { len--; S_[len] = '\0'; new_line = "\n"; } else new_line = ""; #ifdef FRIBIDI_NO_CHARSETS { char *st = S_, *ust = (char *) logical; int in_len = (int) len; len = sizeof logical; iconv (to_ucs4, &st, &in_len, &ust, (int *) &len); len = (FriBidiChar *) ust - logical; } #else len = fribidi_charset_to_unicode (char_set_num, S_, len, logical); #endif { FriBidiChar *visual; FriBidiStrIndex *ltov, *vtol; FriBidiLevel *levels; FriBidiStrIndex new_len; fribidi_boolean log2vis; visual = show_visual ? ALLOCATE (FriBidiChar, len + 1) : NULL; ltov = show_ltov ? ALLOCATE (FriBidiStrIndex, len + 1) : NULL; vtol = show_vtol ? ALLOCATE (FriBidiStrIndex, len + 1) : NULL; levels = show_levels ? ALLOCATE (FriBidiLevel, len + 1) : NULL; /* Create a bidi string. */ base = input_base_direction; log2vis = fribidi_log2vis (logical, len, &base, /* output */ visual, ltov, vtol, levels); if (log2vis) { if (show_input) printf ("%-*s => ", padding_width, S_); new_len = len; /* Remove explicit marks, if asked for. */ if (do_clean) len = fribidi_remove_bidi_marks (visual, len, ltov, vtol, levels); if (show_visual) { printf (nl_found); if (bol_text) printf ("%s", bol_text); /* Convert it to input charset and print. */ { FriBidiStrIndex idx, st; for (idx = 0; idx < len;) { FriBidiStrIndex wid, inlen; wid = break_width; st = idx; #ifndef FRIBIDI_NO_CHARSETS if (char_set_num != FRIBIDI_CHAR_SET_CAP_RTL) #endif while (wid > 0 && idx < len) wid -= fribidi_wcwidth (visual[idx++]); #ifndef FRIBIDI_NO_CHARSETS else while (wid > 0 && idx < len) { wid--; idx++; } #endif if (wid < 0 && idx > st + 1) idx--; inlen = idx - st; #ifdef FRIBIDI_NO_CHARSETS { char *str = outstring, *ust = (char *) (visual + st); int in_len = inlen * sizeof visual[0]; new_len = sizeof outstring; iconv (from_ucs4, &ust, &in_len, &str, (int *) &new_len); *str = '\0'; new_len = str - outstring; } #else new_len = fribidi_unicode_to_charset (char_set_num, visual + st, inlen, outstring); #endif if (FRIBIDI_IS_RTL (base)) printf ("%*s", (int) (do_pad ? (padding_width + strlen (outstring) - (break_width - wid)) : 0), outstring); else printf ("%s", outstring); if (idx < len) printf ("\n"); } } if (eol_text) printf ("%s", eol_text); nl_found = "\n"; } if (show_basedir) { printf (nl_found); printf ("Base direction: %s", (FRIBIDI_DIR_TO_LEVEL (base) ? "R" : "L")); nl_found = "\n"; } if (show_ltov) { FriBidiStrIndex i; printf (nl_found); for (i = 0; i < len; i++) printf ("%ld ", (long) ltov[i]); nl_found = "\n"; } if (show_vtol) { FriBidiStrIndex i; printf (nl_found); for (i = 0; i < len; i++) printf ("%ld ", (long) vtol[i]); nl_found = "\n"; } if (show_levels) { FriBidiStrIndex i; printf (nl_found); for (i = 0; i < len; i++) printf ("%d ", (int) levels[i]); nl_found = "\n"; } if (show_changes) { FriBidiStrIndex change_start, change_len; fribidi_find_string_changes (logical, len, visual, new_len, &change_start, &change_len); printf ("%sChange start[length] = %d[%d]", nl_found, change_start, change_len); nl_found = "\n"; } } else { exit_val = 2; } if (show_visual) free (visual); if (show_ltov) free (ltov); if (show_vtol) free (vtol); if (show_levels) free (levels); } if (*nl_found) printf (new_line); } } } return exit_val; } --- NEW FILE: fribidi.c --- /* FriBidi - Library of BiDi algorithm * Copyright (C) 1999,2000 Dov Grobgeld, and * Copyright (C) 2001,2002 Behdad Esfahbod. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this library, in a file named COPYING; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA * [...1414 lines suppressed...] "Copyright (C) 2001,2002,2005 Behdad Esfahbod <fr...@be...>.\n" "Copyright (C) 1999,2000 Dov Grobgeld\n" FRIBIDI_PACKAGE " comes with NO WARRANTY, to the extent permitted by law.\n" "You may redistribute copies of " FRIBIDI_PACKAGE " under the terms of\n" "the GNU Lesser General Public License.\n" "For more information about these matters, see the files named COPYING.\n" "\n" "Configured with following options:\n" #ifdef DEBUG "--enable-debug\n" #endif #ifdef MEM_OPTIMIZED "--enable-memopt\n" #endif #ifdef USE_SIMPLE_MALLOC "--enable-malloc\n" #endif #ifdef FRIBIDI_NO_CHARSETS "--without-charsts\n" #endif ; --- NEW FILE: fribidi_unicode.h --- /* FriBidi - Library of BiDi algorithm * Copyright (C) 2001,2002,2005 Behdad Esfahbod. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License * along with this library, in a file named COPYING; if not, write to the * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA * * For licensing issues, contact <fw...@sh...>. */ #ifndef FRIBIDI_UNICODE_H #define FRIBIDI_UNICODE_H #include "fribidi_config.h" #include "fribidi_types.h" #ifdef __cplusplus extern "C" { #endif /* Unicode version */ #define FRIBIDI_UNICODE_CHARS (sizeof(FriBidiChar) >= 4 ? 0x110000 : 0x10000) #define FRIBIDI_UNICODE_VERSION "4.1.0" /* UAX#9 Unicode BiDirectional Algorithm */ #define UNI_MAX_BIDI_LEVEL 61 /* BiDirectional marks */ #define UNI_LRM 0x200E #define UNI_RLM 0x200F #define UNI_LRE 0x202A #define UNI_RLE 0x202B #define UNI_PDF 0x202C #define UNI_LRO 0x202D #define UNI_RLO 0x202E /* Line and Paragraph separators */ #define UNI_LS 0x2028 #define UNI_PS 0x2029 /* Joining marks */ #define UNI_ZWNJ 0x200C #define UNI_ZWJ 0x200D /* Hebrew and Arabic */ #define UNI_HEBREW_ALEF 0x05D0 #define UNI_ARABIC_ALEF 0x0627 #define UNI_ARABIC_ZERO 0x0660 #define UNI_FARSI_ZERO 0x06F0 /* wcwidth functions */ FRIBIDI_API int fribidi_wcwidth (FriBidiChar ch); FRIBIDI_API int fribidi_wcswidth (const FriBidiChar *str, FriBidiStrIndex len); FRIBIDI_API int fribidi_wcswidth_cjk (const FriBidiChar *str, FriBidiStrIndex len); #ifdef __cplusplus } #endif #endif /* FRIBIDI_UNICODE_H */ --- NEW FILE: depcomp --- #! /bin/sh # depcomp - compile a program generating dependencies as side-effects scriptversion=2005-02-09.22 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Originally written by Alexandre Oliva <ol...@dc...>. case $1 in '') echo "$0: No command. Try \`$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] Run PROGRAMS ARGS to compile a file, generating dependencies as side-effects. Environment variables: depmode Dependency tracking mode. source Source file read by `PROGRAMS ARGS'. object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to <bug...@gn...>. EOF exit $? ;; -v | --v*) echo "depcomp $scriptversion" exit $? ;; esac if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. depfile=${depfile-`echo "$object" | sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case # here, because this file can only contain one case statement. if test "$depmode" = hp; then # HP compiler uses -M and no extra arg. gccflag=-M depmode=gcc fi if test "$depmode" = dashXmstdout; then # This is just like dashmstdout with a different argument. dashmflag=-xM depmode=dashmstdout fi case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi mv "$tmpdepfile" "$depfile" ;; gcc) ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ## -MM, not -M (despite what the docs say). ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then gccflag=-MD, fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the `deleted header file' problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. tr ' ' ' ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as ## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; hp) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, # since it is checked for above. exit 1 ;; sgi) if test "$libtool" = yes; then "$@" "-Wp,-MDupdate,$tmpdepfile" else "$@" -MDupdate "$tmpdepfile" fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; # the IRIX cc adds comments like `#:fec' to the end of the # dependency line. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' ' ' ' >> $depfile echo >> $depfile # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> $depfile else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi stat=$? if test -f "$tmpdepfile"; then : else stripped=`echo "$stripped" | sed 's,^.*/,,'` tmpdepfile="$stripped.u" fi if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi if test -f "$tmpdepfile"; then outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile # "include basename.Plo" scheme. echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; icc) # Intel's C compiler understands `-MD -MF file'. However on # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h # which is wrong. We want: # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h # and will wrap long lines using \ : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" # Each line is of the form `foo.o: dependent.h', # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a # static library. This mecanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two # compilations output dependencies in in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is # automatically cleaned when .libs/ is deleted, while ignoring # the former would cause a distcleancheck panic. tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 tmpdepfile2=$dir$base.o.d # libtool 1.5 tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else tmpdepfile1=$dir$base.o.d tmpdepfile2=$dir$base.d tmpdepfile3=$dir$base.d tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" do test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. dashmstdout) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done test -z "$dashmflag" && dashmflag=-M # Require at least two characters before searching for `:' # in the target name. This is to cope with DOS-style filenames: # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. "$@" $dashmflag | sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' ' < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; dashXmstdout) # This case only exists to satisfy depend.m4. It is never actually # run, as this mode is specially recognized in the preamble. exit 1 ;; makedepend) "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # X makedepend shift cleared=no for arg in "$@"; do case $cleared in no) set ""; shift cleared=yes ;; esac case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done obj_suffix="`echo $object | sed 's/^.*\././'`" touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; cpp) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. if test "$libtool" = yes; then while test $1 != '--mode=compile'; do shift done shift fi # Remove `-o $object'. IFS=" " for arg do case $arg in -o) shift ;; $object) shift ;; *) set fnord "$@" "$arg" shift # fnord shift # $arg ;; esac done "$@" -E | sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; msvisualcpp) # Important note: in order to support this mode, a compiler *must* # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " for arg do case "$arg" in "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift shift ;; *) set fnord "$@" "$arg" shift shift ;; esac done "$@" -E | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; none) exec "$@" ;; *) echo "Unknown depmode $depmode" 1>&2 exit 1 ;; esac exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-end: "$" # End: --- NEW FILE: INSTALL --- Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that you can run in the future to recreate the current configuration, and a file `config.log' containing compiler output (useful mainly for debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If you are using the cache, and at some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create `configure' by a program called `autoconf'. You only need `configure.ac' if you want to change it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. If you're using `csh' on an old version of System V, you might need to type `sh ./configure' instead to prevent `csh' from trying to execute `configure' itself. Running `configure' takes awhile. While running, it prints some messages telling which features it is checking for. 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with the package. 4. Type `make install' to install the programs and any data files and documentation. 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is also a `make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. Compilers and Options ===================== Some systems require unusual options for compilation or linking that the `configure' script does not know about. Run `./configure --help' for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. If you have... [truncated message content] |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:46:50
|
Update of /cvsroot/roadmap/roadmap_editor/src/libfribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17690/libfribidi Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/libfribidi added to the repository |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:28:49
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10598/libssd Modified Files: libssd.vcp Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: libssd.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libssd/libssd.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libssd.vcp 21 Nov 2006 09:36:29 -0000 1.3 --- libssd.vcp 7 Jan 2007 10:28:41 -0000 1.4 *************** *** 47,51 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "..\..\..\\" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 47,51 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /I "..\..\..\\" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 123,126 **** --- 123,127 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_types.h"\ "..\..\..\ssd\ssd_button.h"\ *************** *** 155,158 **** --- 156,160 ---- "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_types.h"\ "..\..\..\ssd\ssd_button.h"\ |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:28:43
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10598 Modified Files: Roadmap.vcw Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Roadmap.vcw 17 Nov 2006 16:48:55 -0000 1.13 --- Roadmap.vcw 7 Jan 2007 10:28:40 -0000 1.14 *************** *** 34,40 **** End Project Dependency Begin Project Dependency - Project_Dep_Name fribidi - End Project Dependency - Begin Project Dependency Project_Dep_Name libdgl End Project Dependency --- 34,37 ---- *************** *** 63,66 **** --- 60,66 ---- Project_Dep_Name zlibce End Project Dependency + Begin Project Dependency + Project_Dep_Name libfribidi + End Project Dependency }}} *************** *** 96,99 **** --- 96,108 ---- Project_Dep_Name agg End Project Dependency + Begin Project Dependency + Project_Dep_Name libssd + End Project Dependency + Begin Project Dependency + Project_Dep_Name lpngce + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlibce + End Project Dependency }}} *************** *** 190,193 **** --- 199,214 ---- ############################################################################### + Project: "libfribidi"=.\libfribidi\libfribidi.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "libft"=.\libft\libft.vcp - Package Owner=<4> |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:27:15
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libfribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10182 Added Files: libfribidi.vcp Log Message: Import a new libfribidi project (builds as a dll). --- NEW FILE: libfribidi.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="libfribidi" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302 CFG=libfribidi - Win32 (WCE ARMV4) Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "libfribidi.vcn". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "libfribidi.vcn" CFG="libfribidi - Win32 (WCE ARMV4) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "libfribidi - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library") !MESSAGE "libfribidi - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 CPP=clarm.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "libfribidi - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "LIBFRIBIDI_EXPORTS" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_9_I" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_2_I" /D "MEM_OPTIMIZED" /D "FRIBIDI_NO_CHARSETS" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "libfribidi - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "LIBFRIBIDI_EXPORTS" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_9_I" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_2_I" /D "MEM_OPTIMIZED" /D "FRIBIDI_NO_CHARSETS" /YX /M$(CECrtMTDebug) /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF # Begin Target # Name "libfribidi - Win32 (WCE ARMV4) Release" # Name "libfribidi - Win32 (WCE ARMV4) Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\libfribidi\fribidi.c DEP_CPP_FRIBI=\ "..\..\..\libfribidi\fribidi.h"\ "..\..\..\libfribidi\fribidi_char_sets.h"\ "..\..\..\libfribidi\fribidi_char_sets.i"\ "..\..\..\libfribidi\fribidi_char_sets_cap_rtl.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1255.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1256.h"\ "..\..\..\libfribidi\fribidi_char_sets_isiri_3342.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_6.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_8.h"\ "..\..\..\libfribidi\fribidi_char_sets_utf8.h"\ "..\..\..\libfribidi\fribidi_config.h"\ "..\..\..\libfribidi\fribidi_mem.h"\ "..\..\..\libfribidi\fribidi_types.h"\ "..\..\..\libfribidi\fribidi_types.i"\ "..\..\..\libfribidi\fribidi_unicode.h"\ # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\fribidi_char_type.c DEP_CPP_FRIBID=\ "..\..\..\libfribidi\fribidi.h"\ "..\..\..\libfribidi\fribidi_char_sets.h"\ "..\..\..\libfribidi\fribidi_char_sets.i"\ "..\..\..\libfribidi\fribidi_char_sets_cap_rtl.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1255.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1256.h"\ "..\..\..\libfribidi\fribidi_char_sets_isiri_3342.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_6.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_8.h"\ "..\..\..\libfribidi\fribidi_char_sets_utf8.h"\ "..\..\..\libfribidi\fribidi_config.h"\ "..\..\..\libfribidi\fribidi_tab_char_type_2.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_9.i"\ "..\..\..\libfribidi\fribidi_types.h"\ "..\..\..\libfribidi\fribidi_types.i"\ "..\..\..\libfribidi\fribidi_unicode.h"\ NODEP_CPP_FRIBID=\ "..\..\..\libfribidi\fribidi_tab_char_type_3.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_4.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_5.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_6.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_7.i"\ "..\..\..\libfribidi\fribidi_tab_char_type_8.i"\ # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\win32\fribidi_dll.cpp # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\fribidi_mem.c DEP_CPP_FRIBIDI=\ "..\..\..\libfribidi\fribidi_config.h"\ "..\..\..\libfribidi\fribidi_mem.h"\ "..\..\..\libfribidi\fribidi_types.h"\ "..\..\..\libfribidi\fribidi_types.i"\ # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\fribidi_mirroring.c DEP_CPP_FRIBIDI_=\ "..\..\..\libfribidi\fribidi.h"\ "..\..\..\libfribidi\fribidi_char_sets.h"\ "..\..\..\libfribidi\fribidi_char_sets.i"\ "..\..\..\libfribidi\fribidi_char_sets_cap_rtl.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1255.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1256.h"\ "..\..\..\libfribidi\fribidi_char_sets_isiri_3342.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_6.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_8.h"\ "..\..\..\libfribidi\fribidi_char_sets_utf8.h"\ "..\..\..\libfribidi\fribidi_config.h"\ "..\..\..\libfribidi\fribidi_tab_mirroring.i"\ "..\..\..\libfribidi\fribidi_types.h"\ "..\..\..\libfribidi\fribidi_types.i"\ "..\..\..\libfribidi\fribidi_unicode.h"\ # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\fribidi_types.c DEP_CPP_FRIBIDI_T=\ "..\..\..\libfribidi\fribidi.h"\ "..\..\..\libfribidi\fribidi_char_sets.h"\ "..\..\..\libfribidi\fribidi_char_sets.i"\ "..\..\..\libfribidi\fribidi_char_sets_cap_rtl.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1255.h"\ "..\..\..\libfribidi\fribidi_char_sets_cp1256.h"\ "..\..\..\libfribidi\fribidi_char_sets_isiri_3342.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_6.h"\ "..\..\..\libfribidi\fribidi_char_sets_iso8859_8.h"\ "..\..\..\libfribidi\fribidi_char_sets_utf8.h"\ "..\..\..\libfribidi\fribidi_config.h"\ "..\..\..\libfribidi\fribidi_types.h"\ "..\..\..\libfribidi\fribidi_types.i"\ "..\..\..\libfribidi\fribidi_unicode.h"\ # End Source File # Begin Source File SOURCE=..\..\..\libfribidi\win32\libfribidi.def # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:26:16
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libfribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9798/libfribidi Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libfribidi added to the repository |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:24:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/win32_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9040/win32_env Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/win32_env added to the repository |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:24:23
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9011 Modified Files: freemap_install.inf preferences roadmap_file.c roadmap_libpng.c roadmap_main.cpp roadmap_sound.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: freemap_install.inf =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/freemap_install.inf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** freemap_install.inf 17 Sep 2006 20:44:19 -0000 1.1 --- freemap_install.inf 7 Jan 2007 10:24:18 -0000 1.2 *************** *** 1,180 **** ! [CEStrings] ! AppName = "FreeMap" ! InstallDir = %CE1%\%AppName% ! ! [Strings] ! CompanyName = "FreeMapIL" ! ! [Version] ! Signature = "$Chicago$" ! CESignature = "$Windows CE$" ! Provider = %CompanyName% ! ! [DefaultInstall] ! CESETUPDLL="setupdll.dll" ! CEShortcuts = Shortcuts.All ! ! [DefaultInstall.ARM] ! CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Icons, Files.Sound, Files.Dll ! ! [SourceDisksNames] ! 1 = ,"Common config files",,L:\shared\roadmap_editor\src ! 2 = ,"Common map files",,L:\shared\roadmap_editor\maps ! 5 = ,"WinCE preferences",,L:\shared\roadmap_editor\src\win32 ! 6 = ,"Manual",,L:\shared\roadmap_editor\manual ! 7 = ,"bmp icons",,L:\shared\roadmap_editor\src\icons\bmp ! 10 = ,"sound",,L:\shared\roadmap_editor\src\sound ! ! [SourceDisksNames.ARM] ! 3 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\FreeMap\ARMV4Rel ! 4 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\RoadGPS\ARMV4Rel ! 8 = ,"ARMDll files",,C:\Projects\ComSplit\ARMV4Rel ! 9 = ,"Setup Dll",,L:\shared\roadmap_editor\src\win32\wince_env\setupdll\ARMV4Rel ! ! ! [SourceDisksFiles] ! drivers = 1 ! preferences = 5 ! session = 5 ! roadmap.toolbar = 5 ! quick.menu = 1 ! schema = 1 ! sprites = 1 ! objects = 1 ! objects_wide = 1 ! lang = 1 ! font.ttf = 1 ! usc77001.rdm = 2 ! usdir.rdm = 2 ! apt_toc.gif = 6 ! manual.html = 6 ! rm_2d.bmp = 7 ! rm_3d.bmp = 7 ! rm_clockwise.bmp = 7 ! rm_counterclockwise.bmp = 7 ! rm_destination.bmp = 7 ! rm_full.bmp = 7 ! rm_gps.bmp = 7 ! rm_hold.bmp = 7 ! rm_location.bmp = 7 ! rm_quit.bmp = 7 ! rm_record.bmp = 7 ! rm_stop.bmp = 7 ! rm_zoom1.bmp = 7 ! rm_zoomin.bmp = 7 ! rm_zoomout.bmp = 7 ! rm_menu.bmp = 7 ! nav_approaching.bmp = 7 ! nav_continue.bmp = 7 ! nav_keep_left.bmp = 7 ! nav_keep_right.bmp = 7 ! nav_panel.bmp = 7 ! nav_panel_wide.bmp = 7 ! nav_turn_left.bmp = 7 ! nav_turn_right.bmp = 7 ! nav_u_turn.bmp = 7 ! welcome.bmp = 7 ! sync.bmp = 7 ! 200.wav = 10 ! 800.wav = 10 ! Arrive.wav = 10 ! KeepLeft.wav = 10 ! KeepRight.wav = 10 ! m.wav = 10 ! Straight.wav = 10 ! TurnLeft.wav = 10 ! TurnRight.wav = 10 ! within.wav = 10 ! rec_start.wav = 10 ! rec_end.wav = 10 ! ! [SourceDisksFiles.ARM] ! FreeMap.exe = 3 ! RoadGPS.exe = 4 ! ComSplit.dll = 8 ! setupdll.dll = 9 ! ! [DestinationDirs] ! Shortcuts.All = 0,%CE11% ! Files.Config = 0,%InstallDir% ! Files.Maps = 0,%InstallDir%\Maps ! Files.ARM = 0,%InstallDir% ! Files.Icons = 0,%InstallDir%\icons ! Files.Sound = 0,%InstallDir%\sound ! Files.Dll = 0,\Windows ! DefaultDestDir = 0,%InstallDir% ! ! [Shortcuts.All] ! %AppName%,0,FreeMap.exe ! ; RoadGPS,0,RoadGPS.exe ! ! [Files.Config] ! drivers,,,0x00000010 ! preferences,,,0x00000010 ! session,,,0x00000010 ! roadmap.toolbar,,,0x00000010 ! quick.menu,,,0x00000010 ! schema,,,0x00000010 ! sprites,,,0x00000010 ! objects,,,0x00000010 ! objects_wide,,,0x00000010 ! lang,,,0x40000000 ! font.ttf,,,0x00000010 ! apt_toc.gif,,,0 ! manual.html,,,0 ! ! [Files.Icons] ! rm_2d.bmp,,,0x00000010 ! rm_3d.bmp,,,0x00000010 ! rm_clockwise.bmp,,,0x00000010 ! rm_counterclockwise.bmp,,,0x00000010 ! rm_destination.bmp,,,0x00000010 ! rm_full.bmp,,,0x00000010 ! rm_gps.bmp,,,0x00000010 ! rm_hold.bmp,,,0x00000010 ! rm_location.bmp,,,0x00000010 ! rm_quit.bmp,,,0x00000010 ! rm_record.bmp,,,0x00000010 ! rm_stop.bmp,,,0x00000010 ! rm_zoom1.bmp,,,0x00000010 ! rm_zoomin.bmp,,,0x00000010 ! rm_zoomout.bmp,,,0x00000010 ! rm_menu.bmp,,,0x00000010 ! nav_approaching.bmp,,,0x00000010 ! nav_continue.bmp,,,0x00000010 ! nav_keep_left.bmp,,,0x00000010 ! nav_keep_right.bmp,,,0x00000010 ! nav_panel.bmp,,,0x00000010 ! nav_panel_wide.bmp,,,0x00000010 ! nav_turn_left.bmp,,,0x00000010 ! nav_turn_right.bmp,,,0x00000010 ! nav_u_turn.bmp,,,0x00000010 ! welcome.bmp,,,0x40000000 ! sync.bmp,,,0x00000010 ! ! [Files.Sound] ! 200.wav,,,0x40000000 ! 800.wav,,,0x40000000 ! Arrive.wav,,,0x40000000 ! KeepLeft.wav,,,0x40000000 ! KeepRight.wav,,,0x40000000 ! m.wav,,,0x40000000 ! Straight.wav,,,0x40000000 ! TurnLeft.wav,,,0x40000000 ! TurnRight.wav,,,0x40000000 ! within.wav,,,0x40000000 ! rec_start.wav,,,0x40000000 ! rec_end.wav,,,0x40000000 ! ! [Files.Maps] ! usc77001.rdm,,,0x40000000 ! usdir.rdm,,,0x40000000 ! ! [Files.ARM] ! FreeMap.exe,,,0 ! RoadGPS.exe,,,0 ! ! [Files.Dll] ! ComSplit.dll,,,0 ! setupdll.dll,,0x80000000 ! --- 1,278 ---- ! [CEStrings] ! AppName = "FreeMap" ! InstallDir = %CE1%\%AppName% ! ! [Strings] ! CompanyName = "FreeMapIL" ! ! [Version] ! Signature = "$Chicago$" ! CESignature = "$Windows CE$" ! Provider = %CompanyName% ! ! [DefaultInstall] ! CESETUPDLL="setupdll.dll" ! CEShortcuts = Shortcuts.All ! ! [DefaultInstall.ARM] ! CopyFiles = Files.Config, Files.Maps, Files.ARM, Files.Skin, Files.SkinDay, Files.SkinNight, Files.Sound, Files.SysDll, Files.Dll ! ! [SourceDisksNames] ! 1 = ,"Common config files",,L:\shared\roadmap_editor\src ! 2 = ,"Common map files",,L:\shared\roadmap_editor\maps ! 5 = ,"WinCE preferences",,L:\shared\roadmap_editor\src\win32 ! 6 = ,"Manual",,L:\shared\roadmap_editor\manual ! 7 = ,"bmp icons",,L:\shared\roadmap_editor\src\skins\default ! 10 = ,"sound",,L:\shared\roadmap_editor\src\sound ! ! [SourceDisksNames.ARM] ! 3 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\FreeMap\ARMV4Rel ! 4 = ,"ARM files",,L:\shared\roadmap_editor\src\win32\wince_env\RoadGPS\ARMV4Rel ! 8 = ,"ARMDll files",,C:\Projects\ComSplit\ARMV4Rel ! 9 = ,"Setup Dll",,L:\shared\roadmap_editor\src\win32\wince_env\setupdll\ARMV4Rel ! 11 = ,"fribidi Dll",,L:\shared\roadmap_editor\src\win32\wince_env\libfribidi\ARMV4Rel ! 12 = ,"zlib Dll",,L:\shared\roadmap_editor\src\win32\wince_env\zlib\ARMV4Rel ! 13 = ,"png Dll",,L:\shared\roadmap_editor\src\win32\wince_env\libpng\ARMV4Rel ! ! ! [SourceDisksFiles] ! drivers = 1 ! preferences = 5 ! session = 5 ! roadmap.toolbar = 5 ! quick.menu = 1 ! schema_day = 7 ! schema_night = 7 ! sprites = 1 ! objects = 7 ! objects_wide = 7 ! lang = 1 ! font.ttf = 1 ! usc77001.rdm = 2 ! usdir.rdm = 2 ! apt_toc.gif = 6 ! manual.html = 6 ! 200.wav = 10 ! 800.wav = 10 ! Arrive.wav = 10 ! KeepLeft.wav = 10 ! KeepRight.wav = 10 ! m.wav = 10 ! Straight.wav = 10 ! TurnLeft.wav = 10 ! TurnRight.wav = 10 ! within.wav = 10 ! rec_start.wav = 10 ! rec_end.wav = 10 ! click.wav = 10 ! click_long.wav = 10 ! about.png=7 ! addeditnote.png=7 ! address.png=7 ! button_down.png=7 ! button_up.png=7 ! deleteroads.png=7 ! detectreceiver.png=7 ! down.png=7 ! draw_roads.png=7 ! edit.png=7 ! key1_large_down.png=7 ! key1_large_up.png=7 ! key1_medium_down.png=7 ! key1_medium_up.png=7 ! key2_large_down.png=7 ! key2_large_up.png=7 ! key2_medium_down.png=7 ! key2_medium_up.png=7 ! left.png=7 ! nav_approaching.png=7 ! nav_continue.png=7 ! nav_exit_left.png=7 ! nav_exit_right.png=7 ! nav_keep_left.png=7 ! nav_keep_right.png=7 ! nav_panel.png=7 ! nav_panel_wide.png=7 ! nav_turn_left.png=7 ! nav_turn_right.png=7 ! nav_u_turn.png=7 ! preferences.png=7 ! properties.png=7 ! right.png=7 ! rm_2d.png=7 ! rm_3d.png=7 ! rm_clockwise.png=7 ! rm_counterclockwise.png=7 ! rm_destination.png=7 ! rm_down.png=7 ! rm_full.png=7 ! rm_gps.png=7 ! rm_hold.png=7 ! rm_left.png=7 ! rm_location.png=7 ! rm_menu.png=7 ! rm_new_roads.png=7 ! rm_quit.png=7 ! rm_record.png=7 ! rm_right.png=7 ! rm_stop.png=7 ! rm_up.png=7 ! rm_zoom1.png=7 ! rm_zoomin.png=7 ! rm_zoomout.png=7 ! setasdeparture.png=7 ! setasdestination.png=7 ! sync.bmp=7 ! sync.png=7 ! traffic.png=7 ! u_turn.png=7 ! up.png=7 ! updaterange.png=7 ! viewmarkers.png=7 ! welcome.png=7 ! ! [SourceDisksFiles.ARM] ! FreeMap.exe = 3 ! RoadGPS.exe = 4 ! ComSplit.dll = 8 ! setupdll.dll = 9 ! libfribidi.dll = 11 ! zlibce.dll = 12 ! lpngce.dll = 13 ! ! [DestinationDirs] ! Shortcuts.All = 0,%CE11% ! Files.Config = 0,%InstallDir% ! Files.Maps = 0,%InstallDir%\Maps ! Files.ARM = 0,%InstallDir% ! Files.Skin = 0,%InstallDir%\skins\default ! Files.SkinDay = 0,%InstallDir%\skins\default\day ! Files.SkinNight = 0,%InstallDir%\skins\default\night ! Files.Sound = 0,%InstallDir%\sound ! Files.SysDll = 0,\Windows ! Files.Dll = 0,%InstallDir% ! DefaultDestDir = 0,%InstallDir% ! ! [Shortcuts.All] ! %AppName%,0,FreeMap.exe ! ; RoadGPS,0,RoadGPS.exe ! ! [Files.Config] ! drivers,,,0x00000010 ! preferences,,,0x40000000 ! session,,,0x00000010 ! roadmap.toolbar,,,0x00000010 ! quick.menu,,,0x40000000 ! sprites,,,0x40000000 ! lang,,,0x40000000 ! font.ttf,,,0x00000010 ! apt_toc.gif,,,0 ! manual.html,,,0 ! ! [Files.Skin] ! about.png,,,0x00000010 ! addeditnote.png,,,0x00000010 ! address.png,,,0x00000010 ! button_down.png,,,0x00000010 ! button_up.png,,,0x00000010 ! deleteroads.png,,,0x00000010 ! detectreceiver.png,,,0x00000010 ! down.png,,,0x00000010 ! draw_roads.png,,,0x00000010 ! edit.png,,,0x00000010 ! key1_large_down.png,,,0x00000010 ! key1_large_up.png,,,0x00000010 ! key1_medium_down.png,,,0x00000010 ! key1_medium_up.png,,,0x00000010 ! key2_large_down.png,,,0x00000010 ! key2_large_up.png,,,0x00000010 ! key2_medium_down.png,,,0x00000010 ! key2_medium_up.png,,,0x00000010 ! left.png,,,0x00000010 ! nav_approaching.png,,,0x00000010 ! nav_continue.png,,,0x00000010 ! nav_exit_left.png,,,0x00000010 ! nav_exit_right.png,,,0x00000010 ! nav_keep_left.png,,,0x00000010 ! nav_keep_right.png,,,0x00000010 ! nav_panel.png,,,0x00000010 ! nav_panel_wide.png,,,0x00000010 ! nav_turn_left.png,,,0x00000010 ! nav_turn_right.png,,,0x00000010 ! nav_u_turn.png,,,0x00000010 ! objects,,,0x00000010 ! objects_wide,,,0x00000010 ! preferences.png,,,0x00000010 ! properties.png,,,0x00000010 ! right.png,,,0x00000010 ! rm_2d.png,,,0x00000010 ! rm_3d.png,,,0x00000010 ! rm_clockwise.png,,,0x00000010 ! rm_counterclockwise.png,,,0x00000010 ! rm_destination.png,,,0x00000010 ! rm_down.png,,,0x00000010 ! rm_full.png,,,0x00000010 ! rm_gps.png,,,0x00000010 ! rm_hold.png,,,0x00000010 ! rm_left.png,,,0x00000010 ! rm_location.png,,,0x00000010 ! rm_menu.png,,,0x00000010 ! rm_new_roads.png,,,0x00000010 ! rm_quit.png,,,0x00000010 ! rm_record.png,,,0x00000010 ! rm_right.png,,,0x00000010 ! rm_stop.png,,,0x00000010 ! rm_up.png,,,0x00000010 ! rm_zoom1.png,,,0x00000010 ! rm_zoomin.png,,,0x00000010 ! rm_zoomout.png,,,0x00000010 ! setasdeparture.png,,,0x00000010 ! setasdestination.png,,,0x00000010 ! sync.bmp,,,0x00000010 ! sync.png,,,0x00000010 ! traffic.png,,,0x00000010 ! u_turn.png,,,0x00000010 ! up.png,,,0x00000010 ! updaterange.png,,,0x00000010 ! viewmarkers.png,,,0x00000010 ! welcome.png,,,0x00000010 ! ! [Files.SkinDay] ! schema,schema_day,,0x00000010 ! ! [Files.SkinNight] ! schema,schema_night,,0x00000010 ! ! [Files.Sound] ! 200.wav,,,0x40000000 ! 800.wav,,,0x40000000 ! Arrive.wav,,,0x40000000 ! KeepLeft.wav,,,0x40000000 ! KeepRight.wav,,,0x40000000 ! m.wav,,,0x40000000 ! Straight.wav,,,0x40000000 ! TurnLeft.wav,,,0x40000000 ! TurnRight.wav,,,0x40000000 ! within.wav,,,0x40000000 ! rec_start.wav,,,0x40000000 ! rec_end.wav,,,0x40000000 ! click.wav,,,0x40000000 ! click_long.wav,,,0x40000000 ! ! [Files.Maps] ! usc77001.rdm,,,0x40000000 ! usdir.rdm,,,0x40000000 ! ! [Files.ARM] ! FreeMap.exe,,,0 ! RoadGPS.exe,,,0 ! ! [Files.SysDll] ! ComSplit.dll,,,0 ! setupdll.dll,,0x80000000 ! ! [Files.Dll] ! libfribidi.dll,,,0x00000010 ! zlibce.dll,,,0x00000010 ! lpngce.dll,,,0x00000010 ! Index: roadmap_sound.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_sound.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_sound.c 18 Aug 2006 17:57:52 -0000 1.3 --- roadmap_sound.c 7 Jan 2007 10:24:18 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- #include "../roadmap_path.h" #include "../roadmap_file.h" + #include "../roadmap_res.h" #include "../roadmap_sound.h" *************** *** 113,120 **** for (i=0; i<roadmap_sound_list_count (list); i++) { ! roadmap_sound_play (roadmap_sound_list_get (list, i)); } ! roadmap_sound_list_free (list); sound_lists[current_list] = NULL; } --- 114,130 ---- for (i=0; i<roadmap_sound_list_count (list); i++) { ! const char *name = roadmap_sound_list_get (list, i); ! RoadMapSound sound = ! roadmap_res_get (RES_SOUND, RES_NOCREATE, name); ! if (sound) { ! roadmap_sound_play (sound); ! } else { ! roadmap_sound_play_file (name); ! } } ! if (!(list->flags & SOUND_LIST_NO_FREE)) { ! roadmap_sound_list_free (list); ! } sound_lists[current_list] = NULL; } *************** *** 142,148 **** res = waveInReset(hWaveIn); ! res = waveInClose(hWaveIn); hWaveIn = NULL; ! roadmap_sound_play ("rec_end.wav"); res = res; } --- 152,158 ---- res = waveInReset(hWaveIn); ! res = waveInClose(hWaveIn); hWaveIn = NULL; ! roadmap_sound_play_file ("rec_end.wav"); res = res; } *************** *** 150,154 **** ! int roadmap_sound_play (const char *file_name) { char full_name[256]; --- 160,179 ---- ! int roadmap_sound_play (RoadMapSound sound) { ! ! BOOL res; ! void *mem; ! ! if (!sound) return -1; ! mem = roadmap_file_base ((RoadMapFileContext)sound); ! ! res = PlaySound((LPWSTR)mem, NULL, SND_SYNC | SND_MEMORY); ! ! if (res == TRUE) return 0; ! else return -1; ! } ! ! ! int roadmap_sound_play_file (const char *file_name) { char full_name[256]; *************** *** 175,181 **** ! RoadMapSoundList roadmap_sound_list_create (void) { ! return (RoadMapSoundList) calloc (1, sizeof(struct roadmap_sound_list_t)); } --- 200,239 ---- ! RoadMapSound roadmap_sound_load (const char *path, const char *file, int *mem) { ! char *full_name = roadmap_path_join (path, file); ! RoadMapFileContext sound; ! ! roadmap_file_map (NULL, full_name, NULL, "r", &sound); ! ! roadmap_path_free (full_name); ! ! if (sound == NULL) { ! *mem = 0; ! return NULL; ! } ! ! *mem = roadmap_file_size (sound); ! ! return (RoadMapSound) sound; ! } ! ! ! int roadmap_sound_free (RoadMapSound sound) { ! ! roadmap_file_unmap (&(RoadMapFileContext)sound); ! ! return 0; ! } ! ! ! RoadMapSoundList roadmap_sound_list_create (int flags) { ! ! RoadMapSoundList list = ! (RoadMapSoundList) calloc (1, sizeof(struct roadmap_sound_list_t)); ! ! list->flags = flags; ! ! return list; } *************** *** 359,363 **** res = waveInAddBuffer(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! roadmap_sound_play ("rec_start.wav"); res = waveInStart(hWaveIn); --- 417,421 ---- res = waveInAddBuffer(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! roadmap_sound_play_file ("rec_start.wav"); res = waveInStart(hWaveIn); Index: preferences =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/preferences,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** preferences 21 Nov 2006 09:34:40 -0000 1.11 --- preferences 7 Jan 2007 10:24:18 -0000 1.12 *************** *** 20,24 **** Map.GPS map offset longitude: 0 Map.GPS map offset latitude: 0 - Download.Source: http://www.freemap.co.il/roadmap/maps/usc%05d.rdm.gz History.Depth: 100 GPS.Timeout: 10 --- 20,23 ---- Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** roadmap_main.cpp 17 Nov 2006 16:49:32 -0000 1.24 --- roadmap_main.cpp 7 Jan 2007 10:24:18 -0000 1.25 *************** *** 57,60 **** --- 57,61 ---- #include "../roadmap_io.h" #include "../roadmap_main.h" + #include "../roadmap_res.h" #include "../roadmap_serial.h" #include "../roadmap_messagebox.h" *************** *** 183,193 **** } } ! ! static void CALLBACK AvoidSuspend (HWND hwnd, UINT uMsg, UINT idEvent, ! DWORD dwTime) { ! #ifdef UNDER_CE ! CEDevice::wakeUp(); ! #endif ! } #ifndef _ROADGPS --- 184,194 ---- } } ! ! static void CALLBACK AvoidSuspend (HWND hwnd, UINT uMsg, UINT idEvent, ! DWORD dwTime) { ! #ifdef UNDER_CE ! CEDevice::wakeUp(); ! #endif ! } #ifndef _ROADGPS *************** *** 404,408 **** #endif ! BOOL other_instance = AppInstanceExists (); //If it is already running, then focus on the window, and exit --- 405,413 ---- #endif ! BOOL other_instance = false; ! ! #ifndef _ROADGPS ! other_instance = AppInstanceExists (); ! #endif //If it is already running, then focus on the window, and exit *************** *** 422,428 **** } - #ifndef _ROADGPS if (other_instance) return 0; - #endif if (!MyRegisterClass(hInstance, szWindowClass)) --- 427,431 ---- *************** *** 456,459 **** --- 459,463 ---- editor_main_set (1); roadmap_main_start_sync (); + roadmap_res_shutdown (); CEDevice::end(); return 0; *************** *** 1134,1138 **** #ifdef FREEMAP_IL RoadMapImage image = roadmap_canvas_load_image (roadmap_path_user(), ! "icons\\welcome.bmp"); if (image) { --- 1138,1142 ---- #ifdef FREEMAP_IL RoadMapImage image = roadmap_canvas_load_image (roadmap_path_user(), ! "skins\\default\\welcome.png"); if (image) { Index: roadmap_libpng.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_libpng.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_libpng.c 21 Nov 2006 09:34:22 -0000 1.1 --- roadmap_libpng.c 7 Jan 2007 10:24:18 -0000 1.2 *************** *** 115,118 **** --- 115,121 ---- png_read_image(png_ptr, row_pointers); + png_read_end(png_ptr, NULL); + png_destroy_read_struct (&png_ptr, &info_ptr, NULL); + free (row_pointers); CloseHandle(fp); Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_file.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_file.c 15 Oct 2006 10:53:00 -0000 1.7 --- roadmap_file.c 7 Jan 2007 10:24:18 -0000 1.8 *************** *** 38,71 **** struct RoadMapFileContextStructure { ! HANDLE hMapFile; ! HANDLE hFile; ! void *base; ! int size; }; FILE *roadmap_file_fopen (const char *path, const char *name, const char *mode) { [...1001 lines suppressed...] ! ! if (!WriteFile((HANDLE)file, data, length, &num_bytes, NULL)) { ! return -1; ! } else { ! return num_bytes; ! } } --- 557,567 ---- int roadmap_file_write(RoadMapFile file, const void *data, int length) { ! DWORD num_bytes; ! ! if (!WriteFile((HANDLE)file, data, length, &num_bytes, NULL)) { ! return -1; ! } else { ! return num_bytes; ! } } |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:20:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7757 Modified Files: roadmap_file.c roadmap_sound.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: roadmap_sound.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_sound.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_sound.c 18 Aug 2006 17:55:40 -0000 1.2 --- roadmap_sound.c 7 Jan 2007 10:20:01 -0000 1.3 *************** *** 31,37 **** #include "roadmap_sound.h" ! RoadMapSoundList roadmap_sound_list_create (void) { ! return (RoadMapSoundList) calloc (1, sizeof(struct roadmap_sound_list_t)); } --- 31,41 ---- #include "roadmap_sound.h" ! RoadMapSoundList roadmap_sound_list_create (int flags) { ! RoadMapSoundList list = ! (RoadMapSoundList) calloc (1, sizeof(struct roadmap_sound_list_t)); ! list->flags = flags; ! ! return list; } *************** *** 69,73 **** ! int roadmap_sound_play (const char *file_name) { return 0; --- 73,95 ---- ! RoadMapSound roadmap_sound_load (const char *path, const char *file, int *mem) { ! ! return 0; ! } ! ! ! int roadmap_sound_free (RoadMapSound sound) { ! ! return 0; ! } ! ! ! int roadmap_sound_play (RoadMapSound sound) { ! ! return 0; ! } ! ! ! int roadmap_sound_play_file (const char *file_name) { return 0; Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_file.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_file.c 15 Oct 2006 10:52:38 -0000 1.5 --- roadmap_file.c 7 Jan 2007 10:20:01 -0000 1.6 *************** *** 225,228 **** --- 225,229 ---- roadmap_log (ROADMAP_ERROR, "%s: invalid file access mode %s", name, mode); + free (context); return NULL; } *************** *** 248,251 **** --- 249,253 ---- } if (sequence == NULL) { + free (context); return NULL; } |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:19:10
|
Update of /cvsroot/roadmap/roadmap_editor/src/ssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7700 Modified Files: ssd_button.c ssd_container.c ssd_dialog.c ssd_entry.c ssd_keyboard.c ssd_keyboard.h ssd_list.c ssd_menu.c ssd_text.c ssd_widget.c ssd_widget.h Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: ssd_button.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_button.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_button.c 24 Nov 2006 11:09:17 -0000 1.4 --- ssd_button.c 7 Jan 2007 10:19:00 -0000 1.5 *************** *** 115,123 **** struct ssd_button_data *data = (struct ssd_button_data *) widget->data; ! RoadMapSoundList list = roadmap_sound_list_create (); ! if (roadmap_sound_list_add (list, "click.wav") != -1) { ! roadmap_sound_play_list (list); } if (widget->callback) { (*widget->callback) (widget, SSD_BUTTON_SHORT_CLICK); --- 115,128 ---- struct ssd_button_data *data = (struct ssd_button_data *) widget->data; ! static RoadMapSoundList list; ! ! if (!list) { ! list = roadmap_sound_list_create (SOUND_LIST_NO_FREE); ! roadmap_sound_list_add (list, "click.wav"); ! roadmap_res_get (RES_SOUND, 0, "click.wav"); } + roadmap_sound_play_list (list); + if (widget->callback) { (*widget->callback) (widget, SSD_BUTTON_SHORT_CLICK); *************** *** 134,142 **** struct ssd_button_data *data = (struct ssd_button_data *) widget->data; ! RoadMapSoundList list = roadmap_sound_list_create (); ! if (roadmap_sound_list_add (list, "click_long.wav") != -1) { ! roadmap_sound_play_list (list); } if (widget->callback) { (*widget->callback) (widget, SSD_BUTTON_LONG_CLICK); --- 139,151 ---- struct ssd_button_data *data = (struct ssd_button_data *) widget->data; ! static RoadMapSoundList list; ! if (!list) { ! list = roadmap_sound_list_create (SOUND_LIST_NO_FREE); ! roadmap_sound_list_add (list, "click_long.wav"); ! roadmap_res_get (RES_SOUND, 0, "click_long.wav"); } + roadmap_sound_play_list (list); + if (widget->callback) { (*widget->callback) (widget, SSD_BUTTON_LONG_CLICK); Index: ssd_keyboard.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_keyboard.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_keyboard.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_keyboard.c 7 Jan 2007 10:19:00 -0000 1.4 *************** *** 50,72 **** #define SSD_KEY_SPACE 0x2 #define SSD_KEY_BACKSPACE 0x4 typedef struct ssd_keyboard { const char *name; const char *keys; int special_keys; SsdWidget widget; SsdDialogCB callback; void *context; } SsdKeyboard; ! SsdKeyboard def_keyboards[] = { ! {"letters_kbd", ! "×1×2×3×4×5×6×7×8×9×0××××××× ×ססעעפףצץקקר:ש,ת.", ! SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE, NULL, NULL, ! NULL} }; static int button_callback (SsdWidget widget, const char *new_value) { --- 50,198 ---- #define SSD_KEY_SPACE 0x2 #define SSD_KEY_BACKSPACE 0x4 + #define SSD_KEY_SWITCH 0x8 + + #define SSD_KEYBOARD_MULTI 0x1 + #define SSD_KEYBOARD_LTR 0x2 + + typedef struct key_set_t { + const char *key_images[2]; + const char *action_images[2]; + int size; + } SsdKeySet; + + static SsdKeySet key_sets[] = { + { + {"key1_large_up.png", "key1_large_down.png"}, + {"key2_large_up.png", "key2_large_down.png"}, + 46 + }, + { + {"key1_medium_up.png", "key1_medium_down.png"}, + {"key2_medium_up.png", "key2_medium_down.png"}, + 40 + } + }; typedef struct ssd_keyboard { const char *name; + int type; + int flags; const char *keys; int special_keys; + const char *extra_key; SsdWidget widget; SsdDialogCB callback; void *context; + int key_set; } SsdKeyboard; ! static SsdKeyboard *CurrentKeyboard = NULL; ! ! static void show_keyboard (SsdKeyboard *keyboard, const char *title, ! const char *value, const char *extra_key, ! SsdDialogCB callback, void *context); ! ! SsdKeyboard keyboards[] = { ! {"letters", ! SSD_KEYBOARD_LETTERS, ! SSD_KEYBOARD_MULTI, ! "×1×2×3×4×5×6×7×8×9×0××××××× ×ס-×¢\"פףצץקקר:ש,ת.||", ! SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE | SSD_KEY_SWITCH, NULL, NULL, ! NULL, ! NULL, ! 0}, ! ! {"english", ! SSD_KEYBOARD_LETTERS, ! SSD_KEYBOARD_MULTI|SSD_KEYBOARD_LTR, ! "a1b2c3d4e5f6g7h8i9j0kkllmmnnooppqqrrssttuuvvwwx:y,z.||", ! SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE | SSD_KEY_SWITCH, ! NULL, ! NULL, ! NULL, ! NULL, ! 0}, ! ! {"digits", ! SSD_KEYBOARD_DIGITS, ! SSD_KEYBOARD_LTR, ! "112233||445566||778899||00||", ! SSD_KEY_CONFIRM | SSD_KEY_BACKSPACE | SSD_KEY_SWITCH, ! NULL, ! NULL, ! NULL, ! NULL, ! 0} }; + static void switch_type(SsdKeyboard *keyboard) { + SsdKeyboard *new_keyboard; + unsigned int i; + + for (i=0; i < sizeof(keyboards) / sizeof(keyboards[0]); i++) { + if (&keyboards[i] == keyboard) break; + } + + i = (i + 1) % (sizeof(keyboards) / sizeof(keyboards[0])); + + new_keyboard = &keyboards[i]; + + show_keyboard (new_keyboard, + ssd_widget_get_value (keyboard->widget, NULL), + ssd_widget_get_value (keyboard->widget, "input"), + keyboard->extra_key, + keyboard->callback, + keyboard->context); + + ssd_dialog_hide (keyboard->name); + } + + + static void calc_key_size (SsdKeyboard *keyboard, wchar_t *wkeys, int count, + SsdSize *size) { + + unsigned int set; + int i; + + for (set=0; set<sizeof(key_sets) / sizeof(SsdKeySet); set++) { + int key_size = key_sets[set].size; + int cur_x = 0; + int cur_y = 0; + + keyboard->key_set = set; + + if (keyboard->special_keys) { + cur_y += key_size; + } + + for (i=0; i<count/2; i++) { + char key1[20]; + int len; + + if ((len = wcrtomb(key1, wkeys[i*2], NULL)) <= 0) continue; + key1[len] = '\0'; + + if (key1[0] == '|') { + cur_x = 0; + cur_y += key_size; + if (cur_y > size->height) break; + continue; + } + + cur_x += key_size; + if (cur_x > size->width) { + cur_x = key_size; + cur_y += key_size; + if (cur_y > size->height) break; + } + } + + if (i == count/2) return; + } + } + + static int button_callback (SsdWidget widget, const char *new_value) { *************** *** 82,86 **** keyboard = (SsdKeyboard *)k->context; ! if (!strcmp (roadmap_lang_get ("Ok"), widget->name)) { return (*keyboard->callback) (SSD_KEYBOARD_OK, ssd_dialog_get_value ("input"), --- 208,217 ---- keyboard = (SsdKeyboard *)k->context; ! if (keyboard->extra_key && !strcmp (keyboard->extra_key, widget->name)) { ! return (*keyboard->callback) ! (SSD_KEYBOARD_EXTRA, ssd_dialog_get_value ("input"), ! keyboard->context); ! ! } else if (!strcmp (roadmap_lang_get ("Ok"), widget->name)) { return (*keyboard->callback) (SSD_KEYBOARD_OK, ssd_dialog_get_value ("input"), *************** *** 118,121 **** --- 249,255 ---- strcpy (key, " "); + } else if (!strcmp (roadmap_lang_get ("SWCH"), widget->name)) { + switch_type(keyboard); + } else { *************** *** 161,174 **** ! static void add_key (const char *key1, const char *key2, int type) { char name[255]; char value[255]; - const char *icons[] = { - "key_button1", - "key_button2" - }; - SsdWidget button; strcpy(name, key1); --- 295,307 ---- ! static SsdWidget add_key (SsdWidget container, ! const char *key1, const char *key2, int type, ! int flags, int key_set) { char name[255]; char value[255]; SsdWidget button; + const int KEY_TEXT_SIZE = 20; + int txt_offset = (key_sets[key_set].size - KEY_TEXT_SIZE) / 2 - 0; strcpy(name, key1); *************** *** 178,191 **** strcat(value, "|"); strcat(value, key2); } - button = - ssd_dialog_new_button (name, value, icons, 2, - SSD_ALIGN_CENTER|SSD_WIDGET_SPACE, - button_callback); if (type == SSD_BUTTON_KEY) { ! SsdWidget w = ssd_text_new ("key1", key1, 20, SSD_END_ROW); ! ssd_widget_set_offset (w, 9, 3); ssd_widget_add (button, w); } else { --- 311,329 ---- strcat(value, "|"); strcat(value, key2); + button = + ssd_button_new (name, value, key_sets[key_set].key_images, 2, + SSD_ALIGN_CENTER|flags, + button_callback); + } else { + button = + ssd_button_new (name, value, key_sets[key_set].action_images, 2, + SSD_ALIGN_CENTER|flags, + button_callback); } if (type == SSD_BUTTON_KEY) { ! SsdWidget w = ssd_text_new ("key1", key1, KEY_TEXT_SIZE, SSD_END_ROW); ! ssd_widget_set_offset (w, txt_offset, 3); ssd_widget_add (button, w); } else { *************** *** 194,202 **** if ((type == SSD_BUTTON_KEY) && strcmp (key1, key2)) { SsdWidget w = ssd_text_new ("key2", key2, 13, SSD_ALIGN_RIGHT|SSD_END_ROW); ! ssd_widget_set_color (w, "ffff00ff", 0); ! ssd_widget_set_offset (w, 9, 3); ssd_widget_add (button, w); } } --- 332,346 ---- if ((type == SSD_BUTTON_KEY) && strcmp (key1, key2)) { + SsdWidget w = ssd_text_new ("key2", key2, 13, SSD_ALIGN_RIGHT|SSD_END_ROW); ! ! if (flags & SSD_ALIGN_LTR) txt_offset = -txt_offset; ! ssd_widget_set_color (w, "#ee0000", 0); ! ssd_widget_set_offset (w, txt_offset, 3); ssd_widget_add (button, w); } + + ssd_widget_add (container, button); + return button; } *************** *** 206,212 **** --- 350,359 ---- SsdWidget entry; SsdWidget input; + SsdSize size; + SsdSize entry_size; wchar_t wkeys[100]; const char *keys = keyboard->keys; + int flags; int count; int i; *************** *** 229,235 **** ssd_widget_add (dialog, entry); count = mbsrtowcs(wkeys, &keys, ! sizeof(wkeys) / sizeof(wchar_t), NULL); for (i=0; i<count/2; i++) { char key1[20]; --- 376,390 ---- ssd_widget_add (dialog, entry); + ssd_widget_get_size (dialog, &size, NULL); + ssd_widget_get_size (entry, &entry_size, NULL); + + size.height -= entry_size.height; + count = mbsrtowcs(wkeys, &keys, ! sizeof(wkeys) / sizeof(wchar_t), NULL); ! ! calc_key_size (keyboard, wkeys, count, &size); + flags = 0; for (i=0; i<count/2; i++) { char key1[20]; *************** *** 242,286 **** key2[len] = '\0'; ! add_key (key1, key2, SSD_BUTTON_KEY); ! } ! ssd_dialog_new_line (); if (keyboard->special_keys & SSD_KEY_CONFIRM) { ! add_key (roadmap_lang_get ("Ok"), NULL, SSD_BUTTON_TEXT); } if (keyboard->special_keys & SSD_KEY_BACKSPACE) { ! add_key (roadmap_lang_get ("Del"), NULL, SSD_BUTTON_TEXT); } if (keyboard->special_keys & SSD_KEY_SPACE) { ! add_key (roadmap_lang_get ("SPC"), NULL, SSD_BUTTON_TEXT); } } ! void set_title (SsdWidget keyboard, const char *title) { keyboard->set_value (keyboard, title); } ! void set_value (SsdWidget keyboard, const char *title) { ssd_widget_set_value (keyboard, "input", title); } ! void ssd_keyboard_show (int type, const char *title, const char *value, ! SsdDialogCB callback, void *context) { ! SsdKeyboard *keyboard = &def_keyboards[0]; if (!keyboard->widget) { ! ssd_keyboard_new (&def_keyboards[0]); } keyboard->callback = callback; keyboard->context = context; ssd_widget_set_context (keyboard->widget, keyboard); --- 397,494 ---- key2[len] = '\0'; ! if (key1[0] == '|') { ! flags = SSD_START_NEW_ROW; ! continue; ! } ! if (keyboard->flags & SSD_KEYBOARD_LTR) { ! flags |= SSD_ALIGN_LTR; ! } ! if (keyboard->flags & SSD_KEYBOARD_MULTI) { ! add_key (keyboard->widget, key1, key2, SSD_BUTTON_KEY, flags, ! keyboard->key_set); ! } else { ! add_key (keyboard->widget, key1, key2, SSD_BUTTON_TEXT, flags, ! keyboard->key_set); ! } ! flags = 0; ! } if (keyboard->special_keys & SSD_KEY_CONFIRM) { ! add_key (keyboard->widget, roadmap_lang_get ("Ok"), ! NULL, SSD_BUTTON_TEXT, flags, keyboard->key_set); ! flags = 0; } if (keyboard->special_keys & SSD_KEY_BACKSPACE) { ! add_key (keyboard->widget, roadmap_lang_get ("Del"), ! NULL, SSD_BUTTON_TEXT, flags, keyboard->key_set); ! flags = 0; } if (keyboard->special_keys & SSD_KEY_SPACE) { ! add_key (keyboard->widget, roadmap_lang_get ("SPC"), ! NULL, SSD_BUTTON_TEXT, flags, keyboard->key_set); ! flags = 0; ! } ! ! if (keyboard->special_keys & SSD_KEY_SWITCH) { ! add_key (keyboard->widget, roadmap_lang_get ("SWCH"), ! NULL, SSD_BUTTON_TEXT, flags, keyboard->key_set); ! flags = 0; } } ! static void set_title (SsdWidget keyboard, const char *title) { keyboard->set_value (keyboard, title); } ! static void set_value (SsdWidget keyboard, const char *title) { ssd_widget_set_value (keyboard, "input", title); } ! static void hide_extra_key (SsdKeyboard *keyboard) { ! SsdWidget key; ! ! if (!keyboard->extra_key) return; ! ! key = ssd_widget_get (keyboard->widget, keyboard->extra_key); ! ! key->flags |= SSD_WIDGET_HIDE; ! } ! ! ! static void setup_extra_key (SsdKeyboard *keyboard) { ! ! SsdWidget key; ! ! if (!keyboard->extra_key) return; ! ! key = ssd_widget_get (keyboard->widget, keyboard->extra_key); ! ! if (!key) key = add_key (keyboard->widget, ! keyboard->extra_key, keyboard->extra_key, ! SSD_BUTTON_TEXT, 0, keyboard->key_set); ! ! key->flags &= ~SSD_WIDGET_HIDE; ! } ! ! ! static void show_keyboard (SsdKeyboard *keyboard, const char *title, ! const char *value, const char *extra_key, ! SsdDialogCB callback, void *context) { if (!keyboard->widget) { ! ssd_keyboard_new (keyboard); } keyboard->callback = callback; keyboard->context = context; + keyboard->extra_key = extra_key; ssd_widget_set_context (keyboard->widget, keyboard); *************** *** 289,301 **** set_value (keyboard->widget, value); ssd_dialog_activate (keyboard->name, NULL); ssd_dialog_draw (); } ! void ssd_keyboard_hide (int type) { ! SsdKeyboard *keyboard = &def_keyboards[0]; ! ssd_dialog_hide (keyboard->name); } --- 497,535 ---- set_value (keyboard->widget, value); + setup_extra_key (keyboard); + + CurrentKeyboard = keyboard; ssd_dialog_activate (keyboard->name, NULL); + ssd_dialog_draw (); } ! void ssd_keyboard_show (int type, const char *title, const char *value, ! const char *extra_key, SsdDialogCB callback, ! void *context) { ! SsdKeyboard *keyboard; ! unsigned int i; ! ! for (i=0; i < sizeof(keyboards) / sizeof(keyboards[0]); i++) { ! if (keyboards[i].type == type) break; ! } ! ! i = i % (sizeof(keyboards) / sizeof(keyboards[0])); ! ! keyboard = &keyboards[i]; ! ! show_keyboard (keyboard, title, value, extra_key, callback, context); ! } ! ! ! void ssd_keyboard_hide (void) { ! ! if (CurrentKeyboard) { ! hide_extra_key (CurrentKeyboard); ! ssd_dialog_hide (CurrentKeyboard->name); ! CurrentKeyboard = NULL; ! } } Index: ssd_list.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_list.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ssd_list.c 21 Nov 2006 09:32:51 -0000 1.2 --- ssd_list.c 7 Jan 2007 10:19:00 -0000 1.3 *************** *** 48,51 **** --- 48,52 ---- const void **data; int first_row_index; + int selected_row; }; *************** *** 109,112 **** --- 110,114 ---- SsdWidget text = ssd_widget_get (widget, "label"); struct ssd_list_data *data; + int i; data = (struct ssd_list_data *) list->data; *************** *** 114,117 **** --- 116,128 ---- if (!data->callback) return 0; + data->selected_row = -1; + + for (i=0; i<data->num_values; i++) { + if (!strcmp(data->labels[i], text->value)) { + data->selected_row = i; + break; + } + } + return (*data->callback) (list, text->value); } *************** *** 189,192 **** --- 200,212 ---- + static const void *get_data (SsdWidget widget) { + struct ssd_list_data *data = (struct ssd_list_data *) widget->data; + + if (!data || (data->selected_row == -1)) return NULL; + + return data->data[data->selected_row]; + } + + SsdWidget ssd_list_new (const char *name, int width, int height, int flags) { *************** *** 240,243 **** --- 260,265 ---- ssd_widget_add (list_container, list); + list_container->get_data = get_data; + return list_container; } *************** *** 304,308 **** resize (list); ! ssd_list_populate (list, count, labels, NULL, list_callback); ssd_dialog_draw (); --- 326,330 ---- resize (list); ! ssd_list_populate (list, count, labels, values, list_callback); ssd_dialog_draw (); Index: ssd_keyboard.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_keyboard.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_keyboard.h 21 Nov 2006 09:32:51 -0000 1.1 --- ssd_keyboard.h 7 Jan 2007 10:19:00 -0000 1.2 *************** *** 30,41 **** /* key types */ ! #define SSD_KEYBOARD_OK 0x1 #include "ssd_dialog.h" void ssd_keyboard_show (int type, const char *title, const char *value, ! SsdDialogCB callback, void *context); ! void ssd_keyboard_hide (int type); #endif // __SSD_KEYBOARD_H_ --- 30,43 ---- /* key types */ ! #define SSD_KEYBOARD_OK 0x1 ! #define SSD_KEYBOARD_EXTRA 0x2 #include "ssd_dialog.h" void ssd_keyboard_show (int type, const char *title, const char *value, ! const char *extra_key, SsdDialogCB callback, ! void *context); ! void ssd_keyboard_hide (void); #endif // __SSD_KEYBOARD_H_ Index: ssd_text.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_text.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ssd_text.c 17 Nov 2006 16:46:49 -0000 1.2 --- ssd_text.c 7 Jan 2007 10:19:00 -0000 1.3 *************** *** 136,145 **** if (widget->flags & SSD_ALIGN_CENTER) { ! if (ssd_widget_rtl ()) { p.x += (width - text_width) / 2; } else { p.x -= (width - text_width) / 2; } ! } else if (ssd_widget_rtl ()) { p.x += width - text_width; } --- 136,145 ---- if (widget->flags & SSD_ALIGN_CENTER) { ! if (ssd_widget_rtl (NULL)) { p.x += (width - text_width) / 2; } else { p.x -= (width - text_width) / 2; } ! } else if (ssd_widget_rtl (NULL)) { p.x += width - text_width; } Index: ssd_container.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_container.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_container.c 24 Nov 2006 15:38:24 -0000 1.4 --- ssd_container.c 7 Jan 2007 10:19:00 -0000 1.5 *************** *** 127,131 **** if (widget->callback) { ! RoadMapSoundList list = roadmap_sound_list_create (); if (roadmap_sound_list_add (list, "click.wav") != -1) { roadmap_sound_play_list (list); --- 127,131 ---- if (widget->callback) { ! RoadMapSoundList list = roadmap_sound_list_create (0); if (roadmap_sound_list_add (list, "click.wav") != -1) { roadmap_sound_play_list (list); *************** *** 167,170 **** --- 167,178 ---- + static const char *get_value (SsdWidget widget) { + + if (!(widget->flags & SSD_CONTAINER_TITLE)) return ""; + + return ssd_widget_get_value (widget, "title_text"); + } + + SsdWidget ssd_container_new (const char *name, const char *title, int width, int height, int flags) { *************** *** 187,190 **** --- 195,199 ---- w->size.height = height; + w->get_value = get_value; w->set_value = set_value; w->short_click = short_click; Index: ssd_entry.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_entry.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_entry.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_entry.c 7 Jan 2007 10:19:00 -0000 1.4 *************** *** 41,45 **** if (type == SSD_KEYBOARD_OK) { ((SsdWidget)context)->set_value ((SsdWidget)context, new_value); ! ssd_keyboard_hide (SSD_KEYBOARD_LETTERS); } return 1; --- 41,45 ---- if (type == SSD_KEYBOARD_OK) { ((SsdWidget)context)->set_value ((SsdWidget)context, new_value); ! ssd_keyboard_hide (); } return 1; *************** *** 56,61 **** value = widget->get_value (widget); ! ssd_keyboard_show (SSD_KEYBOARD_LETTERS, "", value, keyboard_callback, ! widget); return 1; --- 56,61 ---- value = widget->get_value (widget); ! ssd_keyboard_show (SSD_KEYBOARD_LETTERS, "", value, NULL, ! keyboard_callback, widget); return 1; Index: ssd_widget.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_widget.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_widget.h 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_widget.h 7 Jan 2007 10:19:00 -0000 1.4 *************** *** 41,44 **** --- 41,45 ---- #define SSD_WIDGET_HIDE 0x100 #define SSD_ALIGN_BOTTOM 0x200 + #define SSD_ALIGN_LTR 0x400 /* Buttons flags */ *************** *** 116,120 **** int parent_flags); void ssd_widget_set_callback (SsdWidget widget, SsdCallback callback); ! int ssd_widget_rtl (void); int ssd_widget_pointer_down (SsdWidget widget, const RoadMapGuiPoint *point); --- 117,121 ---- int parent_flags); void ssd_widget_set_callback (SsdWidget widget, SsdCallback callback); ! int ssd_widget_rtl (SsdWidget parent); int ssd_widget_pointer_down (SsdWidget widget, const RoadMapGuiPoint *point); Index: ssd_menu.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_menu.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_menu.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_menu.c 7 Jan 2007 10:19:00 -0000 1.4 *************** *** 104,107 **** --- 104,109 ---- container = ssd_container_new (name, NULL, SSD_MAX_SIZE, SSD_MAX_SIZE, SSD_ALIGN_GRID); + ssd_widget_set_color (dialog, "#000000", "#ffffffee"); + ssd_widget_set_color (container, "#000000", NULL); } Index: ssd_widget.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_widget.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ssd_widget.c 21 Nov 2006 09:32:51 -0000 1.3 --- ssd_widget.c 7 Jan 2007 10:19:00 -0000 1.4 *************** *** 39,42 **** --- 39,44 ---- SsdWidget ssd_widget_get (SsdWidget child, const char *name) { + if (!name) return child; + while (child != NULL) { if (strcmp (child->name, name) == 0) { *************** *** 186,192 **** int bottom = 0; int i; SsdWidget prev_widget; ! if (ssd_widget_rtl ()) cur_x = x; else cur_x = x + width; --- 188,197 ---- int bottom = 0; int i; + int rtl = ssd_widget_rtl(w[0]->parent); SsdWidget prev_widget; ! if (w[0]->flags & SSD_ALIGN_LTR) rtl = 0; ! ! if (rtl) cur_x = x; else cur_x = x + width; *************** *** 213,217 **** if (w[i]->flags & SSD_ALIGN_RIGHT) { cur_x += w[i]->offset_x; ! if (ssd_widget_rtl ()) { if ((i < (count-1)) && (w[i+1]->flags & SSD_WIDGET_SPACE)) { cur_x += SSD_WIDGET_SEP; --- 218,222 ---- if (w[i]->flags & SSD_ALIGN_RIGHT) { cur_x += w[i]->offset_x; ! if (rtl) { if ((i < (count-1)) && (w[i+1]->flags & SSD_WIDGET_SPACE)) { cur_x += SSD_WIDGET_SEP; *************** *** 237,241 **** } ! if (ssd_widget_rtl ()) cur_x = x + width; else cur_x = x; --- 242,246 ---- } ! if (rtl) cur_x = x + width; else cur_x = x; *************** *** 251,255 **** ssd_widget_get_size (w[0], &size, NULL); ! if (ssd_widget_rtl ()) { cur_x -= size.width; cur_x -= w[0]->offset_x; --- 256,260 ---- ssd_widget_get_size (w[0], &size, NULL); ! if (rtl) { cur_x -= size.width; cur_x -= w[0]->offset_x; *************** *** 294,298 **** ssd_widget_get_size (w[i], &size, NULL); ! if (ssd_widget_rtl ()) { cur_x -= space; cur_x -= size.width; --- 299,303 ---- ssd_widget_get_size (w[i], &size, NULL); ! if (rtl) { cur_x -= space; cur_x -= size.width; *************** *** 319,333 **** int space; int i; ! /* align center */ space = (width - avg_width*count) / (count + 1); ! if (ssd_widget_rtl ()) cur_x = x + width; else cur_x = x; for (i=0; i<count; i++) { ! if (ssd_widget_rtl ()) { cur_x -= space; cur_x -= avg_width; --- 324,340 ---- int space; int i; + int rtl = ssd_widget_rtl (w[0]->parent); ! if (w[0]->flags & SSD_ALIGN_LTR) rtl = 0; + /* align center */ space = (width - avg_width*count) / (count + 1); ! if (rtl) cur_x = x + width; else cur_x = x; for (i=0; i<count; i++) { ! if (rtl) { cur_x -= space; cur_x -= avg_width; *************** *** 435,438 **** --- 442,450 ---- SsdSize max_size; + if (w->flags & SSD_WIDGET_HIDE) { + w = w->next; + continue; + } + if (!count) { width = rect->maxx - rect->minx + 1; *************** *** 561,566 **** ! int ssd_widget_rtl (void) { ! return roadmap_lang_rtl (); } --- 573,580 ---- ! int ssd_widget_rtl (SsdWidget parent) { ! ! if (parent && (parent->flags & SSD_ALIGN_LTR)) return 0; ! else return roadmap_lang_rtl (); } *************** *** 621,625 **** const char *ssd_widget_get_value (const SsdWidget widget, const char *name) { ! SsdWidget w = ssd_widget_get (widget, name); if (!w) return ""; --- 635,641 ---- const char *ssd_widget_get_value (const SsdWidget widget, const char *name) { ! SsdWidget w = widget; ! ! if (name) w = ssd_widget_get (w, name); if (!w) return ""; *************** *** 632,636 **** const void *ssd_widget_get_data (const SsdWidget widget, const char *name) { SsdWidget w = ssd_widget_get (widget, name); ! if (!w) return ""; if (w->get_data) return w->get_data (w); --- 648,652 ---- const void *ssd_widget_get_data (const SsdWidget widget, const char *name) { SsdWidget w = ssd_widget_get (widget, name); ! if (!w) return NULL; if (w->get_data) return w->get_data (w); *************** *** 708,713 **** if (!max && (w->cached_size.width < 0)) { ! roadmap_log (ROADMAP_FATAL, ! "ssd_widget_get_size called without max, and no size cache!"); } --- 724,733 ---- if (!max && (w->cached_size.width < 0)) { ! /* roadmap_log (ROADMAP_FATAL, ! "ssd_widget_get_size called without max, and no size cache!");*/ ! static SsdSize canvas_size; ! canvas_size.width = roadmap_canvas_width(); ! canvas_size.height = roadmap_canvas_height(); ! max = &canvas_size; } Index: ssd_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_dialog.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ssd_dialog.c 24 Nov 2006 11:09:56 -0000 1.4 --- ssd_dialog.c 7 Jan 2007 10:19:00 -0000 1.5 *************** *** 32,39 **** #include "roadmap.h" #include "roadmap_types.h" - #include "roadmap_start.h" #include "roadmap_lang.h" #include "roadmap_pointer.h" ! #include "roadmap_screen.h" #include "ssd_widget.h" --- 32,39 ---- #include "roadmap.h" #include "roadmap_types.h" #include "roadmap_lang.h" + #include "roadmap_main.h" #include "roadmap_pointer.h" ! #include "roadmap_start.h" #include "ssd_widget.h" *************** *** 66,69 **** --- 66,70 ---- static int RoadMapScreenFrozen = 0; + static int RoadMapDialogKeyEnabled = 0; static SsdDialog ssd_dialog_get (const char *name) { *************** *** 676,679 **** --- 677,693 ---- #endif + + static void ssd_dialog_enable_callback (void) { + RoadMapDialogKeyEnabled = 1; + roadmap_main_remove_periodic (ssd_dialog_enable_callback); + } + + + static void ssd_dialog_disable_key (void) { + RoadMapDialogKeyEnabled = 0; + roadmap_main_set_periodic (350, ssd_dialog_enable_callback); + } + + static int ssd_dialog_pressed (RoadMapGuiPoint *point) { SsdWidget container = RoadMapDialogCurrent->container; *************** *** 683,689 **** } LastPointerPoint = *point; ssd_widget_pointer_down (RoadMapDialogCurrent->container, point); ! roadmap_screen_redraw (); return 1; } --- 697,708 ---- } + if (!RoadMapDialogKeyEnabled) { + LastPointerPoint.x = -1; + return 1; + } + LastPointerPoint = *point; ssd_widget_pointer_down (RoadMapDialogCurrent->container, point); ! roadmap_start_redraw (); return 1; } *************** *** 691,698 **** static int ssd_dialog_short_click (RoadMapGuiPoint *point) { if (LastPointerPoint.x < 0) { ! return 0; } ssd_widget_short_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_screen_redraw (); return 1; --- 710,722 ---- static int ssd_dialog_short_click (RoadMapGuiPoint *point) { if (LastPointerPoint.x < 0) { ! SsdWidget container = RoadMapDialogCurrent->container; ! if (ssd_widget_find_by_pos (container, point)) { ! return 1; ! } else { ! return 0; ! } } ssd_widget_short_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_start_redraw (); return 1; *************** *** 701,708 **** static int ssd_dialog_long_click (RoadMapGuiPoint *point) { if (!LastPointerPoint.x < 0) { ! return 0; } ssd_widget_long_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_screen_redraw (); return 1; --- 725,737 ---- static int ssd_dialog_long_click (RoadMapGuiPoint *point) { if (!LastPointerPoint.x < 0) { ! SsdWidget container = RoadMapDialogCurrent->container; ! if (ssd_widget_find_by_pos (container, point)) { ! return 1; ! } else { ! return 0; ! } } ssd_widget_long_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_start_redraw (); return 1; *************** *** 790,793 **** --- 819,823 ---- SsdWidget ssd_dialog_activate (const char *name, void *context) { + SsdDialog prev = NULL; SsdDialog current = RoadMapDialogCurrent; SsdDialog dialog = ssd_dialog_get (name); *************** *** 798,805 **** --- 828,841 ---- while (current && strcmp(current->name, name)) { + prev = current; current = current->activated_prev; } if (current) { + if (prev) { + prev->activated_prev = current->activated_prev; + current->activated_prev = RoadMapDialogCurrent; + RoadMapDialogCurrent = current; + } return current->container; } *************** *** 822,829 **** if (!RoadMapScreenFrozen && !(dialog->container->flags & SSD_DIALOG_FLOAT)) { ! roadmap_screen_freeze (); RoadMapScreenFrozen = 1; } return dialog->container; /* Tell the caller the dialog already exists. */ } --- 858,866 ---- if (!RoadMapScreenFrozen && !(dialog->container->flags & SSD_DIALOG_FLOAT)) { ! roadmap_start_screen_refresh (0); RoadMapScreenFrozen = 1; } + ssd_dialog_disable_key (); return dialog->container; /* Tell the caller the dialog already exists. */ } *************** *** 850,854 **** } ! if (!RoadMapDialogCurrent) { roadmap_pointer_unregister_pressed (ssd_dialog_pressed); roadmap_pointer_unregister_short_click (ssd_dialog_short_click); --- 887,893 ---- } ! if (RoadMapDialogCurrent) { ! ssd_dialog_disable_key (); ! } else { roadmap_pointer_unregister_pressed (ssd_dialog_pressed); roadmap_pointer_unregister_short_click (ssd_dialog_short_click); *************** *** 872,876 **** RoadMapScreenFrozen = 0; ! roadmap_screen_unfreeze (); } --- 911,915 ---- RoadMapScreenFrozen = 0; ! roadmap_start_screen_refresh (1); } |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:17:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7304 Added Files: click.wav click_long.wav Log Message: Add click sounds. --- NEW FILE: click_long.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: click.wav --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:16:52
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7267 Modified Files: navigate_main.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: navigate_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** navigate_main.c 24 Nov 2006 11:08:35 -0000 1.17 --- navigate_main.c 7 Jan 2007 10:16:48 -0000 1.18 *************** *** 430,434 **** NavigateDistanceToTurn <= 10) { ! sound_list = roadmap_sound_list_create (); roadmap_sound_list_add (sound_list, "Arrive.wav"); roadmap_sound_play_list (sound_list); --- 430,434 ---- NavigateDistanceToTurn <= 10) { ! sound_list = roadmap_sound_list_create (0); roadmap_sound_list_add (sound_list, "Arrive.wav"); roadmap_sound_play_list (sound_list); *************** *** 494,498 **** roadmap_message_set ('C', properties.city); ! sound_list = roadmap_sound_list_create (); if (!NavigateNextAnnounce) { roadmap_message_unset ('w'); --- 494,498 ---- roadmap_message_set ('C', properties.city); ! sound_list = roadmap_sound_list_create (0); if (!NavigateNextAnnounce) { roadmap_message_unset ('w'); |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:15:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6857 Modified Files: Makefile roadmap_libpng.c roadmap_main.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 21 Nov 2006 09:29:21 -0000 1.12 --- Makefile 7 Jan 2007 10:15:10 -0000 1.13 *************** *** 123,127 **** gtkroadgps: roadmap_main.o ../libguiroadgps.a $(RDMLIBS) ! $(CXX) $(LDFLAGS) roadmap_main.o -o gtkroadgps ../libguiroadgps.a $(LIBS) ../libssd_widgets.a: --- 123,127 ---- gtkroadgps: roadmap_main.o ../libguiroadgps.a $(RDMLIBS) ! $(CXX) $(LDFLAGS) roadmap_main.o -o gtkroadgps $(SSDLIB) ../libguiroadgps.a $(LIBS) $(SSDLIB) ../libguiroadgps.a $(RDMLIBS) ../libssd_widgets.a: Index: roadmap_libpng.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_libpng.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_libpng.c 21 Nov 2006 09:29:21 -0000 1.1 --- roadmap_libpng.c 7 Jan 2007 10:15:10 -0000 1.2 *************** *** 31,44 **** int y; ! char header[8]; // 8 is the maximum size that can be checked ! unsigned char *buf; FILE *fp; ! /* open file and test for it being a png */ ! fp = fopen(file_name, "rb"); ! if (!fp) return NULL; ! fread(header, 1, 8, fp); ! if (png_sig_cmp(header, 0, 8)) { roadmap_log (ROADMAP_ERROR, "[read_png_file] File %s is not recognized as a PNG file", --- 31,44 ---- int y; ! char header[8]; // 8 is the maximum size that can be checked ! unsigned char *buf; FILE *fp; ! /* open file and test for it being a png */ ! fp = fopen(file_name, "rb"); ! if (!fp) return NULL; ! fread(header, 1, 8, fp); ! if (png_sig_cmp(header, 0, 8)) { roadmap_log (ROADMAP_ERROR, "[read_png_file] File %s is not recognized as a PNG file", *************** *** 48,55 **** } ! /* initialize stuff */ ! png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); ! ! if (!png_ptr) { roadmap_log (ROADMAP_ERROR, "[read_png_file] png_create_read_struct failed"); --- 48,55 ---- } ! /* initialize stuff */ ! png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); ! ! if (!png_ptr) { roadmap_log (ROADMAP_ERROR, "[read_png_file] png_create_read_struct failed"); *************** *** 58,71 **** } ! info_ptr = png_create_info_struct(png_ptr); ! if (!info_ptr) { roadmap_log (ROADMAP_ERROR, ! "[read_png_file] png_create_info_struct failed"); fclose(fp); return NULL; } ! if (setjmp(png_jmpbuf(png_ptr))) { roadmap_log (ROADMAP_ERROR, "[read_png_file] Error during init_io"); fclose(fp); --- 58,71 ---- } ! info_ptr = png_create_info_struct(png_ptr); ! if (!info_ptr) { roadmap_log (ROADMAP_ERROR, ! "[read_png_file] png_create_info_struct failed"); fclose(fp); return NULL; } ! if (setjmp(png_jmpbuf(png_ptr))) { roadmap_log (ROADMAP_ERROR, "[read_png_file] Error during init_io"); fclose(fp); *************** *** 73,92 **** } ! png_init_io(png_ptr, fp); ! png_set_sig_bytes(png_ptr, 8); ! png_read_info(png_ptr, info_ptr); ! *width = info_ptr->width; ! *height = info_ptr->height; *stride = info_ptr->rowbytes; ! color_type = info_ptr->color_type; ! bit_depth = info_ptr->bit_depth; ! number_of_passes = png_set_interlace_handling(png_ptr); ! png_read_update_info(png_ptr, info_ptr); ! /* read file */ ! if (setjmp(png_jmpbuf(png_ptr))) { roadmap_log (ROADMAP_ERROR, "[read_png_file] Error during read_image"); fclose(fp); --- 73,92 ---- } ! png_init_io(png_ptr, fp); ! png_set_sig_bytes(png_ptr, 8); ! png_read_info(png_ptr, info_ptr); ! *width = info_ptr->width; ! *height = info_ptr->height; *stride = info_ptr->rowbytes; ! color_type = info_ptr->color_type; ! bit_depth = info_ptr->bit_depth; ! number_of_passes = png_set_interlace_handling(png_ptr); ! png_read_update_info(png_ptr, info_ptr); ! /* read file */ ! if (setjmp(png_jmpbuf(png_ptr))) { roadmap_log (ROADMAP_ERROR, "[read_png_file] Error during read_image"); fclose(fp); *************** *** 94,108 **** } ! row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * *height); ! buf = malloc (*height * info_ptr->rowbytes); ! for (y=0; y<*height; y++) { ! row_pointers[y] = (png_byte*) (buf + y * info_ptr->rowbytes); } ! png_read_image(png_ptr, row_pointers); fclose(fp); ! return buf; } --- 94,111 ---- } ! row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * *height); ! buf = malloc (*height * info_ptr->rowbytes); ! for (y=0; y<*height; y++) { ! row_pointers[y] = (png_byte*) (buf + y * info_ptr->rowbytes); } ! png_read_image(png_ptr, row_pointers); ! png_read_end(png_ptr, NULL); ! png_destroy_read_struct (&png_ptr, &info_ptr, NULL); ! free (row_pointers); fclose(fp); ! return buf; } Index: roadmap_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_main.c 17 Nov 2006 16:49:48 -0000 1.6 --- roadmap_main.c 7 Jan 2007 10:15:10 -0000 1.7 *************** *** 291,295 **** GtkWidget *menu_item; - return; if (RoadMapMainMenuBar == NULL) { --- 291,294 ---- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:14:06
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6416/export Modified Files: editor_sync.c editor_upload.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: editor_sync.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_sync.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** editor_sync.c 3 Nov 2006 12:41:38 -0000 1.5 --- editor_sync.c 7 Jan 2007 10:14:02 -0000 1.6 *************** *** 81,85 **** if (roadmap_dialog_activate ("Sync process", NULL)) { ! const char *icon = roadmap_path_join (roadmap_path_user(), "icons/sync.bmp"); roadmap_dialog_new_image ("Sync", icon); roadmap_dialog_new_label ("Sync", "Progress status"); --- 81,85 ---- if (roadmap_dialog_activate ("Sync process", NULL)) { ! const char *icon = roadmap_path_join (roadmap_path_user(), "skins/default/sync.bmp"); roadmap_dialog_new_image ("Sync", icon); roadmap_dialog_new_label ("Sync", "Progress status"); Index: editor_upload.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** editor_upload.c 15 Oct 2006 10:51:05 -0000 1.9 --- editor_upload.c 7 Jan 2007 10:14:02 -0000 1.10 *************** *** 629,635 **** ("preferences", &RoadMapConfigTarget, ! "http://www.freemap.co.il/upload/upload_rm.php"); ! roadmap_config_declare ("preferences", &RoadMapConfigUser, ""); roadmap_config_declare_password ("preferences", &RoadMapConfigPassword, ""); } --- 629,635 ---- ("preferences", &RoadMapConfigTarget, ! "http://www.freemap.co.il/upload/upload_rm.php", NULL); ! roadmap_config_declare ("preferences", &RoadMapConfigUser, "", NULL); roadmap_config_declare_password ("preferences", &RoadMapConfigPassword, ""); } |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:14:06
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6416 Modified Files: editor_main.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** editor_main.c 24 Nov 2006 15:39:15 -0000 1.21 --- editor_main.c 7 Jan 2007 10:14:02 -0000 1.22 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 pre4"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 rc2"; void editor_main_check_map (void) { |
