Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: andi <bod...@us...> - 2008-01-05 16:10:30
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22865 Modified Files: Makefile.am Added Files: gc_event.xpm gc_multi.xpm gc_mystery.xpm gc_question.xpm gc_reference.xpm gc_stages.xpm gc_tradi.xpm gc_webcam.xpm Log Message: added Geocaching icons --- NEW FILE: gc_mystery.xpm --- /* XPM */ static char *gc_mystery[] = { /* columns rows colors chars-per-pixel */ "16 16 18 1", " c black", ". c #000041", "X c #003041", "o c #396500", "O c #7B0041", "+ c #414141", "@ c #00308B", "# c #0030B4", "$ c #7B008B", "% c #7B658B", "& c #399500", "* c #009541", "= c #0095B4", "- c #7B95B4", "; c none", ": c #838383", "> c #BD95B4", ", c #C5C5C5", /* pixels */ ";;;;;;;;;;;;;;;;", ";;;;;:$$O:;;;;;;", ";;;;+X###%o;;;;;", ";;;:@#XX@#-o;;;;", ";;;*#X,;:@#-;;;;", ";;;*#%O;;X#%;;;;", ";;;>X#%,;X#&;;;;", ";;;;>*$;*#o;;;;;", ";;;;;;;+X+;;;;;;", ";;;;;;,X$;;;;;;;", ";;;;;;$ :;;;;;;;", ";;;;;;,+,;;;;;;;", ";;;;;:.#+:;;;;;;", ";;;;;:X=+:;;;;;;", ";;;;;;:$:;;;;;;;", ";;;;;;;;;;;;;;;;" }; --- NEW FILE: gc_stages.xpm --- /* XPM */ static char *gc_stages[] = { /* columns rows colors chars-per-pixel */ "16 16 23 1", " c black", ". c #802000", "X c #804000", "o c #A04000", "O c #A06000", "+ c #804040", "@ c #806040", "# c #A06040", "$ c #C06040", "% c #A08040", "& c #C08040", "* c #808080", "= c #A08080", "- c #A0A0A4", "; c #C08080", ": c #C0A080", "> c #E0A080", ", c #C0A0C0", "< c #C0C080", "1 c #C0C0C0", "2 c #C0DCC0", "3 c #FFFBF0", "4 c gray100", /* pixels */ " ", " 41-:3444434434 ", " 3#..#244444444 ", " 1X.X.;43444344 ", " 1X.X.%4442:=14 ", " 3@.oX%433#..@3 ", " 4:Xo##34-.X..1 ", " 43&#&:33:..XX1 ", " 442<33,31XXoX1 ", " 3441+X#42#OX$3 ", " 4443=&:33&&&>3 ", " 44433334333434 ", " 44434444,++*34 ", " 444444431%#:44 ", " 44444443332334 ", " " }; --- NEW FILE: gc_event.xpm --- /* XPM */ static char *gc_event[] = { /* columns rows colors chars-per-pixel */ "16 16 19 1", " c #393000", ". c #393041", "X c #396541", "o c #7B3041", "O c #7B6541", "+ c #7B008B", "@ c #7B308B", "# c #7B658B", "$ c #399541", "% c #7B9541", "& c #7B958B", "* c none", "= c #BD9541", "- c #838383", "; c #BD95B4", ": c #BDCAB4", "> c #FFCA8B", ", c #C5C5C5", "< c gray100", /* pixels */ "****************", "****************", "*****+$&&%o*****", "***$O>>>>>>=.***", "** >><<<<<<<>X**", "*X><<,,,,,,,<<.*", "*%><<--;;;;;<<:-", "*%><<<<,,,,,<<<+", "*%><<<<----;<<:-", "*o:<<<<<<<<<<< *", "** ,<<<<<<<<< **", "***#X;<<<<<<X***", "*****-+%&o&%****", "**********X@****", "**********+*****", "****************" }; --- NEW FILE: gc_tradi.xpm --- /* XPM */ static char *gc_tradi[] = { /* columns rows colors chars-per-pixel */ "16 16 19 1", " c black", ". c #003000", "X c #393000", "o c #393041", "O c #396500", "+ c #396541", "@ c #414141", "# c #7B6541", "$ c #7B308B", "% c #7B658B", "& c #399541", "* c #7B9541", "= c #7B958B", "- c none", "; c #838383", ": c #BD95B4", "> c #BDCAB4", ", c #C5C5C5", "< c gray100", /* pixels */ "----------------", "----------------", "----------------", "-------%X+@++ -", "------oOOXO+oo+-", "----+@OXO*oo@>$-", "--&@*+#*@oo;<<=-", "-.@@@@@o ;<<<<*-", "-X@@@oo@<<<<<+--", "-+ oo@<%<<<:+---", "-X<,<<<#<<+-----", "-.<<<<<%=+------", "--&====+--------", "----------------", "----------------", "----------------" }; --- NEW FILE: gc_multi.xpm --- /* XPM */ static char *gc_multi[] = { /* columns rows colors chars-per-pixel */ "16 16 28 1", " c black", ". c #003000", "X c #393000", "o c #390041", "O c #393041", "+ c #396500", "@ c #396541", "# c #7B3000", "$ c #7B0041", "% c #7B6500", "& c #414141", "* c #7B008B", "= c #7B308B", "- c #7B658B", "; c #7B9500", ": c #7B9541", "> c #7B958B", ", c #7B95B4", "< c #FF3000", "1 c none", "2 c #BD9500", "3 c #BDCA00", "4 c #FF9500", "5 c #FFCA00", "6 c yellow", "7 c #838383", "8 c #BDCAB4", "9 c gray100", /* pixels */ "1111111111111111", "1111111111111111", "1111=;######%..1", "11- %2222222;3+1", "117;%%%%%%%;X:*1", "111@99&2456X 9*1", "111O-%4<4;;& 9$1", "11-;4<4;;;,9 @11", "1.#222X;-999o111", "1+;%%; 9999@1111", "1OX%X9&99>@11111", "1.9899&9X>111111", "1=:>:>X=11111111", "1111111111111111", "1111111111111111", "1111111111111111" }; --- NEW FILE: gc_question.xpm --- /* XPM */ static char *gc_question[] = { /* columns rows colors chars-per-pixel */ "16 16 3 1", " c black", ". c none", "X c gray100", /* pixels */ ".....XXXX.......", "....XX XX......", "....X X......", "....X X......", ".XXXXX XXXX....", "X X....", "X XXX..", "X XX X X.", ".X..X X", ".X..X X", "X XX X X.", "X XXX..", "X XX X....", "X X..X X....", "X XX X....", ".XXXXX..XXX....." }; --- NEW FILE: gc_webcam.xpm --- /* XPM */ static char *gc_webcam[] = { /* columns rows colors chars-per-pixel */ "16 16 22 1", " c black", ". c #393000", "X c #393041", "o c #006500", "O c #396541", "+ c #7B3041", "@ c #414141", "# c #7B6541", "$ c #7B008B", "% c #7B308B", "& c #7B658B", "* c #7B9541", "= c #7B958B", "- c #7BCA8B", "; c #BD308B", ": c #BD30B4", "> c none", ", c #838383", "< c #BD95B4", "1 c #BDCAB4", "2 c #C5C5C5", "3 c gray100", /* pixels */ ">>>>>>:$$;>>>>>>", ">>>>>.1333=2>>>>", ">>>>.3322331,>>>", ">>>O33 @@ 13->>>", ">>>X3@2,&,X312>>", ">>>*3&2<<,X31,>>", ">>>O3#3,<< 3<,>>", ">>>O3<,3<@&3O,>>", ">>>,O32##<3<&>>>", ">>>>&X1333O+>>>>", ">>>>>>OXXO>>>>>>", ">>>>>>: @:>>>>>>", ">>>>>>:.=:>>>>>>", ">>>>>&*<=@%>>>>>", ">>>>oO<<<O@ >>>>", ">>>>>>>>>>>>>>>>" }; --- NEW FILE: gc_reference.xpm --- /* XPM */ static char *gc_reference[] = { /* columns rows colors chars-per-pixel */ "16 16 18 1", " c #00656A", ". c #00658B", "X c #39658B", "o c #39958B", "O c #3995B4", "+ c #7B958B", "@ c #7B95B4", "# c #7BCAB4", "$ c #7BCAD5", "% c none", "& c #B4B4B4", "* c #BDCAD5", "= c #BDCAFF", "- c #C5C5C5", "; c #D5D5D5", ": c #FFFFD5", "> c #E6E6E6", ", c gray100", /* pixels */ "%%%%%%%%%%%%%%%%", "%%%%%**&$*;%%%%%", "%%%%@#*=;-#@%%%%", "%%%@*,>,>,>*@%%%", "%%@*,,,,,,>>*%%%", "%*#,,,>$*>,,>@;%", "%&*,,*o. O>,>**%", "%$>,>@.X..*,,;$%", "%&>,>@ .X $,,;*%", "%$*,:*X..o>,,*$%", "%*#,,;*@@;,,>#*%", "%%@*,,>>,,,,*@%%", "%%%@*,,,,,,*+%%%", "%%%%@#*>>*#@%%%%", "%%%%%*&&$&*%%%%%", "%%%%%%%%%%%%%%%%" }; Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 4 Jan 2008 18:16:07 -0000 1.8 --- Makefile.am 5 Jan 2008 16:10:27 -0000 1.9 *************** *** 1,4 **** include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm EXTRA_DIST = $(xpm_DATA) #burgerking.ico: --- 1,5 ---- include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm ! gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm EXTRA_DIST = $(xpm_DATA) #burgerking.ico: |
|
From: Martin S. <mar...@us...> - 2008-01-05 12:56:54
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12876 Modified Files: item_def.h Log Message: Fix:Core:make new definitions from wiki Index: item_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/item_def.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** item_def.h 24 Nov 2007 12:40:25 -0000 1.13 --- item_def.h 5 Jan 2008 12:56:58 -0000 1.14 *************** *** 197,203 **** ITEM(rg_point) ITEM(point_unkn) ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) - /* Line */ ITEM(border_country) ITEM(border_state) --- 197,204 ---- ITEM(rg_point) ITEM(point_unkn) + ITEM(traffic_signals) + /* Line */ ITEM2(0x80000000,line) ITEM2(0x80000001,line_unspecified) ITEM(border_country) ITEM(border_state) *************** *** 235,239 **** ITEM(marine_hazard) ITEM(roundabout) - /* Area */ ITEM2(0xc0000000,area) --- 236,239 ---- |
|
From: Martin S. <mar...@us...> - 2008-01-05 12:48:32
|
Update of /cvsroot/navit/navit/src/script In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9942 Modified Files: wiki2def Log Message: Fix:Tools:Changed path to new wiki Index: wiki2def =================================================================== RCS file: /cvsroot/navit/navit/src/script/wiki2def,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wiki2def 19 Nov 2007 09:07:34 -0000 1.1 --- wiki2def 5 Jan 2008 12:48:31 -0000 1.2 *************** *** 4,8 **** IFS="|" type="n" ! wget -O - "http://navit.sourceforge.net/wiki/index.php/Item_def.h?action=edit" | awk '/<textarea/,/<\/textarea/ { print $0 }' | grep "^| " | --- 4,8 ---- IFS="|" type="n" ! wget -O - "http://wiki.navit-project.org/index.php/Item_def.h?action=edit" | awk '/<textarea/,/<\/textarea/ { print $0 }' | grep "^| " | |
|
From: Michael F. <ho...@us...> - 2008-01-05 00:01:20
|
Update of /cvsroot/navit/navit/src/binding/python In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17191/src/binding/python Modified Files: binding_python.c Log Message: Fix:Core:Revert patch. No need to #include <glib.h> twice. Index: binding_python.c =================================================================== RCS file: /cvsroot/navit/navit/src/binding/python/binding_python.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** binding_python.c 4 Jan 2008 22:10:11 -0000 1.5 --- binding_python.c 5 Jan 2008 00:01:23 -0000 1.6 *************** *** 5,9 **** #include "coord.h" #include "projection.h" - #include <glib.h> #include "map.h" #include "mapset.h" --- 5,8 ---- |
|
From: Martin S. <mar...@us...> - 2008-01-04 22:10:08
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32108/gui/gtk Modified Files: datawindow.c Log Message: Fix:Core:Applied patch from diekhans for better posix compatibility Index: datawindow.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/datawindow.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** datawindow.c 11 Aug 2007 20:13:13 -0000 1.6 --- datawindow.c 4 Jan 2008 22:10:11 -0000 1.7 *************** *** 1,3 **** - #include <malloc.h> #include <stdlib.h> #include <stdio.h> --- 1,2 ---- |
|
From: Martin S. <mar...@us...> - 2008-01-04 22:10:08
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32108 Modified Files: file.c main.c osm2navit.c param.c Log Message: Fix:Core:Applied patch from diekhans for better posix compatibility Index: param.c =================================================================== RCS file: /cvsroot/navit/navit/src/param.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** param.c 2 Dec 2005 10:41:56 -0000 1.1 --- param.c 4 Jan 2008 22:10:11 -0000 1.2 *************** *** 1,5 **** #include <stdio.h> #include <string.h> ! #include <malloc.h> #include "param.h" --- 1,5 ---- #include <stdio.h> #include <string.h> ! #include <stdlib.h> #include "param.h" Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** osm2navit.c 3 Jan 2008 22:55:51 -0000 1.23 --- osm2navit.c 4 Jan 2008 22:10:11 -0000 1.24 *************** *** 4,8 **** #include <glib.h> #include <assert.h> - #include <malloc.h> #include <string.h> #include <signal.h> --- 4,7 ---- *************** *** 721,725 **** { FILE *f; ! f=fopen64(filename,"wb+"); fwrite(b->base, b->size, 1, f); fclose(f); --- 720,724 ---- { FILE *f; ! f=fopen(filename,"wb+"); fwrite(b->base, b->size, 1, f); fclose(f); *************** *** 733,737 **** free(b->base); b->malloced=0; ! f=fopen64(filename,"rb"); fseek(f, 0, SEEK_END); b->size=b->malloced=ftell(f); --- 732,736 ---- free(b->base); b->malloced=0; ! f=fopen(filename,"rb"); fseek(f, 0, SEEK_END); b->size=b->malloced=ftell(f); *************** *** 1034,1038 **** strcat(buffer,".bin"); #endif ! f=fopen64(buffer, "wb+"); while (th) { fwrite(th->data, th->size, 1, f); --- 1033,1037 ---- strcat(buffer,".bin"); #endif ! f=fopen(buffer, "wb+"); while (th) { fwrite(th->data, th->size, 1, f); *************** *** 1761,1767 **** if (start == 1) { if (process_ways) ! ways=fopen64("ways.tmp","wb+"); if (process_nodes) ! nodes=fopen64("nodes.tmp","wb+"); phase=1; fprintf(stderr,"PROGRESS: Phase 1: collecting data\n"); --- 1760,1766 ---- if (start == 1) { if (process_ways) ! ways=fopen("ways.tmp","wb+"); if (process_nodes) ! nodes=fopen("nodes.tmp","wb+"); phase=1; fprintf(stderr,"PROGRESS: Phase 1: collecting data\n"); *************** *** 1780,1785 **** if (start <= 2) { if (process_ways) { ! ways=fopen64("ways.tmp","rb"); ! ways_split=fopen64("ways_split.tmp","wb+"); phase=2; fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n"); --- 1779,1784 ---- if (start <= 2) { if (process_ways) { ! ways=fopen("ways.tmp","rb"); ! ways_split=fopen("ways_split.tmp","wb+"); phase=2; fprintf(stderr,"PROGRESS: Phase 2: finding intersections\n"); *************** *** 1802,1809 **** fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n"); if (process_ways) ! ways_split=fopen64("ways_split.tmp","rb"); if (process_nodes) ! nodes=fopen64("nodes.tmp","rb"); ! tilesdir=fopen64("tilesdir.tmp","wb+"); phase3(ways_split,nodes,tilesdir); fclose(tilesdir); --- 1801,1808 ---- fprintf(stderr,"PROGRESS: Phase 3: generating tiles\n"); if (process_ways) ! ways_split=fopen("ways_split.tmp","rb"); if (process_nodes) ! nodes=fopen("nodes.tmp","rb"); ! tilesdir=fopen("tilesdir.tmp","wb+"); phase3(ways_split,nodes,tilesdir); fclose(tilesdir); *************** *** 1819,1827 **** fprintf(stderr,"PROGRESS: Phase 4: assembling map\n"); if (process_ways) ! ways_split=fopen64("ways_split.tmp","rb"); if (process_nodes) ! nodes=fopen64("nodes.tmp","rb"); ! res=fopen64(result,"wb+"); ! zipdir=fopen64("zipdir.tmp","wb+"); phase4(ways_split,nodes,res,zipdir,compression_level); fclose(zipdir); --- 1818,1826 ---- fprintf(stderr,"PROGRESS: Phase 4: assembling map\n"); if (process_ways) ! ways_split=fopen("ways_split.tmp","rb"); if (process_nodes) ! nodes=fopen("nodes.tmp","rb"); ! res=fopen(result,"wb+"); ! zipdir=fopen("zipdir.tmp","wb+"); phase4(ways_split,nodes,res,zipdir,compression_level); fclose(zipdir); Index: main.c =================================================================== RCS file: /cvsroot/navit/navit/src/main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** main.c 3 Jan 2008 11:13:34 -0000 1.22 --- main.c 4 Jan 2008 22:10:10 -0000 1.23 *************** *** 7,10 **** --- 7,11 ---- #include <sys/types.h> #include <sys/wait.h> + #include <signal.h> #include <unistd.h> #include <libintl.h> Index: file.c =================================================================== RCS file: /cvsroot/navit/navit/src/file.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** file.c 27 Nov 2007 11:10:18 -0000 1.9 --- file.c 4 Jan 2008 22:10:10 -0000 1.10 *************** *** 15,18 **** --- 15,22 ---- #include "file.h" + #ifndef O_LARGEFILE + #define O_LARGEFILE 0 + #endif + static struct file *file_list; |
|
From: Martin S. <mar...@us...> - 2008-01-04 22:10:08
|
Update of /cvsroot/navit/navit/src/binding/python In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32108/binding/python Modified Files: binding_python.c Log Message: Fix:Core:Applied patch from diekhans for better posix compatibility Index: binding_python.c =================================================================== RCS file: /cvsroot/navit/navit/src/binding/python/binding_python.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** binding_python.c 4 Jan 2008 08:34:30 -0000 1.4 --- binding_python.c 4 Jan 2008 22:10:11 -0000 1.5 *************** *** 5,8 **** --- 5,9 ---- #include "coord.h" #include "projection.h" + #include <glib.h> #include "map.h" #include "mapset.h" |
|
From: Martin S. <mar...@us...> - 2008-01-04 21:42:04
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20640 Modified Files: gui_gtk_statusbar.c Log Message: Fix:Gtk:Correct ETA estimation Index: gui_gtk_statusbar.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gui_gtk_statusbar.c 28 Dec 2007 10:45:39 -0000 1.6 --- gui_gtk_statusbar.c 4 Jan 2008 21:42:07 -0000 1.7 *************** *** 95,99 **** if (!item_attr_get(item, attr_destination_time, &attr)) return; ! eta=time(NULL)+attr.u.num; eta_tm=localtime(&eta); navigation_list_destroy(list); --- 95,99 ---- if (!item_attr_get(item, attr_destination_time, &attr)) return; ! eta=time(NULL)+attr.u.num/10; eta_tm=localtime(&eta); navigation_list_destroy(list); |
|
From: Martin S. <mar...@us...> - 2008-01-04 20:18:13
|
Update of /cvsroot/navit/navit/src/vehicle/demo In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10190/vehicle/demo Modified Files: vehicle_demo.c Log Message: Fix:Core:Cleaned up routing api Index: vehicle_demo.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** vehicle_demo.c 3 Jan 2008 11:13:38 -0000 1.9 --- vehicle_demo.c 4 Jan 2008 20:18:15 -0000 1.10 *************** *** 96,100 **** } priv->last = pos; ! while (item) { if (!item_coord_get(item, &c, 1)) { item=map_rect_get_item(mr); --- 96,100 ---- } priv->last = pos; ! while (item && priv->config_speed) { if (!item_coord_get(item, &c, 1)) { item=map_rect_get_item(mr); |
|
From: Martin S. <mar...@us...> - 2008-01-04 20:18:12
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10190 Modified Files: navigation.c navit.c route.c Log Message: Fix:Core:Cleaned up routing api Index: navigation.c =================================================================== RCS file: /cvsroot/navit/navit/src/navigation.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** navigation.c 29 Dec 2007 15:25:51 -0000 1.32 --- navigation.c 4 Jan 2008 20:18:15 -0000 1.33 *************** *** 114,118 **** char *name1; char *name2; - struct coord start; struct item item; int angle_start; --- 114,117 ---- *************** *** 223,247 **** } static struct navigation_itm * ! navigation_itm_new(struct navigation *this_, struct item *item, struct coord *start) { struct navigation_itm *ret=g_new0(struct navigation_itm, 1); ! int l,i=0,a1,a2,dir=0; struct map_rect *mr; struct attr attr; struct coord c[5]; ! if (item) { ! dbg(1, "start 0x%x 0x%x\n", start->x, start->y); ! ret->item=*item; ! item_hash_insert(this_->hash, item, ret); ! mr=map_rect_new(item->map, NULL); ! item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo); ! if (item_attr_get(item, attr_street_name, &attr)) ret->name1=g_strdup(attr.u.str); ! if (item_attr_get(item, attr_street_name_systematic, &attr)) ret->name2=g_strdup(attr.u.str); l=-1; ! while (item_coord_get(item, &c[i], 1)) { dbg(1, "coord %d 0x%x 0x%x\n", i, c[i].x ,c[i].y); l=i; --- 222,270 ---- } + static void + navigation_itm_update(struct navigation_itm *itm, struct item *ritem) + { + struct attr length, time; + if (! item_attr_get(ritem, attr_length, &length)) { + dbg(0,"no length\n"); + return; + } + if (! item_attr_get(ritem, attr_time, &time)) { + dbg(0,"no time\n"); + return; + } + dbg(1,"length=%d time=%d\n", length.u.num, time.u.num); + itm->length=length.u.num; + itm->time=time.u.num; + } + static struct navigation_itm * ! navigation_itm_new(struct navigation *this_, struct item *ritem) { struct navigation_itm *ret=g_new0(struct navigation_itm, 1); ! int l,i=0; ! struct item *sitem; ! struct attr street_item; struct map_rect *mr; struct attr attr; struct coord c[5]; ! if (ritem) { ! if (! item_attr_get(ritem, attr_street_item, &street_item)) { ! dbg(0,"no street item\n"); ! return NULL; ! } ! sitem=street_item.u.item; ! ret->item=*sitem; ! item_hash_insert(this_->hash, sitem, ret); ! mr=map_rect_new(sitem->map, NULL); ! sitem=map_rect_get_item_byid(mr, sitem->id_hi, sitem->id_lo); ! if (item_attr_get(sitem, attr_street_name, &attr)) ret->name1=g_strdup(attr.u.str); ! if (item_attr_get(sitem, attr_street_name_systematic, &attr)) ret->name2=g_strdup(attr.u.str); + navigation_itm_update(ret, ritem); l=-1; ! while (item_coord_get(ritem, &c[i], 1)) { dbg(1, "coord %d 0x%x 0x%x\n", i, c[i].x ,c[i].y); l=i; *************** *** 256,275 **** if (l == 4) l=3; ! if (start->x != c[0].x || start->y != c[0].y) ! dir=-1; ! a1=road_angle(&c[0], &c[1], dir); ! a2=road_angle(&c[l-1], &c[l], dir); ! if (dir >= 0) { ! ret->angle_start=a1; ! ret->angle_end=a2; ! } else { ! ret->angle_start=a2; ! ret->angle_end=a1; ! } ! dbg(1,"i=%d dir=%d a1 %d a2 %d '%s' '%s'\n", i, dir, a1, a2, ret->name1, ret->name2); map_rect_destroy(mr); } - if (start) - ret->start=*start; if (! this_->first) this_->first=ret; --- 279,287 ---- if (l == 4) l=3; ! ret->angle_start=road_angle(&c[0], &c[1], 0); ! ret->angle_end=road_angle(&c[l-1], &c[l], 0); ! dbg(1,"i=%d start %d end %d '%s' '%s'\n", i, ret->angle_start, ret->angle_end, ret->name1, ret->name2); map_rect_destroy(mr); } if (! this_->first) this_->first=ret; *************** *** 470,474 **** return 1; case attr_time: ! attr->u.num=(this_->itm->dest_time-this_->cmd->itm->dest_time)/10; return 1; case attr_destination_length: --- 482,486 ---- return 1; case attr_time: ! attr->u.num=this_->itm->dest_time-this_->cmd->itm->dest_time; return 1; case attr_destination_length: *************** *** 476,480 **** return 1; case attr_destination_time: ! attr->u.num=this_->itm->dest_time/10; return 1; default: --- 488,492 ---- return 1; case attr_destination_time: ! attr->u.num=this_->itm->dest_time; return 1; default: *************** *** 571,574 **** --- 583,640 ---- navigation_update(struct navigation *this_, struct route *route) { + struct map *map; + struct map_rect *mr; + struct item *ritem,*sitem; + struct attr street_item; + struct navigation_itm *itm; + int incr=0; + + if (! route) + return; + map=route_get_map(route); + if (! map) + return; + mr=map_rect_new(map, NULL); + if (! mr) + return; + dbg(0,"enter\n"); + ritem=map_rect_get_item(mr); + if (ritem) { + if (item_attr_get(ritem, attr_street_item, &street_item)) { + sitem=street_item.u.item; + dbg(0,"sitem=%p\n", sitem); + itm=item_hash_lookup(this_->hash, sitem); + dbg(2,"itm for item with id (0x%x,0x%x) is %p\n", sitem->id_hi, sitem->id_lo, itm); + navigation_destroy_itms_cmds(this_, itm); + if (itm) { + incr=1; + navigation_itm_update(itm, ritem); + } else { + dbg(0,"not on track\n"); + do { + dbg(0,"item\n"); + navigation_itm_new(this_, ritem); + ritem=map_rect_get_item(mr); + } while (ritem); + itm=navigation_itm_new(this_, NULL); + make_maneuvers(this_); + } + } else + dbg(0,"no street_item\n"); + calculate_dest_distance(this_, incr); + dbg(2,"destination distance old=%d new=%d\n", this_->distance_last, this_->first->dest_length); + if (this_->first->dest_length > this_->distance_last && this_->distance_last >= 0) + this_->turn_around=1; + else + this_->turn_around=0; + dbg(2,"turn_around=%d\n", this_->turn_around); + this_->distance_last=this_->first->dest_length; + profile(0,"end"); + navigation_call_callbacks(this_, FALSE); + } else + navigation_destroy_itms_cmds(this_, NULL); + map_rect_destroy(mr); + + #if 0 struct route_path_handle *rph; struct route_path_segment *s; *************** *** 638,641 **** --- 704,708 ---- profile(0,"end"); navigation_call_callbacks(this_, FALSE); + #endif } Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** route.c 1 Jan 2008 22:13:02 -0000 1.36 --- route.c 4 Jan 2008 20:18:15 -0000 1.37 *************** *** 59,63 **** --- 59,65 ---- struct item item; unsigned int offset; + #if 0 int time; + #endif int length; int dir; *************** *** 527,531 **** static void route_path_add_item(struct route_path *this, struct route_path *oldpath, ! struct route_graph_segment *rgs, int len, int time, int offset, int dir) { struct route_path_segment *segment; --- 529,533 ---- static void route_path_add_item(struct route_path *this, struct route_path *oldpath, ! struct route_graph_segment *rgs, int len, int offset, int dir) { struct route_path_segment *segment; *************** *** 555,559 **** linkold: segment->length=len; - segment->time=time; segment->dir=dir; segment->next=NULL; --- 557,560 ---- *************** *** 625,640 **** } - int - route_path_segment_get_length(struct route_path_segment *s) - { - return s->length; - } - - int - route_path_segment_get_time(struct route_path_segment *s) - { - return s->time; - } - void route_path_close(struct route_path_handle *h) --- 626,629 ---- *************** *** 884,888 **** struct route_graph_segment *s=NULL; int len=0,segs=0; ! int ilen,seg_time,seg_len; #if 0 int time=0,hr,min,sec --- 873,877 ---- struct route_graph_segment *s=NULL; int len=0,segs=0; ! int ilen,seg_len; #if 0 int time=0,hr,min,sec *************** *** 936,949 **** #endif seg_len=s->len; - seg_time=route_time(speedlist, &s->item, seg_len); - #if 0 - time+=seg_time; - #endif len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset, 1); start=s->end; } else { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset, -1); start=s->start; } --- 925,934 ---- #endif seg_len=s->len; len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, oldpath, s, seg_len, s->offset, 1); start=s->end; } else { ! route_path_add_item(ret, oldpath, s, seg_len, s->offset, -1); start=s->start; } *************** *** 962,988 **** } ilen=route_info_length(pos, NULL, 0); - #if 0 - time+=route_time(&pos->street->item, ilen); - #endif len+=ilen; ilen=route_info_length(NULL, dst, 0); - #if 0 - time+=route_time(&dst->street->item, ilen); - #endif len+=ilen; dbg(1, "%d segments\n", segs); - #if 0 - dbg(1, "len %5.3f\n", len/1000.0); - time/=10; - sec=time; - min=time/60; - time-=min*60; - hr=min/60; - min-=hr*60; - dbg(1, "time %02d:%02d:%02d (%d sec)\n", hr, min, time, sec); - dbg(1, "speed %f km/h\n", len/sec*3.6); - #endif return ret; } --- 947,956 ---- *************** *** 1350,1353 **** --- 1318,1323 ---- struct map_priv *mpriv; struct item item; + struct item *sitem; + int length; unsigned int last_coord; struct route_path_segment *seg; *************** *** 1371,1374 **** --- 1341,1371 ---- rm_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr) { + struct map_rect_priv *mr = priv_data; + struct route_path_segment *seg=mr->seg; + struct route *route=mr->mpriv->route; + attr->type=attr_type; + switch (attr_type) { + case attr_street_item: + if (seg) + attr->u.item=&seg->item; + else + attr->u.item=mr->sitem; + return 1; + case attr_length: + if (seg) + attr->u.num=seg->length; + else + attr->u.num=mr->length; + return 1; + case attr_time: + if (seg) + attr->u.num=route_time(route->speedlist, &seg->item, seg->length); + else + attr->u.num=route_time(route->speedlist, mr->sitem, mr->length); + return 1; + default: + attr->type=attr_none; + return 0; + } return 0; } *************** *** 1397,1401 **** if (i >= seg->ncoords) break; ! c[i] = seg->c[mr->last_coord++]; rc++; } --- 1394,1401 ---- if (i >= seg->ncoords) break; ! if (seg->dir < 0) ! c[i] = seg->c[seg->ncoords-++mr->last_coord]; ! else ! c[i] = seg->c[mr->last_coord++]; rc++; } *************** *** 1486,1491 **** mr->ri=route_info_open(route_get_pos(priv->route), route_get_dst(priv->route), 0); mr->pos_next=1; ! if (!mr->ri) { mr->ri=route_info_open(route_get_pos(priv->route), NULL, 0); mr->pos_next=-1; } --- 1486,1495 ---- mr->ri=route_info_open(route_get_pos(priv->route), route_get_dst(priv->route), 0); mr->pos_next=1; ! mr->sitem=&(route_get_pos(priv->route)->street->item); ! if (mr->ri) { ! mr->length=route_info_length(route_get_pos(priv->route), route_get_dst(priv->route), 0); ! } else { mr->ri=route_info_open(route_get_pos(priv->route), NULL, 0); + mr->length=route_info_length(route_get_pos(priv->route), NULL, 0); mr->pos_next=-1; } *************** *** 1556,1560 **** seg = seg->next; if (seg) { ! mr->item = seg->item; break; } --- 1560,1564 ---- seg = seg->next; if (seg) { ! mr->sitem = &seg->item; break; } *************** *** 1562,1565 **** --- 1566,1571 ---- route_info_close(mr->ri); mr->ri=route_info_open(NULL, route_get_dst(r), 0); + mr->sitem=&(route_get_dst(r)->street->item); + mr->length=route_info_length(NULL, route_get_dst(r), 0); case 1: mr->pos_next=2; Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** navit.c 3 Jan 2008 23:05:06 -0000 1.69 --- navit.c 4 Jan 2008 20:18:15 -0000 1.70 *************** *** 796,799 **** --- 796,800 ---- struct attr attr; struct param_list param[5]; + int secs; dbg(1,"enter\n"); *************** *** 814,819 **** item_attr_get(item, attr_time, &attr); dbg(2, "Time=%d\n", attr.u.num); param[2].name=_("Time"); ! param[2].value=g_strdup_printf("%d:%d",attr.u.num / 60, attr.u.num % 60); item_attr_get(item, attr_destination_length, &attr); --- 815,821 ---- item_attr_get(item, attr_time, &attr); dbg(2, "Time=%d\n", attr.u.num); + secs=attr.u.num/10; param[2].name=_("Time"); ! param[2].value=g_strdup_printf("%d:%d",secs / 60, secs % 60); item_attr_get(item, attr_destination_length, &attr); *************** *** 824,829 **** item_attr_get(item, attr_destination_time, &attr); dbg(2, "Desttime=%d\n", attr.u.num); param[4].name=_("Destination Time"); ! param[4].value=g_strdup_printf("%d:%d",attr.u.num / 60, attr.u.num % 60); datawindow_add(this_->roadbook_window, param, 5); --- 826,832 ---- item_attr_get(item, attr_destination_time, &attr); dbg(2, "Desttime=%d\n", attr.u.num); + secs=attr.u.num/10; param[4].name=_("Destination Time"); ! param[4].value=g_strdup_printf("%d:%d",secs / 60, secs % 60); datawindow_add(this_->roadbook_window, param, 5); |
|
From: Martin S. <mar...@us...> - 2008-01-04 19:29:20
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16870 Modified Files: Makefile.am Log Message: Fix:Core:Prototypes were wrong Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Makefile.am 3 Jan 2008 11:13:34 -0000 1.30 --- Makefile.am 4 Jan 2008 19:29:22 -0000 1.31 *************** *** 35,39 **** builtin.c: ! ls $(top_builddir)/src/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void /" >builtin.c echo "extern void builtin_init(void);" >>builtin.c echo "void builtin_init(void) {" >>builtin.c --- 35,39 ---- builtin.c: ! ls $(top_builddir)/src/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c echo "extern void builtin_init(void);" >>builtin.c echo "void builtin_init(void) {" >>builtin.c |
|
From: KaZeR <ka...@us...> - 2008-01-04 18:16:04
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15939 Modified Files: Makefile.am Log Message: Patch:core:Added reddog's patch for additionnals xpms, thanks Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 28 Nov 2007 22:28:20 -0000 1.7 --- Makefile.am 4 Jan 2008 18:16:07 -0000 1.8 *************** *** 1,4 **** include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm bank.xpm camping.xpm car_dealer.xpm dumping-station.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm parking.xpm police.xpm restaurant.xpm trailerpark.xpm unknown.xpm EXTRA_DIST = $(xpm_DATA) #burgerking.ico: --- 1,4 ---- include $(top_srcdir)/Makefile.inc ! xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm EXTRA_DIST = $(xpm_DATA) #burgerking.ico: |
|
From: KaZeR <ka...@us...> - 2008-01-04 16:24:00
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25651/gui/sdl/datafiles/layouts Modified Files: TaharezLook.layout Log Message: Fix:cegui:removed reference to deprecated font 'Commonwealth' Index: TaharezLook.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/TaharezLook.layout,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TaharezLook.layout 11 Dec 2007 14:52:54 -0000 1.7 --- TaharezLook.layout 4 Jan 2008 16:24:02 -0000 1.8 *************** *** 216,220 **** <Property Name="Text" Value="Calculating the route" /> <Property Name="Visible" Value="False" /> - <Property Name="TitlebarFont" Value="Commonwealth-10" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> <Property Name="TitlebarEnabled" Value="True" /> --- 216,219 ---- |
|
From: KaZeR <ka...@us...> - 2008-01-04 16:19:17
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23350/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:cegui:Added a missing font for sdl gui (thanks bodenseepingu) Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** gui_sdl_window.cpp 4 Jan 2008 15:06:25 -0000 1.43 --- gui_sdl_window.cpp 4 Jan 2008 16:19:20 -0000 1.44 *************** *** 579,582 **** --- 579,583 ---- CEGUI::FontManager::getSingleton().createFont("DejaVuSans-10.font"); + CEGUI::FontManager::getSingleton().createFont("DejaVuSans-12.font"); CEGUI::FontManager::getSingleton().createFont("DejaVuSans-14.font"); |
|
From: KaZeR <ka...@us...> - 2008-01-04 15:06:23
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24636/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:cegui:Fixes ticket #61 : make cegui honour for ressources loading Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** gui_sdl_window.cpp 4 Jan 2008 14:43:09 -0000 1.42 --- gui_sdl_window.cpp 4 Jan 2008 15:06:25 -0000 1.43 *************** *** 551,586 **** ! // FIXME This should maybe move to navit.xml ! static char *datafiles_path[]={ ! "./gui/sdl/datafiles", ! "/usr/share/navit/datafiles", ! "/usr/local/share/navit/datafiles", ! NULL, ! }; ! ! char **filename=datafiles_path; ! ! while (*filename) { ! if (FILE * file = fopen(*filename, "r")) ! { ! fclose(file); ! break; ! } ! filename++; ! } ! if(*filename==NULL){ ! // FIXME Elaborate the possible solutions ! printf("Can't find the datafiles directory for CEGUI files. Navit will probably crash :)\n"); ! } else { ! printf("Loading SDL datafiles from %s\n",*filename); ! } ! rp->setResourceGroupDirectory("schemes", g_strdup_printf("%s/schemes/",*filename)); ! rp->setResourceGroupDirectory("imagesets", g_strdup_printf("%s/imagesets/",*filename)); ! rp->setResourceGroupDirectory("fonts", g_strdup_printf("%s/fonts/",*filename)); ! rp->setResourceGroupDirectory("layouts", g_strdup_printf("%s/layouts/",*filename)); ! rp->setResourceGroupDirectory("looknfeels", g_strdup_printf("%s/looknfeel/",*filename)); ! rp->setResourceGroupDirectory("lua_scripts", g_strdup_printf("%s/lua_scripts/",*filename)); --- 551,566 ---- ! char *filename; ! filename=g_strdup_printf("%s/share/navit/datafiles", getenv("NAVIT_PREFIX")); ! dbg(0,"Loading SDL datafiles from %s\n",filename); ! rp->setResourceGroupDirectory("schemes", g_strdup_printf("%s/schemes/",filename)); ! rp->setResourceGroupDirectory("imagesets", g_strdup_printf("%s/imagesets/",filename)); ! rp->setResourceGroupDirectory("fonts", g_strdup_printf("%s/fonts/",filename)); ! rp->setResourceGroupDirectory("layouts", g_strdup_printf("%s/layouts/",filename)); ! rp->setResourceGroupDirectory("looknfeels", g_strdup_printf("%s/looknfeel/",filename)); ! rp->setResourceGroupDirectory("lua_scripts", g_strdup_printf("%s/lua_scripts/",filename)); ! g_free(filename); |
|
From: KaZeR <ka...@us...> - 2008-01-04 14:43:06
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15054/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:cegui:Fixes the breakage after pluginless mode addition Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** gui_sdl_window.cpp 21 Dec 2007 10:51:03 -0000 1.41 --- gui_sdl_window.cpp 4 Jan 2008 14:43:09 -0000 1.42 *************** *** 12,15 **** --- 12,16 ---- #include "gui.h" #include "coord.h" + #include "config.h" #include "plugin.h" #include "callback.h" *************** *** 61,65 **** CEGUI::Window* myRoot; ! #define MODULE "gui_sdl" GLuint * DLid; --- 62,67 ---- CEGUI::Window* myRoot; ! // Temp fix for pluginless mode ! // #define MODULE "gui_sdl" GLuint * DLid; |
|
From: KaZeR <ka...@us...> - 2008-01-04 10:29:38
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27743 Modified Files: Makefile.am Log Message: Added a missing font for sdl gui (thanks bodenseepingu) Index: Makefile.am =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 3 Oct 2007 14:14:23 -0000 1.3 --- Makefile.am 4 Jan 2008 10:29:36 -0000 1.4 *************** *** 3,7 **** CEGUIFONTSdir=$(pkgdatadir)/datafiles/fonts # CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans-18.font fonts/DejaVuSans.ttf fonts/Font.xsd ! CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans.ttf fonts/Font.xsd CEGUILAYOUTdir=$(pkgdatadir)/datafiles/layouts --- 3,7 ---- CEGUIFONTSdir=$(pkgdatadir)/datafiles/fonts # CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-14.font fonts/DejaVuSans-18.font fonts/DejaVuSans.ttf fonts/Font.xsd ! CEGUIFONTS_DATA = fonts/DejaVuSans-10.font fonts/DejaVuSans-12.font fonts/DejaVuSans-14.font fonts/DejaVuSans.ttf fonts/Font.xsd CEGUILAYOUTdir=$(pkgdatadir)/datafiles/layouts |
|
From: KaZeR <ka...@us...> - 2008-01-04 09:49:08
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/fonts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6391 Added Files: DejaVuSans-12.font Log Message: Added a missing font for sdl gui (thanks bodenseepingu) --- NEW FILE: DejaVuSans-12.font --- <?xml version="1.0" ?> <Font Name="DejaVuSans-12" Filename="DejaVuSans.ttf" Type="FreeType" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true"/> |
|
From: Michael F. <ho...@us...> - 2008-01-04 09:37:41
|
Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1128 Modified Files: table.c mem.c backend.c Log Message: Fix:POI:Fix some compiler warnings Index: backend.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/backend.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** backend.c 11 Aug 2007 08:02:34 -0000 1.1 --- backend.c 4 Jan 2008 09:37:44 -0000 1.2 *************** *** 161,165 **** * Use mdb_remove_backends() to destroy this hash when done. */ ! void mdb_init_backends() { mdb_backends = g_hash_table_new(g_str_hash, g_str_equal); --- 161,165 ---- * Use mdb_remove_backends() to destroy this hash when done. */ ! void mdb_init_backends(void) { mdb_backends = g_hash_table_new(g_str_hash, g_str_equal); *************** *** 183,187 **** * Removes all entries from and destroys the mdb_backends hash. */ ! void mdb_remove_backends() { g_hash_table_foreach_remove(mdb_backends, mdb_drop_backend, NULL); --- 183,187 ---- * Removes all entries from and destroys the mdb_backends hash. */ ! void mdb_remove_backends(void) { g_hash_table_foreach_remove(mdb_backends, mdb_drop_backend, NULL); Index: table.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/table.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** table.c 11 Aug 2007 08:02:45 -0000 1.1 --- table.c 4 Jan 2008 09:37:44 -0000 1.2 *************** *** 35,39 **** } ! unsigned char mdb_col_needs_size(int col_type) { if (col_type == MDB_TEXT) { --- 35,39 ---- } ! static unsigned char mdb_col_needs_size(int col_type) { if (col_type == MDB_TEXT) { Index: mem.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/mem.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mem.c 11 Aug 2007 08:02:42 -0000 1.1 --- mem.c 4 Jan 2008 09:37:44 -0000 1.2 *************** *** 32,36 **** * **/ ! void mdb_init() { mdb_init_backends(); --- 32,36 ---- * **/ ! void mdb_init(void) { mdb_init_backends(); *************** *** 45,49 **** * **/ ! void mdb_exit() { mdb_remove_backends(); --- 45,49 ---- * **/ ! void mdb_exit(void) { mdb_remove_backends(); |
|
From: Michael F. <ho...@us...> - 2008-01-04 09:37:41
|
Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1128/include Modified Files: mdbtools.h Log Message: Fix:POI:Fix some compiler warnings Index: mdbtools.h =================================================================== RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/include/mdbtools.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mdbtools.h 11 Aug 2007 08:02:46 -0000 1.1 --- mdbtools.h 4 Jan 2008 09:37:44 -0000 1.2 *************** *** 386,391 **** /* mem.c */ ! extern void mdb_init(); ! extern void mdb_exit(); /* file.c */ --- 386,391 ---- /* mem.c */ ! extern void mdb_init(void); ! extern void mdb_exit(void); /* file.c */ *************** *** 457,463 **** extern char *mdb_get_coltype_string(MdbBackend *backend, int col_type); extern int mdb_coltype_takes_length(MdbBackend *backend, int col_type); ! extern void mdb_init_backends(); extern void mdb_register_backend(MdbBackendType *backend, char *backend_name); ! extern void mdb_remove_backends(); extern int mdb_set_default_backend(MdbHandle *mdb, char *backend_name); extern char *mdb_get_relationships(MdbHandle *mdb); --- 457,463 ---- extern char *mdb_get_coltype_string(MdbBackend *backend, int col_type); extern int mdb_coltype_takes_length(MdbBackend *backend, int col_type); ! extern void mdb_init_backends(void); extern void mdb_register_backend(MdbBackendType *backend, char *backend_name); ! extern void mdb_remove_backends(void); extern int mdb_set_default_backend(MdbHandle *mdb, char *backend_name); extern char *mdb_get_relationships(MdbHandle *mdb); |
|
From: Michael F. <ho...@us...> - 2008-01-04 09:30:46
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30668 Modified Files: callback.h callback.c Log Message: Fix:Core:Fix some compiler warnings Index: callback.h =================================================================== RCS file: /cvsroot/navit/navit/src/callback.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** callback.h 4 Jan 2008 08:34:31 -0000 1.12 --- callback.h 4 Jan 2008 09:30:48 -0000 1.13 *************** *** 6,13 **** #endif /* prototypes */ struct callback; struct callback_list; struct callback_list *callback_list_new(void); ! struct callback * callback_new_attr(void (*func)(), enum attr_type type, int pcount, void **p); struct callback *callback_new(void (*func)(void), int pcount, void **p); void callback_set_arg(struct callback *cb, int arg, void *p); --- 6,14 ---- #endif /* prototypes */ + enum attr_type; struct callback; struct callback_list; struct callback_list *callback_list_new(void); ! struct callback * callback_new_attr(void (*func)(void), enum attr_type type, int pcount, void **p); struct callback *callback_new(void (*func)(void), int pcount, void **p); void callback_set_arg(struct callback *cb, int arg, void *p); Index: callback.c =================================================================== RCS file: /cvsroot/navit/navit/src/callback.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** callback.c 1 Jan 2008 22:13:02 -0000 1.9 --- callback.c 4 Jan 2008 09:30:48 -0000 1.10 *************** *** 25,29 **** struct callback * ! callback_new_attr(void (*func)(), enum attr_type type, int pcount, void **p) { struct callback *ret; --- 25,29 ---- struct callback * ! callback_new_attr(void (*func)(void), enum attr_type type, int pcount, void **p) { struct callback *ret; *************** *** 41,45 **** struct callback * ! callback_new(void (*func)(), int pcount, void **p) { return callback_new_attr(func, attr_none, pcount, p); --- 41,45 ---- struct callback * ! callback_new(void (*func)(void), int pcount, void **p) { return callback_new_attr(func, attr_none, pcount, p); *************** *** 62,66 **** struct callback * ! callback_list_add_new(struct callback_list *l, void (*func)(), int pcount, void **p) { struct callback *ret; --- 62,66 ---- struct callback * ! callback_list_add_new(struct callback_list *l, void (*func)(void), int pcount, void **p) { struct callback *ret; |
|
From: Michael F. <ho...@us...> - 2008-01-04 09:29:44
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30178/gui/gtk Modified Files: gui_gtk_window.c Log Message: Fix:Gtk:Remove call to deprecated funtion gdk_rgb_init(). It's not needed anymore Index: gui_gtk_window.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gui_gtk_window.c 3 Jan 2008 11:13:37 -0000 1.16 --- gui_gtk_window.c 4 Jan 2008 09:29:48 -0000 1.17 *************** *** 190,194 **** { gtk_init(>k_argc, >k_argv); - gdk_rgb_init(); gtk_set_locale(); --- 190,193 ---- |
|
From: Michael F. <ho...@us...> - 2008-01-04 08:34:31
|
Update of /cvsroot/navit/navit/src/binding/python In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17779/binding/python Modified Files: binding_python.c Log Message: Fix:Core:Fix some compiler warnings Index: binding_python.c =================================================================== RCS file: /cvsroot/navit/navit/src/binding/python/binding_python.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** binding_python.c 28 Aug 2007 17:31:15 -0000 1.3 --- binding_python.c 4 Jan 2008 08:34:30 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- #include "config.h" + #include <glib.h> #include <Python.h> #include <fcntl.h> |
|
From: Michael F. <ho...@us...> - 2008-01-04 08:34:30
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17779 Modified Files: callback.h menu.h vehicle.h Log Message: Fix:Core:Fix some compiler warnings Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** vehicle.h 18 Dec 2007 22:14:27 -0000 1.18 --- vehicle.h 4 Jan 2008 08:34:31 -0000 1.19 *************** *** 5,9 **** --- 5,12 ---- extern "C" { #endif + struct vehicle; struct vehicle_priv; + enum attr_type; + struct attr; struct vehicle_methods { *************** *** 15,21 **** /* prototypes */ - enum attr_type; - struct attr; - struct vehicle; struct vehicle *vehicle_new(struct attr **attrs); int vehicle_position_attr_get(struct vehicle *this_, enum attr_type type, struct attr *attr); --- 18,21 ---- Index: menu.h =================================================================== RCS file: /cvsroot/navit/navit/src/menu.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** menu.h 3 Dec 2007 13:17:19 -0000 1.4 --- menu.h 4 Jan 2008 08:34:31 -0000 1.5 *************** *** 8,12 **** --- 8,14 ---- }; + struct container; struct menu; + struct callback; struct menu_methods { *************** *** 22,29 **** /* prototypes */ - enum menu_type; - struct callback; - struct container; - struct menu; void menu_route_do_update(struct container *co); void menu_route_update(struct container *co); --- 24,27 ---- Index: callback.h =================================================================== RCS file: /cvsroot/navit/navit/src/callback.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** callback.h 3 Jan 2008 23:02:35 -0000 1.11 --- callback.h 4 Jan 2008 08:34:31 -0000 1.12 *************** *** 9,12 **** --- 9,13 ---- struct callback_list; struct callback_list *callback_list_new(void); + struct callback * callback_new_attr(void (*func)(), enum attr_type type, int pcount, void **p); struct callback *callback_new(void (*func)(void), int pcount, void **p); void callback_set_arg(struct callback *cb, int arg, void *p); |
|
From: Michael F. <ho...@us...> - 2008-01-03 23:05:06
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30208 Modified Files: navit.c Log Message: Fix:Core:Don't forget this_ as argument of callback_list_call_attr Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** navit.c 3 Jan 2008 22:55:51 -0000 1.68 --- navit.c 3 Jan 2008 23:05:06 -0000 1.69 *************** *** 1185,1189 **** } if (attr_updated) { ! callback_list_call_attr(this_->attr_cbl, attr->type, 1, &attr); } return 1; --- 1185,1194 ---- } if (attr_updated) { ! void *p[2]; ! ! p[0] = this_; ! p[1] = attr; ! ! callback_list_call_attr(this_->attr_cbl, attr->type, 2, p); } return 1; |
13 messages has been excluded from this view by a project administrator.
