head	1.2;
access;
symbols
	pkgsrc-2019Q3:1.1.0.8
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.6
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.4
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.2
	pkgsrc-2018Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2019.11.26.16.54.13;	author nia;	state dead;
branches;
next	1.1;
commitid	YPLrnTal0lfYKnMB;

1.1
date	2018.12.28.22.24.53;	author gutteridge;	state Exp;
branches;
next	;
commitid	AJwRgyXRa7rIfC5B;


desc
@@


1.2
log
@abiword: Update to 3.0.3

Changes:

    Bug 13827 - Fix overflow read in PNG
    Bug 13826 - Fix out of bounds access
    Bug 13834 - Do not delete[] strings allocated with g_malloc()
    Bug 13815 - Fix the black drawing regression with Gtk3.22
    Bug 13791 - Fix flicker and caret problems
    Bug 13791 - Reduce flickering
    Fix Gtk criticals in dialog stylist
    Fix stylist styles population
    Fix a bad static_cast
    Fix a runtime error (integer overflow)
    Update sq-AL.po
    Bug 13904 - Fix touch pad scrolling
@
text
@$NetBSD: patch-src_af_xap_gtk_xap__UnixFrameImpl.cpp,v 1.1 2018/12/28 22:24:53 gutteridge Exp $

Abiword bug 13815, SVN revision 35394: Draw event should return TRUE.

Abiword bug 13791, SVN revision 35480: Fix flicker and caret problems.

--- src/af/xap/gtk/xap_UnixFrameImpl.cpp.orig	2014-12-14 14:56:47.000000000 +0000
+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
@@@@ -1208,15 +1208,23 @@@@ gint XAP_UnixFrameImpl::_fe::delete_even
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
 #else
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
 #endif
 {
 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
 	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
+	double x, y, width, height;
 #if GTK_CHECK_VERSION(3,0,0)
-	GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
+	cairo_clip_extents (cr, &x, &y, &width, &height);
+	width -= x;
+	height -= y;
+#else
+	x = pExposeEvent->area.x;
+	y = pExposeEvent->area.y;
+	width = pExposeEvent->area.width;
+	height = pExposeEvent->area.height;
 #endif
 /* Jean: commenting out next lines since the zoom update code does draw only
  * part of what needs to be updated. */
@@@@ -1231,19 +1239,21 @@@@ gint XAP_UnixFrameImpl::_fe::expose(GtkW
 		if (pGr->getPaintCount () > 0)
 			return TRUE;
 		xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d  height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height));
-		rClip.left = pGr->tlu(pExposeEvent->area.x);
-		rClip.top = pGr->tlu(pExposeEvent->area.y);
-		rClip.width = pGr->tlu(pExposeEvent->area.width)+1;
-		rClip.height = pGr->tlu(pExposeEvent->area.height)+1;
+		rClip.left = pGr->tlu(x);
+		rClip.top = pGr->tlu(y);
 #if GTK_CHECK_VERSION(3,0,0)
+		rClip.width = pGr->tlu(width);
+		rClip.height = pGr->tlu(height);
 		static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
 		pView->draw(&rClip);
 		static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
 #else
+		rClip.width = pGr->tlu(width)+1;
+		rClip.height = pGr->tlu(height)+1;
 		pView->draw(&rClip);
 #endif
 	}
-	return FALSE;
+	return TRUE;
 }
 
 static bool bScrollWait = false;
@


1.1
log
@abiword: add upstream patches to fix various bugs

Add upstream patches to address overflow bugs, fundamental rendering
problems, and miscellaneous crashers. (All of these commits have been
branched upstream, but no updated source release has been made in over
two years. Relevant upstream SVN commit IDs and bug IDs are noted in
each patch comment.) Bump PKGREVISION.

OK wiz@@
@
text
@d1 1
a1 1
$NetBSD$
@