Line 0
Link Here
|
|
|
1 |
--- src/af/gr/gtk/gr_UnixCairoGraphics.cpp |
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 |
15 |
+++ src/af/gr/xp/gr_Caret.cpp |
16 |
@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) |
17 |
{ |
18 |
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); |
19 |
|
20 |
+ c->m_enabler->stop(); |
21 |
c->m_worker->stop(); |
22 |
- c->_blink(true); |
23 |
- if (!c->m_bCursorIsOn) |
24 |
- c->_blink(true); // blink again |
25 |
- else |
26 |
- { |
27 |
- c->_blink(true); // ?? - MARCM |
28 |
- c->_blink(true); |
29 |
- } |
30 |
c->m_worker->start(); |
31 |
- c->m_enabler->stop(); |
32 |
+ c->_blink(true); |
33 |
} |
34 |
|
35 |
void GR_Caret::s_blink_timeout(UT_Worker * _w) |
36 |
{ |
37 |
GR_Caret * c = static_cast<GR_Caret *>(_w->getInstanceData()); |
38 |
+ |
39 |
+ c->m_blinkTimeout->stop(); |
40 |
if (c->isEnabled()) |
41 |
c->disable(); |
42 |
} |
43 |
--- src/af/xap/gtk/xap_UnixFrameImpl.cpp |
44 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp |
45 |
@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g |
46 |
} |
47 |
|
48 |
#if GTK_CHECK_VERSION(3,0,0) |
49 |
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) |
50 |
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) |
51 |
#else |
52 |
gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) |
53 |
#endif |
54 |
{ |
55 |
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); |
56 |
FV_View * pView = static_cast<FV_View *>(pUnixFrameImpl->getFrame()->getCurrentView()); |
57 |
+ double x, y, width, height; |
58 |
#if GTK_CHECK_VERSION(3,0,0) |
59 |
- GdkEventExpose *pExposeEvent = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event()); |
60 |
+ cairo_clip_extents (cr, &x, &y, &width, &height); |
61 |
+ width -= x; |
62 |
+ height -= y; |
63 |
+#else |
64 |
+ x = pExposeEvent->area.x; |
65 |
+ y = pExposeEvent->area.y; |
66 |
+ width = pExposeEvent->area.width; |
67 |
+ height = pExposeEvent->area.height; |
68 |
#endif |
69 |
/* Jean: commenting out next lines since the zoom update code does draw only |
70 |
* part of what needs to be updated. */ |
71 |
@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) |
72 |
UT_Rect rClip; |
73 |
if (pGr->getPaintCount () > 0) |
74 |
return TRUE; |
75 |
- 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)); |
76 |
- rClip.left = pGr->tlu(pExposeEvent->area.x); |
77 |
- rClip.top = pGr->tlu(pExposeEvent->area.y); |
78 |
- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; |
79 |
- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; |
80 |
-#if GTK_CHECK_VERSION(3,0,0) |
81 |
+ rClip.left = pGr->tlu(x); |
82 |
+ rClip.top = pGr->tlu(y); |
83 |
+ #if GTK_CHECK_VERSION(3,0,0) |
84 |
+ rClip.width = pGr->tlu(width); |
85 |
+ rClip.height = pGr->tlu(height); |
86 |
static_cast<GR_CairoGraphics *>(pGr)->setCairo(cr); |
87 |
pView->draw(&rClip); |
88 |
static_cast<GR_CairoGraphics *>(pGr)->setCairo(NULL); |
89 |
#else |
90 |
+ rClip.width = pGr->tlu(width)+1; |
91 |
+ rClip.height = pGr->tlu(height)+1; |
92 |
pView->draw(&rClip); |
93 |
#endif |
94 |
} |
95 |
- return FALSE; |
96 |
+ return TRUE; |
97 |
} |
98 |
|
99 |
static bool bScrollWait = false; |
100 |
--- src/af/xap/gtk/xap_UnixFrameImpl.h |
101 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.h |
102 |
@@ -152,7 +152,7 @@ protected: |
103 |
static gint key_release_event(GtkWidget* w, GdkEventKey* e); |
104 |
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); |
105 |
#if GTK_CHECK_VERSION(3,0,0) |
106 |
- static gint draw(GtkWidget * w, cairo_t * cr); |
107 |
+ static gboolean draw(GtkWidget * w, cairo_t * cr); |
108 |
#else |
109 |
static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); |
110 |
#endif |
111 |
|
112 |
|