|
Line 0
Link Here
|
|
|
1 |
--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp.orig 2019-04-03 20:11:12 UTC |
| 2 |
+++ src/af/gr/gtk/gr_UnixCairoGraphics.cpp |
| 3 |
@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() |
| 4 |
|
| 5 |
void GR_UnixCairoGraphics::flush(void) |
| 6 |
{ |
| 7 |
- if (m_Widget) { |
| 8 |
- gtk_widget_queue_draw(m_Widget); |
| 9 |
- } |
| 10 |
+ gdk_flush(); |
| 11 |
} |
| 12 |
|
| 13 |
bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const |
| 14 |
--- src/af/gr/xp/gr_Caret.cpp.orig 2019-04-03 18:13:38 UTC |
| 15 |
+++ src/af/gr/xp/gr_Caret.cpp |
| 16 |
@@ -146,8 +146,10 @@ void GR_Caret::s_work(UT_Worker * _w) |
| 17 |
{ |
| 18 |
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); |
| 19 |
|
| 20 |
- if (c->m_nDisableCount == 0) |
| 21 |
- c->_blink(false); |
| 22 |
+ c->m_enabler->stop(); |
| 23 |
+ c->m_worker->stop(); |
| 24 |
+ c->m_worker->start(); |
| 25 |
+ c->_blink(true); |
| 26 |
} |
| 27 |
|
| 28 |
/** One-time enabler. */ |
| 29 |
@@ -155,22 +157,17 @@ void GR_Caret::s_enable(UT_Worker * _w) |
| 30 |
{ |
| 31 |
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); |
| 32 |
|
| 33 |
+ c->m_enabler->stop(); |
| 34 |
c->m_worker->stop(); |
| 35 |
- c->_blink(true); |
| 36 |
- if (!c->m_bCursorIsOn) |
| 37 |
- c->_blink(true); // blink again |
| 38 |
- else |
| 39 |
- { |
| 40 |
- c->_blink(true); // ?? - MARCM |
| 41 |
- c->_blink(true); |
| 42 |
- } |
| 43 |
c->m_worker->start(); |
| 44 |
- c->m_enabler->stop(); |
| 45 |
+ c->_blink(true); |
| 46 |
} |
| 47 |
|
| 48 |
void GR_Caret::s_blink_timeout(UT_Worker * _w) |
| 49 |
{ |
| 50 |
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); |
| 51 |
+ |
| 52 |
+ c->m_blinkTimeout->stop(); |
| 53 |
if (c->isEnabled()) |
| 54 |
c->disable(); |
| 55 |
} |
| 56 |
--- src/af/util/xp/ut_iconv.cpp.orig 2019-04-03 18:13:38 UTC |
| 57 |
+++ src/af/util/xp/ut_iconv.cpp |
| 58 |
@@ -264,10 +264,10 @@ const char * ucs4Internal () |
| 59 |
// we special-case the win32 build, otherwise spelling and other stuff |
| 60 |
// just doesn't work |
| 61 |
return "UCS-4LE"; |
| 62 |
-#elif defined(_LIBICONV_H) |
| 63 |
+#elif defined(_LIBICONV_H) || defined(__FreeBSD__) |
| 64 |
// libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE |
| 65 |
return "UCS-4-INTERNAL"; |
| 66 |
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) |
| 67 |
+#elif defined(__OpenBSD__) || defined(__NetBSD__) |
| 68 |
// we special case the BSDs since spelling just doesn't work |
| 69 |
return "UCS4"; |
| 70 |
#else |
| 71 |
--- src/af/xap/gtk/xap_UnixFrameImpl.cpp.orig 2019-04-03 18:13:38 UTC |
| 72 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp |
| 73 |
@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * |
| 74 |
} |
| 75 |
|
| 76 |
#if GTK_CHECK_VERSION(3,0,0) |
| 77 |
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) |
| 78 |
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) |
| 79 |
#else |
| 80 |
gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) |
| 81 |
#endif |
| 82 |
{ |
| 83 |
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); |
| 84 |
FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView()); |
| 85 |
+ double x, y, width, height; |
| 86 |
#if GTK_CHECK_VERSION(3,0,0) |
| 87 |
- GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event()); |
| 88 |
+ cairo_clip_extents (cr, &x, &y, &width, &height); |
| 89 |
+ width -= x; |
| 90 |
+ height -= y; |
| 91 |
+#else |
| 92 |
+ x = pExposeEvent->area.x; |
| 93 |
+ y = pExposeEvent->area.y; |
| 94 |
+ width = pExposeEvent->area.width; |
| 95 |
+ height = pExposeEvent->area.height; |
| 96 |
#endif |
| 97 |
/* Jean: commenting out next lines since the zoom update code does draw only |
| 98 |
* part of what needs to be updated. */ |
| 99 |
@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, Gdk |
| 100 |
UT_Rect rClip; |
| 101 |
if (pGr->getPaintCount () > 0) |
| 102 |
return TRUE; |
| 103 |
- 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)); |
| 104 |
- rClip.left = pGr->tlu(pExposeEvent->area.x); |
| 105 |
- rClip.top = pGr->tlu(pExposeEvent->area.y); |
| 106 |
- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; |
| 107 |
- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; |
| 108 |
-#if GTK_CHECK_VERSION(3,0,0) |
| 109 |
+ rClip.left = pGr->tlu(x); |
| 110 |
+ rClip.top = pGr->tlu(y); |
| 111 |
+ #if GTK_CHECK_VERSION(3,0,0) |
| 112 |
+ rClip.width = pGr->tlu(width); |
| 113 |
+ rClip.height = pGr->tlu(height); |
| 114 |
static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr); |
| 115 |
pView->draw(&rClip); |
| 116 |
static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL); |
| 117 |
#else |
| 118 |
+ rClip.width = pGr->tlu(width)+1; |
| 119 |
+ rClip.height = pGr->tlu(height)+1; |
| 120 |
pView->draw(&rClip); |
| 121 |
#endif |
| 122 |
} |
| 123 |
- return FALSE; |
| 124 |
+ return TRUE; |
| 125 |
} |
| 126 |
|
| 127 |
static bool bScrollWait = false; |
| 128 |
--- src/af/xap/gtk/xap_UnixFrameImpl.h.orig 2019-04-03 18:13:38 UTC |
| 129 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.h |
| 130 |
@@ -152,7 +152,7 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl (protec |
| 131 |
static gint key_release_event(GtkWidget* w, GdkEventKey* e); |
| 132 |
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); |
| 133 |
#if GTK_CHECK_VERSION(3,0,0) |
| 134 |
- static gint draw(GtkWidget * w, cairo_t * cr); |
| 135 |
+ static gboolean draw(GtkWidget * w, cairo_t * cr); |
| 136 |
#else |
| 137 |
static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); |
| 138 |
#endif |