WebSVN – Kolibri OS – Path Comparison – / – /programs/cmm/ Rev 8456 and /programs/cmm/ Rev 8457

Regard whitespace Rev 8456 → Rev 8457

 /programs/cmm/browser/TWB/TWB.c
 ,8 → 39,7
 struct TWebBrowser {
         llist list;
         STYLE style;
-        dword draw_y, stolbec;
-        int zoom;
+        dword draw_y, draw_x;
         dword o_bufpointer;
         int cur_encoding, custom_encoding;
         bool link, t_html, t_body;
 ,6 → 85,7
         unsigned px; //paint x coordinate
         unsigned pw; //paint y coordinate
            dword pc; //paint color
+           int zoom;
         if (style.title)
         {
 ,37 → 102,37
         if (line)
         {
-                px = stolbec * list.font_w + BODY_MARGIN + list.x;
-                pw = strlen(#line) * zoom * list.font_w;
-                stolbec += strlen(#line) * zoom;
+                pw = strlen(#line) * list.font_w;
+                zoom = list.font_w / BASIC_CHAR_W;
                 style.cur_line_h = math.max(style.cur_line_h, list.item_h);
                 if (bg_colors.get_last() - bg_colors.get(0)) {
-                        canvas.DrawBar(px, draw_y, pw, list.item_h, bg_colors.get_last());
+                        canvas.DrawBar(draw_x, draw_y, pw, list.item_h, bg_colors.get_last());
                 }
                 if (style.image) {
-                        canvas.DrawBar(px, draw_y, pw, list.item_h-1, 0xF9DBCB);
+                        canvas.DrawBar(draw_x, draw_y, pw, list.item_h-1, 0xF9DBCB);
                 }
                 if (style.button) {
-                        canvas.DrawBar(px, draw_y, pw, list.item_h - calc(zoom*2), 0xCCCccc);
-                        canvas.DrawBar(px, draw_y + list.item_h - calc(zoom*2), pw, zoom, 0x999999);
+                        canvas.DrawBar(draw_x, draw_y, pw, list.item_h - calc(zoom*2), 0xCCCccc);
+                        canvas.DrawBar(draw_x, draw_y + list.item_h - calc(zoom*2), pw, zoom, 0x999999);
                 }
                 pc = text_colors.get_last();
                 if (link) && (pc == text_colors.get(0)) pc = link_color_default;
-                canvas.WriteText(px, draw_y, list.font_type, pc, #line, NULL);
-                if (style.b) canvas.WriteText(px+1, draw_y, list.font_type, pc, #line, NULL);
-                if (style.s) canvas.DrawBar(px, list.item_h / 2 - zoom + draw_y, pw, zoom, pc);
-                if (style.u) canvas.DrawBar(px, list.item_h - zoom - zoom + draw_y, pw, zoom, pc);
+                canvas.WriteText(draw_x, draw_y, list.font_type, pc, #line, NULL);
+                if (style.b) canvas.WriteText(draw_x+1, draw_y, list.font_type, pc, #line, NULL);
+                if (style.s) canvas.DrawBar(draw_x, list.item_h / 2 - zoom + draw_y, pw, zoom, pc);
+                if (style.u) canvas.DrawBar(draw_x, list.item_h - zoom - zoom + draw_y, pw, zoom, pc);
                 if (link) {
                         if (line[0]==' ') && (line[1]==NULL) {} else {
-                                canvas.DrawBar(px, draw_y + list.item_h - calc(zoom*2)-1, pw, zoom, link_color_default);
-                                links.add_text(px, draw_y + list.y, pw, list.item_h - calc(zoom*2)-1, zoom);
+                                canvas.DrawBar(draw_x, draw_y + list.item_h - calc(zoom*2)-1, pw, zoom, link_color_default);
+                                links.add_text(draw_x, draw_y + list.y, pw, list.item_h - calc(zoom*2)-1, zoom);
                         }
                 }
+                draw_x += pw;
                 if (debug_mode) debugln(#line);
                 line = NULL;
         }
 ,9 → 156,8
         header = NULL;
         cur_encoding = CH_CP866;
         draw_y = BODY_MARGIN;
-        stolbec = 0;
+        draw_x = BODY_MARGIN;
         line = 0;
-        zoom = 1;
         redirect = '\0';
         //hold original buffer
         if (o_bufpointer) o_bufpointer=free(o_bufpointer);
 ,6 → 176,8
         dword bufpos;
         bufsize = _bufsize;
+        if (list.w!=canvas.bufw) canvas.Init(list.x, list.y, list.w, 400*20);
         if (bufpointer != _bufpointer) {
                 bufpointer = malloc(bufsize);
                 memmov(bufpointer, _bufpointer, bufsize);
 ,7 → 207,7
                         break;
                 case 0x09:
                         if (style.pre) {
-                                tab_len = strlen(#line) + stolbec % 4;
+                                tab_len = draw_x - BODY_MARGIN / list.font_w + strlen(#line) % 4;
                                 if (!tab_len) tab_len = 4; else tab_len = 4 - tab_len;
                                 for (j=0; j<tab_len; j++;) chrcat(#line,' ');
                         } else {
 ,7 → 281,7
         if (!style.pre) && (_char == ' ')
         {
                 if (line[line_len-1]==' ') return; //no double spaces
-                if (!stolbec) && (!line) return; //no paces at the beginning of the line
+                if (draw_x==BODY_MARGIN) && (!line) return; //no paces at the beginning of the line
                 if (link) && (line_len==0) return;
         }
         if (line_len < sizeof(line)) chrcat(#line, _char);
 ,27 → 290,30
 //============================================================================================
 bool TWebBrowser::CheckForLineBreak()
 {
-        int line_break_pos;
-        char new_line_text[4096];
+        int break_pos;
+        char next_line[4096];
+        int zoom = list.font_w / BASIC_CHAR_W;
         //Do we need a line break?
-        if (strlen(#line)*zoom + stolbec < list.column_max) return false;
+        if (strlen(#line) * list.font_w + draw_x < list.w) return false;
         //Yes, we do. Lets calculate where...
-        line_break_pos = strrchr(#line, ' ');
+        break_pos = strrchr(#line, ' ');
         //Is a new line fits in the current line?
-        if (line_break_pos*zoom + stolbec > list.column_max) {
-                line_break_pos = list.column_max/zoom - stolbec;
-                while(line_break_pos) && (line[line_break_pos]!=' ') line_break_pos--;
+        if (break_pos * list.font_w + draw_x > list.w) {
+                break_pos = list.w - draw_x /list.font_w;
+                while(break_pos) && (line[break_pos]!=' ') break_pos--;
         }
         //Maybe a new line is too big for the whole new line? Then we have to split it
-        if (!line_break_pos) && (style.tag_list.level*5 + strlen(#line) * zoom >= list.column_max) {
-                line_break_pos = list.column_max/zoom - stolbec;
+        if (!break_pos) && (style.tag_list.level*5 + strlen(#line) * zoom >= list.column_max) {
+                break_pos = list.w  - draw_x / list.font_w;
         }
-        strcpy(#new_line_text, #line + line_break_pos);
-        line[line_break_pos] = 0x00;
+        strcpy(#next_line, #line + break_pos);
+        line[break_pos] = 0x00;
         Paint();
-        strcpy(#line, #new_line_text);
+        strcpy(#line, #next_line);
         NewLine();
         return true;
 }
 ,25 → 320,21
 //============================================================================================
 void TWebBrowser::NewLine()
 {
-        static int empty_line=0;
+        static bool empty_line = true;
-        if (!stolbec) && (draw_y==BODY_MARGIN) return;
+        if (draw_x==BODY_MARGIN) && (draw_y==BODY_MARGIN) return;
+        if (t_html) && (!t_body) return;
-        if (style.tag_list.level) && (stolbec == style.tag_list.level * 5) {
-                if (empty_line<1) empty_line++;
-                else return;
-        } else if (!stolbec) {
-                if (empty_line<1) empty_line++;
-                else return;
+        if (draw_x == style.tag_list.level * 5 * list.font_w + BODY_MARGIN) {
+                if (!empty_line) empty_line=true; else return;
         } else {
-                empty_line=0;
+                empty_line = false;
         }
-        if (t_html) && (!t_body) return;
         draw_y += style.cur_line_h;
         style.cur_line_h = list.item_h;
-        if (style.blq) stolbec = 6; else stolbec = 0;
-        stolbec += style.tag_list.level * 5;
+        if (style.blq) draw_x = 6 * list.font_w; else draw_x = 0;
+        draw_x += style.tag_list.level * 5 * list.font_w + BODY_MARGIN;
 }
 //============================================================================================
 void TWebBrowser::ChangeEncoding(int _new_encoding)
 ,6 → 354,11
 void TWebBrowser::DrawPage()
 {
+        if (list.w!=canvas.bufw) {
+                ParseHtml(bufpointer, bufsize);
+        }
+        canvas.Show(list.first, list.h);
         scroll_wv.max_area = list.count;
         scroll_wv.cur_area = list.visible;
         scroll_wv.position = list.first;
 ,5 → 368,4
         scroll_wv.size_y = list.h;
         scrollbar_v_draw(#scroll_wv);
-        canvas.Show(list.first, list.h);
 }

 /programs/cmm/browser/TWB/set_style.h
 ,7 → 31,7
         if (tag.is("dl"))         { if (tag.opened) NewLine(); return; }
         if (tag.is("tr"))         { if (tag.opened) NewLine(); return; }
         if (tag.is("td"))         { /*if (tag.opened) AddCharToTheLine(' ');*/ return; }
-        if (tag.is("button"))     { style.button = tag.opened; stolbec++;  return; }
+        if (tag.is("button"))     { style.button = tag.opened; draw_x+=10;  return; }
         if (tag.is("w:r"))        { if (!tag.opened) style.b = false;      return; }
         if (tag.is("h1"))         { tag_h1234_caption();  return; }
         if (tag.is("h2"))         { tag_h1234_caption();  return; }
 ,11 → 180,11
                 if (!style.pre) NewLine();
                 if (style.tag_list.order_type() == 'u') {
                         strcpy(#line, "\31 ");
-                        stolbec = style.tag_list.level * 5 - 2;
+                        draw_x = style.tag_list.level * 5 - 2 * list.font_w + BODY_MARGIN;
                 }
                 if (style.tag_list.order_type() == 'o') {
                         sprintf(#line, "%i. ", style.tag_list.inc_counter());
-                        stolbec = style.tag_list.level * 5 - strlen(#line);
+                        draw_x = style.tag_list.level * 5 - 1 - strlen(#line) * list.font_w + BODY_MARGIN;
                 }
         }
 }
 ,15 → 243,13
                 if (tag.opened) {
                         if (!style.pre) NewLine();
                         draw_y += 10;
-                        zoom=2;
-                        list.font_type |= 10011001b;
+                        list.SetFont(BASIC_CHAR_W*2, 14*2, 10011001b);
                         list.item_h = BASIC_LINE_H * 2 - 2;
                         if (tag.is("h1")) style.b = true;
                 } else {
                         if (tag.is("h1")) style.b = false;
                         NewLine();
-                        zoom=1;
-                        list.font_type = 10011000b;
+                        list.SetFont(BASIC_CHAR_W, 14, 10011000b);
                         style.cur_line_h = list.item_h = BASIC_LINE_H;
                 }
         }
 ,27 → 304,15
         img_h = ESDWORD[cur_img+8];
         img_w = ESDWORD[cur_img+4];
-        if (img_w / 8 + stolbec > list.column_max) {
-                NewLine();
-        }
-        img_x = stolbec*list.font_w + 3;
+        if (img_w + draw_x >= list.w) NewLine();
         img_y = draw_y;
         if (img_h < list.item_h) img_y += list.item_h - img_h / 2 - 1; else img_y -= 2;
+        style.cur_line_h = math.max(style.cur_line_h, img_h);
-        img_w = math.min(img_w, canvas.bufw - img_x);
+        img_w = math.min(img_w, canvas.bufw - draw_x);
-        style.cur_line_h = math.max(list.item_h, img_h);
+        if (link) links.add_text(draw_x + list.x, img_y + list.y, img_w, img_h, 0);
-        stolbec += img_w / 8;
-        if (img_w % 8) stolbec++;
-        if (stolbec > list.column_max) {
-                NewLine();
-        }
-        if (link) links.add_text(img_x + list.x, img_y + list.y, img_w, img_h, 0);
         if (img_y + img_h >= canvas.bufh) canvas.IncreaseBufSize();
         if (ESDWORD[cur_img+20] != IMAGE_BPP32) {
 ,8 → 327,11
         imgbuf[08] = canvas.bufh;
         imgbuf[20] = IMAGE_BPP32;
         imgbuf[24] = buf_data+8;
-        img_blend stdcall(#imgbuf, cur_img, img_x, img_y, 0, 0, img_w, img_h);
+        img_blend stdcall(#imgbuf, cur_img, draw_x, img_y, 0, 0, img_w, img_h);
         img_destroy stdcall(cur_img);
+        draw_x += img_w;
+        if (draw_x >= list.w) NewLine();
         return;
 NOIMG:

 /programs/cmm/browser/WebView.c
 ,7 → 41,7
 //                       DATA                        //
 //                                                   //
 //===================================================//
-char version[]="WebView 3.21";
+char version[]="WebView 3.25";
 #define DEFAULT_URL URL_SERVICE_HOMEPAGE
 ,10 → 220,10
                                         redirect_count++;
                                         HandleRedirect();
                                 } else {
-                                        notify("'Too many redirects.' -E");
                                         StopLoading();
                                         redirect_count = 0;
                                         if (http_get_type==IMG) goto _IMG_RES;
+                                        notify("'Too many redirects.' -E");
                                 }
                         } else {
                                 // Loading the page is complete, free resources
 ,7 → 335,7
 void SetElementSizes()
 {
         omnibox_edit.width = Form.cwidth - omnibox_edit.left - 52 - 16;
-        WB1.list.SetSizes(0, TOOLBAR_H+TAB_H, Form.width - 10 - scroll_wv.size_x,
+        WB1.list.SetSizes(0, TOOLBAR_H+TAB_H, Form.cwidth - scroll_wv.size_x,
                 Form.cheight - TOOLBAR_H - STATUSBAR_H - TAB_H, BASIC_LINE_H);
         WB1.list.wheel_size = 7 * BASIC_LINE_H;
         WB1.list.column_max = WB1.list.w - scroll_wv.size_x / WB1.list.font_w + 1;
 ,7 → 366,9
         DrawRectangle(WB1.list.x + WB1.list.w, WB1.list.y, scroll_wv.size_x,
                 WB1.list.h-1, scroll_wv.bckg_col);
-        if (!BrowserWidthChanged()) {
+        if (!canvas.bufw) {
+                OpenPage(history.current());
+        } else {
                 WB1.DrawPage();
                 DrawOmnibox();
         }
 ,24 → 377,6
         DrawTabsBar();
 }
-bool BrowserWidthChanged()
-{
-        dword source_mode_holder;
-        if (WB1.list.w!=canvas.bufw) {
-                canvas.Init(WB1.list.x, WB1.list.y, WB1.list.w, 400*20);
-                if (!strncmp(history.current(),"http",4)) {
-                        //nihuya ne izyashnoe reshenie, no pust' poka butet tak
-                        source_mode_holder = source_mode;
-                        LoadInternalPage(#loading_text, sizeof(loading_text));
-                        source_mode = source_mode_holder;
-                }
-                OpenPage(history.current());
-                return true;
-        }
-        return false;
-}
 void EventChangeEncodingAndLoadPage(int _new_encoding)
 {
         dword newbuf, newsize;
 ,6 → 545,7
                 history.add(#new_url);
                 if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home));
                 else if (streq(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#buildin_page_help, sizeof(buildin_page_help));
+                else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test));
                 else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
                 else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 ,7 → 935,7
         if (_new) return;
         DrawOmnibox();
         DrawStatusBar(T_RENDERING);
-        WB1.ParseHtml(WB1.o_bufpointer, WB1.bufsize);
+        WB1.ParseHtml(WB1.bufpointer, WB1.bufsize);
         WB1.DrawPage();
         debugln(sprintf(#param, T_DONE_IN_SEC, GetStartTime()-render_start_time/100));
         DrawStatusBar(NULL);

 /programs/cmm/browser/const.h
 ,6 → 2,7
 char buildin_page_error[] = FROM "res/page_not_found_ru.htm""\0";
 char buildin_page_home[]  = FROM "res/homepage_ru.htm""\0";
 char buildin_page_help[]  = FROM "res/help_ru.htm""\0";
+char buildin_page_test[]  = FROM "res/test.htm""\0";
 char accept_language[]= "Accept-Language: ru\n";
 char rmb_menu[] =
 "®á¬®âà¥âì ¨áå®¤¨ª|Ctrl+U
 ,9 → 67,12
 #define URL_SERVICE_HISTORY "WebView:history"
 #define URL_SERVICE_HOMEPAGE "WebView:home"
 #define URL_SERVICE_HELP "WebView:help"
+#define URL_SERVICE_TEST "WebView:test"
 char webview_shared[] = "WEBVIEW";
+#define BASIC_CHAR_W 8
 enum {
         NEW_TAB=600,
         ENCODINGS=700,

/programs/cmm/browser/res/page_not_found_en.htm
12,5 → 12,3
<li>Browser doesn't handled properly server's response.<br>
Please, report an error.<br>
</ul>
</body>
</html>

 /programs/cmm/browser/tabs.h
 ,6 → 146,7
         if (_id == tab.active) {
                 tab.close(_id);
                 tab.restore(tab.active);
+                SetElementSizes();
                 WB1.ParseHtml(WB1.bufpointer, WB1.bufsize);
                 WB1.DrawPage();
                 SetOmniboxText(history.current());
 ,11 → 167,10
         if (_id==-1) _id = tab.count-1;
         tab.save_state();
         tab.restore(_id);
-        if (!BrowserWidthChanged()) {
                 DrawTabsBar();
+        SetElementSizes();
                 WB1.ParseHtml(WB1.bufpointer, WB1.bufsize);
                 WB1.DrawPage();
-        }
         SetOmniboxText(history.current());
 }

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8456 → Rev 8457