Changeset d296c9a for owl.c


Ignore:
Timestamp:
Jul 18, 2010, 4:48:15 PM (11 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, release-1.7, release-1.8, release-1.9
Children:
205e164
Parents:
1cc9b615 (diff), 8bba1ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'owl_window'

Conflicts:
	global.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.c

    rdec60b4 rd296c9a  
    240240  /* log the message if we need to */
    241241  owl_log_message(m);
     242  /* redraw the sepbar; TODO: don't violate layering */
     243  owl_global_sepbar_dirty(&g);
    242244
    243245  return 1;
     
    272274    /* this should be optimized to not run if the new messages won't be displayed */
    273275    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
    274     sepbar(NULL);
    275     owl_global_set_needrefresh(&g);
    276276  }
    277277  return newmsgs;
     
    428428{
    429429  /* if a resize has been scheduled, deal with it */
    430   owl_global_resize(&g, 0, 0);
    431   /* also handle relayouts */
    432   owl_global_relayout(&g);
    433 
     430  owl_global_check_resize(&g);
    434431  /* update the terminal if we need to */
    435   if (owl_global_is_needrefresh(&g)) {
    436     /* these are here in case a relayout changes the windows */
    437     WINDOW *sepwin = owl_global_get_curs_sepwin(&g);
    438     WINDOW *typwin = owl_global_get_curs_typwin(&g);
    439 
    440     /* push all changed windows to screen */
    441     update_panels();
    442     /* leave the cursor in the appropriate window */
    443     if (!owl_popwin_is_active(owl_global_get_popwin(&g))
    444         && owl_global_get_typwin(&g)) {
    445       owl_function_set_cursor(typwin);
    446     } else {
    447       owl_function_set_cursor(sepwin);
    448     }
    449     doupdate();
    450     owl_global_set_noneedrefresh(&g);
    451   }
     432  owl_window_redraw_scheduled();
    452433  return 0;
    453434}
     
    519500
    520501  owl_global_pop_context(&g);
    521   owl_global_push_context(&g, OWL_CTX_READCONFIG, NULL, NULL);
     502  owl_global_push_context(&g, OWL_CTX_READCONFIG, NULL, NULL, NULL);
    522503
    523504  perlerr=owl_perlconfig_initperl(opts.configfile, &argc, &argv, &env);
     
    563544    "-----------------------------------------------------------------m-m---\n"
    564545  );
    565   sepbar(NULL);
    566546
    567547  /* process the startup file */
     
    587567
    588568  owl_global_pop_context(&g);
    589   owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
     569  owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv", NULL);
    590570
    591571  owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
Note: See TracChangeset for help on using the changeset viewer.