# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1318792373 0
# Node ID 75a773cdb626643e9280ca53a4ba210f6d541e58
# Parent  437b045a3b07c3d11a616a06b456868e55034881
Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font().
Also added multi-page printing code to the test program to make sure that works properly on all platforms.
It will print the selected file on page 2, or a centered error message if none is selected.

diff -r 437b045a3b07 -r 75a773cdb626 dwtest.c
--- a/dwtest.c	Tue Oct 11 23:37:21 2011 +0000
+++ b/dwtest.c	Sun Oct 16 19:12:53 2011 +0000
@@ -307,8 +307,10 @@
     }
 }
 
-void draw_file( int row, int col )
+/* When hpma is not NULL we are printing.. so handle things differently */
+void draw_file( int row, int col, int nrows, int fheight, HPIXMAP hpma )
 {
+    HPIXMAP hpm = hpma ? hpma : text2pm;
     char buf[10];
     int i,y,fileline;
     char *pLine;
@@ -316,25 +318,33 @@
     if ( current_file )
     {
         dw_color_foreground_set(DW_CLR_WHITE);
-        dw_draw_rect(0, text1pm, TRUE, 0, 0, (int)DW_PIXMAP_WIDTH(text1pm), (int)DW_PIXMAP_HEIGHT(text1pm));
-        dw_draw_rect(0, text2pm, TRUE, 0, 0, (int)DW_PIXMAP_WIDTH(text2pm), (int)DW_PIXMAP_HEIGHT(text2pm));
+        if(!hpma)
+            dw_draw_rect(0, text1pm, TRUE, 0, 0, (int)DW_PIXMAP_WIDTH(text1pm), (int)DW_PIXMAP_HEIGHT(text1pm));
+        dw_draw_rect(0, hpm, TRUE, 0, 0, (int)DW_PIXMAP_WIDTH(hpm), (int)DW_PIXMAP_HEIGHT(hpm));
 
-        for ( i = 0;(i < rows) && (i+row < num_lines); i++)
+        for ( i = 0;(i < nrows) && (i+row < num_lines); i++)
         {
             fileline = i + row - 1;
-            y = i*font_height;
+            y = i*fheight;
             dw_color_background_set( 1 + (fileline % 15) );
             dw_color_foreground_set( fileline < 0 ? DW_CLR_WHITE : fileline % 16 );
-            sprintf( buf, "%6.6d", i+row );
-            dw_draw_text( 0, text1pm, 0, y, buf);
+            if(!hpma)
+            {
+                sprintf( buf, "%6.6d", i+row );
+                dw_draw_text( 0, text1pm, 0, y, buf);
+            }
             pLine = lp[i+row];
-            dw_draw_text( 0, text2pm, 0, y, pLine+col );
+            dw_draw_text( 0, hpm, 0, y, pLine+col );
         }
-        text_expose( textbox1, NULL, NULL);
-        text_expose( textbox2, NULL, NULL);
+        if(!hpma)
+        {
+            text_expose( textbox1, NULL, NULL);
+            text_expose( textbox2, NULL, NULL);
+        }
     }
 }
 
+/* When hpma is not NULL we are printing.. so handle things differently */
 void draw_shapes(int direct, HPIXMAP hpma)
 {
     HPIXMAP hpm = hpma ? hpma : text2pm;
@@ -375,7 +385,7 @@
             draw_shapes(TRUE, NULL);
             break;
         case 2:
-            draw_file(current_row, current_col);
+            draw_file(current_row, current_col, rows, font_height, NULL);
             break;
     }
 }
@@ -383,13 +393,49 @@
 int DWSIGNAL draw_page(HPRINT print, HPIXMAP pixmap, int page_num, void *data)
 {
    dw_pixmap_set_font(pixmap, FIXEDFONT);
-   draw_shapes(FALSE, pixmap);
+   if(page_num == 0)
+   {
+       draw_shapes(FALSE, pixmap);
+   }
+   else if(page_num == 1)
+   {
+       /* Get the font size for this printer context... */
+       int fheight, fwidth;
+       
+       /* If we have a file to display... */
+       if(current_file)
+       {
+           int nrows;
+           
+           /* Calculate new dimensions */
+           dw_font_text_extents_get(NULL, pixmap, "(g", NULL, &fheight);
+           nrows = (int)(DW_PIXMAP_HEIGHT(pixmap) / fheight);
+       
+           /* Do the actual drawing */
+           draw_file(0, 0, nrows, fheight, pixmap);
+       }
+       else
+       {
+           /* We don't have a file so center an error message on the page */
+           char *text = "No file currently selected!";
+           int posx, posy;
+           
+           dw_font_text_extents_get(NULL, pixmap, text, &fwidth, &fheight);
+           
+           posx = (int)(DW_PIXMAP_WIDTH(pixmap) - fwidth)/2;
+           posy = (int)(DW_PIXMAP_HEIGHT(pixmap) - fheight)/2;
+           
+           dw_color_foreground_set(DW_CLR_BLACK);
+           dw_color_background_set(DW_CLR_WHITE);
+           dw_draw_text(NULL, pixmap, posx, posy, text);
+       }
+   }
    return TRUE;
 }
 
 int DWSIGNAL print_callback(HWND window, void *data)
 {
-   HPRINT print = dw_print_new("DWTest Job", 0, 1, DW_SIGNAL_FUNC(draw_page), NULL);
+   HPRINT print = dw_print_new("DWTest Job", 0, 2, DW_SIGNAL_FUNC(draw_page), NULL);
    dw_print_run(print, 0);
    return FALSE;
 }
diff -r 437b045a3b07 -r 75a773cdb626 mac/dw.m
--- a/mac/dw.m	Tue Oct 11 23:37:21 2011 +0000
+++ b/mac/dw.m	Sun Oct 16 19:12:53 2011 +0000
@@ -5031,22 +5031,28 @@
 {
     id object = handle;
     NSString *nstr = [NSString stringWithUTF8String:text];
+    NSFont *font = nil;
+    /* Check the pixmap for associated object or font */
     if(pixmap)
     {
         object = pixmap->handle;
+        font = pixmap->font;
     }
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-    if([object isMemberOfClass:[DWRender class]] || [object isKindOfClass:[NSControl class]])
-    {
-        NSFont *font = [object font];
-
-        if(font)
-        {
-            [dict setValue:font forKey:NSFontAttributeName];
-        }
-    }
+    /* If we didn't get a font from the pixmap... try the associated object */
+    if(!font && ([object isMemberOfClass:[DWRender class]] || [object isKindOfClass:[NSControl class]]))
+    {
+        font = [object font];
+    }
+    /* If we got a font... add it to the dictionary */
+    if(font)
+    {
+        [dict setValue:font forKey:NSFontAttributeName];
+    }
+    /* Calculate the size of the string */
     NSSize size = [nstr sizeWithAttributes:dict];
     [dict release];
+    /* Return whatever information we can */
     if(width)
     {
         *width = size.width;