X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=bin%2Fsup;h=8a377f78149f5a4b17a56e06036fcae96e2b3fb6;hb=fc260ddb62efcd26747e41d1c8a098bda3174d42;hp=9abe1b54c395630857445d4268baacfcd1c5e930;hpb=5057149d9c3b57c6b5c4d0964a0aae9d490aaa38;p=sup diff --git a/bin/sup b/bin/sup index 9abe1b5..8a377f7 100755 --- a/bin/sup +++ b/bin/sup @@ -5,7 +5,6 @@ require 'ncurses' require 'curses' require 'fileutils' require 'trollop' -require 'fastthread' require "sup" BIN_VERSION = "git" @@ -79,6 +78,7 @@ global_keymap = Keymap.new do |k| k.add :compose, "Compose new message", 'm', 'c' k.add :nothing, "Do nothing", :ctrl_g k.add :recall_draft, "Edit most recent draft message", 'R' + k.add :show_inbox, "Show the Inbox buffer", 'I' end ## the following magic enables wide characters when used with a ruby @@ -89,24 +89,24 @@ end ## BSD users: if libc.so.6 is not found, try installing compat6x. require 'dl/import' module LibC - extend DL::Importable + extend DL.const_defined?(:Importer) ? DL::Importer : DL::Importable setlocale_lib = case Config::CONFIG['arch'] when /darwin/; "libc.dylib" when /cygwin/; "cygwin1.dll" else; "libc.so.6" end - Redwood::log "dynamically loading setlocale() from #{setlocale_lib}" + debug "dynamically loading setlocale() from #{setlocale_lib}" begin dlload setlocale_lib extern "void setlocale(int, const char *)" - Redwood::log "setting locale..." + debug "setting locale..." LibC.setlocale(6, "") # LC_ALL == 6 rescue RuntimeError => e - Redwood::log "cannot dlload setlocale(); ncurses wide character support probably broken." - Redwood::log "dlload error was #{e.class}: #{e.message}" + warn "cannot dlload setlocale(); ncurses wide character support probably broken." + warn "dlload error was #{e.class}: #{e.message}" if Config::CONFIG['arch'] =~ /bsd/ - Redwood::log "BSD variant detected. You may have to install a compat6x package to acquire libc." + warn "BSD variant detected. You may have to install a compat6x package to acquire libc." end end end @@ -130,7 +130,7 @@ def stop_cursing end module_function :start_cursing, :stop_cursing -Index.new +Index.init begin Index.lock rescue Index::LockError => e @@ -161,48 +161,57 @@ begin Redwood::start Index.load - if(s = Index.source_for DraftManager.source_name) + trap("TERM") { |x| SuicideManager.please_die! } + trap("WINCH") { |x| BufferManager.sigwinch_happened! } + + if(s = Redwood::SourceManager.source_for DraftManager.source_name) DraftManager.source = s else - Redwood::log "no draft source, auto-adding..." - Index.add_source DraftManager.new_source + debug "no draft source, auto-adding..." + Redwood::SourceManager.add_source DraftManager.new_source end - if(s = Index.source_for SentManager.source_uri) + if(s = Redwood::SourceManager.source_for SentManager.source_uri) SentManager.source = s else - Index.add_source SentManager.default_source + Redwood::SourceManager.add_source SentManager.default_source end HookManager.run "startup" - log "starting curses" + debug "starting curses" + Redwood::Logger.remove_sink $stderr start_cursing - bm = BufferManager.new + bm = BufferManager.init Colormap.new.populate_colormap - log "initializing mail index buffer" + debug "initializing log buffer" + lmode = Redwood::LogMode.new "system log" + lmode.on_kill { Logger.clear! } + Logger.add_sink lmode + Logger.force_message "Welcome to Sup! Log level is set to #{Logger.level}." + + debug "initializing inbox buffer" imode = InboxMode.new ibuf = bm.spawn "Inbox", imode - log "ready for interaction!" - Logger.make_buf + debug "ready for interaction!" bm.draw_screen - Index.usual_sources.each do |s| + Redwood::SourceManager.usual_sources.each do |s| next unless s.respond_to? :connect reporting_thread("call #connect on #{s}") do begin s.connect rescue SourceError => e - Redwood::log "fatal error loading from #{s}: #{e.message}" + error "fatal error loading from #{s}: #{e.message}" end end end unless $opts[:no_initial_poll] - - imode.load_threads :num => ibuf.content_height, :when_done => lambda { reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] } + + imode.load_threads :num => ibuf.content_height, :when_done => lambda { |num| reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] } if $opts[:compose] ComposeMode.spawn_nicely :to_default => $opts[:compose] @@ -219,29 +228,39 @@ begin end until Redwood::exceptions.nonempty? || SuicideManager.die? - c = - begin - Ncurses.nonblocking_getch - rescue Exception => e - if e.is_a?(Interrupt) - raise if BufferManager.ask_yes_or_no("Die ungracefully now?") - bm.draw_screen - nil - end - end - next unless c + c = begin + Ncurses.nonblocking_getch + rescue Interrupt => e + raise if BufferManager.ask_yes_or_no "Die ungracefully now?" + BufferManager.draw_screen + nil + end + + if c.nil? + if BufferManager.sigwinch_happened? + debug "redrawing screen on sigwinch" + BufferManager.completely_redraw_screen + end + next + end + + if c == 410 + ## this is ncurses's way of telling us it's detected a refresh. + ## since we have our own sigwinch handler, we don't do anything. + next + end + bm.erase_flash - action = - begin - if bm.handle_input c - :nothing - else - bm.resolve_input_with_keymap c, global_keymap - end - rescue InputSequenceAborted + action = begin + if bm.handle_input c :nothing + else + bm.resolve_input_with_keymap c, global_keymap end + rescue InputSequenceAborted + :nothing + end case action when :quit_now break if bm.kill_all_buffers_safely @@ -297,6 +316,8 @@ begin b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] } b.mode.load_threads :num => b.content_height if new end + when :show_inbox + BufferManager.raise_to_front ibuf when :nothing, InputSequenceAborted when :redraw bm.completely_redraw_screen @@ -321,17 +342,19 @@ ensure Redwood::finish stop_cursing - Redwood::log "stopped cursing" + Redwood::Logger.remove_all_sinks! + Redwood::Logger.add_sink $stderr, false + debug "stopped cursing" if SuicideManager.instantiated? && SuicideManager.die? - Redwood::log "I've been ordered to commit seppuku. I obey!" + info "I've been ordered to commit seppuku. I obey!" end if Redwood::exceptions.empty? - Redwood::log "no fatal errors. good job, william." + debug "no fatal errors. good job, william." Index.save else - Redwood::log "oh crap, an exception" + error "oh crap, an exception" end Index.unlock