From de8bde7be0a8ab99dbbf5cdbf6e5fc7fc582da01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Benencia?= Date: Tue, 3 Sep 2013 15:24:40 -0300 Subject: Solved row overflow bug --- Print.hs | 2 +- Screen.hs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Print.hs b/Print.hs index d033bf2..81dd9d0 100644 --- a/Print.hs +++ b/Print.hs @@ -43,7 +43,7 @@ ppFlag FORWARDED = 'P' ppFlag DELETED = 'T' ppFlag (OTHERFLAG [c]) = c -ppSep = "\t" +ppSep = " " normalizeLen len cs = if (length cs > len) then shorten len cs diff --git a/Screen.hs b/Screen.hs index 617bdcb..6bc5b5e 100644 --- a/Screen.hs +++ b/Screen.hs @@ -50,6 +50,7 @@ startCurses = do cfg <- ask (=<<) put $ liftCurses $ do setEcho False + setCursorMode CursorInvisible (rows, cols) <- screenSize basColID <- newColorID (fst . baseColor $ cfg) (snd . baseColor $ cfg) 1 selColID <- newColorID (fst . selectionColor $ cfg) (snd . selectionColor $ cfg) 2 @@ -135,6 +136,7 @@ drawSimpleRow st path str | (mode st) == MaildirMode = drawString $ normalizeLen {- Empty the whole window. Useful when changing modes. -} clearMain rows columns = do drawEmptyLine 0 + moveCursor 0 0 where drawEmptyLine currentRow = do moveCursor currentRow 0 @@ -164,7 +166,7 @@ drawEmailHeaders = do liftUpdate $ do setColor $ headerColorID . colorStyle $ st - drawHeaders st (curRowAsInteger st) parsedHeaders + drawHeaders st (curRowAsInteger st) parsedHeaders setColor $ baseColorID . colorStyle $ st put $ st { currentRow = 1 + (length parsedHeaders) + (currentRow st) } @@ -195,9 +197,9 @@ drawBody row col maxRows (xs:xss) = do drawStatus = do st <- get liftUpdate $ do - moveCursor ((scrRowsAsInteger st) - 1) 0 + moveCursor (scrRowsAsInteger st) 0 setColor $ statusBarColorID . colorStyle $ st - drawCroppedString st $ concat $ drawStatusHelper (mode st) st + drawString $ normalizeLen (screenColumns st - 1)$ concat $ drawStatusHelper (mode st) st -- Can't write in the last char - ncurses bug setColor $ baseColorID . colorStyle $ st {- Status bar string for Maildir mode -} -- cgit v1.2.3