Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/a548275fa238870075fc3c9a5076a731d3d11a9e
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/a548275fa238870075fc3c9a5076a731d3d11a9e
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/a548275fa238870075fc3c9a5076a731d3d11a9e

The branch, master has been updated
       via  a548275fa238870075fc3c9a5076a731d3d11a9e (commit)
       via  317a1dd92326e5bd189d529e395f5d6917d6bbab (commit)
      from  d9bd357802795ba3b30d280bafe2c66daa44be54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/a548275fa238870075fc3c9a5076a731d3d11a9e
commit a548275fa238870075fc3c9a5076a731d3d11a9e
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Avoid forward declaration of functions.  Add missing comment to one 
function.

diff --git a/render/html_interaction.c b/render/html_interaction.c
index 7edde10..a74e99d 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -46,8 +46,135 @@
 #include "utils/utils.h"
 
 
-static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap);
-static void html_box_drag_start(struct box *box, int x, int y);
+/**
+ * Get pointer shape for given box
+ *
+ * \param box       box in question
+ * \param imagemap  whether an imagemap applies to the box
+ */
+
+static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
+{
+       browser_pointer_shape pointer;
+       css_computed_style *style;
+       enum css_cursor_e cursor;
+       lwc_string **cursor_uris;
+
+       if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
+               style = box->children->style;
+       else
+               style = box->style;
+
+       if (style == NULL)
+               return BROWSER_POINTER_DEFAULT;
+
+       cursor = css_computed_cursor(style, &cursor_uris);
+
+       switch (cursor) {
+       case CSS_CURSOR_AUTO:
+               if (box->href || (box->gadget &&
+                               (box->gadget->type == GADGET_IMAGE ||
+                               box->gadget->type == GADGET_SUBMIT)) ||
+                               imagemap) {
+                       /* link */
+                       pointer = BROWSER_POINTER_POINT;
+               } else if (box->gadget &&
+                               (box->gadget->type == GADGET_TEXTBOX ||
+                               box->gadget->type == GADGET_PASSWORD ||
+                               box->gadget->type == GADGET_TEXTAREA)) {
+                       /* text input */
+                       pointer = BROWSER_POINTER_CARET;
+               } else {
+                       /* html content doesn't mind */
+                       pointer = BROWSER_POINTER_AUTO;
+               }
+               break;
+       case CSS_CURSOR_CROSSHAIR:
+               pointer = BROWSER_POINTER_CROSS;
+               break;
+       case CSS_CURSOR_POINTER:
+               pointer = BROWSER_POINTER_POINT;
+               break;
+       case CSS_CURSOR_MOVE:
+               pointer = BROWSER_POINTER_MOVE;
+               break;
+       case CSS_CURSOR_E_RESIZE:
+               pointer = BROWSER_POINTER_RIGHT;
+               break;
+       case CSS_CURSOR_W_RESIZE:
+               pointer = BROWSER_POINTER_LEFT;
+               break;
+       case CSS_CURSOR_N_RESIZE:
+               pointer = BROWSER_POINTER_UP;
+               break;
+       case CSS_CURSOR_S_RESIZE:
+               pointer = BROWSER_POINTER_DOWN;
+               break;
+       case CSS_CURSOR_NE_RESIZE:
+               pointer = BROWSER_POINTER_RU;
+               break;
+       case CSS_CURSOR_SW_RESIZE:
+               pointer = BROWSER_POINTER_LD;
+               break;
+       case CSS_CURSOR_SE_RESIZE:
+               pointer = BROWSER_POINTER_RD;
+               break;
+       case CSS_CURSOR_NW_RESIZE:
+               pointer = BROWSER_POINTER_LU;
+               break;
+       case CSS_CURSOR_TEXT:
+               pointer = BROWSER_POINTER_CARET;
+               break;
+       case CSS_CURSOR_WAIT:
+               pointer = BROWSER_POINTER_WAIT;
+               break;
+       case CSS_CURSOR_PROGRESS:
+               pointer = BROWSER_POINTER_PROGRESS;
+               break;
+       case CSS_CURSOR_HELP:
+               pointer = BROWSER_POINTER_HELP;
+               break;
+       default:
+               pointer = BROWSER_POINTER_DEFAULT;
+               break;
+       }
+
+       return pointer;
+}
+
+
+/**
+ * Start drag scrolling the contents of a box
+ *
+ * \param box  the box to be scrolled
+ * \param x    x ordinate of initial mouse position
+ * \param y    y ordinate
+ */
+
+static void html_box_drag_start(struct box *box, int x, int y)
+{
+       int box_x, box_y;
+       int scroll_mouse_x, scroll_mouse_y;
+
+       box_coords(box, &box_x, &box_y);
+
+       if (box->scroll_x != NULL) {
+               scroll_mouse_x = x - box_x ;
+               scroll_mouse_y = y - (box_y + box->padding[TOP] +
+                               box->height + box->padding[BOTTOM] -
+                               SCROLLBAR_WIDTH);
+               scrollbar_start_content_drag(box->scroll_x,
+                               scroll_mouse_x, scroll_mouse_y);
+       } else if (box->scroll_y != NULL) {
+               scroll_mouse_x = x - (box_x + box->padding[LEFT] +
+                               box->width + box->padding[RIGHT] -
+                               SCROLLBAR_WIDTH);
+               scroll_mouse_y = y - box_y;
+
+               scrollbar_start_content_drag(box->scroll_y,
+                               scroll_mouse_x, scroll_mouse_y);
+       }
+}
 
 
 /**
@@ -722,96 +849,6 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
 }
 
 
-browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
-{
-       browser_pointer_shape pointer;
-       css_computed_style *style;
-       enum css_cursor_e cursor;
-       lwc_string **cursor_uris;
-
-       if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
-               style = box->children->style;
-       else
-               style = box->style;
-
-       if (style == NULL)
-               return BROWSER_POINTER_DEFAULT;
-
-       cursor = css_computed_cursor(style, &cursor_uris);
-
-       switch (cursor) {
-       case CSS_CURSOR_AUTO:
-               if (box->href || (box->gadget &&
-                               (box->gadget->type == GADGET_IMAGE ||
-                               box->gadget->type == GADGET_SUBMIT)) ||
-                               imagemap) {
-                       /* link */
-                       pointer = BROWSER_POINTER_POINT;
-               } else if (box->gadget &&
-                               (box->gadget->type == GADGET_TEXTBOX ||
-                               box->gadget->type == GADGET_PASSWORD ||
-                               box->gadget->type == GADGET_TEXTAREA)) {
-                       /* text input */
-                       pointer = BROWSER_POINTER_CARET;
-               } else {
-                       /* html content doesn't mind */
-                       pointer = BROWSER_POINTER_AUTO;
-               }
-               break;
-       case CSS_CURSOR_CROSSHAIR:
-               pointer = BROWSER_POINTER_CROSS;
-               break;
-       case CSS_CURSOR_POINTER:
-               pointer = BROWSER_POINTER_POINT;
-               break;
-       case CSS_CURSOR_MOVE:
-               pointer = BROWSER_POINTER_MOVE;
-               break;
-       case CSS_CURSOR_E_RESIZE:
-               pointer = BROWSER_POINTER_RIGHT;
-               break;
-       case CSS_CURSOR_W_RESIZE:
-               pointer = BROWSER_POINTER_LEFT;
-               break;
-       case CSS_CURSOR_N_RESIZE:
-               pointer = BROWSER_POINTER_UP;
-               break;
-       case CSS_CURSOR_S_RESIZE:
-               pointer = BROWSER_POINTER_DOWN;
-               break;
-       case CSS_CURSOR_NE_RESIZE:
-               pointer = BROWSER_POINTER_RU;
-               break;
-       case CSS_CURSOR_SW_RESIZE:
-               pointer = BROWSER_POINTER_LD;
-               break;
-       case CSS_CURSOR_SE_RESIZE:
-               pointer = BROWSER_POINTER_RD;
-               break;
-       case CSS_CURSOR_NW_RESIZE:
-               pointer = BROWSER_POINTER_LU;
-               break;
-       case CSS_CURSOR_TEXT:
-               pointer = BROWSER_POINTER_CARET;
-               break;
-       case CSS_CURSOR_WAIT:
-               pointer = BROWSER_POINTER_WAIT;
-               break;
-       case CSS_CURSOR_PROGRESS:
-               pointer = BROWSER_POINTER_PROGRESS;
-               break;
-       case CSS_CURSOR_HELP:
-               pointer = BROWSER_POINTER_HELP;
-               break;
-       default:
-               pointer = BROWSER_POINTER_DEFAULT;
-               break;
-       }
-
-       return pointer;
-}
-
-
 /**
  * Callback for in-page scrollbars.
  */
