Attachment #522942 for bug #601300

View | Details | Raw Unified | Return to bug 601300
Collapse All | Expand All

Lines 577-585 void GR_UnixCairoGraphics::_endPaint() Link Here

(-)a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp (-3 / +1 lines)
577		577
578	void GR_UnixCairoGraphics::flush(void)	578	void GR_UnixCairoGraphics::flush(void)
579	{	579	{
580	if (m_Widget) {	580	gdk_flush();
581	gtk_widget_queue_draw(m_Widget);
582	}
583	}	581	}
584		582
585	bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const	583	bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const




{
	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());

	c->m_enabler->stop();
	c->m_worker->stop();
	c->_blink(true);
	if (!c->m_bCursorIsOn)
		c->_blink(true); // blink again
	else
	{
		c->_blink(true); // ?? - MARCM
		c->_blink(true);
	}
	c->m_worker->start();
	c->_blink(true);
}

void GR_Caret::s_blink_timeout(UT_Worker * _w)
{
	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());

	c->m_blinkTimeout->stop();
	if (c->isEnabled())
		c->disable();
}




{
	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)
	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. */

		UT_Rect rClip;
		if (pGr->getPaintCount () > 0)
			return TRUE;
		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);
#if GTK_CHECK_VERSION(3,0,0)
		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 to bug 601300

Lines 155-176 void GR_Caret::s_enable(UT_Worker * _w) Link Here

(-)a/src/af/gr/xp/gr_Caret.cpp (-9 / +4 lines)
155	{	155	{
156	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());	156	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
157		157
		158	c->m_enabler->stop();
158	c->m_worker->stop();	159	c->m_worker->stop();
159	c->_blink(true);
160	if (!c->m_bCursorIsOn)
161	c->_blink(true); // blink again
162	else
163	{
164	c->_blink(true); // ?? - MARCM
165	c->_blink(true);
166	}
167	c->m_worker->start();	160	c->m_worker->start();
168	c->m_enabler->stop();	161	c->_blink(true);
169	}	162	}
170		163
171	void GR_Caret::s_blink_timeout(UT_Worker * _w)	164	void GR_Caret::s_blink_timeout(UT_Worker * _w)
172	{	165	{
173	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());	166	GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData());
		167
		168	c->m_blinkTimeout->stop();
174	if (c->isEnabled())	169	if (c->isEnabled())
175	c->disable();	170	c->disable();
176	}	171	}

Lines 1208-1215 gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /event/, g Link Here

(-)a/src/af/xap/gtk/xap_UnixFrameImpl.cpp (-7 / +16 lines)
1208	{	1208	{
1209	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));	1209	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
1210	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());	1210	FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView());
		1211	double x, y, width, height;
1211	#if GTK_CHECK_VERSION(3,0,0)	1212	#if GTK_CHECK_VERSION(3,0,0)
1212	GdkEventExpose pExposeEvent = reinterpret_cast<GdkEventExpose >(gtk_get_current_event());	1213	cairo_clip_extents (cr, &x, &y, &width, &height);
		1214	width -= x;
		1215	height -= y;
		1216	#else
		1217	x = pExposeEvent->area.x;
		1218	y = pExposeEvent->area.y;
		1219	width = pExposeEvent->area.width;
		1220	height = pExposeEvent->area.height;
1213	#endif	1221	#endif
1214	/* Jean: commenting out next lines since the zoom update code does draw only	1222	/* Jean: commenting out next lines since the zoom update code does draw only
1215	* part of what needs to be updated. */	1223	* part of what needs to be updated. */
Lines 1230-1245 gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) Link Here
1230	UT_Rect rClip;	1238	UT_Rect rClip;
1231	if (pGr->getPaintCount () > 0)	1239	if (pGr->getPaintCount () > 0)
1232	return TRUE;	1240	return TRUE;
1233	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));	1241	rClip.left = pGr->tlu(x);
1234	rClip.left = pGr->tlu(pExposeEvent->area.x);	1242	rClip.top = pGr->tlu(y);
1235	rClip.top = pGr->tlu(pExposeEvent->area.y);	1243	#if GTK_CHECK_VERSION(3,0,0)
1236	rClip.width = pGr->tlu(pExposeEvent->area.width)+1;	1244	rClip.width = pGr->tlu(width);
1237	rClip.height = pGr->tlu(pExposeEvent->area.height)+1;	1245	rClip.height = pGr->tlu(height);
1238	#if GTK_CHECK_VERSION(3,0,0)
1239	static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);	1246	static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr);
1240	pView->draw(&rClip);	1247	pView->draw(&rClip);
1241	static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);	1248	static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL);
1242	#else	1249	#else
		1250	rClip.width = pGr->tlu(width)+1;
		1251	rClip.height = pGr->tlu(height)+1;
1243	pView->draw(&rClip);	1252	pView->draw(&rClip);
1244	#endif	1253	#endif
1245	}	1254	}