Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9d0943b8e561dd2e5449cd9d53d8b5c2f439442d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9d0943b8e561dd2e5449cd9d53d8b5c2f439442d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9d0943b8e561dd2e5449cd9d53d8b5c2f439442d
The branch, master has been updated
via 9d0943b8e561dd2e5449cd9d53d8b5c2f439442d (commit)
from 6741b6e287bf89607eb6ce8378d79f7b4cf4b162 (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/commit/?id=9d0943b8e561dd2e5449cd9d53d8b5c2f439442d
commit 9d0943b8e561dd2e5449cd9d53d8b5c2f439442d
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove redundant global context
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 70c3ad1..a3d6066 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -496,7 +496,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
double y2;
struct rect clip;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -508,8 +507,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
-
return FALSE;
}
@@ -537,12 +534,10 @@ nsgtk_cw_draw_event(GtkWidget *widget,
clip.x1 = event->area.x + event->area.width;
clip.y1 = event->area.y + event->area.height;
- current_widget = widget;
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
cairo_destroy(current_cr);
return FALSE;
diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c
index bf4de08..2ed1d06 100644
--- a/frontends/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
@@ -39,7 +39,6 @@
#include "gtk/scaffolding.h"
#include "gtk/bitmap.h"
-GtkWidget *current_widget;
cairo_t *current_cr;
static GdkRectangle cliprect;
diff --git a/frontends/gtk/plotters.h b/frontends/gtk/plotters.h
index c88a8da..453d5ce 100644
--- a/frontends/gtk/plotters.h
+++ b/frontends/gtk/plotters.h
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Target independent plotting (GDK / GTK+ interface).
+/**
+ * \file
+ * Target independent plotting GTK+ interface.
*/
#ifndef NETSURF_GTK_PLOTTERS_H
@@ -30,7 +31,6 @@ struct plotter_table;
extern const struct plotter_table nsgtk_plotters;
/* make sure this is NULL if no redraw is in progress */
-extern GtkWidget *current_widget;
extern cairo_t *current_cr;
void nsgtk_set_colour(colour c);
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index de666c9..7a40d66 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -1663,7 +1663,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
double x2;
double y2;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -1677,8 +1676,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
browser_window_history_redraw(bw, &ctx);
- current_widget = NULL;
-
return FALSE;
}
#else
@@ -1698,8 +1695,6 @@ nsgtk_history_draw_event(GtkWidget *widget,
GdkEventExpose *event, gpointer g)
.plot = &nsgtk_plotters
};
- current_widget = widget;
-
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
clip.x0 = event->area.x;
@@ -1712,8 +1707,6 @@ nsgtk_history_draw_event(GtkWidget *widget,
GdkEventExpose *event, gpointer g)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 326e573..7432e30 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -211,7 +211,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = cr;
GtkAdjustment *vscroll = nsgtk_layout_get_vadjustment(gw->layout);
@@ -234,8 +233,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
nsgtk_plot_caret(gw->caretx, gw->carety, gw->careth);
}
- current_widget = NULL;
-
return FALSE;
}
@@ -261,7 +258,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose
*event, gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = gdk_cairo_create(nsgtk_layout_get_bin_window(gw->layout));
clip.x0 = event->area.x;
@@ -277,8 +273,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose
*event, gpointer data)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/corewindow.c | 5 -----
frontends/gtk/plotters.c | 1 -
frontends/gtk/plotters.h | 6 +++---
frontends/gtk/scaffolding.c | 7 -------
frontends/gtk/window.c | 6 ------
5 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 70c3ad1..a3d6066 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -496,7 +496,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
double y2;
struct rect clip;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -508,8 +507,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
-
return FALSE;
}
@@ -537,12 +534,10 @@ nsgtk_cw_draw_event(GtkWidget *widget,
clip.x1 = event->area.x + event->area.width;
clip.y1 = event->area.y + event->area.height;
- current_widget = widget;
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
cairo_destroy(current_cr);
return FALSE;
diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c
index bf4de08..2ed1d06 100644
--- a/frontends/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
@@ -39,7 +39,6 @@
#include "gtk/scaffolding.h"
#include "gtk/bitmap.h"
-GtkWidget *current_widget;
cairo_t *current_cr;
static GdkRectangle cliprect;
diff --git a/frontends/gtk/plotters.h b/frontends/gtk/plotters.h
index c88a8da..453d5ce 100644
--- a/frontends/gtk/plotters.h
+++ b/frontends/gtk/plotters.h
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Target independent plotting (GDK / GTK+ interface).
+/**
+ * \file
+ * Target independent plotting GTK+ interface.
*/
#ifndef NETSURF_GTK_PLOTTERS_H
@@ -30,7 +31,6 @@ struct plotter_table;
extern const struct plotter_table nsgtk_plotters;
/* make sure this is NULL if no redraw is in progress */
-extern GtkWidget *current_widget;
extern cairo_t *current_cr;
void nsgtk_set_colour(colour c);
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index de666c9..7a40d66 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -1663,7 +1663,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
double x2;
double y2;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -1677,8 +1676,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
browser_window_history_redraw(bw, &ctx);
- current_widget = NULL;
-
return FALSE;
}
#else
@@ -1698,8 +1695,6 @@ nsgtk_history_draw_event(GtkWidget *widget,
GdkEventExpose *event, gpointer g)
.plot = &nsgtk_plotters
};
- current_widget = widget;
-
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
clip.x0 = event->area.x;
@@ -1712,8 +1707,6 @@ nsgtk_history_draw_event(GtkWidget *widget,
GdkEventExpose *event, gpointer g)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 326e573..7432e30 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -211,7 +211,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = cr;
GtkAdjustment *vscroll = nsgtk_layout_get_vadjustment(gw->layout);
@@ -234,8 +233,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr,
gpointer data)
nsgtk_plot_caret(gw->caretx, gw->carety, gw->careth);
}
- current_widget = NULL;
-
return FALSE;
}
@@ -261,7 +258,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose
*event, gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = gdk_cairo_create(nsgtk_layout_get_bin_window(gw->layout));
clip.x0 = event->area.x;
@@ -277,8 +273,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose
*event, gpointer data)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
