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: KaZeR <ka...@us...> - 2007-12-16 22:28:12
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15821/src/graphics/gtk_drawing_area Modified Files: graphics_gtk_drawing_area.c Log Message: Added Zilux patch about fonts, using default path on OpenMoko Index: graphics_gtk_drawing_area.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** graphics_gtk_drawing_area.c 2 Dec 2007 19:25:29 -0000 1.21 --- graphics_gtk_drawing_area.c 16 Dec 2007 22:28:13 -0000 1.22 *************** *** 111,115 **** while (*filename) { // Trying the Liberation font first ! sprintf(fontpath,"%s/LiberationSans-Regular.ttf",*filename); dbg(1,"font : %s\n",fontpath); if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) --- 111,115 ---- while (*filename) { // Trying the Liberation font first ! sprintf(fontpath,"%s/LiberationMono-Regular.ttf",*filename); dbg(1,"font : %s\n",fontpath); if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) *************** *** 128,131 **** --- 128,135 ---- if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) break; + sprintf(fontpath,"%s/DejaVuSans.ttf",*filename); + dbg(1,"font : %s\n",fontpath); + if (!FT_New_Face( gr->library, fontpath, 0, &font->face )) + break; filename++; } |
|
From: KaZeR <ka...@us...> - 2007-12-14 18:57:40
|
Update of /cvsroot/navit/navit/src/xpm In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28579 Added Files: bar.xpm bus.xpm church.xpm cinema.xpm fastfood.xpm firebrigade.xpm library.xpm museum.xpm pharmacy.xpm picnic.xpm post.xpm skiing.xpm sports.xpm telephone.xpm theater.xpm tower.xpm Log Message: Added icons provided by HH --- NEW FILE: pharmacy.xpm --- /* XPM */ static char *pharmacy[] = { /* columns rows colors chars-per-pixel */ "16 16 17 1", " c #00CC00", ". c #01CC01", "X c #02CC02", "o c #04CD04", "O c #1CD21C", "+ c #40D940", "@ c #41D941", "# c #77E477", "$ c #80E680", "% c #82E682", "& c #9CEB9C", "* c #BFF2BF", "= c #C0F2C0", "- c #DAF8DA", "; c #E7FAE7", ": c #FDFFFD", "> c gray100", /* pixels */ "# O-", " ;>>>>>>>>>>>>$$", " > $$$@ $$$", " > >>>$ $$$", " > >>>% $$$", " > oo>>>% $$$", " >$>>>>>>>>>>$$$", " >$>>>>>>>>>>$$$", " >$>>>>>>>>>>$$$", " >@$$$>>>=%%$$$$", " > >>>$ $$$", " > o>>>$ $$$", " > >>>% $$$", " >$$$$$$$$$$$=$$", "O$$$$$$$$$$$$%@&", "-$$$$$$$$$$$$#&>" }; --- NEW FILE: museum.xpm --- /* XPM */ static char *museum[] = { /* columns rows colors chars-per-pixel */ "16 15 81 1", " c black", ". c #010101", "X c #020202", "o c #040404", "O c #070707", "+ c gray3", "@ c gray4", "# c gray6", "$ c gray7", "% c gray8", "& c gray9", "* c gray10", "= c #1E1E1E", "- c gray13", "; c #222222", ": c #232323", "> c #313131", ", c #353535", "< c #3A3A3A", "1 c #3E3E3E", "2 c #3F3F3F", "3 c #444444", "4 c gray27", "5 c gray28", "6 c #494949", "7 c gray30", "8 c #515151", "9 c #565656", "0 c #5D5D5D", "q c #626262", "w c #646464", "e c #656565", "r c #676767", "t c #686868", "y c #6D6D6D", "u c gray43", "i c #747474", "p c #7C7C7C", "a c gray49", "s c #7E7E7E", "d c #848484", "f c gray53", "g c gray54", "h c gray55", "j c #909090", "k c gray57", "l c #929292", "z c gray58", "x c gray59", "c c #989898", "v c #9B9B9B", "b c gray61", "n c gray63", "m c #A2A2A2", "M c gray66", "N c #A9A9A9", "B c #AAAAAA", "V c gray67", "C c #ACACAC", "Z c #B2B2B2", "A c gray71", "S c gray72", "D c #B9B9B9", "F c #BCBCBC", "G c #C6C6C6", "H c #C8C8C8", "J c #CACACA", "K c #D8D8D8", "L c #DADADA", "P c gainsboro", "I c #E6E6E6", "U c #ECECEC", "Y c #EEEEEE", "T c gray94", "R c #F3F3F3", "E c #F4F4F4", "W c #F8F8F8", "Q c gray99", "! c #FDFDFD", "~ c #FEFEFE", "^ c gray100", /* pixels */ "^^^^^^^^^^^^^^^^", "^^^^^Ym9<fL^^^^^", "^^Iz4+ >fL^^", "^L+ A^", "^^bjjjjjjjjjjv^^", "^^y1D^W44R^J1i^^", "^^y%T^^8w^^^*V^^", "^^f$^^^0t^^^=V^^", "^^h*^^^wq^^^=V^^", "^^j%^^^ww^^^;V^^", "^^m$^^^tw^^^;V^^", "^^t$T^I,4^^G#p^^", "^T+ j^J L^j ;^^", "^U76gJDaaDJZzz^^", "^TDDDDDDDDDDDFW^" }; --- NEW FILE: theater.xpm --- /* XPM */ static char *theater[] = { /* columns rows colors chars-per-pixel */ "16 15 128 2", " c black", ". c #010101", "X c #020202", "o c gray1", "O c gray2", "+ c gray4", "@ c #0C0C0C", "# c gray7", "$ c #151515", "% c #161616", "& c #1D1D1D", "* c #232323", "= c gray14", "- c #272727", "; c gray16", ": c gray17", "> c #2C2C2C", ", c gray18", "< c gray19", "1 c gray20", "2 c #343434", "3 c gray22", "4 c #393939", "5 c gray23", "6 c #3F3F3F", "7 c gray27", "8 c #464646", "9 c gray28", "0 c #484848", "q c #494949", "w c #4B4B4B", "e c #4C4C4C", "r c gray30", "t c gray31", "y c #505050", "u c #515151", "i c gray32", "p c gray33", "a c #555555", "s c gray34", "d c #585858", "f c gray35", "g c #5A5A5A", "h c #606060", "j c gray38", "k c #626262", "l c gray39", "z c gray40", "x c DimGray", "c c #6A6A6A", "v c gray42", "b c #6D6D6D", "n c gray44", "m c #717171", "M c gray45", "N c gray46", "B c #767676", "V c gray47", "C c #797979", "Z c #7C7C7C", "A c gray49", "S c #7E7E7E", "D c gray50", "F c #808080", "G c #818181", "H c gray51", "J c #838383", "K c #8B8B8B", "L c gray55", "P c #8D8D8D", "I c gray57", "U c #929292", "Y c #939393", "T c gray58", "R c #959595", "E c #979797", "W c #9A9A9A", "Q c #9D9D9D", "! c gray63", "~ c #A2A2A2", "^ c #A4A4A4", "/ c #A5A5A5", "( c gray65", ") c gray66", "_ c #AAAAAA", "` c #ACACAC", "' c gray68", "] c #AFAFAF", "[ c #B4B4B4", "{ c #B7B7B7", "} c gray73", "| c gray", " . c gray75", ".. c #C0C0C0", "X. c #C3C3C3", "o. c #CACACA", "O. c #CDCDCD", "+. c #CECECE", "@. c gray81", "#. c #D0D0D0", "$. c LightGray", "%. c gray83", "&. c gray84", "*. c #D8D8D8", "=. c gray85", "-. c #DADADA", ";. c gainsboro", ":. c gray87", ">. c gray88", ",. c #E2E2E2", "<. c #E4E4E4", "1. c gray90", "2. c #E7E7E7", "3. c #E9E9E9", "4. c #EAEAEA", "5. c gray92", "6. c gray93", "7. c #EEEEEE", "8. c #F4F4F4", "9. c gray96", "0. c #F6F6F6", "q. c gray97", "w. c #F8F8F8", "e. c #F9F9F9", "r. c #FBFBFB", "t. c gray99", "y. c #FEFEFE", "u. c gray100", /* pixels */ "u.u.u.u.u.u.u.u.u.u.u.u.u.@.@.u.", "u.u.u.u.u.u.@.F *.q.9.:.~ 4 h u.", "u.Q U u.u.u.1.t t g t 9 9 g 6 9.", "u.K E B q.u.3.9 s 4 F 4 4 9.", "u.K u.~ h h h q * E O , , s 1 5.", "u.A } ~ | u.1.z & _ 9 : } *.y | ", ":.A 3.U :.3.{ g - B q F # % t } ", "&.W X.} F *.b 4 t , E + y 3.", "u.b u.u.g 1.u.q.t , % E F 2 7 9.", "u.v _ { s 7.~ 5.* q F U _ V v u.", "u.F _ , X.V v y K q A @ : 6 @.u.", "u.*.b : 1 s o.u.V q y 4 F u.u.", "u.u.h _ v s _ u.u.u.~ U &.q.u.u.", "u.u.@.y B g q.u.u.u.u.u.u.u.u.u.", "u.u.u.9.3.9.u.u.u.u.u.u.u.u.u.u." }; --- NEW FILE: sports.xpm --- /* XPM */ static char *sports[] = { /* columns rows colors chars-per-pixel */ "16 16 73 1", " c black", ". c #010101", "X c #000200", "o c #020202", "O c #0C0C0C", "+ c #001B00", "@ c #001C00", "# c #0D150D", "$ c #1E1E1E", "% c #002100", "& c #002300", "* c #003A00", "= c #003F00", "- c #1F251F", "; c #212D21", ": c gray17", "> c #213421", ", c gray19", "< c #343434", "1 c #393939", "2 c gray23", "3 c gray24", "4 c #054105", "5 c #004C00", "6 c #0E4E0E", "7 c #005100", "8 c #005B00", "9 c #025F02", "0 c #0B510B", "q c #006700", "w c #006D00", "e c #007A00", "r c #007D00", "t c #007E00", "y c #007F00", "u c #205720", "i c gray25", "p c #444444", "a c gray27", "s c #4E4E4E", "d c gray32", "f c #5B5B5B", "g c #5D5D5D", "h c #5D6B5D", "j c #606660", "k c #6D6D6D", "l c gray43", "z c #6F6F6F", "x c gray46", "c c #777777", "v c gray47", "b c gray50", "n c #008000", "m c #808080", "M c #808B80", "N c #838A83", "B c #828E82", "V c gray55", "C c #A7A7A7", "Z c #ADAEAD", "A c gray70", "S c #B6B6B6", "D c #C5C5C5", "F c #C8C8C8", "G c gray84", "H c #DADADA", "J c #DFDFDF", "K c gray91", "L c gray98", "P c gray99", "I c #FEFEFE", "U c gray100", "Y c None", /* pixels */ "Y Y", " nnnnnnnnnnnn ", " nnnnnnnnnnnnnn ", " nnnny74*5ennnn ", " nnn9>SKdih8nnn ", " nnw#aIIxPIhqnn ", " nn& gk< zJ2@nn ", " nn-fII$ mk nn ", " nnZmIDs,3IH2nn ", " nnMi2vIIvFbNnn ", " nn6 <GPa :unn ", " nny&OCSV +ynn ", " nnny0BAS;=yynn ", " nnnnnnnnnynnnn ", " nnnnnnnnnnnn ", "Y Y" }; --- NEW FILE: library.xpm --- /* XPM */ static char *library[] = { /* columns rows colors chars-per-pixel */ "8 16 12 1", " c black", ". c gray25", "X c #464646", "o c #808080", "O c gray56", "+ c #BCBCBC", "@ c gray75", "# c gainsboro", "$ c #FBFBFB", "% c gray99", "& c gray100", "* c None", /* pixels */ "*** * ", "** X&X ", "* @&&.o ", " @&@ @& ", " .. &@@ ", " && @.& ", " && &o@ ", " && O@@ ", " && @.@ ", " && #&& ", " && &&& ", " && &&. ", " && &X *", " && X **", " && ***", ". ****" }; --- NEW FILE: church.xpm --- /* XPM */ static char *church[] = { /* columns rows colors chars-per-pixel */ "16 16 4 1", " c black", ". c #2F2F2F", "X c #B1B1B1", "o c gray100", /* pixels */ "ooooooo..ooooooo", "ooooooo..ooooooo", "ooooooo..ooooooo", "oooo...XX...oooo", "oooo...XX...oooo", "ooooooo..ooooooo", "ooooooo..ooooooo", "ooooooo..ooooooo", "oooo oooo", "oooo oooo", "oooo oooo", "oooo oooo", "oooo oooo", "oooo oooo", "oooo oooo", "oooo oooo" }; --- NEW FILE: bar.xpm --- /* XPM */ static char *bar[] = { /* columns rows colors chars-per-pixel */ "16 16 48 1", " c #2D63D2", ". c #2D63D3", "X c #2F65D3", "o c #3869CF", "O c #3066D3", "+ c #3166D3", "@ c #3368D4", "# c #3B6CD2", "$ c #3D6ED1", "% c #4172D5", "& c #4273D6", "* c #4374D7", "= c #4474D7", "- c #688FDF", "; c #6990DF", ": c #8FA1C4", "> c #8CAAE6", ", c #95B0E8", "< c #97B2E9", "1 c #98B3E9", "2 c #99B4E9", "3 c #B0BBD2", "4 c #BDC8DF", "5 c #AFC0E4", "6 c #AAC0EC", "7 c #ACC2ED", "8 c #B0C2E8", "9 c #B3C6EB", "0 c #B4C6EA", "q c #B8CAEE", "w c #B9CBEE", "e c #B9CBEF", "r c #BACCEF", "t c #BACCF0", "y c #F4F4F3", "u c gray97", "i c #F3F5F9", "p c #F5F8FD", "a c #F9F8F7", "s c #F9F9F8", "d c #FBFBFB", "f c #FCFDFD", "g c #FDFDFD", "h c #FDFEFD", "j c #FEFEFD", "k c #FEFEFE", "l c #FEFEFF", "z c gray100", /* pixels */ "zzzzzzzzzzzzzzzz", "zzi6222222222<7p", "zzz9o.XXXXXXXo8z", "zzzu:$+@@@@O%5dz", "zzzzuw*X@@O$tzzz", "zzzzzzw%OO%9zzzz", "zzzzzzzw==qzzzzz", "zzzzzzzz>>zzzzzz", "zzzzzzzz<,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzzz,,zzzzzz", "zzzzzzu4--3yzzzz" }; --- NEW FILE: firebrigade.xpm --- /* XPM */ static char *firebrigade[] = { /* columns rows colors chars-per-pixel */ "16 10 91 1", " c #0C0E1A", ". c #0E101A", "X c #11111D", "o c #121220", "O c #141524", "+ c #151725", "@ c #1B1C2B", "# c #1A1D2C", "$ c #222636", "% c #262637", "& c #202439", "* c #2A2A41", "= c #313648", "- c #393A4D", "; c #3A4156", ": c #3F4352", "> c #434658", ", c #42475C", "< c #474856", "1 c #43495B", "2 c #454B5D", "3 c #53535E", "4 c #4B5265", "5 c #4C5269", "6 c #525664", "7 c #555561", "8 c #555562", "9 c #545765", "0 c #555765", "q c #646D7E", "w c #6B707D", "e c #555586", "r c #565797", "t c #666D82", "y c #737585", "u c #7C7D88", "i c #6060F6", "p c #FF0005", "a c #FF0207", "s c #FF050A", "d c #FF060B", "f c #FE080E", "g c #FF0A0F", "h c #FF191E", "j c #FF3D41", "k c #FF4246", "l c #FF474B", "z c #FF5154", "x c #FE5558", "c c #FF5558", "v c #FF676A", "b c #FF6A6D", "n c #82838D", "m c #808094", "M c #868593", "N c #898992", "B c #90929E", "V c #8A90A3", "C c #9096A0", "Z c #9799A5", "A c #959AA8", "S c #99A0AF", "D c #9EAAB6", "F c #AAABB3", "G c #8A8AFD", "H c #FF8082", "J c #FFACAE", "K c #CCCCD5", "L c #D1D0D5", "P c #D2D2D6", "I c #D3D3D7", "U c #D6D6D9", "Y c #D9DCE3", "T c #DFE0E3", "R c #FEC4C7", "E c #FFC4C6", "W c #FFD4D5", "Q c #FFDDDE", "! c #E0E0E2", "~ c #ECEDEE", "^ c #EDEDEF", "/ c #FFE2E3", "( c #FFE9E9", ") c #F0F0F3", "_ c #F4F5F8", "` c gray98", "' c #FBFBFC", "] c #FFFBFB", "[ c #FFFDFD", "{ c #FFFEFE", "} c gray100", /* pixels */ "}}}}}}}}}}}}}}}}", "}}}}Gi}}}}}}}}}}", "}YnNerY}}}}}}W}}", "_uPPZ]F~}}}}/zR}", "yC}US})ZP~}}JpgR", "#-52=,>$O:D(kppx", ",V<+oX..wq6Qspsh", "-&t000304@C}hlbg", "u*K'''''M%!}zvjH", "}}}}}}}}}}}}}}}}" }; --- NEW FILE: cinema.xpm --- /* XPM */ static char *cinema[] = { /* columns rows colors chars-per-pixel */ "12 16 114 2", " c gray4", ". c #0B0B0B", "X c #0C0C0C", "o c gray5", "O c #0E0E0E", "+ c gray6", "@ c #101010", "# c #111111", "$ c #161616", "% c #191919", "& c #1E1E1E", "* c gray13", "= c #282828", "- c gray16", "; c gray17", ": c #2D2D2D", "> c #2F2F2F", ", c gray19", "< c gray20", "1 c #3A3A3A", "2 c gray23", "3 c #384B50", "4 c #3F4D51", "5 c #345158", "6 c #3A6B77", "7 c gray25", "8 c #414141", "9 c #464646", "0 c #404648", "q c #4C4C4C", "w c #4E4E4E", "e c gray32", "r c #585858", "t c gray36", "y c #466D76", "u c #576F75", "i c #5A7278", "p c #606060", "a c #646464", "s c gray40", "d c DimGray", "f c gray42", "g c #607478", "h c #66797E", "j c gray44", "k c #747474", "l c gray46", "z c #707A7C", "x c #7C7C7C", "c c #6B7F83", "v c #3E9FB7", "b c #2CA5C3", "n c #34A8C5", "m c #3CABC7", "M c #588894", "N c #5F8F9B", "B c #4299AF", "V c #5FA8BA", "C c #658B95", "Z c #69909A", "A c #7B8E93", "S c #739097", "D c #7D959B", "F c #619BAA", "G c #679CAA", "H c #6C9CA8", "J c #7C9EA6", "K c #67A1AF", "L c #60A8BA", "P c #69ACBD", "I c #72A3AF", "U c #70AAB9", "Y c #47A8C0", "T c #4BACC4", "R c #48AFC8", "E c #4BB1CA", "W c #56B7CF", "Q c #6AB3C5", "! c #79BDCE", "~ c #78C1D3", "^ c #78C5D9", "/ c gray51", "( c gray52", ") c #989898", "_ c gray65", "` c #AAAAAA", "' c #ACACAC", "] c #AEAEAE", "[ c gray70", "{ c #B7B7B7", "} c gray74", "| c #89CDDD", " . c #AADBE7", ".. c #ABDBE7", "X. c #C5C5C5", "o. c gray80", "O. c gray82", "+. c gainsboro", "@. c #DDDDDD", "#. c #CCE9F1", "$. c #DAEEF2", "%. c #E4E4E4", "&. c #EAEAEA", "*. c #ECECEC", "=. c #EEF8FA", "-. c #F3F3F3", ";. c #F4F4F4", ":. c #F6F6F6", ">. c gray97", ",. c #F8F8F8", "<. c gray99", "1. c #FDFDFD", "2. c #FEFEFE", "3. c gray100", /* pixels */ "3.3.3.3.3.3.3.:.O.,.3.3.", "3.3.3.3.#. .^ K d @.3.3.", ",.j A B B N y e O [ 3.3.", "1.x > : # @ ; e , ) 3.3.", "3.A * c G Q E b l a 3.3.", "<.[ p v b b b b h : 3.3.", "<.+.o I b b b m Z a *.3.", "3.-.s S L J i 0 = o.3.", "3.3.2 O $ < 3 i t ] 3.", "3.3.l 9 H P T n E 0 d 3.", "3.3._ 9 ~ b b b b u ( ,.", "3.3.X.8 V b b b b D ; &.", "3.3.%.2 C U M z q & w O.", "3.3.:.2 % @ # > 5 6 = ` ", "3.3.3./ r F ! W | .} &.", "3.3.3.` ) $.=.3.3.3.3.3." }; --- NEW FILE: skiing.xpm --- /* XPM */ static char *skiing[] = { /* columns rows colors chars-per-pixel */ "32 32 101 2", " c #000000030000", ". c #000001430000", "X c #000002470000", "o c #0000034C0000", "O c #0000057D0000", "+ c #000006C60000", "@ c #000007920000", "# c #0000084A0000", "$ c #000009AD0000", "% c #00000A890000", "& c #00000B5E0000", "* c #00000C9B0000", "= c #00000E7E0000", "- c #00000FB70000", "; c #000010F30000", ": c #000011AC0000", "> c #000012800000", ", c #000013A40000", "< c #0000147A0000", "1 c #000015510000", "2 c #000017790000", "3 c #000018EC0000", "4 c #000019C80000", "5 c #00001AA40000", "6 c #00001BBA0000", "7 c #00001C600000", "8 c #00001D780000", "9 c #00001EB60000", "0 c #00001FAB0000", "q c #000020C70000", "w c #000021AB0000", "e c #000023EA0000", "r c #000024840000", "t c #000025800000", "y c #000026560000", "u c #000028F00000", "i c #000029DE0000", "p c #00002BBB0000", "a c #00002CD30000", "s c #00002D9D0000", "d c #00002F090000", "f c #00002F830000", "g c #000030C90000", "h c #000033850000", "j c #000034550000", "k c #000035CD0000", "l c #000037470000", "z c #000038850000", "x c #000039830000", "c c #00003B910000", "v c #00003CC80000", "b c #00003D6B0000", "n c #00003F540000", "m c #000040DF0000", "M c #000041E80000", "N c #000043FD0000", "B c #000044B00000", "V c #000045D40000", "C c #000046E20000", "Z c #000049040000", "A c #000049D10000", "S c #00004AE40000", "D c #00004D0F0000", "F c #00004EE20000", "G c #000052920000", "H c #000053B00000", "J c #000054CF0000", "K c #0000555F0000", "L c #000056810000", "P c #000058C80000", "I c #000059EE0000", "U c #00005C200000", "Y c #00005CD30000", "T c #00005DCC0000", "R c #000060580000", "E c #0000621F0000", "W c #000064AB0000", "Q c #000069120000", "! c #000069FD0000", "~ c #00006BD70000", "^ c #00006CF50000", "/ c #00006E050000", "( c #00006EF50000", ") c #00006FE70000", "_ c #0000721D0000", "` c #000073640000", "' c #000074070000", "] c #000074AB0000", "[ c #000075F50000", "{ c #000077090000", "} c #000077E70000", "| c #000079130000", " . c #000079DC0000", ".. c #00007A840000", "X. c #00007BD50000", "o. c #00007CD40000", "O. c #00007E280000", "+. c #00007F280000", "@. c #00007FD40000", "#. c #000080800000", "$. c None", /* pixels */ "$.$.@.@.@.@.@.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.$.$.", "$.@.@. #.#.$.", "@.@. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.#.", "@. @.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.@.@.@.@.@.@.@.@.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.@.@.@.#.@.@.@.#.#.#.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.@.@.#.#.@.@.#.@.@.#.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.@.@.Q F A v h v o.@.@.@.#.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.' v > * * * 1 A j c ) #.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.o.K t # @ > # q @ * c #.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.@.@.] B > * 3 # 1 q #.#. #.", "#. #.#.#.#.#.#.#.#.#.#.#.#.#.#.@.) B q * > * * q # v #.#. #.", "#. #.#.#.#.#.#.#.@.@.@.@.@.@.@.) v > * 1 # 7 3 7 j @.@. #.", "#. #.#.#.#.#.#.#.@.@.@.@.@.@.@.G 1 # > * # 7 7 7 @.@. #.", "#. #.#.#.#.@.#.#.#.@.@.@.#.@.@.B * * 3 # 1 3 7 @ j #.#. #.", "#. #.#.#.#.@.@.#.#.@.@...) ] ..c @ 1 1 i G I K # # E #.#. #.", "#. #.#.@.@.@.@.#.#.#.#.Q v A I t > 1 3 U @.@.U @ q o.#.#. #.", "#. #.#.@.@.@.@.#.#.#.#.E c c h > @ > 1 s ..@.] B # B @.#.#. #.", "#. #.#.o.@.@.@.#.#.#.#.] ' U t 1 3 > m ..@.) h * ' @.#.#. #.", "#. #.#.) ' ..@.#.#.#.#...U t @ @ 7 t t B U ' I 7 s #.#.#.#. #.", "#. #.#.c m F W ) ) ' ] G 3 @ 7 v K ..' K m j 1 K @.@.@.#. #.", "#. #.#...W A h i s v c 1 # t I o.@.@.@.@.o.I q o.@.@.@.#. #.", "#. #.#.@.@.o.@.@...U B s q t v K ) ] ....o.o.@.@.@.@.@.#.#. #.", "#. #.#.@.@.@.@.@.@.@.#.@.@.) F j q 7 h A W ..o.o.o.] ] #.#. #.", "#. #.@.#.#.#.#.#.#.#.#.#.#.#.@.@...E B s q q j h 7 E #. #.", "#.#. #.#.#.#.#.#.#.#.#.#.#.#.@.@.@.@.@.@.@.@.@.@.@.#. #.#.", "$.#.#. #.#.$.", "$.$.#.#.#.#.#.#.#.#.#.#.#.#.@.@.@.@.@.@.@.@.@.@.@.@.#.#.#.#.$.$." }; --- NEW FILE: post.xpm --- /* XPM */ static char *post[] = { /* columns rows colors chars-per-pixel */ "16 16 58 1", " c black", ". c red", "X c #FF0101", "o c #FF0202", "O c #FF0303", "+ c #FF0404", "@ c #FF0505", "# c #FF0606", "$ c #FF0808", "% c #FF0A0A", "& c #FF0B0B", "* c #FF0C0C", "= c #FF0E0E", "- c #FF1010", "; c #FF1111", ": c #FF1212", "> c #FF1313", ", c #FF1414", "< c #FF1515", "1 c #FF1616", "2 c #FF1717", "3 c #FF1818", "4 c #FF1A1A", "5 c #FF1B1B", "6 c #FF1D1D", "7 c #FF1F1F", "8 c #FF2121", "9 c #FF2222", "0 c #FF2323", "q c #FF2424", "w c #FF2525", "e c #FF2828", "r c #FF2A2A", "t c #FF2C2C", "y c #FF3030", "u c #FF3333", "i c #FF3434", "p c #FF3737", "a c #FF3838", "s c #FF3B3B", "d c #FF3C3C", "f c #FF4E4E", "g c #FF5252", "h c #FF5858", "j c #FF6363", "k c #FF6666", "l c #FF6B6B", "z c #FF6D6D", "x c #FF8282", "c c #FF9D9D", "v c #FFA3A3", "b c #FFA5A5", "n c #FFA9A9", "m c #FFAAAA", "M c #FFC6C6", "N c #FFDCDC", "B c #FFF8F8", "V c None", /* pixels */ "VVVVhr2..:9fVVVV", "VVya=......&r3VV", "Vr&+.........+:V", "Va............6V", "g2zzzzzzzzzzzz3a", "02BckjjkjjkkcB63", ":2Nbna+...anbN9&", ".2M.ybnddmvp.M6.", ".:M...yvby...M9.", "=2M..........M6+", "32NjkkkjkkjjjN9=", "a:xxxxxxxxxxxx29", "V9............=V", "V&3..........9.V", "VV&2+......+=lVV", "VVVV9:+..+03VVVV" }; --- NEW FILE: bus.xpm --- /* XPM */ static char *bus[] = { /* columns rows colors chars-per-pixel */ "30 12 147 2", " c #0C0C0C", ". c #0E0E0E", "X c #101010", "o c gray8", "O c #161616", "+ c gray10", "@ c #1D1D1D", "# c #1E1E1E", "$ c gray14", "% c gray15", "& c gray17", "* c #323232", "= c gray21", "- c #3A3A3A", "; c #3B3C3C", ": c gray27", "> c #464646", ", c #565656", "< c #5B5B5B", "1 c #5D6262", "2 c #606060", "3 c #6B6D6D", "4 c #6E7777", "5 c #008080", "6 c #018080", "7 c #018181", "8 c #028181", "9 c #038181", "0 c #038282", "q c #048282", "w c #058282", "e c #068383", "r c #078383", "t c #088484", "y c #0A8585", "u c #0B8686", "i c #0C8686", "p c #0D8686", "a c #0F8787", "s c #108888", "d c #148A8A", "f c #158A8A", "g c #168A8A", "h c #178B8B", "j c #188C8C", "k c #198C8C", "l c #1A8D8D", "z c #1B8D8D", "x c #1C8D8D", "c c #1E8E8E", "v c #1E8F8F", "b c #1F8F8F", "n c #208F8F", "m c #219090", "M c #229191", "N c #259191", "B c #279393", "V c #289393", "C c #299494", "Z c #2B9595", "A c #2C9595", "S c #329999", "D c #359A9A", "F c #379A9A", "G c #389B9B", "H c #3A9898", "J c #3B9D9D", "K c #3F9898", "L c #3C9D9D", "P c #3D9E9E", "I c #3F9F9F", "U c #469494", "Y c #469797", "T c #4E9494", "R c #549393", "E c #579393", "W c #42A0A0", "Q c #43A0A0", "! c #43A1A1", "~ c #44A0A0", "^ c #46A2A2", "/ c #4AA4A4", "( c #4BA5A5", ") c #4CA5A5", "_ c #4EA6A6", "` c #57A3A3", "' c #52A8A8", "] c #59ACAC", "[ c #5AACAC", "{ c #5FAEAE", "} c #62A7A7", "| c #64B1B1", " . c #66B2B2", ".. c #7EAAAA", "X. c #77BABA", "o. c #7BBCBC", "O. c #7DBEBE", "+. c #7EBEBE", "@. c gray51", "#. c #868686", "$. c gray53", "%. c gray54", "&. c #8D8D8D", "*. c #889A9A", "=. c #9F9F9F", "-. c #86A0A0", ";. c #80ABAB", ":. c gray72", ">. c #B8BBBB", ",. c #8CC4C4", "<. c #8FC6C6", "1. c #9CCCCC", "2. c #A0CECE", "3. c #A3D0D0", "4. c #A5D1D1", "5. c #A6D2D2", "6. c #A8D2D2", "7. c #AED5D5", "8. c #AFD6D6", "9. c #B0D7D7", "0. c #B1D7D7", "q. c #B8DADA", "w. c #B9DBDB", "e. c #BFDEDE", "r. c #C3C3C3", "t. c gray81", "y. c #C0DFDF", "u. c #D7DDDD", "i. c #C6E1E1", "p. c #C9E3E3", "a. c #D0E6E6", "s. c #D6E9E9", "d. c #D7EAEA", "f. c #DBE7E7", "g. c #D8EAEA", "h. c #DBECEC", "j. c #DDECEC", "k. c #E4E4E4", "l. c #E1EEEE", "z. c #E6F1F1", "x. c #EAF3F3", "c. c #EEF5F5", "v. c gray94", "b. c #F0F6F6", "n. c #F6F9F9", "m. c #F9FAFA", "M. c gray99", /* pixels */ "b.^ h h j d j h h d j j d d d d j d d d j d d d j d j d h _ ", "a.l j Y ! Y W u Z Y ! Y D e P ! ! Y M u ^ Y W G t G ! Y N 8.", "w.s ' m.m.m.b.n 5.m.m.m.9.d l.m.M.M. .Z m.m.m.w.v e.m.n.[ e.", "9.u O.M.M.M.s.h p.M.M.M.<.v z.M.M.M.] Y M.M.M.5.M p.M.x.P 2.", "3.u X.e.e.e.<.h 1.e.e.e. .v 9.e.e.e.P / e.e.e.o.v 2.e.2.b +.", ",.0 e t t t r 7 r e u r t 0 t t u r 7 e e u e e 0 t u e 7 _ ", "{ 7 7 7 7 7 5 5 7 5 5 5 5 5 7 7 5 5 5 5 5 5 7 7 7 7 7 5 7 S ", "J s K R T H 7 7 5 5 5 5 5 5 7 7 5 5 7 N U E Y l 7 7 7 7 5 V ", "Z } 1 X # 4 _ 5 5 5 7 5 5 5 5 5 7 7 M -.& ; ..p 5 5 5 7 M ", "P *.. :.%.+ ..n l l l l h l l h j j ` > , r.= 3 Y l l l l V ", "h.:.o @.2 $ u.g.g.g.s.g.s.s.s.s.s.s.g.< - &.% #.l.d.s.s.s.s.", "M.v.#.# * =.M.M.M.M.M.M.M.M.M.M.M.M.M.t.> O < k.M.M.M.M.M.M." }; --- NEW FILE: picnic.xpm --- /* XPM */ static char *picnic[] = { /* columns rows colors chars-per-pixel */ "16 15 45 1", " c #000023", ". c #060629", "X c #0A0A2D", "o c #141436", "O c #1B1B3E", "+ c #1F1F41", "@ c #262648", "# c #28284A", "$ c #29294C", "% c #2B2B4D", "& c #353558", "* c #37375A", "= c #404062", "- c #454567", "; c #48486B", ": c #4A4A6C", "> c #4C4C6F", ", c #535375", "< c #2727C6", "1 c #646486", "2 c #666688", "3 c #68688B", "4 c #737396", "5 c #7B7B9D", "6 c #7E7EA1", "7 c #4D4DCF", "8 c #8181A4", "9 c #8A8AAD", "0 c #8C8CAE", "q c #9898BB", "w c #9A9ABC", "e c #A6A6C9", "r c #AFAFD2", "t c #B4B4D6", "y c #B9B9DB", "u c #BDBDDF", "i c #B5B5E8", "p c #C2C2E4", "a c #C9C9EF", "s c #CECEF1", "d c #CFCFF1", "f c #D0D0F2", "g c #D1D1F2", "h c #F6F6FC", "j c None", /* pixels */ "jjgggggdgddgddjj", "jadgggdgdggggddj", "ddgq,,,,,,,,,gdd", "dgd4 .ddd", "dddie* :: 6eddd", "ddddt+ yy wddgd", "dddd3 #pd2 +ddgg", "d>%%. o#%o .%%%0", "d@ . 6", "ddd- =dgdd0 ddd", "dgd Xqddddd% 2dd", "gg6 *dddddd* ,dd", "gg8,4gddgggi,,td", "jgggdgddggggdddj", "jjdgggggggggddjj" }; --- NEW FILE: fastfood.xpm --- /* XPM */ static char *fastfood[] = { /* columns rows colors chars-per-pixel */ "16 16 166 2", " c black", ". c #181614", "X c #1B1A18", "o c #251606", "O c #2E2B27", "+ c #3E3E3E", "@ c #4F351B", "# c #5F380F", "$ c #53371A", "% c #4D3E2E", "& c #443D35", "* c #5A3F23", "= c #49423A", "- c #4A4138", "; c #514232", ": c #5C4C3B", "> c #5F503F", ", c #714212", "< c #774917", "1 c #7D4F1E", "2 c #614528", "3 c #6E4B24", "4 c #604E3A", "5 c #694E31", "6 c #6D5134", "7 c #4C4843", "8 c #534D47", "9 c #5C5042", "0 c #5C5145", "q c #5F5244", "w c #5E5346", "e c #58534E", "r c #585858", "t c gray35", "y c #5A5A5A", "u c #5B5B5B", "i c #5D5A58", "p c gray37", "a c #605447", "s c #675A4C", "d c #605B55", "f c #625C57", "g c #675F56", "h c #745C43", "j c #715D48", "k c #676058", "l c #6E6051", "z c #6A655F", "x c #71675C", "c c #7E6851", "v c #626262", "b c #646464", "n c #676767", "m c #6E6862", "M c #686868", "N c #696968", "B c #6A6A6A", "V c #6C6C6C", "C c #6D6D6D", "Z c #6E6D6C", "A c #6F6E6D", "S c #746E67", "D c #706C69", "F c #706F6D", "G c #76716B", "H c #7B746D", "J c #727272", "K c gray46", "L c #777776", "P c #787877", "I c #7B7875", "U c gray48", "Y c #7C7C7C", "T c #8B5317", "R c #885219", "E c #965918", "W c #975A19", "Q c #815424", "! c #A5611A", "~ c #A6621B", "^ c #A7631B", "/ c #A9651C", "( c #85725D", ") c #87725C", "_ c #8E7A65", "` c #807870", "' c #CF7B21", "] c #8E8274", "[ c #9A856F", "{ c #838383", "} c gray52", "| c #868686", " . c gray53", ".. c #8B8681", "X. c #8A8885", "o. c #8B8B8B", "O. c #8E8C89", "+. c #8D8D8D", "@. c #8F8F8E", "#. c gray56", "$. c #92908D", "%. c #94908D", "&. c #909090", "*. c #919090", "=. c gray57", "-. c #939392", ";. c gray58", ":. c #989898", ">. c gray60", ",. c #9B9B9B", "<. c gray61", "1. c #9D9D9D", "2. c #9F9F9F", "3. c #A1A1A0", "4. c #A4A4A4", "5. c #A7A7A7", "6. c #A8A8A7", "7. c #AAA9A7", "8. c #A9A9A9", "9. c #AAAAAA", "0. c #AEAEAE", "q. c #AFAFAF", "w. c #B1B0AF", "e. c gray69", "r. c #B1B1B1", "t. c #B2B2B2", "y. c gray71", "u. c #B6B6B6", "i. c gray72", "p. c #BBBBBB", "a. c gray74", "s. c gray75", "d. c #C3BEB9", "f. c #C1C1C1", "g. c #C3C3C3", "h. c #C6C4C2", "j. c gray77", "k. c gray79", "l. c #CBCBCB", "z. c #CDCDCD", "x. c #CECECE", "c. c #D0D0D0", "v. c gray82", "b. c #D2D2D2", "n. c LightGray", "m. c gray83", "M. c #D5D5D5", "N. c gray84", "B. c #D7D7D7", "V. c #D8D8D8", "C. c gray85", "Z. c #DDDDDD", "A. c gray87", "S. c #DFDFDF", "D. c #E1DEDB", "F. c #E2E2E2", "G. c #E4E4E4", "H. c gray90", "J. c #E7E7E7", "K. c gray91", "L. c gray93", "P. c gray95", "I. c #F4F4F4", "U. c gray97", "Y. c gray100", "T. c None", /* pixels */ "T.T.@ s 3 T.T.T.T.T.T.T.T.T.T.T.", "T.^ 1 g 4 < T.T.T.T.T.T.T.T.T.T.", "2 k l i = a = Q T.T.T.T.T.T.T.T.", "& C 5. .r ;.n O T.T.T.T.T.T.T.T.", "] r.>.o.&.2.f.0 T.T.T.T.T.T.T.T.", "[ I.Y.Y.Y.Y.A.5 f C F 7 * T.T.T.", "_ K.Y.Y.Y.P.M ` I 7.-.X.x > W T.", "8 w.c.l.y.M r.y.8.8.B.c.l.7.c T.", "% h.c.l.y.o.m.x.F.c.n.g.B.K.%.R ", "$ D.Y.Y.x.;.p.U.A.m.F.H.t.L.$.h ", ", d.Y.Y.C C >.>.5.m.m.c.a.2.P z ", "^ H m.H.p r L >.o. . .J #.&.e 6 ", "' ..a.r.>.C r #.q.v + i P v i T ", "T.9 G 3.&.M w.2. . .#.v Y 2.a E ", "T.# o . X 0 O.@.r.f.f.i. .D : T.", "T.T.T.T.T.^ j ( S L C m ( ; T.T." }; --- NEW FILE: tower.xpm --- /* XPM */ static char *tower[] = { /* columns rows colors chars-per-pixel */ "10 16 13 1", " c black", ". c #131313", "X c gray8", "o c #1B1B1B", "O c #1E1E1E", "+ c #252525", "@ c gray15", "# c gray21", "$ c gray25", "% c #797979", "& c #AEAEAE", "* c #D7D7D7", "= c gray100", /* pixels */ "==========", "====%%====", "===& &===", "===&oo&===", "===* *===", "==== ====", "==== ====", "====##====", "====$#====", "====o@====", "====OO====", "====.X====", "====@@====", "====..====", "==== ====", "==== ====" }; --- NEW FILE: telephone.xpm --- /* XPM */ static char *telephone[] = { /* columns rows colors chars-per-pixel */ "9 10 35 1", " c black", ". c gray6", "X c #161616", "o c gray15", "O c #282828", "+ c #373737", "@ c gray25", "# c #464646", "$ c #515151", "% c #535353", "& c #555555", "* c #606060", "= c gray46", "- c gray50", "; c #838383", ": c #9B9B9B", "> c gray63", ", c #A2A2A2", "< c #A9A9A9", "1 c #C8C8C8", "2 c gray83", "3 c #DDDDDD", "4 c #DFDFDF", "5 c #E4E4E4", "6 c #E9E9E9", "7 c #EEEEEE", "8 c gray96", "9 c #F6F6F6", "0 c gray97", "q c #F9F9F9", "w c gray98", "e c gray99", "r c #FDFDFD", "t c #FEFEFE", "y c gray100", /* pixels */ "yyy88yyyy", "yy;#&yyyy", "y7X@=yyyy", "y4 1wyyyy", "y6.:yyyyy", "yy+owyyyy", "yy> <y5yy", "yy8%o-%>y", "yyy8% o-y", "yyyyy42yy" }; |
|
From: KaZeR <ka...@us...> - 2007-12-14 15:56:04
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13012/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Made the previous fix to work :) Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** gui_sdl_window.cpp 14 Dec 2007 14:59:01 -0000 1.36 --- gui_sdl_window.cpp 14 Dec 2007 15:56:07 -0000 1.37 *************** *** 520,524 **** SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); ! init_GL(); try --- 520,524 ---- SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); ! // init_GL(); try *************** *** 694,698 **** exit(1); } ! // Force centering view on cursor // navit_toggle_cursor(gui->nav); --- 694,698 ---- exit(1); } ! init_GL(); // Force centering view on cursor // navit_toggle_cursor(gui->nav); |
|
From: KaZeR <ka...@us...> - 2007-12-14 14:59:03
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20382/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fixed a little bug with button label when setting the default view mode in navit.xml Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** gui_sdl_window.cpp 11 Dec 2007 14:52:54 -0000 1.35 --- gui_sdl_window.cpp 14 Dec 2007 14:59:01 -0000 1.36 *************** *** 421,424 **** --- 421,425 ---- glMatrixMode(GL_MODELVIEW); glLoadIdentity(); + CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("2D"); } else { *************** *** 437,441 **** glLoadIdentity(); // gluLookAt(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); ! } --- 438,442 ---- glLoadIdentity(); // gluLookAt(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ); ! CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("3D"); } *************** *** 453,462 **** { VIEW_MODE=!VIEW_MODE; - - if(VIEW_MODE==VM_2D){ - CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("2D"); - } else { - CEGUI::WindowManager::getSingleton().getWindow("OSD/ViewMode")->setText("3D"); - } init_GL(); } --- 454,457 ---- |
|
From: Alexander A. <za...@us...> - 2007-12-13 14:25:06
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18792/src Modified Files: osm2navit.c Log Message: [PATCH] map more OSM attributes to POI from Aurelien Jacobs - Thanks Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** osm2navit.c 10 Dec 2007 13:35:12 -0000 1.16 --- osm2navit.c 13 Dec 2007 14:25:03 -0000 1.17 *************** *** 35,39 **** --- 35,98 ---- "n type junktion\n" "n amenity hospital poi_hospital\n" + "n amenity atm poi_bank\n" "n amenity bank poi_bank\n" + "n amenity pub poi_bar\n" + "n amenity cafe poi_bar\n" + "n amenity bus_station poi_bus_station\n" + "n amenity parking poi_car_parking\n" + "n amenity cinema poi_cinema\n" + "n amenity fire_station poi_firebrigade\n" + "n amenity fuel poi_fuel\n" + "n amenity courthouse poi_justice\n" + "n amenity library poi_library\n" + "n amenity pharmacy poi_pharmacy\n" + "n amenity place_of_worship poi_church\n" + "n amenity police poi_police\n" + "n amenity post_office poi_post\n" + "n amenity post_box poi_post\n" + "n amenity public_building poi_public_office\n" + "n amenity restaurant poi_restaurant\n" + "n amenity fast_food poi_fastfood\n" + "n amenity toilets poi_restroom\n" + "n amenity school poi_school\n" + "n amenity university poi_school\n" + "n amenity college poi_school\n" + "n amenity telephone poi_telephone\n" + "n amenity theatre poi_theater\n" + "n leisure slipway poi_boat_ramp\n" + "n leisure fishing poi_fish\n" + "n leisure golf_course poi_golf\n" + "n leisure marina poi_marine\n" + "n leisure sports_centre poi_sport\n" + "n leisure stadium poi_stadium\n" + "n shop supermarket poi_shopping\n" + "n shop convenience poi_shop_grocery\n" + "n tourism attraction poi_attraction\n" + "n tourism camp_site poi_camp_rv\n" + "n tourism caravan_site poi_camp_rv\n" + "n tourism hotel poi_hotel\n" + "n tourism motel poi_hotel\n" + "n tourism guest_house poi_hotel\n" + "n tourism hostel poi_hotel\n" + "n tourism information poi_information\n" + "n tourism picnic_site poi_picnic\n" + "n tourism theme_park poi_resort\n" + "n tourism zoo poi_zoo\n" + "n historic museum poi_museum_history\n" + "n amenity grave_yard poi_cemetery\n" + "n landuse cemetery poi_cemetery\n" + "n military airfield poi_military\n" + "n military bunker poi_military\n" + "n military barracks poi_military\n" + "n military range poi_military\n" + "n military danger_area poi_danger_area\n" + "n sport golf poi_golf\n" + "n sport swimming poi_swimming\n" + "n sport skiing poi_skiing\n" + "n aeroway aerodrome poi_airport\n" + "n aeroway terminal poi_airport\n" + "n aeroway helipad poi_heliport\n" + "n man_made tower poi_tower\n" + "n natural bay poi_bay\n" "n place suburb district_label\n" "n place city town_label_2e5\n" |
|
From: Alexander A. <za...@us...> - 2007-12-11 23:43:11
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5112 Modified Files: route.c Log Message: Reuse route_path_segments from the last calculated path when possible Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** route.c 6 Dec 2007 21:41:21 -0000 1.27 --- route.c 11 Dec 2007 23:43:10 -0000 1.28 *************** *** 71,74 **** --- 71,75 ---- struct route_path_segment *next; struct item item; + unsigned int offset; int time; int length; *************** *** 102,106 **** #define RF_SHOWGRAPH (1<<5) - struct route { int version; --- 103,106 ---- *************** *** 128,132 **** static struct route_graph_point *route_graph_get_point(struct route_graph *this, struct coord *c); static void route_graph_update(struct route *this); ! static struct route_path *route_path_new(struct route_graph *this, struct route_info *pos, struct route_info *dst, int *speedlist); static void route_process_street_graph(struct route_graph *this, struct item *item); static void route_graph_destroy(struct route_graph *this); --- 128,132 ---- static struct route_graph_point *route_graph_get_point(struct route_graph *this, struct coord *c); static void route_graph_update(struct route *this); ! static struct route_path *route_path_new(struct route_graph *this, struct route_path *oldpath, struct route_info *pos, struct route_info *dst, int *speedlist); static void route_process_street_graph(struct route_graph *this, struct item *item); static void route_graph_destroy(struct route_graph *this); *************** *** 223,237 **** route_path_update(struct route *this) { ! route_path_destroy(this->path2); ! this->path2 = NULL; ! if (! this->pos || ! this->dst) return; ! if (! this->graph || !(this->path2=route_path_new(this->graph, this->pos, this->dst, this->speedlist))) { profile(0,NULL); route_graph_update(this); ! this->path2=route_path_new(this->graph, this->pos, this->dst, this->speedlist); profile(1,"route_path_new"); profile(0,"end"); } } --- 223,249 ---- route_path_update(struct route *this) { ! struct route_path *oldpath = NULL; ! if (! this->pos || ! this->dst) { ! route_path_destroy(this->path2); ! this->path2 = NULL; return; ! } ! /* the graph is destroyed when setting the destination */ ! if (this->graph && this->pos && this->dst && this->path2) { ! // we can try to update ! oldpath = this->path2; ! this->path2 = NULL; ! } ! if (! this->graph || !(this->path2=route_path_new(this->graph, oldpath, this->pos, this->dst, this->speedlist))) { profile(0,NULL); route_graph_update(this); ! this->path2=route_path_new(this->graph, oldpath, this->pos, this->dst, this->speedlist); profile(1,"route_path_new"); profile(0,"end"); } + if (oldpath) { + /* Destroy what's left */ + route_path_destroy(oldpath); + } } *************** *** 365,369 **** this->dst=route_find_nearest_street(this->ms, dst); profile(1,"find_nearest_street"); - route_graph_destroy(this->graph); this->graph=NULL; --- 377,380 ---- *************** *** 493,498 **** } static void ! route_path_add_item(struct route_path *this, struct route_graph_segment *rgs, int len, int time, int offset) { struct route_path_segment *segment; --- 504,534 ---- } + static struct route_path_segment * + route_extract_segment_from_path(struct route_path *path, struct item *item, + int offset) + { + struct route_path_segment *sp = NULL, *s; + s = path->path; + while (s) { + if (s->offset == offset && item_is_equal(s->item,*item)) { + if (sp) { + sp->next = s->next; + break; + } else { + path->path = s->next; + break; + } + } + sp = s; + s = s->next; + } + if (s) + item_hash_remove(path->path_hash, item); + return s; + } + 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) { struct route_path_segment *segment; *************** *** 500,503 **** --- 536,549 ---- struct coord ca[2048]; + if (oldpath) { + ccnt = (int)item_hash_lookup(oldpath->path_hash, &rgs->item); + if (ccnt) { + segment = route_extract_segment_from_path(oldpath, + &rgs->item, offset); + if (segment) + goto linkold; + } + } + ccnt = get_item_seg_coords(&rgs->item, ca, 2047, rgs); segment= calloc(1, sizeof(*segment) + sizeof(struct coord) * ccnt); *************** *** 508,516 **** memcpy(segment->c, ca, ccnt * sizeof(struct coord)); segment->ncoords = ccnt; - item_hash_insert(this->path_hash, &rgs->item, (void *)offset); segment->item=rgs->item; ! segment->next=NULL; segment->length=len; segment->time=time; if (!this->path) this->path=segment; --- 554,564 ---- memcpy(segment->c, ca, ccnt * sizeof(struct coord)); segment->ncoords = ccnt; segment->item=rgs->item; ! segment->offset = offset; ! linkold: segment->length=len; segment->time=time; + segment->next=NULL; + item_hash_insert(this->path_hash, &rgs->item, (void *)offset); if (!this->path) this->path=segment; *************** *** 520,524 **** } - struct route_path_handle { struct route_path_segment *s; --- 568,571 ---- *************** *** 932,936 **** static struct route_path * ! route_path_new(struct route_graph *this, struct route_info *pos, struct route_info *dst, int *speedlist) { struct route_graph_point *start1=NULL,*start2=NULL,*start; --- 979,983 ---- static struct route_path * ! route_path_new(struct route_graph *this, struct route_path *oldpath, struct route_info *pos, struct route_info *dst, int *speedlist) { struct route_graph_point *start1=NULL,*start2=NULL,*start; *************** *** 995,1002 **** len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, s, seg_len, seg_time, s->offset); start=s->end; } else { ! route_path_add_item(ret, s, seg_len, seg_time, s->offset); start=s->start; } --- 1042,1049 ---- len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset); start=s->end; } else { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset); start=s->start; } |
|
From: Alexander A. <za...@us...> - 2007-12-11 18:12:57
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14009 Modified Files: gui_gtk_window.c Log Message: Support embedding into X sockets for gtk GUI Index: gui_gtk_window.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gui_gtk_window.c 10 Dec 2007 12:26:39 -0000 1.14 --- gui_gtk_window.c 11 Dec 2007 18:12:57 -0000 1.15 *************** *** 1,3 **** --- 1,4 ---- #include <stdio.h> + #include <stdlib.h> #include <gdk/gdkkeysyms.h> #if !defined(GDK_Book) || !defined(GDK_Calendar) *************** *** 154,163 **** struct gui_priv *this; int w=792, h=547; *meth=gui_gtk_methods; ! this=g_new0(struct gui_priv, 1); this->nav=nav; ! this->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); g_signal_connect(G_OBJECT(this->win), "delete-event", G_CALLBACK(gui_gtk_delete), nav); this->vbox = gtk_vbox_new(FALSE, 0); --- 155,174 ---- struct gui_priv *this; int w=792, h=547; + char *cp = getenv("NAVIT_XID"); + unsigned xid = 0; + + if (cp) { + xid = strtol(cp, NULL, 0); + } *meth=gui_gtk_methods; ! this=g_new0(struct gui_priv, 1); this->nav=nav; ! if (!xid) ! this->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); ! else ! this->win = gtk_plug_new(xid); ! g_signal_connect(G_OBJECT(this->win), "delete-event", G_CALLBACK(gui_gtk_delete), nav); this->vbox = gtk_vbox_new(FALSE, 0); |
|
From: KaZeR <ka...@us...> - 2007-12-11 14:52:51
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25263/gui/sdl Modified Files: gui_sdl_window.cpp sdl_events.cpp Log Message: Added media_window_title,media_cmd options to cegui Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** gui_sdl_window.cpp 11 Dec 2007 14:24:13 -0000 1.34 --- gui_sdl_window.cpp 11 Dec 2007 14:52:54 -0000 1.35 *************** *** 65,68 **** --- 65,69 ---- #define _(STRING) gettext(STRING) + char media_window_title[255], media_cmd[255]; struct bookmark{ *************** *** 818,821 **** --- 819,837 ---- } + struct attr *media_cmd_setting=attr_search(attrs, NULL, attr_media_cmd); + if(media_cmd_setting){ + dbg(0,"setting media_cmd to %s\n",media_cmd_setting->u.str); + strcpy(media_cmd,media_cmd_setting->u.str); + } else { + // strcpy(media_cmd_setting->u.str,media_window_title); + } + + struct attr *media_window_title_setting=attr_search(attrs, NULL, attr_media_window_title); + if(media_window_title_setting){ + strcpy(media_window_title,media_window_title_setting->u.str); + } else { + // strcpy(media_cmd_setting->u.str,media_window_title); + } + struct attr *skin_setting=attr_search(attrs, NULL, attr_skin); if(skin_setting){ Index: sdl_events.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** sdl_events.cpp 10 Dec 2007 12:26:39 -0000 1.21 --- sdl_events.cpp 11 Dec 2007 14:52:54 -0000 1.22 *************** *** 503,510 **** bool Switch_to_nGhost(const CEGUI::EventArgs& event) { ! printf("Switching to nGhost\n"); ! if (window_switch("Nanonymous")==EXIT_FAILURE) { ! popen("nghost","r"); } --- 503,511 ---- bool Switch_to_nGhost(const CEGUI::EventArgs& event) { ! extern char media_window_title[255], media_cmd[255]; ! dbg(0,"trying to switch to %s (%s)\n",media_window_title,media_cmd); ! if (window_switch(media_window_title)==EXIT_FAILURE) { ! popen(media_cmd,"r"); } |
|
From: KaZeR <ka...@us...> - 2007-12-11 14:52:51
|
Update of /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25263/gui/sdl/datafiles/layouts Modified Files: TaharezLook.layout Log Message: Added media_window_title,media_cmd options to cegui Index: TaharezLook.layout =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/datafiles/layouts/TaharezLook.layout,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TaharezLook.layout 3 Dec 2007 21:22:24 -0000 1.6 --- TaharezLook.layout 11 Dec 2007 14:52:54 -0000 1.7 *************** *** 186,190 **** </Window> <Window Type="TaharezLook/Button" Name="OSD/nGhostButton" > ! <Property Name="Text" Value="nGhost" /> <Property Name="Visible" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> --- 186,190 ---- </Window> <Window Type="TaharezLook/Button" Name="OSD/nGhostButton" > ! <Property Name="Text" Value="Media" /> <Property Name="Visible" Value="True" /> <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> |
|
From: KaZeR <ka...@us...> - 2007-12-11 14:52:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25263 Modified Files: attr_def.h Log Message: Added media_window_title,media_cmd options to cegui Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** attr_def.h 11 Dec 2007 14:24:13 -0000 1.15 --- attr_def.h 11 Dec 2007 14:52:54 -0000 1.16 *************** *** 53,56 **** --- 53,58 ---- ATTR(view_mode) ATTR(tilt) + ATTR(media_window_title) + ATTR(media_cmd) /* poi */ ATTR(icon) |
|
From: KaZeR <ka...@us...> - 2007-12-11 14:24:15
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12266 Modified Files: attr_def.h Log Message: Added view_mode and tilt options to cegui Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** attr_def.h 20 Nov 2007 18:55:41 -0000 1.14 --- attr_def.h 11 Dec 2007 14:24:13 -0000 1.15 *************** *** 51,54 **** --- 51,56 ---- ATTR(skin) ATTR(fullscreen) + ATTR(view_mode) + ATTR(tilt) /* poi */ ATTR(icon) |
|
From: KaZeR <ka...@us...> - 2007-12-11 14:24:11
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12266/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Added view_mode and tilt options to cegui Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** gui_sdl_window.cpp 3 Dec 2007 21:22:24 -0000 1.33 --- gui_sdl_window.cpp 11 Dec 2007 14:24:13 -0000 1.34 *************** *** 473,477 **** ! static void init_sdlgui(char * skin_layout,int fullscreen) { SDL_Surface * screen; --- 473,477 ---- ! static void init_sdlgui(char * skin_layout,int fullscreen,int tilt) { SDL_Surface * screen; *************** *** 671,674 **** --- 671,680 ---- CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")->subscribeEvent(Scrollbar::EventScrollPositionChanged, Event::Subscriber(MoveCamera)); + // FIXME : char (conf) -> int (init) -> char (property) = bad + char buffer[4]; + sprintf (buffer,"%i",tilt); + CEGUI::WindowManager::getSingleton().getWindow("OSD/Scrollbar1")->setProperty("ScrollPosition",buffer); + eyeZ=-tilt; + CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->subscribeEvent(PushButton::EventClicked, Event::Subscriber(RoadBookSwitch)); CEGUI::WindowManager::getSingleton().getWindow("OSD/RoadbookButton")->setText(_("RoadBook")); *************** *** 778,781 **** --- 784,788 ---- struct attr *fullscreen_setting=attr_search(attrs, NULL, attr_fullscreen); + //FIXME currently, we only check if fullscreen is declared, but not its value if(fullscreen_setting){ fullscreen=1; *************** *** 786,796 **** } struct attr *skin_setting=attr_search(attrs, NULL, attr_skin); if(skin_setting){ ! init_sdlgui(skin_setting->u.str,fullscreen); } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("TaharezLook",fullscreen); } dbg(1,"End SDL init\n"); --- 793,829 ---- } + int tilt=400; + struct attr *tilt_setting=attr_search(attrs, NULL, attr_tilt); + if(tilt_setting){ + if(sscanf(tilt_setting->u.str,"%i",&tilt)){ + dbg(0,"tilt set to %i\n",tilt); + } else { + dbg(0,"title was not recognized : %s\n",tilt_setting->u.str); + } + } else { + dbg(0,"tilt is not set\n"); + } + + struct attr *view_mode_setting=attr_search(attrs, NULL, attr_view_mode); + if(view_mode_setting){ + if(!strcmp(view_mode_setting->u.str,"2D")){ + dbg(0,"View mode is 2D\n"); + VIEW_MODE=VM_2D; + } else { + dbg(0,"view mode is something else : %s\n",view_mode_setting->u.str); + } + + } else { + dbg(0,"view_mode is not set\n"); + } + struct attr *skin_setting=attr_search(attrs, NULL, attr_skin); if(skin_setting){ ! init_sdlgui(skin_setting->u.str,fullscreen,tilt); } else { g_warning("Warning, no skin set for <sdl> in navit.xml. Using default one"); ! init_sdlgui("TaharezLook",fullscreen,tilt); } + dbg(1,"End SDL init\n"); |
|
From: KaZeR <ka...@us...> - 2007-12-11 10:50:11
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5670/src Modified Files: navit.c Log Message: Applied zoom_Ãfactorize.diff patch from Aurelien J. Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** navit.c 10 Dec 2007 21:18:01 -0000 1.47 --- navit.c 11 Dec 2007 10:50:09 -0000 1.48 *************** *** 253,256 **** --- 253,272 ---- } + static void + navit_scale(struct navit *this_, long scale, struct point *p) + { + struct coord c1, c2, *center; + if (p) + transform_reverse(this_->trans, p, &c1); + transform_set_scale(this_->trans, scale); + if (p) { + transform_reverse(this_->trans, p, &c2); + center = transform_center(this_->trans); + center->x += c1.x - c2.x; + center->y += c1.y - c2.y; + } + navit_draw(this_); + } + /** * Change the current zoom level, zooming closer to the ground *************** *** 264,281 **** navit_zoom_in(struct navit *this_, int factor, struct point *p) { - struct coord c1, c2, *center; long scale=transform_get_scale(this_->trans)/factor; if (scale < 1) scale=1; ! if (p) ! transform_reverse(this_->trans, p, &c1); ! transform_set_scale(this_->trans, scale); ! if (p) { ! transform_reverse(this_->trans, p, &c2); ! center = transform_center(this_->trans); ! center->x += c1.x - c2.x; ! center->y += c1.y - c2.y; ! } ! navit_draw(this_); } --- 280,287 ---- navit_zoom_in(struct navit *this_, int factor, struct point *p) { long scale=transform_get_scale(this_->trans)/factor; if (scale < 1) scale=1; ! navit_scale(this_, scale, p); } *************** *** 291,306 **** navit_zoom_out(struct navit *this_, int factor, struct point *p) { - struct coord c1, c2, *center; long scale=transform_get_scale(this_->trans)*factor; ! if (p) ! transform_reverse(this_->trans, p, &c1); ! transform_set_scale(this_->trans,scale); ! if (p) { ! transform_reverse(this_->trans, p, &c2); ! center = transform_center(this_->trans); ! center->x += c1.x - c2.x; ! center->y += c1.y - c2.y; ! } ! navit_draw(this_); } --- 297,302 ---- navit_zoom_out(struct navit *this_, int factor, struct point *p) { long scale=transform_get_scale(this_->trans)*factor; ! navit_scale(this_, scale, p); } |
|
From: Martin S. <mar...@us...> - 2007-12-10 21:18:01
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7172 Modified Files: navit.c Log Message: Improved left mouse button handling Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** navit.c 10 Dec 2007 12:26:39 -0000 1.46 --- navit.c 10 Dec 2007 21:18:01 -0000 1.47 *************** *** 90,94 **** struct menu *destinations; struct point pressed, last, current; ! int button_pressed,moved; guint button_timeout, motion_timeout; }; --- 90,94 ---- struct menu *destinations; struct point pressed, last, current; ! int button_pressed,moved,popped; guint button_timeout, motion_timeout; }; *************** *** 161,164 **** --- 161,165 ---- popup(this_, 1, &this_->pressed); this_->button_timeout=0; + this_->popped=1; return FALSE; } *************** *** 176,179 **** --- 177,181 ---- this_->button_pressed=1; this_->moved=0; + this_->popped=0; this_->button_timeout=g_timeout_add(500, navit_popup, data); } *************** *** 236,240 **** int dx, dy; ! if (this_->button_pressed) { dx=(p->x-this_->pressed.x); dy=(p->y-this_->pressed.y); --- 238,242 ---- int dx, dy; ! if (this_->button_pressed && !this_->popped) { dx=(p->x-this_->pressed.x); dy=(p->y-this_->pressed.y); |
|
From: Martin S. <mar...@us...> - 2007-12-10 13:35:14
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18388 Modified Files: osm2navit.c Log Message: Fixed some town labels Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** osm2navit.c 9 Dec 2007 12:59:57 -0000 1.15 --- osm2navit.c 10 Dec 2007 13:35:12 -0000 1.16 *************** *** 37,41 **** "n amenity bank poi_bank\n" "n place suburb district_label\n" ! "n place town town_label\n" "w amenity place_of_worship building_poly\n" "w building\n" --- 37,43 ---- "n amenity bank poi_bank\n" "n place suburb district_label\n" ! "n place city town_label_2e5\n" ! "n place town town_label_2e4\n" ! "n place village town_label_2e3\n" "w amenity place_of_worship building_poly\n" "w building\n" |
|
From: Martin S. <mar...@us...> - 2007-12-10 13:28:48
|
Update of /cvsroot/navit/navit/src/script In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15510 Added Files: mapExtract.class.php map_index.php Log Message: Added mapExtract class from burner and web script for downloading a map area --- NEW FILE: map_index.php --- <code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /> set_time_limit</span><span style="color: #007700">(</span><span style="color: #0000BB">600</span><span style="color: #007700">);<br /> require_once(</span><span style="color: #DD0000">"mapExtract.class.php"</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$bbox</span><span style="color: #007700">=</span><span style="color: #0000BB">split</span><span style="color: #007700">(</span><span style="color: #DD0000">','</span><span style="color: #007700">,</span><span style="color: #0000BB">$HTTP_GET_VARS</span><span style="color: #007700">[</span><span style="color: #DD0000">'bbox'</span><span style="color: #007700">]);<br /> if (</span><span style="color: #0000BB">count</span><span style="color: #007700">(</span><span style="color: #0000BB">$bbox</span><span style="color: #007700">) == </span><span style="color: #0000BB">4</span><span style="color: #007700">) {<br /> </span><span style="color: #0000BB">$mapextract </span><span style="color: #007700">= new </span><span style="color: #0000BB">mapExtract</span><span style="color: #007700">();<br /> </span><span style="color: #0000BB">$mapextract</span><span style="color: #007700">-></span><span style="color: #0000BB">setBbox</span><span style="color: #007700">(</span><span style="color: #0000BB">$bbox</span><span style="color: #007700">[</span><span style="color: #0000BB">0</span><span style="color: #007700">], </span><span style="color: #0000BB">$bbox</span><span style="color: #007700">[</span><span style="color: #0000BB">1</span><span style="color: #007700">], </span><span style="color: #0000BB">$bbox</span><span style="color: #007700">[</span><span style="color: #0000BB">2</span><span style="color: #007700">], </span><span style="color: #0000BB">$bbox</span><span style="color: #007700">[</span><span style="color: #0000BB">3</span><span style="color: #007700">]); <br /> </span><span style="color: #0000BB">$fp</span><span style="color: #007700">=</span><span style="color: #0000BB">fopen</span><span style="color: #007700">(</span><span style="color: #DD0000">'php://output'</span><span style="color: #007700">,</span><span style="color: #DD0000">'w'</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$mapextract</span><span style="color: #007700">-></span><span style="color: #0000BB">setInput</span><span style="color: #007700">(</span><span style="color: #DD0000">'../../planet.bin'</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$mapextract</span><span style="color: #007700">-></span><span style="color: #0000BB">setOutputFD</span><span style="color: #007700">(</span><span style="color: #0000BB">$fp</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">header</span><span style="color: #007700">(</span><span style="color: #DD0000">'Content-Type: application/octet-stream'</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$error</span><span style="color: #007700">=</span><span style="color: #0000BB">$mapextract</span><span style="color: #007700">-></span><span style="color: #0000BB">process</span><span style="color: #007700">();<br /> if (</span><span style="color: #0000BB">$error</span><span style="color: #007700">) {<br /> </span><span style="color: #0000BB">header</span><span style="color: #007700">(</span><span style="color: #DD0000">'Content-Type: text/plain'</span><span style="color: #007700">);<br /> echo </span><span style="color: #0000BB">$error</span><span style="color: #007700">;<br /> }<br /> </span><span style="color: #0000BB">fclose</span><span style="color: #007700">(</span><span style="color: #0000BB">$fp</span><span style="color: #007700">);<br /> } else {<br /> </span><span style="color: #FF8000">#echo "<pre>";<br /> #print_r($HTTP_HOST);<br /> #echo "</pre>";<br /> </span><span style="color: #0000BB">$areas</span><span style="color: #007700">=array(<br /> </span><span style="color: #DD0000">'Germany' </span><span style="color: #007700">=> </span><span style="color: #DD0000">'5,47,16,55.1'</span><span style="color: #007700">,<br /> );<br /> </span><span style="color: #0000BB">$url</span><span style="color: #007700">=</span><span style="color: #DD0000">'http://' </span><span style="color: #007700">. </span><span style="color: #0000BB">$HTTP_HOST </span><span style="color: #007700">. </span><span style="color: #0000BB">$PHP_SELF</span><span style="color: #007700">;<br /> echo </span><span style="color: #DD0000">"Use: $url?bbox=bllon,bllat,trlon,trlat <br />\n"</span><span style="color: #007700">;<br /> echo </span><span style="color: #DD0000">"<br />\n"</span><span style="color: #007700">;<br /> while (list(</span><span style="color: #0000BB">$area</span><span style="color: #007700">,</span><span style="color: #0000BB">$bbox</span><span style="color: #007700">)=</span><span style="color: #0000BB">each</span><span style="color: #007700">(</span><span style="color: #0000BB">$areas</span><span style="color: #007700">)) {<br /> </span><span style="color: #0000BB">$urlf</span><span style="color: #007700">=</span><span style="color: #0000BB">$url </span><span style="color: #007700">. </span><span style="color: #DD0000">"?bbox=$bbox"</span><span style="color: #007700">;<br /> echo </span><span style="color: #DD0000">"$area <a href='$urlf'>$urlf</a><br />\n"</span><span style="color: #007700">;<br /> }<br /> <br /> }<br /></span><span style="color: #0000BB">?><br /></span> </span> </code> --- NEW FILE: mapExtract.class.php --- <code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /><br /></span><span style="color: #007700">class </span><span style="color: #0000BB">mapExtract </span><span style="color: #007700">{<br /> <br /> var </span><span style="color: #0000BB">$input_fd</span><span style="color: #007700">;<br /> var </span><span style="color: #0000BB">$output_fd</span><span style="color: #007700">;<br /> var </span><span style="color: #0000BB">$fetchBbox</span><span style="color: #007700">;<br /> <br /> var </span><span style="color: #0000BB">$formats</span><span style="color: #007700">;<br /> var </span><span style="color: #0000BB">$worldBbox</span><span style="color: #007700">;<br /> <br /> function </span><span style="color: #0000BB">mapExtract</span><span style="color: #007700">() {<br /> </span><span style="color: #0000BB">$formats </span><span style="color: #007700">= array();<br /> <br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'ziphpack'</span><span style="color: #007700">] = </span><span style="color: #DD0000">"lssssslLLSS"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] = </span><span style="color: #DD0000">"l" </span><span style="color: #007700">. </span><span style="color: #DD0000">"ziplocsig"</span><span style="color: #007700">; </span><span style="color: #FF8000"># Signature (is always the same)<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipver"</span><span style="color: #007700">; </span><span style="color: #FF8000"># zip version needed<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipgenfld"</span><span style="color: #007700">;</span><span style="color: #FF8000"># type of os that generated the file<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipmthd"</span><span style="color: #007700">; </span><span style="color: #FF8000"># <br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"ziptime"</span><span style="color: #007700">; </span><span style="color: #FF8000"># time<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipdate"</span><span style="color: #007700">; </span><span style="color: #FF8000"># date<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/l" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcrc"</span><span style="color: #007700">; </span><span style="color: #FF8000"># crc checksum<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/L" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipsize"</span><span style="color: #007700">; </span><span style="color: #FF8000"># data size<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/L" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipuncmp"</span><span style="color: #007700">; </span><span style="color: #FF8000"># uncompressed size<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipfnln"</span><span style="color: #007700">; </span><span style="color: #FF8000"># length of filename<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">] .= </span><span style="color: #DD0000">"/S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipxtraln"</span><span style="color: #007700">;</span><span style="color: #FF8000"># length of extra data (always 0)<br /> <br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcdpack'</span><span style="color: #007700">] = </span><span style="color: #DD0000">"iccccssssiIISSSSSII"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcd'</span><span style="color: #007700">] = </span><span style="color: #DD0000">""</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"i" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcensig/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"c" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcver/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"c" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcos/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"c" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcvxt/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"c" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcexos/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcflg/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcmthd/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"ziptim/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipdat/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"i" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipccrc/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcsiz/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcunc/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcfnl/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipcxtl/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipccml/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipdsk/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipint/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipext/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipofst"</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipeocpack'</span><span style="color: #007700">] = </span><span style="color: #DD0000">"iSSSSIIs"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipeoc'</span><span style="color: #007700">] = </span><span style="color: #DD0000">""</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"i" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipesig/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipedsk/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipecen/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipenum/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"S" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipecenn/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipecsz/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"I" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipeofst/"</span><span style="color: #007700">.<br /> </span><span style="color: #DD0000">"s" </span><span style="color: #007700">. </span><span style="color: #DD0000">"zipecoml/"</span><span style="color: #007700">.<br /> <br /> </span><span style="color: #0000BB">$world_bbox </span><span style="color: #007700">= array();<br /> </span><span style="color: #0000BB">$world_bbox</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = -</span><span style="color: #0000BB">20000000</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$world_bbox</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = -</span><span style="color: #0000BB">20000000</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$world_bbox</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">20000000</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$world_bbox</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">20000000</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">formats </span><span style="color: #007700">= </span><span style="color: #0000BB">$formats</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">worldBbox </span><span style="color: #007700">= </span><span style="color: #0000BB">$world_bbox</span><span style="color: #007700">;<br /> }<br /> <br /> <br /> function </span><span style="color: #0000BB">process</span><span style="color: #007700">() {<br /> <br /> if (!</span><span style="color: #0000BB">is_array</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">fetchBbox</span><span style="color: #007700">)) {<br /> return </span><span style="color: #DD0000">"Fetch box not set"</span><span style="color: #007700">;<br /> }<br /> </span><span style="color: #FF8000">#<br /> </span><span style="color: #007700">if (!</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">input_fd</span><span style="color: #007700">) {<br /> return </span><span style="color: #DD0000">"No useable input set"</span><span style="color: #007700">;<br /> }<br /> if (!</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">output_fd</span><span style="color: #007700">) {<br /> return </span><span style="color: #DD0000">"No useable output set"</span><span style="color: #007700">;<br /> }<br /> </span><span style="color: #0000BB">$filecount </span><span style="color: #007700">= </span><span style="color: #0000BB">0</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$offset </span><span style="color: #007700">= </span><span style="color: #0000BB">0</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$zipcd_data </span><span style="color: #007700">= </span><span style="color: #DD0000">''</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$report </span><span style="color: #007700">= array();<br /> <br /> </span><span style="color: #FF8000">/**<br /> * Read through zipheaders<br /> * <br /> */<br /> </span><span style="color: #007700">for(;;) {<br /> </span><span style="color: #0000BB">$buffer </span><span style="color: #007700">= </span><span style="color: #0000BB">fread</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">input_fd</span><span style="color: #007700">, </span><span style="color: #0000BB">30</span><span style="color: #007700">);<br /> if (! </span><span style="color: #0000BB">strlen</span><span style="color: #007700">(</span><span style="color: #0000BB">$buffer</span><span style="color: #007700">))<br /> break;<br /> </span><span style="color: #0000BB">$tileinfo </span><span style="color: #007700">= </span><span style="color: #0000BB">unpack</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipheader'</span><span style="color: #007700">], </span><span style="color: #0000BB">$buffer</span><span style="color: #007700">);<br /> <br /> if (</span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipfnln'</span><span style="color: #007700">] <= </span><span style="color: #0000BB">0</span><span style="color: #007700">)<br /> break;<br /> <br /> </span><span style="color: #0000BB">$filename </span><span style="color: #007700">= </span><span style="color: #0000BB">fread</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">input_fd</span><span style="color: #007700">, </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipfnln'</span><span style="color: #007700">]);<br /> </span><span style="color: #0000BB">$done</span><span style="color: #007700">=</span><span style="color: #0000BB">false</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #0000BB">$r </span><span style="color: #007700">= </span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">worldBbox</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #0000BB">$len</span><span style="color: #007700">=</span><span style="color: #0000BB">strlen</span><span style="color: #007700">(</span><span style="color: #0000BB">$filename</span><span style="color: #007700">); <br /> for (</span><span style="color: #0000BB">$i</span><span style="color: #007700">=</span><span style="color: #0000BB">0 </span><span style="color: #007700">; </span><span style="color: #0000BB">$i </span><span style="color: #007700">< </span><span style="color: #0000BB">$len </span><span style="color: #007700">; </span><span style="color: #0000BB">$i</span><span style="color: #007700">++) {<br /> </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">floor</span><span style="color: #007700">( (</span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] + </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">])/</span><span style="color: #0000BB">2 </span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">floor</span><span style="color: #007700">( (</span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] + </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">])/</span><span style="color: #0000BB">2 </span><span style="color: #007700">);<br /> <br /> switch(</span><span style="color: #0000BB">$filename</span><span style="color: #007700">[</span><span style="color: #0000BB">$i</span><span style="color: #007700">]) {<br /> case </span><span style="color: #DD0000">'a'</span><span style="color: #007700">:<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'x'</span><span style="color: #007700">];<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'y'</span><span style="color: #007700">];<br /> break;<br /> case </span><span style="color: #DD0000">'b'</span><span style="color: #007700">:<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'x'</span><span style="color: #007700">];<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'y'</span><span style="color: #007700">];<br /> break;<br /> case </span><span style="color: #DD0000">'c'</span><span style="color: #007700">:<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'l'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'x'</span><span style="color: #007700">];<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'y'</span><span style="color: #007700">];<br /> break;<br /> case </span><span style="color: #DD0000">'d'</span><span style="color: #007700">:<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'x'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'x'</span><span style="color: #007700">];<br /> </span><span style="color: #0000BB">$r</span><span style="color: #007700">[</span><span style="color: #DD0000">'h'</span><span style="color: #007700">][</span><span style="color: #DD0000">'y'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$c</span><span style="color: #007700">[</span><span style="color: #DD0000">'y'</span><span style="color: #007700">];<br /> break;<br /> default:<br /> </span><span style="color: #0000BB">$done</span><span style="color: #007700">=</span><span style="color: #0000BB">true</span><span style="color: #007700">;<br /> }<br /> if (</span><span style="color: #0000BB">$done</span><span style="color: #007700">)<br /> break;<br /> }<br /> </span><span style="color: #FF8000"># print "zipsize=" . $tileinfo['zipsize']; <br /> </span><span style="color: #0000BB">$tilecontent </span><span style="color: #007700">= </span><span style="color: #0000BB">fread</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">input_fd</span><span style="color: #007700">, </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipsize'</span><span style="color: #007700">]);<br /> <br /> </span><span style="color: #FF8000"># print "tile $filename"; <br /> /* Area inside box, save it! */<br /> </span><span style="color: #007700">if (</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">contains_bbox</span><span style="color: #007700">(</span><span style="color: #0000BB">$r</span><span style="color: #007700">)) {<br /> </span><span style="color: #0000BB">$report</span><span style="color: #007700">[</span><span style="color: #DD0000">'added_areas'</span><span style="color: #007700">]++;<br /> <br /> </span><span style="color: #0000BB">$zipheader </span><span style="color: #007700">= </span><span style="color: #0000BB">$buffer</span><span style="color: #007700">;<br /> </span><span style="color: #FF8000"># print " in\n";<br /> <br /> /* Area outside of box, set zipcontent=0 */<br /> </span><span style="color: #007700">} else {<br /> </span><span style="color: #FF8000"># print " out\n";<br /> </span><span style="color: #0000BB">$report</span><span style="color: #007700">[</span><span style="color: #DD0000">'excluded_areas'</span><span style="color: #007700">]++;<br /> <br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipmthd'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcrc'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$tileinfo<br /></span><span style="color: #007700">[</span><span style="color: #DD0000">'zipsize'</span><span style="color: #007700">] = </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipuncmp'</span><span style="color: #007700">] = </span><span style="color: #0000BB">0</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$zipheader </span><span style="color: #007700">= </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$tilecontent </span><span style="color: #007700">= </span><span style="color: #DD0000">''</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">$zipheader </span><span style="color: #007700">= </span><span style="color: #0000BB">pack</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'ziphpack'</span><span style="color: #007700">], <br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'ziplocsig'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipver'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipgenfld'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipmthd'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'ziptime'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipdate'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcrc'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipsize'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipuncmp'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipfnln'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipxtraln'</span><span style="color: #007700">]<br /> );<br /> }<br /> <br /> </span><span style="color: #0000BB">$put </span><span style="color: #007700">= </span><span style="color: #0000BB">$zipheader</span><span style="color: #007700">.</span><span style="color: #0000BB">$filename</span><span style="color: #007700">.</span><span style="color: #0000BB">$tilecontent</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #FF8000">/* Zip directory */<br /> </span><span style="color: #0000BB">$zipcd_data </span><span style="color: #007700">.= </span><span style="color: #0000BB">pack</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcdpack'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">0x02014b50</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipver'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x0a</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipmthd'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'ziptime'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipdate'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipcrc'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipsize'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipuncmp'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">$tileinfo</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipfnln'</span><span style="color: #007700">],<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">0x00</span><span style="color: #007700">,<br /> </span><span style="color: #0000BB">$offset<br /> </span><span style="color: #007700">) . </span><span style="color: #0000BB">$filename</span><span style="color: #007700">;<br /> <br /> </span><span style="color: #0000BB">fwrite</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">output_fd</span><span style="color: #007700">, </span><span style="color: #0000BB">$put</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$offset </span><span style="color: #007700">+= </span><span style="color: #0000BB">strlen</span><span style="color: #007700">(</span><span style="color: #0000BB">$put</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$filecount </span><span style="color: #007700">+= </span><span style="color: #0000BB">1</span><span style="color: #007700">;<br /> }<br /> <br /> </span><span style="color: #0000BB">fwrite</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">output_fd</span><span style="color: #007700">, </span><span style="color: #0000BB">$zipcd_data</span><span style="color: #007700">);<br /> </span><span style="color: #0000BB">$ecsz </span><span style="color: #007700">= </span><span style="color: #0000BB">strlen</span><span style="color: #007700">(</span><span style="color: #0000BB">$zipcd_data</span><span style="color: #007700">);<br /> <br /> </span><span style="color: #FF8000">/* Zip central directory */<br /> </span><span style="color: #0000BB">$zip_eoc </span><span style="color: #007700">= </span><span style="color: #0000BB">pack</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">-></span><span style="color: #0000BB">formats</span><span style="color: #007700">[</span><span style="color: #DD0000">'zipeocpack'</span><span style="color: #007700">], <br /> </span><span style="color: #0000BB">0x06054b50</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipesig;<br /> </span><span style="color: #0000BB">0</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipedsk;<br /> </span><span style="color: #0000BB">0</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipecen;<br /> </span><span style="color: #0000BB">$filecount</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipenum;<br /> </span><span style="color: #0000BB">$filecount</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipecenn;<br /> </span><span style="color: #0000BB">$ecsz</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipecsz;<br /> </span><span style="color: #0000BB">$offset</span><span style="color: #007700">, </span><span style="color: #FF8000">#zipeofst;<br /> </span><span style="color: #0000BB">0 </span><span style="color: #FF8000">#zipecoml;<br /> </span><span style="color: #007700">);<br /> </span><spa... [truncated message content] |
|
From: KaZeR <ka...@us...> - 2007-12-10 12:26:39
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24781 Modified Files: navit.c navit.h Log Message: Added patch from Aurelien J. about middle mouse button centering Index: navit.h =================================================================== RCS file: /cvsroot/navit/navit/src/navit.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** navit.h 26 Nov 2007 10:15:48 -0000 1.20 --- navit.h 10 Dec 2007 12:26:39 -0000 1.21 *************** *** 35,40 **** void navit_draw(struct navit *this_); void navit_draw_displaylist(struct navit *this_); ! void navit_zoom_in(struct navit *this_, int factor); ! void navit_zoom_out(struct navit *this_, int factor); struct navit *navit_new(struct pcoord *center, int zoom); void navit_set_gui(struct navit *this_, struct gui *gui, char *type); --- 35,40 ---- void navit_draw(struct navit *this_); void navit_draw_displaylist(struct navit *this_); ! void navit_zoom_in(struct navit *this_, int factor, struct point *p); ! void navit_zoom_out(struct navit *this_, int factor, struct point *p); struct navit *navit_new(struct pcoord *center, int zoom); void navit_set_gui(struct navit *this_, struct gui *gui, char *type); Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** navit.c 6 Dec 2007 21:41:21 -0000 1.45 --- navit.c 10 Dec 2007 12:26:39 -0000 1.46 *************** *** 183,189 **** popup(this_, button, p); if (button == 4) ! navit_zoom_in(this_, 2); if (button == 5) ! navit_zoom_out(this_, 2); } else { this_->button_pressed=0; --- 183,189 ---- popup(this_, button, p); if (button == 4) ! navit_zoom_in(this_, 2, p); if (button == 5) ! navit_zoom_out(this_, 2, p); } else { this_->button_pressed=0; *************** *** 256,268 **** * @param navit The navit instance * @param factor The zoom factor, usually 2 * @returns nothing */ void ! navit_zoom_in(struct navit *this_, int factor) { long scale=transform_get_scale(this_->trans)/factor; if (scale < 1) scale=1; transform_set_scale(this_->trans, scale); navit_draw(this_); } --- 256,278 ---- * @param navit The navit instance * @param factor The zoom factor, usually 2 + * @param p The invariant point (if set to NULL, default to center) * @returns nothing */ void ! navit_zoom_in(struct navit *this_, int factor, struct point *p) { + struct coord c1, c2, *center; long scale=transform_get_scale(this_->trans)/factor; if (scale < 1) scale=1; + if (p) + transform_reverse(this_->trans, p, &c1); transform_set_scale(this_->trans, scale); + if (p) { + transform_reverse(this_->trans, p, &c2); + center = transform_center(this_->trans); + center->x += c1.x - c2.x; + center->y += c1.y - c2.y; + } navit_draw(this_); } *************** *** 273,283 **** * @param navit The navit instance * @param factor The zoom factor, usually 2 * @returns nothing */ void ! navit_zoom_out(struct navit *this_, int factor) { long scale=transform_get_scale(this_->trans)*factor; transform_set_scale(this_->trans,scale); navit_draw(this_); } --- 283,303 ---- * @param navit The navit instance * @param factor The zoom factor, usually 2 + * @param p The invariant point (if set to NULL, default to center) * @returns nothing */ void ! navit_zoom_out(struct navit *this_, int factor, struct point *p) { + struct coord c1, c2, *center; long scale=transform_get_scale(this_->trans)*factor; + if (p) + transform_reverse(this_->trans, p, &c1); transform_set_scale(this_->trans,scale); + if (p) { + transform_reverse(this_->trans, p, &c2); + center = transform_center(this_->trans); + center->x += c1.x - c2.x; + center->y += c1.y - c2.y; + } navit_draw(this_); } |
|
From: KaZeR <ka...@us...> - 2007-12-10 12:26:39
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24781/gui/gtk Modified Files: gui_gtk_action.c gui_gtk_window.c Log Message: Added patch from Aurelien J. about middle mouse button centering Index: gui_gtk_action.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** gui_gtk_action.c 3 Dec 2007 13:17:19 -0000 1.22 --- gui_gtk_action.c 10 Dec 2007 12:26:39 -0000 1.23 *************** *** 30,34 **** zoom_in_action(GtkWidget *w, struct gui_priv *gui, void *dummy) { ! navit_zoom_in(gui->nav, 2); } --- 30,34 ---- zoom_in_action(GtkWidget *w, struct gui_priv *gui, void *dummy) { ! navit_zoom_in(gui->nav, 2, NULL); } *************** *** 36,40 **** zoom_out_action(GtkWidget *w, struct gui_priv *gui, void *dummy) { ! navit_zoom_out(gui->nav, 2); } --- 36,40 ---- zoom_out_action(GtkWidget *w, struct gui_priv *gui, void *dummy) { ! navit_zoom_out(gui->nav, 2, NULL); } Index: gui_gtk_window.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gui_gtk_window.c 25 Nov 2007 01:32:15 -0000 1.13 --- gui_gtk_window.c 10 Dec 2007 12:26:39 -0000 1.14 *************** *** 60,67 **** break; case GDK_Book: ! navit_zoom_in(this->nav, 2); break; case GDK_Calendar: ! navit_zoom_out(this->nav, 2); break; default: --- 60,67 ---- break; case GDK_Book: ! navit_zoom_in(this->nav, 2, NULL); break; case GDK_Calendar: ! navit_zoom_out(this->nav, 2, NULL); break; default: |
|
From: KaZeR <ka...@us...> - 2007-12-10 12:26:37
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24781/gui/sdl Modified Files: sdl_events.cpp Log Message: Added patch from Aurelien J. about middle mouse button centering Index: sdl_events.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/sdl_events.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** sdl_events.cpp 3 Dec 2007 21:22:24 -0000 1.20 --- sdl_events.cpp 10 Dec 2007 12:26:39 -0000 1.21 *************** *** 554,558 **** { extern struct navit *sdl_gui_navit; ! navit_zoom_in(sdl_gui_navit, 2); } --- 554,558 ---- { extern struct navit *sdl_gui_navit; ! navit_zoom_in(sdl_gui_navit, 2, NULL); } *************** *** 561,565 **** { extern struct navit *sdl_gui_navit; ! navit_zoom_out(sdl_gui_navit, 2); } --- 561,565 ---- { extern struct navit *sdl_gui_navit; ! navit_zoom_out(sdl_gui_navit, 2, NULL); } |
|
From: Martin S. <mar...@us...> - 2007-12-09 12:59:55
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27676 Modified Files: osm2navit.c Log Message: More improvements to reduce node count Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** osm2navit.c 9 Dec 2007 10:32:13 -0000 1.14 --- osm2navit.c 9 Dec 2007 12:59:57 -0000 1.15 *************** *** 226,231 **** --- 226,235 ---- if (! strcmp(k,"ele")) level=9; + if (! strcmp(k,"time")) + level=9; if (! strcmp(k,"created_by")) level=9; + if (! strncmp(k,"tiger:",6)) + level=9; if (! strcmp(k,"converted_by") || ! strcmp(k,"source")) level=8; |
|
From: Martin S. <mar...@us...> - 2007-12-09 10:53:24
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3875 Modified Files: graphics.c Log Message: Fixed a bug reported by Helge Halfting (Thanks!) regarding xpm loading Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** graphics.c 6 Dec 2007 21:41:21 -0000 1.21 --- graphics.c 9 Dec 2007 10:53:25 -0000 1.22 *************** *** 1,4 **** --- 1,5 ---- #include <glib.h> #include <stdio.h> + #include <stdlib.h> #include <math.h> #include "debug.h" *************** *** 378,382 **** case element_icon: if (!img) { ! char *icon=g_strdup_printf("xpm/%s", e->u.icon.src); img=graphics_image_new(gra, icon); g_free(icon); --- 379,383 ---- case element_icon: if (!img) { ! char *icon=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/xpm/", e->u.icon.src, NULL); img=graphics_image_new(gra, icon); g_free(icon); |
|
From: Martin S. <mar...@us...> - 2007-12-09 10:32:11
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28672 Modified Files: osm2navit.c Log Message: Added patch from Arelien Jacobs (Thanks!) to ignore nodes with only ele tag Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** osm2navit.c 29 Nov 2007 09:44:03 -0000 1.13 --- osm2navit.c 9 Dec 2007 10:32:13 -0000 1.14 *************** *** 224,227 **** --- 224,229 ---- enum item_type type; int level=2; + if (! strcmp(k,"ele")) + level=9; if (! strcmp(k,"created_by")) level=9; |
|
From: Martin S. <mar...@us...> - 2007-12-07 08:29:48
|
Update of /cvsroot/navit/navit/src/script In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27549 Added Files: mapextract.php Log Message: Added and improved mapextract script from burner --- NEW FILE: mapextract.php --- #!/usr/local/bin/php –q <?php function getmercator($sx,$sy,$ex,$ey) { $sx = $sx*6371000.0*M_PI/180; $sy = log(tan(M_PI_4+$sy*M_PI/360))*6371000.0; $ex = $ex*6371000.0*M_PI/180; $ey = log(tan(M_PI_4+$ey*M_PI/360))*6371000.0; return array( 'l' => array( 'x' => $sx, 'y' => $sy ), 'h' => array( 'x' => $ex, 'y' => $ey ) ); } function contains_bbox($c, &$r) { if ($c['l']['x'] > $r['h']['x']) return false; elseif ($c['h']['x'] < $r['l']['x']) return false; elseif ($c['l']['y'] > $r['h']['y']) return false; elseif ($c['h']['y'] < $r['l']['y']) return false; else return true; } $fetch_bbox = getmercator(11.3, 47.9, 11.4, 48.0); $files = array(); $files['input'] = '/home/burner/carputer/navit/src/maps/osm_bbox_11.3,47.9,11.7,48.2.bin'; $files['output'] = 'myarea.bin'; $formats = array(); $formats['ziphpack'] = "lssssslLLSS"; $formats['zipheader'] = "l" . "ziplocsig"; # Signature (is always the same) $formats['zipheader'] .= "/s" . "zipver"; # zip version needed $formats['zipheader'] .= "/s" . "zipgenfld";# type of os that generated the file $formats['zipheader'] .= "/s" . "zipmthd"; # $formats['zipheader'] .= "/s" . "ziptime"; # time $formats['zipheader'] .= "/s" . "zipdate"; # date $formats['zipheader'] .= "/l" . "zipcrc"; # crc checksum $formats['zipheader'] .= "/L" . "zipsize"; # data size $formats['zipheader'] .= "/L" . "zipuncmp"; # uncompressed size $formats['zipheader'] .= "/S" . "zipfnln"; # length of filename $formats['zipheader'] .= "/S" . "zipxtraln";# length of extra data (always 0) $formats['zipcd'] = "". "i" . "zipcensig/". "c" . "zipcver/". "c" . "zipcos/". "c" . "zipcvxt/". "c" . "zipcexos/". "s" . "zipcflg/". "s" . "zipcmthd/". "s" . "ziptim/". "s" . "zipdat/". "i" . "zipccrc/". "I" . "zipcsiz/". "I" . "zipcunc/". "S" . "zipcfnl/". "S" . "zipcxtl/". "S" . "zipccml/". "S" . "zipdsk/". "S" . "zipint/". "I" . "zipext/". "I" . "zipofst/". $formats['zipcdpack'] = "iccccssssiIISSSSSII"; $formats['zipcontent'] = "i5x/i5y/ii"; $world_bbox = array(); $world_bbox['l']['x'] = -20000000; $world_bbox['l']['y'] = -20000000; $world_bbox['h']['x'] = 20000000; $world_bbox['h']['y'] = 20000000; $fp = fopen($files['input'], 'r'); $sp = fopen($files['output'], 'w'); $files = array(); $offset = 0; /** * Read through zipheaders * */ while (!feof($fp)) { $buffer = fread($fp, 30); $tileinfo = unpack($formats['zipheader'], $buffer); if ($tileinfo['zipfnln'] <= 0) break; $filename = fread($fp, $tileinfo['zipfnln']); $x=0; $done=false; $r = $world_bbox; while (!$done) { $c['x'] = floor( ($r['l']['x'] + $r['h']['x'])/2 ); $c['y'] = floor( ($r['l']['y'] + $r['h']['y'])/2 ); switch($filename[$x]) { case 'a': $r['l']['x'] = $c['x']; $r['l']['y'] = $c['y']; break; case 'b': $r['h']['x'] = $c['x']; $r['l']['y'] = $c['y']; break; case 'c': $r['l']['x'] = $c['x']; $r['h']['y'] = $c['y']; break; case 'd': $r['h']['x'] = $c['x']; $r['h']['y'] = $c['y']; break; default: $done=true; } $x++; } $tilecontent = fread($fp, $tileinfo['zipsize']); /* Area inside box, save it! */ if (contains_bbox($fetch_bbox, $r)) { #echo "In box. "; #echo $filename . " "; $zipheader = $buffer; #echo "\n"; /* Area outside of box, set zipcontent=0 */ } else { $tileinfo['zipmthd'] = $tileinfo['zipcrc'] = $tileinfo['zipsize'] = $tileinfo['zipuncmp'] = 0; #echo "Out of box"; $zipheader = $tileinfo; $tilecontent = ''; $zipheader = pack($formats['ziphpack'], $tileinfo['ziplocsig'], $tileinfo['zipver'], $tileinfo['zipgenfld'], $tileinfo['zipmthd'], $tileinfo['ziptime'], $tileinfo['zipdate'], $tileinfo['zipcrc'], $tileinfo['zipsize'], $tileinfo['zipuncmp'], $tileinfo['zipfnln'], $tileinfo['zipxtraln'] ); } $put = $zipheader.$filename.$tilecontent; $files[$filename]['header'] = $tileinfo; $files[$filename]['size'] = strlen($put); $zipcd = array(); $zipcd['zipcensig'] = 0x02014b50; $zipcd['zipcver'] = $tileinfo['zipver']; $zipcd['zipcos'] = 0x00; $zipcd['zipcvxt'] = 0x0a; $zipcd['zipcexos'] = 0x00; $zipcd['zipcflg'] = 0x00; $zipcd['zipcmthd'] = $tileinfo['zipmthd']; $zipcd['ziptim'] = $tileinfo['ziptime']; $zipcd['zipdat'] = $tileinfo['zipdate']; $zipcd['zipccrc'] = $tileinfo['zipcrc']; $zipcd['zipcsiz'] = $tileinfo['zipsize']; $zipcd['zipcunc'] = $tileinfo['zipuncmp']; $zipcd['zipcfnl'] = $tileinfo['zipfnln']; $zipcd['zipcxtl'] = 0x00; $zipcd['zipccml'] = 0x00; $zipcd['zipdsk'] = 0x00; $zipcd['zipint'] = 0x00; $zipcd['zipext'] = 0x00; $zipcd['zipofst'] = $offset; $zipcd_data .= pack($formats['zipcdpack'], $zipcd['zipcensig'], $zipcd['zipcver'], $zipcd['zipcos'], $zipcd['zipcvxt'], $zipcd['zipcexos'], $zipcd['zipcflg'], $zipcd['zipcmthd'], $zipcd['ziptim'], $zipcd['zipdat'], $zipcd['zipccrc'], $zipcd['zipcsiz'], $zipcd['zipcunc'], $zipcd['zipcfnl'], $zipcd['zipcxtl'], $zipcd['zipccml'], $zipcd['zipdsk'], $zipcd['zipint'], $zipcd['zipext'], $zipcd['zipofst'] ) . $filename; fwrite($sp, $put); $offset += strlen($put); } fwrite($sp, $zipcd_data); fclose($fp); fclose($sp); ?> |
|
From: Martin S. <mar...@us...> - 2007-12-06 21:41:23
|
Update of /cvsroot/navit/navit/src/data/garmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22879/data/garmin Modified Files: garmin.c Log Message: Changed map_selection data structure for more flexibility in viewport setup Index: garmin.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** garmin.c 28 Nov 2007 11:08:54 -0000 1.11 --- garmin.c 6 Dec 2007 21:41:22 -0000 1.12 *************** *** 550,557 **** if (sel) { ! r.lulat = sel->rect.lu.y; ! r.lulong = sel->rect.lu.x; ! r.rllat = sel->rect.rl.y; ! r.rllong = sel->rect.rl.x; level = get_level(sel); // level = nl2gl[level].g; --- 550,557 ---- if (sel) { ! r.lulat = sel->u.c_rect.lu.y; ! r.lulong = sel->u.c_rect.lu.x; ! r.rllat = sel->u.c_rect.rl.y; ! r.rllong = sel->u.c_rect.rl.x; level = get_level(sel); // level = nl2gl[level].g; |
|
From: Martin S. <mar...@us...> - 2007-12-06 21:41:23
|
Update of /cvsroot/navit/navit/src/data/binfile In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22879/data/binfile Modified Files: binfile.c Log Message: Changed map_selection data structure for more flexibility in viewport setup Index: binfile.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/binfile/binfile.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** binfile.c 27 Nov 2007 11:10:29 -0000 1.9 --- binfile.c 6 Dec 2007 21:41:22 -0000 1.10 *************** *** 260,264 **** return 1; while (sel) { ! if (coord_rect_overlap(r, &sel->rect)) return 1; sel=sel->next; --- 260,264 ---- return 1; while (sel) { ! if (coord_rect_overlap(r, &sel->u.c_rect)) return 1; sel=sel->next; |
13 messages has been excluded from this view by a project administrator.
