Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
de9224bf
Kaydet (Commit)
de9224bf
authored
Tem 26, 2015
tarafından
Pranav Kant
Kaydeden (comit)
Miklos Vajna
Tem 28, 2015
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
lokdocview: Move postMouseEvent in separate LOK thread
Change-Id: I9d1a08db2a91a596d3039a2388c22e6ea76dc2b1
üst
4fb3d2e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
4 deletions
+59
-4
lokdocview.cxx
libreofficekit/source/gtk/lokdocview.cxx
+49
-3
tilebuffer.hxx
libreofficekit/source/gtk/tilebuffer.hxx
+10
-1
No files found.
libreofficekit/source/gtk/lokdocview.cxx
Dosyayı görüntüle @
de9224bf
...
...
@@ -958,7 +958,16 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
if
((
pEvent
->
time
-
priv
->
m_nLastButtonPressTime
)
<
250
)
nCount
++
;
priv
->
m_nLastButtonPressTime
=
pEvent
->
time
;
priv
->
m_pDocument
->
pClass
->
postMouseEvent
(
priv
->
m_pDocument
,
LOK_MOUSEEVENT_MOUSEBUTTONDOWN
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
),
nCount
);
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_POST_MOUSE_EVENT
);
pLOEvent
->
m_nPostMouseEventType
=
LOK_MOUSEEVENT_MOUSEBUTTONDOWN
;
pLOEvent
->
m_nPostMouseEventX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventCount
=
nCount
;
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
break
;
}
case
GDK_BUTTON_RELEASE
:
...
...
@@ -967,7 +976,16 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
if
((
pEvent
->
time
-
priv
->
m_nLastButtonReleaseTime
)
<
250
)
nCount
++
;
priv
->
m_nLastButtonReleaseTime
=
pEvent
->
time
;
priv
->
m_pDocument
->
pClass
->
postMouseEvent
(
priv
->
m_pDocument
,
LOK_MOUSEEVENT_MOUSEBUTTONUP
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
),
nCount
);
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_POST_MOUSE_EVENT
);
pLOEvent
->
m_nPostMouseEventType
=
LOK_MOUSEEVENT_MOUSEBUTTONUP
;
pLOEvent
->
m_nPostMouseEventX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventCount
=
nCount
;
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
break
;
}
default
:
...
...
@@ -1050,11 +1068,36 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
}
// Otherwise a mouse move, as on the desktop.
priv
->
m_pDocument
->
pClass
->
postMouseEvent
(
priv
->
m_pDocument
,
LOK_MOUSEEVENT_MOUSEMOVE
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
),
1
);
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_POST_MOUSE_EVENT
);
pLOEvent
->
m_nPostMouseEventType
=
LOK_MOUSEEVENT_MOUSEMOVE
;
pLOEvent
->
m_nPostMouseEventX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
pLOEvent
->
m_nPostMouseEventCount
=
1
;
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
return
FALSE
;
}
static
void
postMouseEventInThread
(
gpointer
data
)
{
GTask
*
task
=
G_TASK
(
data
);
LOKDocView
*
pDocView
=
LOK_DOC_VIEW
(
g_task_get_source_object
(
task
));
LOKDocViewPrivate
*
priv
=
static_cast
<
LOKDocViewPrivate
*>
(
lok_doc_view_get_instance_private
(
pDocView
));
LOEvent
*
pLOEvent
=
static_cast
<
LOEvent
*>
(
g_task_get_task_data
(
task
));
priv
->
m_pDocument
->
pClass
->
postMouseEvent
(
priv
->
m_pDocument
,
pLOEvent
->
m_nPostMouseEventType
,
pLOEvent
->
m_nPostMouseEventX
,
pLOEvent
->
m_nPostMouseEventY
,
pLOEvent
->
m_nPostMouseEventCount
);
}
static
void
openDocumentInThread
(
gpointer
data
)
{
...
...
@@ -1236,6 +1279,9 @@ lokThreadFunc(gpointer data, gpointer /*user_data*/)
case
LOK_PAINT_TILE
:
paintTileInThread
(
task
);
break
;
case
LOK_POST_MOUSE_EVENT
:
postMouseEventInThread
(
task
);
break
;
}
g_object_unref
(
task
);
...
...
libreofficekit/source/gtk/tilebuffer.hxx
Dosyayı görüntüle @
de9224bf
...
...
@@ -138,7 +138,8 @@ enum
LOK_SET_PARTMODE
,
LOK_SET_PART
,
LOK_POST_KEY
,
LOK_PAINT_TILE
LOK_PAINT_TILE
,
LOK_POST_MOUSE_EVENT
};
/**
...
...
@@ -187,6 +188,14 @@ struct LOEvent
float
m_fPaintTileZoom
;
///@}
/// @name postMouseEvent parameters
///@{
int
m_nPostMouseEventType
;
int
m_nPostMouseEventX
;
int
m_nPostMouseEventY
;
int
m_nPostMouseEventCount
;
///@}
/// Constructor to instantiate an object of type `type`.
LOEvent
(
int
type
)
:
m_nType
(
type
)
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment