mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-02-07 14:44:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updates search function

Browse source 
Do not use pthread_cancel to stop the search thread
This commit is contained in:
neldoreth 2010-03-08 21:10:39 +01:00
parent 8ebb802850
commit 71a36b5738
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.def.h
View file

@ -58,6 +58,7 @@ Shortcut shortcuts[] = {
{GDK_CONTROL_MASK, GDK_q, sc_quit, -1, {0} }, {GDK_CONTROL_MASK, GDK_q, sc_quit, -1, {0} },
{GDK_CONTROL_MASK, GDK_c, sc_abort, -1, {0} }, {GDK_CONTROL_MASK, GDK_c, sc_abort, -1, {0} },
{GDK_CONTROL_MASK, GDK_i, sc_revert_video, NORMAL, {0} }, {GDK_CONTROL_MASK, GDK_i, sc_revert_video, NORMAL, {0} },
{0, GDK_slash, sc_focus_inputbar, NORMAL, { .data = "/" } },
{GDK_SHIFT_MASK, GDK_slash, sc_focus_inputbar, NORMAL, { .data = "/" } }, {GDK_SHIFT_MASK, GDK_slash, sc_focus_inputbar, NORMAL, { .data = "/" } },
{GDK_SHIFT_MASK, GDK_question, sc_focus_inputbar, NORMAL, { .data = "?" } }, {GDK_SHIFT_MASK, GDK_question, sc_focus_inputbar, NORMAL, { .data = "?" } },
{0, GDK_Tab, sc_toggle_index, NORMAL, {0} }, {0, GDK_Tab, sc_toggle_index, NORMAL, {0} },

20
zathura.c
View file

@ -1033,7 +1033,9 @@ switch_view(GtkWidget* widget)
void* void*
search(void* parameter) search(void* parameter)
{ {
pthread_mutex_lock(&(Zathura.Lock.search_lock));
Zathura.Thread.search_thread_running = TRUE; Zathura.Thread.search_thread_running = TRUE;
pthread_mutex_unlock(&(Zathura.Lock.search_lock));
Argument* argument = (Argument*) parameter; Argument* argument = (Argument*) parameter;
static char* search_item; static char* search_item;
@ -1048,7 +1050,9 @@ search(void* parameter)
if(!Zathura.PDF.document || !search_item || !strlen(search_item)) if(!Zathura.PDF.document || !search_item || !strlen(search_item))
{ {
pthread_mutex_lock(&(Zathura.Lock.search_lock));
Zathura.Thread.search_thread_running = FALSE; Zathura.Thread.search_thread_running = FALSE;
pthread_mutex_unlock(&(Zathura.Lock.search_lock));
pthread_exit(NULL); pthread_exit(NULL);
} }
@ -1058,6 +1062,14 @@ search(void* parameter)
for(page_counter = 1; page_counter <= Zathura.PDF.number_of_pages; page_counter++) for(page_counter = 1; page_counter <= Zathura.PDF.number_of_pages; page_counter++)
{ {
pthread_mutex_lock(&(Zathura.Lock.search_lock));
if(Zathura.Thread.search_thread_running == FALSE)
{
pthread_mutex_unlock(&(Zathura.Lock.search_lock));
pthread_exit(NULL);
}
pthread_mutex_unlock(&(Zathura.Lock.search_lock));
next_page = (Zathura.PDF.number_of_pages + Zathura.PDF.page_number + next_page = (Zathura.PDF.number_of_pages + Zathura.PDF.page_number +
page_counter * direction) % Zathura.PDF.number_of_pages; page_counter * direction) % Zathura.PDF.number_of_pages;
@ -1296,12 +1308,14 @@ sc_search(Argument* argument)
pthread_mutex_lock(&(Zathura.Lock.search_lock)); pthread_mutex_lock(&(Zathura.Lock.search_lock));
if(Zathura.Thread.search_thread_running) if(Zathura.Thread.search_thread_running)
{ {
if(pthread_cancel(Zathura.Thread.search_thread) == 0) pthread_mutex_unlock(&(Zathura.Lock.search_lock));
pthread_join(Zathura.Thread.search_thread, NULL);
Zathura.Thread.search_thread_running = FALSE; Zathura.Thread.search_thread_running = FALSE;
pthread_join(Zathura.Thread.search_thread, NULL);
} }
else
pthread_mutex_unlock(&(Zathura.Lock.search_lock));
pthread_mutex_lock(&(Zathura.Lock.search_lock));
pthread_create(&(Zathura.Thread.search_thread), NULL, search, (gpointer) argument); pthread_create(&(Zathura.Thread.search_thread), NULL, search, (gpointer) argument);
pthread_mutex_unlock(&(Zathura.Lock.search_lock)); pthread_mutex_unlock(&(Zathura.Lock.search_lock));
} }