diff --git a/src/conio/x_events.c b/src/conio/x_events.c index 09ba9e9f59b733979a24091a99424cec29fea4ff..e526793d0049b2cd936b470092c5fd4b48caf2cb 100644 --- a/src/conio/x_events.c +++ b/src/conio/x_events.c @@ -165,7 +165,6 @@ static int r_shift; static int g_shift; static int b_shift; static struct graphics_buffer *last = NULL; -pthread_mutex_t last_mutex; #ifdef WITH_XRENDER static XRenderPictFormat *xrender_pf = NULL; static Pixmap xrender_pm = None; @@ -728,12 +727,10 @@ resize_pictures(void) static void free_last(void) { - pthread_mutex_lock(&last_mutex); if (last) { release_buffer(last); last = NULL; } - pthread_mutex_unlock(&last_mutex); } static void resize_xim(void) @@ -1383,7 +1380,6 @@ local_draw_rect(struct rectlist *rect) /* TODO: Translate into local colour depth */ idx = 0; - pthread_mutex_lock(&last_mutex); for (y = 0; y < dh; y++) { for (x = 0; x < dw; x++) { if (last) { @@ -1488,7 +1484,6 @@ local_draw_rect(struct rectlist *rect) #endif } last = source; - pthread_mutex_lock(&last_mutex); } static void handle_resize_event(int width, int height, bool map) @@ -2272,7 +2267,6 @@ void x11_event_thread(void *args) return; } sem_init(&event_thread_complete, 0, 0); - pthread_mutex_init(&last_mutex, NULL); atexit(x11_terminate_event_thread); diff --git a/src/syncterm/CHANGES b/src/syncterm/CHANGES index 658959ad5b3762b1c18c89be9e07a8594d6f43e9..b3fb5e55b477f5db20c6a69a9a550f6173169c32 100644 --- a/src/syncterm/CHANGES +++ b/src/syncterm/CHANGES @@ -12,7 +12,6 @@ Fix focus-follows-mouse behaviour in herbstluftwm Fix SAUCE binary capture date Add Build Options menu item Fix saving non-integer scaling in GDI mode -Fix X11 race between Expose event and redraw Version 1.2rc1 --------------