Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5800 Modified Files: roadmap_main.c Log Message: Add roadmap_start events. Index: roadmap_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_main.c 8 Oct 2006 20:04:42 -0000 1.5 --- roadmap_main.c 17 Nov 2006 16:49:48 -0000 1.6 *************** *** 82,85 **** --- 82,96 ---- + static void roadmap_start_event (int event) { + switch (event) { + case ROADMAP_START_INIT: + #ifdef FREEMAP_IL + editor_main_check_map (); + #endif + break; + } + } + + #ifdef ROADMAP_USES_GPE *************** *** 253,257 **** RoadMapMainTitle = strdup (title); #ifdef FREEMAP_IL - editor_main_check_map (); editor_main_set (1); #endif --- 264,267 ---- *************** *** 281,284 **** --- 291,295 ---- GtkWidget *menu_item; + return; if (RoadMapMainMenuBar == NULL) { *************** *** 548,551 **** --- 559,563 ---- } + roadmap_start_subscribe (roadmap_start_event); roadmap_start (argc, argv); |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5782 Modified Files: roadmap_main.cpp Log Message: Add roadmap_start events. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** roadmap_main.cpp 3 Nov 2006 12:44:45 -0000 1.23 --- roadmap_main.cpp 17 Nov 2006 16:49:32 -0000 1.24 *************** *** 104,113 **** static bool RoadMapMainFullScreen = false; static HANDLE VirtualSerialHandle = 0; ! static const char *RoadMapMainVirtualSerial; static bool RoadMapMainSync = false; // Global Variables: ! extern "C" HINSTANCE g_hInst = NULL; extern "C" HWND RoadMapMainWindow = NULL; --- 104,113 ---- static bool RoadMapMainFullScreen = false; static HANDLE VirtualSerialHandle = 0; ! static const char *RoadMapMainVirtualSerial; static bool RoadMapMainSync = false; // Global Variables: ! extern "C" HINSTANCE g_hInst = NULL; extern "C" HWND RoadMapMainWindow = NULL; *************** *** 174,177 **** --- 174,194 ---- + static void roadmap_start_event (int event) { + switch (event) { + case ROADMAP_START_INIT: + #ifdef FREEMAP_IL + editor_main_check_map (); + #endif + break; + } + } + + static void CALLBACK AvoidSuspend (HWND hwnd, UINT uMsg, UINT idEvent, + DWORD dwTime) { + #ifdef UNDER_CE + CEDevice::wakeUp(); + #endif + } + #ifndef _ROADGPS #ifdef UNDER_CE *************** *** 426,432 **** roadmap_config_initialize (); roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); if (!roadmap_main_should_sync ()) return 0; roadmap_lang_initialize (); roadmap_start_set_title (roadmap_lang_get ("RoadMap")); --- 443,453 ---- roadmap_config_initialize (); roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); if (!roadmap_main_should_sync ()) return 0; + + CEDevice::init(); + SetTimer (NULL, 0, 50000, AvoidSuspend); + roadmap_lang_initialize (); roadmap_start_set_title (roadmap_lang_get ("RoadMap")); *************** *** 434,438 **** editor_main_initialize (); editor_main_set (1); ! roadmap_main_start_sync (); return 0; } --- 455,460 ---- editor_main_initialize (); editor_main_set (1); ! roadmap_main_start_sync (); ! CEDevice::end(); return 0; } *************** *** 441,444 **** --- 463,467 ---- + roadmap_start_subscribe (roadmap_start_event); roadmap_start(0, args); *************** *** 489,500 **** - static void CALLBACK AvoidSuspend (HWND hwnd, UINT uMsg, UINT idEvent, - DWORD dwTime) { - #ifdef UNDER_CE - CEDevice::wakeUp(); - #endif - } - - static int roadmap_main_vkey_pressed(HWND w, WPARAM wParam, LPARAM lParam) { --- 512,515 ---- *************** *** 897,901 **** #ifdef FREEMAP_IL - editor_main_check_map (); editor_main_set (1); #endif --- 912,915 ---- |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:11
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/zlib Added Files: zlibce.vcp Log Message: Update evc files for SSD. Make zlib as a dll. --- NEW FILE: zlibce.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="zlibce" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE MIPSIV) Dynamic-Link Library" 0x9602 # TARGTYPE "Win32 (WCE ARMV4T) Dynamic-Link Library" 0xa402 # TARGTYPE "Win32 (WCE MIPSIV_FP) Dynamic-Link Library" 0x9202 # TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102 # TARGTYPE "Win32 (WCE MIPSII_FP) Dynamic-Link Library" 0xa202 # TARGTYPE "Win32 (WCE x86) Dynamic-Link Library" 0x8302 # TARGTYPE "Win32 (WCE emulator) Dynamic-Link Library" 0xa602 # TARGTYPE "Win32 (WCE SH4) Dynamic-Link Library" 0x8602 # TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302 # TARGTYPE "Win32 (WCE MIPS16) Dynamic-Link Library" 0x8902 # TARGTYPE "Win32 (WCE ARMV4I) Dynamic-Link Library" 0xa502 # TARGTYPE "Win32 (WCE MIPSII) Dynamic-Link Library" 0xa102 CFG=zlibce - Win32 (WCE MIPSII_FP) Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, [...3418 lines suppressed...] # End Source File # Begin Source File SOURCE=..\..\zconf.h # End Source File # Begin Source File SOURCE=..\..\zlib.h # End Source File # Begin Source File SOURCE=..\..\zutil.h # End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/agg Modified Files: agg.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: agg.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg/agg.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** agg.vcp 3 Sep 2006 18:20:35 -0000 1.3 --- agg.vcp 17 Nov 2006 16:48:55 -0000 1.4 *************** *** 325,328 **** --- 325,329 ---- "..\..\..\agg\include\agg_allocator.h"\ + # ADD CPP /D RGB565=1 # End Source File # End Group |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/libguiroadgps Modified Files: libguiroadgps.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: libguiroadgps.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps/libguiroadgps.vcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** libguiroadgps.vcp 3 Sep 2006 18:20:35 -0000 1.4 --- libguiroadgps.vcp 17 Nov 2006 16:48:55 -0000 1.5 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" *************** *** 105,109 **** CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 105,109 ---- CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 131,135 **** CPP=cl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 131,135 ---- CPP=cl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 157,161 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 157,161 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 209,213 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 209,213 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "WIN32_PROFILE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:02
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/FreeMap Modified Files: FreeMap.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: FreeMap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap/FreeMap.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FreeMap.vcp 17 Sep 2006 20:46:45 -0000 1.2 --- FreeMap.vcp 17 Nov 2006 16:48:55 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- !MESSAGE "FreeMap - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Application") !MESSAGE "FreeMap - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Application") + !MESSAGE "FreeMap - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Application") !MESSAGE *************** *** 91,94 **** --- 92,126 ---- # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Profiler" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "ARMV4Profiler" + # PROP BASE Intermediate_Dir "ARMV4Profiler" + # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" + # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP BASE Ignore_Export_Lib 0 + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "ARMV4Profiler" + # PROP Intermediate_Dir "ARMV4Profiler" + # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" + # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" + # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r + # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r + # ADD BASE CPP /nologo /W3 /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /O2 /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /Zi /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /O2 /M$(CECrtMT) /fastcap /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib cecap.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + !ENDIF *************** *** 97,100 **** --- 129,133 ---- # Name "FreeMap - Win32 (WCE ARMV4) Release" # Name "FreeMap - Win32 (WCE ARMV4) Debug" + # Name "FreeMap - Win32 (WCE ARMV4) Profiler" # Begin Group "Source Files" |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:01
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358 Modified Files: Roadmap.vcw Log Message: Update evc files for SSD. Make zlib as a dll. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Roadmap.vcw 3 Nov 2006 12:45:14 -0000 1.12 --- Roadmap.vcw 17 Nov 2006 16:48:55 -0000 1.13 *************** *** 55,59 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name zlib End Project Dependency }}} --- 55,65 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name libssd ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name lpngce ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name zlibce End Project Dependency }}} *************** *** 126,132 **** Project_Dep_Name agg End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency }}} --- 132,135 ---- *************** *** 274,277 **** --- 277,295 ---- ############################################################################### + Project: "lpngce"=.\libpng\lpngce.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name zlibce + End Project Dependency + }}} + + ############################################################################### + Project: "rdmfriends"=.\rdmfriends\rdmfriends.vcp - Package Owner=<4> *************** *** 316,320 **** ############################################################################### ! Project: "zlib"=.\zlib\zlib.vcp - Package Owner=<4> Package=<5> --- 334,338 ---- ############################################################################### ! Project: "zlibce"=.\zlib\zlibce.vcp - Package Owner=<4> Package=<5> |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:49:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/libwinceguiroadmap Modified Files: libwinceguiroadmap.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: libwinceguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** libwinceguiroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.7 --- libwinceguiroadmap.vcp 17 Nov 2006 16:48:56 -0000 1.8 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release" *************** *** 480,483 **** --- 480,522 ---- DEP_CPP_ROADM=\ + "..\..\..\agg\include\agg_array.h"\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_bezier_arc.h"\ + "..\..\..\agg\include\agg_clip_liang_barsky.h"\ + "..\..\..\agg\include\agg_color_rgba.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_conv_adaptor_vcgen.h"\ + "..\..\..\agg\include\agg_conv_contour.h"\ + "..\..\..\agg\include\agg_conv_stroke.h"\ + "..\..\..\agg\include\agg_conv_transform.h"\ + "..\..\..\agg\include\agg_curves.h"\ + "..\..\..\agg\include\agg_dda_line.h"\ + "..\..\..\agg\include\agg_ellipse.h"\ + "..\..\..\agg\include\agg_ellipse_bresenham.h"\ + "..\..\..\agg\include\agg_gamma_functions.h"\ + "..\..\..\agg\include\agg_line_aa_basics.h"\ + "..\..\..\agg\include\agg_math.h"\ + "..\..\..\agg\include\agg_math_stroke.h"\ + "..\..\..\agg\include\agg_path_storage.h"\ + "..\..\..\agg\include\agg_pixfmt_rgb_packed.h"\ + "..\..\..\agg\include\agg_pixfmt_rgba.h"\ + "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_outline.h"\ + "..\..\..\agg\include\agg_rasterizer_outline_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ + "..\..\..\agg\include\agg_renderer_base.h"\ + "..\..\..\agg\include\agg_renderer_outline_aa.h"\ + "..\..\..\agg\include\agg_renderer_primitives.h"\ + "..\..\..\agg\include\agg_renderer_scanline.h"\ + "..\..\..\agg\include\agg_rendering_buffer.h"\ + "..\..\..\agg\include\agg_scanline_p.h"\ + "..\..\..\agg\include\agg_trans_affine.h"\ + "..\..\..\agg\include\agg_vcgen_contour.h"\ + "..\..\..\agg\include\agg_vcgen_stroke.h"\ + "..\..\..\agg\include\agg_vertex_sequence.h"\ + "..\..\..\agg\include\platform\win32\agg_win32_bmp.h"\ + "..\..\..\agg\include\util\agg_color_conv.h"\ + "..\..\..\agg\include\util\agg_color_conv_rgb8.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 496,534 **** NODEP_CPP_ROADM=\ ! "..\..\..\agg23\include\agg_array.h"\ ! "..\..\..\agg23\include\agg_basics.h"\ ! "..\..\..\agg23\include\agg_clip_liang_barsky.h"\ ! "..\..\..\agg23\include\agg_color_rgba.h"\ ! "..\..\..\agg23\include\agg_config.h"\ ! "..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\ ! "..\..\..\agg23\include\agg_conv_contour.h"\ ! "..\..\..\agg23\include\agg_conv_stroke.h"\ ! "..\..\..\agg23\include\agg_conv_transform.h"\ ! "..\..\..\agg23\include\agg_curves.h"\ ! "..\..\..\agg23\include\agg_dda_line.h"\ ! "..\..\..\agg23\include\agg_ellipse.h"\ ! "..\..\..\agg23\include\agg_ellipse_bresenham.h"\ ! "..\..\..\agg23\include\agg_gamma_functions.h"\ ! "..\..\..\agg23\include\agg_line_aa_basics.h"\ ! "..\..\..\agg23\include\agg_math.h"\ ! "..\..\..\agg23\include\agg_math_stroke.h"\ ! "..\..\..\agg23\include\agg_path_storage.h"\ ! "..\..\..\agg23\include\agg_pixfmt_rgb.h"\ ! "..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg23\include\agg_rasterizer_outline.h"\ ! "..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg23\include\agg_render_scanlines.h"\ ! "..\..\..\agg23\include\agg_renderer_base.h"\ ! "..\..\..\agg23\include\agg_renderer_outline_aa.h"\ ! "..\..\..\agg23\include\agg_renderer_primitives.h"\ ! "..\..\..\agg23\include\agg_renderer_scanline.h"\ ! "..\..\..\agg23\include\agg_rendering_buffer.h"\ ! "..\..\..\agg23\include\agg_scanline_p.h"\ ! "..\..\..\agg23\include\agg_trans_affine.h"\ ! "..\..\..\agg23\include\agg_vcgen_contour.h"\ ! "..\..\..\agg23\include\agg_vcgen_stroke.h"\ ! "..\..\..\agg23\include\agg_vertex_sequence.h"\ ! "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ # ADD CPP /I "../../../agg/include" --- 535,539 ---- NODEP_CPP_ROADM=\ ! "..\..\..\agg\include\agg_allocator.h"\ # ADD CPP /I "../../../agg/include" *************** *** 649,661 **** DEP_CPP_ROADMA=\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ NODEP_CPP_ROADMA=\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\ygshell.h"\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ --- 654,678 ---- DEP_CPP_ROADMA=\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_dialog.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"winuserm.h"\ NODEP_CPP_ROADMA=\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ *************** *** 741,843 **** # End Source File - # Begin Source File - - SOURCE=..\..\..\win32\roadmap_messagebox.c - - !IF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Release" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_factory.h"\ - "..\..\..\roadmap_file.h"\ - "..\..\..\roadmap_gui.h"\ - "..\..\..\roadmap_io.h"\ - "..\..\..\roadmap_lang.h"\ - "..\..\..\roadmap_list.h"\ - "..\..\..\roadmap_main.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_serial.h"\ - "..\..\..\roadmap_spawn.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - "..\..\win32_serial.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Release" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_factory.h"\ - "..\..\..\roadmap_file.h"\ - "..\..\..\roadmap_gui.h"\ - "..\..\..\roadmap_io.h"\ - "..\..\..\roadmap_lang.h"\ - "..\..\..\roadmap_list.h"\ - "..\..\..\roadmap_main.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_serial.h"\ - "..\..\..\roadmap_spawn.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - "..\..\win32_serial.h"\ - - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Profiler" - - DEP_CPP_ROADMAP_=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_start.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\roadmap_win32.h"\ - - - !ENDIF - - # End Source File # End Group # Begin Group "Header Files" --- 758,761 ---- |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:48:59
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/libssd Modified Files: libssd.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: libssd.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libssd/libssd.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libssd.vcp 3 Nov 2006 12:46:15 -0000 1.1 --- libssd.vcp 17 Nov 2006 16:48:56 -0000 1.2 *************** *** 20,23 **** --- 20,24 ---- !MESSAGE "libssd - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "libssd - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") + !MESSAGE "libssd - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE *************** *** 45,50 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 46,51 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "..\..\..\\" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 70,75 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 71,101 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\\" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo ! # ADD LIB32 /nologo ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! ! !ELSEIF "$(CFG)" == "libssd - Win32 (WCE ARMV4) Profiler" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "ARMV4Profiler" ! # PROP BASE Intermediate_Dir "ARMV4Profiler" ! # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" ! # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "ARMV4Profiler" ! # PROP Intermediate_Dir "ARMV4Profiler" ! # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" ! # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /I "..\..\..\\" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 85,91 **** --- 111,291 ---- # Name "libssd - Win32 (WCE ARMV4) Release" # Name "libssd - Win32 (WCE ARMV4) Debug" + # Name "libssd - Win32 (WCE ARMV4) Profiler" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_button.c + DEP_CPP_SSD_B=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_container.c + DEP_CPP_SSD_C=\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_dialog.c + DEP_CPP_SSD_D=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_start.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_entry.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_entry.c + DEP_CPP_SSD_E=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_entry.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_keyboard.c + DEP_CPP_SSD_K=\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_keyboard.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_list.c + DEP_CPP_SSD_L=\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_list.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_menu.c + DEP_CPP_SSD_M=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_factory.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_menu.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_messagebox.c + DEP_CPP_SSD_ME=\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_text.c + DEP_CPP_SSD_T=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + + # End Source File + # Begin Source File + + SOURCE=..\..\..\ssd\ssd_widget.c + DEP_CPP_SSD_W=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_widget.h"\ + "..\..\roadmap_win32.h"\ + + # End Source File # End Group # Begin Group "Header Files" |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:48:59
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/libroadmap Modified Files: libroadmap.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** libroadmap.vcp 14 Oct 2006 09:29:40 -0000 1.19 --- libroadmap.vcp 17 Nov 2006 16:48:55 -0000 1.20 *************** *** 105,109 **** CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 105,109 ---- CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "..\..\.." /I "..\..\..\dglib" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SSD" /YX /Gs8192 /GF /c LIB32=link.exe -lib [...1031 lines suppressed...] *** 9167,9170 **** --- 9414,9418 ---- "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_navigate.h"\ *************** *** 9177,9180 **** --- 9425,9434 ---- "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_types.h"\ + "..\..\..\ssd\ssd_button.h"\ + "..\..\..\ssd\ssd_container.h"\ + "..\..\..\ssd\ssd_dialog.h"\ + "..\..\..\ssd\ssd_keyboard.h"\ + "..\..\..\ssd\ssd_text.h"\ + "..\..\..\ssd\ssd_widget.h"\ "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:48:58
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5358/libguiroadmap Modified Files: libguiroadmap.vcp Log Message: Update evc files for SSD. Make zlib as a dll. Index: libguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** libguiroadmap.vcp 14 Oct 2006 09:29:40 -0000 1.7 --- libguiroadmap.vcp 17 Nov 2006 16:48:55 -0000 1.8 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo [...1116 lines suppressed...] "..\..\..\roadmap_voice.h"\ + "..\..\..\ssd\ssd_menu.h"\ "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ *************** *** 3808,3811 **** --- 4144,4148 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_math.h"\ *************** *** 3820,3823 **** --- 4157,4161 ---- "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_sprite.h"\ + "..\..\..\roadmap_state.h"\ "..\..\..\roadmap_sunrise.h"\ "..\..\..\roadmap_time.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:47:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4905 Modified Files: roadmap_canvas.cpp Log Message: Set agg default for a depth of 24 bits. Define RGB565 for 16 bits. Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/roadmap_canvas.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_canvas.cpp 3 Nov 2006 12:43:42 -0000 1.8 --- roadmap_canvas.cpp 17 Nov 2006 16:47:11 -0000 1.9 *************** *** 68,72 **** --- 68,76 ---- #include "../roadmap_canvas_agg.h" + #ifdef RGB565 typedef agg::pixfmt_rgb565 pixfmt; + #else + typedef agg::pixfmt_bgra32 pixfmt; + #endif typedef agg::renderer_base<pixfmt> renbase_type; typedef agg::renderer_primitives<renbase_type> renderer_pr; *************** *** 482,491 **** agg::render_scanlines( ras, sl, ren_solid); ! } else if (fast_draw) { renderer_pr ren_pr(agg_renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(CurrentPen->color); ras_line.add_path(path); ! } else { --- 486,495 ---- agg::render_scanlines( ras, sl, ren_solid); ! /* } else if (fast_draw) { renderer_pr ren_pr(agg_renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(CurrentPen->color); ras_line.add_path(path); ! */ } else { *************** *** 778,781 **** --- 782,791 ---- if (mode == IMAGE_SELECTED) { + static RoadMapPen selection; + + if (!selection) { + selection = roadmap_canvas_create_pen("selection"); + roadmap_canvas_set_foreground ("#000000"); + } RoadMapGuiPoint points[5] = { *************** *** 788,792 **** --- 798,804 ---- int num_points = 5; + RoadMapPen current = roadmap_canvas_select_pen (selection); roadmap_canvas_draw_multiple_lines (1, &num_points, points, 0); + roadmap_canvas_select_pen (current); } } |
|
From: Ehud S. <esh...@us...> - 2006-11-17 16:46:54
|
Update of /cvsroot/roadmap/roadmap_editor/src/ssd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4559 Modified Files: ssd_button.c ssd_button.h ssd_container.c ssd_container.h ssd_dialog.c ssd_dialog.h ssd_entry.c ssd_keyboard.c ssd_menu.c ssd_text.c ssd_text.h ssd_widget.c ssd_widget.h Added Files: ssd_list.c ssd_list.h ssd_messagebox.c Log Message: SSD refactor. Widgets are now fully stackable. Layout is working fine (except for really complex things). Index: ssd_button.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_button.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_button.c 3 Nov 2006 12:39:17 -0000 1.1 --- ssd_button.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 48,169 **** ! static void draw_button_text (SsdWidget widget, const RoadMapGuiPoint *point) { ! struct ssd_button_data *data = (struct ssd_button_data *) widget->data; ! char value[255]; ! char *key2 = NULL; ! RoadMapGuiPoint p = *point; ! int text_size; ! ! strncpy(value, widget->value, sizeof(value)); ! value[sizeof(value)-1] = '\0'; ! ! ! ! if (widget->flags & SSD_BUTTON_KEY) { ! p.x += 14; ! p.y += 18; ! text_size = 20; ! ! key2 = strchr(value, '|'); ! if (key2) { ! *key2 = '\0'; ! key2++; ! } ! ! } else { ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height; ! ! text_size = 14; ! ! roadmap_canvas_get_text_extents ! (value, text_size, &text_width, &text_ascent, &text_descent, NULL); ! ! text_height = text_ascent + text_descent; ! ! p.x += (widget->size.width - text_width) / 2; ! p.y += (widget->size.height - text_height) / 2 + text_height / 2; ! } ! ! if (data->state == BUTTON_STATE_SELECTED) { ! p.x += 2; ! p.y += 2; ! } ! roadmap_canvas_draw_string_angle (&p, NULL, 0, text_size, value); ! ! if (widget->flags & SSD_BUTTON_KEY) { ! if (key2 && strcmp(value, key2)) { ! p.x += 13; ! p.y += 13; ! ! if (data->state == BUTTON_STATE_SELECTED) { ! p.x += 2; ! p.y += 2; ! } ! roadmap_canvas_draw_string_angle (&p, NULL, 0, text_size - 5, key2); ! } ! } ! } ! ! ! static void format_below_text (char *text, char **lines, int max_lines) { ! *lines = text; ! lines++; ! *lines = NULL; ! } ! ! ! static void draw_button_text_below (SsdWidget widget, ! const RoadMapGuiPoint *point) { ! ! char text[255]; ! char *lines[2]; ! char **line; ! ! RoadMapGuiPoint p = *point; ! int text_size; ! ! strncpy(text, widget->value, sizeof(text)); ! text[sizeof(text)-1] = '\0'; ! ! format_below_text (text, lines, 2); ! ! p.y += widget->size.height + 2; ! ! line = lines; ! ! while (*line) { ! ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height; ! RoadMapGuiPoint text_p = p; ! ! text_size = 14; ! ! roadmap_canvas_get_text_extents ! (*line, text_size, &text_width, &text_ascent, &text_descent, NULL); ! ! text_height = text_ascent + text_descent; ! ! text_p.x += (widget->size.width - text_width) / 2; ! text_p.y += text_height; ! ! roadmap_canvas_draw_string_angle (&text_p, NULL, 0, text_size, *line); ! ! p.y += text_height + 2; ! line++; ! } ! } ! - static void draw (SsdWidget widget, const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; RoadMapImage image; int i; for (i=data->state; i>=0; i--) { if (data->bitmaps[i] && --- 48,60 ---- ! static void draw (SsdWidget widget, RoadMapGuiRect *rect, int flags) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; + RoadMapGuiPoint point = {rect->minx, rect->miny}; RoadMapImage image; int i; + if ((flags & SSD_GET_SIZE)) return; + for (i=data->state; i>=0; i--) { if (data->bitmaps[i] && *************** *** 181,195 **** switch (data->state) { case BUTTON_STATE_NORMAL: ! roadmap_canvas_draw_image (image, point, 0, IMAGE_NORMAL); break; case BUTTON_STATE_SELECTED: if (i == data->state) { ! roadmap_canvas_draw_image (image, point, 0, IMAGE_NORMAL); } else { ! roadmap_canvas_draw_image (image, point, 0, IMAGE_SELECTED); } break; } if ((widget->flags & SSD_BUTTON_KEY) || (widget->flags & SSD_BUTTON_TEXT)) { --- 72,87 ---- switch (data->state) { case BUTTON_STATE_NORMAL: ! roadmap_canvas_draw_image (image, &point, 0, IMAGE_NORMAL); break; case BUTTON_STATE_SELECTED: if (i == data->state) { ! roadmap_canvas_draw_image (image, &point, 0, IMAGE_NORMAL); } else { ! roadmap_canvas_draw_image (image, &point, 0, IMAGE_SELECTED); } break; } + #if 0 if ((widget->flags & SSD_BUTTON_KEY) || (widget->flags & SSD_BUTTON_TEXT)) { *************** *** 202,244 **** draw_button_text_below (widget, point); } ! } ! int ssd_button_pointer_down (SsdWidget widget, const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; data->state = BUTTON_STATE_SELECTED; ! return 0; } ! int ssd_button_short_click (SsdWidget widget, const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; if (widget->callback) { ! (*widget->callback) ! (widget->name, SSD_BUTTON_SHORT_CLICK, widget->context); } data->state = BUTTON_STATE_NORMAL; ! return 0; } ! int ssd_button_long_click (SsdWidget widget, const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; if (widget->callback) { ! (*widget->callback) ! (widget->name, SSD_BUTTON_LONG_CLICK, widget->context); } data->state = BUTTON_STATE_NORMAL; ! return 0; } --- 94,137 ---- draw_button_text_below (widget, point); } ! #endif } ! static int ssd_button_pointer_down (SsdWidget widget, ! const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; data->state = BUTTON_STATE_SELECTED; ! return 1; } ! static int ssd_button_short_click (SsdWidget widget, ! const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; if (widget->callback) { ! (*widget->callback) (widget, SSD_BUTTON_SHORT_CLICK); } data->state = BUTTON_STATE_NORMAL; ! return 1; } ! static int ssd_button_long_click (SsdWidget widget, ! const RoadMapGuiPoint *point) { struct ssd_button_data *data = (struct ssd_button_data *) widget->data; if (widget->callback) { ! (*widget->callback) (widget, SSD_BUTTON_LONG_CLICK); } data->state = BUTTON_STATE_NORMAL; ! return 1; } *************** *** 265,269 **** SsdWidget ssd_button_new (const char *name, const char *value, const char **bitmaps, int num_bitmaps, ! int flags) { SsdWidget w; --- 158,162 ---- SsdWidget ssd_button_new (const char *name, const char *value, const char **bitmaps, int num_bitmaps, ! int flags, SsdCallback callback) { SsdWidget w; *************** *** 283,286 **** --- 176,180 ---- w->data = data; + w->callback = callback; set_value (w, value); Index: ssd_keyboard.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_keyboard.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_keyboard.c 3 Nov 2006 12:39:18 -0000 1.1 --- ssd_keyboard.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 38,43 **** --- 38,47 ---- #include "roadmap_path.h" #include "ssd_dialog.h" + #include "ssd_text.h" + #include "ssd_container.h" #include "ssd_button.h" + #include "ssd_keyboard.h" + #define SSD_KEY_CHAR 1 #define SSD_KEY_WORD 2 *************** *** 48,54 **** typedef struct ssd_keyboard { ! const char *name; ! const char *keys; ! int special_keys; } SsdKeyboard; --- 52,61 ---- typedef struct ssd_keyboard { ! const char *name; ! const char *keys; ! int special_keys; ! SsdWidget widget; ! SsdDialogCB callback; ! void *context; } SsdKeyboard; *************** *** 56,64 **** {"letters_kbd", "×1×2×3×4×5×6×7×8×9×0××××××× ×ססעעפףצץקקר:ש,ת.", ! SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE} }; ! static int button_callback (const char *name, const char *new_value, ! void *context) { wchar_t wkeys[3]; char key[20]; --- 63,74 ---- {"letters_kbd", "×1×2×3×4×5×6×7×8×9×0××××××× ×ססעעפףצץקקר:ש,ת.", ! SSD_KEY_CONFIRM | SSD_KEY_SPACE | SSD_KEY_BACKSPACE, ! NULL, ! NULL, ! NULL} }; ! static int button_callback (SsdWidget widget, const char *new_value) { ! wchar_t wkeys[3]; char key[20]; *************** *** 67,74 **** int len; ! if (!strcmp (roadmap_lang_get ("Ok"), name)) { return 0; ! } else if (!strcmp (roadmap_lang_get ("Del"), name)) { wchar_t wtext[255]; const char *t = ssd_dialog_get_value ("input"); --- 77,84 ---- int len; ! if (!strcmp (roadmap_lang_get ("Ok"), widget->name)) { return 0; ! } else if (!strcmp (roadmap_lang_get ("Del"), widget->name)) { wchar_t wtext[255]; const char *t = ssd_dialog_get_value ("input"); *************** *** 97,101 **** return 0; ! } else if (!strcmp (roadmap_lang_get ("SPC"), name)) { len = 1; strcpy (key, " "); --- 107,111 ---- return 0; ! } else if (!strcmp (roadmap_lang_get ("SPC"), widget->name)) { len = 1; strcpy (key, " "); *************** *** 103,107 **** } else { ! const char *value = ssd_dialog_get_value (name); count = mbsrtowcs(wkeys, &value, sizeof(wkeys) / sizeof(wchar_t), NULL); if (count <= 0) return 1; --- 113,118 ---- } else { ! const char *value = widget->value; ! count = mbsrtowcs(wkeys, &value, sizeof(wkeys) / sizeof(wchar_t), NULL); if (count <= 0) return 1; *************** *** 130,133 **** --- 141,157 ---- } + + static int input_callback (SsdWidget widget, const char *new_value) { + SsdKeyboard *keyboard; + SsdWidget k = widget->parent->parent; + + keyboard = (SsdKeyboard *)k->context; + + if (!keyboard) return 1; + + return (*keyboard->callback) (0, new_value, keyboard->context); + } + + static void add_key (const char *key1, const char *key2, int type) { *************** *** 139,142 **** --- 163,168 ---- }; + SsdWidget button; + strcpy(name, key1); strcpy(value, key1); *************** *** 147,155 **** } ! ssd_dialog_new_button (name, value, icons, 2, type, button_callback); } static void ssd_keyboard_new (SsdKeyboard *keyboard) { wchar_t wkeys[100]; const char *keys = keyboard->keys; --- 173,203 ---- } ! button = ! ssd_dialog_new_button (name, value, icons, 2, ! SSD_ALIGN_CENTER|SSD_WIDGET_SPACE, ! button_callback); ! if (type == SSD_BUTTON_KEY) { ! SsdWidget w = ssd_text_new ("key1", key1, 20, SSD_END_ROW); ! ! ssd_widget_set_offset (w, 9, 3); ! ssd_widget_add (button, w); ! } else { ! ssd_widget_add (button, ssd_text_new ("key1", key1, 14, SSD_ALIGN_CENTER|SSD_ALIGN_VCENTER|SSD_END_ROW)); ! } ! ! if ((type == SSD_BUTTON_KEY) && strcmp (key1, key2)) { ! SsdWidget w = ssd_text_new ("key2", key2, 13, SSD_ALIGN_RIGHT|SSD_END_ROW); ! ssd_widget_set_color (w, "ffaaff", 0); ! ssd_widget_set_offset (w, 9, 3); ! ssd_widget_add (button, w); ! } } static void ssd_keyboard_new (SsdKeyboard *keyboard) { + SsdWidget dialog; + SsdWidget entry; + SsdWidget input; + wchar_t wkeys[100]; const char *keys = keyboard->keys; *************** *** 157,168 **** int i; ! if (!ssd_dialog_activate (keyboard->name, NULL)) return; count = mbsrtowcs(wkeys, &keys, sizeof(wkeys) / sizeof(wchar_t), NULL); - ssd_dialog_new (keyboard->name, "", 0); - ssd_dialog_new_entry ("input", "", 0, NULL); - for (i=0; i<count/2; i++) { char key1[20]; --- 205,228 ---- int i; ! dialog = ssd_dialog_new (keyboard->name, "", SSD_CONTAINER_TITLE); ! keyboard->widget = dialog; ! ! ssd_widget_set_color (dialog, "#000000", "#000000"); ! ! entry = ssd_container_new ("entry", NULL, SSD_MAX_SIZE, 19, ! SSD_CONTAINER_BORDER|SSD_END_ROW); ! ! ssd_widget_set_color (entry, "#000000", "#ffffff"); ! ! input = ssd_text_new ("input", "", 15, 0); ! ssd_widget_set_callback (input, input_callback); ! ! ssd_widget_add (entry, input); ! ! ssd_widget_add (dialog, entry); count = mbsrtowcs(wkeys, &keys, sizeof(wkeys) / sizeof(wchar_t), NULL); for (i=0; i<count/2; i++) { char key1[20]; *************** *** 192,195 **** --- 252,284 ---- add_key (roadmap_lang_get ("SPC"), NULL, SSD_BUTTON_TEXT); } + } + + + void set_title (SsdWidget keyboard, const char *title) { + keyboard->set_value (keyboard, title); + } + + + void set_value (SsdWidget keyboard, const char *title) { + ssd_widget_set_value (keyboard, "input", title); + } + + + void ssd_keyboard_show (int type, const char *title, const char *value, + SsdDialogCB callback, void *context) { + + SsdKeyboard *keyboard = &def_keyboards[0]; + + if (!keyboard->widget) { + ssd_keyboard_new (&def_keyboards[0]); + } + + keyboard->callback = callback; + keyboard->context = context; + + ssd_widget_set_context (keyboard->widget, keyboard); + + set_title (keyboard->widget, title); + set_value (keyboard->widget, value); ssd_dialog_activate (keyboard->name, NULL); *************** *** 197,202 **** } ! void ssd_keyboard_show (void) { ! ssd_keyboard_new (&def_keyboards[0]); } --- 286,294 ---- } ! ! void ssd_keyboard_hide (int type) { ! SsdKeyboard *keyboard = &def_keyboards[0]; ! ! ssd_dialog_hide (keyboard->name); } Index: ssd_button.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_button.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_button.h 3 Nov 2006 12:39:17 -0000 1.1 --- ssd_button.h 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 34,38 **** SsdWidget ssd_button_new (const char *name, const char *value, const char **bitmaps, int num_bitmaps, ! int flags); #endif // __SSD_WIDGET_BUTTON_H_ --- 34,38 ---- SsdWidget ssd_button_new (const char *name, const char *value, const char **bitmaps, int num_bitmaps, ! int flags, SsdCallback callback); #endif // __SSD_WIDGET_BUTTON_H_ --- NEW FILE: ssd_list.c --- /* ssd_list.c - list view widget * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See ssd_list.h. */ #include <string.h> #include <stdlib.h> #include "ssd_dialog.h" #include "ssd_container.h" #include "ssd_button.h" #include "ssd_text.h" #include "ssd_list.h" #define MAX_ROWS 50 #define MIN_ROW_HEIGHT 40 struct ssd_list_data { int alloc_rows; int num_rows; SsdWidget *rows; SsdCallback callback; int num_values; const char **labels; const void **data; int first_row_index; }; static int setup_rows (SsdWidget list) { struct ssd_list_data *data = (struct ssd_list_data *) list->data; int current_index = data->first_row_index; int i; for (i=0; i<data->num_rows; i++) { SsdWidget row = data->rows[i]; const char *label; if (current_index == data->num_values) { label = ""; } else { label = data->labels[current_index]; current_index++; } ssd_widget_set_value (row, "label", label); row = row->next; } return 0; } static int button_callback (SsdWidget widget, const char *new_value) { struct ssd_list_data *data; SsdWidget list = widget; /* Find the list main widget */ while (strcmp(list->name, "list_container") && strcmp(list->name, "scroll_container")) list = list->parent; list = list->parent; data = (struct ssd_list_data *) list->data; if (!strcmp(widget->name, "scroll_up")) { data->first_row_index -= data->num_rows; if (data->first_row_index < 0) data->first_row_index = 0; return setup_rows (list); } if (!strcmp(widget->name, "scroll_down")) { if ((data->first_row_index + data->num_rows) >= data->num_values) { return -1; } data->first_row_index += data->num_rows; return setup_rows (list); } return 0; } static int label_callback (SsdWidget widget, const char *new_value) { SsdWidget list = widget->parent->parent; SsdWidget text = ssd_widget_get (widget, "label"); struct ssd_list_data *data; data = (struct ssd_list_data *) list->data; if (!data->callback) return 0; return (*data->callback) (list, text->value); } static void update_list_rows (SsdWidget list_container, struct ssd_list_data *data) { SsdSize size; int num_rows; int row_height; int i; ssd_widget_container_size (list_container, &size); num_rows = size.height / MIN_ROW_HEIGHT; row_height = size.height / num_rows; if (data->num_rows == num_rows) return; if (num_rows > data->alloc_rows) { data->rows = realloc (data->rows, sizeof(SsdWidget) * num_rows); for (i=data->alloc_rows; i<num_rows; i++) { SsdWidget row = ssd_container_new ("rowx", NULL, SSD_MAX_SIZE, row_height, SSD_CONTAINER_BORDER|SSD_END_ROW); SsdWidget label = ssd_text_new ("label", "", 16, SSD_END_ROW); ssd_widget_set_color (row, "#000000", "#efefef"); ssd_widget_set_callback (row, label_callback); ssd_widget_add (row, label); ssd_widget_add (list_container, row); data->rows[i] = row; } data->alloc_rows = num_rows; } for (i=0; i<num_rows; i++) { ssd_widget_set_size (data->rows[i], SSD_MAX_SIZE, row_height); ssd_widget_show (data->rows[i]); } for (i=num_rows; i<data->num_rows; i++) { ssd_widget_hide (data->rows[i]); } data->num_rows = num_rows; } static void resize (SsdWidget list) { struct ssd_list_data *data = (struct ssd_list_data *) list->data; SsdWidget scroll_bar = ssd_widget_get (list, "scroll_bar"); SsdWidget button = ssd_widget_get (list, "scroll_up"); SsdWidget scroll = ssd_widget_get (list, "scroll_container"); SsdWidget list_container = ssd_widget_get (list, "list_container"); SsdSize size; SsdSize scroll_size; ssd_widget_get_size (button, &size, NULL); ssd_widget_container_size (scroll, &scroll_size); ssd_widget_set_size (scroll_bar, size.width, scroll_size.height - size.height*2); update_list_rows (list_container, data); } SsdWidget ssd_list_new (const char *name, int width, int height, int flags) { const char *scroll_up_icons[] = {"up.bmp"}; const char *scroll_down_icons[] = {"down.bmp"}; SsdSize scroll_size; SsdSize button_size; SsdWidget list; SsdWidget scroll; SsdWidget scroll_up; SsdWidget scroll_down; SsdWidget scroll_bar; struct ssd_list_data *data = (struct ssd_list_data *)calloc (1, sizeof(*data)); SsdWidget list_container = ssd_container_new (name, NULL, width, height, SSD_CONTAINER_BORDER); list_container->data = data; scroll_up = ssd_button_new ("scroll_up", "", scroll_up_icons, 1, SSD_ALIGN_CENTER|SSD_END_ROW, button_callback); scroll_down = ssd_button_new ("scroll_down", "", scroll_down_icons, 1, SSD_ALIGN_CENTER|SSD_END_ROW, button_callback); ssd_widget_get_size (scroll_up, &button_size, NULL); scroll = ssd_container_new ("scroll_container", NULL, SSD_MIN_SIZE, SSD_MAX_SIZE, SSD_CONTAINER_BORDER|SSD_ALIGN_RIGHT); ssd_widget_set_color (scroll, "#000000", "#efefef"); ssd_widget_add (scroll, scroll_up); scroll_bar = ssd_container_new ("scroll_bar", NULL, button_size.width, scroll_size.height - button_size.height*2, SSD_CONTAINER_BORDER|SSD_END_ROW); ssd_widget_add (scroll, scroll_bar); ssd_widget_add (scroll, scroll_down); list = ssd_container_new ("list_container", NULL, SSD_MAX_SIZE, SSD_MAX_SIZE, SSD_CONTAINER_BORDER); ssd_widget_set_color (list, "#000000", "#000000"); ssd_widget_add (list_container, scroll); ssd_widget_add (list_container, list); return list_container; } void ssd_list_populate (SsdWidget list, int count, const char **labels, const void **values, SsdCallback callback) { struct ssd_list_data *data = (struct ssd_list_data *) list->data; data->num_values = count; data->labels = labels; data->data = values; data->first_row_index = 0; data->callback = callback; setup_rows (list); } /*** Generic list dialog implementation ***/ typedef struct ssd_list_context { SsdDialogCB callback; void *context; } SsdListContext; static int list_callback (SsdWidget widget, const char *new_value) { SsdWidget dialog = widget->parent; SsdListContext *context = (SsdListContext *)dialog->context; return (*context->callback) (0, new_value, context->context); } void ssd_list_show (const char *title, int count, const char **labels, const void **values, SsdDialogCB callback, void *context) { static SsdListContext list_context; SsdWidget list; SsdWidget dialog = ssd_dialog_activate ("generic_list", NULL); list_context.callback = callback; list_context.context = context; if (!dialog) { dialog = ssd_dialog_new ("generic_list", "", SSD_CONTAINER_BORDER|SSD_CONTAINER_TITLE); list = ssd_list_new ("list", SSD_MAX_SIZE, SSD_MAX_SIZE, 0); ssd_widget_add (dialog, list); ssd_dialog_activate ("generic_list", NULL); } dialog->set_value (dialog, title); ssd_widget_set_context (dialog, &list_context); list = ssd_widget_get (dialog, "list"); ssd_widget_reset_cache (list->parent); resize (list); ssd_list_populate (list, count, labels, NULL, list_callback); ssd_dialog_draw (); } void ssd_list_hide (void) { ssd_dialog_hide ("generic_list"); } Index: ssd_entry.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_entry.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_entry.c 3 Nov 2006 12:39:18 -0000 1.1 --- ssd_entry.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 28,36 **** #include <stdlib.h> #include <string.h> ! #include "roadmap.h" #include "roadmap_canvas.h" #include "ssd_widget.h" #include "ssd_entry.h" --- 28,37 ---- #include <stdlib.h> #include <string.h> ! #include "roadmap.h" #include "roadmap_canvas.h" #include "ssd_widget.h" + #include "ssd_text.h" #include "ssd_entry.h" *************** *** 39,64 **** static RoadMapPen text_pen; - static void draw_text (SsdWidget widget, const RoadMapGuiRect *rect) { - int text_width; - int text_ascent; - int text_descent; - int text_height; - RoadMapGuiPoint p; - - roadmap_canvas_get_text_extents - (widget->value, -1, &text_width, &text_ascent, &text_descent, NULL); - text_height = text_ascent + text_descent; - - if (ssd_widget_rtl()) { - p.x = rect->maxx - text_width; - } else { - p.x = rect->minx; - } - - p.y = rect->maxy - text_height / 2; - roadmap_canvas_draw_string_angle (&p, NULL, 0, -1, widget->value); - } - - static void init (void) { bg = roadmap_canvas_create_pen ("ssd_entry_bg"); --- 40,43 ---- *************** *** 72,108 **** ! static void draw (SsdWidget widget, const RoadMapGuiPoint *point) { ! RoadMapGuiRect rect; RoadMapGuiPoint points[5]; int count = 5; ! rect.minx = point->x; ! rect.miny = point->y; ! rect.maxx = rect.minx + widget->size.width - 1; ! rect.maxy = rect.miny + widget->size.height - 1; ! ! roadmap_canvas_select_pen (bg); ! roadmap_canvas_erase_area (&rect); ! roadmap_canvas_select_pen (text_pen); ! ! points[0].x = rect.minx; ! points[0].y = rect.miny; ! points[1].x = rect.maxx; ! points[1].y = rect.miny; ! points[2].x = rect.maxx; ! points[2].y = rect.maxy; ! points[3].x = rect.minx; ! points[3].y = rect.maxy; ! points[4].x = rect.minx; ! points[4].y = rect.miny; ! roadmap_canvas_draw_multiple_lines (1, &count, points, 0); ! rect.minx += 2; ! rect.miny += 2; ! rect.maxx -= 2; ! rect.maxy -= 2; ! draw_text (widget, &rect); } --- 51,84 ---- ! static void draw (SsdWidget widget, RoadMapGuiRect *rect, int flags) { ! RoadMapGuiPoint points[5]; int count = 5; ! if (!(flags & SSD_GET_SIZE)) { ! roadmap_canvas_select_pen (bg); ! roadmap_canvas_erase_area (rect); ! } ! points[0].x = rect->minx; ! points[0].y = rect->miny; ! points[1].x = rect->maxx; ! points[1].y = rect->miny; ! points[2].x = rect->maxx; ! points[2].y = rect->maxy; ! points[3].x = rect->minx; ! points[3].y = rect->maxy; ! points[4].x = rect->minx; ! points[4].y = rect->miny; ! if (!(flags & SSD_GET_SIZE)) { ! roadmap_canvas_select_pen (text_pen); ! roadmap_canvas_draw_multiple_lines (1, &count, points, 0); ! } ! rect->minx += 1; ! rect->miny += 1; ! rect->maxx -= 1; ! rect->maxy -= 1; } *************** *** 110,118 **** static int set_value (SsdWidget widget, const char *value) { ! if (widget->value && *widget->value) free (widget->value); ! ! if (*value) widget->value = strdup(value); ! else widget->value = ""; return 0; --- 86,93 ---- static int set_value (SsdWidget widget, const char *value) { ! SsdWidget w = ssd_widget_get (widget, "text"); ! w->set_value (w, value); + widget->value = w->value; return 0; *************** *** 135,140 **** w->set_value = set_value; w->flags = flags; ! w->size.height = 20; ! w->size.width = roadmap_canvas_width() - 6; set_value (w, value); --- 110,117 ---- w->set_value = set_value; w->flags = flags; ! // w->size.height = 24; ! // w->size.width = roadmap_canvas_width() - 6; ! ! w->children = ssd_text_new ("text", value, 20, 0); set_value (w, value); Index: ssd_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_dialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_dialog.c 3 Nov 2006 12:39:17 -0000 1.1 --- ssd_dialog.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 35,38 **** --- 35,39 ---- #include "roadmap_lang.h" #include "roadmap_pointer.h" + #include "roadmap_screen.h" #include "ssd_widget.h" *************** *** 67,70 **** --- 68,73 ---- static RoadMapGuiPoint LastPointerPoint; + static int RoadMapScreenFrozen = 0; + static SsdDialog ssd_dialog_get (const char *name) { *************** *** 679,683 **** LastPointerPoint = *point; ssd_widget_pointer_down (RoadMapDialogCurrent->container, point); ! ssd_dialog_draw (); return 1; } --- 682,686 ---- LastPointerPoint = *point; ssd_widget_pointer_down (RoadMapDialogCurrent->container, point); ! roadmap_screen_redraw (); return 1; } *************** *** 685,717 **** static void ssd_dialog_short_click (RoadMapGuiPoint *point) { ssd_widget_short_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! ssd_dialog_draw (); } static void ssd_dialog_long_click (RoadMapGuiPoint *point) { ssd_widget_long_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! ssd_dialog_draw (); } static void append_child (SsdWidget child) { ! SsdWidget last = RoadMapDialogWindows->container->children; ! ! while (last->next) last=last->next; ! last->next = child; } ! void ssd_dialog_new (const char *name, const char *title, int flags) { SsdDialog child; child = (SsdDialog) malloc (sizeof (*child)); - roadmap_check_allocated(child); ! child->name = strdup(name); ! child->container = ssd_container_new (name, title, flags); child->next = RoadMapDialogWindows; RoadMapDialogWindows = child; } --- 688,727 ---- static void ssd_dialog_short_click (RoadMapGuiPoint *point) { ssd_widget_short_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_screen_redraw (); } static void ssd_dialog_long_click (RoadMapGuiPoint *point) { ssd_widget_long_click (RoadMapDialogCurrent->container, &LastPointerPoint); ! roadmap_screen_redraw (); } static void append_child (SsdWidget child) { ! ssd_widget_add (RoadMapDialogWindows->container, child); } ! SsdWidget ssd_dialog_new (const char *name, const char *title, int flags) { SsdDialog child; + int width = roadmap_canvas_width (); + int height = roadmap_canvas_height (); child = (SsdDialog) malloc (sizeof (*child)); roadmap_check_allocated(child); ! child->name = strdup(name); ! ! if (flags & SSD_DIALOG_FLOAT) { ! width -= 70; ! height = -1; ! } ! ! child->container = ! ssd_container_new (name, title, SSD_MAX_SIZE, SSD_MAX_SIZE, flags); child->next = RoadMapDialogWindows; RoadMapDialogWindows = child; + + return child->container; } *************** *** 726,730 **** {0, 0, roadmap_canvas_width() - 1, roadmap_canvas_height() - 1}; ! ssd_widget_draw (RoadMapDialogCurrent->container, &rect); roadmap_canvas_refresh (); } --- 736,741 ---- {0, 0, roadmap_canvas_width() - 1, roadmap_canvas_height() - 1}; ! ssd_widget_reset_cache (RoadMapDialogCurrent->container); ! ssd_widget_draw (RoadMapDialogCurrent->container, &rect, 0); roadmap_canvas_refresh (); } *************** *** 742,753 **** ! void ssd_dialog_new_button (const char *name, const char *value, ! const char **bitmaps, int num_bitmaps, ! int flags, SsdCallback callback) { ! SsdWidget child = ssd_button_new (name, value, bitmaps, num_bitmaps, flags); append_child (child); ! ssd_widget_set_callback (child, callback); } --- 753,765 ---- ! SsdWidget ssd_dialog_new_button (const char *name, const char *value, ! const char **bitmaps, int num_bitmaps, ! int flags, SsdCallback callback) { ! SsdWidget child = ! ssd_button_new (name, value, bitmaps, num_bitmaps, flags, callback); append_child (child); ! return child; } *************** *** 763,772 **** ! int ssd_dialog_activate (const char *name, void *context) { SsdDialog dialog = ssd_dialog_get (name); if (!dialog) { ! return 1; /* Tell the caller this is a new, undefined, dialog. */ } --- 775,795 ---- ! SsdWidget ssd_dialog_activate (const char *name, void *context) { + SsdDialog current = RoadMapDialogCurrent; SsdDialog dialog = ssd_dialog_get (name); if (!dialog) { ! return NULL; /* Tell the caller this is a new, undefined, dialog. */ ! } ! ! while (current && strcmp(current->name, name)) { ! current = current->activated_prev; ! } ! ! if (current) { ! roadmap_log (ROADMAP_FATAL, ! "Trying to activate an already activated dialog: %s", ! name); } *************** *** 787,791 **** RoadMapDialogCurrent = dialog; ! return 0; /* Tell the caller the dialog already exists. */ } --- 810,819 ---- RoadMapDialogCurrent = dialog; ! if (!RoadMapScreenFrozen && !(dialog->container->flags & SSD_DIALOG_FLOAT)) { ! roadmap_screen_freeze (); ! RoadMapScreenFrozen = 1; ! } ! ! return dialog->container; /* Tell the caller the dialog already exists. */ } *************** *** 793,802 **** void ssd_dialog_hide (const char *name) { ! if (!RoadMapDialogCurrent) { roadmap_log (ROADMAP_FATAL, ! "Trying to hide a dialog, but no active dialogs exist"); } ! RoadMapDialogCurrent = RoadMapDialogCurrent->activated_prev; if (!RoadMapDialogCurrent) { --- 821,842 ---- void ssd_dialog_hide (const char *name) { ! SsdDialog prev = NULL; ! SsdDialog dialog = RoadMapDialogCurrent; ! ! while (dialog && strcmp(dialog->name, name)) { ! prev = dialog; ! dialog = dialog->activated_prev; ! } ! ! if (!dialog) { roadmap_log (ROADMAP_FATAL, ! "Trying to hide dialog '%s', but it is not active.", name); } ! if (prev == NULL) { ! RoadMapDialogCurrent = RoadMapDialogCurrent->activated_prev; ! } else { ! prev->activated_prev = dialog->activated_prev; ! } if (!RoadMapDialogCurrent) { *************** *** 805,808 **** --- 845,873 ---- roadmap_pointer_register_long_click (PrevLongClickHandler); } + + if (RoadMapScreenFrozen) { + dialog = RoadMapDialogCurrent; + while (dialog) { + if ( !(dialog->container->flags & SSD_DIALOG_FLOAT)) { + ssd_dialog_draw (); + return; + } + dialog = dialog->activated_prev; + } + } + + RoadMapScreenFrozen = 0; + roadmap_screen_unfreeze (); + } + + + void ssd_dialog_hide_current (void) { + + if (!RoadMapDialogCurrent) { + roadmap_log (ROADMAP_FATAL, + "Trying to hide a dialog, but no active dialogs exist"); + } + + ssd_dialog_hide (RoadMapDialogCurrent->name); } Index: ssd_text.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_text.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_text.c 3 Nov 2006 12:39:18 -0000 1.1 --- ssd_text.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 35,44 **** #include "ssd_text.h" static int initialized; static RoadMapPen pen; static void init_containers (void) { pen = roadmap_canvas_create_pen ("ssd_text_pen"); ! roadmap_canvas_set_foreground ("#ffffff"); initialized = 1; --- 35,49 ---- #include "ssd_text.h" + struct ssd_text_data { + int size; + }; + static int initialized; static RoadMapPen pen; + static const char *def_color = "#000000"; static void init_containers (void) { pen = roadmap_canvas_create_pen ("ssd_text_pen"); ! roadmap_canvas_set_foreground (def_color); initialized = 1; *************** *** 46,53 **** ! static void draw (SsdWidget widget, const RoadMapGuiPoint *point) { ! RoadMapGuiPoint p = *point; ! p.y += widget->size.height / 2 + 2; ! roadmap_canvas_draw_string_angle (&p, NULL, 0, -1, widget->value); } --- 51,186 ---- ! static int format_text (SsdWidget widget, int draw, ! RoadMapGuiRect *rect) { ! ! struct ssd_text_data *data = (struct ssd_text_data *) widget->data; ! char line[255] = {0}; ! const char *text; ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height = 0; ! int width = rect->maxx - rect->minx + 1; ! int max_width = 0; ! RoadMapGuiPoint p; ! ! if (draw) { ! p.x = rect->minx; ! p.y = rect->miny; ! } ! ! text = widget->value; ! ! while (*text || *line) { ! const char *space = strchr(text, ' '); ! const char *new_line = strchr(text, '\n'); ! unsigned int len; ! unsigned int new_len; ! ! if (!*text) { ! new_len = strlen(line); ! ! } else { ! ! if (new_line && (!space || (new_line < space))) { ! space = new_line; ! } else { ! new_line = NULL; ! } ! ! if (space) { ! len = space - text; ! } else { ! len = strlen(text); ! } ! ! if (len > (sizeof(line) - strlen(line) - 1)) { ! len = sizeof(line) - strlen(line) - 1; ! } ! ! if (*line) { ! strcat (line ," "); ! } ! ! new_len = strlen(line) + len; ! strncpy (line + strlen(line), text, len); ! line[new_len] = '\0'; ! ! text += len; ! ! if (space) text++; ! } ! ! roadmap_canvas_get_text_extents ! (line, data->size, &text_width, &text_ascent, ! &text_descent, NULL); ! ! if (!*text || new_line || (text_width > width)) { ! int h; ! ! if ((text_width > width) && (new_len > len)) { ! line[new_len - len - 1] = '\0'; ! text -= len; ! if (space) text--; ! ! roadmap_canvas_get_text_extents ! (line, data->size, &text_width, &text_ascent, ! &text_descent, NULL); ! } ! ! h = text_ascent + text_descent; ! ! if (draw) { ! p.y += h; ! p.x = rect->minx; ! ! if (widget->flags & SSD_ALIGN_CENTER) { ! if (ssd_widget_rtl ()) { ! p.x += (width - text_width) / 2; ! } else { ! p.x -= (width - text_width) / 2; ! } ! } else if (ssd_widget_rtl ()) { ! p.x += width - text_width; ! } ! ! roadmap_canvas_draw_string_angle (&p, NULL, 0, data->size, line); ! } ! ! line[0] = '\0'; ! ! if (text_width > max_width) max_width = text_width; ! ! text_height += h; ! } ! } ! ! rect->maxx = rect->minx + max_width - 1; ! rect->maxy = rect->miny + text_height - 1; ! ! return 0; ! } ! ! ! static void draw (SsdWidget widget, RoadMapGuiRect *rect, int flags) { ! ! const char *color = def_color; ! ! if (flags & SSD_GET_SIZE) { ! format_text (widget, 0, rect); ! return; ! } ! ! // compensate for descending characters ! // Doing it dynamically is not good as the text will move vertically. ! rect->miny -= 2; ! ! roadmap_canvas_select_pen (pen); ! if (widget->fg_color) color = widget->fg_color; ! roadmap_canvas_set_foreground (color); ! ! format_text (widget, 1, rect); ! ! rect->miny += 2; } *************** *** 55,75 **** static int set_value (SsdWidget widget, const char *value) { ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height; if (widget->value && *widget->value) free (widget->value); ! if (*value) widget->value = strdup(value); ! else widget->value = ""; ! roadmap_canvas_get_text_extents ! (value, -1, &text_width, &text_ascent, &text_descent, NULL); ! text_height = text_ascent + text_descent; ! widget->size.width = text_width; ! widget->size.height = text_height; return 0; --- 188,212 ---- static int set_value (SsdWidget widget, const char *value) { ! if (widget->callback && !widget->callback (widget, value)) return -1; if (widget->value && *widget->value) free (widget->value); ! if (*value) { ! int len = strlen(value); ! if (widget->flags & SSD_TEXT_LABEL) { ! len += 1; ! } ! widget->value = (char *) malloc (len + 1); ! strcpy (widget->value, value); ! if (widget->flags & SSD_TEXT_LABEL) strcat (widget->value, ":"); ! ! } else { ! widget->value = ""; ! } ! ! ssd_widget_reset_cache (widget); return 0; *************** *** 77,83 **** ! SsdWidget ssd_text_new (const char *name, const char *value, int flags) { SsdWidget w; if (!initialized) { --- 214,223 ---- ! SsdWidget ssd_text_new (const char *name, const char *value, ! int size, int flags) { SsdWidget w; + struct ssd_text_data *data = + (struct ssd_text_data *)calloc (1, sizeof(*data)); if (!initialized) { *************** *** 93,96 **** --- 233,239 ---- w->flags = flags; + data->size = size; + w->data = data; + set_value (w, value); Index: ssd_container.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_container.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_container.c 3 Nov 2006 12:39:17 -0000 1.1 --- ssd_container.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 34,37 **** --- 34,40 ---- #include "ssd_widget.h" #include "ssd_text.h" + #include "ssd_button.h" + #include "ssd_dialog.h" + #include "ssd_container.h" *************** *** 39,49 **** static RoadMapPen bg; static RoadMapPen border; static void init_containers (void) { bg = roadmap_canvas_create_pen ("container_bg"); ! roadmap_canvas_set_foreground ("#000000"); border = roadmap_canvas_create_pen ("container_border"); ! roadmap_canvas_set_foreground ("#ffffff"); roadmap_canvas_set_thickness (2); --- 42,54 ---- static RoadMapPen bg; static RoadMapPen border; + static const char *default_fg = "#000000"; + static const char *default_bg = "#ffffff"; static void init_containers (void) { bg = roadmap_canvas_create_pen ("container_bg"); ! roadmap_canvas_set_foreground (default_bg); border = roadmap_canvas_create_pen ("container_border"); ! roadmap_canvas_set_foreground (default_fg); roadmap_canvas_set_thickness (2); *************** *** 52,104 **** ! static void draw (SsdWidget widget, const RoadMapGuiPoint *point) { ! RoadMapGuiRect rect; RoadMapGuiPoint points[5]; int count = 5; ! rect.minx = point->x; ! rect.miny = point->y; ! rect.maxx = rect.minx + widget->size.width - 1; ! rect.maxy = rect.miny + widget->size.height - 1; ! roadmap_canvas_select_pen (bg); ! roadmap_canvas_erase_area (&rect); ! roadmap_canvas_select_pen (border); ! points[0].x = rect.minx; ! points[0].y = rect.miny; ! points[1].x = rect.maxx; ! points[1].y = rect.miny; ! points[2].x = rect.maxx; ! points[2].y = rect.maxy; ! points[3].x = rect.minx; ! points[3].y = rect.maxy; ! points[4].x = rect.minx; ! points[4].y = rect.miny; ! roadmap_canvas_draw_multiple_lines (1, &count, points, 0); ! rect.minx += 3; ! rect.miny += 3; ! rect.maxx -= 3; ! rect.maxy -= 3; ! ssd_widget_draw (widget->children, &rect); } ! static int set_value (SsdWidget widget, const char *value) { ! widget = ssd_widget_get (widget->children, "title"); ! if (widget) { ! return widget->set_value (widget, value); ! } else { ! return -1; } } ! SsdWidget ssd_container_new (const char *name, const char *title, int flags) { SsdWidget w; --- 57,166 ---- ! static void draw (SsdWidget widget, RoadMapGuiRect *rect, int flags) { ! RoadMapGuiPoint points[5]; int count = 5; ! if (!(flags & SSD_GET_SIZE)) { ! if (widget->bg_color) { ! roadmap_canvas_select_pen (bg); ! roadmap_canvas_set_foreground (widget->bg_color); ! roadmap_canvas_erase_area (rect); ! } ! } ! if (widget->flags & SSD_CONTAINER_BORDER) { ! points[0].x = rect->minx + 1; ! points[0].y = rect->miny + 1; ! points[1].x = rect->maxx - 0; ! points[1].y = rect->miny + 1; ! points[2].x = rect->maxx - 0; ! points[2].y = rect->maxy - 0; ! points[3].x = rect->minx + 1; ! points[3].y = rect->maxy - 0; ! points[4].x = rect->minx + 1; ! points[4].y = rect->miny + 1; ! if (!(flags & SSD_GET_SIZE)) { ! const char *color = default_fg; ! roadmap_canvas_select_pen (border); ! if (widget->fg_color) color = widget->fg_color; ! roadmap_canvas_set_foreground (color); ! ! roadmap_canvas_draw_multiple_lines (1, &count, points, 0); ! } ! ! rect->minx += 2; ! rect->miny += 2; ! rect->maxx -= 2; ! rect->maxy -= 2; ! } ! ! if ((flags & SSD_GET_SIZE) && (widget->flags & SSD_CONTAINER_TITLE)) { ! SsdWidget title; ! ! title = ssd_widget_get (widget, "title_bar"); ! ! if (title) { ! SsdSize max_size = {rect->maxx - rect->minx + 1, ! rect->maxy - rect->miny + 1}; ! SsdSize title_size; ! ssd_widget_get_size (title, &title_size, &max_size); ! rect->miny += title_size.height; ! } ! } } ! static int button_callback (SsdWidget widget, const char *new_value) { ! ssd_dialog_hide_current (); ! return 1; ! } ! ! static int short_click (SsdWidget widget, const RoadMapGuiPoint *point) { ! ! if (widget->callback) { ! (*widget->callback) (widget, SSD_BUTTON_SHORT_CLICK); ! return 1; } + + return 0; } ! static void add_title (SsdWidget w, int flags) { ! SsdWidget title; ! const char *close_icon[] = {"rm_quit.bmp"}; ! ! title = ssd_container_new ("title_bar", NULL, SSD_MAX_SIZE, SSD_MIN_SIZE, ! SSD_END_ROW); ! ssd_widget_set_color (title, "#000000", "#efefef"); ! ! ssd_widget_add (title, ! ssd_text_new ("title_text", "" , 15, SSD_WIDGET_SPACE|SSD_ALIGN_VCENTER)); ! ! ssd_widget_add (title, ! ssd_button_new ("close", "", close_icon, 1, ! SSD_ALIGN_RIGHT, button_callback)); ! ! ssd_widget_add (w, title); ! } ! ! ! static int set_value (SsdWidget widget, const char *value) { ! ! if (!(widget->flags & SSD_CONTAINER_TITLE)) return -1; ! ! return ssd_widget_set_value (widget, "title_text", value); ! } ! ! ! SsdWidget ssd_container_new (const char *name, const char *title, ! int width, int height, int flags) { SsdWidget w; *************** *** 112,122 **** w->typeid = "Container"; w->draw = draw; w->set_value = set_value; ! w->size.width = roadmap_canvas_width (); ! w->size.height = roadmap_canvas_height (); ! w->children = ssd_text_new ("title", title, SSD_ALIGN_CENTER|SSD_END_ROW); return w; --- 174,195 ---- w->typeid = "Container"; + w->flags = flags; + w->draw = draw; + + w->size.width = width; + w->size.height = height; + w->set_value = set_value; + w->short_click = short_click; ! w->fg_color = default_fg; ! w->bg_color = default_bg; ! if (flags & SSD_CONTAINER_TITLE) { ! add_title (w, flags); ! } ! ! set_value (w, title); return w; --- NEW FILE: ssd_list.h --- /* ssd_list.h - List view widget * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ #ifndef __SSD_WIDGET_LIST_H_ #define __SSD_WIDGET_LIST_H_ #include "ssd_widget.h" SsdWidget ssd_list_new (const char *name, int width, int height, int flags); void ssd_list_populate (SsdWidget list, int count, const char **labels, const void **values, SsdCallback callback); void ssd_list_show (const char *title, int count, const char **labels, const void **values, SsdDialogCB callback, void *context); void ssd_list_hide (void); #endif // __SSD_WIDGET_LIST_H_ --- NEW FILE: ssd_messagebox.c --- /* ssd_messagebox.c - ssd messagebox. * * LICENSE: * * Copyright 2006 Ehud Shabtai. * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See roadmap_messagebox.h */ #include <stdlib.h> #include "ssd_dialog.h" #include "ssd_text.h" #include "ssd_container.h" #include "ssd_button.h" #include "roadmap_lang.h" #include "roadmap_messagebox.h" static int button_callback (SsdWidget widget, const char *new_value) { ssd_dialog_hide ("message_box"); return 0; } static void create_messagebox (void) { SsdWidget dialog; SsdWidget button; const char *ok_button[] = {"button.bmp"}; dialog = ssd_dialog_new ("message_box", "", SSD_CONTAINER_BORDER|SSD_CONTAINER_TITLE|SSD_DIALOG_FLOAT| SSD_ALIGN_CENTER|SSD_ALIGN_VCENTER); ssd_widget_add (dialog, ssd_text_new ("text", "", 13, SSD_END_ROW|SSD_WIDGET_SPACE)); /* Spacer */ ssd_widget_add (dialog, ssd_container_new ("spacer1", NULL, 0, 20, SSD_END_ROW)); button = ssd_button_new ("confirm", "", ok_button, 1, SSD_ALIGN_CENTER|SSD_START_NEW_ROW, button_callback); ssd_widget_add (button, ssd_text_new ("ok", roadmap_lang_get ("Ok"), 16, SSD_ALIGN_VCENTER| SSD_ALIGN_CENTER)); ssd_widget_add (dialog, button); } void roadmap_messagebox (const char *title, const char *text) { SsdWidget dialog = ssd_dialog_activate ("message_box", NULL); title = roadmap_lang_get (title); text = roadmap_lang_get (text); if (!dialog) { create_messagebox (); dialog = ssd_dialog_activate ("message_box", NULL); } dialog->set_value (dialog, title); ssd_widget_set_value (dialog, "text", text); ssd_dialog_draw (); } Index: ssd_widget.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_widget.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_widget.h 3 Nov 2006 12:39:18 -0000 1.1 --- ssd_widget.h 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 28,45 **** #include "roadmap_gui.h" #define SSD_ALIGN_CENTER 0x1 #define SSD_ALIGN_RIGHT 0x2 #define SSD_START_NEW_ROW 0x4 #define SSD_END_ROW 0x8 /* Buttons flags */ ! #define SSD_BUTTON_KEY 0x100 ! #define SSD_BUTTON_TEXT 0x200 ! #define SSD_BUTTON_TEXT_BELOW 0x400 typedef struct ssd_size { ! unsigned short width; ! unsigned short height; } SsdSize; --- 28,62 ---- #include "roadmap_gui.h" + #define SSD_MIN_SIZE -1 + #define SSD_MAX_SIZE -2 + #define SSD_ALIGN_CENTER 0x1 #define SSD_ALIGN_RIGHT 0x2 #define SSD_START_NEW_ROW 0x4 #define SSD_END_ROW 0x8 + #define SSD_ALIGN_VCENTER 0x10 + #define SSD_ALIGN_GRID 0x20 + #define SSD_GET_SIZE 0x40 + #define SSD_WIDGET_SPACE 0x80 + #define SSD_WIDGET_HIDE 0x100 /* Buttons flags */ ! #define SSD_BUTTON_KEY 0x1000 ! #define SSD_BUTTON_TEXT 0x2000 ! #define SSD_BUTTON_TEXT_BELOW 0x4000 ! ! /* Dialogs */ ! #define SSD_DIALOG_FLOAT 0x10000 + /* Container flags */ + #define SSD_CONTAINER_BORDER 0x1000 + #define SSD_CONTAINER_TITLE 0x2000 + + /* Text flags */ + #define SSD_TEXT_LABEL 0x1000 /* Adds a ':' sign */ typedef struct ssd_size { ! short width; ! short height; } SsdSize; *************** *** 50,55 **** * applied. */ ! typedef int (*SsdCallback) (const char *name, const char *new_value, ! void *context); struct ssd_widget { --- 67,71 ---- * applied. */ ! typedef int (*SsdCallback) (SsdWidget widget, const char *new_value); struct ssd_widget { *************** *** 57,60 **** --- 73,77 ---- char *typeid; + struct ssd_widget *parent; struct ssd_widget *next; *************** *** 66,72 **** --- 83,96 ---- SsdSize size; + SsdSize cached_size; + + int offset_x; + int offset_y; int flags; + const char *fg_color; + const char *bg_color; + SsdCallback callback; void *context; /* References a caller-specific context. */ *************** *** 76,80 **** int (*set_value) (SsdWidget widget, const char *value); ! void (*draw) (SsdWidget widget, const RoadMapGuiPoint *point); int (*pointer_down) (SsdWidget widget, const RoadMapGuiPoint *point); int (*short_click) (SsdWidget widget, const RoadMapGuiPoint *point); --- 100,104 ---- int (*set_value) (SsdWidget widget, const char *value); ! void (*draw) (SsdWidget widget, RoadMapGuiRect *rect, int flags); int (*pointer_down) (SsdWidget widget, const RoadMapGuiPoint *point); int (*short_click) (SsdWidget widget, const RoadMapGuiPoint *point); *************** *** 84,97 **** SsdWidget ssd_widget_new (const char *name, int flags); SsdWidget ssd_widget_get (SsdWidget child, const char *name); ! void ssd_widget_draw (SsdWidget w, const RoadMapGuiRect *rect); void ssd_widget_set_callback (SsdWidget widget, SsdCallback callback); int ssd_widget_rtl (void); ! void ssd_widget_pointer_down (SsdWidget widget, RoadMapGuiPoint *point); ! void ssd_widget_short_click (SsdWidget widget, RoadMapGuiPoint *point); ! void ssd_widget_long_click (SsdWidget widget, RoadMapGuiPoint *point); const char *ssd_widget_get_value (const SsdWidget widget, const char *name); int ssd_widget_set_value (const SsdWidget widget, const char *name, const char *value); #endif // __SSD_WIDGET_H_ --- 108,141 ---- SsdWidget ssd_widget_new (const char *name, int flags); SsdWidget ssd_widget_get (SsdWidget child, const char *name); ! void ssd_widget_draw (SsdWidget w, const RoadMapGuiRect *rect, ! int parent_flags); void ssd_widget_set_callback (SsdWidget widget, SsdCallback callback); int ssd_widget_rtl (void); ! int ssd_widget_pointer_down (SsdWidget widget, const RoadMapGuiPoint *point); ! int ssd_widget_short_click (SsdWidget widget, const RoadMapGuiPoint *point); ! int ssd_widget_long_click (SsdWidget widget, const RoadMapGuiPoint *point); const char *ssd_widget_get_value (const SsdWidget widget, const char *name); int ssd_widget_set_value (const SsdWidget widget, const char *name, const char *value); + + void ssd_widget_add (SsdWidget parent, SsdWidget child); + + void ssd_widget_set_size (SsdWidget widget, int width, int height); + void ssd_widget_set_offset (SsdWidget widget, int x, int y); + void ssd_widget_set_context (SsdWidget widget, void *context); + void ssd_widget_get_size (SsdWidget w, SsdSize *size, const SsdSize *max); + void ssd_widget_set_color (SsdWidget w, const char *fg_color, + const char *bg_color); + + void ssd_widget_container_size (SsdWidget dialog, SsdSize *size); + + void *ssd_widget_get_context (SsdWidget w); + + void ssd_widget_reset_cache (SsdWidget w); + + void ssd_widget_hide (SsdWidget w); + void ssd_widget_show (SsdWidget w); + #endif // __SSD_WIDGET_H_ Index: ssd_menu.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/ssd/ssd_menu.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssd_menu.c 3 Nov 2006 12:39:18 -0000 1.1 --- ssd_menu.c 17 Nov 2006 16:46:49 -0000 1.2 *************** *** 33,111 **** #include "roadmap_factory.h" #include "ssd_dialog.h" #include "ssd_button.h" #include "ssd_menu.h" ! static int button_callback (const char *name, const char *new_value, ! void *context) { ! #if 0 ! wchar_t wkeys[3]; ! char key[20]; ! char text[255]; ! int count; ! int len; ! ! if (!strcmp (roadmap_lang_get ("Ok"), name)) { ! return 0; ! ! } else if (!strcmp (roadmap_lang_get ("Del"), name)) { ! wchar_t wtext[255]; ! const char *t = ssd_dialog_get_value ("input"); ! int value_len = strlen(t); ! ! if (!value_len) return 1; ! ! count = mbsrtowcs(wtext, &t, sizeof(wtext) / sizeof(wchar_t), NULL); ! ! len = wcrtomb(key, wtext[count-1], NULL); ! ! if ((len <= 0) || (len > value_len)) return 1; ! ! if (len == value_len) { ! ssd_dialog_set_value ("input", ""); ! return 0; ! } ! ! strncpy(text, ssd_dialog_get_value ("input"), sizeof(text)); ! text[sizeof(text)-1] = '\0'; ! ! text[strlen(text) - len] = '\0'; ! ! ssd_dialog_set_value ("input", text); ! return 0; - } else if (!strcmp (roadmap_lang_get ("SPC"), name)) { - len = 1; - strcpy (key, " "); ! } else { ! count = mbsrtowcs(wkeys, &name, sizeof(wkeys) / sizeof(wchar_t), NULL); ! if (count <= 0) return 1; ! if (!strcmp(new_value, SSD_BUTTON_SHORT_CLICK)) { - if ((len = wcrtomb(key, wkeys[0], NULL)) <= 0) return 1; - } else { ! if ((len = wcrtomb(key, wkeys[1], NULL)) <= 0) return 1; ! } ! key[len] = '\0'; } ! strncpy(text, ssd_dialog_get_value ("input"), sizeof(text)); ! text[sizeof(text)-1] = '\0'; - if ((strlen(text) + len) >= siz... [truncated message content] |
|
From: Paul F. <pg...@us...> - 2006-11-16 16:50:50
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20698 Modified Files: roadmap_trip.c Log Message: new dialog to select among waypoints if a mouse click selects more than one (because they're identical, or equally distant). Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** roadmap_trip.c 16 Nov 2006 01:58:28 -0000 1.78 --- roadmap_trip.c 16 Nov 2006 16:50:46 -0000 1.79 *************** *** 2769,2772 **** --- 2769,2774 ---- RoadMapListItem *element, *tmp; + roadmap_dialog_hide ("Multiple Places"); + ROADMAP_LIST_FOR_EACH(&RoadMapTripAreaPlaces, element, tmp) { free (roadmap_list_remove(element)); *************** *** 2775,2778 **** --- 2777,2879 ---- } + void roadmap_trip_waypoint_show_selected(void) { + + roadmap_place_pointer *pp; + waypoint *wpt; + pp = (roadmap_place_pointer *) + ROADMAP_LIST_FIRST(&RoadMapTripAreaPlaces); + + wpt = pp->wpt; + + roadmap_message_set ('R', pp->list ? pp->list : ""); + roadmap_message_set ('P', wpt->shortname); + + roadmap_display_text("Place", "%s%s%s%s%s%s", + pp->list ? pp->list : "", + pp->list ? " / " : "", + wpt->shortname, + wpt->description ? " - " : "", + wpt->description ? wpt->description : "", + roadmap_list_count(&RoadMapTripAreaPlaces) > 1 ? " (more)" : ""); + roadmap_screen_redraw (); + + roadmap_trip_move_last_cancel (NULL); + RoadMapTripSelectedPlace = pp; + } + + static void roadmap_trip_waypoint_selection_dialog_selected ( + const char *name, void *data) { + + roadmap_place_pointer *pp; + + pp = (roadmap_place_pointer *) roadmap_dialog_get_data ("Names", ".Places"); + + if (pp != NULL) { + /* force it to the start of the list */ + roadmap_list_insert + ( &RoadMapTripAreaPlaces, roadmap_list_remove(&pp->link)); + roadmap_trip_waypoint_show_selected (); + roadmap_trip_set_focus_waypoint (pp->wpt); + roadmap_screen_refresh (); + } + } + + static void roadmap_trip_waypoint_selection_dialog (void) { + + char **names; + roadmap_place_pointer **places; + int count; + int i; + RoadMapListItem *elem, *tmp; + waypoint *wpt; + roadmap_place_pointer *pp; + + + if (roadmap_dialog_activate ( "Multiple Places", NULL)) { + + roadmap_dialog_new_list ("Names", ".Places"); + roadmap_dialog_add_button + ("Okay", roadmap_trip_dialog_cancel); + + roadmap_dialog_complete (0); /* No need for a keyboard. */ + } + + count = roadmap_list_count(&RoadMapTripAreaPlaces); + if (count <= 1) { + return; + } + + names = calloc (count, sizeof (*names)); + roadmap_check_allocated (names); + places = calloc (count, sizeof (*places)); + roadmap_check_allocated (places); + + + i = 0; + ROADMAP_LIST_FOR_EACH (&RoadMapTripAreaPlaces, elem, tmp) { + char buf[128]; + pp = (roadmap_place_pointer *)elem; + wpt = pp->wpt; + + snprintf(buf, sizeof(buf), "%s%s%s%s%s", + pp->list ? pp->list : "", + pp->list ? " / " : "", + wpt->shortname, + wpt->description ? " - " : "", + wpt->description ? wpt->description : ""); + names[i] = strdup(buf); + places[i++] = pp; + } + roadmap_dialog_show_list + ("Names", ".Places", count, names, (void **) places, + roadmap_trip_waypoint_selection_dialog_selected); + + while (i > 0) + free(names[--i]); + free (names); + free (places); + + } + int roadmap_trip_retrieve_area_points (RoadMapArea *area, RoadMapPosition *position) { *************** *** 2842,2864 **** } ! pp = (roadmap_place_pointer *) ! ROADMAP_LIST_FIRST(&RoadMapTripAreaPlaces); ! ! wpt = pp->wpt; ! ! roadmap_message_set ('R', pp->list ? pp->list : ""); ! roadmap_message_set ('P', wpt->shortname); ! ! roadmap_display_text("Place", "%s%s%s%s%s%s", ! pp->list ? pp->list : "", ! pp->list ? " / " : "", ! wpt->shortname, ! wpt->description ? " - " : "", ! wpt->description ? wpt->description : "", ! count > 1 ? " (more)" : ""); ! roadmap_screen_redraw (); - roadmap_trip_move_last_cancel (NULL); - RoadMapTripSelectedPlace = pp; } --- 2943,2952 ---- } ! if (count > 1) { ! roadmap_trip_waypoint_selection_dialog (); ! } else { ! roadmap_trip_waypoint_show_selected(); ! } } |
|
From: Paul F. <pg...@us...> - 2006-11-16 01:58:36
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26703 Modified Files: roadmap_trip.c Log Message: follow pattern in other files, and declare own copy of the any config descriptor used. Index: roadmap_trip.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** roadmap_trip.c 14 Nov 2006 13:55:11 -0000 1.77 --- roadmap_trip.c 16 Nov 2006 01:58:28 -0000 1.78 *************** *** 81,85 **** ROADMAP_CONFIG_ITEM("Trip", "Waypoint Radius"); ! RoadMapConfigDescriptor RoadMapConfigBackupFiles = ROADMAP_CONFIG_ITEM("Files", "Make Backups"); --- 81,85 ---- ROADMAP_CONFIG_ITEM("Trip", "Waypoint Radius"); ! static RoadMapConfigDescriptor RoadMapConfigBackupFiles = ROADMAP_CONFIG_ITEM("Files", "Make Backups"); |
|
From: Paul F. <pg...@us...> - 2006-11-15 23:42:41
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7269 Modified Files: roadmap_screen.c Log Message: don't suppress trip/track/landmark sprites with Map.Signs config option Index: roadmap_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** roadmap_screen.c 14 Nov 2006 22:05:27 -0000 1.79 --- roadmap_screen.c 15 Nov 2006 23:42:38 -0000 1.80 *************** *** 1061,1070 **** roadmap_sprite_draw ("Compass", &CompassPoint, 0); - roadmap_landmark_display (); - roadmap_features_display (); - roadmap_trip_display (); - roadmap_track_display (); roadmap_display_signs (); } } --- 1061,1071 ---- roadmap_sprite_draw ("Compass", &CompassPoint, 0); roadmap_display_signs (); } + + roadmap_landmark_display (); + roadmap_features_display (); + roadmap_trip_display (); + roadmap_track_display (); } |
|
From: Paul F. <pg...@us...> - 2006-11-15 23:39:53
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6098 Modified Files: roadmap_landmark.c Log Message: follow pattern in other files, and declare own copy of the any config descriptor used. Index: roadmap_landmark.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_landmark.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** roadmap_landmark.c 13 Nov 2006 22:44:58 -0000 1.13 --- roadmap_landmark.c 15 Nov 2006 23:39:50 -0000 1.14 *************** *** 49,54 **** ROADMAP_CONFIG_ITEM("Landmarks", "Color"); ! /* in roadmap_trip.c */ ! extern RoadMapConfigDescriptor RoadMapConfigBackupFiles; --- 49,54 ---- ROADMAP_CONFIG_ITEM("Landmarks", "Color"); ! static RoadMapConfigDescriptor RoadMapConfigBackupFiles = ! ROADMAP_CONFIG_ITEM("Files", "Make Backups"); |
|
From: Paul F. <pg...@us...> - 2006-11-15 23:39:18
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5682 Modified Files: README Log Message: add missing documentation for "preferences" entries Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** README 14 Nov 2006 22:10:07 -0000 1.106 --- README 15 Nov 2006 23:38:29 -0000 1.107 *************** *** 2147,2150 **** --- 2147,2158 ---- <<Default:>> system default toolbar position (usually on top). + [General.Tooltips] Show (yes) or hide (no) tooltips on menus and buttons. + + <<Format:>> boolean + + <<Default:>> yes + + <<Comment:>> Tooltips may not work well on a touchscreen device. + [Geometry.Main] Sets the size of the RoadMap main window. *************** *** 2181,2185 **** <<Format:>> RoadMap format string ! <<Default:>> ETA: %A|%T [Display.Top Left] Defines the message on the top left corner. --- 2189,2193 ---- <<Format:>> RoadMap format string ! <<Default:>> In %Y, %X|%X"); [Display.Top Left] Defines the message on the top left corner. *************** *** 2203,2206 **** --- 2211,2220 ---- <<Default:>> "yes" + [Display.Refresh Period] Minimum interval between display refreshes. + + <<Format:>> integer (milliseconds) + + <<Default:>> 200 + [Help.Browser] The browser program used to show the help text. *************** *** 2248,2251 **** --- 2262,2291 ---- They can still be toggled by command. + [Map.DynamicOrientation] Rotate the map to match the GPS direction. + + <<Format:>> boolean + + <<Default:>> off + + <<Comment:>> chooses whether the map will initially show north, + or the direction of travel, towards the top of the + screen. Can be toggled by command as well. + + [Map.GPS map offset latitude] + + <<Format:>> integer + + <<Default:>> 0 + + <<Comment:>> offset (millionths of a degree) applied to GPS results + + [Map.GPS map offset longitude] + + <<Format:>> integer + + <<Default:>> 0 + + <<Comment:>> offset (millionths of a degree) applied to GPS results + [Map.Signs] Enable/disable the map sprites and street signs. *************** *** 2262,2265 **** --- 2302,2458 ---- <<Default:>> normal + [Labels.MinFeatureSize] The shortest street which may be labeled. + + <<Format:>> integer (in pixels) + + <<Default:>> 25 + + [Labels.Color] The color used when labeling streets. + + <<Format:>> color + + <<Default:>> Black + + [Landmarks.Name] The filename used for storing personal landmarks + + <<Format:>> pathname, including & and ~ shortcuts + + <<Default:>> landmarks.gpx, in the '&' (~/.roadmap) directory. + + [Landmarks.Color] The color used when labeling personal landmarks. + + <<Format:>> color + + <<Default:>> dark red + + [Track.Name] The filename used for storing current "breadcrumb" track + + <<Format:>> pathname, including & and ~ shortcuts + + <<Default:>> currenttrack.gpx, in the '&' (~/.roadmap) directory. + + <<Comment:>> The file is in stored in GPX format. + + [Track.Initial Display] Determines whether the track is displayed when + RoadMap starts. + + <<Format:>> enumeration (on, off) + + <<Default:>> on + + <<Comment:>> The display can still be toggled by command. + + [Track.Policy] The algorithm used to decide when to store a new trackpoint + + <<Format:>> enumeration ("off", "Deviation", "Distance", "Time") + + <<Default:>> off + + <<Comment:>> When "off", no track is recorded. When set to "Time", + a new trackpoint is stored after "Track.Time Delta" time + has passed since the last point was recorded. Shen set to + "Distance Delta", a new point is stored when the user has + moved Track.Distance from the last point. "Deviation" is + the optimal setting: call the most recent three points A, + B, and C. Point B is dropped if the distance from A to B + and then to C is approximately equal to the distance + directly from A to C. + + [Track.Time Delta] Time interval used when Track.Policy is "Time". + + <<Format:>> integer (seconds) + + <<Default:>> 15 + + [Track.Distance Delta] Distance used when Track.Policy is "Distance". + + <<Format:>> integer (with units) + + <<Default:>> 100 m + + [Track.Autosave minutes] Number of minutes between automatic saves of + the current track. + + <<Format:>> integer + + <<Default:>> 1000 + + [Track.Saved Track Points] Approximate number of track points saved in + memory, or in a single file. + + <<Format:>> integer + + <<Default:>> 1000 + + <<Comment:>> After "Track.Autosave minutes", if there are 25% + more points in the current track than this number, then + 75% are saved to an archive file, and the remainder + are still kept in memory and displayed on the map. + + [Trip.Name] The filename holding the current trip. + + <<Format:>> pathname, including & and ~ shortcuts + + <<Default:>> SavedTrip.gpx, in the '&/trips' (~/.roadmap) directory, + but usually chosen by the user. + + <<Comment:>> The file is in stored in GPX format. + + [Trip.Show Inactive Routes] Should waypoints in unselected routes be shown. + + <<Format:>> boolean + + <<Default:>> yes + + <<Comment:>> Can still be toggled by command. + + [Trip.Connect Route Points] Should route waypoints be connected with + straight lines? + + <<Format:>> boolean + + <<Default:>> yes + + <<Comment:>> Can still be toggled by command. + + [Trip.Route Connect Color] The color used to connect route waypoints. + + <<Format:>> color + + <<Default:>> red + + [Trip.Waypoint Radius] How close does the GPS need to be to a waypoint + to be "on" the waypoint. + + <<Format:>> integer (distance, with units) + + <<Default:>> 125 ft + + [FeatureFiles.Path] List of files containing features to display on map. + + <<Format:>> A comma-separated list of filenames, each accompanied + by their semi-colon-separated list of display parameters: + filename;spritename;labelcolor;declutterlevel,filename;spritename... + + <<Default:>> <empty> + + <<Comment:>> The filename may include & and ~ as path shorthands, + the spritename else should appear in the sprites file, the + labelcolor will be used when writing the feature's name, and the + declutter level is an integer, representing the zoom level above + which the label will not be drawn. The spritename or the + labelcolor may be the string "NONE", which will suppress the + sprite or the label, respectively. The declutter value may be + omitted. + + [Files.Make Backups] Enable/disable the creation of backup files. + + <<Format:>> boolean + + <<Default:>> yes + + <<Comment:>> On UNIX, backup files will have a '~' character + appended. Under Windows, a ".bak" suffix will be used. + [GPS.Background] The background color for the RoadGps screen. *************** *** 2302,2311 **** available, one can use a GPS source connected directly to a serial port. (tty://<device-path>[:baudrate]) An example ! would be "tty://dev/ttyS0". 4800 baud is the NMEA standard, ! but a different speed can be given: "tty://dev/ttyS0:19200". ! (Note that using direct tty access prevents one from running ! both RoadMap and RoadGps at the same time, since there is no ! mechanism in place to allow sharing the serial port. Using ! gpsd is recommended.) [GPS.Color] The color used for the current GPS position symbol. --- 2495,2511 ---- available, one can use a GPS source connected directly to a serial port. (tty://<device-path>[:baudrate]) An example ! would be "tty://dev/ttyS0", or "COM1:" under Windows. 4800 ! baud is the NMEA standard, but a different speed can be ! given: "tty://dev/ttyS0:19200". (Note that using direct ! tty access prevents one from running both RoadMap and ! RoadGps at the same time, since there is no mechanism in ! place to allow sharing the serial port. Using gpsd is ! recommended.) ! ! [GPS.Baud] The baud rate to use if GPS.Source is a serial port ! ! <<Format:>> integer ! ! <<Default:>> 4800 [GPS.Color] The color used for the current GPS position symbol. *************** *** 2415,2426 **** [Accuracy.GPS Position] The GPS's estimated position error (worst case) ! <<Format:>> integer ! <<Default:>> 300 ! <<Comment:>> the unit depends on the selected unit system (feet or ! meter). The default shown being tuned for feet. This default ! accuracy can be adjusted to the actual GPS estimate if a ! Garmin GPS receiver is used. [Accuracy.GPS Speed] GPS's speed accuracy. --- 2615,2624 ---- [Accuracy.GPS Position] The GPS's estimated position error (worst case) ! <<Format:>> distance ! <<Default:>> 30m ! <<Comment:>> This default accuracy can be adjusted to the actual GPS ! estimate if a Garmin GPS receiver is used. [Accuracy.GPS Speed] GPS's speed accuracy. *************** *** 2436,2440 **** <<Default:>> 5 ! [Accuracy.Mouse] The size of the street selection search area. <<Format:>> number of pixels --- 2634,2638 ---- <<Default:>> 5 ! [Accuracy.Mouse] The size of the street or place selection search area. <<Format:>> number of pixels *************** *** 2618,2622 **** <<Format:>> string ! <<Default:>> Map Menu (*) NOTE: the default position values match 1 Market St, San Francisco, CA. --- 2816,2826 ---- <<Format:>> string ! <<Default:>> Right Click Popup ! ! [Events.Long Click] The name of the menu to open on a mouse long click. ! ! <<Format:>> string ! ! <<Default:>> Long Click Popup (*) NOTE: the default position values match 1 Market St, San Francisco, CA. |
|
From: Paul F. <pg...@us...> - 2006-11-15 19:48:12
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12336 Modified Files: roadmap_factory.c Log Message: new config option to suppress tooltips. tooltips don't necessarily work well on touchscreens -- "hovering" has no meaning. Index: roadmap_factory.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** roadmap_factory.c 15 Nov 2006 02:49:29 -0000 1.27 --- roadmap_factory.c 15 Nov 2006 19:47:59 -0000 1.28 *************** *** 52,55 **** --- 52,58 ---- ROADMAP_CONFIG_ITEM("General", "Icons"); + static RoadMapConfigDescriptor RoadMapConfigGeneralTooltips = + ROADMAP_CONFIG_ITEM("General", "Tooltips"); + const char RoadMapFactorySeparator[] = "--separator--"; *************** *** 525,529 **** void roadmap_factory_config_menu ! (const char **item, RoadMapAction *actions, int doing_menus) { RoadMapMenu gui_menu = NULL; --- 528,533 ---- void roadmap_factory_config_menu ! (const char **item, RoadMapAction *actions, ! int doing_menus, int use_tips) { RoadMapMenu gui_menu = NULL; *************** *** 547,556 **** gui_menu = roadmap_main_new_menu (title); ! /* all menus are available as popups */ ! roadmap_factory_add_popup (gui_menu, title); ! /* but only non-popups go into the menubar */ if (doing_menus && is_menu) ! roadmap_main_add_menu (gui_menu, title); --- 551,560 ---- gui_menu = roadmap_main_new_menu (title); ! /* all menus are available as popups */ ! roadmap_factory_add_popup (gui_menu, title); ! /* but only non-popups go into the menubar */ if (doing_menus && is_menu) ! roadmap_main_add_menu (gui_menu, title); *************** *** 576,580 **** roadmap_main_add_menu_item (gui_menu, this_action->label_long, ! this_action->tip, this_action->callback); } else { --- 580,584 ---- roadmap_main_add_menu_item (gui_menu, this_action->label_long, ! use_tips ? this_action->tip : NULL, this_action->callback); } else { *************** *** 587,591 **** void roadmap_factory_config_toolbar ! (const char **item, RoadMapAction *actions, int use_icons) { roadmap_main_add_toolbar --- 591,596 ---- void roadmap_factory_config_toolbar ! (const char **item, RoadMapAction *actions, ! int use_icons, int use_tips) { roadmap_main_add_toolbar *************** *** 610,615 **** if (this_action != NULL) { roadmap_main_add_tool (roadmap_factory_terse(this_action), ! (use_icons) ? this_action->name : NULL, ! this_action->tip, this_action->callback); } else { --- 615,620 ---- if (this_action != NULL) { roadmap_main_add_tool (roadmap_factory_terse(this_action), ! use_icons ? this_action->name : NULL, ! use_tips ? this_action->tip : NULL, this_action->callback); } else { *************** *** 626,633 **** const char *toolbar[]) { int use_toolbar; ! const char **userconfig; roadmap_config_declare_enumeration ("preferences", --- 631,647 ---- const char *toolbar[]) { + const char **userconfig; + int use_toolbar; + int use_tips; + int use_icons; ! use_toolbar = roadmap_config_match (&RoadMapConfigGeneralToolbar, "yes"); ! use_tips = roadmap_config_match (&RoadMapConfigGeneralTooltips, "yes"); ! use_icons = roadmap_config_match (&RoadMapConfigGeneralIcons, "yes"); + roadmap_config_declare_enumeration ("preferences", + &RoadMapConfigGeneralTooltips, + "yes", "no", NULL); roadmap_config_declare_enumeration ("preferences", *************** *** 647,673 **** * anyway, but only as popups, to make those menus available * to the user's config. */ ! roadmap_factory_config_menu(menu, actions, 0); ! roadmap_factory_config_menu(userconfig, actions, 1); } else { ! roadmap_factory_config_menu(menu, actions, 1); } userconfig = roadmap_factory_user_config (name, "popup", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 0); } - use_toolbar = roadmap_config_match (&RoadMapConfigGeneralToolbar, "yes"); if (use_toolbar) { - int use_icons; - use_icons = roadmap_config_match (&RoadMapConfigGeneralIcons, "yes"); userconfig = roadmap_factory_user_config (name, "toolbar", actions); if (userconfig != NULL) { ! roadmap_factory_config_toolbar(userconfig, actions, use_icons); } else { ! roadmap_factory_config_toolbar(toolbar, actions, use_icons); } } --- 661,686 ---- * anyway, but only as popups, to make those menus available * to the user's config. */ ! roadmap_factory_config_menu(menu, actions, 0, use_tips); ! roadmap_factory_config_menu(userconfig, actions, 1, use_tips); } else { ! roadmap_factory_config_menu(menu, actions, 1, use_tips); } userconfig = roadmap_factory_user_config (name, "popup", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 0, use_tips); } if (use_toolbar) { userconfig = roadmap_factory_user_config (name, "toolbar", actions); if (userconfig != NULL) { ! roadmap_factory_config_toolbar ! (userconfig, actions, use_icons, use_tips); } else { ! roadmap_factory_config_toolbar ! (toolbar, actions, use_icons, use_tips); } } |
|
From: Paul F. <pg...@us...> - 2006-11-15 02:49:32
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7278 Modified Files: roadmap_factory.c Log Message: make the builtin menus available, at least as popups, if the user has supplied menu config. Index: roadmap_factory.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roadmap_factory.c 14 Nov 2006 22:10:07 -0000 1.26 --- roadmap_factory.c 15 Nov 2006 02:49:29 -0000 1.27 *************** *** 644,647 **** --- 644,651 ---- userconfig = roadmap_factory_user_config (name, "menus", actions); if (userconfig != NULL) { + /* The user supplied config. Load the internal config + * anyway, but only as popups, to make those menus available + * to the user's config. */ + roadmap_factory_config_menu(menu, actions, 0); roadmap_factory_config_menu(userconfig, actions, 1); } else { |
|
From: Paul F. <pg...@us...> - 2006-11-15 02:39:43
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3891 Modified Files: roadmap_start.c Log Message: type: missing comma Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** roadmap_start.c 14 Nov 2006 22:15:41 -0000 1.113 --- roadmap_start.c 15 Nov 2006 02:39:39 -0000 1.114 *************** *** 657,661 **** ! ROADMAP_SUBMENU "Display modes..." "togglelabels", --- 657,661 ---- ! ROADMAP_SUBMENU "Display modes...", "togglelabels", *************** *** 734,740 **** "createroute", "setasdestination", ! "allroutetoggle", #if WGET_GOOGLE_ROUTE ! "getgoogleroute", #endif --- 734,740 ---- "createroute", "setasdestination", ! "allroutetoggle", #if WGET_GOOGLE_ROUTE ! "getgoogleroute", #endif *************** *** 742,746 **** "addaswaypoint", ! "gpsaswaypoint", "editroutepoints", "edittriplandmarks", --- 742,746 ---- "addaswaypoint", ! "gpsaswaypoint", "editroutepoints", "edittriplandmarks", |
|
From: Paul F. <pg...@us...> - 2006-11-14 22:15:44
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28201/src Modified Files: roadmap_start.c Log Message: rearrange menus. this reduces the number of top-level menus, and makes many menus shorter. small screens should benefit. Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** roadmap_start.c 13 Nov 2006 22:44:58 -0000 1.112 --- roadmap_start.c 14 Nov 2006 22:15:41 -0000 1.113 *************** *** 340,347 **** {"nonavigation", "Disable Navigation", "Nav Off", NULL, ! "Disable all navigation functions", roadmap_navigate_disable}, {"navigation", "Enable Navigation", "Nav On", NULL, ! "Enable all GPS-based navigation functions", roadmap_navigate_enable}, {"logtofile", "Log to File", "Log", NULL, --- 340,347 ---- {"nonavigation", "Disable Navigation", "Nav Off", NULL, ! "Disable all navigation feedback", roadmap_navigate_disable}, {"navigation", "Enable Navigation", "Nav On", NULL, ! "Enable navigation feedback", roadmap_navigate_enable}, {"logtofile", "Log to File", "Log", NULL, *************** *** 357,361 **** {"purgehistory", "Purge History", "Forget", NULL, ! "Remove all but the 10 most recent addresses", roadmap_start_purge}, {"quit", "Quit", NULL, NULL, --- 357,361 ---- {"purgehistory", "Purge History", "Forget", NULL, ! "Remove all but the 10 most recent searches", roadmap_start_purge}, {"quit", "Quit", NULL, NULL, *************** *** 417,421 **** roadmap_start_show_location}, ! {"mapdownload", "Map Download", "Download", NULL, "Enable/Disable the map download mode", roadmap_start_toggle_download}, --- 417,421 ---- roadmap_start_show_location}, ! {"mapdownload", "Toggle Map Download", "Download", NULL, "Enable/Disable the map download mode", roadmap_start_toggle_download}, *************** *** 439,443 **** "Save the current trip", roadmap_start_save_trip}, ! {"savescreenshot", "Make a screenshot of the map", "Screenshot", "Y", "Make a screenshot of the current map under the trip name", roadmap_trip_save_screenshot}, --- 439,443 ---- "Save the current trip", roadmap_start_save_trip}, ! {"savescreenshot", "Map Screenshot", "Screenshot", "Y", "Make a screenshot of the current map under the trip name", roadmap_trip_save_screenshot}, *************** *** 606,734 **** static const char *RoadMapStartMenu[] = { ROADMAP_MENU "File", ! "preferences", ! "gpsconsole", ! "savescreenshot", ! RoadMapFactorySeparator, ! "mutevoice", ! "enablevoice", ! "nonavigation", ! "navigation", ! RoadMapFactorySeparator, ! "logtofile", ! "nolog", ! "purgehistory", ! RoadMapFactorySeparator, ! "quit", ROADMAP_MENU "View", ! "zoomin", ! "zoomout", ! "zoom1", ! RoadMapFactorySeparator, ! "up", ! "left", ! "right", ! "down", ! "togglelabels", ! "toggleorientation", ! "toggleview", ! "increasehorizon", ! "decreasehorizon", ! "full", ! RoadMapFactorySeparator, ! "clockwise", ! "counterclockwise", ! RoadMapFactorySeparator, ! "hold", ! ROADMAP_MENU "Find", - "address", - "intersection", - "position", ! RoadMapFactorySeparator, ! "startpoint", ! "destination", ! "departure", ! "gps", ! RoadMapFactorySeparator, ! "mapdownload", ! "mapdiskspace", ! "deletemaps", ROADMAP_MENU "Trip", ! "newtrip", ! "opentrip", ! "mergetrip", ! "savetrip", ! "savetripas", ! ROADMAP_MENU "Routes", ! "manageroutes", ! "listdeletedroutes", ! "starttrip", ! "stoptrip", ! "resumeroute", ! "reverseroute", ! "simplifyroute", ! "tracktoroute", ! "createroute", ! "setasdestination", ! "allroutetoggle", #if WGET_GOOGLE_ROUTE ! "getgoogleroute", #endif ! ROADMAP_MENU "Places", ! "addaswaypoint", ! "gpsaswaypoint", ! "addroutepointnear", ! "editroutepoints", ! "edittriplandmarks", ! "editpersonallandmarks", ! "listdeletedplaces", ! "mergepersonallandmarks", ! RoadMapFactorySeparator, ! "tracksave", ! "trackreset", ! "backtrackroute", ! "addtrack", ! "tracktoggle", ROADMAP_MENU "Help", ! RoadMapFactoryHelpTopics, ! RoadMapFactorySeparator, ! "about", NULL --- 606,796 ---- static const char *RoadMapStartMenu[] = { + /* The "Menus..." popup isn't normally used, but can be useful + * for binding to a mouse click or toolbar button, particularly + * if the menubar has been suppressed. + */ + ROADMAP_SUBMENU "Menus...", + + ROADMAP_INVOKE_SUBMENU "File", + ROADMAP_INVOKE_SUBMENU "View", + ROADMAP_INVOKE_SUBMENU "Find", + ROADMAP_INVOKE_SUBMENU "Trip", + ROADMAP_INVOKE_SUBMENU "Help", + + ROADMAP_SUBMENU "Announcements...", + "mutevoice", + "enablevoice", + + RoadMapFactorySeparator, + + "nonavigation", + "navigation", + + RoadMapFactorySeparator, + + "logtofile", + "nolog", + + ROADMAP_SUBMENU "Map Download...", + + "mapdownload", + "mapdiskspace", + "deletemaps", + ROADMAP_MENU "File", ! "preferences", ! "gpsconsole", ! "savescreenshot", ! RoadMapFactorySeparator, ! ROADMAP_INVOKE_SUBMENU "Announcements...", ! RoadMapFactorySeparator, ! ROADMAP_INVOKE_SUBMENU "Map Download...", ! RoadMapFactorySeparator, ! "quit", + ROADMAP_SUBMENU "Display modes..." + + "togglelabels", + "toggleorientation", + "toggleview", + "increasehorizon", + "decreasehorizon", + "full", + ROADMAP_MENU "View", ! "zoomin", ! "zoomout", ! "zoom1", ! RoadMapFactorySeparator, ! "up", ! "left", ! "right", ! "down", ! RoadMapFactorySeparator, ! "clockwise", ! "counterclockwise", ! RoadMapFactorySeparator, ! ROADMAP_INVOKE_SUBMENU "Display modes...", + RoadMapFactorySeparator, ! "hold", ! ROADMAP_MENU "Find", ! "address", ! "intersection", ! "position", ! "purgehistory", ! RoadMapFactorySeparator, ! "startpoint", ! "destination", ! "departure", ! "gps", ROADMAP_MENU "Trip", ! "newtrip", ! "opentrip", ! "mergetrip", ! "savetrip", ! "savetripas", ! RoadMapFactorySeparator, ! ROADMAP_INVOKE_SUBMENU "Routes...", ! ROADMAP_INVOKE_SUBMENU "Places...", ! ROADMAP_INVOKE_SUBMENU "Edit Place...", ! ROADMAP_INVOKE_SUBMENU "Tracks...", ! ! ROADMAP_SUBMENU "Routes...", ! ! "manageroutes", ! "listdeletedroutes", ! "starttrip", ! "stoptrip", ! "resumeroute", ! "reverseroute", ! "simplifyroute", ! "createroute", ! "setasdestination", ! "allroutetoggle", #if WGET_GOOGLE_ROUTE ! "getgoogleroute", #endif ! ROADMAP_SUBMENU "Places...", ! "addaswaypoint", ! "gpsaswaypoint", ! "editroutepoints", ! "edittriplandmarks", ! "editpersonallandmarks", ! "listdeletedplaces", ! "mergepersonallandmarks", ! ROADMAP_SUBMENU "Tracks...", ! "tracktoroute", ! ! RoadMapFactorySeparator, ! ! "tracktoggle", ! ! RoadMapFactorySeparator, ! "backtrackroute", ! "addtrack", ! "tracksave", ! "trackreset", ! ! ROADMAP_SUBMENU "Edit Places...", ! ! "lastplacedelete", ! "lastplaceedit", ! "lastplacemove", ! ! RoadMapFactorySeparator, ! ! "addroutepointnear", ! "addroutepointstart", ! "addroutepointend", ! ! RoadMapFactorySeparator, ! ! "addpersonallandmark", ! "addtriplandmark", ! ! RoadMapFactorySeparator, ! ! "routepointahead", ! "routepointback", ROADMAP_MENU "Help", ! RoadMapFactoryHelpTopics, ! RoadMapFactorySeparator, ! "about", NULL |
|
From: Paul F. <pg...@us...> - 2006-11-14 22:10:12
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25658/src Modified Files: roadmap_factory.c Log Message: popup menus can now be bound to toolbar buttons, and it's now possible to suppress the builtin menubar by supplying an empty roadmap.menus file. Index: roadmap_factory.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** roadmap_factory.c 13 Nov 2006 22:22:45 -0000 1.25 --- roadmap_factory.c 14 Nov 2006 22:10:07 -0000 1.26 *************** *** 59,70 **** RoadMapCallback action; ! const char *title; } RoadMapFactoryMenuPopup; - /* note relationship to number of action functions declared below */ - #define MAX_MENUPOPUPS 20 - int RoadMapFactoryMenuPopupCount; - void roadmap_factory_menu_popup_n(int n); --- 59,66 ---- RoadMapCallback action; ! char *title; } RoadMapFactoryMenuPopup; void roadmap_factory_menu_popup_n(int n); *************** *** 89,94 **** void roadmap_factory_menu_popup_18(void) { roadmap_factory_menu_popup_n(18); }; void roadmap_factory_menu_popup_19(void) { roadmap_factory_menu_popup_n(19); }; ! RoadMapFactoryMenuPopup RoadMapFactoryMenuPopups[MAX_MENUPOPUPS] = { { roadmap_factory_menu_popup_00, NULL }, { roadmap_factory_menu_popup_01, NULL }, --- 85,100 ---- void roadmap_factory_menu_popup_18(void) { roadmap_factory_menu_popup_n(18); }; void roadmap_factory_menu_popup_19(void) { roadmap_factory_menu_popup_n(19); }; + void roadmap_factory_menu_popup_20(void) { roadmap_factory_menu_popup_n(20); }; + void roadmap_factory_menu_popup_21(void) { roadmap_factory_menu_popup_n(21); }; + void roadmap_factory_menu_popup_22(void) { roadmap_factory_menu_popup_n(22); }; + void roadmap_factory_menu_popup_23(void) { roadmap_factory_menu_popup_n(23); }; + void roadmap_factory_menu_popup_24(void) { roadmap_factory_menu_popup_n(24); }; + void roadmap_factory_menu_popup_25(void) { roadmap_factory_menu_popup_n(25); }; + void roadmap_factory_menu_popup_26(void) { roadmap_factory_menu_popup_n(26); }; + void roadmap_factory_menu_popup_27(void) { roadmap_factory_menu_popup_n(27); }; + void roadmap_factory_menu_popup_28(void) { roadmap_factory_menu_popup_n(28); }; + void roadmap_factory_menu_popup_29(void) { roadmap_factory_menu_popup_n(29); }; ! RoadMapFactoryMenuPopup RoadMapFactoryMenuPopups[] = { { roadmap_factory_menu_popup_00, NULL }, { roadmap_factory_menu_popup_01, NULL }, *************** *** 111,116 **** --- 117,138 ---- { roadmap_factory_menu_popup_18, NULL }, { roadmap_factory_menu_popup_19, NULL }, + { roadmap_factory_menu_popup_20, NULL }, + { roadmap_factory_menu_popup_21, NULL }, + { roadmap_factory_menu_popup_22, NULL }, + { roadmap_factory_menu_popup_23, NULL }, + { roadmap_factory_menu_popup_24, NULL }, + { roadmap_factory_menu_popup_25, NULL }, + { roadmap_factory_menu_popup_26, NULL }, + { roadmap_factory_menu_popup_27, NULL }, + { roadmap_factory_menu_popup_28, NULL }, + { roadmap_factory_menu_popup_29, NULL }, }; + #define MAX_MENUPOPUPS \ + ( sizeof(RoadMapFactoryMenuPopups) / sizeof(*RoadMapFactoryMenuPopups) ) + + int RoadMapFactoryMenuPopupCount; + + void roadmap_factory_menu_popup_n(int n) { *************** *** 233,239 **** buffer[sizeof(buffer)-1] = 0; ! /* remove the end-of-line character. */ ! p = strchr (buffer, '\n'); ! if (p != NULL) *p = 0; /* Remove any leading space. */ --- 255,262 ---- buffer[sizeof(buffer)-1] = 0; ! /* remove the end-of-line character, and trailing whitespace */ ! p = buffer + strlen(buffer); ! while (p-- > buffer && isspace(*p)) ! *p = '\0'; /* Remove any leading space. */ *************** *** 269,273 **** fclose(file); ! if (count <= 0) return NULL; loaded[count] = NULL; --- 292,298 ---- fclose(file); ! /* okay to return with count == 0 -- this allows user to override ! * builtin configs with empty files ! */ loaded[count] = NULL; *************** *** 340,346 **** buffer[sizeof(buffer)-1] = 0; ! /* remove the end-of-line character. */ ! p = strchr (buffer, '\n'); ! if (p != NULL) *p = 0; /* Remove any leading space. */ --- 365,372 ---- buffer[sizeof(buffer)-1] = 0; ! /* remove the end-of-line character, and trailing whitespace */ ! p = buffer + strlen(buffer); ! while (p-- > buffer && isspace(*p)) ! *p = '\0'; /* Remove any leading space. */ *************** *** 448,458 **** } void roadmap_factory_config_menu ! (const char **item, RoadMapAction *actions, int doing_popups) { RoadMapMenu gui_menu = NULL; ! int menuprefix = strlen(ROADMAP_MENU); ! int submenuprefix = strlen(ROADMAP_SUBMENU); ! int invokemenuprefix = strlen(ROADMAP_INVOKE_SUBMENU); const char *title; --- 474,533 ---- } + static RoadMapAction * roadmap_factory_menu_dummy_action + (const char *title) { + int i; + static char tip[128]; + static RoadMapAction this_action; + + /* See if we've already allocated an action routine for + * this popup. + */ + for (i = 0; i < RoadMapFactoryMenuPopupCount; i++) { + if ( strcmp (RoadMapFactoryMenuPopups[i].title, title) == 0 ) + break; + } + + if (i == MAX_MENUPOPUPS) { /* Not found, and no room for more */ + + roadmap_log (ROADMAP_ERROR, + "No more room for menu '%s' (%d submenus max)", + title, MAX_MENUPOPUPS ); + return NULL; + + } + + if (i == RoadMapFactoryMenuPopupCount) { + RoadMapFactoryMenuPopups + [RoadMapFactoryMenuPopupCount++].title = strdup(title); + } + + snprintf(tip, sizeof(tip), + "Submenu for %s", RoadMapFactoryMenuPopups[i].title); + + this_action.label_long = RoadMapFactoryMenuPopups[i].title; + this_action.tip = (const char *)tip; + this_action.callback = RoadMapFactoryMenuPopups[i].action; + + return &this_action; + } + + static RoadMapAction *roadmap_factory_find_action_or_menu + (RoadMapAction *actions, const char *item) { + + if (strncmp (item, ROADMAP_INVOKE_SUBMENU, + sizeof(ROADMAP_INVOKE_SUBMENU)-1) == 0) { + return roadmap_factory_menu_dummy_action + (item + sizeof(ROADMAP_INVOKE_SUBMENU)-1); + } + + return roadmap_factory_find_action (actions, item); + } + void roadmap_factory_config_menu ! (const char **item, RoadMapAction *actions, int doing_menus) { RoadMapMenu gui_menu = NULL; ! int menuprefix = sizeof(ROADMAP_MENU)-1; ! int submenuprefix = sizeof(ROADMAP_SUBMENU)-1; const char *title; *************** *** 461,484 **** if (strncmp (*item, ROADMAP_MENU, menuprefix) == 0) { ! int is_popup = 0; - /* If processing a popups file, either menu prefix token - * gives a popup. In a menu file, the difference in - * tokens is significant - */ if (strncmp (*item, ROADMAP_SUBMENU, submenuprefix) == 0) { title = *item + submenuprefix; - is_popup = 1; } else { title = *item + menuprefix; } gui_menu = roadmap_main_new_menu (title); ! if (is_popup || doing_popups) { ! roadmap_factory_add_popup (gui_menu, title); ! } else { ! roadmap_main_add_menu (gui_menu, title); ! } --- 536,556 ---- if (strncmp (*item, ROADMAP_MENU, menuprefix) == 0) { ! int is_menu = 0; if (strncmp (*item, ROADMAP_SUBMENU, submenuprefix) == 0) { title = *item + submenuprefix; } else { title = *item + menuprefix; + is_menu = 1; } gui_menu = roadmap_main_new_menu (title); ! /* all menus are available as popups */ ! roadmap_factory_add_popup (gui_menu, title); ! ! /* but only non-popups go into the menubar */ ! if (doing_menus && is_menu) ! roadmap_main_add_menu (gui_menu, title); *************** *** 487,528 **** continue; - } else if (strncmp (*item, ROADMAP_INVOKE_SUBMENU, invokemenuprefix) == 0) { - - int i; - char tip[128]; - - title = *item + invokemenuprefix; - - /* See if we've already allocated an action routine for - * this popup. - */ - for (i = 0; i < RoadMapFactoryMenuPopupCount; i++) { - if ( strcmp (RoadMapFactoryMenuPopups[i].title, title) == 0 ) - break; - } - - if (i == MAX_MENUPOPUPS) { /* Not found, and no room for more */ - - roadmap_log (ROADMAP_ERROR, - "No more room for menu '%s' (%d submenus max)", - title, MAX_MENUPOPUPS ); - continue; - - } - - if (i == RoadMapFactoryMenuPopupCount) { - RoadMapFactoryMenuPopups - [RoadMapFactoryMenuPopupCount++].title = strdup(title); - } - - snprintf(tip, sizeof(tip), - "Submenu for %s", RoadMapFactoryMenuPopups[i].title); - - roadmap_main_add_menu_item - (gui_menu, - RoadMapFactoryMenuPopups[i].title, - strdup(tip), RoadMapFactoryMenuPopups[i].action); - - } else if (*item == RoadMapFactorySeparator) { --- 559,562 ---- *************** *** 537,541 **** const RoadMapAction *this_action; ! this_action = roadmap_factory_find_action (actions, *item); if (this_action != NULL) { roadmap_main_add_menu_item (gui_menu, --- 571,576 ---- const RoadMapAction *this_action; ! this_action = roadmap_factory_find_action_or_menu (actions, *item); ! if (this_action != NULL) { roadmap_main_add_menu_item (gui_menu, *************** *** 554,559 **** (const char **item, RoadMapAction *actions, int use_icons) { - int prefix = strlen(ROADMAP_MENU); - roadmap_main_add_toolbar (roadmap_config_get (&RoadMapConfigGeneralToolbarOrientation)); --- 589,592 ---- *************** *** 565,573 **** roadmap_main_add_tool_space (); ! } else if (strncmp (*item, ROADMAP_MENU, prefix) != 0) { const RoadMapAction *this_action; ! this_action = roadmap_factory_find_action (actions, *item); if (this_action != NULL) { --- 598,610 ---- roadmap_main_add_tool_space (); ! } else if (strncmp (*item, ROADMAP_MENU, sizeof(ROADMAP_MENU)-1) == 0) { ! ! continue; ! ! } else { const RoadMapAction *this_action; ! this_action = roadmap_factory_find_action_or_menu (actions, *item); if (this_action != NULL) { *************** *** 607,618 **** userconfig = roadmap_factory_user_config (name, "menus", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 0); } else { ! roadmap_factory_config_menu(menu, actions, 0); } userconfig = roadmap_factory_user_config (name, "popup", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 1); } --- 644,655 ---- userconfig = roadmap_factory_user_config (name, "menus", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 1); } else { ! roadmap_factory_config_menu(menu, actions, 1); } userconfig = roadmap_factory_user_config (name, "popup", actions); if (userconfig != NULL) { ! roadmap_factory_config_menu(userconfig, actions, 0); } *************** *** 681,684 **** --- 718,722 ---- p = separator + strlen(ROADMAP_MAPPED_TO); while (*p <= ' ') ++p; + this_action = roadmap_factory_find_action (actions, p); |
|
From: Paul F. <pg...@us...> - 2006-11-14 22:10:12
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25658 Modified Files: README Log Message: popup menus can now be bound to toolbar buttons, and it's now possible to suppress the builtin menubar by supplying an empty roadmap.menus file. Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** README 11 Nov 2006 18:35:30 -0000 1.105 --- README 14 Nov 2006 22:10:07 -0000 1.106 *************** *** 421,425 **** Note: the main GTK RoadMap executables (roadmap and roadgps) are built as "gtkroadmap" and "gtkroadgps", while the QT equivalent are ! built as "qtroadmap" and qtroadgps" to avoid a clash. These executables are installed under their "standard" names using symbolic links, so that only one version can be installed at a time (the reason is to --- 421,425 ---- Note: the main GTK RoadMap executables (roadmap and roadgps) are built as "gtkroadmap" and "gtkroadgps", while the QT equivalent are ! built as "qtroadmap" and "qtroadgps" to avoid a clash. These executables are installed under their "standard" names using symbolic links, so that only one version can be installed at a time (the reason is to *************** *** 854,858 **** [--location=<LONGITUDE,LATITUDE>] Set the location point (see menu entry ! View/Show Location..). This option is sticky (preference item Locations.Location=<LONGITUDE,LATITUDE>). --- 854,858 ---- [--location=<LONGITUDE,LATITUDE>] Set the location point (see menu entry ! "Show Location.."). This option is sticky (preference item Locations.Location=<LONGITUDE,LATITUDE>). *************** *** 1126,1133 **** The map download is available in a special RoadMap mode, which can be ! activated and deactivated using the Find / Map Download menu entry. On ! startup the download mode is always deactivated. RoadMap shows a red ! "download" icone on the right top corner of the map screen to indicate ! that the download mode has been activated. In the download mode, if a map is not found by the display engine, the --- 1126,1133 ---- The map download is available in a special RoadMap mode, which can be ! activated and deactivated using the Map Download menu entry. On startup ! the download mode is always deactivated. RoadMap shows a red "download" ! icon in the right top corner of the map screen to indicate that the ! download mode has been activated. In the download mode, if a map is not found by the display engine, the *************** *** 1165,1173 **** RoadMap also provides a dialog for deleting maps, activated through the ! Find / Delete Maps.. menu entry. The dialog shows the number of map files stored locally, the total size of the local maps and the list of maps currently visible on the RoadMap screen. The proper way for selecting ! maps to delete is to view an area you do not need anymore, hit the Find / ! Delete Maps.. entry, then select a specific county and hit the Delete button. The county will immediately disappear from the map screen and the dialog gets updated (i.e. the map statistics and the map list will --- 1165,1173 ---- RoadMap also provides a dialog for deleting maps, activated through the ! "Delete Maps.." menu entry. The dialog shows the number of map files stored locally, the total size of the local maps and the list of maps currently visible on the RoadMap screen. The proper way for selecting ! maps to delete is to view an area you do not need anymore, hit the ! "Delete Maps.." entry, then select a specific county and hit the Delete button. The county will immediately disappear from the map screen and the dialog gets updated (i.e. the map statistics and the map list will *************** *** 1228,1234 **** - by clicking on a location on the map, - by entering a valid USPS address (street number, name, city and state ! names) in the dialog launched by the "View / Show Location.." menu entry, - by specifying the intersection of two streets in the dialog launched ! by the "View / Show intersection.." menu entry. More details are provided in the following sections. --- 1228,1234 ---- - by clicking on a location on the map, - by entering a valid USPS address (street number, name, city and state ! names) in the dialog launched by the "Show Location.." menu entry, - by specifying the intersection of two streets in the dialog launched ! by the "Show intersection.." menu entry. More details are provided in the following sections. *************** *** 1330,1334 **** * SELECTING AN INTERSECTION ! The "Find / Intersection.." menu entry activates a dialog that asks for two street names and a state name. RoadMap will search within the given state for all intersections between streets that match the street names --- 1330,1334 ---- * SELECTING AN INTERSECTION ! The "Intersection.." menu entry activates a dialog that asks for two street names and a state name. RoadMap will search within the given state for all intersections between streets that match the street names *************** *** 1344,1348 **** * SELECTING A POSITION ! The "Find / Position.." menu entry activates a dialog that asks for a longitude / latitude position. The format for the longitude and latitude must conform to the ISO 6709-1983 standard (with some extensions). --- 1344,1348 ---- * SELECTING A POSITION ! The "Position.." menu entry activates a dialog that asks for a longitude / latitude position. The format for the longitude and latitude must conform to the ISO 6709-1983 standard (with some extensions). *************** *** 1983,1989 **** with the '#' character are treated as comments. ! There are two sorts of menus: the menus accessed through the menu bar ! and the popup menus. The popup menus will be trigerred by events, as ! specified in the preferences' "Events" section. The menus, popup and toolbar configuration files for roadmap are named --- 1983,1992 ---- with the '#' character are treated as comments. ! There are two sorts of menus. All menus are available as popup menus, ! which are invoked either in response to an event (as specified in the ! preferences "Events" section), or by being invoked from a menu entry or ! toolbar button. In addition, menus that are specified as menubar menus ! will appear in the menu bar. Invoking a popup menu from another menu is ! how submenus are implemented in RoadMap. The menus, popup and toolbar configuration files for roadmap are named *************** *** 2034,2038 **** --- 2037,2052 ---- zoomout zoom1 + ->Help... ---- + The last item in the toolbar file example will invoke the "Help..." menu. + + It's actually possible to configure RoadMap with no on-screen buttons or + menus at all. By creating an empty "roadmap.menus" file, the internal + menubar menus will be suppressed. Then, configure the Long or Right Click + action to invoke the "Menus..." menu. This special popup contains the same + list of menus that would normally appear in the menubar. This allows full + access to RoadMap commands, all via the mouse. More practically, one might + wish to bind the "->Menus..." popup menu to a toolbar button -- then + RoadMap could run with a toolbar, but no menubar. It is also possible to rename the RoadMap actions, with the effect of |
|
From: Paul F. <pg...@us...> - 2006-11-14 22:06:39
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22691 Modified Files: roadmap_screen.c Log Message: hide the "No map available" sign as soon as we can. Index: roadmap_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** roadmap_screen.c 14 Nov 2006 13:55:11 -0000 1.78 --- roadmap_screen.c 14 Nov 2006 22:05:27 -0000 1.79 *************** *** 958,961 **** --- 958,962 ---- int count; int max_pen = roadmap_layer_max_pen(); + static int nomap; *************** *** 992,995 **** --- 993,1000 ---- roadmap_display_text("Info", "No map available: " FLT_FMT ", " FLT_FMT, to_float(pos.longitude), to_float(pos.latitude)); + nomap = 1; + } else if (nomap) { + roadmap_display_hide("Info"); + nomap = 0; } |
