ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.350 by root, Thu Oct 14 23:21:40 2010 UTC

911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 912
913 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
916 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
917 c = NOCHAR; 919 c = NOCHAR;
918 // and try the same character next loop iteration 920 // and try the same character next loop iteration
919 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
920 } 925 }
921 926
922 line->touch (); 927 line->touch ();
923 928
924 do 929 do
1021 1026
1022 want_refresh = 1; 1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1026 else 1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028} 1035}
1029 1036
1030/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines