roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src roadmap_screen.c,1.56,1.57

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160

Modified Files:
	roadmap_screen.c 
Log Message:
Zoom on mouse scroll events

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** roadmap_screen.c	19 Nov 2005 21:01:55 -0000	1.56
--- roadmap_screen.c	20 Nov 2005 00:10:10 -0000	1.57
***************
*** 578,581 ****
--- 578,583 ----
        pen = roadmap_layer_get_pen (roadmap_polygon_category (i), 0);
  
+       if (pen == NULL) continue;
+ 
        if (RoadMapScreenLastPen != pen) {
           roadmap_screen_flush_polygons ();
***************
*** 717,720 ****
--- 719,725 ----
     layer_pen = roadmap_layer_get_pen (layer, pen_index);
  
+    if (layer_pen == NULL) return;
+ 
+ 
     /* Draw each line that belongs to this square. */
  
***************
*** 1128,1131 ****
--- 1133,1146 ----
  
  
+ static void roadmap_screen_scroll_up (RoadMapGuiPoint *point) {
+    roadmap_screen_zoom_in ();
+ }
+ 
+ 
+ static void roadmap_screen_scroll_down (RoadMapGuiPoint *point) {
+    roadmap_screen_zoom_out ();
+ }
+ 
+ 
  void roadmap_screen_refresh (void) {
  
***************
*** 1310,1313 ****
--- 1325,1330 ----
  
     roadmap_pointer_register_right_click (&roadmap_screen_right_click);
+    roadmap_pointer_register_scroll_up (&roadmap_screen_scroll_up);
+    roadmap_pointer_register_scroll_down (&roadmap_screen_scroll_down);
  
     roadmap_canvas_register_configure_handler (&roadmap_screen_configure);

[Roadmap-commit] roadmap/src/win32 roadmap_canvas.c,1.4,1.5

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9627

Modified Files:
	roadmap_canvas.c 
Log Message:
Zoom on mouse scroll events

Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_canvas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_canvas.c	18 Nov 2005 20:24:08 -0000	1.4
--- roadmap_canvas.c	20 Nov 2005 00:09:25 -0000	1.5
***************
*** 61,64 ****
--- 61,66 ----
  static RoadMapCanvasMouseHandler RoadMapCanvasMouseMove =
  	roadmap_canvas_ignore_button;
+ static RoadMapCanvasMouseHandler RoadMapCanvasMouseScroll =
+ 	roadmap_canvas_ignore_button;
  
  static void roadmap_canvas_ignore_configure (void) {}
***************
*** 403,406 ****
--- 405,422 ----
  
  
+ void roadmap_canvas_mouse_scroll(int direction, POINT *data)
+ {
+ 	RoadMapGuiPoint point;
+ 	
+ 	point.x = (short)data->x;
+ 	point.y = (short)data->y;
+ 	
+    direction = (direction > 0) ? 1 : ((direction < 0) ? -1 : 0);
+ 
+ 	(*RoadMapCanvasMouseScroll) (direction, &point);
+ 	
+ }
+ 
+ 
  void roadmap_canvas_register_button_pressed_handler (
  				RoadMapCanvasMouseHandler handler)
***************
*** 424,427 ****
--- 440,450 ----
  
  
+ void roadmap_canvas_register_mouse_scroll_handler
+                     (RoadMapCanvasMouseHandler handler) {
+ 
+    RoadMapCanvasMouseScroll = handler;
+ }
+ 
+ 
  int roadmap_canvas_width (void)
  {

[Roadmap-commit] roadmap/src/win32 roadmap_main.cpp,1.8,1.9

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9480

Modified Files:
	roadmap_main.cpp 
Log Message:
Zoom on mouse scroll events

Index: roadmap_main.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_main.cpp	18 Nov 2005 20:27:13 -0000	1.8
--- roadmap_main.cpp	20 Nov 2005 00:08:35 -0000	1.9
***************
*** 419,422 ****
--- 419,434 ----
  		break;
  				
+ 	case WM_MOUSEWHEEL:
+ 		{
+ 			POINT point;
+ 			point.x = LOWORD(lParam);
+ 			point.y = HIWORD(lParam);
+ 			if (RoadMapMainToolbar != NULL) {
+ 				point.y -= 26;
+ 			}
+ 			roadmap_canvas_mouse_scroll(HIWORD(lParam), &point);
+ 		}
+ 		break;
+ 				
  	case WM_KEYDOWN:
  		if (roadmap_main_vkey_pressed(hWnd, wParam, lParam)) return 0;

[Roadmap-commit] roadmap/src/win32 roadmap_wincecanvas.h,1.3,1.4

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9397

Modified Files:
	roadmap_wincecanvas.h 
Log Message:
Zoom on mouse scroll events

Index: roadmap_wincecanvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_wincecanvas.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_wincecanvas.h	18 Nov 2005 20:27:29 -0000	1.3
--- roadmap_wincecanvas.h	20 Nov 2005 00:07:58 -0000	1.4
***************
*** 38,41 ****
--- 38,42 ----
  void roadmap_canvas_button_released(int button, POINT *data);
  void roadmap_canvas_mouse_move(POINT *data);
+ void roadmap_canvas_mouse_scroll(int direction, POINT *data);
  
  #endif // INCLUDE__ROADMAP_WINCE_CANVAS__H

[Roadmap-commit] roadmap/src/qt qt_canvas.cc,1.6,1.7

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9270

Modified Files:
	qt_canvas.cc 
Log Message:
Zoom on mouse scroll events

Index: qt_canvas.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_canvas.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** qt_canvas.cc	18 Nov 2005 20:19:00 -0000	1.6
--- qt_canvas.cc	20 Nov 2005 00:07:32 -0000	1.7
***************
*** 35,38 ****
--- 35,39 ----
  RoadMapCanvasMouseHandler rhandler = 0;
  RoadMapCanvasMouseHandler mhandler = 0;
+ RoadMapCanvasMouseHandler whandler = 0;
  RoadMapCanvasConfigureHandler chandler = 0;
  
***************
*** 48,51 ****
--- 49,53 ----
     registerButtonReleasedHandler(rhandler);
     registerMouseMoveHandler(mhandler);
+    registerMouseWheelHandler(whandler);
  
  	registerConfigureHandler(chandler);
***************
*** 265,268 ****
--- 267,274 ----
  }
  
+ void RMapCanvas::registerMouseWheelHandler(RoadMapCanvasMouseHandler handler) {
+   mouseWheelHandler = handler;
+ }
+ 
  
  void RMapCanvas::registerConfigureHandler(RoadMapCanvasConfigureHandler handler) {
***************
*** 321,324 ****
--- 327,331 ----
  
  void RMapCanvas::mouseMoveEvent(QMouseEvent* ev) {
+ 
     RoadMapGuiPoint pt;
  
***************
*** 331,334 ****
--- 338,358 ----
  }
  
+ void RMapCanvas::wheelEvent (QWheelEvent* ev) {
+ 
+    int direction;
+ 
+    RoadMapGuiPoint pt;
+ 
+    pt.x = ev->x();
+    pt.y = ev->y();
+ 
+    direction = ev->delta();
+    direction = (direction > 0) ? 1 : ((direction < 0) ? -1 : 0);
+ 
+    if (mouseWheelHandler != 0) {
+       mouseWheelHandler(direction, &pt);
+    }
+ }
+ 
  void RMapCanvas::resizeEvent(QResizeEvent* ev) {
  	configure();

[Roadmap-commit] roadmap/src/qt qt_canvas.h,1.4,1.5

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9201

Modified Files:
	qt_canvas.h 
Log Message:
Zoom on mouse scroll events

Index: qt_canvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_canvas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** qt_canvas.h	4 Sep 2005 22:07:05 -0000	1.4
--- qt_canvas.h	20 Nov 2005 00:07:03 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
     void registerButtonReleasedHandler(RoadMapCanvasMouseHandler handler);
     void registerMouseMoveHandler(RoadMapCanvasMouseHandler handler);
+    void registerMouseWheelHandler(RoadMapCanvasMouseHandler handler);
  
  	void registerConfigureHandler(RoadMapCanvasConfigureHandler handler);
***************
*** 87,90 ****
--- 88,92 ----
     RoadMapCanvasMouseHandler buttonReleasedHandler;
     RoadMapCanvasMouseHandler mouseMoveHandler;
+    RoadMapCanvasMouseHandler mouseWheelHandler;
  
  
***************
*** 95,98 ****
--- 97,101 ----
     virtual void mouseReleaseEvent(QMouseEvent*);
     virtual void mouseMoveEvent(QMouseEvent*);
+    virtual void wheelEvent(QWheelEvent*);
  	virtual void resizeEvent(QResizeEvent*);
  	virtual void paintEvent(QPaintEvent*);
***************
*** 103,106 ****
--- 106,110 ----
  extern RoadMapCanvasMouseHandler rhandler;
  extern RoadMapCanvasMouseHandler mhandler;
+ extern RoadMapCanvasMouseHandler whandler;
  
  extern RoadMapCanvasConfigureHandler chandler;

[Roadmap-commit] roadmap/src/qt roadmap_canvas.cc,1.6,1.7

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9080

Modified Files:
	roadmap_canvas.cc 
Log Message:
Zoom on mouse scroll events

Index: roadmap_canvas.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_canvas.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_canvas.cc	4 Sep 2005 22:07:23 -0000	1.6
--- roadmap_canvas.cc	20 Nov 2005 00:06:26 -0000	1.7
***************
*** 62,65 ****
--- 62,76 ----
  }
  
+ void roadmap_canvas_register_mouse_scroll_handler
+                     (RoadMapCanvasMouseHandler handler) {
+ 
+    if (roadMapCanvas) {
+       roadMapCanvas->registerMouseWheelHandler(handler);
+    } else {
+       whandler = handler;
+ 	}
+ }
+ 
+ 
  void roadmap_canvas_register_configure_handler(
  	RoadMapCanvasConfigureHandler handler) {

[Roadmap-commit] roadmap/src/gtk roadmap_canvas.c,1.7,1.8

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22333

Modified Files:
	roadmap_canvas.c 
Log Message:
Zoom on mouse scroll events (dummy)

Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_canvas.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_canvas.c	18 Nov 2005 20:16:21 -0000	1.7
--- roadmap_canvas.c	19 Nov 2005 23:08:19 -0000	1.8
***************
*** 388,391 ****
--- 388,398 ----
  
  
+ void roadmap_canvas_register_mouse_scroll_handler
+                     (RoadMapCanvasMouseHandler handler) {
+ 
+    // TBD.
+ }
+ 
+ 
  int roadmap_canvas_width (void) {
  

[Roadmap-commit] roadmap/src/gtk2 roadmap_canvas.c,1.10,1.11

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22009

Modified Files:
	roadmap_canvas.c 
Log Message:
Zoom on mouse scroll events

Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_canvas.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** roadmap_canvas.c	18 Nov 2005 20:17:23 -0000	1.10
--- roadmap_canvas.c	19 Nov 2005 23:07:45 -0000	1.11
***************
*** 75,78 ****
--- 75,81 ----
                                       roadmap_canvas_ignore_mouse;
  
+ static RoadMapCanvasMouseHandler RoadMapCanvasMouseScroll =
+                                      roadmap_canvas_ignore_mouse;
+ 
  
  static void roadmap_canvas_ignore_configure (void) {}
***************
*** 400,403 ****
--- 403,428 ----
  
  
+ static gboolean roadmap_canvas_scroll_event
+                (GtkWidget *w, GdkEventScroll *event, gpointer data) {
+ 
+    int direction = 0;
+    RoadMapGuiPoint point;
+ 
+    point.x = event->x;
+    point.y = event->y;
+ 
+    switch (event->direction) {
+       case GDK_SCROLL_UP:    direction = 1;  break;
+       case GDK_SCROLL_DOWN:  direction = -1; break;
+       case GDK_SCROLL_LEFT:  direction = 2;  break;
+       case GDK_SCROLL_RIGHT: direction = -2; break;
+    }
+ 
+    (*RoadMapCanvasMouseScroll) (direction, &point);
+ 
+    return FALSE;
+ }
+ 
+ 
  void roadmap_canvas_register_button_pressed_handler
                      (RoadMapCanvasMouseHandler handler) {
***************
*** 421,424 ****
--- 446,456 ----
  
  
+ void roadmap_canvas_register_mouse_scroll_handler
+                     (RoadMapCanvasMouseHandler handler) {
+ 
+    RoadMapCanvasMouseScroll = handler;
+ }
+ 
+ 
  int roadmap_canvas_width (void) {
  
***************
*** 460,466 ****
     gtk_widget_set_double_buffered (RoadMapDrawingArea, FALSE);
  
!    gtk_widget_set_events
!       (RoadMapDrawingArea,
!        GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK);
  
  
--- 492,500 ----
     gtk_widget_set_double_buffered (RoadMapDrawingArea, FALSE);
  
!    gtk_widget_set_events (RoadMapDrawingArea,
!                           GDK_BUTTON_PRESS_MASK |
!                           GDK_BUTTON_RELEASE_MASK |
!                           GDK_POINTER_MOTION_MASK |
!                           GDK_SCROLL_MASK);
  
  
***************
*** 490,493 ****
--- 524,532 ----
                       (gpointer)3);
  
+    g_signal_connect (RoadMapDrawingArea,
+                      "scroll_event",
+                      (GCallback) roadmap_canvas_scroll_event,
+                      (gpointer)0);
+ 
     RoadMapGc = RoadMapDrawingArea->style->black_gc;
  

[Roadmap-commit] roadmap/src roadmap_screen.c,1.55,1.56

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28691

Modified Files:
	roadmap_screen.c 
Log Message:
Which popup menu to use must now be defined as a preference

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** roadmap_screen.c	19 Nov 2005 06:08:17 -0000	1.55
--- roadmap_screen.c	19 Nov 2005 21:01:55 -0000	1.56
***************
*** 78,81 ****
--- 78,84 ----
                          ROADMAP_CONFIG_ITEM("Map", "Refresh");
  
+ static RoadMapConfigDescriptor RoadMapConfigEventRightClick =
+                         ROADMAP_CONFIG_ITEM("Events", "Right Click");
+ 
  static RoadMapConfigDescriptor RoadMapConfigStylePrettyDrag =
                    ROADMAP_CONFIG_ITEM("Style", "Pretty Lines when Dragging");
***************
*** 1063,1071 ****
  static void roadmap_screen_right_click (RoadMapGuiPoint *point) {
  
!    RoadMapMenu popup = roadmap_factory_popup ("Map Menu");
! 
!    if (popup != NULL) {
!       roadmap_main_popup_menu (popup, point);
!    }
  }
  
--- 1066,1070 ----
  static void roadmap_screen_right_click (RoadMapGuiPoint *point) {
  
!    roadmap_factory_popup (&RoadMapConfigEventRightClick, point);
  }
  
***************
*** 1290,1293 ****
--- 1289,1295 ----
         ("preferences", &RoadMapConfigMapBackground, "LightYellow");
  
+    roadmap_config_declare
+        ("preferences", &RoadMapConfigEventRightClick,  "Map Menu");
+ 
     roadmap_config_declare_enumeration
         ("preferences", &RoadMapConfigMapSigns, "yes", "no", NULL);

[Roadmap-commit] roadmap/src roadmap_factory.c,1.18,1.19

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28637

Modified Files:
	roadmap_factory.c 
Log Message:
Which popup menu to use must now be defined as a preference

Index: roadmap_factory.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** roadmap_factory.c	18 Nov 2005 20:15:47 -0000	1.18
--- roadmap_factory.c	19 Nov 2005 21:01:42 -0000	1.19
***************
*** 609,624 ****
  
  
! RoadMapMenu roadmap_factory_popup (const char *title) {
  
     struct RoadMapFactoryPopup *popup;
  
     for (popup = RoadMapFactoryPopupList; popup != NULL; popup = popup->next) {
  
        if (strcmp (popup->title, title) == 0) {
!          return popup->menu;
        }
     }
- 
-    return NULL;
  }
  
--- 609,628 ----
  
  
! void roadmap_factory_popup (RoadMapConfigDescriptor *descriptor,
!                             const RoadMapGuiPoint *position) {
  
     struct RoadMapFactoryPopup *popup;
  
+    const char *title = roadmap_config_get (descriptor);
+ 
+    if (title == NULL || title[0] == 0) return; /* No menu attached. */
+ 
+ 
     for (popup = RoadMapFactoryPopupList; popup != NULL; popup = popup->next) {
  
        if (strcmp (popup->title, title) == 0) {
!          roadmap_main_popup_menu (popup->menu, position);
        }
     }
  }
  

[Roadmap-commit] roadmap/src roadmap_factory.h,1.9,1.10

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28598

Modified Files:
	roadmap_factory.h 
Log Message:
Which popup menu to use must now be defined as a preference

Index: roadmap_factory.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_factory.h	18 Nov 2005 20:13:22 -0000	1.9
--- roadmap_factory.h	19 Nov 2005 21:01:33 -0000	1.10
***************
*** 26,29 ****
--- 26,31 ----
  
  #include "roadmap_main.h"
+ #include "roadmap_gui.h"
+ #include "roadmap_config.h"
  
  
***************
*** 57,61 ****
                               const char    *shortcuts[]);
  
! RoadMapMenu roadmap_factory_popup (const char *title);
  
  void roadmap_factory_usage (const char *section, const RoadMapAction *action);
--- 59,64 ----
                               const char    *shortcuts[]);
  
! void roadmap_factory_popup (RoadMapConfigDescriptor *descriptor,
!                             const RoadMapGuiPoint *position);
  
  void roadmap_factory_usage (const char *section, const RoadMapAction *action);

[Roadmap-commit] roadmap/src roadmap_screen.c,1.54,1.55

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10167

Modified Files:
	roadmap_screen.c 
Log Message:
Merging in the map editor changes (Ehud)

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** roadmap_screen.c	18 Nov 2005 20:13:00 -0000	1.54
--- roadmap_screen.c	19 Nov 2005 06:08:17 -0000	1.55
***************
*** 102,105 ****
--- 102,107 ----
  static int   SquareOnScreenCount;
  
+ static RoadMapPen RoadMapScreenLastPen = NULL;
+ 
  
  static void roadmap_screen_after_refresh (void) {}
***************
*** 147,150 ****
--- 149,154 ----
  static void roadmap_screen_flush_points (void) {
  
+    if (RoadMapScreenPoints.cursor == RoadMapScreenPoints.data) return;
+ 
     roadmap_math_rotate_coordinates
         (RoadMapScreenPoints.cursor - RoadMapScreenPoints.data,
***************
*** 161,164 ****
--- 165,170 ----
  static void roadmap_screen_flush_lines (void) {
  
+    if (RoadMapScreenObjects.cursor == RoadMapScreenObjects.data) return;
+ 
     roadmap_math_rotate_coordinates
         (RoadMapScreenLinePoints.cursor - RoadMapScreenLinePoints.data,
***************
*** 175,255 ****
  
  
! void roadmap_screen_draw_one_line (int line,
!                                    int fully_visible,
!                                    int first_shape_line,
!                                    int last_shape_line) {
! 
!    int line_style;
! #define ROADMAP_LINE_STYLE_POINT   0
! #define ROADMAP_LINE_STYLE_SEGMENT 1
! #define ROADMAP_LINE_STYLE_SHAPE   2
! 
!    int first_shape;
!    int last_shape;
! 
!    RoadMapPosition position0;
!    RoadMapPosition position1;
  
     RoadMapGuiPoint point0;
     RoadMapGuiPoint point1;
  
-    /* These are used when the line has a shape: */
-    RoadMapPosition midposition;
-    RoadMapGuiPoint midpoint;
- 
     int i;
     RoadMapGuiPoint *points;
  
!    int last_shape_drawn = 0;
! 
! 
!    /* Retrieve the position and "size" of the line and decide
!     * what details to draw.
!     */
!    roadmap_line_from (line, &position0);
!    roadmap_line_to   (line, &position1);
! 
!    roadmap_math_coordinate (&position0, &point0);
!    roadmap_math_coordinate (&position1, &point1);
! 
!    if (abs(point0.x - point1.x) < 5 && abs(point0.y - point1.y) < 5) {
! 
!       /* Decluttering logic: show less details if the line is too small
!        * for these details to matter.
!        */
!       if ((point0.x == point1.x) && (point0.y == point1.y)) {
! 
!          line_style = ROADMAP_LINE_STYLE_POINT;
! 
!       } else {
! 
!          /* This line is too small for us to consider a shape. */
!          line_style = ROADMAP_LINE_STYLE_SEGMENT;
!       }
! 
!    } else if (first_shape_line < 0) {
  
-       line_style = ROADMAP_LINE_STYLE_SEGMENT;
  
!    } else {
!       
!       if (roadmap_shape_of_line (line,
!                                  first_shape_line, last_shape_line,
!                                  &first_shape, &last_shape) > 0) {
  
!          line_style = ROADMAP_LINE_STYLE_SHAPE;
  
!       } else {
  
!          line_style = ROADMAP_LINE_STYLE_SEGMENT;
!       }
     }
  
  
!    /* Now that we know how much to draw, draw it. */
! 
!    switch (line_style) {
  
!    case ROADMAP_LINE_STYLE_SHAPE: /* Draw a shaped line. */
  
        if (last_shape - first_shape + 3 >=
--- 181,219 ----
  
  
! void roadmap_screen_draw_line (const RoadMapPosition *from,
!                                const RoadMapPosition *to,
!                                int fully_visible,
!                                const RoadMapPosition *shape_start,
!                                int first_shape,
!                                int last_shape,
!                                RoadMapShapeIterator shape_next,
!                                RoadMapPen pen) {
  
     RoadMapGuiPoint point0;
     RoadMapGuiPoint point1;
  
     int i;
     RoadMapGuiPoint *points;
  
!    int last_point_visible = 0;
  
  
!    if (RoadMapScreenLastPen != pen) {
  
!       /* The pen has changed: flush the previous lines and points. */
  
!       roadmap_screen_flush_lines ();
!       roadmap_screen_flush_points ();
  
!       roadmap_canvas_select_pen (pen);
!       RoadMapScreenLastPen = pen;
     }
  
+    if (first_shape >= 0) {
  
!       /* Draw a shaped line. */
  
!       RoadMapPosition midposition;
!       RoadMapPosition last_midposition;
  
        if (last_shape - first_shape + 3 >=
***************
*** 277,291 ****
         * to start with.
         */
!       midposition = position0;
  
!       last_shape_drawn = 0; /* We have drawn nothing yet. */
  
        for (i = first_shape; i <= last_shape; ++i) {
  
!          roadmap_shape_get_position (i, &midposition);
  
!          roadmap_math_coordinate (&midposition, &midpoint);
  
!          if (roadmap_math_line_is_visible (&position0, &midposition)) {
  
              /* Show this line: add 2 points if this is the start of a new
--- 241,266 ----
         * to start with.
         */
!       last_midposition = *from;
!       midposition = *shape_start;
  
!       last_point_visible = 0; /* We have drawn nothing yet. */
  
        for (i = first_shape; i <= last_shape; ++i) {
  
!          (*shape_next) (i, &midposition);
  
!          if (roadmap_math_line_is_visible (&last_midposition, &midposition) && 
!              roadmap_math_get_visible_coordinates
!                         (&last_midposition, &midposition, &point0, &point1)) {
  
!             if ((point0.x == point1.x) &&
!                 (point0.y == point1.y) &&
!                 last_point_visible) {
! 
!                /* This segment is very short, we can skip it */
!                last_midposition = midposition; 
! 
!                continue;
!             }
  
              /* Show this line: add 2 points if this is the start of a new
***************
*** 293,310 ****
               * one more point to the current complete line.
               */
!             if (!last_shape_drawn) {
                 *(points++) = point0; /* Show the start of this segment. */
-                last_shape_drawn = 1;
              }
!             *(points++) = midpoint;
  
!          } else {
  
!             if (last_shape_drawn) {
  
!                /* Show the previous segment as the end
!                 * of a complete line. The remaining part of the
!                 * shaped line, if any, will be drawn as a new
!                 * complete line.
                  */
                 *RoadMapScreenObjects.cursor =
--- 268,283 ----
               * one more point to the current complete line.
               */
!             if (!last_point_visible) {
                 *(points++) = point0; /* Show the start of this segment. */
              }
!             *(points++) = point1;
  
!             last_point_visible = roadmap_math_point_is_visible (&midposition);
  
!             if (!last_point_visible) {
  
!                /* Show the previous segment as the end of a complete line.
!                 * The remaining part of the shaped line, if any, will be
!                 * drawn as a new complete line.
                  */
                 *RoadMapScreenObjects.cursor =
***************
*** 318,338 ****
                    points = RoadMapScreenLinePoints.cursor;
                 }
-                last_shape_drawn = 0;
              }
           }
!          position0 = midposition; /* The latest position is our new start. */
!          point0 = midpoint;
        }
  
!       if (roadmap_math_line_is_visible (&position0, &position1)) {
  
!          if (!last_shape_drawn) {
               *(points++) = point0; /* Show the start of this segment. */
-              last_shape_drawn = 1;
           }
           *(points++) = point1;
        }
  
!       if (last_shape_drawn) {
  
           /* End the current complete line. */
--- 291,317 ----
                    points = RoadMapScreenLinePoints.cursor;
                 }
              }
           }
! 
!          /* The latest position is our new start. */
!          last_midposition = midposition;
        }
  
!       if (roadmap_math_line_is_visible (&last_midposition, to) && 
!              roadmap_math_get_visible_coordinates
!                         (&last_midposition, to, &point0, &point1)) {
  
!          if (!last_point_visible) {
               *(points++) = point0; /* Show the start of this segment. */
           }
           *(points++) = point1;
+ 
+          /* set last point as visible to force line completion at the next
+           * statement.
+           */
+          last_point_visible = 1;
        }
  
!       if (last_point_visible) {
  
           /* End the current complete line. */
***************
*** 344,355 ****
           RoadMapScreenObjects.cursor += 1;
        }
-       break;
  
!    case ROADMAP_LINE_STYLE_SEGMENT: /* Draw a line with no shape. */
  
        /* Optimization: do not draw a line that is obviously not visible. */
!       if (! fully_visible)
!       {
!          if (! roadmap_math_line_is_visible (&position0, &position1)) return;
        }
  
--- 323,352 ----
           RoadMapScreenObjects.cursor += 1;
        }
  
!    } else {
! 
!       /* Draw a line with no shape. */
  
        /* Optimization: do not draw a line that is obviously not visible. */
!       if (! fully_visible) {
!          if (! roadmap_math_line_is_visible (from, to)) return;
!       }
! 
!       /* Optimization: adjust the edges of the line so they do not go out
!        * of the screen.
!        */
!       if (!roadmap_math_get_visible_coordinates (from, to, &point0, &point1)) {
!          return;
!       }
! 
!       if ((point0.x == point1.x) && (point0.y == point1.y)) {
!          /* draw a point instead of a line */
!          if (RoadMapScreenPoints.cursor >= RoadMapScreenPoints.end) {
!             roadmap_screen_flush_points ();
!          }
!          RoadMapScreenPoints.cursor[0] = point0;
!          RoadMapScreenPoints.cursor += 1;
! 
!          return;
        }
  
***************
*** 366,413 ****
        RoadMapScreenObjects.cursor += 1;
  
!       break;
  
-    case ROADMAP_LINE_STYLE_POINT: /* Draw a point. */
  
!       /* Optimization: do not draw a line that is obviously not visible. */
!       if (! fully_visible)
!       {
!          if (! roadmap_math_point_is_visible (&position0)) return;
!       }
  
!       if (RoadMapScreenPoints.cursor >= RoadMapScreenPoints.end) {
!          roadmap_screen_flush_points ();
!       }
!       RoadMapScreenPoints.cursor[0] = point0;
  
!       RoadMapScreenPoints.cursor += 1;
  
!       break;
     }
  }
  
  
! void roadmap_screen_draw_line (int line) {
  
!    int square;
!    int first_shape_line;
!    int last_shape_line;
  
!    RoadMapPosition position;
  
  
!    roadmap_line_from (line, &position);
!    square = roadmap_square_search (&position);
  
!    if (roadmap_shape_in_square (square, &first_shape_line,
!                                         &last_shape_line) > 0) {
  
!       roadmap_screen_draw_one_line
!          (line, 1, first_shape_line, last_shape_line);
  
     } else {
  
!       roadmap_screen_draw_one_line (line, 1, -1, -1);
     }
  }
  
--- 363,527 ----
        RoadMapScreenObjects.cursor += 1;
  
!    }
! }
  
  
! /* TODO: ugly hack (both the hack and the drawing itself are ugly!).
!  * This should be rewritten to allow specifying a sprite for
!  * the direction mark.
!  */
! static void roadmap_screen_draw_direction (RoadMapGuiPoint *point0,
!                                            RoadMapGuiPoint *point1,
!                                            int width,
!                                            int direction) {
!    RoadMapGuiPoint from;
!    RoadMapGuiPoint to;
  
!    double delta_x = point1->x - point0->x;
!    double delta_y = point1->y - point0->y;
!    double ll = (1.0 * (abs((int)(delta_x)) + abs((int)(delta_y))) / 15);
  
!    if (ll >= 1) {
  
!       static int i=0;
!       
!       double step_x = delta_x / ll;
!       double step_y = delta_y / ll;
!       double x = point0->x + step_x;
!       double y = point0->y + step_y;
! 
!       while (abs((int)(x + step_x - point0->x)) < abs((int)(delta_x))) {
!          i++;
! 
!          from.x = (int)x;
!          from.y = (int)y;
!          to.x = (int) (x + step_x);
!          to.y = (int) (y + step_y);
! 
!          if (RoadMapScreenLinePoints.cursor + 5 >=
!                RoadMapScreenLinePoints.end) {
!             roadmap_screen_flush_lines ();
!          }
! 
!          /* main line */
!          RoadMapScreenLinePoints.cursor[0] = from;
!          RoadMapScreenLinePoints.cursor[1] = to;
!          *RoadMapScreenObjects.cursor = 2;
!          RoadMapScreenLinePoints.cursor  += 2;
!          RoadMapScreenObjects.cursor += 1;
! 
!          /* head */
!          if ((direction == 1) ||
!                ((direction == 3) && (i % 2))) {
!             RoadMapGuiPoint head;
!             double dir=atan2(from.x-to.x, from.y-to.y);
!             int i1=9;
!             head.x = (short)(to.x + i1*sin(dir+0.5));
!             head.y = (short)(to.y + i1*cos(dir+0.5));
!             RoadMapScreenLinePoints.cursor[0] = head;
!             head.x = (short)(to.x + i1*sin(dir-0.5));
!             head.y = (short)(to.y + i1*cos(dir-0.5));
!             RoadMapScreenLinePoints.cursor[2] = head;
!             RoadMapScreenLinePoints.cursor[1] = to;
!             *RoadMapScreenObjects.cursor = 3;
!             RoadMapScreenLinePoints.cursor  += 3;
!             RoadMapScreenObjects.cursor += 1;
!          }
! 
!          if ((direction == 2) ||
!                ((direction == 3) && !(i % 2))) {
!             /* second head */
!             RoadMapGuiPoint head;
!             double dir=atan2(to.x-from.x, to.y-from.y);
!             int i1=9;
!             head.x = (short)(from.x + i1*sin(dir+0.5));
!             head.y = (short)(from.y + i1*cos(dir+0.5));
!             RoadMapScreenLinePoints.cursor[0] = head;
!             head.x = (short)(from.x + i1*sin(dir-0.5));
!             head.y = (short)(from.y + i1*cos(dir-0.5));
!             RoadMapScreenLinePoints.cursor[2] = head;
!             RoadMapScreenLinePoints.cursor[1] = from;
!             *RoadMapScreenObjects.cursor = 3;
!             RoadMapScreenLinePoints.cursor  += 3;
!             RoadMapScreenObjects.cursor += 1;
!          }
! 
!          x += step_x*3;
!          y += step_y*3;
!       }
     }
  }
  
  
! /* TODO: this function should either be implemented in
!  * roadmap_screen_draw_one_line(), or common parts should be extracted.
!  */
! void roadmap_screen_draw_line_direction (const RoadMapPosition *from,
!                                          const RoadMapPosition *to,
!                                          const RoadMapPosition *shape_start,
!                                          int first_shape,
!                                          int last_shape,
!                                          RoadMapShapeIterator shape_next,
!                                          int width,
!                                          int direction) {
  
!    static RoadMapPen direction_pen = NULL;
  
!    RoadMapGuiPoint point0;
!    RoadMapGuiPoint point1;
  
+    /* These are used when the line has a shape: */
+    RoadMapPosition midposition;
+    RoadMapPosition last_midposition;
  
!    int i;
  
!    roadmap_screen_flush_lines ();
!    roadmap_screen_flush_points ();
  
!    if (direction_pen == NULL) {
!       direction_pen = roadmap_canvas_create_pen ("direction_mark");
!       roadmap_canvas_set_thickness (1);
!       roadmap_canvas_set_foreground ("black");
!    } else {
!      roadmap_canvas_select_pen (direction_pen);
!    }
! 
!    if (first_shape >= 0) {
! 
!       last_midposition = *from;
!       midposition = *shape_start;
! 
!       for (i = first_shape; i <= last_shape; ++i) {
! 
!          (*shape_next) (i, &midposition);
! 
!          if (roadmap_math_line_is_visible (&last_midposition, &midposition) && 
!              roadmap_math_get_visible_coordinates
!                         (&last_midposition, &midposition, &point0, &point1)) {
! 
!             roadmap_screen_draw_direction (&point0, &point1, width, direction);
! 
!          }
!          last_midposition = midposition;
!       }
! 
!       if (roadmap_math_line_is_visible (&last_midposition, to) && 
!              roadmap_math_get_visible_coordinates
!                         (&last_midposition, to, &point0, &point1)) {
! 
!          roadmap_screen_draw_direction (&point0, &point1, width, direction);
! 
!       }
  
     } else {
  
!       if (roadmap_math_get_visible_coordinates (from, to, &point0, &point1)) {
!          roadmap_screen_draw_direction (&point0, &point1, width, direction);
!       }
     }
+ 
+    roadmap_screen_flush_lines ();
+    roadmap_screen_flush_points ();
  }
  
***************
*** 440,445 ****
     int j;
     int size;
-    int layer;
-    int current_layer = -1;
     int *geo_point;
     RoadMapPosition position;
--- 554,557 ----
***************
*** 451,456 ****
--- 563,571 ----
  
     RoadMapArea edges;
+    RoadMapPen pen = NULL;
  
  
+    RoadMapScreenLastPen = NULL;
+ 
     if (! roadmap_is_visible (ROADMAP_SHOW_AREA)) return;
  
***************
*** 458,467 ****
     for (i = roadmap_polygon_count() - 1; i >= 0; --i) {
  
!       layer = roadmap_polygon_category (i);
  
!       if (layer != current_layer) {
           roadmap_screen_flush_polygons ();
!          roadmap_canvas_select_pen (roadmap_layer_get_pen (layer, 0));
!          current_layer = layer;
        }
  
--- 573,582 ----
     for (i = roadmap_polygon_count() - 1; i >= 0; --i) {
  
!       pen = roadmap_layer_get_pen (roadmap_polygon_category (i), 0);
  
!       if (RoadMapScreenLastPen != pen) {
           roadmap_screen_flush_polygons ();
!          roadmap_canvas_select_pen (pen);
!          RoadMapScreenLastPen = pen;
        }
  
***************
*** 576,584 ****
     roadmap_math_rotate_coordinates (count, points);
     roadmap_canvas_draw_multiple_lines (1, &count, points);
  }
  
  
  static int roadmap_screen_draw_square
!               (int square, int layer, int fully_visible) {
  
     int line;
--- 691,700 ----
     roadmap_math_rotate_coordinates (count, points);
     roadmap_canvas_draw_multiple_lines (1, &count, points);
+    RoadMapScreenLastPen = NULL;
  }
  
  
  static int roadmap_screen_draw_square
!               (int square, int layer, int fully_visible, int pen_index) {
  
     int line;
***************
*** 587,590 ****
--- 703,709 ----
     int first_shape_line;
     int last_shape_line;
+    int first_shape;
+    int last_shape;
+    RoadMapPen layer_pen;
  
     int drawn = 0;
***************
*** 593,596 ****
--- 712,717 ----
     roadmap_log_push ("roadmap_screen_draw_square");
  
+    layer_pen = roadmap_layer_get_pen (layer, pen_index);
+ 
     /* Draw each line that belongs to this square. */
  
***************
*** 600,609 ****
                                              &last_shape_line) <= 0) {
           first_shape_line = last_shape_line = -1;
        }
  
        for (line = first_line; line <= last_line; ++line) {
  
!          roadmap_screen_draw_one_line
!             (line, fully_visible, first_shape_line, last_shape_line);
           drawn += 1;
        }
--- 721,745 ----
                                              &last_shape_line) <= 0) {
           first_shape_line = last_shape_line = -1;
+          first_shape = last_shape = -1;
        }
  
        for (line = first_line; line <= last_line; ++line) {
  
!          RoadMapPosition from;
!          RoadMapPosition to;
! 
!          roadmap_line_from (line, &from);
!          roadmap_line_to (line, &to);
! 
!          if (first_shape_line >= 0) {
!             if (roadmap_shape_of_line (line,
!                                        first_shape_line, last_shape_line,
!                                        &first_shape, &last_shape) == 0) {
!                first_shape = -1;
!             }
!          }
!          roadmap_screen_draw_line
!             (&from, &to, fully_visible, &from, first_shape, last_shape,
!              roadmap_shape_get_position, layer_pen);
           drawn += 1;
        }
***************
*** 625,628 ****
--- 761,766 ----
        for (line = first_line; line <= last_line; ++line) {
  
+          RoadMapPosition from;
+          RoadMapPosition to;
           RoadMapPosition position;
  
***************
*** 670,673 ****
--- 808,812 ----
  
                 first_shape_line = last_shape_line = -1;
+                first_shape = last_shape = -1;
              }
           }
***************
*** 678,683 ****
           }
  
!          roadmap_screen_draw_one_line
!             (real_line, fully_visible, first_shape_line, last_shape_line);
           drawn += 1;
        }
--- 817,835 ----
           }
  
!          if (first_shape_line >= 0) {
!             roadmap_shape_of_line (real_line,
!                                    first_shape_line, last_shape_line,
!                                    &first_shape, &last_shape);
!          } else {
!             first_shape = last_shape = -1;
!          }
! 
!          roadmap_line_from (real_line, &from);
!          roadmap_line_to (real_line, &to);
! 
!          roadmap_screen_draw_line
!             (&from, &to, fully_visible, &from, first_shape, last_shape,
!              roadmap_shape_get_position, layer_pen);
! 
           drawn += 1;
        }
***************
*** 762,780 ****
     count = roadmap_layer_visible_lines (layers, 1024, pen_index);
     
     for (i = 0; i < count; ++i) {
  
          layer = layers[i];
  
-         roadmap_canvas_select_pen (roadmap_layer_get_pen (layer, pen_index));
- 
          drawn += roadmap_screen_draw_square
!                     (square, layer, fully_visible);
  
!         if (RoadMapScreenObjects.cursor != RoadMapScreenObjects.data) {
!             roadmap_screen_flush_lines();
!         }
!         if (RoadMapScreenPoints.cursor != RoadMapScreenPoints.data) {
!             roadmap_screen_flush_points();
!         }
     }
  
--- 914,928 ----
     count = roadmap_layer_visible_lines (layers, 1024, pen_index);
     
+    RoadMapScreenLastPen = NULL;
+ 
     for (i = 0; i < count; ++i) {
  
          layer = layers[i];
  
          drawn += roadmap_screen_draw_square
!                     (square, layer, fully_visible, pen_index);
  
!         roadmap_screen_flush_lines();
!         roadmap_screen_flush_points();
     }
  

[Roadmap-commit] roadmap/src roadmap_screen.h,1.8,1.9

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10148

Modified Files:
	roadmap_screen.h 
Log Message:
Merging in the map editor changes (Ehud)

Index: roadmap_screen.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_screen.h	4 Sep 2005 22:04:45 -0000	1.8
--- roadmap_screen.h	19 Nov 2005 06:08:08 -0000	1.9
***************
*** 26,29 ****
--- 26,30 ----
  
  #include "roadmap_types.h"
+ #include "roadmap_canvas.h"
  
  void roadmap_screen_initialize (void);
***************
*** 52,57 ****
--- 53,77 ----
  
  typedef void (*RoadMapScreenSubscriber) (void);
+ typedef void (*RoadMapShapeIterator) (int shape, RoadMapPosition *position);
  
  void roadmap_screen_subscribe_after_refresh (RoadMapScreenSubscriber handler);
  
+ void roadmap_screen_draw_line (const RoadMapPosition *from,
+                                const RoadMapPosition *to,
+                                int fully_visible,
+                                const RoadMapPosition *shape_start,
+                                int first_shape,
+                                int last_shape,
+                                RoadMapShapeIterator shape_next,
+                                RoadMapPen pen);
+ 
+ void roadmap_screen_draw_line_direction (const RoadMapPosition *from,
+                                          const RoadMapPosition *to,
+                                          const RoadMapPosition *shape_start,
+                                          int first_shape,
+                                          int last_shape,
+                                          RoadMapShapeIterator shape_next,
+                                          int width,
+                                          int direction);
+ 
  #endif // INCLUDE__ROADMAP_SCREEN__H

[Roadmap-commit] roadmap/web download.html,1.35,1.36

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19440

Modified Files:
	download.html 
Log Message:
Patched 1.0.12

Index: download.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/download.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** download.html	6 Nov 2005 07:06:08 -0000	1.35
--- download.html	18 Nov 2005 20:42:46 -0000	1.36
***************
*** 60,63 ****
--- 60,66 ----
  The RoadMap files below are tar files compressed using <b>gzip</b>.
  
+ <P>RoadMap v1.0.12p1:
+ <A class=normal href="roadmap/roadmap_1_0_12p1_src.tar.gz">1.0.12 Patch with full PocketPC sources</A>.
+ 
  <P>RoadMap v1.0.12:
  <A class=normal href="roadmap/roadmap_1_0_12_src.tar.gz">Sources only</A>,
***************
*** 69,72 ****
--- 72,76 ----
  <A class=normal 
     href="roadmap/roadmap_1_0_12_doc.tar.gz">Documentation</A>.
+ .
  
  <P>RoadMap v1.0.11:

[Roadmap-commit] roadmap/src/win32 roadmap_wincecanvas.h,1.2,1.3

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16278

Modified Files:
	roadmap_wincecanvas.h 
Log Message:
A sample popup menu

Index: roadmap_wincecanvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_wincecanvas.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_wincecanvas.h	4 Sep 2005 22:54:04 -0000	1.2
--- roadmap_wincecanvas.h	18 Nov 2005 20:27:29 -0000	1.3
***************
*** 35,40 ****
   */
  HWND roadmap_canvas_new (HWND main, HWND tool_bar);
! void roadmap_canvas_button_pressed(POINT *data);
! void roadmap_canvas_button_released(POINT *data);
  void roadmap_canvas_mouse_move(POINT *data);
  
--- 35,40 ----
   */
  HWND roadmap_canvas_new (HWND main, HWND tool_bar);
! void roadmap_canvas_button_pressed(int button, POINT *data);
! void roadmap_canvas_button_released(int button, POINT *data);
  void roadmap_canvas_mouse_move(POINT *data);
  

[Roadmap-commit] roadmap/src/win32 roadmap_main.cpp,1.7,1.8

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16226

Modified Files:
	roadmap_main.cpp 
Log Message:
A sample popup menu

Index: roadmap_main.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_main.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_main.cpp	23 Oct 2005 21:28:00 -0000	1.7
--- roadmap_main.cpp	18 Nov 2005 20:27:13 -0000	1.8
***************
*** 343,347 ****
  				point.y -= 26;
  			}
