diff --git a/src/.indent.pro b/src/.indent.pro new file mode 100644 index 0000000..2a08389 --- /dev/null +++ b/src/.indent.pro @@ -0,0 +1 @@ +-bap -bbo -br -brs -ce -ci4 -cli2 -cs -di1 -hnl -i2 -l140 -lp -lps -nbc -npcs -nss -nsob -pmt -psl -ts 999 diff --git a/src/screen.c b/src/screen.c index 799644d..4883a7b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1596,6 +1596,9 @@ scr_refresh(int type) Pixmap pmap = images[image_bg].current->pmap->pixmap; int (*draw_string) (), (*draw_image_string) (); register int low_x = 99999, low_y = 99999, high_x = 0, high_y = 0; +#ifdef PIXMAP_SUPPORT + Drawable draw_buffer; +#endif #ifndef NO_BOLDFONT int bfont = 0; /* we've changed font to bold font */ #endif @@ -1603,15 +1606,6 @@ scr_refresh(int type) register int nrows = TermWin.nrow; register int ncols = TermWin.ncol; #endif -#ifdef PIXMAP_SUPPORT - Drawable draw_buffer; - - if (buffer_pixmap) { - draw_buffer = buffer_pixmap; - } else { - draw_buffer = TermWin.vt; - } -#endif PROF_INIT(scr_refresh); @@ -1629,6 +1623,14 @@ scr_refresh(int type) if (type == NO_REFRESH) return; +#ifdef PIXMAP_SUPPORT + if (buffer_pixmap) { + draw_buffer = buffer_pixmap; + } else { + draw_buffer = TermWin.vt; + } +#endif + row_offset = TermWin.saveLines - TermWin.view_start; fprop = TermWin.fprop; diff --git a/src/system.c b/src/system.c index 0808eb5..8383d92 100644 --- a/src/system.c +++ b/src/system.c @@ -42,17 +42,8 @@ static const char cvs_ident[] = "$Id$"; #include "misc.h" #include "system.h" -static RETSIGTYPE dummy_handler(int); - static sighandler_t old_handler = (sighandler_t) NULL; -static RETSIGTYPE -dummy_handler(int sig) -{ - signal(SIGCHLD, old_handler); - SIG_RETURN(0); -} - int wait_for_chld(int system_pid) {