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

[Paul F. <pg...@us...>]

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

Modified Files:
	roadmap_canvas.c 
Log Message:
the canvas layer can now report whether or not it can print angled
text, via new optional return arg from roadmap_canvas_get_text_extents().
all desktops now fall back to horizontal text if the interntal line font
is turned off with -DROADMAP_NO_LINEFONT, and if no other angling (e.g.,
agg, or QT's rotate transform) is available.


Index: roadmap_canvas.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_canvas.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** roadmap_canvas.c	26 Jun 2006 19:54:01 -0000	1.9
--- roadmap_canvas.c	13 Jul 2006 15:47:53 -0000	1.10
***************
*** 81,85 ****
  
  void roadmap_canvas_get_text_extents 
!         (const char *text, int size, int *width, int *ascent, int *descent) {
  
      static int RoadMapCanvasAscent = 0;
--- 81,86 ----
  
  void roadmap_canvas_get_text_extents 
!         (const char *text, int size, int *width,
!             int *ascent, int *descent, int *can_tilt) {
  
      static int RoadMapCanvasAscent = 0;
***************
*** 113,116 ****
--- 114,118 ----
      *ascent  = RoadMapCanvasAscent;
      *descent = RoadMapCanvasDescent;
+     if (can_tilt) *can_tilt = 0;
  }
  
***************
*** 206,210 ****
  
     roadmap_canvas_get_text_extents 
!         (text, -1, &text_width, &text_ascent, &text_descent);
  
     switch (corner) {
--- 208,212 ----
  
     roadmap_canvas_get_text_extents 
!         (text, -1, &text_width, &text_ascent, &text_descent, NULL);
  
     switch (corner) {
***************
*** 279,283 ****
  void roadmap_canvas_draw_multiple_polygons
           (int count, int *polygons, RoadMapGuiPoint *points, int filled,
! 	    int fast_draw) {
  
     int i;
--- 281,285 ----
  void roadmap_canvas_draw_multiple_polygons
           (int count, int *polygons, RoadMapGuiPoint *points, int filled,
!             int fast_draw) {
  
     int i;
***************
*** 298,302 ****
  void roadmap_canvas_draw_multiple_circles
          (int count, RoadMapGuiPoint *centers, int *radius, int filled,
! 	    int fast_draw) {
  
     int i;
--- 300,304 ----
  void roadmap_canvas_draw_multiple_circles
          (int count, RoadMapGuiPoint *centers, int *radius, int filled,
!             int fast_draw) {
  
     int i;