! 			roadmap_canvas_button_pressed(&point);
  		}
  		break;
--- 343,347 ----
  				point.y -= 26;
  			}
! 			roadmap_canvas_button_pressed(1, &point);
  		}
  		break;
***************
*** 355,359 ****
  				point.y -= 26;
  			}
! 			roadmap_canvas_button_released(&point);
  		}
  		break;
--- 355,407 ----
  				point.y -= 26;
  			}
! 			roadmap_canvas_button_released(1, &point);
! 		}
! 		break;
! 
! 	case WM_MBUTTONDOWN:
! 		{
! 			POINT point;
! 			point.x = LOWORD(lParam);
! 			point.y = HIWORD(lParam);
! 			if (RoadMapMainToolbar != NULL) {
! 				point.y -= 26;
! 			}
! 			roadmap_canvas_button_pressed(2, &point);
! 		}
! 		break;
! 
! 	case WM_MBUTTONUP:
! 		{
! 			POINT point;
! 			point.x = LOWORD(lParam);
! 			point.y = HIWORD(lParam);
! 			if (RoadMapMainToolbar != NULL) {
! 				point.y -= 26;
! 			}
! 			roadmap_canvas_button_released(2, &point);
! 		}
! 		break;
! 
! 	case WM_RBUTTONDOWN:
! 		{
! 			POINT point;
! 			point.x = LOWORD(lParam);
! 			point.y = HIWORD(lParam);
! 			if (RoadMapMainToolbar != NULL) {
! 				point.y -= 26;
! 			}
! 			roadmap_canvas_button_pressed(3, &point);
! 		}
! 		break;
! 
! 	case WM_RBUTTONUP:
! 		{
! 			POINT point;
! 			point.x = LOWORD(lParam);
! 			point.y = HIWORD(lParam);
! 			if (RoadMapMainToolbar != NULL) {
! 				point.y -= 26;
! 			}
! 			roadmap_canvas_button_released(3, &point);
  		}
  		break;

