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.30 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.34 by pcg, Tue Feb 24 00:44:23 2004 UTC

… …
485 prev_nrow = prev_ncol = 0; 485 prev_nrow = prev_ncol = 0;
486 scr_reset (); 486 scr_reset ();
487 487
488 scr_clear (); 488 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 489 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 490}
494 491
495/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
593# endif 590# endif
594 SWAP_IT (screen.charset, swap.charset, int16_t); 591 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT (screen.flags, swap.flags, int); 592 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 593 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 594 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 {
603 Gr_scroll (0);
604 Gr_ChangeScreen ();
605 }
606# endif
607#else 595#else
608# ifdef SCROLL_ON_NO_SECONDARY 596# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 597 if (current_screen == PRIMARY)
614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed ()
616# endif
617 )
618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 599# endif
620#endif 600#endif
621 return scrn; 601 return scrn;
622} 602}
… …
771 751
772 if (!spec) /* line length may not equal TermWin.ncol */ 752 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 753 scr_blank_screen_mem (screen.text, screen.rend,
774 (unsigned int)j, rstyle); 754 (unsigned int)j, rstyle);
775 } 755 }
776
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781 756
782 return count; 757 return count;
783} 758}
784 759
785/* ------------------------------------------------------------------------- */ 760/* ------------------------------------------------------------------------- */
… …
1075void 1050void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1051rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1052{
1078 want_refresh = 1; 1053 want_refresh = 1;
1079 ZERO_SCROLLBACK (); 1054 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1055
1085 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1056 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1086 1057
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1059 : col);
… …
1135 want_refresh = 1; 1106 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1107 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1109
1139 ZERO_SCROLLBACK (); 1110 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1111
1146 screen.flags &= ~Screen_WrapNext; 1112 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1113 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1114 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1115 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
… …
1167 unsigned int row, col, num; 1133 unsigned int row, col, num;
1168 1134
1169 want_refresh = 1; 1135 want_refresh = 1;
1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); 1136 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1137 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1138
1178 selection_check (1); 1139 selection_check (1);
1179 1140
1180 screen.flags &= ~Screen_WrapNext; 1141 screen.flags &= ~Screen_WrapNext;
1181 1142
… …
1250 row = 0; 1211 row = 0;
1251 num = screen.cur.row; 1212 num = screen.cur.row;
1252 break; 1213 break;
1253 case 2: /* erase whole screen */ 1214 case 2: /* erase whole screen */
1254 selection_check (3); 1215 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1216 row = 0;
1259 num = TermWin.nrow; 1217 num = TermWin.nrow;
1260 break; 1218 break;
1261 default: 1219 default:
1262 return; 1220 return;
… …
1331{ 1289{
1332 int end; 1290 int end;
1333 1291
1334 ZERO_SCROLLBACK (); 1292 ZERO_SCROLLBACK ();
1335 1293
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340
1341 selection_check (1); 1294 selection_check (1);
1342 1295
1343 if (screen.cur.row > screen.bscroll) 1296 if (screen.cur.row > screen.bscroll)
1344 return; 1297 return;
1345 1298
… …
1369 rend_t *srp; 1322 rend_t *srp;
1370 int16_t *slp; 1323 int16_t *slp;
1371 1324
1372 want_refresh = 1; 1325 want_refresh = 1;
1373 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1327
1380 if (count <= 0) 1328 if (count <= 0)
1381 return; 1329 return;
1382 1330
1383 selection_check (1); 1331 selection_check (1);
… …
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1756rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1757{
1810 if (TermWin.view_start != oldviewstart) 1758 if (TermWin.view_start != oldviewstart)
1811 { 1759 {
1812 want_refresh = 1; 1760 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1761 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1762 }
1819 return (int) (TermWin.view_start - oldviewstart); 1763 return (int) (TermWin.view_start - oldviewstart);
1820} 1764}
1821 1765
… …
2225 * Actually do the drawing of the string here 2169 * Actually do the drawing of the string here
2226 */ 2170 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2171 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2172
2229 if (back == fore) 2173 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2174 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2175 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2176 back);
2233 else if (back == Color_bg) 2177 else if (back == Color_bg)
2234 { 2178 {
2235 if (must_clear) 2179 if (must_clear)
… …
2237 CLEAR_CHARS (xpixel, ypixel, count); 2181 CLEAR_CHARS (xpixel, ypixel, count);
2238 2182
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2183 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2184 if (text[i] != ' ')
2241 { 2185 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2186 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2187 break;
2244 } 2188 }
2245 } 2189 }
2246 else 2190 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2191 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2192 }
2249 else 2193 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2194 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2195
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2196 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2197 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2198 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
… …
2316 num_scr = 0; 2260 num_scr = 0;
2317 num_scr_allow = 1; 2261 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2262 want_refresh = 0; /* screen is current */
2319} 2263}
2320 2264
2265void
2266rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2267{
2268 if (!rp || !tp)
2269 return;
2270
2271 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2272 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2273}
2274
2275void
2276rxvt_term::scr_remap_chars ()
2277{
2278 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2279 scr_remap_chars (screen.text[i], screen.rend[i]);
2280
2281 for (int i = TermWin.nrow; i--; )
2282 {
2283 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2284 scr_remap_chars (swap.text[i], swap.rend[i]);
2285 }
2286}
2287
2321/* ------------------------------------------------------------------------- */ 2288/* ------------------------------------------------------------------------- */
2322void 2289void
2323rxvt_term::scr_clear () 2290rxvt_term::scr_clear ()
2324{ 2291{
2325 if (!TermWin.mapped) 2292 if (!TermWin.mapped)
… …
2723rxvt_term::selection_clear () 2690rxvt_term::selection_clear ()
2724{ 2691{
2725 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2692 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2693
2727 want_refresh = 1; 2694 want_refresh = 1;
2728 if (selection.text)
2729 free (selection.text); 2695 free (selection.text);
2730 selection.text = NULL; 2696 selection.text = NULL;
2731 selection.len = 0; 2697 selection.len = 0;
2732 CLEAR_SELECTION (); 2698 CLEAR_SELECTION ();
2733} 2699}
2734 2700

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines