ebook.patch

--- old/default.c   2012-05-16 09:49:47.000000000 -0400
+++ links2.3/default.c  2012-05-10 15:46:54.000000000 -0400
@@ -140,10 +140,26 @@
    return "";
 }

+#if 1 /* ZIPIT_Z2 */
+/* Use off white for background on ZIPIT instead of ugly gray. */
+unsigned int default_bgcolor = 0xFFFFDD;
+
+unsigned char *parse_options(int argc, unsigned char *argv[])
+{
+   unsigned char *retval;
+   retval = p_arse_options(argc, argv, all_options);
+   default_bg_g.r = (default_bgcolor >> 16) & 0xFF;
+   default_bg_g.g = (default_bgcolor >>  8) & 0xFF;
+   default_bg_g.b = (default_bgcolor      ) & 0xFF;
+   return retval;
+}
+
+#else
 unsigned char *parse_options(int argc, unsigned char *argv[])
 {
    return p_arse_options(argc, argv, all_options);
 }
+#endif

 unsigned char *get_token(unsigned char **line)
 {
@@ -426,6 +442,11 @@
    return;
    ok:
    parse_config_file(config_file, c, all_options);
+#if 1 /* ZIPIT_Z2 */
+   default_bg_g.r = (default_bgcolor >> 16) & 0xFF;
+   default_bg_g.g = (default_bgcolor >>  8) & 0xFF;
+   default_bg_g.b = (default_bgcolor      ) & 0xFF;
+#endif
    mem_free(c);
    mem_free(config_file);
 }
@@ -1474,7 +1495,13 @@
 struct rgb default_vlink = { 255, 255, 0, 0 };

 struct rgb default_fg_g = { 0, 0, 0, 0 };
+#if 1 /* ZIPIT_Z2 */
+/* Use off white for background on ZIPIT instead of ugly gray. */
+struct rgb default_bg_g = { 0xFF, 0xFF, 0xDD, 0 };
+//unsigned int default_bgcolor = 0xFFFFDD;
+#else
 struct rgb default_bg_g = { 192, 192, 192, 0 };
+#endif
 struct rgb default_link_g = { 0, 0, 255, 0 };
 struct rgb default_vlink_g = { 0, 0, 128, 0 };

@@ -1621,6 +1648,9 @@
    {1, gen_cmd, num_rd, num_wr, 0, 1, &dds.target_in_new_window, "html_target_in_new_window", "html-target-in-new-window"},
    {1, gen_cmd, num_rd, num_wr, 0, 9, &dds.margin, "html_margin", "html-margin"},
    {1, gen_cmd, num_rd, num_wr, 1, MAX_FONT_SIZE, &dds.font_size, "html_font_size", "html-user-font-size"},
+#if 1 /* ZIPIT_Z2 */
+   {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &default_bgcolor, "html_default_bgcolor", "html-default-bgcolor"},
+#endif
    {0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL},
 };

--- old/setup.h 2012-05-16 09:49:54.000000000 -0400
+++ links2.3/setup.h    2012-05-10 11:19:22.000000000 -0400
@@ -138,7 +138,12 @@
 #define G_DIALOG_BUTTON_L      "[ "
 #define G_DIALOG_BUTTON_R      " ]"

+#if 1 /* ZIPIT_Z2 */
+/* Shave a few pixels off the big fat scroll bar. */
+#define G_SCROLL_BAR_WIDTH     8
+#else
 #define G_SCROLL_BAR_WIDTH     12
+#endif
 #define G_SCROLL_BAR_MIN_SIZE      20
 #define G_DEFAULT_SCROLL_BAR_FRAME_COLOR   0x000000
 #define G_DEFAULT_SCROLL_BAR_AREA_COLOR        0xc0c0c0
--- old/view_gr.c   2012-05-16 09:49:42.000000000 -0400
+++ links2.3/view_gr.c  2012-05-11 14:55:13.000000000 -0400
@@ -989,6 +989,43 @@
    }
 }

+#if 1 /* ZIPIT_Z2 */
+unsigned char scrollmark_file[MAX_STR_LEN]="";
+static int read_scrollmark(struct session *ses, struct f_data_c *fd, int a)
+{
+   unsigned int pos = 0;
+   unsigned char *buf;
+
+   if (!*scrollmark_file)
+       snprintf(scrollmark_file,MAX_STR_LEN,"%sscrollmark.cfg",links_home?links_home:(unsigned char*)"");
+
+   buf=read_config_file(scrollmark_file);
+   if (a && buf){
+       pos = atoi(buf);
+       unset_link(fd);
+       if (pos > fd->f_data->y - fd->yw + fd->f_data->hsb * G_SCROLL_BAR_WIDTH) {
+           return 0;
+       }
+       fd->vs->view_pos = pos;
+       fd->vs->orig_view_pos = fd->vs->view_pos;
+       return 3;
+   }
+   return 0;
+}
+
+static int write_scrollmark(struct session *ses, struct f_data_c *f)
+{
+   unsigned char buf[80];
+   unsigned int pos = 0;
+
+   if (!*scrollmark_file)
+     read_scrollmark(ses, f, 0); /* 0 means just read, do not scroll*/
+
+   sprintf(buf, "%d\n", f->vs->view_pos);
+   write_to_config_file(scrollmark_file, buf);
+}
+#endif /* ZIPIT_Z2 */
+
 int g_frame_ev(struct session *ses, struct f_data_c *fd, struct event *ev)
 {
    if (!fd->f_data) return 0;
@@ -1146,6 +1183,10 @@
                return enter(ses, fd, 0);
            }
 #if 1 /* ZIPIT_Z2 */
+           /* Add scroll mark for ZIPIT_Z2 ereading. */
+           if (upcase(ev->x) == 'R' && !(ev->y & (KBD_CTRL | KBD_ALT))) return read_scrollmark(ses,fd, 1);
+           if (upcase(ev->x) == 'M' && !(ev->y & (KBD_CTRL | KBD_ALT))) return write_scrollmark(ses,fd);
+
            /* Add more conveient croll keys for ZIPIT_Z2 */
            if (ev->x == KBD_PAGE_DOWN || (upcase(ev->x) == 'F' && ev->y & KBD_CTRL)) {
 #else