[Roadmap-commit] roadmap/src/win32 roadmap_canvas.c,1.3,1.4

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15517

Modified Files:
	roadmap_canvas.c 
Log Message:
A sample popup menu

Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_canvas.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_canvas.c	5 Sep 2005 15:53:32 -0000	1.3
--- roadmap_canvas.c	18 Nov 2005 20:24:08 -0000	1.4
***************
*** 54,58 ****
  static HBITMAP		OldBitmap = NULL;
  
! static void roadmap_canvas_ignore_button (RoadMapGuiPoint *point) {}
  static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
  	roadmap_canvas_ignore_button;
--- 54,58 ----
  static HBITMAP		OldBitmap = NULL;
  
! static void roadmap_canvas_ignore_button (int button, RoadMapGuiPoint *point) {}
  static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
  	roadmap_canvas_ignore_button;
***************
*** 367,371 ****
  
  
! void roadmap_canvas_button_pressed(POINT *data)
  {
  	RoadMapGuiPoint point;
--- 367,371 ----
  
  
! void roadmap_canvas_button_pressed(int button, POINT *data)
  {
  	RoadMapGuiPoint point;
***************
*** 374,383 ****
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseButtonPressed) (&point);
  	
  }
  
  
! void roadmap_canvas_button_released(POINT *data)
  {
  	RoadMapGuiPoint point;
--- 374,383 ----
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseButtonPressed) (button, &point);
  	
  }
  
  
! void roadmap_canvas_button_released(int button, POINT *data)
  {
  	RoadMapGuiPoint point;
***************
*** 386,390 ****
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseButtonReleased) (&point);
  	
  }
--- 386,390 ----
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseButtonReleased) (button, &point);
  	
  }
***************
*** 398,402 ****
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseMove) (&point);
  	
  }
--- 398,402 ----
  	point.y = (short)data->y;
  	
! 	(*RoadMapCanvasMouseMove) (0, &point);
  	
  }

[Roadmap-commit] roadmap/src/qt qt_main.cc,1.8,1.9

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14849

Modified Files:
	qt_main.cc 
Log Message:
Merging in the map editor changes: popup menus (Ehud)

Index: qt_main.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_main.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** qt_main.cc	8 Oct 2005 20:31:21 -0000	1.8
--- qt_main.cc	18 Nov 2005 20:21:01 -0000	1.9
***************
*** 65,69 ****
  // Implementation of RMapMainWindow class
  RMapMainWindow::RMapMainWindow(const char* name) : QMainWindow(0, name) {
- 	currentMenu = 0;
  	spacePressed = false;
  	for (int i = 0 ; i < ROADMAP_MAX_TIMER; ++i) {
--- 65,68 ----
***************
*** 92,118 ****
  }
  
- void RMapMainWindow::addMenu(const char* label) {
- 	currentMenu = new QPopupMenu(this);
  
! 	menuBar()->insertItem(label, currentMenu);
  }
  
! void RMapMainWindow::addMenuItem(const char* label, const char* tip,
! 	RoadMapCallback callback) {
  
! 	if (currentMenu == 0) {
! 		roadmap_log (ROADMAP_FATAL, "No menu defined for menu item %s", label);
! 	}
  
  	RMapCallback* cb = new RMapCallback(callback);
! 	currentMenu->insertItem(label, cb, SLOT(fire()));
  }
  
! void RMapMainWindow::addMenuSeparator() {
! 	if (currentMenu == 0) {
! 		roadmap_log (ROADMAP_FATAL, "No menu defined for menu separator");
! 	}
  
! 	currentMenu->insertSeparator();
  }
  
--- 91,129 ----
  }
  
  
! QPopupMenu *RMapMainWindow::newMenu(const char *title) {
! 
!   return new QPopupMenu(this, title);
  }
  
! void RMapMainWindow::freeMenu(QPopupMenu *menu) {
  
!    delete (menu);
! }
! 
! void RMapMainWindow::addMenu(QPopupMenu *menu, const char* label) {
! 
! 	menuBar()->insertItem(label, menu);
! }
! 
! 
! void RMapMainWindow::popupMenu(QPopupMenu *menu, int x, int y) {
! 
!    if (menu != NULL) menu->popup (mapToGlobal(QPoint (x, y)));
! }
! 
! 
! void RMapMainWindow::addMenuItem(QPopupMenu *menu,
!                                  const char* label,
!                                  const char* tip,
!                                  RoadMapCallback callback) {
  
  	RMapCallback* cb = new RMapCallback(callback);
! 	menu->insertItem(label, cb, SLOT(fire()));
  }
  
! void RMapMainWindow::addMenuSeparator(QPopupMenu *menu) {
  
! 	menu->insertSeparator();
  }
  
***************
*** 302,309 ****
  		}
  	}
! 	if (found < 0) {
! 		roadmap_log (ROADMAP_ERROR, "no timer set");
! 		return;
! 	}
  
  	tm[found]->stop();
--- 313,317 ----
  		}
  	}
! 	if (found < 0) return;
  
  	tm[found]->stop();

[Roadmap-commit] roadmap/src/qt qt_main.h,1.6,1.7

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14720

Modified Files:
	qt_main.h 
Log Message:
Merging in the map editor changes: popup menus (Ehud)

Index: qt_main.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** qt_main.h	8 Oct 2005 20:31:15 -0000	1.6
--- qt_main.h	18 Nov 2005 20:20:26 -0000	1.7
***************
*** 92,100 ****
  	void setKeyboardCallback(RoadMapKeyInput c);
  
! 	void addMenu(const char* label);
! 	void addMenuItem(const char* label, const char* tip, 
! 		RoadMapCallback callback);
  
! 	void addMenuSeparator();
  
  	void addToolbar(const char* orientation);
--- 92,107 ----
  	void setKeyboardCallback(RoadMapKeyInput c);
  
!    QPopupMenu *newMenu(const char *title);
!    void freeMenu(QPopupMenu *menu);
  
! 	void addMenu(QPopupMenu *menu, const char* label);
!    void popupMenu(QPopupMenu *menu, int x, int y);
! 
! 	void addMenuItem(QPopupMenu *menu,
!                     const char* label,
!                     const char* tip, 
!                     RoadMapCallback callback);
! 
! 	void addMenuSeparator(QPopupMenu *menu);
  
  	void addToolbar(const char* orientation);
***************
*** 114,118 ****
  protected:
  	RoadMapKeyInput keyCallback;
- 	QPopupMenu* currentMenu;
  	QMap<int, RMapInput*> inputMap;
  	QToolBar* toolBar;
--- 121,124 ----

[Roadmap-commit] roadmap/src/qt roadmap_main.cc,1.12,1.13

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14504

Modified Files:
	roadmap_main.cc 
Log Message:
Merging in the map editor changes: popup menus (Ehud)

Index: roadmap_main.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_main.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** roadmap_main.cc	23 Oct 2005 23:01:53 -0000	1.12
--- roadmap_main.cc	18 Nov 2005 20:19:52 -0000	1.13
***************
*** 92,112 ****
  }
  
! void roadmap_main_add_menu(const char* label) {
  	if (mainWindow) {
! 		mainWindow->addMenu(label);
  	}
  }
  
! void roadmap_main_add_menu_item(const char* label, const char* tip,
! 	RoadMapCallback callback) {
  
  	if (mainWindow) {
! 		mainWindow->addMenuItem(label, tip, callback);
  	}
  }
  
! void roadmap_main_add_separator(void) {
  	if (mainWindow) {
! 		mainWindow->addMenuSeparator();
  	}
  }
--- 92,138 ----
  }
  
! RoadMapMenu roadmap_main_new_menu (const char *title) {
! 
!   if (mainWindow) {
!      return (RoadMapMenu) mainWindow->newMenu(title);
!   } else {
!       return (RoadMapMenu) NULL;
!    }
! }
! 
! void roadmap_main_free_menu (RoadMapMenu menu) {
! 
!   if (mainWindow) {
!      mainWindow->freeMenu((QPopupMenu *)menu);
!   }
! }
! 
! void roadmap_main_popup_menu (RoadMapMenu menu,
!                               const RoadMapGuiPoint *position) {
! 
!   if (mainWindow) {
!      mainWindow->popupMenu((QPopupMenu *)menu, position->x, position->y);
!   }
! }
! 
! void roadmap_main_add_menu(RoadMapMenu menu, const char* label) {
  	if (mainWindow) {
! 		mainWindow->addMenu((QPopupMenu *)menu, label);
  	}
  }
  
! void roadmap_main_add_menu_item(RoadMapMenu menu,
!                                 const char* label,
!                                 const char* tip,
!                                 RoadMapCallback callback) {
  
  	if (mainWindow) {
! 		mainWindow->addMenuItem((QPopupMenu *)menu, label, tip, callback);
  	}
  }
  
! void roadmap_main_add_separator(RoadMapMenu menu) {
  	if (mainWindow) {
! 		mainWindow->addMenuSeparator((QPopupMenu *)menu);
  	}
  }

[Roadmap-commit] roadmap/src/qt qt_canvas.cc,1.5,1.6

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14290

Modified Files:
	qt_canvas.cc 
Log Message:
A sample popup menu

Index: qt_canvas.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_canvas.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** qt_canvas.cc	4 Sep 2005 22:06:46 -0000	1.5
--- qt_canvas.cc	18 Nov 2005 20:19:00 -0000	1.6
***************
*** 283,304 ****
  
  void RMapCanvas::mousePressEvent(QMouseEvent* ev) {
     RoadMapGuiPoint pt;
  
     pt.x = ev->x();
     pt.y = ev->y();
  
     if (buttonPressedHandler != 0) {
!       buttonPressedHandler(&pt);
     }
  }
  
  void RMapCanvas::mouseReleaseEvent(QMouseEvent* ev) {
     RoadMapGuiPoint pt;
  
     pt.x = ev->x();
     pt.y = ev->y();
  
     if (buttonReleasedHandler != 0) {
!       buttonReleasedHandler(&pt);
     }
  }
--- 283,320 ----
  
  void RMapCanvas::mousePressEvent(QMouseEvent* ev) {
+ 
+    int button;
     RoadMapGuiPoint pt;
  
+    switch (ev->button()) {
+       case LeftButton:  button = 1; break;
+       case MidButton:   button = 2; break;
+       case RightButton: button = 3; break;
+       default:          button = 0; break;
+    }
     pt.x = ev->x();
     pt.y = ev->y();
  
     if (buttonPressedHandler != 0) {
!       buttonPressedHandler(button, &pt);
     }
  }
  
  void RMapCanvas::mouseReleaseEvent(QMouseEvent* ev) {
+ 
+    int button;
     RoadMapGuiPoint pt;
  
+    switch (ev->button()) {
+       case LeftButton:  button = 1; break;
+       case MidButton:   button = 2; break;
+       case RightButton: button = 3; break;
+       default:          button = 0; break;
+    }
     pt.x = ev->x();
     pt.y = ev->y();
  
     if (buttonReleasedHandler != 0) {
!       buttonReleasedHandler(button, &pt);
     }
  }
***************
*** 311,315 ****
  
     if (mouseMoveHandler != 0) {
!       mouseMoveHandler(&pt);
     }
  }
--- 327,331 ----
  
     if (mouseMoveHandler != 0) {
!       mouseMoveHandler(0, &pt);
     }
  }

[Roadmap-commit] roadmap/src/gtk2 roadmap_main.c,1.20,1.21

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14059

Modified Files:
	roadmap_main.c 
Log Message:
Merging in the map editor changes: popup menus (Ehud)

Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** roadmap_main.c	23 Oct 2005 07:28:49 -0000	1.20
--- roadmap_main.c	18 Nov 2005 20:17:46 -0000	1.21
***************
*** 76,80 ****
  static GtkWidget      *RoadMapCanvasBox   = NULL;
  static GtkWidget      *RoadMapMainMenuBar = NULL;
- static GtkWidget      *RoadMapCurrentMenu = NULL;
  static GtkWidget      *RoadMapMainToolbar = NULL;
  static GtkWidget      *RoadMapMainStatus  = NULL;