@@ -887,37 +924,3 @@ void html_overflow_scroll_drag_end(struct scrollbar 
*scrollbar,
                                scroll_mouse_x, scroll_mouse_y);
        }
 }
-
-
-/**
- * Start drag scrolling the contents of a box
- *
- * \param box  the box to be scrolled
- * \param x    x ordinate of initial mouse position
- * \param y    y ordinate
- */
-
-void html_box_drag_start(struct box *box, int x, int y)
-{
-       int box_x, box_y;
-       int scroll_mouse_x, scroll_mouse_y;
-       
-       box_coords(box, &box_x, &box_y);
-       
-       if (box->scroll_x != NULL) {
-               scroll_mouse_x = x - box_x ;
-               scroll_mouse_y = y - (box_y + box->padding[TOP] +
-                               box->height + box->padding[BOTTOM] -
-                               SCROLLBAR_WIDTH);
-               scrollbar_start_content_drag(box->scroll_x,
-                               scroll_mouse_x, scroll_mouse_y);
-       } else if (box->scroll_y != NULL) {
-               scroll_mouse_x = x - (box_x + box->padding[LEFT] +
-                               box->width + box->padding[RIGHT] -
-                               SCROLLBAR_WIDTH);
-               scroll_mouse_y = y - box_y;
-               
-               scrollbar_start_content_drag(box->scroll_y,
-                               scroll_mouse_x, scroll_mouse_y);
-       }
-}


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/317a1dd92326e5bd189d529e395f5d6917d6bbab
commit 317a1dd92326e5bd189d529e395f5d6917d6bbab
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    get_pointer_shape() doesn't need bw.

