Changes in functions.c [1cfcab7:2cfc6d7]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r1cfcab7 r2cfc6d7 1264 1264 void owl_function_full_redisplay(void) 1265 1265 { 1266 redrawwin(owl_global_get_curs_recwin(&g)); 1267 redrawwin(owl_global_get_curs_sepwin(&g)); 1268 /* Work around curses segfualts with windows off the screen */ 1269 if (g.lines >= owl_global_get_typwin_lines(&g)+2) 1270 redrawwin(owl_global_get_curs_typwin(&g)); 1271 if (g.lines >= 2) 1272 redrawwin(owl_global_get_curs_msgwin(&g)); 1266 touchwin(owl_global_get_curs_recwin(&g)); 1267 touchwin(owl_global_get_curs_sepwin(&g)); 1268 touchwin(owl_global_get_curs_typwin(&g)); 1269 touchwin(owl_global_get_curs_msgwin(&g)); 1273 1270 1274 1271 sepbar(""); … … 1575 1572 { 1576 1573 owl_global_set_typwin_lines(&g, newsize); 1577 owl_ function_resize();1574 owl_global_set_relayout_pending(&g); 1578 1575 } 1579 1576 … … 1995 1992 newbuff = owl_sprintf("%s%s", buff, redirect); 1996 1993 1997 if (type == 1) {1994 if (type == OWL_OUTPUT_POPUP) { 1998 1995 owl_popexec_new(newbuff); 1999 1996 } else { … … 2002 1999 pclose(p); 2003 2000 2004 if (type==1) { 2005 owl_function_popless_text(out); 2006 } else if (type==0) { 2001 if (type == OWL_OUTPUT_RETURN) { 2007 2002 owl_free(newbuff); 2008 2003 return out; 2009 } else if (type ==2) {2004 } else if (type == OWL_OUTPUT_ADMINMSG) { 2010 2005 owl_function_adminmsg(buff, out); 2011 } else {2012 owl_function_popless_text(out);2013 2006 } 2014 2007 owl_free(out); … … 2037 2030 perlout = owl_perlconfig_execute(buff); 2038 2031 if (perlout) { 2039 if (type ==1) {2032 if (type == OWL_OUTPUT_POPUP) { 2040 2033 owl_function_popless_text(perlout); 2041 } else if (type ==2) {2034 } else if (type == OWL_OUTPUT_ADMINMSG) { 2042 2035 owl_function_adminmsg(buff, perlout); 2043 } else if (type ==0) {2036 } else if (type == OWL_OUTPUT_RETURN) { 2044 2037 return perlout; 2045 } else {2046 owl_function_popless_text(perlout);2047 2038 } 2048 2039 owl_free(perlout); … … 2334 2325 /* if it already exists then go with it. This lets users override */ 2335 2326 if (owl_global_get_filter(&g, filtname)) { 2336 return(filtname);2327 goto done; 2337 2328 } 2338 2329 … … 2364 2355 2365 2356 owl_free(argbuff); 2357 done: 2366 2358 owl_free(class); 2367 2359 if (instance) { … … 2392 2384 /* if it already exists then go with it. This lets users override */ 2393 2385 if (owl_global_get_filter(&g, filtname)) { 2394 return (owl_strdup(filtname));2386 return filtname; 2395 2387 } 2396 2388
Note: See TracChangeset
for help on using the changeset viewer.