chiark / gitweb /
~mdw / disorder / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13affe6)
misc improvements to man page popup
authorRichard Kettlewell <rjk@greenend.org.uk>
Sun, 21 Oct 2007 19:38:13 +0000 (20:38 +0100)
committerRichard Kettlewell <rjk@greenend.org.uk>
Sun, 21 Oct 2007 19:38:13 +0000 (20:38 +0100)
disobedience/help.c patch | blob | blame | history
scripts/htmlman patch | blob | blame | history

diff --git a/disobedience/help.c b/disobedience/help.c
index 09de980628c61ef653223a5246e31da71e7eb4a9..f8e660f53b24c71a1aaad750ec6a99a90550680f 100644 (file)
--- a/disobedience/help.c
+++ b/disobedience/help.c
@@ -45,13 +45,17 @@ static void init_italic(GtkTextTag *tag) {
   g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, (char *)0);
 }
 
   g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, (char *)0);
 }
 
+static void init_pre(GtkTextTag *tag) {
+  g_object_set(G_OBJECT(tag), "family", "monospace", (char *)0);
+}
 /** @brief Table of known tags
  *
  * Keep in alphabetical order
  */
 static  struct tag tags[] = {
   { "b", init_bold, 0 },
 /** @brief Table of known tags
  *
  * Keep in alphabetical order
  */
 static  struct tag tags[] = {
   { "b", init_bold, 0 },
-  { "i", init_italic, 0 }
+  { "i", init_italic, 0 },
+  { "pre", init_pre, 0 }
 };
 
 /** @brief Number of known tags */
 };
 
 /** @brief Number of known tags */
@@ -65,6 +69,12 @@ struct state {
   /** @brief True if we are inside <body> */
   int body;
 
   /** @brief True if we are inside <body> */
   int body;
 
+  /** @brief True if inside <pre> */
+  int pre;
+
+  /** @brief True if a space is required before any non-space */
+  int space;
+
   /** @brief Stack of marks corresponding to tags */
   struct markstack marks[1];
 
   /** @brief Stack of marks corresponding to tags */
   struct markstack marks[1];
 
@@ -78,7 +88,9 @@ static void html_open(const char *tag,
   GtkTextIter iter[1];
 
   if(!strcmp(tag, "body"))
   GtkTextIter iter[1];
 
   if(!strcmp(tag, "body"))
-    s->body = 1;
+    ++s->body;
+  else if(!strcmp(tag, "pre"))
+    ++s->pre;
   if(!s->body)
     return;
   /* push a mark for the start of the region */
   if(!s->body)
     return;
   /* push a mark for the start of the region */
@@ -99,7 +111,11 @@ static void html_close(const char *tag,
   int n;
 
   if(!strcmp(tag, "body"))
   int n;
 
   if(!strcmp(tag, "body"))
-    s->body = 0;
+    --s->body;
+  else if(!strcmp(tag, "pre")) {
+    --s->pre;
+    s->space = 0;
+  }
   if(!s->body)
     return;
   /* see if this is a known tag */
   if(!s->body)
     return;
   /* see if this is a known tag */
@@ -125,6 +141,24 @@ static void html_text(const char *text,
   /* ignore header */
   if(!s->body)
     return;
   /* ignore header */
   if(!s->body)
     return;
+  if(!s->pre) {
+    char *formatted = xmalloc(strlen(text) + 1), *t = formatted;
+    /* normalize spacing */
+    while(*text) {
+      if(isspace((unsigned char)*text)) {
+       s->space = 1;
+       ++text;
+      } else {
+       if(s->space) {
+         *t++ = ' ';
+         s->space = 0;
+       }
+       *t++ = *text++;
+      }
+    }
+    *t = 0;
+    text = formatted;
+  }
   gtk_text_buffer_insert_at_cursor(s->buffer, text, strlen(text));
 }
 
   gtk_text_buffer_insert_at_cursor(s->buffer, text, strlen(text));
 }
 
@@ -178,9 +212,11 @@ void popup_help(void) {
                   G_CALLBACK(gtk_widget_destroyed), &help_window);
   gtk_window_set_title(GTK_WINDOW(help_window), "Disobedience Manual");
   view = gtk_text_view_new_with_buffer(html_buffer(manual));
                   G_CALLBACK(gtk_widget_destroyed), &help_window);
   gtk_window_set_title(GTK_WINDOW(help_window), "Disobedience Manual");
   view = gtk_text_view_new_with_buffer(html_buffer(manual));
+  gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
   gtk_container_add(GTK_CONTAINER(help_window),
                    scroll_widget(view,
                                  "help"));
   gtk_container_add(GTK_CONTAINER(help_window),
                    scroll_widget(view,
                                  "help"));
+  gtk_window_set_default_size(GTK_WINDOW(help_window), 480, 512);
   gtk_widget_show_all(help_window);
 }
 
   gtk_widget_show_all(help_window);
 }
 
diff --git a/scripts/htmlman b/scripts/htmlman
index 82a33ca20c822bb3650fb29f0261665d16470b62..54faee114f283e13021e9ddeaf0461a152ad3a99 100755 (executable)
--- a/scripts/htmlman
+++ b/scripts/htmlman
@@ -55,6 +55,7 @@ printf "   <pre class=manpage>"
 # this is kind of painful using only BREs
 nroff -man "$1" | sed \
                       '1d;$d;
 # this is kind of painful using only BREs
 nroff -man "$1" | sed \
                       '1d;$d;
+                       1,/./{/^$/d};
                        s/&/\&amp;/g;
                        s/</\&lt;/g;
                        s/>/\&gt;/g;
                        s/&/\&amp;/g;
                        s/</\&lt;/g;
                        s/>/\&gt;/g;
Multi-user software jukebox -- https://www.greenend.org.uk/rjk/disorder/