Attachment 153380 Details for Bug 230593 – patch

[patch] patch

half-open-ranges.patch (text/plain), 2.55 KB, created by Matthias Clasen on 2007-04-24 20:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2007-04-24 20:25:06 UTC

Size: 2.55 KB

patch

obsolete

>Index: gtk/gtkprintoperation.c
>===================================================================
>--- gtk/gtkprintoperation.c	(revision 17618)
>+++ gtk/gtkprintoperation.c	(working copy)
>@@ -214,7 +214,7 @@
>       for (i = 0; i < priv->num_page_ranges; i++)
> 	{
> 	  if (page_nr >= priv->page_ranges[i].start &&
>-	      page_nr <= priv->page_ranges[i].end)
>+	      (page_nr <= priv->page_ranges[i].end || page_ranges[i].end == -1)
> 	    return TRUE;
> 	}
>       return FALSE;
>@@ -2018,6 +2018,7 @@
>   GtkPrintOperationPrivate *priv; 
>   GtkPageSetup *page_setup;
>   gboolean done = FALSE;
>+  gint i;
> 
>   data = (PrintPagesData*)user_data;
>   priv = data->op->priv;
>@@ -2067,6 +2068,9 @@
> 	{
> 	  data->ranges = priv->page_ranges;
> 	  data->num_ranges = priv->num_page_ranges;
>+          for (i = 0; i < data->num_ranges; i++)
>+            if (data->ranges[i].end == -1)
>+              data->ranges[i].end = priv->nr_of_pages - 1;
> 	}
>       else if (priv->print_pages == GTK_PRINT_PAGES_CURRENT &&
> 	       priv->current_page != -1)
>Index: gtk/gtkprintunixdialog.c
>===================================================================
>--- gtk/gtkprintunixdialog.c	(revision 17618)
>+++ gtk/gtkprintunixdialog.c	(working copy)
>@@ -1652,22 +1652,33 @@
>   p = text;
>   while (*p)
>     {
>-      start = (int)strtol (p, &next, 10);
>-      if (start < 1)
>-	start = 1;
>+      while (isspace (*p)) p++;
>+
>+      if (*p == '-')
>+        {
>+          /* a half-open range like -2 */
>+          start = 1;
>+        }
>+      else
>+        {
>+          start = (int)strtol (p, &next, 10);
>+          if (start < 1)
>+	    start = 1;
>+          p = next;
>+        }
>+      
>       end = start;
> 
>-      if (next != p)
>+      while (isspace (*p)) p++;
>+
>+      if (*p == '-')
> 	{
>-	  p = next;
>-
>-	  if (*p == '-')
>-	    {
>-	      p++;
>-	      end = (int)strtol (p, NULL, 10);
>-	      if (end < start)
>-		end = start;
>-	    }
>+	  p++;
>+	  end = (int)strtol (p, &next, 10);
>+          if (next == p) /* a half-open range like 2- */
>+            end = 0;
>+	  else if (end < start)
>+	    end = start;
> 	}
> 
>       ranges[i].start = start - 1;
>@@ -1685,6 +1696,9 @@
> 
>   *n_ranges_out = i;
>   
>+  for (i = 0; i < *n_ranges_out; i++)
>+    g_print ("[%d, %d]\n", ranges[i].start, ranges[i].end);
>+
>   return ranges;
> }
> 
>@@ -1702,6 +1716,8 @@
>       g_string_append_printf (s, "%d", ranges[i].start + 1);
>       if (ranges[i].end > ranges[i].start)
> 	g_string_append_printf (s, "-%d", ranges[i].end + 1);
>+      else if (ranges[i].end == -1)
>+        g_string_append (s, "-");
>       
>       if (i != n_ranges - 1)
> 	g_string_append (s, ",");

Actions: View | Diff

Attachments on bug 230593: 153380