--- 76,79 ----
***************
*** 262,266 ****
  
  
! void roadmap_main_add_menu (const char *label) {
  
     GtkWidget *menu_item;
--- 261,277 ----
  
  
! RoadMapMenu roadmap_main_new_menu (const char *title) {
! 
!    return (RoadMapMenu) gtk_menu_new ();
! }
! 
! 
! void roadmap_main_free_menu (RoadMapMenu menu) {
! 
!    gtk_widget_destroy ((GtkWidget *)menu);
! }
! 
! 
! void roadmap_main_add_menu (RoadMapMenu menu, const char *label) {
  
     GtkWidget *menu_item;
***************
*** 277,286 ****
     gtk_menu_shell_append (GTK_MENU_SHELL(RoadMapMainMenuBar), menu_item);
  
!    RoadMapCurrentMenu = gtk_menu_new ();
!    gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item), RoadMapCurrentMenu);
  }
  
  
! void roadmap_main_add_menu_item (const char *label,
                                   const char *tip,
                                   RoadMapCallback callback) {
--- 288,312 ----
     gtk_menu_shell_append (GTK_MENU_SHELL(RoadMapMainMenuBar), menu_item);
  
!    gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item), (GtkWidget *) menu);
  }
  
  
! void roadmap_main_popup_menu (RoadMapMenu menu,
!                               const RoadMapGuiPoint *position) {
! 
!    if (menu != NULL) {
!       gtk_menu_popup (GTK_MENU(menu),
!                       NULL,
!                       NULL,
!                       NULL,
!                       NULL,
!                       0,
!                       gtk_get_current_event_time());
!    }
! }
! 
! 
! void roadmap_main_add_menu_item (RoadMapMenu menu,
!                                  const char *label,
                                   const char *tip,
                                   RoadMapCallback callback) {
***************
*** 288,295 ****
     GtkWidget *menu_item;
  
-    if (RoadMapCurrentMenu == NULL) {
-       roadmap_log (ROADMAP_FATAL, "No menu defined for menu item %s", label);
-    }
- 
     if (label != NULL) {
  
--- 314,317 ----
***************
*** 301,305 ****
        menu_item = gtk_menu_item_new ();
     }
!    gtk_menu_shell_append (GTK_MENU_SHELL(RoadMapCurrentMenu), menu_item);
  
     if (tip != NULL) {
--- 323,328 ----
        menu_item = gtk_menu_item_new ();
     }
!    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item);
!    gtk_widget_show(menu_item);
  
     if (tip != NULL) {
***************
*** 309,315 ****
  
  
! void roadmap_main_add_separator (void) {
  
!    roadmap_main_add_menu_item (NULL, NULL, NULL);
  }
  
--- 332,338 ----
  
  
! void roadmap_main_add_separator (RoadMapMenu menu) {
  
!    roadmap_main_add_menu_item (menu, NULL, NULL, NULL);
  }
  
***************
*** 523,528 ****
        }
     }
- 
-    roadmap_log (ROADMAP_ERROR, "timer 0x%08x not found", callback);
  }
  
--- 546,549 ----

[Roadmap-commit] roadmap/src/gtk2 roadmap_canvas.c,1.9,1.10

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13965

Modified Files:
	roadmap_canvas.c 
Log Message:
A sample popup menu

Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_canvas.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_canvas.c	4 Sep 2005 22:05:57 -0000	1.9
--- roadmap_canvas.c	18 Nov 2005 20:17:23 -0000	1.10
***************
*** 64,68 ****
   * functions, so that we don't care checking if one has been setup.
   */
! static void roadmap_canvas_ignore_mouse (RoadMapGuiPoint *point) {}
  
  static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
--- 64,68 ----
   * functions, so that we don't care checking if one has been setup.
   */
! static void roadmap_canvas_ignore_mouse (int button, RoadMapGuiPoint *point) {}
  
  static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
***************
*** 385,391 ****
  
     switch ((int) data) {
!       case 1: (*RoadMapCanvasMouseButtonPressed) (&point);  break;
!       case 2: (*RoadMapCanvasMouseButtonReleased) (&point); break;
!       case 3: (*RoadMapCanvasMouseMoved) (&point);          break;
     }
  
--- 385,397 ----
  
     switch ((int) data) {
!       case 1:
!          (*RoadMapCanvasMouseButtonPressed) (event->button, &point);
!          break;
!       case 2:
!          (*RoadMapCanvasMouseButtonReleased) (event->button, &point);
!          break;
!       case 3:
!          (*RoadMapCanvasMouseMoved) (0, &point);
!          break;
     }
  

[Roadmap-commit] roadmap/src/gtk roadmap_main.c,1.13,1.14

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13876

Modified Files:
	roadmap_main.c 
Log Message:
Merging in the map editor changes: popup menus (Ehud)

Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** roadmap_main.c	23 Oct 2005 07:28:23 -0000	1.13
--- roadmap_main.c	18 Nov 2005 20:16:56 -0000	1.14
***************
*** 26,29 ****
--- 26,30 ----
   */
  
+ #include <time.h>
  #include <sys/time.h>
  
***************
*** 65,69 ****
  static GtkWidget      *RoadMapCanvasBox   = NULL;
  static GtkWidget      *RoadMapMainMenuBar = NULL;
- static GtkWidget      *RoadMapCurrentMenu = NULL;
  static GtkWidget      *RoadMapMainToolbar = NULL;
  static GtkWidget      *RoadMapMainStatus  = NULL;
--- 66,69 ----
***************
*** 181,185 ****
  
  
! void roadmap_main_add_menu (const char *label) {
  
     GtkWidget *menu_item;
--- 181,196 ----
  
  
! RoadMapMenu roadmap_main_new_menu (const char *title) {
! 
!    return (RoadMapMenu) gtk_menu_new ();
! }
! 
! 
! void roadmap_main_free_menu (RoadMapMenu menu) {
! 
!    gtk_widget_destroy ((GtkWidget *)menu);
! }
! 
! void roadmap_main_add_menu (RoadMapMenu menu, const char *label) {
  
     GtkWidget *menu_item;
***************
*** 196,205 ****
     gtk_menu_bar_append (GTK_MENU_BAR(RoadMapMainMenuBar), menu_item);
  
!    RoadMapCurrentMenu = gtk_menu_new ();
!    gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item), RoadMapCurrentMenu);
  }
  
  
! void roadmap_main_add_menu_item (const char *label,
                                   const char *tip,
                                   RoadMapCallback callback) {
--- 207,216 ----
     gtk_menu_bar_append (GTK_MENU_BAR(RoadMapMainMenuBar), menu_item);
  
!    gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item), (GtkWidget *) menu);
  }
  
  
! void roadmap_main_add_menu_item (RoadMapMenu menu,
!                                  const char *label,
                                   const char *tip,
                                   RoadMapCallback callback) {
***************
*** 207,214 ****
     GtkWidget *menu_item;
  
-    if (RoadMapCurrentMenu == NULL) {
-       roadmap_log (ROADMAP_FATAL, "No menu defined for menu item %s", label);
-    }
- 
     if (label != NULL) {
  
--- 218,221 ----
***************
*** 221,225 ****
        menu_item = gtk_menu_item_new ();
     }
!    gtk_menu_append (GTK_MENU(RoadMapCurrentMenu), menu_item);
  
     if (tip != NULL) {
--- 228,232 ----
        menu_item = gtk_menu_item_new ();
     }
!    gtk_menu_append (GTK_MENU(menu), menu_item);
  
     if (tip != NULL) {
***************
*** 229,235 ****
  
  
! void roadmap_main_add_separator (void) {
  
!    roadmap_main_add_menu_item (NULL, NULL, NULL);
  }
  
--- 236,257 ----
  
  
! void roadmap_main_add_separator (RoadMapMenu menu) {
  
!    roadmap_main_add_menu_item (menu, NULL, NULL, NULL);
! }
! 
! 
! void roadmap_main_popup_menu (RoadMapMenu menu,
!                               const RoadMapGuiPoint *position) {
! 
!    if (menu != NULL) {
!       gtk_menu_popup (GTK_MENU(menu),
!                       NULL,
!                       NULL,
!                       NULL,
!                       NULL,
!                       0,
!                       time(NULL));
!    }
  }
  
***************
*** 427,432 ****
        }
     }
- 
-    roadmap_log (ROADMAP_ERROR, "timer 0x%08x not found", callback);
  }
  
--- 449,452 ----