mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-31 12:54:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Render thread lock

Browse source
This commit is contained in:
neldoreth 2010-01-01 20:26:31 +01:00
parent 0d6fd356e2
commit 3067c9144d
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
zathura.c
View file

@ -176,6 +176,7 @@ struct
{ {
pthread_mutex_t scale_lock; pthread_mutex_t scale_lock;
pthread_mutex_t rotate_lock; pthread_mutex_t rotate_lock;
pthread_mutex_t render_lock;
} Lock; } Lock;
struct struct
@ -270,6 +271,7 @@ init_zathura()
/* mutexes */ /* mutexes */
pthread_mutex_init(&(Zathura.Lock.scale_lock), NULL); pthread_mutex_init(&(Zathura.Lock.scale_lock), NULL);
pthread_mutex_init(&(Zathura.Lock.rotate_lock), NULL); pthread_mutex_init(&(Zathura.Lock.rotate_lock), NULL);
pthread_mutex_init(&(Zathura.Lock.render_lock), NULL);
/* look */ /* look */
gdk_color_parse(default_fgcolor, &(Zathura.Style.default_fg)); gdk_color_parse(default_fgcolor, &(Zathura.Style.default_fg));
@ -708,6 +710,7 @@ sc_navigate(Argument* argument)
void void
sc_revert_video(Argument* argument) sc_revert_video(Argument* argument)
{ {
pthread_mutex_lock(&(Zathura.Lock.render_lock));
if(Zathura.PDF.render_thread) if(Zathura.PDF.render_thread)
pthread_cancel(Zathura.PDF.render_thread); pthread_cancel(Zathura.PDF.render_thread);
@ -715,11 +718,13 @@ sc_revert_video(Argument* argument)
intptr_t t = Zathura.PDF.page_number; intptr_t t = Zathura.PDF.page_number;
pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t); pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t);
pthread_mutex_unlock(&(Zathura.Lock.render_lock));
} }
void void
sc_rotate(Argument* argument) sc_rotate(Argument* argument)
{ {
pthread_mutex_lock(&(Zathura.Lock.render_lock));
if(Zathura.PDF.render_thread) if(Zathura.PDF.render_thread)
pthread_cancel(Zathura.PDF.render_thread); pthread_cancel(Zathura.PDF.render_thread);
@ -729,6 +734,7 @@ sc_rotate(Argument* argument)
intptr_t t = Zathura.PDF.page_number; intptr_t t = Zathura.PDF.page_number;
pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t); pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t);
pthread_mutex_unlock(&(Zathura.Lock.render_lock));
} }
void void
@ -1163,7 +1169,12 @@ cmd_open(int argc, char** argv)
} }
/* render pages */ /* render pages */
pthread_mutex_lock(&(Zathura.Lock.render_lock));
if(Zathura.PDF.render_thread)
pthread_cancel(Zathura.PDF.render_thread);
pthread_create(&(Zathura.PDF.render_thread), NULL, render, NULL); pthread_create(&(Zathura.PDF.render_thread), NULL, render, NULL);
pthread_mutex_unlock(&(Zathura.Lock.render_lock));
set_page(0); set_page(0);
update_status(); update_status();
@ -1236,11 +1247,13 @@ cmd_set(int argc, char** argv)
if(!Zathura.PDF.document) if(!Zathura.PDF.document)
return FALSE; return FALSE;
pthread_mutex_lock(&(Zathura.Lock.render_lock));
if(Zathura.PDF.render_thread) if(Zathura.PDF.render_thread)
pthread_cancel(Zathura.PDF.render_thread); pthread_cancel(Zathura.PDF.render_thread);
intptr_t t = Zathura.PDF.page_number; intptr_t t = Zathura.PDF.page_number;
pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t); pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t);
pthread_mutex_unlock(&(Zathura.Lock.render_lock));
} }
} }
} }
@ -1422,11 +1435,13 @@ bcmd_zoom(char* buffer, Argument* argument)
Zathura.PDF.scale = 100; Zathura.PDF.scale = 100;
pthread_mutex_unlock(&(Zathura.Lock.scale_lock)); pthread_mutex_unlock(&(Zathura.Lock.scale_lock));
pthread_mutex_lock(&(Zathura.Lock.render_lock));
if(Zathura.PDF.render_thread) if(Zathura.PDF.render_thread)
pthread_cancel(Zathura.PDF.render_thread); pthread_cancel(Zathura.PDF.render_thread);
intptr_t t = Zathura.PDF.page_number; intptr_t t = Zathura.PDF.page_number;
pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t); pthread_create(&(Zathura.PDF.render_thread), NULL, render, (gpointer) t);
pthread_mutex_unlock(&(Zathura.Lock.render_lock));
update_status(); update_status();
} }
@ -1449,6 +1464,7 @@ cb_destroy(GtkWidget* widget, gpointer data)
/* mutexes */ /* mutexes */
pthread_mutex_destroy(&(Zathura.Lock.scale_lock)); pthread_mutex_destroy(&(Zathura.Lock.scale_lock));
pthread_mutex_destroy(&(Zathura.Lock.rotate_lock)); pthread_mutex_destroy(&(Zathura.Lock.rotate_lock));
pthread_mutex_destroy(&(Zathura.Lock.render_lock));
gtk_main_quit(); gtk_main_quit();