diff --git a/render/html_interaction.c b/render/html_interaction.c
index b4e2c04..7edde10 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -46,8 +46,7 @@
 #include "utils/utils.h"
 
 
-static browser_pointer_shape get_pointer_shape(struct browser_window *bw,
-               struct box *box, bool imagemap);
+static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap);
 static void html_box_drag_start(struct box *box, int x, int y);
 
 
@@ -314,7 +313,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                if (box->title)
                        title = box->title;
 
-               pointer = get_pointer_shape(bw, box, false);
+               pointer = get_pointer_shape(box, false);
 
                if ((box->scroll_x != NULL || box->scroll_y != NULL) &&
                                   drag_candidate == NULL)
@@ -410,8 +409,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                                                messages_get("FormSubmit"),
                                                gadget->form->action);
                                status = status_buffer;
-                               pointer = get_pointer_shape(bw, gadget_box,
-                                               false);
+                               pointer = get_pointer_shape(gadget_box, false);
                                if (mouse & (BROWSER_MOUSE_CLICK_1 |
                                                BROWSER_MOUSE_CLICK_2))
                                        action = ACTION_SUBMIT;
@@ -421,7 +419,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                        break;
                case GADGET_TEXTAREA:
                        status = messages_get("FormTextarea");
-                       pointer = get_pointer_shape(bw, gadget_box, false);
+                       pointer = get_pointer_shape(gadget_box, false);
 
                        if (mouse & (BROWSER_MOUSE_PRESS_1 |
                                        BROWSER_MOUSE_PRESS_2)) {
@@ -468,7 +466,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                case GADGET_TEXTBOX:
                case GADGET_PASSWORD:
                        status = messages_get("FormTextbox");
-                       pointer = get_pointer_shape(bw, gadget_box, false);
+                       pointer = get_pointer_shape(gadget_box, false);
 
                        if ((mouse & BROWSER_MOUSE_PRESS_1) &&
                                        !(mouse & (BROWSER_MOUSE_MOD_1 |
@@ -565,7 +563,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                } else
                        status = nsurl_access(url);
 
-               pointer = get_pointer_shape(bw, url_box, imagemap);
+               pointer = get_pointer_shape(url_box, imagemap);
 
                if (mouse & BROWSER_MOUSE_CLICK_1 &&
                                mouse & BROWSER_MOUSE_MOD_1) {
@@ -724,16 +722,13 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
 }
 
 
-browser_pointer_shape get_pointer_shape(struct browser_window *bw, struct box 
*box,
-               bool imagemap)
+browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
 {
        browser_pointer_shape pointer;
        css_computed_style *style;
        enum css_cursor_e cursor;
        lwc_string **cursor_uris;
 
-       assert(bw);
-
        if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
                style = box->children->style;
        else


-----------------------------------------------------------------------

Summary of changes:
 render/html_interaction.c |  270 ++++++++++++++++++++++-----------------------
 1 files changed, 134 insertions(+), 136 deletions(-)

diff --git a/render/html_interaction.c b/render/html_interaction.c
index b4e2c04..a74e99d 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -46,9 +46,135 @@
 #include "utils/utils.h"
 
 
-static browser_pointer_shape get_pointer_shape(struct browser_window *bw,
-               struct box *box, bool imagemap);
-static void html_box_drag_start(struct box *box, int x, int y);
+/**
+ * Get pointer shape for given box
+ *
+ * \param box       box in question
+ * \param imagemap  whether an imagemap applies to the box
+ */
+
+static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
+{
+       browser_pointer_shape pointer;
+       css_computed_style *style;
+       enum css_cursor_e cursor;
+       lwc_string **cursor_uris;
+
+       if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
+               style = box->children->style;
+       else
+               style = box->style;
+
+       if (style == NULL)
+               return BROWSER_POINTER_DEFAULT;
+
+       cursor = css_computed_cursor(style, &cursor_uris);
+
+       switch (cursor) {
+       case CSS_CURSOR_AUTO:
+               if (box->href || (box->gadget &&
+                               (box->gadget->type == GADGET_IMAGE ||
+                               box->gadget->type == GADGET_SUBMIT)) ||
+                               imagemap) {
+                       /* link */
+                       pointer = BROWSER_POINTER_POINT;
+               } else if (box->gadget &&
+                               (box->gadget->type == GADGET_TEXTBOX ||
+                               box->gadget->type == GADGET_PASSWORD ||
+                               box->gadget->type == GADGET_TEXTAREA)) {
+                       /* text input */
+                       pointer = BROWSER_POINTER_CARET;
+               } else {
+                       /* html content doesn't mind */
+                       pointer = BROWSER_POINTER_AUTO;
+               }
+               break;
+       case CSS_CURSOR_CROSSHAIR:
+               pointer = BROWSER_POINTER_CROSS;
+               break;
+       case CSS_CURSOR_POINTER:
+               pointer = BROWSER_POINTER_POINT;
+               break;
+       case CSS_CURSOR_MOVE:
+               pointer = BROWSER_POINTER_MOVE;
+               break;
+       case CSS_CURSOR_E_RESIZE:
+               pointer = BROWSER_POINTER_RIGHT;
+               break;
+       case CSS_CURSOR_W_RESIZE:
+               pointer = BROWSER_POINTER_LEFT;
+               break;
+       case CSS_CURSOR_N_RESIZE:
+               pointer = BROWSER_POINTER_UP;
+               break;
+       case CSS_CURSOR_S_RESIZE:
+               pointer = BROWSER_POINTER_DOWN;
+               break;
+       case CSS_CURSOR_NE_RESIZE:
+               pointer = BROWSER_POINTER_RU;
+               break;
+       case CSS_CURSOR_SW_RESIZE:
+               pointer = BROWSER_POINTER_LD;
+               break;
+       case CSS_CURSOR_SE_RESIZE:
+               pointer = BROWSER_POINTER_RD;
+               break;
+       case CSS_CURSOR_NW_RESIZE:
+               pointer = BROWSER_POINTER_LU;
+               break;
+       case CSS_CURSOR_TEXT:
+               pointer = BROWSER_POINTER_CARET;
+               break;
+       case CSS_CURSOR_WAIT:
+               pointer = BROWSER_POINTER_WAIT;
+               break;
+       case CSS_CURSOR_PROGRESS:
+               pointer = BROWSER_POINTER_PROGRESS;
+               break;
+       case CSS_CURSOR_HELP:
+               pointer = BROWSER_POINTER_HELP;
+               break;
+       default:
+               pointer = BROWSER_POINTER_DEFAULT;
+               break;
+       }
+
+       return pointer;
+}
+
+
+/**
+ * Start drag scrolling the contents of a box
+ *
+ * \param box  the box to be scrolled
+ * \param x    x ordinate of initial mouse position
+ * \param y    y ordinate
+ */
+
+static void html_box_drag_start(struct box *box, int x, int y)
+{
+       int box_x, box_y;
+       int scroll_mouse_x, scroll_mouse_y;
+
+       box_coords(box, &box_x, &box_y);
+
+       if (box->scroll_x != NULL) {
+               scroll_mouse_x = x - box_x ;
+               scroll_mouse_y = y - (box_y + box->padding[TOP] +
+                               box->height + box->padding[BOTTOM] -
+                               SCROLLBAR_WIDTH);
+               scrollbar_start_content_drag(box->scroll_x,
+                               scroll_mouse_x, scroll_mouse_y);
+       } else if (box->scroll_y != NULL) {
+               scroll_mouse_x = x - (box_x + box->padding[LEFT] +
+                               box->width + box->padding[RIGHT] -
+                               SCROLLBAR_WIDTH);
+               scroll_mouse_y = y - box_y;
+
+               scrollbar_start_content_drag(box->scroll_y,
+                               scroll_mouse_x, scroll_mouse_y);
+       }
+}
 
 
 /**
@@ -314,7 +440,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                if (box->title)
                        title = box->title;
 
-               pointer = get_pointer_shape(bw, box, false);
+               pointer = get_pointer_shape(box, false);
 
                if ((box->scroll_x != NULL || box->scroll_y != NULL) &&
                                   drag_candidate == NULL)
@@ -410,8 +536,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                                                messages_get("FormSubmit"),
                                                gadget->form->action);
                                status = status_buffer;
-                               pointer = get_pointer_shape(bw, gadget_box,
-                                               false);
+                               pointer = get_pointer_shape(gadget_box, false);
                                if (mouse & (BROWSER_MOUSE_CLICK_1 |
                                                BROWSER_MOUSE_CLICK_2))
                                        action = ACTION_SUBMIT;
@@ -421,7 +546,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                        break;
                case GADGET_TEXTAREA:
                        status = messages_get("FormTextarea");
-                       pointer = get_pointer_shape(bw, gadget_box, false);
+                       pointer = get_pointer_shape(gadget_box, false);
 
                        if (mouse & (BROWSER_MOUSE_PRESS_1 |
                                        BROWSER_MOUSE_PRESS_2)) {
@@ -468,7 +593,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                case GADGET_TEXTBOX:
                case GADGET_PASSWORD:
                        status = messages_get("FormTextbox");
-                       pointer = get_pointer_shape(bw, gadget_box, false);
+                       pointer = get_pointer_shape(gadget_box, false);
 
                        if ((mouse & BROWSER_MOUSE_PRESS_1) &&
                                        !(mouse & (BROWSER_MOUSE_MOD_1 |
@@ -565,7 +690,7 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
                } else
                        status = nsurl_access(url);
 
-               pointer = get_pointer_shape(bw, url_box, imagemap);
+               pointer = get_pointer_shape(url_box, imagemap);
 
                if (mouse & BROWSER_MOUSE_CLICK_1 &&
                                mouse & BROWSER_MOUSE_MOD_1) {
@@ -724,99 +849,6 @@ void html_mouse_action(struct content *c, struct 
browser_window *bw,
 }
 
 
-browser_pointer_shape get_pointer_shape(struct browser_window *bw, struct box 
*box,
-               bool imagemap)
-{
-       browser_pointer_shape pointer;
-       css_computed_style *style;
-       enum css_cursor_e cursor;
-       lwc_string **cursor_uris;
-
-       assert(bw);
-
-       if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
-               style = box->children->style;
-       else
-               style = box->style;
-
-       if (style == NULL)
-               return BROWSER_POINTER_DEFAULT;
-
-       cursor = css_computed_cursor(style, &cursor_uris);
-
-       switch (cursor) {
-       case CSS_CURSOR_AUTO:
-               if (box->href || (box->gadget &&
-                               (box->gadget->type == GADGET_IMAGE ||
-                               box->gadget->type == GADGET_SUBMIT)) ||
-                               imagemap) {
-                       /* link */
-                       pointer = BROWSER_POINTER_POINT;
-               } else if (box->gadget &&
-                               (box->gadget->type == GADGET_TEXTBOX ||
-                               box->gadget->type == GADGET_PASSWORD ||
-                               box->gadget->type == GADGET_TEXTAREA)) {
-                       /* text input */
-                       pointer = BROWSER_POINTER_CARET;
-               } else {
-                       /* html content doesn't mind */
-                       pointer = BROWSER_POINTER_AUTO;
-               }
-               break;
-       case CSS_CURSOR_CROSSHAIR:
-               pointer = BROWSER_POINTER_CROSS;
-               break;
-       case CSS_CURSOR_POINTER:
-               pointer = BROWSER_POINTER_POINT;
-               break;
-       case CSS_CURSOR_MOVE:
-               pointer = BROWSER_POINTER_MOVE;
-               break;
-       case CSS_CURSOR_E_RESIZE:
-               pointer = BROWSER_POINTER_RIGHT;
-               break;
-       case CSS_CURSOR_W_RESIZE:
-               pointer = BROWSER_POINTER_LEFT;
-               break;
-       case CSS_CURSOR_N_RESIZE:
-               pointer = BROWSER_POINTER_UP;
-               break;
-       case CSS_CURSOR_S_RESIZE:
-               pointer = BROWSER_POINTER_DOWN;
-               break;
-       case CSS_CURSOR_NE_RESIZE:
-               pointer = BROWSER_POINTER_RU;
-               break;
-       case CSS_CURSOR_SW_RESIZE:
-               pointer = BROWSER_POINTER_LD;
-               break;
-       case CSS_CURSOR_SE_RESIZE:
-               pointer = BROWSER_POINTER_RD;
-               break;
-       case CSS_CURSOR_NW_RESIZE:
-               pointer = BROWSER_POINTER_LU;
-               break;
-       case CSS_CURSOR_TEXT:
-               pointer = BROWSER_POINTER_CARET;
-               break;
-       case CSS_CURSOR_WAIT:
-               pointer = BROWSER_POINTER_WAIT;
-               break;
-       case CSS_CURSOR_PROGRESS:
-               pointer = BROWSER_POINTER_PROGRESS;
-               break;
-       case CSS_CURSOR_HELP:
-               pointer = BROWSER_POINTER_HELP;
-               break;
-       default:
-               pointer = BROWSER_POINTER_DEFAULT;
-               break;
-       }
-
-       return pointer;
-}
-
-
 /**
  * Callback for in-page scrollbars.
  */
@@ -892,37 +924,3 @@ void html_overflow_scroll_drag_end(struct scrollbar 
*scrollbar,
                                scroll_mouse_x, scroll_mouse_y);
        }
 }
-
-
-/**
- * Start drag scrolling the contents of a box
- *
- * \param box  the box to be scrolled
- * \param x    x ordinate of initial mouse position
- * \param y    y ordinate
- */
-
-void html_box_drag_start(struct box *box, int x, int y)
-{
-       int box_x, box_y;
-       int scroll_mouse_x, scroll_mouse_y;
-       
-       box_coords(box, &box_x, &box_y);
-       
-       if (box->scroll_x != NULL) {
-               scroll_mouse_x = x - box_x ;
-               scroll_mouse_y = y - (box_y + box->padding[TOP] +
-                               box->height + box->padding[BOTTOM] -
-                               SCROLLBAR_WIDTH);
-               scrollbar_start_content_drag(box->scroll_x,
-                               scroll_mouse_x, scroll_mouse_y);
-       } else if (box->scroll_y != NULL) {
-               scroll_mouse_x = x - (box_x + box->padding[LEFT] +
-                               box->width + box->padding[RIGHT] -
-                               SCROLLBAR_WIDTH);
-               scroll_mouse_y = y - box_y;
-               
-               scrollbar_start_content_drag(box->scroll_y,
-                               scroll_mouse_x, scroll_mouse_y);
-       }
-}


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to