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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.228 by root, Sun Jan 15 06:02:41 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 29#include "rxvtperl.h" /* NECESSARY */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 32
34#include <stdint.h> 33#include <inttypes.h>
35#include <wchar.h>
36 34
37#include "salloc.C" // HACK, should be a seperate compile! 35#include "salloc.C" // HACK, should be a seperate compile!
38 36
39inline void fill_text (text_t *start, text_t value, int len) 37inline void fill_text (text_t *start, text_t value, int len)
40{ 38{
41 while (len--) 39 while (len--)
42 *start++ = value; 40 *start++ = value;
43} 41}
44 42
45/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
48 47
49/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
54 TermWin.view_start = 0 53 view_start = 0
55#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
62 61
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
75 74
76/* these must be row_col_t */ 75/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 88
90/* 89/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 93 */
95#define drawBuffer TermWin.vt 94#define drawBuffer vt
96 95
97#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 97 if (mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)width, \
101 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
102 101
103#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 103 if (mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
108 107
109#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 111 (unsigned int)width, \
113 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
114 113
115/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
121{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
122 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
124 136
125 while (width--) 137 while (width--)
126 { 138 {
127 *et++ = ' '; 139 *et++ = ' ';
128 *er++ = efs; 140 *er++ = efs;
… …
130} 142}
131 143
132/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
134void 146void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
136{ 148{
137#ifdef DEBUG_STRICT 149 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145 150
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 162#if ENABLE_OVERLAY
156 unsigned int p, q; 163 scr_overlay_off ();
157 int k; 164#endif
158 rend_t setrstyle;
159 165
160 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
161
162 TermWin.view_start = 0; 166 view_start = 0;
163 num_scr = 0; 167 num_scr = 0;
164 168
165 if (TermWin.ncol == 0) 169 if (ncol == 0)
166 TermWin.ncol = 80; 170 ncol = 80;
167 171
168 if (TermWin.nrow == 0) 172 if (nrow == 0)
169 TermWin.nrow = 24; 173 nrow = 24;
170
171 ncol = TermWin.ncol;
172 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2)
180 {
181 //TODO//FIXME
182 saveLines++;
183 prev_nrow--;
184 top_row--;
185 }
186
177 want_refresh = 1; 187 want_refresh = 1;
178 188
189 int prev_total_rows = prev_nrow + saveLines;
179 total_rows = nrow + TermWin.saveLines; 190 total_rows = nrow + saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 191
182 screen.tscroll = 0; 192 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
184 194
185 if (!talloc) 195 if (!row_buf)
186 { 196 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; /* no saved lines */
201 term_start = 0;
202
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 }
190 205
191 if (prev_nrow == 0) 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
192 { 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
193 /* 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 * first time called so just malloc everything : don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL
196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
201 209
202 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 210 for (int row = nrow; row--; )
203 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
204
205 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
207 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
209
210 for (p = 0; p < nrow; p++)
211 {
212 q = p + TermWin.saveLines;
213 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
218 216
219 MEMSET (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 220 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 221 screen.charset = 0;
225 current_screen = PRIMARY; 222 current_screen = PRIMARY;
… …
245 else 242 else
246 { 243 {
247 /* 244 /*
248 * add or delete rows as appropriate 245 * add or delete rows as appropriate
249 */ 246 */
250 setrstyle = DEFAULT_RSTYLE;
251 247
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
253 { 253 {
254 /* delete rows */
255 k = min (TermWin.nscrolled, prev_nrow - nrow);
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 254 for (int row = nrow; row < prev_nrow; row++)
259 { 255 {
260 q = p + TermWin.saveLines; 256 lfree (swap_buf [row]);
261 if (screen.text[q]) 257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
270
271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (top_row)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
292 do
293 {
294 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
300
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
262 { 302 {
263#ifdef DEBUG_STRICT 303 p = MOD (p - 1, prev_total_rows);
264 assert (screen.rend[q]); 304
265#endif 305 plines++;
266 talloc->free (screen.text[q]); 306 llen += prev_ncol;
267 ralloc->free (screen.rend[q]);
268 } 307 }
269 if (swap.text[p]) 308
309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
317 int lofs = 0;
318 line_t *qline;
319
320 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++)
270 { 322 {
271#ifdef DEBUG_STRICT 323 qline = row_buf + qrow;
324 lalloc (*qline);
325 qline->l = ncol;
326 qline->is_longer (1);
327
328 int qcol = 0;
329
330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
332 {
333 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol;
335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348
272 assert (swap.rend[p]); 349 assert (len);
273#endif 350 assert (pline.t);
274 talloc->free (swap.text[p]); 351
275 ralloc->free (swap.rend[p]); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354
355 lofs += len;
356 qcol += len;
357 }
276 } 358 }
277#ifdef DEBUG_STRICT 359
278 assert (drawn_text[p] && drawn_rend[p]); 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
279#endif 361 qline->is_longer (0);
280 talloc->free (drawn_text[p]); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
281 ralloc->free (drawn_rend[p]);
282 } 363 }
364 while (p != pend && q > 0);
283 365
284 /* we have fewer rows so fix up cursor position */ 366 term_start = total_rows - nrow;
285 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 367 top_row = q - term_start;
286 MIN_IT (swap.cur.row, (int32_t)nrow - 1); 368
287 369 // make sure all terminal lines exist
288 scr_reset_realloc (); /* realloc _last_ */ 370 while (top_row > 0)
289 } 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
290 else if (nrow > prev_nrow)
291 { 372 }
292 /* add rows */ 373 else
293 scr_reset_realloc (); /* realloc _first_ */ 374 {
294 375 // if no scrollback exists (yet), wing, instead of wrap
295 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 376
296 377 for (int row = min (nrow, prev_nrow); row--; )
297 k = min (TermWin.nscrolled, nrow - prev_nrow);
298
299 for (p = prev_total_rows; p < total_rows; p++)
300 { 378 {
301 screen.tlen[p] = 0; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
302 screen.text[p] = NULL; 380 line_t &qline = row_buf [row];
303 screen.rend[p] = NULL; 381
382 qline = pline;
383 lresize (qline);
304 } 384 }
305 385
306 for (p = prev_total_rows; p < total_rows - k; p++)
307 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
308
309 for (p = prev_nrow; p < nrow; p++) 386 for (int row = prev_nrow; row < nrow; row++)
310 { 387 {
311 swap.tlen[p] = 0; 388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
312 swap.text[p] = NULL;
313 swap.rend[p] = NULL;
314 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 389 }
319 390
320 if (k > 0) 391 term_start = 0;
321 {
322 scr_scroll_text (0, (int)nrow - 1, -k, 1);
323 screen.cur.row += k;
324 screen.s_cur.row += k;
325 TermWin.nscrolled -= k;
326 }
327#ifdef DEBUG_STRICT
328 assert (screen.cur.row < TermWin.nrow);
329 assert (swap.cur.row < TermWin.nrow);
330#else /* drive with your eyes closed */
331
332 MIN_IT (screen.cur.row, nrow - 1);
333 MIN_IT (swap.cur.row, nrow - 1);
334#endif
335 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
336 }
337
338 /* resize columns */
339 if (ncol != prev_ncol)
340 { 392 }
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 393
345 for (p = 0; p < total_rows; p++) 394#ifdef DEBUG_STRICT //TODO: remove
346 { 395 for (int i = top_row; i < nrow; i++)
347 if (screen.text[p]) 396 assert (ROW (i).t);
348 { 397#endif
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
350 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
351 398
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
353 402
354 if (ncol > prev_ncol) 403 clamp_it (screen.cur.row, 0, nrow - 1);
355 scr_blank_line (& (screen.text[p][prev_ncol]), 404 clamp_it (screen.cur.col, 0, ncol - 1);
356 & (screen.rend[p][prev_ncol]),
357 ncol - prev_ncol,
358 setrstyle);
359 }
360 }
361
362 for (p = 0; p < nrow; p++)
363 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
365 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
366
367 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]),
369 & (drawn_rend[p][prev_ncol]),
370 ncol - prev_ncol, setrstyle);
371
372 if (swap.text[p])
373 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
375 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
376
377 MIN_IT (swap.tlen[p], (int16_t)ncol);
378
379 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]),
381 & (swap.rend[p][prev_ncol]),
382 ncol - prev_ncol, setrstyle);
383 }
384
385 }
386
387 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
388 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
389
390 delete talloc; talloc = ta;
391 delete ralloc; ralloc = ra;
392 }
393 405
394 if (tabs) 406 if (tabs)
395 free (tabs); 407 free (tabs);
396 } 408 }
397 409
398 prev_nrow = nrow; 410 prev_nrow = nrow;
399 prev_ncol = ncol; 411 prev_ncol = ncol;
400 412
401 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
402 414
403 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
404 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
405 417
406 tt_winch (); 418 tt_winch ();
407}
408 419
409void 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
410rxvt_term::scr_reset_realloc ()
411{
412 uint16_t total_rows, nrow;
413
414 nrow = TermWin.nrow;
415 total_rows = nrow + TermWin.saveLines;
416 /* *INDENT-OFF* */
417 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
418 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
419 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
420 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
421
422 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
423 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
424
425 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
426 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
427 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
428 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
429 /* *INDENT-ON* */
430} 421}
431 422
432/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
433/* 424/*
434 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
435 */ 426 */
436void 427void
437rxvt_term::scr_release () 428rxvt_term::scr_release ()
438{ 429{
439 uint16_t total_rows;
440 int i;
441
442 total_rows = TermWin.nrow + TermWin.saveLines;
443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 }
451#endif
452
453 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
455 432
456 free (screen.text); 433 free (row_buf);
457 free (screen.tlen); 434 free (swap_buf);
458 free (screen.rend);
459 free (drawn_text); 435 free (drawn_buf);
460 free (drawn_rend);
461 free (swap.text);
462 free (swap.tlen);
463 free (swap.rend);
464 free (buf_text);
465 free (buf_rend);
466 free (tabs); 436 free (tabs);
467 437
468 /* NULL these so if anything tries to use them, we'll know about it */ 438 row_buf = 0; // signal that we freed all the arrays
469 screen.text = drawn_text = swap.text = NULL;
470 screen.rend = drawn_rend = swap.rend = NULL;
471 screen.tlen = swap.tlen = NULL;
472 buf_text = NULL;
473 buf_rend = NULL;
474 tabs = NULL;
475} 439}
476 440
477/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
478/* 442/*
479 * Hard reset 443 * Hard reset
480 */ 444 */
481void 445void
482rxvt_term::scr_poweron () 446rxvt_term::scr_poweron ()
483{ 447{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 448 scr_release ();
487 prev_nrow = prev_ncol = 0; 449 prev_nrow = prev_ncol = 0;
488 scr_reset (); 450 scr_reset ();
489 451
490 scr_clear (); 452 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 453 scr_refresh (SLOW_REFRESH);
492} 454}
493 455
494/* ------------------------------------------------------------------------- * 456/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 457 * PROCESS SCREEN COMMANDS *
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 462 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 463 */
502void 464void
503rxvt_term::scr_cursor (int mode) 465rxvt_term::scr_cursor (int mode)
504{ 466{
505 screen_t *s; 467 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 468
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 470 if (current_screen == SECONDARY)
511 s = & (swap); 471 s = &swap;
512 else 472 else
513#endif 473#endif
514 s = & (screen); 474 s = &screen;
475
515 switch (mode) 476 switch (mode)
516 { 477 {
517 case SAVE: 478 case SAVE:
518 s->s_cur.row = s->cur.row; 479 s->s_cur.row = screen.cur.row;
519 s->s_cur.col = s->cur.col; 480 s->s_cur.col = screen.cur.col;
520 s->s_rstyle = rstyle; 481 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 482 s->s_charset = screen.charset;
522 s->s_charset_char = charsets[s->charset]; 483 s->s_charset_char = charsets[screen.charset];
523 break; 484 break;
485
524 case RESTORE: 486 case RESTORE:
525 want_refresh = 1; 487 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 488 screen.cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 489 screen.cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 490 screen.flags &= ~Screen_WrapNext;
529 rstyle = s->s_rstyle; 491 rstyle = s->s_rstyle;
530 s->charset = s->s_charset; 492 screen.charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 493 charsets[screen.charset] = s->s_charset_char;
532 set_font_style (); 494 set_font_style ();
533 break; 495 break;
534 } 496 }
497
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 499 min_it (s->cur.row, nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 500 min_it (s->cur.col, ncol - 1);
538#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
540 assert (s->cur.col >= 0); 503 assert (s->cur.col >= 0);
541#else /* drive with your eyes closed */
542 MAX_IT (s->cur.row, 0);
543 MAX_IT (s->cur.col, 0);
544#endif 504#endif
545} 505}
546 506
547/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
548/* 508/*
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 512 */
553int 513int
554rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
555{ 515{
556 int i; 516 want_refresh = 1;
517 view_start = 0;
518
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */
523
524 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
557#if NSCREENS 532#if NSCREENS
558 int offset; 533 if (OPTION (Opt_secondaryScreen))
559#endif 534 {
560
561 want_refresh = 1;
562
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564
565 TermWin.view_start = 0;
566
567 if (current_screen == scrn)
568 return current_screen;
569
570 selection_check (2); /* check for boundary cross */
571
572 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS
574 num_scr = 0; 535 num_scr = 0;
575 offset = TermWin.saveLines; 536
576 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
577 { 538 ::swap (ROW(i), swap_buf [i]);
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 539
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 540 ::swap (screen.charset, swap.charset);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 541 ::swap (screen.flags, swap.flags);
581 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
597#else 544 }
598# ifdef SCROLL_ON_NO_SECONDARY 545 else
599 if (current_screen == PRIMARY) 546#endif
547 if (OPTION (Opt_secondaryScroll))
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
601# endif 549
602#endif
603 return scrn; 550 return scrn;
604} 551}
605 552
553// clear WrapNext indicator, solidifying position on next line
554void
555rxvt_term::scr_do_wrap ()
556{
557 if (!(screen.flags & Screen_WrapNext))
558 return;
559
560 screen.flags &= ~Screen_WrapNext;
561
562 screen.cur.col = 0;
563
564 if (screen.cur.row == screen.bscroll)
565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
566 else if (screen.cur.row < nrow - 1)
567 screen.cur.row++;
568}
569
606/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
607/* 571/*
608 * Change the colour for following text 572 * Change the colour for following text
609 */ 573 */
610void 574void
611rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
612{ 576{
613 color &= RS_fgMask; 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg;
579
614 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
615 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
616 else 582 else
617 rstyle = SET_BGCOLOR (rstyle, color); 583 rstyle = SET_BGCOLOR (rstyle, color);
618} 584}
… …
635/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
636/* 602/*
637 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
638 * count positive ==> scroll up 604 * count positive ==> scroll up
639 * count negative ==> scroll down 605 * count negative ==> scroll down
640 * spec == 0 for normal routines
641 */ 606 */
642int 607int
643rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
644{ 609{
645 int i, j;
646 long nscrolled;
647
648 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
649 return 0; 611 return 0;
650 612
651 want_refresh = 1; 613 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 614 num_scr += count;
653 615
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 616 if (count > 0
617 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
619 {
620 top_row = max (top_row - count, -saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626
655 { 627 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
657 633
658 if (nscrolled > (long)TermWin.saveLines) 634 // erase newly scorlled-in lines
659 TermWin.nscrolled = TermWin.saveLines; 635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
660 else 658
661 TermWin.nscrolled = (uint16_t)nscrolled; 659 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen)
661 {
662 selection.beg.row -= count;
663 selection.end.row -= count;
664 selection.mark.row -= count;
662 665
666 if (selection.beg.row < top_row
667 || selection.end.row < top_row
668 || selection.mark.row < top_row)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
672 }
673 }
674
675 // finally move the view window, if desired
663 if ((Options & Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
664 && TermWin.view_start != 0 677 && view_start != 0
665 && TermWin.view_start != TermWin.saveLines) 678 && view_start != -saveLines)
666 scr_page (UP, count); 679 scr_page (UP, count);
667 } 680 }
668 else if (!spec) 681 else
669 row1 += TermWin.saveLines; 682 {
670
671 row2 += TermWin.saveLines;
672
673 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
674 { 684 {
675 i = selection.beg.row + TermWin.saveLines; 685 if ((selection.beg.row < row1 && selection.end.row > row1)
676 j = selection.end.row + TermWin.saveLines; 686 || (selection.beg.row < row2 && selection.end.row > row2)
677 if ((i < row1 && j > row1) 687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
678 || (i < row2 && j > row2) 688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
679 || (i - count < row1 && i >= row1) 689 || (selection.end.row - count < row1 && selection.end.row >= row1)
680 || (i - count > row2 && i <= row2) 690 || (selection.end.row - count > row2 && selection.end.row <= row2))
681 || (j - count < row1 && j >= row1)
682 || (j - count > row2 && j <= row2))
683 { 691 {
684 CLEAR_ALL_SELECTION (); 692 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 693 selection.op = SELECTION_CLEAR;
686 } 694 }
687 else if (j >= row1 && j <= row2) 695 else if (selection.end.row >= row1 && selection.end.row <= row2)
688 { 696 {
689 /* move selected region too */ 697 /* move selected region too */
690 selection.beg.row -= count; 698 selection.beg.row -= count;
691 selection.end.row -= count; 699 selection.end.row -= count;
692 selection.mark.row -= count; 700 selection.mark.row -= count;
701
702 selection_check (0);
693 } 703 }
694 }
695
696 selection_check (0); /* _after_ TermWin.nscrolled update */
697
698 num_scr += count;
699 j = count;
700
701 if (count < 0)
702 count = -count;
703
704 i = row2 - row1 + 1;
705 MIN_IT (count, i);
706
707 if (j > 0)
708 {
709 /* A: scroll up */
710
711 /* A1: Copy lines that will get clobbered by the rotation */
712 for (i = 0, j = row1; i < count; i++, j++)
713 { 704 }
714 buf_text[i] = screen.text[j]; 705
715 buf_rend[i] = screen.rend[j]; 706 // use a simple and robust scrolling algorithm, this
707 // part of scr_scroll_text is not time-critical.
708
709 int rows = row2 - row1 + 1;
710
711 min_it (count, rows);
712
713 line_t *temp_buf = row_buf + total_rows;
714
715 for (int row = 0; row < rows; row++)
716 } 716 {
717 /* A2: Rotate lines */ 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
718 for (j = row1, i = j + count; i <= row2; i++, j++) 718
719 if (!IN_RANGE_EXC (row + count, 0, rows))
720 scr_blank_screen_mem (temp_buf [row], rstyle);
719 { 721 }
720 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i];
723 }
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729 722
730 /* B1: Copy lines that will get clobbered by the rotation */ 723 for (int row = 0; row < rows; row++)
731 for (i = 0, j = row2; i < count; i++, j--) 724 ROW(row1 + row) = temp_buf [row];
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--)
738 {
739 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i];
742 }
743 j = row1, i = count;
744 count = -count;
745 }
746
747 /* C: Resurrect lines */
748 for (; i--; j++)
749 {
750 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i];
753
754 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend,
756 (unsigned int)j, rstyle);
757 } 725 }
758 726
759 return count; 727 return count;
760} 728}
761 729
762/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
763/* 731/*
764 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
765 */ 733 */
766void 734void
767rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
768{ 736{
769 unsigned char checksel, clearsel;
770 unicode_t c;
771 int i, row, last_col;
772 text_t *stp;
773 rend_t *srp;
774
775 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
776 return; 738 return;
777 739
740 unsigned char checksel;
741 unicode_t c;
742 int ncol = this->ncol;
743 const wchar_t *strend = str + len;
744
778 want_refresh = 1; 745 want_refresh = 1;
779 last_col = TermWin.ncol;
780
781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
782 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
747
783 if (nlines > 0) 748 if (minlines > 0)
784 { 749 {
785 nlines += (screen.cur.row - screen.bscroll); 750 minlines += screen.cur.row - screen.bscroll;
751
786 if ((nlines > 0) 752 if (minlines > 0
787 && (screen.tscroll == 0) 753 && screen.tscroll == 0
788 && (screen.bscroll == (TermWin.nrow - 1))) 754 && screen.bscroll == nrow - 1)
789 { 755 {
790 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
791 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
792 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
793 } 759 }
794 } 760 }
761
795#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < TermWin.nrow) 764 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 765 && screen.cur.row >= top_row);
799#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 766#endif
804 row = screen.cur.row + TermWin.saveLines; 767 int row = screen.cur.row;
805 768
806 checksel = (selection.op 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0;
809 770
810 stp = screen.text[row]; 771 line_t *line = &ROW(row);
811 srp = screen.rend[row];
812 772
813 for (i = 0; i < len;) 773 while (str < strend)
814 { 774 {
815 c = str[i++]; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
816 switch (c) 776
777 if (c < 0x20)
778 if (c == C0_LF)
817 { 779 {
818 case '\t': 780 max_it (line->l, screen.cur.col);
819 scr_tab (1); 781
782 screen.flags &= ~Screen_WrapNext;
783
784 if (screen.cur.row == screen.bscroll)
785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
786 else if (screen.cur.row < (nrow - 1))
787 row = ++screen.cur.row;
788
789 line = &ROW(row); /* _must_ refresh */
820 continue; 790 continue;
821 case '\n': 791 }
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 792 else if (c == C0_CR)
823 MAX_IT (screen.tlen[row], screen.cur.col); 793 {
824 screen.flags &= ~Screen_WrapNext; 794 max_it (line->l, screen.cur.col);
825 if (screen.cur.row == screen.bscroll) 795
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines;
829 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */
831 continue;
832 case '\r':
833 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col);
835 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 797 screen.cur.col = 0;
837 continue; 798 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 799 }
800 else if (c == C0_HT)
801 {
802 scr_tab (1, true);
803 continue;
804 }
843 805
844 if (checksel /* see if we're writing within selection */ 806 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 809 {
848 checksel = 0; 810 checksel = 0;
849 clearsel = 1; 811 /*
812 * If we wrote anywhere in the selected area, kill the selection
813 * XXX: should we kill the mark too? Possibly, but maybe that
814 * should be a similar check.
815 */
816 CLEAR_SELECTION ();
850 } 817 }
851 818
852 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
853 { 820 {
854 screen.tlen[row] = -1; 821 max_it (line->l, ncol);
855 if (screen.cur.row == screen.bscroll) 822 line->is_longer (1);
856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
857 else if (screen.cur.row < (TermWin.nrow - 1))
858 row = (++screen.cur.row) + TermWin.saveLines;
859 823
860 stp = screen.text[row]; /* _must_ refresh */ 824 scr_do_wrap ();
861 srp = screen.rend[row]; /* _must_ refresh */ 825
862 screen.cur.col = 0; 826 row = screen.cur.row;
863 screen.flags &= ~Screen_WrapNext; 827 line = &ROW(row); /* _must_ refresh */
828 }
829
830 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd;
833
834 // rely on wcwidth to tell us the character width, at least for non-latin1
835 // do wcwidth before further replacements, as wcwidth might return -1
836 // for the line drawing characters below as they might be invalid in the current
837 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c);
839
840 if (charsets [screen.charset] == '0') // DEC SPECIAL
841 {
842 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100
844 // 40-5e rxvt extension for extra curses acs chars
845 static uint16_t vt100_0[62] = { // 41 .. 7e
846 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
847 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
848 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
849 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
850 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
851 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
852 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
853 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
854 };
855
856 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
857 {
858 c = vt100_0[c - 0x41];
859 width = 1; // vt100 line drawing characters are always single-width
860 }
864 } 861 }
865 862
866 if (screen.flags & Screen_Insert) 863 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 864 scr_insdel_chars (width, INSERT);
868 865
869 // rely on wcwidth to tell us the character width, at least for non-latin1
870 // do wcwidth before further replacements, as wcwidth says that line-drawing
871 // characters have width -1 (DOH!) on gnu/linux sometimes.
872 int width = c < 256 ? 1 : wcwidth (c);
873
874 if (charsets[screen.charset] == '0') // DEC SPECIAL
875 switch (c)
876 {
877 // vt100 special graphics and line drawing
878 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
879 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
880 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
881 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
882 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
883 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
884 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
885 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
886 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
887 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
888 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
889 }
890
891 if (width > 0) 866 if (width != 0)
892 { 867 {
893#if !UNICODE_3 && ENABLE_COMBINING 868#if !UNICODE_3
894 // trim characters we can't store directly :( 869 // trim characters we can't store directly :(
895 if (c >= 0x10000) 870 if (c >= 0x10000)
871# if ENABLE_COMBINING
896 c = rxvt_composite.compose (c); // map to lower 16 bits 872 c = rxvt_composite.compose (c); // map to lower 16 bits
873# else
874 c = 0xfffd;
897#endif 875# endif
876#endif
877
878 // nuke the character at this position, if required
879 if (line->t[screen.cur.col] == NOCHAR
880 || (screen.cur.col < ncol - 1
881 && line->t[screen.cur.col + 1] == NOCHAR))
882 {
883 int col = screen.cur.col;
884
885 // find begin
886 while (col > 0 && line->t[col] == NOCHAR)
887 col--;
888
889 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
890
891 // found begin, nuke
892 do {
893 line->t[col] = ' ';
894 line->r[col] = rend;
895 col++;
896 } while (col < ncol && line->t[col] == NOCHAR);
897 }
898
898 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
900
901 // if the character doesn't fit into the remaining columns...
902 if (screen.cur.col > ncol - width && ncol >= width)
903 {
904 // ...output spaces
905 c = ' ';
906 // and try the same character next loop iteration
907 --str;
908 }
909
910 line->touch ();
899 911
900 do 912 do
901 { 913 {
902 stp[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
904 916
905 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
906 screen.cur.col++; 918 screen.cur.col++;
907 else 919 else
908 { 920 {
909 screen.tlen[row] = last_col; 921 line->l = ncol;
910 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
911 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
912 break; 924 break;
913 } 925 }
914 926
915 c = NOCHAR; 927 c = NOCHAR;
916 } 928 }
917 while (--width > 0); 929 while (--width > 0);
918 930
919 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 932 if (!width)
921 { 933 {
934 line->touch ();
935
936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
937 {
922 stp[c] = ' '; 938 line->t[c] = ' ';
923 srp[c] = rend; 939 line->r[c] = rend;
940 }
924 } 941 }
925 } 942 }
926 else if (width == 0) 943 else // width == 0
927 { 944 {
928#if ENABLE_COMBINING 945#if ENABLE_COMBINING
929 // handle combining characters 946 // handle combining characters
930 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
933 950 line_t *linep;
934 text_t *tp; 951 text_t *tp;
935 rend_t *rp; 952 rend_t *rp;
936 953
937 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
938 { 955 {
956 linep = line;
939 tp = stp + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
941 } 959 }
942 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 961 && ROW(screen.cur.row - 1).is_longer ())
944 { 962 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 963 linep = &ROW(screen.cur.row - 1);
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 964 tp = line->t + ncol - 1;
965 rp = line->r + ncol - 1;
947 } 966 }
948 else 967 else
949 continue; 968 continue;
950 969
951 // handle double-width-chars by making them look extremely ugly 970 linep->touch ();
952 if (*tp == NOCHAR) 971
953 *tp = ' '; // hack //D //TODO //--tp, --rp; 972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
954 974
955 // first try to find a precomposed character 975 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 977 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
959 979
960 *tp = n; 980 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 982#endif
963 } 983 }
964 } 984 }
965 985
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 986 max_it (line->l, screen.cur.col);
967 MAX_IT (screen.tlen[row], screen.cur.col);
968
969 /*
970 * If we wrote anywhere in the selected area, kill the selection
971 * XXX: should we kill the mark too? Possibly, but maybe that
972 * should be a similar check.
973 */
974 if (clearsel)
975 CLEAR_SELECTION ();
976 987
977#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0);
981#endif 990#endif
982} 991}
983 992
984/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
985/* 994/*
… …
988 */ 997 */
989void 998void
990rxvt_term::scr_backspace () 999rxvt_term::scr_backspace ()
991{ 1000{
992 want_refresh = 1; 1001 want_refresh = 1;
1002
993 if (screen.cur.col == 0) 1003 if (screen.cur.col == 0)
994 { 1004 {
995 if (screen.cur.row > 0) 1005 if (screen.cur.row > 0)
996 { 1006 {
997#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
998 screen.cur.col = TermWin.ncol - 1; 1008 screen.cur.col = ncol - 1;
999 screen.cur.row--; 1009 screen.cur.row--;
1000 return; 1010 return;
1001#endif 1011#endif
1002
1003 } 1012 }
1004 } 1013 }
1005 else if ((screen.flags & Screen_WrapNext) == 0) 1014 else if (!(screen.flags & Screen_WrapNext))
1006 scr_gotorc (0, -1, RELATIVE); 1015 scr_gotorc (0, -1, RELATIVE);
1016
1007 screen.flags &= ~Screen_WrapNext; 1017 screen.flags &= ~Screen_WrapNext;
1008} 1018}
1009 1019
1010/* ------------------------------------------------------------------------- */ 1020/* ------------------------------------------------------------------------- */
1011/* 1021/*
1012 * Process Horizontal Tab 1022 * Process Horizontal Tab
1013 * count: +ve = forward; -ve = backwards 1023 * count: +ve = forward; -ve = backwards
1014 * XTERM_SEQ: CTRL-I 1024 * XTERM_SEQ: CTRL-I
1015 */ 1025 */
1016void 1026void
1017rxvt_term::scr_tab (int count) 1027rxvt_term::scr_tab (int count, bool ht)
1018{ 1028{
1019 int i, x; 1029 int i, x;
1020 1030
1021 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1022 want_refresh = 1; 1031 want_refresh = 1;
1023 i = x = screen.cur.col; 1032 i = x = screen.cur.col;
1033
1024 if (count == 0) 1034 if (count == 0)
1025 return; 1035 return;
1026 else if (count > 0) 1036 else if (count > 0)
1027 { 1037 {
1038 line_t &l = ROW(screen.cur.row);
1039 rend_t base_rend = l.r[i];
1040 ht &= l.t[i] == ' ';
1041
1028 for (; ++i < TermWin.ncol; ) 1042 for (; ++i < ncol; )
1029 if (tabs[i]) 1043 if (tabs[i])
1030 { 1044 {
1031 x = i; 1045 x = i;
1046
1032 if (!--count) 1047 if (!--count)
1033 break; 1048 break;
1034 } 1049 }
1050 else
1051 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend);
1053
1035 if (count) 1054 if (count)
1036 x = TermWin.ncol - 1; 1055 x = ncol - 1;
1056
1057 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs))
1060 {
1061 base_rend = SET_FONT (base_rend, 0);
1062
1063 l.touch (x);
1064
1065 i = screen.cur.col;
1066
1067 l.t[i] = '\t';
1068 l.r[i] = base_rend;
1069
1070 while (++i < x)
1071 {
1072 l.t[i] = NOCHAR;
1073 l.r[i] = base_rend;
1074 }
1075 }
1037 } 1076 }
1038 else /* if (count < 0) */ 1077 else /* if (count < 0) */
1039 { 1078 {
1040 for (; --i >= 0; ) 1079 for (; --i >= 0; )
1041 if (tabs[i]) 1080 if (tabs[i])
1042 { 1081 {
1043 x = i; 1082 x = i;
1044 if (!++count) 1083 if (!++count)
1045 break; 1084 break;
1046 } 1085 }
1086
1047 if (count) 1087 if (count)
1048 x = 0; 1088 x = 0;
1049 } 1089 }
1090
1050 if (x != screen.cur.col) 1091 if (x != screen.cur.col)
1051 scr_gotorc (0, x, R_RELATIVE); 1092 scr_gotorc (0, x, R_RELATIVE);
1052} 1093}
1053 1094
1054/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1056 * Process DEC Back Index 1097 * Process DEC Back Index
1057 * XTERM_SEQ: ESC 6 1098 * XTERM_SEQ: ESC 6
1058 * Move cursor left in row. If we're at the left boundary, shift everything 1099 * Move cursor left in row. If we're at the left boundary, shift everything
1059 * in that row right. Clear left column. 1100 * in that row right. Clear left column.
1060 */ 1101 */
1061#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1062void 1103void
1063rxvt_term::scr_backindex () 1104rxvt_term::scr_backindex ()
1064{ 1105{
1065 if (screen.cur.col > 0) 1106 if (screen.cur.col > 0)
1066 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1067 else 1108 else
1068 {
1069 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1070 return; /* um, yeah? */
1071 scr_insdel_chars (1, INSERT); 1109 scr_insdel_chars (1, INSERT);
1072 }
1073} 1110}
1074#endif 1111#endif
1075/* ------------------------------------------------------------------------- */ 1112/* ------------------------------------------------------------------------- */
1076/* 1113/*
1077 * Process DEC Forward Index 1114 * Process DEC Forward Index
1078 * XTERM_SEQ: ESC 9 1115 * XTERM_SEQ: ESC 9
1079 * Move cursor right in row. If we're at the right boundary, shift everything 1116 * Move cursor right in row. If we're at the right boundary, shift everything
1080 * in that row left. Clear right column. 1117 * in that row left. Clear right column.
1081 */ 1118 */
1082#ifndef NO_FRILLS 1119#if ENABLE_FRILLS
1083void 1120void
1084rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1085{ 1122{
1086 int row;
1087
1088 if (screen.cur.col < TermWin.ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1125 else
1091 { 1126 {
1092 row = screen.cur.row + TermWin.saveLines; 1127 line_t &l = ROW(screen.cur.row);
1093 if (screen.tlen[row] == 0) 1128
1094 return; /* um, yeah? */ 1129 l.touch ();
1095 else if (screen.tlen[row] == -1) 1130 l.is_longer (0);
1096 screen.tlen[row] = TermWin.ncol; 1131
1097 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1098 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1099 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1100 } 1135 }
1101} 1136}
1102#endif 1137#endif
1103 1138
1104/* ------------------------------------------------------------------------- */ 1139/* ------------------------------------------------------------------------- */
… …
1109rxvt_term::scr_gotorc (int row, int col, int relative) 1144rxvt_term::scr_gotorc (int row, int col, int relative)
1110{ 1145{
1111 want_refresh = 1; 1146 want_refresh = 1;
1112 ZERO_SCROLLBACK (); 1147 ZERO_SCROLLBACK ();
1113 1148
1114 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));
1115
1116 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1117 : col); 1150 clamp_it (screen.cur.col, 0, ncol - 1);
1118 MAX_IT (screen.cur.col, 0);
1119 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1120 1151
1121 screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1153
1122 if (relative & R_RELATIVE) 1154 if (relative & R_RELATIVE)
1123 { 1155 {
1124 if (row > 0) 1156 if (row > 0)
1125 { 1157 {
1126 if (screen.cur.row <= screen.bscroll 1158 if (screen.cur.row <= screen.bscroll
… …
1141 else 1173 else
1142 { 1174 {
1143 if (screen.flags & Screen_Relative) 1175 if (screen.flags & Screen_Relative)
1144 { /* relative origin mode */ 1176 { /* relative origin mode */
1145 screen.cur.row = row + screen.tscroll; 1177 screen.cur.row = row + screen.tscroll;
1146 MIN_IT (screen.cur.row, screen.bscroll); 1178 min_it (screen.cur.row, screen.bscroll);
1147 } 1179 }
1148 else 1180 else
1149 screen.cur.row = row; 1181 screen.cur.row = row;
1150 } 1182 }
1151 MAX_IT (screen.cur.row, 0);
1152 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1153 1183
1154 while (screen.cur.col > 0 1184 clamp_it (screen.cur.row, 0, nrow - 1);
1155 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1156 screen.cur.col--;
1157} 1185}
1158 1186
1159/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1160/* 1188/*
1161 * direction should be UP or DN 1189 * direction should be UP or DN
1162 */ 1190 */
1163void 1191void
1164rxvt_term::scr_index (enum page_dirn direction) 1192rxvt_term::scr_index (enum page_dirn direction)
1165{ 1193{
1166 int dirn; 1194 int dirn;
1167 1195
1168 want_refresh = 1; 1196 want_refresh = 1;
1197 ZERO_SCROLLBACK ();
1198
1169 dirn = ((direction == UP) ? 1 : -1); 1199 dirn = ((direction == UP) ? 1 : -1);
1170 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1171
1172 ZERO_SCROLLBACK ();
1173 1200
1174 screen.flags &= ~Screen_WrapNext; 1201 screen.flags &= ~Screen_WrapNext;
1202
1175 if ((screen.cur.row == screen.bscroll && direction == UP) 1203 if ((screen.cur.row == screen.bscroll && direction == UP)
1176 || (screen.cur.row == screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1177 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1178 else 1206 else
1179 screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1180 MAX_IT (screen.cur.row, 0); 1208
1181 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1182 selection_check (0); 1210 selection_check (0);
1183} 1211}
1184 1212
1185/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1186/* 1214/*
… …
1190 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1191 */ 1219 */
1192void 1220void
1193rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1194{ 1222{
1195 unsigned int row, col, num; 1223 unsigned int col, num;
1196 1224
1197 want_refresh = 1; 1225 want_refresh = 1;
1198 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1199 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1200 1227
1201 selection_check (1); 1228 selection_check (1);
1202 1229
1203 screen.flags &= ~Screen_WrapNext; 1230 line_t &line = ROW(screen.cur.row);
1204 1231
1205 row = TermWin.saveLines + screen.cur.row; 1232 line.touch ();
1233 line.is_longer (0);
1234
1206 switch (mode) 1235 switch (mode)
1207 { 1236 {
1208 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1209 col = screen.cur.col; 1238 col = screen.cur.col;
1210 num = TermWin.ncol - col; 1239 num = ncol - col;
1211 MIN_IT (screen.tlen[row], (int16_t)col); 1240 min_it (line.l, col);
1212 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1213 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1214 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1215 break; 1244 break;
1216 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1220 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1222 break; 1251 break;
1223 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1224 col = 0; 1253 col = 0;
1225 num = TermWin.ncol; 1254 num = ncol;
1226 screen.tlen[row] = 0; 1255 line.l = 0;
1227 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1228 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1229 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1230 break; 1259 break;
1231 default: 1260 default:
1232 return; 1261 return;
1233 } 1262 }
1234 1263
1235 if (screen.text[row]) 1264 scr_blank_line (line, col, num, rstyle);
1236 scr_blank_line (& (screen.text[row][col]),
1237 & (screen.rend[row][col]), num, rstyle);
1238 else
1239 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1240} 1265}
1241 1266
1242/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1243/* 1268/*
1244 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1247 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1248 */ 1273 */
1249void 1274void
1250rxvt_term::scr_erase_screen (int mode) 1275rxvt_term::scr_erase_screen (int mode)
1251{ 1276{
1252 int num; 1277 int num;
1253 int32_t row, row_offset; 1278 int32_t row;
1254 rend_t ren; 1279 rend_t ren;
1255 XGCValues gcvalue; 1280 XGCValues gcvalue;
1256 1281
1257 want_refresh = 1; 1282 want_refresh = 1;
1258 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1259 ZERO_SCROLLBACK (); 1283 ZERO_SCROLLBACK ();
1260 row_offset = (int32_t)TermWin.saveLines;
1261 1284
1262 switch (mode) 1285 switch (mode)
1263 { 1286 {
1264 case 0: /* erase to end of screen */ 1287 case 0: /* erase to end of screen */
1265 selection_check (1); 1288 selection_check (1);
1266 scr_erase_line (0); 1289 scr_erase_line (0);
1267 row = screen.cur.row + 1; /* possible OOB */ 1290 row = screen.cur.row + 1; /* possible OOB */
1268 num = TermWin.nrow - row; 1291 num = nrow - row;
1269 break; 1292 break;
1270 case 1: /* erase to beginning of screen */ 1293 case 1: /* erase to beginning of screen */
1271 selection_check (3); 1294 selection_check (3);
1272 scr_erase_line (1); 1295 scr_erase_line (1);
1273 row = 0; 1296 row = 0;
1274 num = screen.cur.row; 1297 num = screen.cur.row;
1275 break; 1298 break;
1276 case 2: /* erase whole screen */ 1299 case 2: /* erase whole screen */
1277 selection_check (3); 1300 selection_check (3);
1278 row = 0; 1301 row = 0;
1279 num = TermWin.nrow; 1302 num = nrow;
1280 break; 1303 break;
1281 default: 1304 default:
1282 return; 1305 return;
1283 } 1306 }
1284 refresh_type |= REFRESH_BOUNDS; 1307
1285 if (selection.op && current_screen == selection.screen 1308 if (selection.op && current_screen == selection.screen
1286 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1309 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1287 || (selection.end.row >= row 1310 || (selection.end.row >= row
1288 && selection.end.row <= row + num))) 1311 && selection.end.row <= row + num)))
1289 CLEAR_SELECTION (); 1312 CLEAR_SELECTION ();
1313
1290 if (row >= TermWin.nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1291 return; 1315 return;
1292 MIN_IT (num, (TermWin.nrow - row)); 1316
1317 min_it (num, nrow - row);
1318
1293 if (rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1294 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1295 else if (GET_BASEBG (rstyle) == Color_bg) 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1296 { 1322 {
1297 ren = DEFAULT_RSTYLE; 1323 ren = DEFAULT_RSTYLE;
1298 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1299 } 1325 }
1300 else 1326 else
1301 { 1327 {
1302 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1303 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1304 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1305 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1306 gcvalue.foreground = PixColors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1307 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1308 } 1334 }
1335
1309 for (; num--; row++) 1336 for (; num--; row++)
1310 { 1337 {
1311 scr_blank_screen_mem (screen.text, screen.rend, 1338 scr_blank_screen_mem (ROW(row), rstyle);
1312 (unsigned int) (row + row_offset), rstyle); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 screen.tlen[row + row_offset] = 0;
1314 scr_blank_line (drawn_text[row], drawn_rend[row],
1315 (unsigned int)TermWin.ncol, ren);
1316 } 1340 }
1317} 1341}
1342
1343#if ENABLE_FRILLS
1344void
1345rxvt_term::scr_erase_savelines ()
1346{
1347 want_refresh = 1;
1348 ZERO_SCROLLBACK ();
1349
1350 top_row = 0;
1351}
1352#endif
1318 1353
1319/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1320/* 1355/*
1321 * Fill the screen with `E's 1356 * Fill the screen with `E's
1322 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1323 */ 1358 */
1324void 1359void
1325rxvt_term::scr_E () 1360rxvt_term::scr_E ()
1326{ 1361{
1327 int i, j, k; 1362 rend_t fs;
1328 rend_t *r1, fs;
1329 1363
1330 want_refresh = 1; 1364 want_refresh = 1;
1365 ZERO_SCROLLBACK ();
1366
1331 num_scr_allow = 0; 1367 num_scr_allow = 0;
1332 ZERO_SCROLLBACK ();
1333 selection_check (3); 1368 selection_check (3);
1334 1369
1335 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1370 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1336 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1371 for (int row = nrow; row--; )
1337 { 1372 {
1338 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1373 line_t &line = ROW(row);
1374
1339 fill_text (screen.text[k], 'E', TermWin.ncol); 1375 fill_text (line.t, 'E', ncol);
1340 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1376 rend_t *r1 = line.r;
1377
1378 for (int j = ncol; j--; )
1341 *r1++ = fs; 1379 *r1++ = fs;
1380
1381 line.is_longer (0);
1382 line.touch (ncol);
1342 } 1383 }
1343} 1384}
1344 1385
1345/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1346/* 1387/*
1347 * Insert/Delete <count> lines 1388 * Insert/Delete <count> lines
1348 */ 1389 */
1349void 1390void
1350rxvt_term::scr_insdel_lines (int count, int insdel) 1391rxvt_term::scr_insdel_lines (int count, int insdel)
1351{ 1392{
1352 int end; 1393 int end;
1353 1394
1354 ZERO_SCROLLBACK (); 1395 ZERO_SCROLLBACK ();
1355 1396
1356 selection_check (1); 1397 selection_check (1);
1357 1398
… …
1364 if (insdel == DELETE) 1405 if (insdel == DELETE)
1365 return; 1406 return;
1366 else if (insdel == INSERT) 1407 else if (insdel == INSERT)
1367 count = end; 1408 count = end;
1368 } 1409 }
1369 screen.flags &= ~Screen_WrapNext;
1370 1410
1411 scr_do_wrap ();
1412
1371 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1413 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1372} 1414}
1373 1415
1374/* ------------------------------------------------------------------------- */ 1416/* ------------------------------------------------------------------------- */
1375/* 1417/*
1376 * Insert/Delete <count> characters from the current position 1418 * Insert/Delete <count> characters from the current position
1377 */ 1419 */
1378void 1420void
1379rxvt_term::scr_insdel_chars (int count, int insdel) 1421rxvt_term::scr_insdel_chars (int count, int insdel)
1380{ 1422{
1381 int col, row; 1423 int col, row;
1382 rend_t tr; 1424 rend_t tr;
1383 text_t *stp;
1384 rend_t *srp;
1385 int16_t *slp;
1386 1425
1387 want_refresh = 1; 1426 want_refresh = 1;
1388 ZERO_SCROLLBACK (); 1427 ZERO_SCROLLBACK ();
1389 1428
1390 if (count <= 0) 1429 if (count <= 0)
1391 return; 1430 return;
1392 1431
1432 scr_do_wrap ();
1433
1393 selection_check (1); 1434 selection_check (1);
1394 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1395 1436
1396 row = screen.cur.row + TermWin.saveLines;
1397 screen.flags &= ~Screen_WrapNext;
1398
1399 stp = screen.text[row];
1400 srp = screen.rend[row]; 1437 row = screen.cur.row;
1401 slp = & (screen.tlen[row]); 1438
1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1443
1402 switch (insdel) 1444 switch (insdel)
1403 { 1445 {
1404 case INSERT: 1446 case INSERT:
1405 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1406 col--)
1407 { 1448 {
1408 stp[col] = stp[col - count]; 1449 line->t[col] = line->t[col - count];
1409 srp[col] = srp[col - count]; 1450 line->r[col] = line->r[col - count];
1410 } 1451 }
1411 if (*slp != -1) 1452
1412 { 1453 line->l = min (line->l + count, ncol);
1413 *slp += count; 1454
1414 MIN_IT (*slp, TermWin.ncol);
1415 }
1416 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1457 {
1419 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
1420 || (selection.end.col + count >= TermWin.ncol)) 1459 || (selection.end.col + count >= ncol))
1421 CLEAR_SELECTION (); 1460 CLEAR_SELECTION ();
1422 else 1461 else
1423 { /* shift selection */ 1462 { /* shift selection */
1424 selection.beg.col += count; 1463 selection.beg.col += count;
1425 selection.mark.col += count; /* XXX: yes? */ 1464 selection.mark.col += count; /* XXX: yes? */
1426 selection.end.col += count; 1465 selection.end.col += count;
1427 } 1466 }
1428 } 1467 }
1429 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1468
1430 (unsigned int)count, rstyle); 1469 scr_blank_line (*line, screen.cur.col, count, rstyle);
1431 break; 1470 break;
1471
1432 case ERASE: 1472 case ERASE:
1433 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1434 selection_check (1); 1474 selection_check (1);
1435 screen.cur.col -= count; 1475 screen.cur.col -= count;
1436 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1476
1437 (unsigned int)count, rstyle); 1477 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1479 break;
1480
1439 case DELETE: 1481 case DELETE:
1440 tr = srp[TermWin.ncol - 1]
1441 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1483
1442 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1484 for (col = screen.cur.col; (col + count) < ncol; col++)
1443 { 1485 {
1444 stp[col] = stp[col + count]; 1486 line->t[col] = line->t[col + count];
1445 srp[col] = srp[col + count]; 1487 line->r[col] = line->r[col + count];
1446 } 1488 }
1447 scr_blank_line (& (stp[TermWin.ncol - count]), 1489
1448 & (srp[TermWin.ncol - count]), 1490 line->l = max (line->l - count, 0);
1449 (unsigned int)count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1450 if (*slp == -1) /* break line continuation */ 1492
1451 *slp = TermWin.ncol;
1452 *slp -= count;
1453 MAX_IT (*slp, 0);
1454 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1455 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1456 { 1495 {
1457 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
1458 || (screen.cur.col >= selection.beg.col - count) 1497 || (screen.cur.col >= selection.beg.col - count)
1459 || selection.end.col >= TermWin.ncol) 1498 || selection.end.col >= ncol)
1460 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1461 else 1500 else
1462 { 1501 {
1463 /* shift selection */ 1502 /* shift selection */
1464 selection.beg.col -= count; 1503 selection.beg.col -= count;
1465 selection.mark.col -= count; /* XXX: yes? */ 1504 selection.mark.col -= count; /* XXX: yes? */
1466 selection.end.col -= count; 1505 selection.end.col -= count;
1467 } 1506 }
1468 } 1507 }
1508
1469 break; 1509 break;
1470 } 1510 }
1471} 1511}
1472 1512
1473/* ------------------------------------------------------------------------- */ 1513/* ------------------------------------------------------------------------- */
… …
1476 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1477 */ 1517 */
1478void 1518void
1479rxvt_term::scr_scroll_region (int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1480{ 1520{
1481 MAX_IT (top, 0); 1521 max_it (top, 0);
1482 MIN_IT (bot, (int)TermWin.nrow - 1); 1522 min_it (bot, nrow - 1);
1523
1483 if (top > bot) 1524 if (top > bot)
1484 return; 1525 return;
1526
1485 screen.tscroll = top; 1527 screen.tscroll = top;
1486 screen.bscroll = bot; 1528 screen.bscroll = bot;
1487 scr_gotorc (0, 0, 0); 1529 scr_gotorc (0, 0, 0);
1488} 1530}
1489 1531
… …
1495 */ 1537 */
1496void 1538void
1497rxvt_term::scr_cursor_visible (int mode) 1539rxvt_term::scr_cursor_visible (int mode)
1498{ 1540{
1499 want_refresh = 1; 1541 want_refresh = 1;
1542
1500 if (mode) 1543 if (mode)
1501 screen.flags |= Screen_VisibleCursor; 1544 screen.flags |= Screen_VisibleCursor;
1502 else 1545 else
1503 screen.flags &= ~Screen_VisibleCursor; 1546 screen.flags &= ~Screen_VisibleCursor;
1504} 1547}
… …
1513rxvt_term::scr_autowrap (int mode) 1556rxvt_term::scr_autowrap (int mode)
1514{ 1557{
1515 if (mode) 1558 if (mode)
1516 screen.flags |= Screen_Autowrap; 1559 screen.flags |= Screen_Autowrap;
1517 else 1560 else
1518 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1519} 1562}
1520 1563
1521/* ------------------------------------------------------------------------- */ 1564/* ------------------------------------------------------------------------- */
1522/* 1565/*
1523 * Set/unset margin origin mode 1566 * Set/unset margin origin mode
… …
1533{ 1576{
1534 if (mode) 1577 if (mode)
1535 screen.flags |= Screen_Relative; 1578 screen.flags |= Screen_Relative;
1536 else 1579 else
1537 screen.flags &= ~Screen_Relative; 1580 screen.flags &= ~Screen_Relative;
1581
1538 scr_gotorc (0, 0, 0); 1582 scr_gotorc (0, 0, 0);
1539} 1583}
1540 1584
1541/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1542/* 1586/*
… …
1562 */ 1606 */
1563void 1607void
1564rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1565{ 1609{
1566 if (mode < 0) 1610 if (mode < 0)
1567 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1568 else if (screen.cur.col < TermWin.ncol) 1612 else if (screen.cur.col < ncol)
1569 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1570} 1614}
1571 1615
1572/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1573/* 1617/*
1574 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1576 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1577 */ 1621 */
1578void 1622void
1579rxvt_term::scr_rvideo_mode (int mode) 1623rxvt_term::scr_rvideo_mode (int mode)
1580{ 1624{
1581 XGCValues gcvalue; 1625 XGCValues gcvalue;
1582 1626
1583 if (rvideo != mode) 1627 if (rvideo != mode)
1584 { 1628 {
1585 rvideo = mode; 1629 rvideo = mode;
1586 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1587#if defined(XPM_BACKGROUND) 1631#if XPM_BACKGROUND
1588 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1589#endif 1633#endif
1590#if defined(TRANSPARENT) 1634#if TRANSPARENT
1591 if (! (Options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1592#endif 1636#endif
1593 XSetWindowBackground (display->display, TermWin.vt, 1637 XSetWindowBackground (display->display, vt,
1594 PixColors[Color_bg]); 1638 pix_colors[Color_bg]);
1595 1639
1596 gcvalue.foreground = PixColors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
1597 gcvalue.background = PixColors[Color_bg]; 1641 gcvalue.background = pix_colors[Color_bg];
1598 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1642 XChangeGC (display->display, gc, GCBackground | GCForeground,
1599 &gcvalue); 1643 &gcvalue);
1600 scr_clear (); 1644 scr_clear ();
1601 scr_touch (true); 1645 scr_touch (true);
1602 } 1646 }
1603} 1647}
… …
1621 * Set font style 1665 * Set font style
1622 */ 1666 */
1623void 1667void
1624rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1625{ 1669{
1670#if 0
1626 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1627 { 1672 {
1628 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1629 break; 1674 break;
1630 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1631 break; 1676 break;
… …
1638 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1639 break; 1684 break;
1640 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1641 break; 1686 break;
1642 } 1687 }
1688#endif
1643} 1689}
1644 1690
1645/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1646/* 1692/*
1647 * Choose a font 1693 * Choose a font
… …
1650 * XTERM_SEQ: Invoke G2 character set: ESC N 1696 * XTERM_SEQ: Invoke G2 character set: ESC N
1651 * XTERM_SEQ: Invoke G3 character set: ESC O 1697 * XTERM_SEQ: Invoke G3 character set: ESC O
1652 */ 1698 */
1653void 1699void
1654rxvt_term::scr_charset_choose (int set) 1700rxvt_term::scr_charset_choose (int set)
1655 { 1701{
1656 screen.charset = set; 1702 screen.charset = set;
1657 set_font_style (); 1703 set_font_style ();
1658 } 1704}
1659 1705
1660/* ------------------------------------------------------------------------- */ 1706/* ------------------------------------------------------------------------- */
1661/* 1707/*
1662 * Set a font 1708 * Set a font
1663 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1709 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1666 * XTERM_SEQ: Set G3 character set: ESC + <C> 1712 * XTERM_SEQ: Set G3 character set: ESC + <C>
1667 * See set_font_style for possible values for <C> 1713 * See set_font_style for possible values for <C>
1668 */ 1714 */
1669void 1715void
1670rxvt_term::scr_charset_set (int set, unsigned int ch) 1716rxvt_term::scr_charset_set (int set, unsigned int ch)
1671 { 1717{
1672 charsets[set] = (unsigned char)ch; 1718 charsets[set] = (unsigned char)ch;
1673 set_font_style (); 1719 set_font_style ();
1674 } 1720}
1675 1721
1676 1722
1677/* ------------------------------------------------------------------------- * 1723/* ------------------------------------------------------------------------- *
1678 * MAJOR SCREEN MANIPULATION * 1724 * MAJOR SCREEN MANIPULATION *
1679 * ------------------------------------------------------------------------- */ 1725 * ------------------------------------------------------------------------- */
… …
1684bool 1730bool
1685rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1686{ 1732{
1687 bool found = false; 1733 bool found = false;
1688 1734
1689 for (int i = 0; i < TermWin.nrow; i++) 1735 for (int i = 0; i < nrow; i++)
1690 { 1736 {
1691 int col = 0; 1737 int col = 0;
1692 rend_t *drp = drawn_rend [i]; 1738 rend_t *drp = drawn_buf[i].r;
1693 1739
1694 for (; col < TermWin.ncol; col++, drp++) 1740 for (; col < ncol; col++, drp++)
1695 if ((*drp & mask) == value) 1741 if ((*drp & mask) == value)
1696 { 1742 {
1697 found = true; 1743 found = true;
1698 *drp = ~value; 1744 *drp = ~value;
1699 } 1745 }
… …
1710 PART_END, 1756 PART_END,
1711 RC_COUNT 1757 RC_COUNT
1712}; 1758};
1713 1759
1714void 1760void
1715rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1716{ 1762{
1717 int i; 1763 int i;
1718 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1719 1765
1720 if (drawn_text == NULL) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1721 return; 1767 return;
1722 1768
1723#ifdef DEBUG_STRICT 1769#ifndef NO_SLOW_LINK_SUPPORT
1724 x = max (x, (int)TermWin.int_bwidth); 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1725 x = min (x, (int)TermWin.width); 1771 {
1726 y = max (y, (int)TermWin.int_bwidth); 1772 y = 0;
1727 y = min (y, (int)TermWin.height); 1773 eheight = height;
1774 }
1728#endif 1775#endif
1729 1776
1730 /* round down */ 1777 /* round down */
1731 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1732 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
1733 /* round up */ 1780 /* round up */
1734 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1781 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1735 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1736 1783
1737 /* sanity checks */ 1784 /* sanity checks */
1738 for (i = PART_BEG; i < RC_COUNT; i++) 1785 for (i = PART_BEG; i < RC_COUNT; i++)
1739 { 1786 {
1740 MIN_IT (rc[i].col, TermWin.ncol - 1); 1787 min_it (rc[i].col, ncol - 1);
1741 MIN_IT (rc[i].row, TermWin.nrow - 1); 1788 min_it (rc[i].row, nrow - 1);
1742 } 1789 }
1743
1744 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1745 1790
1746 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1747 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1748 (rc[PART_END].col - rc[PART_BEG].col + 1));
1749 1793
1750 if (refresh) 1794 if (refresh)
1751 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1795 scr_refresh (SLOW_REFRESH);
1752} 1796}
1753 1797
1754/* ------------------------------------------------------------------------- */ 1798/* ------------------------------------------------------------------------- */
1755/* 1799/*
1756 * Refresh the entire screen 1800 * Refresh the entire screen
1757 */ 1801 */
1758void 1802void
1759rxvt_term::scr_touch (bool refresh) 1803rxvt_term::scr_touch (bool refresh)
1760{ 1804{
1761 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1805 scr_expose (0, 0, width, height, refresh);
1762} 1806}
1763 1807
1764/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1765/* 1809/*
1766 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1767 * the top of the screen 1811 * the top of the screen
1768 */ 1812 */
1769int 1813void
1770rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1771{ 1815{
1772 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1773 uint16_t oldviewstart;
1774 1817
1775 oldviewstart = TermWin.view_start; 1818 scr_changeview (p);
1776 if (y < len)
1777 {
1778 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1779 p -= (long) (TermWin.nrow - 1);
1780 p = max (p, 0);
1781 }
1782 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1783 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1784
1785 return scr_changeview (oldviewstart);
1786} 1819}
1787 1820
1788/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1789/* 1822/*
1790 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1791 * direction should be UP or DN 1824 * direction should be UP or DN
1792 */ 1825 */
1793int 1826bool
1794rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1795{ 1828{
1796 int n; 1829 int new_view_start =
1797 uint16_t oldviewstart; 1830 direction == UP ? view_start - nlines
1831 : view_start + nlines;
1798 1832
1799 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1833 return scr_changeview (new_view_start);
1800#ifdef DEBUG_STRICT 1834}
1801 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1835
1802#endif 1836bool
1803 oldviewstart = TermWin.view_start; 1837rxvt_term::scr_changeview (int new_view_start)
1804 if (direction == UP) 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1841 if (new_view_start != view_start)
1805 { 1842 {
1806 n = TermWin.view_start + nlines; 1843 num_scr += new_view_start - view_start;
1807 TermWin.view_start = min (n, TermWin.nscrolled); 1844 view_start = new_view_start;
1845 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1846 want_refresh = 1;
1847
1848 return true;
1808 } 1849 }
1809 else 1850 else
1810 { 1851 return false;
1811 n = TermWin.view_start - nlines;
1812 TermWin.view_start = max (n, 0);
1813 }
1814 return scr_changeview (oldviewstart);
1815}
1816
1817int
1818rxvt_term::scr_changeview (uint16_t oldviewstart)
1819{
1820 if (TermWin.view_start != oldviewstart)
1821 {
1822 want_refresh = 1;
1823 num_scr -= (TermWin.view_start - oldviewstart);
1824 }
1825 return (int) (TermWin.view_start - oldviewstart);
1826} 1852}
1827 1853
1828/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1829void 1855void
1830rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
1831{ 1857{
1832#ifndef NO_BELL 1858#ifndef NO_BELL
1859
1833# ifndef NO_MAPALERT 1860# ifndef NO_MAPALERT
1834# ifdef MAPALERT_OPTION 1861# ifdef MAPALERT_OPTION
1835 if (Options & Opt_mapAlert) 1862 if (OPTION (Opt_mapAlert))
1836# endif 1863# endif
1837 XMapWindow (display->display, TermWin.parent[0]); 1864 XMapWindow (display->display, parent[0]);
1838# endif 1865# endif
1839 if (Options & Opt_visualBell) 1866
1867 if (OPTION (Opt_visualBell))
1840 { 1868 {
1841 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1871 rxvt_usleep (VISUAL_BELL_DURATION);
1842 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1843 } 1873 }
1844 else 1874 else
1845 XBell (display->display, 0); 1875 XBell (display->display, 0);
1876
1846#endif 1877#endif
1847} 1878}
1848 1879
1849/* ------------------------------------------------------------------------- */ 1880/* ------------------------------------------------------------------------- */
1850/* ARGSUSED */ 1881/* ARGSUSED */
1851void 1882void
1852rxvt_term::scr_printscreen (int fullhist) 1883rxvt_term::scr_printscreen (int fullhist)
1853{ 1884{
1854#ifdef PRINTPIPE 1885#ifdef PRINTPIPE
1855 int i, r1, nrows, row_offset; 1886 int nrows, row_start;
1856 text_t *t; 1887 FILE *fd;
1857 FILE *fd;
1858 1888
1859 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1860 return; 1890 return;
1861 nrows = TermWin.nrow; 1891
1862 row_offset = TermWin.saveLines;
1863 if (!fullhist) 1892 if (fullhist)
1864 row_offset -= TermWin.view_start; 1893 {
1894 nrows = nrow - top_row;
1895 row_start = top_row;
1896 }
1865 else 1897 else
1866 { 1898 {
1867 nrows += TermWin.nscrolled; 1899 nrows = nrow;
1868 row_offset -= TermWin.nscrolled; 1900 row_start = view_start;
1869 } 1901 }
1870 1902
1903 wctomb (0, 0);
1904
1871 for (r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
1872 {
1873 t = screen.text[r1 + row_offset];
1874 for (i = TermWin.ncol - 1; i >= 0; i--)
1875 if (!isspace (t[i]))
1876 break;
1877 fprintf (fd, "%.*s\n", (i + 1), t);
1878 } 1906 {
1907 text_t *tp = ROW(r1).t;
1908 int len = ROW(r1).l;
1909
1910 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1911 {
1912 char mb[MB_LEN_MAX];
1913 text_t t = *tp++;
1914 if (t == NOCHAR)
1915 continue;
1916
1917 len = wctomb (mb, t);
1918
1919 if (len <= 0)
1920 {
1921 mb[0] = ' ';
1922 len = 1;
1923 }
1924
1925 fwrite (mb, 1, len, fd);
1926 }
1927
1928 fputc ('\n', fd);
1929 }
1930
1879 pclose_printer (fd); 1931 pclose_printer (fd);
1880#endif 1932#endif
1881} 1933}
1882 1934
1883/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1884/* 1936/*
1885 * Refresh the screen 1937 * Refresh the screen
1886 * drawn_text/drawn_rend contain the screen information before the update. 1938 * drawn_text/drawn_rend contain the screen information before the update.
1887 * screen.text/screen.rend contain what the screen will change to. 1939 * screen.text/screen.rend contain what the screen will change to.
1888 */ 1940 */
1889
1890#define FONT_WIDTH(X, Y) \
1891 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1892#define FONT_RBEAR(X, Y) \
1893 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1894#define FONT_LBEAR(X, Y) \
1895 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1896#define IS_FONT_CHAR(X, Y) \
1897 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1898
1899void 1941void
1900rxvt_term::scr_refresh (unsigned char refresh_type) 1942rxvt_term::scr_refresh (unsigned char refresh_type)
1901{ 1943{
1902 unsigned char clearfirst, /* first character writes before cell */
1903 clearlast, /* last character writes beyond cell */
1904 must_clear, /* use draw_string not draw_image_string */ 1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1905 rvid, /* reverse video this position */
1906 showcursor; /* show the cursor */ 1945 showcursor; /* show the cursor */
1907 int16_t col, row, /* column/row we're processing */ 1946 int16_t col, row, /* column/row we're processing */
1908 ocrow; /* old cursor row */ 1947 ocrow; /* old cursor row */
1909 int i, /* tmp */ 1948 int i; /* tmp */
1910 row_offset; /* basic offset in screen structure */
1911#ifndef NO_CURSORCOLOR 1949#ifndef NO_CURSORCOLOR
1912 rend_t cc1; /* store colours at cursor position (s) */ 1950 rend_t cc1; /* store colours at cursor position (s) */
1913#endif 1951#endif
1914 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1952 rend_t *crp; // cursor rendition pointer
1915 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1916 1953
1954 want_refresh = 0; /* screen is current */
1955
1917 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1956 if (refresh_type == NO_REFRESH || !mapped)
1918 return; 1957 return;
1919 1958
1920 /* 1959 /*
1921 * A: set up vars 1960 * A: set up vars
1922 */ 1961 */
1923 clearfirst = clearlast = must_clear = 0; 1962 must_clear = 0;
1924
1925 refresh_count = 0; 1963 refresh_count = 0;
1926 1964
1927 row_offset = TermWin.saveLines - TermWin.view_start;
1928
1929 if ((refresh_type & REFRESH_BOUNDS))
1930 {
1931 clearfirst = clearlast = 1;
1932 refresh_type &= ~REFRESH_BOUNDS;
1933 }
1934
1935#ifdef XPM_BACKGROUND 1965#if XPM_BACKGROUND
1936 must_clear |= (bgPixmap.pixmap != None); 1966 must_clear |= bgPixmap.pixmap != None;
1937#endif 1967#endif
1938#ifdef TRANSPARENT 1968#if TRANSPARENT
1939 must_clear |= ((Options & Opt_transparent) && am_transparent); 1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1940#endif 1970#endif
1941 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1942 1972
1943 /* 1973 /*
1944 * B: reverse any characters which are selected 1974 * B: reverse any characters which are selected
… …
1947 1977
1948 /* 1978 /*
1949 * C: set the cursor character (s) 1979 * C: set the cursor character (s)
1950 */ 1980 */
1951 { 1981 {
1952 unsigned char setoldcursor; 1982 unsigned char setoldcursor;
1953 rend_t ccol1, /* Cursor colour */ 1983 rend_t ccol1, /* Cursor colour */
1954 ccol2; /* Cursor colour2 */ 1984 ccol2; /* Cursor colour2 */
1955 1985
1956 showcursor = (screen.flags & Screen_VisibleCursor); 1986 showcursor = (screen.flags & Screen_VisibleCursor);
1957#ifdef CURSOR_BLINK 1987#ifdef CURSOR_BLINK
1958 if (hidden_cursor) 1988 if (hidden_cursor)
1959 showcursor = 0; 1989 showcursor = 0;
1960#endif 1990#endif
1961 1991
1962 if (showcursor) 1992 if (showcursor)
1963 { 1993 {
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1994 int col = screen.cur.col;
1965 [screen.cur.col]);
1966 1995
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--;
1998
1999 crp = &ROW(screen.cur.row).r[col];
2000
1967 if (showcursor && TermWin.focus) 2001 if (showcursor && focus)
1968 { 2002 {
2003 if (OPTION (Opt_cursorUnderline))
2004 *crp ^= RS_Uline;
2005 else
2006 {
1969 *srp ^= RS_RVid; 2007 *crp ^= RS_RVid;
2008
1970#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1971 cc1 = *srp & (RS_fgMask | RS_bgMask); 2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
1972 if (ISSET_PIXCOLOR (Color_cursor)) 2011 if (ISSET_PIXCOLOR (Color_cursor))
1973 ccol1 = Color_cursor; 2012 ccol1 = Color_cursor;
1974 else 2013 else
1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1976 ccol1 = GET_FGCOLOR (rstyle); 2015 ccol1 = fgcolor_of (rstyle);
1977#else 2016#else
1978 ccol1 = Color_fg; 2017 ccol1 = Color_fg;
1979#endif 2018#endif
1980 if (ISSET_PIXCOLOR (Color_cursor2)) 2019 if (ISSET_PIXCOLOR (Color_cursor2))
1981 ccol2 = Color_cursor2; 2020 ccol2 = Color_cursor2;
1982 else 2021 else
1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1984 ccol2 = GET_BGCOLOR (rstyle); 2023 ccol2 = bgcolor_of (rstyle);
1985#else 2024#else
1986 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
1987#endif 2026#endif
1988 *srp = SET_FGCOLOR (*srp, ccol1); 2027 *crp = SET_FGCOLOR (*crp, ccol1);
1989 *srp = SET_BGCOLOR (*srp, ccol2); 2028 *crp = SET_BGCOLOR (*crp, ccol2);
1990#endif 2029#endif
2030 }
1991 } 2031 }
1992 } 2032 }
1993 2033
1994 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
1995 setoldcursor = 0; 2035 setoldcursor = 0;
1996 if (ocrow != -1) 2036 if (ocrow != -1)
1997 { 2037 {
1998 if (screen.cur.row + TermWin.view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
1999 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2000 { 2040 {
2001 if (ocrow < TermWin.nrow 2041 if (ocrow < nrow
2002 && oldcursor.col < TermWin.ncol) 2042 && oldcursor.col < ncol)
2003 {
2004 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2005 } 2044
2006 if (TermWin.focus || !showcursor) 2045 if (focus || !showcursor)
2007 oldcursor.row = -1; 2046 oldcursor.row = -1;
2008 else 2047 else
2009 setoldcursor = 1; 2048 setoldcursor = 1;
2010 } 2049 }
2011 } 2050 }
2012 else if (!TermWin.focus) 2051 else if (!focus)
2013 setoldcursor = 1; 2052 setoldcursor = 1;
2053
2014 if (setoldcursor) 2054 if (setoldcursor)
2015 { 2055 {
2016 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2056 if (screen.cur.row - view_start >= nrow)
2017 oldcursor.row = -1; 2057 oldcursor.row = -1;
2018 else 2058 else
2019 { 2059 {
2020 oldcursor.row = screen.cur.row + TermWin.view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2021 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2022 } 2062 }
2023 } 2063 }
2024 } 2064 }
2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2067#if ENABLE_OVERLAY
2068 scr_swap_overlay ();
2069#endif
2025 2070
2026#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
2027 /* 2072 /*
2028 * D: CopyArea pass - very useful for slower links 2073 * D: CopyArea pass - very useful for slower links
2029 * This has been deliberately kept simple. 2074 * This has been deliberately kept simple.
2030 */ 2075 */
2031 i = num_scr; 2076 i = num_scr;
2077 if (!display->is_local
2032 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2033 && abs (i) < TermWin.nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2034 { 2080 {
2035 int16_t nits; 2081 int16_t nits;
2036 int j; 2082 int j;
2037 rend_t *drp2;
2038 text_t *dtp2;
2039 int len, wlen; 2083 int len, wlen;
2040 2084
2041 j = TermWin.nrow; 2085 j = nrow;
2042 wlen = len = -1; 2086 wlen = len = -1;
2043 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2044 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2045 { 2089 {
2046 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2047 { 2091 {
2048 stp = screen.text[row + row_offset]; 2092 line_t s = ROW(view_start + row);
2049 srp = screen.rend[row + row_offset];
2050 dtp = drawn_text[row]; 2093 line_t d = drawn_buf[row];
2051 dtp2 = drawn_text[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2052 drp = drawn_rend[row];
2053 drp2 = drawn_rend[row + i];
2054 2095
2055 for (nits = 0, col = TermWin.ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2056 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2057 nits--; 2098 nits--;
2058 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2099 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2059 nits++; 2100 nits++;
2060 2101
2061 if (nits > 8) /* XXX: arbitrary choice */ 2102 if (nits > 8) /* XXX: arbitrary choice */
2062 { 2103 {
2063 for (col = TermWin.ncol; col--; ) 2104 for (col = ncol; col--; )
2064 { 2105 {
2065 *dtp++ = *dtp2++; 2106 *d.t++ = *d2.t++;
2066 *drp++ = *drp2++; 2107 *d.r++ = *d2.r++;
2067 } 2108 }
2068 2109
2069 if (len == -1) 2110 if (len == -1)
2070 len = row; 2111 len = row;
2071 2112
… …
2076 2117
2077 if (len != -1) 2118 if (len != -1)
2078 { 2119 {
2079 /* also comes here at end if needed because of >= above */ 2120 /* also comes here at end if needed because of >= above */
2080 if (wlen < len) 2121 if (wlen < len)
2081 SWAP_IT (wlen, len, int); 2122 ::swap (wlen, len);
2082 2123
2083 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2084 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2124 XCopyArea (display->display, vt, vt,
2085 TermWin.gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2086 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2087 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2088 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2089 len = -1; 2129 len = -1;
2090 } 2130 }
2091 } 2131 }
… …
2093#endif 2133#endif
2094 2134
2095 /* 2135 /*
2096 * E: main pass across every character 2136 * E: main pass across every character
2097 */ 2137 */
2098 for (row = 0; row < TermWin.nrow; row++) 2138 for (row = 0; row < nrow; row++)
2099 { 2139 {
2100 stp = screen.text[row + row_offset]; 2140 text_t *stp = ROW(view_start + row).t;
2101 srp = screen.rend[row + row_offset]; 2141 rend_t *srp = ROW(view_start + row).r;
2102 dtp = drawn_text[row]; 2142 text_t *dtp = drawn_buf[row].t;
2103 drp = drawn_rend[row]; 2143 rend_t *drp = drawn_buf[row].r;
2104 2144
2105 /* 2145 /*
2106 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
2107 */ 2147 */
2108 int ypixel = (int)Row2Pixel (row); 2148 int ypixel = (int)Row2Pixel (row);
2109 2149
2110 for (col = 0; col < TermWin.ncol; col++) 2150 for (col = 0; col < ncol; col++)
2111 { 2151 {
2112 /* compare new text with old - if exactly the same then continue */ 2152 /* compare new text with old - if exactly the same then continue */
2113 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2153 if (stp[col] == dtp[col] /* Must match characters to skip. */
2114 && (srp[col] == drp[col] /* Either rendition the same or */ 2154 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2115 || (stp[col] == ' ' /* space w/ no background change */ 2155 || (stp[col] == ' ' /* space w/ no background change */
2116 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2156 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2117 continue; 2157 continue;
2118 2158
2119 // redraw one or more characters 2159 // redraw one or more characters
2120 2160
2121 // seek to the beginning if wide characters 2161 // seek to the beginning of wide characters
2122 while (stp[col] == NOCHAR && col > 0) 2162 while (stp[col] == NOCHAR && col > 0)
2123 --col; 2163 --col;
2124 2164
2125 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2126 text_t *text = stp + col; 2166 text_t *text = stp + col;
… …
2129 dtp[col] = stp[col]; 2169 dtp[col] = stp[col];
2130 drp[col] = rend; 2170 drp[col] = rend;
2131 2171
2132 int xpixel = Col2Pixel (col); 2172 int xpixel = Col2Pixel (col);
2133 2173
2134 // this loop looks very messy, it can probably be optimized
2135 // and cleaned a bit by you?
2136 for (i = 0; ++col < TermWin.ncol; ) 2174 for (i = 0; ++col < ncol; )
2137 { 2175 {
2138 if (stp[col] == NOCHAR) 2176 if (stp[col] == NOCHAR)
2139 { 2177 {
2140 dtp[col] = stp[col]; 2178 dtp[col] = stp[col];
2141 drp[col] = rend; 2179 drp[col] = rend;
2142 count++; 2180 count++;
2143
2144 if (i) // only possible skip if char unchanged
2145 i++; 2181 i++;
2146 2182
2147 continue; 2183 continue;
2148 } 2184 }
2149 2185
2150 if (rend != srp[col]) 2186 if (!RS_SAME (rend, srp[col]))
2151 break; 2187 break;
2152 2188
2153 count++; 2189 count++;
2154 2190
2155 if (stp[col] != dtp[col] 2191 if (stp[col] != dtp[col]
2156 || srp[col] != drp[col]) 2192 || !RS_SAME (srp[col], drp[col]))
2157 { 2193 {
2158 if (must_clear && (i++ > (count / 2))) 2194 if (must_clear && (i++ > count / 2))
2159 break; 2195 break;
2160 2196
2161 dtp[col] = stp[col]; 2197 dtp[col] = stp[col];
2162 drp[col] = rend; 2198 drp[col] = rend;
2163 i = 0; 2199 i = 0;
2164 } 2200 }
2165 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2166 break; 2202 break;
2167 } 2203 }
2168 2204
2169 col--; /* went one too far. move back */ 2205 col--; /* went one too far. move back */
2170 count -= i; /* dump any matching trailing chars */ 2206 count -= i; /* dump any matching trailing chars */
2207
2208 // sometimes we optimize away the trailing NOCHAR's, add them back
2209 while (i && text[count] == NOCHAR)
2210 count++, i--;
2171 2211
2172 /* 2212 /*
2173 * Determine the attributes for the string 2213 * Determine the attributes for the string
2174 */ 2214 */
2175 int fid = GET_FONT (rend);
2176 int fore = GET_FGCOLOR (rend); // desired foreground 2215 int fore = fgcolor_of (rend); // desired foreground
2177 int back = GET_BGCOLOR (rend); // desired background 2216 int back = bgcolor_of (rend); // desired background
2178 2217
2179 rend = GET_ATTR (rend); 2218 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2180 2225
2181 rvid = !!(rend & RS_RVid); 2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid;
2182 2234
2183#ifndef NO_BOLD_UNDERLINE_REVERSE 2235#ifndef NO_BOLD_UNDERLINE_REVERSE
2184 if (rend & RS_Bold && fore == Color_fg) 2236 if (rend & RS_Bold
2237 && fore == Color_fg)
2185 { 2238 {
2186 if (ISSET_PIXCOLOR (Color_BD)) 2239 if (ISSET_PIXCOLOR (Color_BD))
2187 fore = Color_BD; 2240 fore = Color_BD;
2241# if !ENABLE_STYLES
2188 else 2242 else
2189 rvid = !rvid; 2243 invert = !invert;
2244# endif
2245 }
2246
2247 if (rend & RS_Italic
2248 && fore == Color_fg)
2249 {
2250 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT;
2252# if !ENABLE_STYLES
2253 else
2254 invert = !invert;
2255# endif
2256 }
2257
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL;
2260#endif
2261
2262 if (invert)
2263 {
2264 ::swap (fore, back);
2265
2266#ifndef NO_BOLD_UNDERLINE_REVERSE
2267 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV;
2269
2270 if (fore == back)
2271 {
2272 fore = Color_bg;
2273 back = Color_fg;
2274 }
2275#endif
2276 }
2277
2278#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 {
2281 if (!text_blink_ev.active)
2282 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2284 hidden_text = 0;
2285 }
2286 else if (hidden_text)
2287 fore = back;
2288 }
2289#endif
2190 } 2290 }
2191
2192 if (rend & RS_Uline)
2193 if (ISSET_PIXCOLOR (Color_UL))
2194 fore = Color_UL;
2195#endif
2196
2197 if (rvid)
2198 {
2199 SWAP_IT (fore, back, int);
2200
2201#ifndef NO_BOLD_UNDERLINE_REVERSE
2202 if (ISSET_PIXCOLOR (Color_RV)
2203# ifndef NO_CURSORCOLOR
2204 && !ISSET_PIXCOLOR (Color_cursor)
2205# endif
2206 )
2207 back = Color_RV;
2208#endif
2209 }
2210
2211#ifdef TEXT_BLINK
2212 if (rend & RS_Blink && back == Color_bg)
2213 {
2214 if (!text_blink_ev.active)
2215 {
2216 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2217 hidden_text = 0;
2218 }
2219 else if (hidden_text)
2220 fore = back;
2221 }
2222#endif
2223 2291
2224 /* 2292 /*
2225 * Actually do the drawing of the string here 2293 * Actually do the drawing of the string here
2226 */ 2294 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2228 2296
2229 if (back == fore) 2297 if (back == fore)
2230 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2298 font->clear_rect (*drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2299 fwidth * count, fheight,
2232 back); 2300 back);
2233 else if (back == Color_bg) 2301 else if (back == Color_bg)
2234 { 2302 {
2235 if (must_clear) 2303 if (must_clear)
2236 { 2304 {
2237 CLEAR_CHARS (xpixel, ypixel, count); 2305 CLEAR_CHARS (xpixel, ypixel, count);
2238 2306
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2307 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2308 if (text[i] != ' ')
2241 { 2309 {
2242 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2311 break;
2244 } 2312 }
2245 } 2313 }
2246 else 2314 else
2247 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2316 }
2249 else 2317 else
2250 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2251 2319
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2320 if (rend & RS_Uline && font->descent > 1 && fore != back)
2321 {
2322#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2325 else
2326#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]);
2328
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2329 XDrawLine (display->display, drawBuffer, gc,
2254 xpixel, ypixel + font->ascent + 1, 2330 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 }
2256 } /* for (col....) */ 2333 } /* for (col....) */
2257 } /* for (row....) */ 2334 } /* for (row....) */
2335
2336#if ENABLE_OVERLAY
2337 scr_swap_overlay ();
2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2258 2340
2259 /* 2341 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2261 */ 2343 */
2262 if (showcursor) 2344 if (showcursor)
2263 { 2345 {
2264 if (TermWin.focus) 2346 if (focus)
2347 {
2348 if (OPTION (Opt_cursorUnderline))
2349 *crp ^= RS_Uline;
2350 else
2265 { 2351 {
2266 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2267 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2352 *crp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2353#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2354 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2355#endif
2356 }
2272 } 2357 }
2273 else if (oldcursor.row >= 0) 2358 else if (oldcursor.row >= 0)
2274 { 2359 {
2360 int cursorwidth = 1;
2361 int col = oldcursor.col;
2362
2363 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2364 col--;
2365
2366 while (col + cursorwidth < ncol
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++;
2369
2275#ifndef NO_CURSORCOLOR 2370#ifndef NO_CURSORCOLOR
2276 if (ISSET_PIXCOLOR (Color_cursor)) 2371 if (ISSET_PIXCOLOR (Color_cursor))
2277 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2278#endif 2373#endif
2279 int cursorwidth = 1;
2280 while (oldcursor.col + cursorwidth < TermWin.ncol
2281 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2282 cursorwidth++;
2283 2374
2284 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2375 XDrawRectangle (display->display, drawBuffer, gc,
2285 Col2Pixel (oldcursor.col), 2376 Col2Pixel (col),
2286 Row2Pixel (oldcursor.row), 2377 Row2Pixel (oldcursor.row),
2287 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2378 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2288 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2289 } 2380 }
2290 } 2381 }
2291 2382
2292 /* 2383 /*
2293 * H: cleanup selection 2384 * H: cleanup selection
2294 */ 2385 */
2295 scr_reverse_selection (); 2386 scr_reverse_selection ();
2296 2387
2297 /*
2298 * I: other general cleanup
2299 */
2300 if (clearfirst && TermWin.int_bwidth)
2301 /*
2302 * clear the whole screen height, note that width == 0 is treated
2303 * specially by XClearArea
2304 */
2305 XClearArea (display->display, TermWin.vt, 0, 0,
2306 (unsigned int)TermWin.int_bwidth,
2307 (unsigned int)TermWin_TotalHeight (), False);
2308
2309 if (clearlast && TermWin.int_bwidth)
2310 /*
2311 * clear the whole screen height, note that width == 0 is treated
2312 * specially by XClearArea
2313 */
2314 XClearArea (display->display, TermWin.vt,
2315 TermWin.width + TermWin.int_bwidth, 0,
2316 (unsigned int)TermWin.int_bwidth,
2317 (unsigned int)TermWin_TotalHeight (), False);
2318
2319 if (refresh_type & SMOOTH_REFRESH)
2320 XSync (display->display, False);
2321
2322 num_scr = 0; 2388 num_scr = 0;
2323 num_scr_allow = 1; 2389 num_scr_allow = 1;
2324 want_refresh = 0; /* screen is current */
2325} 2390}
2326 2391
2327void 2392void
2328rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2393rxvt_term::scr_remap_chars (line_t &l)
2329{ 2394{
2330 if (!rp || !tp) 2395 if (!l.t)
2331 return; 2396 return;
2332 2397
2333 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2334 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2399
2400 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2335} 2402}
2336 2403
2337void 2404void
2338rxvt_term::scr_remap_chars () 2405rxvt_term::scr_remap_chars ()
2339{ 2406{
2340 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2407 for (int i = total_rows; i--; )
2341 scr_remap_chars (screen.text[i], screen.rend[i]); 2408 scr_remap_chars (row_buf [i]);
2342 2409
2343 for (int i = TermWin.nrow; i--; ) 2410 for (int i = nrow; i--; )
2344 {
2345 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2346 scr_remap_chars (swap.text[i], swap.rend[i]);
2347 } 2411 {
2412 scr_remap_chars (drawn_buf [i]);
2413 scr_remap_chars (swap_buf [i]);
2414 }
2415}
2416
2417void
2418rxvt_term::scr_recolour ()
2419{
2420 if (1
2421#if TRANSPARENT
2422 && !am_transparent
2423#endif
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS
2433 if (scrollBar.win)
2434 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle ();
2437 scrollbar_show (0);
2438 }
2439#endif
2440 }
2441
2442 scr_clear ();
2443 scr_touch (true);
2444 want_refresh = 1;
2348} 2445}
2349 2446
2350/* ------------------------------------------------------------------------- */ 2447/* ------------------------------------------------------------------------- */
2351void 2448void
2352rxvt_term::scr_clear (bool really) 2449rxvt_term::scr_clear (bool really)
2353{ 2450{
2354 if (!TermWin.mapped) 2451 if (!mapped)
2355 return; 2452 return;
2356 2453
2357 num_scr_allow = 0; 2454 num_scr_allow = 0;
2358 want_refresh = 1; 2455 want_refresh = 1;
2359 2456
2360#ifdef TRANSPARENT 2457 if (really)
2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2458 XClearWindow (display->display, vt);
2459}
2460
2461void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2463{
2464 int view_end = view_start + nrow;
2465 int row, col;
2466
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = beg_col; col < end_col; col++)
2473 srp[col] ^= rstyle1;
2474
2475 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= rstyle2;
2477
2478 if (++col < end_col)
2479 srp[col] ^= rstyle2;
2362 { 2480 }
2363 int i; 2481}
2364 2482
2365 if (! (Options & Opt_transparent_all)) 2483void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2485{
2486 int view_end = view_start + nrow;
2487 int row, col;
2488
2489 if (beg_row >= view_start)
2490 {
2491 col = beg_col;
2492 row = beg_row;
2493 }
2494 else
2495 {
2366 i = 0; 2496 col = 0;
2497 row = view_start;
2498 }
2499
2500 for (; row < min (end_row, view_end); row++, col = 0)
2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2502 srp[col] ^= rstyle;
2503
2504 if (row == end_row)
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle;
2507}
2508
2509/* ------------------------------------------------------------------------- */
2510void
2511rxvt_term::scr_reverse_selection ()
2512{
2513 if (selection.op
2514 && current_screen == selection.screen
2515 && selection.end.row >= view_start)
2516 {
2517#if ENABLE_FRILLS
2518 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline);
2367 else 2522 else
2368 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2369
2370 while (i--)
2371 if (TermWin.parent[i] != None)
2372 XClearWindow (display->display, TermWin.parent[i]);
2373 }
2374#endif 2523#endif
2375 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2376 if (really) 2525 selection.end.row, selection.end.col,
2377 XClearWindow (display->display, TermWin.vt); 2526 RS_RVid);
2378}
2379
2380/* ------------------------------------------------------------------------- */
2381void
2382rxvt_term::scr_reverse_selection ()
2383{
2384 if (selection.op && current_screen == selection.screen)
2385 {
2386 int end_row = TermWin.saveLines - TermWin.view_start;
2387 int i = selection.beg.row + TermWin.saveLines;
2388 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp;
2390
2391 if (i >= end_row)
2392 col = selection.beg.col;
2393 else
2394 {
2395 col = 0;
2396 i = end_row;
2397 }
2398
2399 end_row += TermWin.nrow;
2400 for (; i < row && i < end_row; i++, col = 0)
2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2402 srp[col] ^= RS_RVid;
2403
2404 if (i == row && i < end_row)
2405 for (srp = screen.rend[i]; col < selection.end.col; col++)
2406 srp[col] ^= RS_RVid;
2407 } 2527 }
2408} 2528}
2409 2529
2410/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2411/* 2531/*
… …
2418{ 2538{
2419 int row, wrote; 2539 int row, wrote;
2420 unsigned int width, towrite; 2540 unsigned int width, towrite;
2421 char r1[] = "\n"; 2541 char r1[] = "\n";
2422 2542
2423 for (row = TermWin.saveLines - TermWin.nscrolled; 2543 for (row = saveLines - nsaved;
2424 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2544 row < saveLines + nrow - 1; row++)
2425 { 2545 {
2426 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2546 width = row_buf[row].l >= 0 ? row_buf[row].l
2427 : TermWin.ncol; 2547 : ncol;
2428 for (towrite = width; towrite; towrite -= wrote) 2548 for (towrite = width; towrite; towrite -= wrote)
2429 { 2549 {
2430 wrote = write (fd, & (screen.text[row][width - towrite]), 2550 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2431 towrite); 2551 towrite);
2432 if (wrote < 0) 2552 if (wrote < 0)
2433 return; /* XXX: death, no report */ 2553 return; /* XXX: death, no report */
2434 } 2554 }
2435 if (screen.tlen[row] >= 0) 2555 if (row_buf[row].l >= 0)
2436 if (write (fd, r1, 1) <= 0) 2556 if (write (fd, r1, 1) <= 0)
2437 return; /* XXX: death, no report */ 2557 return; /* XXX: death, no report */
2438 } 2558 }
2439} 2559}
2440#endif 2560#endif
2441 2561
2442/* ------------------------------------------------------------------------- * 2562/* ------------------------------------------------------------------------- *
2443 * CHARACTER SELECTION * 2563 * CHARACTER SELECTION *
2444 * ------------------------------------------------------------------------- */ 2564 * ------------------------------------------------------------------------- */
2445
2446/*
2447 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2448 */
2449void 2565void
2450rxvt_term::selection_check (int check_more) 2566rxvt_term::selection_check (int check_more)
2451{ 2567{
2452 row_col_t pos; 2568 row_col_t pos;
2453 2569
2454 if (!selection.op) 2570 if (!selection.op)
2455 return; 2571 return;
2456 2572
2457 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2458 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2459 || (selection.beg.row >= TermWin.nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2460 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2461 || (selection.mark.row >= TermWin.nrow)
2462 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2463 || (selection.end.row >= TermWin.nrow)
2464 || (check_more == 1 2577 || (check_more == 1
2465 && current_screen == selection.screen 2578 && current_screen == selection.screen
2466 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2467 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2468 || (check_more == 2 2581 || (check_more == 2
… …
2470 && ROWCOL_IS_AFTER (selection.end, pos)) 2583 && ROWCOL_IS_AFTER (selection.end, pos))
2471 || (check_more == 3 2584 || (check_more == 3
2472 && ROWCOL_IS_AFTER (selection.end, pos)) 2585 && ROWCOL_IS_AFTER (selection.end, pos))
2473 || (check_more == 4 /* screen width change */ 2586 || (check_more == 4 /* screen width change */
2474 && (selection.beg.row != selection.end.row 2587 && (selection.beg.row != selection.end.row
2475 || selection.end.col > TermWin.ncol))) 2588 || selection.end.col > ncol)))
2476 CLEAR_SELECTION (); 2589 CLEAR_SELECTION ();
2477} 2590}
2478 2591
2479/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2480/* 2593/*
2481 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2482 */ 2595 */
2483void 2596void
2484rxvt_term::paste (const unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2485{ 2598{
2486 unsigned int i, j, n;
2487 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2488
2489#if 0
2490 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2491 ZERO_SCROLLBACK (r);
2492#endif
2493
2494 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2495 for (i = 0; i < len; i += PROP_SIZE) 2600 for (unsigned int i = 0; i < len; i++)
2496 { 2601 if (data[i] == C0_LF)
2497 n = min (len - i, PROP_SIZE); 2602 data[i] = C0_CR;
2498 MEMCPY (ds, data + i, n);
2499 2603
2500 for (j = 0; j < n; j++) 2604 tt_write (data, len);
2501 if (ds[j] == '\n')
2502 ds[j] = '\r';
2503
2504 tt_write (ds, (int)n);
2505 }
2506
2507 free (ds);
2508} 2605}
2509 2606
2510/* ------------------------------------------------------------------------- */ 2607/* ------------------------------------------------------------------------- */
2511/* 2608/*
2512 * Respond to a notification that a primary selection has been sent 2609 * Respond to a notification that a primary selection has been sent
2513 * EXT: SelectionNotify 2610 * EXT: SelectionNotify
2514 */ 2611 */
2515int 2612void
2516rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2517{ 2614{
2518 long nread = 0;
2519 unsigned long bytes_after;
2520 XTextProperty ct;
2521
2522 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2523
2524 if (prop == None) /* check for failed XConvertSelection */ 2615 if (prop == None) /* check for failed XConvertSelection */
2525 { 2616 {
2526 if ((selection_type & Sel_CompoundText)) 2617 if ((selection_type & Sel_CompoundText))
2527 { 2618 {
2528 int selnum = selection_type & Sel_whereMask; 2619 int selnum = selection_type & Sel_whereMask;
… …
2541 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2632 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2542 else 2633 else
2543 selection_type = 0; 2634 selection_type = 0;
2544 } 2635 }
2545 2636
2546 return 0; 2637 return;
2547 }
2548
2549 for (;;)
2550 { 2638 }
2639
2640 unsigned long bytes_after;
2641 XTextProperty ct;
2642
2643 if (XGetWindowProperty (display->display, win, prop,
2644 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after,
2648 &ct.value) != Success)
2649 {
2650 ct.value = 0;
2651 goto bailout;
2652 }
2653
2654 if (ct.encoding == None)
2655 goto bailout;
2656
2657 if (bytes_after)
2658 {
2659 // fetch and append remaining data
2660 XTextProperty ct2;
2661
2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2662 if (XGetWindowProperty (display->display, win, prop,
2552 (long) (PROP_SIZE / 4), delete_prop, 2663 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType,
2553 AnyPropertyType, &ct.encoding, &ct.format, 2665 &ct2.encoding, &ct2.format,
2554 &ct.nitems, &bytes_after, 2666 &ct2.nitems, &bytes_after,
2555 &ct.value) != Success) 2667 &ct2.value) != Success)
2556 break; 2668 goto bailout;
2557 2669
2558 if (ct.encoding == 0) 2670 // realloc should be compatible to XFree, here, and elsewhere, too
2559 { 2671 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2672 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2561 break; 2673 ct.nitems += ct2.nitems;
2562 }
2563 2674
2675 XFree (ct2.value);
2676 }
2677
2564 if (ct.value == NULL) 2678 if (ct.value == 0)
2565 { 2679 goto bailout;
2566 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2567 continue;
2568 }
2569 2680
2681 if (ct.encoding == xa[XA_INCR])
2682 {
2683 // INCR selection, start handshake
2684 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop);
2686
2687 selection_wait = Sel_incr;
2688 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10);
2690
2691 goto bailout;
2692 }
2693
2570 if (ct.nitems == 0) 2694 if (ct.nitems == 0)
2695 {
2696 if (selection_wait == Sel_incr)
2697 {
2698 XFree (ct.value);
2699
2700 // finally complete, now paste the whole thing
2701 selection_wait = Sel_normal;
2702 ct.value = (unsigned char *)incr_buf;
2703 ct.nitems = incr_buf_fill;
2704 incr_buf = 0;
2705 incr_buf_size = 0;
2706 incr_ev.stop ();
2571 { 2707 }
2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2708 else
2573 2709 {
2574 if (selection_wait == Sel_normal && nread == 0 2710 if (selection_wait == Sel_normal
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2576 { 2712 {
2577 /* 2713 /*
2578 * pass through again trying CUT_BUFFER0 if we've come from 2714 * pass through again trying CUT_BUFFER0 if we've come from
2579 * XConvertSelection () but nothing was presented 2715 * XConvertSelection () but nothing was presented
2580 */ 2716 */
2581 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2582 selection_paste (display->root, XA_CUT_BUFFER0, False); 2717 selection_paste (display->root, XA_CUT_BUFFER0, False);
2583 } 2718 }
2584 2719
2585 nread = -1; /* discount any previous stuff */ 2720 goto bailout;
2586 break; 2721 }
2722 }
2723 else if (selection_wait == Sel_incr)
2724 {
2725 incr_ev.start (NOW + 10);
2726
2727 while (incr_buf_fill + ct.nitems > incr_buf_size)
2587 } 2728 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2731 }
2588 2732
2733 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2589 nread += ct.nitems; 2734 incr_buf_fill += ct.nitems;
2590 2735
2736 goto bailout;
2737 }
2738
2591 char **cl; 2739 char **cl;
2592 int cr; 2740 int cr;
2741
2742#if ENABLE_FRILLS
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING])
2746 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2748 char *s = rxvt_wcstombs (w);
2749 free (w);
2750 // TODO: strlen == only the first element will be converted. well...
2751 paste (s, strlen (s));
2752 free (s);
2753 }
2754 else
2755#endif
2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2594 &cr) >= 0 && cl) 2757 && cl)
2595 { 2758 {
2596 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2597 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2598 2761
2599 XFreeStringList (cl); 2762 XFreeStringList (cl);
2600 } 2763 }
2601 else 2764 else
2602 paste (ct.value, ct.nitems); 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2603 2766
2604 if (bytes_after == 0) 2767bailout:
2605 break;
2606
2607 XFree (ct.value);
2608 }
2609
2610 if (ct.value)
2611 XFree (ct.value); 2768 XFree (ct.value);
2612 2769
2613 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
2614 selection_wait = Sel_none; 2771 selection_wait = Sel_none;
2615
2616 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2617 return (int)nread;
2618} 2772}
2619 2773
2620void 2774void
2621rxvt_term::incr_cb (time_watcher &w) 2775rxvt_term::incr_cb (time_watcher &w)
2622{ 2776{
2623 selection_wait = Sel_none; 2777 selection_wait = Sel_none;
2624 2778
2779 incr_buf_size = 0;
2780 free (incr_buf);
2781
2625 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2626} 2783}
2627 2784
2628/*
2629 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2630 */
2631void 2785void
2632rxvt_term::selection_property (Window win, Atom prop) 2786rxvt_term::selection_property (Window win, Atom prop)
2633{ 2787{
2634 int reget_time = 0; 2788 if (prop == None || selection_wait != Sel_incr)
2635
2636 if (prop == None)
2637 return; 2789 return;
2638 2790
2639 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2640 if (selection_wait == Sel_normal)
2641 {
2642 int a, afmt;
2643 Atom atype;
2644 unsigned long bytes_after, nitems;
2645 unsigned char *s = NULL;
2646
2647 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2648 xa[XA_INCR], &atype, &afmt, &nitems,
2649 &bytes_after, &s);
2650 if (s)
2651 XFree (s);
2652 if (a != Success)
2653 return;
2654
2655#ifndef __CYGWIN32__
2656 if (atype == xa[XA_INCR])
2657 { /* start an INCR transfer */
2658 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2659 XDeleteProperty (display->display, win, prop);
2660 XFlush (display->display);
2661 reget_time = 1;
2662 selection_wait = Sel_incr;
2663 }
2664#endif
2665
2666 }
2667 else if (selection_wait == Sel_incr)
2668 {
2669 reget_time = 1;
2670
2671 if (selection_paste (win, prop, True) == -1) 2791 selection_paste (win, prop, true);
2672 {
2673 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2674 selection_wait = Sel_none;
2675 incr_ev.stop ();
2676 }
2677 }
2678 if (reget_time) /* received more data so reget time */
2679 incr_ev.start (NOW + 10);
2680} 2792}
2681 2793
2682/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2683/* 2795/*
2684 * Request the current selection: 2796 * Request the current selection:
… …
2690 * EXT: button 2 release 2802 * EXT: button 2 release
2691 */ 2803 */
2692void 2804void
2693rxvt_term::selection_request (Time tm, int x, int y) 2805rxvt_term::selection_request (Time tm, int x, int y)
2694{ 2806{
2695 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2696
2697 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2807 if (x < 0 || x >= width || y < 0 || y >= height)
2698 return; /* outside window */ 2808 return; /* outside window */
2699 2809
2700 if (selection.text) 2810 if (selection.text)
2701 { /* internal selection */ 2811 { /* internal selection */
2702 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2703 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2704 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2705 free (str); 2814 free (str);
2706 return; 2815 return;
2707 } 2816 }
2708 else 2817 else
2709 { 2818 {
2710 int i; 2819 int i;
2711 2820
2712 selection_request_time = tm; 2821 selection_request_time = tm;
2713 selection_wait = Sel_normal; 2822 selection_wait = Sel_normal;
2823
2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2715 { 2825 {
2716#if X_HAVE_UTF8_STRING 2826#if X_HAVE_UTF8_STRING
2717 selection_type = Sel_UTF8String; 2827 selection_type = Sel_UTF8String;
2718 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2828 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2720#else 2830#else
2721 selection_type = Sel_CompoundText; 2831 selection_type = Sel_CompoundText;
2722 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2723 return; 2833 return;
2724#endif 2834#endif
2725
2726 } 2835 }
2727 } 2836 }
2728 2837
2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2838 selection_wait = Sel_none; /* don't loop in selection_paste () */
2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2731 selection_paste (display->root, XA_CUT_BUFFER0, False); 2839 selection_paste (display->root, XA_CUT_BUFFER0, false);
2732} 2840}
2733 2841
2734int 2842int
2735rxvt_term::selection_request_other (Atom target, int selnum) 2843rxvt_term::selection_request_other (Atom target, int selnum)
2736{ 2844{
2737 Atom sel; 2845 Atom sel;
2738#ifdef DEBUG_SELECT
2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2740#endif
2741 2846
2742 selection_type |= selnum; 2847 selection_type |= selnum;
2743 2848
2744 if (selnum == Sel_Primary) 2849 if (selnum == Sel_Primary)
2745 sel = XA_PRIMARY; 2850 sel = XA_PRIMARY;
… …
2748 else 2853 else
2749 sel = xa[XA_CLIPBOARD]; 2854 sel = xa[XA_CLIPBOARD];
2750 2855
2751 if (XGetSelectionOwner (display->display, sel) != None) 2856 if (XGetSelectionOwner (display->display, sel) != None)
2752 { 2857 {
2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2755 TermWin.vt, selection_request_time); 2859 vt, selection_request_time);
2756 return 1; 2860 return 1;
2757 } 2861 }
2758 2862
2759 return 0; 2863 return 0;
2760} 2864}
… …
2765 * EXT: SelectionClear 2869 * EXT: SelectionClear
2766 */ 2870 */
2767void 2871void
2768rxvt_term::selection_clear () 2872rxvt_term::selection_clear ()
2769{ 2873{
2770 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2771
2772 want_refresh = 1; 2874 want_refresh = 1;
2773 free (selection.text); 2875 free (selection.text);
2774 selection.text = NULL; 2876 selection.text = NULL;
2775 selection.len = 0; 2877 selection.len = 0;
2776 CLEAR_SELECTION (); 2878 CLEAR_SELECTION ();
2879
2880 if (display->selection_owner == this)
2881 display->selection_owner = 0;
2777} 2882}
2778 2883
2779/* ------------------------------------------------------------------------- */ 2884/* ------------------------------------------------------------------------- */
2780/* 2885/*
2781 * Copy a selection into the cut buffer 2886 * Copy a selection into the cut buffer
2782 * EXT: button 1 or 3 release 2887 * EXT: button 1 or 3 release
2783 */ 2888 */
2784void 2889void
2785rxvt_term::selection_make (Time tm) 2890rxvt_term::selection_make (Time tm)
2786{ 2891{
2787 int i, col, end_col, row, end_row; 2892 int i;
2788 wchar_t *new_selection_text; 2893 wchar_t *new_selection_text;
2789 text_t *t; 2894 text_t *t;
2790 2895
2791 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2792 switch (selection.op) 2896 switch (selection.op)
2793 { 2897 {
2794 case SELECTION_CONT: 2898 case SELECTION_CONT:
2795 break; 2899 break;
2796 case SELECTION_INIT: 2900 case SELECTION_INIT:
… …
2806 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2807 2911
2808 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2809 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2810 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2811 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2812 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2813 2920
2814 col = selection.beg.col;
2815 MAX_IT (col, 0);
2816 row = selection.beg.row + TermWin.saveLines;
2817 end_row = selection.end.row + TermWin.saveLines;
2818 int ofs = 0; 2921 int ofs = 0;
2819 int extra = 0; 2922 int extra = 0;
2820 2923
2924 int col = selection.beg.col;
2925 int row = selection.beg.row;
2926
2927 int end_col;
2928
2821 for (; row <= end_row; row++, col = 0) 2929 for (; row <= selection.end.row; row++, col = 0)
2822 { 2930 {
2823 t = &(screen.text[row][col]); 2931#if ENABLE_FRILLS
2824 2932 if (selection.rect)
2825 end_col = screen.tlen[row]; 2933 {
2826 2934 col = selection.beg.col;
2827 if (end_col == -1)
2828 end_col = TermWin.ncol; 2935 end_col = ncol + 1;
2936 }
2937 else
2938#endif
2939 end_col = ROW(row).l;
2829 2940
2941 col = max (col, 0);
2942
2830 if (row == end_row) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2831 MIN_IT (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2949
2950 t = ROW(row).t + col;
2832 2951
2833 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2834 { 2953 {
2835 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2836 t++; 2955 t++;
… …
2853#endif 2972#endif
2854 else 2973 else
2855 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2856 } 2975 }
2857 2976
2858 if (screen.tlen[row] != -1 && row != end_row) 2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2859 new_selection_text[ofs++] = L'\n'; 2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2989 if (!ROW(row).is_longer () && row != selection.end.row)
2990 new_selection_text[ofs++] = C0_LF;
2860 } 2991 }
2861 2992
2862 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2863 new_selection_text[ofs++] = L'\n'; 2994 new_selection_text[ofs++] = C0_LF;
2864 2995
2865 new_selection_text[ofs] = 0; 2996 new_selection_text[ofs] = 0;
2866 2997
2867 if (ofs == 0) 2998 if (ofs == 0)
2868 { 2999 {
… …
2874 3005
2875 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2876 selection.len = ofs; 3007 selection.len = ofs;
2877 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2878 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2879 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2880 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2881 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2882 else 3027 else
2883 rxvt_print_error ("can't get primary selection"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2884 3032
2885#if 0 3033#if 0
2886 XTextProperty ct; 3034 XTextProperty ct;
2887 3035
2888 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2889 { 3037 {
2890 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2891 PropModeReplace, ct.value, ct.nitems);
2892 XFree (ct.value); 3039 XFree (ct.value);
2893 } 3040 }
2894#endif 3041#endif
2895
2896 selection_time = tm;
2897 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2898} 3042}
2899 3043
2900/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2901/* 3045/*
2902 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
2903 * EXT: button 1 press 3047 * EXT: button 1 press
2904 */ 3048 */
2905void 3049void
2906rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2907{ 3051{
2908 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2909
2910 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2911 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2912 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
2913 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2914 3065
2915 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2916 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2917 selection.mark.row + TermWin.view_start, 3068 selection.mark.row - view_start,
2918 0, /* button 3 */ 3069 0, /* button 3 */
2919 1, /* button press */ 3070 1, /* button press */
2920 0); /* click change */ 3071 0); /* click change */
2921} 3072}
2922 3073
… …
2926 */ 3077 */
2927void 3078void
2928rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2929{ 3080{
2930 want_refresh = 1; 3081 want_refresh = 1;
3082
3083 selection.mark.row = row + view_start;
2931 selection.mark.col = col; 3084 selection.mark.col = col;
2932 selection.mark.row = row - TermWin.view_start;
2933 3085
2934 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2935 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2936 MAX_IT (selection.mark.col, 0);
2937 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2938 3088
2939 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
2940 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2941 --selection.mark.col; 3091 --selection.mark.col;
2942 3092
2943 if (selection.op) 3093 if (selection.op)
2944 { /* clear the old selection */ 3094 { /* clear the old selection */
2945 selection.beg.row = selection.end.row = selection.mark.row; 3095 selection.beg.row = selection.end.row = selection.mark.row;
… …
2956 * We now only find out the boundary in one direction 3106 * We now only find out the boundary in one direction
2957 */ 3107 */
2958 3108
2959/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3109/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2960#define DELIMIT_TEXT(x) \ 3110#define DELIMIT_TEXT(x) \
2961 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2962#define DELIMIT_REND(x) 1 3112#define DELIMIT_REND(x) 1
2963 3113
2964void 3114void
2965rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2966{ 3116{
… …
2969 text_t *stp; 3119 text_t *stp;
2970 rend_t *srp; 3120 rend_t *srp;
2971 3121
2972 if (dirn == UP) 3122 if (dirn == UP)
2973 { 3123 {
2974 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3124 bound.row = top_row - 1;
2975 bound.col = 0; 3125 bound.col = 0;
2976 dirnadd = -1; 3126 dirnadd = -1;
2977 } 3127 }
2978 else 3128 else
2979 { 3129 {
2980 bound.row = TermWin.saveLines + TermWin.nrow; 3130 bound.row = nrow;
2981 bound.col = TermWin.ncol - 1; 3131 bound.col = ncol - 1;
2982 dirnadd = 1; 3132 dirnadd = 1;
2983 } 3133 }
2984 3134
2985 row = mark->row + TermWin.saveLines; 3135 row = mark->row;
2986 col = mark->col; 3136 col = max (mark->col, 0);
2987 MAX_IT (col, 0); 3137
2988 /* find the edge of a word */ 3138 /* find the edge of a word */
2989 stp = & (screen.text[row][col]); 3139 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2990 w1 = DELIMIT_TEXT (*stp); 3140 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2991
2992 srp = (&screen.rend[row][col]);
2993 w2 = DELIMIT_REND (*srp);
2994 3141
2995 for (;;) 3142 for (;;)
2996 { 3143 {
2997 for (; col != bound.col; col += dirnadd) 3144 for (; col != bound.col; col += dirnadd)
2998 { 3145 {
… …
3008 break; 3155 break;
3009 } 3156 }
3010 3157
3011 if ((col == bound.col) && (row != bound.row)) 3158 if ((col == bound.col) && (row != bound.row))
3012 { 3159 {
3013 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3160 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3014 { 3161 {
3015 trow = row + dirnadd; 3162 trow = row + dirnadd;
3016 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3163 tcol = dirn == UP ? ncol - 1 : 0;
3017 3164
3018 if (screen.text[trow] == NULL) 3165 if (!ROW(trow).t)
3019 break; 3166 break;
3020 3167
3021 stp = & (screen.text[trow][tcol]); 3168 stp = ROW(trow).t + tcol;
3022 srp = & (screen.rend[trow][tcol]); 3169 srp = ROW(trow).r + tcol;
3023 3170
3024 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3171 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3025 break; 3172 break;
3026 3173
3027 row = trow; 3174 row = trow;
… …
3030 } 3177 }
3031 } 3178 }
3032 break; 3179 break;
3033 } 3180 }
3034 3181
3035Old_Word_Selection_You_Die:
3036 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3037
3038 if (dirn == DN) 3182 if (dirn == DN)
3039 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3040 3184
3041 /* Poke the values back in */ 3185 /* Poke the values back in */
3042 ret->row = row - TermWin.saveLines; 3186 ret->row = row;
3043 ret->col = col; 3187 ret->col = col;
3044} 3188}
3045 3189
3046/* ------------------------------------------------------------------------- */ 3190/* ------------------------------------------------------------------------- */
3047/* 3191/*
… …
3052 * flag == 2 ==> button 3 motion 3196 * flag == 2 ==> button 3 motion
3053 */ 3197 */
3054void 3198void
3055rxvt_term::selection_extend (int x, int y, int flag) 3199rxvt_term::selection_extend (int x, int y, int flag)
3056{ 3200{
3057 int col, row; 3201 int col = clamp (Pixel2Col (x), 0, ncol);
3058 3202 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3059 col = Pixel2Col (x);
3060 row = Pixel2Row (y);
3061 MAX_IT (row, 0);
3062 MIN_IT (row, (int)TermWin.nrow - 1);
3063 MAX_IT (col, 0);
3064 MIN_IT (col, (int)TermWin.ncol);
3065 3203
3066 /* 3204 /*
3067 * If we're selecting characters (single click) then we must check first 3205 * If we're selecting characters (single click) then we must check first
3068 * if we are at the same place as the original mark. If we are then 3206 * if we are at the same place as the original mark. If we are then
3069 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3070 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3071 */ 3209 */
3072 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3073 && (col == selection.mark.col 3211 && (col == selection.mark.col
3074 && (row == selection.mark.row + TermWin.view_start))) 3212 && (row == selection.mark.row - view_start)))
3075 { 3213 {
3076 /* select nothing */ 3214 /* select nothing */
3077 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3078 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3079 selection.clicks = 4; 3217 selection.clicks = 4;
3080 want_refresh = 1; 3218 want_refresh = 1;
3081 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3082 return; 3219 return;
3083 } 3220 }
3084 3221
3085 if (selection.clicks == 4) 3222 if (selection.clicks == 4)
3086 selection.clicks = 1; 3223 selection.clicks = 1;
… …
3095 * Extend the selection to the specified col/row 3232 * Extend the selection to the specified col/row
3096 */ 3233 */
3097void 3234void
3098rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3099{ 3236{
3100 int16_t ncol = TermWin.ncol;
3101 int end_col;
3102 row_col_t pos; 3237 row_col_t pos;
3103 enum { 3238 enum {
3104 LEFT, RIGHT 3239 LEFT, RIGHT
3105 } closeto = RIGHT; 3240 } closeto = RIGHT;
3106 3241
3107 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3108 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3109
3110 want_refresh = 1; 3242 want_refresh = 1;
3243
3111 switch (selection.op) 3244 switch (selection.op)
3112 { 3245 {
3113 case SELECTION_INIT: 3246 case SELECTION_INIT:
3114 CLEAR_SELECTION (); 3247 CLEAR_SELECTION ();
3115 selection.op = SELECTION_BEGIN; 3248 selection.op = SELECTION_BEGIN;
… …
3128 selection_start_colrow (col, row); 3261 selection_start_colrow (col, row);
3129 /* FALLTHROUGH */ 3262 /* FALLTHROUGH */
3130 default: 3263 default:
3131 return; 3264 return;
3132 } 3265 }
3266
3133 if (selection.beg.col == selection.end.col 3267 if (selection.beg.col == selection.end.col
3134 && selection.beg.col != selection.mark.col 3268 && selection.beg.col != selection.mark.col
3135 && selection.beg.row == selection.end.row 3269 && selection.beg.row == selection.end.row
3136 && selection.beg.row != selection.mark.row) 3270 && selection.beg.row != selection.mark.row)
3137 { 3271 {
3138 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3139 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3140 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3141 } 3274 }
3142 3275
3143 pos.col = col; 3276 pos.col = col;
3144 pos.row = row; 3277 pos.row = view_start + row;
3145
3146 pos.row -= TermWin.view_start; /* adjust for scroll */
3147 3278
3148 /* 3279 /*
3149 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3150 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3151 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3188 } 3319 }
3189 else 3320 else
3190 { /* button1 drag or button3 drag */ 3321 { /* button1 drag or button3 drag */
3191 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3322 if (ROWCOL_IS_AFTER (selection.mark, pos))
3192 { 3323 {
3193 if ((selection.mark.row == selection.end.row) 3324 if (selection.mark.row == selection.end.row
3194 && (selection.mark.col == selection.end.col) 3325 && selection.mark.col == selection.end.col
3326 && clickchange
3195 && clickchange && selection.clicks == 2) 3327 && selection.clicks == 2)
3196 selection.mark.col--; 3328 selection.mark.col--;
3197 3329
3198 selection.beg.row = pos.row; 3330 selection.beg.row = pos.row;
3199 selection.beg.col = pos.col; 3331 selection.beg.col = pos.col;
3200 selection.end.row = selection.mark.row; 3332 selection.end.row = selection.mark.row;
… …
3209 } 3341 }
3210 } 3342 }
3211 3343
3212 if (selection.clicks == 1) 3344 if (selection.clicks == 1)
3213 { 3345 {
3214 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3215 3347 && !ROW(selection.beg.row).is_longer ()
3216 if (end_col != -1 && selection.beg.col > end_col) 3348#if ENABLE_FRILLS
3349 && !selection.rect
3350#endif
3217 { 3351 )
3218#if 1
3219 selection.beg.col = ncol; 3352 selection.beg.col = ncol;
3220#else 3353
3221 if (selection.beg.row != selection.end.row) 3354 if (
3222 selection.beg.col = ncol; 3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3223 else 3356 && !ROW(selection.end.row).is_longer ()
3224 selection.beg.col = selection.mark.col; 3357#if ENABLE_FRILLS
3358 && !selection.rect
3225#endif 3359#endif
3226 } 3360 )
3227
3228 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3229
3230 if (end_col != -1 && selection.end.col > end_col)
3231 selection.end.col = ncol; 3361 selection.end.col = ncol;
3232 } 3362 }
3233 else if (selection.clicks == 2) 3363 else if (selection.clicks == 2)
3234 { 3364 {
3235 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3365 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3236 selection.end.col--; 3366 selection.end.col--;
3237 3367
3238 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3239 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3368 selection_delimit_word (UP, &selection.beg, &selection.beg);
3369 selection_delimit_word (DN, &selection.end, &selection.end);
3240 } 3370 }
3241 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3242 { 3372 {
3243#ifndef NO_FRILLS 3373#if ENABLE_FRILLS
3244 if ((Options & Opt_tripleclickwords)) 3374 if (OPTION (Opt_tripleclickwords))
3245 { 3375 {
3246 int end_row; 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3247 3377
3248 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3250
3251 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3252 { 3379 {
3253 end_col = screen.tlen[end_row + TermWin.saveLines]; 3380 if (!ROW(end_row).is_longer ())
3254
3255 if (end_col != -1)
3256 { 3381 {
3257 selection.end.row = end_row; 3382 selection.end.row = end_row;
3258 selection.end.col = end_col; 3383 selection.end.col = ROW(end_row).l;
3259 selection_remove_trailing_spaces (); 3384 selection_remove_trailing_spaces ();
3260 break; 3385 break;
3261 } 3386 }
3262 } 3387 }
3263 } 3388 }
3264 else 3389 else
3265#endif 3390#endif
3266 { 3391 {
3267 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3392 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3268 selection.mark.col++; 3393 selection.mark.col++;
3394
3269 selection.beg.col = 0; 3395 selection.beg.col = 0;
3270 selection.end.col = ncol; 3396 selection.end.col = ncol;
3397
3398 // select a complete logical line
3399 while (selection.beg.row > -saveLines
3400 && ROW(selection.beg.row - 1).is_longer ())
3401 selection.beg.row--;
3402
3403 while (selection.end.row < nrow
3404 && ROW(selection.end.row).is_longer ())
3405 selection.end.row++;
3271 } 3406 }
3272 } 3407 }
3273 3408
3274 if (button3 && buttonpress) 3409 if (button3 && buttonpress)
3275 { /* mark may need to be changed */ 3410 { /* mark may need to be changed */
3276 if (closeto == LEFT) 3411 if (closeto == LEFT)
3277 { 3412 {
3278 selection.mark.row = selection.end.row; 3413 selection.mark.row = selection.end.row;
3279 selection.mark.col = selection.end.col 3414 selection.mark.col = selection.end.col - (selection.clicks == 2);
3280 - (selection.clicks == 2);
3281 } 3415 }
3282 else 3416 else
3283 { 3417 {
3284 selection.mark.row = selection.beg.row; 3418 selection.mark.row = selection.beg.row;
3285 selection.mark.col = selection.beg.col; 3419 selection.mark.col = selection.beg.col;
3286 } 3420 }
3287 } 3421 }
3288 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3289}
3290 3422
3291#ifndef NO_FRILLS 3423#if ENABLE_FRILLS
3424 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col);
3426#endif
3427}
3428
3429#if ENABLE_FRILLS
3292void 3430void
3293rxvt_term::selection_remove_trailing_spaces () 3431rxvt_term::selection_remove_trailing_spaces ()
3294{ 3432{
3295 int32_t end_col, end_row; 3433 int32_t end_col, end_row;
3296 text_t *stp; 3434 text_t *stp;
3297 3435
3298 end_col = selection.end.col; 3436 end_col = selection.end.col;
3299 end_row = selection.end.row; 3437 end_row = selection.end.row;
3438
3300 for ( ; end_row >= selection.beg.row; ) 3439 for (; end_row >= selection.beg.row; )
3301 { 3440 {
3302 stp = screen.text[end_row + TermWin.saveLines]; 3441 stp = ROW(end_row).t;
3442
3303 while (--end_col >= 0) 3443 while (--end_col >= 0)
3304 { 3444 {
3305 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3445 if (stp[end_col] != NOCHAR
3446 && !unicode::is_space (stp[end_col]))
3306 break; 3447 break;
3307 } 3448 }
3449
3308 if (end_col >= 0 3450 if (end_col >= 0
3309 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3451 || !ROW(end_row - 1).is_longer ())
3310 { 3452 {
3311 selection.end.col = end_col + 1; 3453 selection.end.col = end_col + 1;
3312 selection.end.row = end_row; 3454 selection.end.row = end_row;
3313 break; 3455 break;
3314 } 3456 }
3457
3315 end_row--; 3458 end_row--;
3316 end_col = TermWin.ncol; 3459 end_col = ncol;
3317 } 3460 }
3461
3318 if (selection.mark.row > selection.end.row) 3462 if (selection.mark.row > selection.end.row)
3319 { 3463 {
3320 selection.mark.row = selection.end.row; 3464 selection.mark.row = selection.end.row;
3321 selection.mark.col = selection.end.col; 3465 selection.mark.col = selection.end.col;
3322 } 3466 }
… …
3338 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3339} 3483}
3340 3484
3341/* ------------------------------------------------------------------------- */ 3485/* ------------------------------------------------------------------------- */
3342/* 3486/*
3343 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3344 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3345 * the X11 protocol.
3346 */
3347typedef CARD32 Atom32;
3348
3349/* ------------------------------------------------------------------------- */
3350/*
3351 * Respond to a request for our current selection 3487 * Respond to a request for our current selection
3352 * EXT: SelectionRequest 3488 * EXT: SelectionRequest
3353 */ 3489 */
3354void 3490void
3355rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3491rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3356{ 3492{
3357 XSelectionEvent ev; 3493 XSelectionEvent ev;
3358 XTextProperty ct; 3494 dDisp;
3359 XICCEncodingStyle style;
3360 Atom target;
3361 3495
3362 ev.type = SelectionNotify; 3496 ev.type = SelectionNotify;
3363 ev.property = None; 3497 ev.property = None;
3364 ev.display = rq.display; 3498 ev.display = rq.display;
3365 ev.requestor = rq.requestor; 3499 ev.requestor = rq.requestor;
… …
3367 ev.target = rq.target; 3501 ev.target = rq.target;
3368 ev.time = rq.time; 3502 ev.time = rq.time;
3369 3503
3370 if (rq.target == xa[XA_TARGETS]) 3504 if (rq.target == xa[XA_TARGETS])
3371 { 3505 {
3372 Atom32 target_list[6]; 3506 Atom target_list[6];
3373 Atom32 *target = target_list; 3507 Atom *target = target_list;
3374 3508
3375 *target++ = (Atom32) xa[XA_TARGETS]; 3509 *target++ = xa[XA_TARGETS];
3376 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3510 *target++ = xa[XA_TIMESTAMP];
3377 *target++ = (Atom32) XA_STRING; 3511 *target++ = XA_STRING;
3378 *target++ = (Atom32) xa[XA_TEXT]; 3512 *target++ = xa[XA_TEXT];
3379 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3513 *target++ = xa[XA_COMPOUND_TEXT];
3380#if X_HAVE_UTF8_STRING 3514#if X_HAVE_UTF8_STRING
3381 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3515 *target++ = xa[XA_UTF8_STRING];
3382#endif 3516#endif
3383 3517
3384 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3385 (8 * sizeof (target_list[0])), PropModeReplace, 3519 32, PropModeReplace,
3386 (unsigned char *)target_list, 3520 (unsigned char *)target_list, target - target_list);
3387 target - target_list);
3388 ev.property = rq.property; 3521 ev.property = rq.property;
3389 } 3522 }
3523#if TODO // TODO
3390 else if (rq.target == xa[XA_MULTIPLE]) 3524 else if (rq.target == xa[XA_MULTIPLE])
3391 { 3525 {
3392 /* TODO: Handle MULTIPLE */ 3526 /* TODO: Handle MULTIPLE */
3393 } 3527 }
3528#endif
3394 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3395 { 3530 {
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3397 (8 * sizeof (Time)), PropModeReplace,
3398 (unsigned char *)&selection_time, 1); 3532 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3399 ev.property = rq.property; 3533 ev.property = rq.property;
3400 } 3534 }
3401 else if (rq.target == XA_STRING 3535 else if (rq.target == XA_STRING
3402 || rq.target == xa[XA_TEXT] 3536 || rq.target == xa[XA_TEXT]
3403 || rq.target == xa[XA_COMPOUND_TEXT] 3537 || rq.target == xa[XA_COMPOUND_TEXT]
3404 || rq.target == xa[XA_UTF8_STRING] 3538 || rq.target == xa[XA_UTF8_STRING]
3405 ) 3539 )
3406 { 3540 {
3541 XTextProperty ct;
3542 Atom target = rq.target;
3407 short freect = 0; 3543 short freect = 0;
3408 int selectlen; 3544 int selectlen;
3409 wchar_t *cl; 3545 wchar_t *cl;
3410 3546 enum {
3411 target = rq.target; 3547 enc_string = XStringStyle,
3548 enc_text = XStdICCTextStyle,
3549 enc_compound_text = XCompoundTextStyle,
3550#ifdef X_HAVE_UTF8_STRING
3551 enc_utf8 = XUTF8StringStyle,
3552#else
3553 enc_utf8 = -1,
3554#endif
3555 } style;
3412 3556
3413 if (target == XA_STRING) 3557 if (target == XA_STRING)
3414 // we actually don't do XA_STRING, but who cares, as i18n clients 3558 // we actually don't do XA_STRING, but who cares, as i18n clients
3415 // will ask for another format anyways. 3559 // will ask for another format anyways.
3416 style = XStringStyle; 3560 style = enc_string;
3417 else if (target == xa[XA_TEXT]) 3561 else if (target == xa[XA_TEXT])
3418 style = XStdICCTextStyle; 3562 style = enc_text;
3419 else if (target == xa[XA_COMPOUND_TEXT]) 3563 else if (target == xa[XA_COMPOUND_TEXT])
3420 style = XCompoundTextStyle; 3564 style = enc_compound_text;
3421#if X_HAVE_UTF8_STRING 3565#if ENABLE_FRILLS
3422 else if (target == xa[XA_UTF8_STRING]) 3566 else if (target == xa[XA_UTF8_STRING])
3423 style = XUTF8StringStyle; 3567 style = enc_utf8;
3424#endif 3568#endif
3425 else 3569 else
3426 { 3570 {
3427 target = xa[XA_COMPOUND_TEXT]; 3571 target = xa[XA_COMPOUND_TEXT];
3428 style = XCompoundTextStyle; 3572 style = enc_compound_text;
3429 } 3573 }
3430 3574
3431 if (selection.text) 3575 if (selection.text)
3432 { 3576 {
3433 cl = selection.text; 3577 cl = selection.text;
… …
3437 { 3581 {
3438 cl = L""; 3582 cl = L"";
3439 selectlen = 0; 3583 selectlen = 0;
3440 } 3584 }
3441 3585
3442 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3586#if ENABLE_FRILLS
3443 // manually for XUTF8StringStyle. 3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually
3589 if (style == enc_utf8)
3590 {
3591 freect = 1;
3592 ct.encoding = target;
3593 ct.format = 8;
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value);
3596 }
3597 else
3598#endif
3444 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3445 freect = 1; 3600 freect = 1;
3446 else 3601 else
3447 { 3602 {
3448 /* if we failed to convert then send it raw */ 3603 /* if we failed to convert then send it raw */
3449 ct.value = (unsigned char *)cl; 3604 ct.value = (unsigned char *)cl;
3450 ct.nitems = selectlen; 3605 ct.nitems = selectlen;
3606 ct.encoding = target;
3451 } 3607 }
3452 3608
3453 XChangeProperty (display->display, rq.requestor, rq.property, 3609 XChangeProperty (disp, rq.requestor, rq.property,
3454 target, 8, PropModeReplace, 3610 ct.encoding, 8, PropModeReplace,
3455 ct.value, (int)ct.nitems); 3611 ct.value, (int)ct.nitems);
3456 ev.property = rq.property; 3612 ev.property = rq.property;
3457 3613
3458 if (freect) 3614 if (freect)
3459 XFree (ct.value); 3615 XFree (ct.value);
3460 } 3616 }
3461 3617
3462 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3463} 3619}
3464 3620
3465/* ------------------------------------------------------------------------- * 3621/* ------------------------------------------------------------------------- *
3466 * MOUSE ROUTINES * 3622 * MOUSE ROUTINES *
3467 * ------------------------------------------------------------------------- */ 3623 * ------------------------------------------------------------------------- */
… …
3471 */ 3627 */
3472void 3628void
3473rxvt_term::pixel_position (int *x, int *y) 3629rxvt_term::pixel_position (int *x, int *y)
3474{ 3630{
3475 *x = Pixel2Col (*x); 3631 *x = Pixel2Col (*x);
3476 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3477 *y = Pixel2Row (*y); 3633 *y = Pixel2Row (*y);
3478 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3479} 3635}
3480 3636
3481/* ------------------------------------------------------------------------- */ 3637/* ------------------------------------------------------------------------- */
3482#ifdef USE_XIM 3638#ifdef USE_XIM
3483void 3639void
3484rxvt_term::im_set_position (XPoint *pos) 3640rxvt_term::im_set_position (XPoint &pos)
3485{ 3641{
3486 XWindowAttributes xwa; 3642 XWindowAttributes xwa;
3487 3643
3488 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3644 XGetWindowAttributes (display->display, vt, &xwa);
3645
3489 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3646 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3490 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3491} 3648}
3492
3493#endif 3649#endif
3494/* ------------------------------------------------------------------------- */ 3650
3495 3651#if ENABLE_OVERLAY
3652void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3654{
3655 if (nrow < 1 || ncol < 1)
3656 return;
3657
3658 want_refresh = 1;
3659
3660 scr_overlay_off ();
3661
3662 if (x < 0) x = ncol - w;
3663 if (y < 0) y = nrow - h;
3664
3665 // make space for border
3666 w += 2; min_it (w, ncol);
3667 h += 2; min_it (h, nrow);
3668
3669 x -= 1; clamp_it (x, 0, ncol - w);
3670 y -= 1; clamp_it (y, 0, nrow - h);
3671
3672 ov_x = x; ov_y = y;
3673 ov_w = w; ov_h = h;
3674
3675 ov_text = new text_t *[h];
3676 ov_rend = new rend_t *[h];
3677
3678 for (y = 0; y < h; y++)
3679 {
3680 text_t *tp = ov_text[y] = new text_t[w];
3681 rend_t *rp = ov_rend[y] = new rend_t[w];
3682
3683 text_t t0, t1, t2;
3684 rend_t r = OVERLAY_RSTYLE;
3685
3686 if (y == 0)
3687 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3688 else if (y < h - 1)
3689 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3690 else
3691 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3692
3693 *tp++ = t0;
3694 *rp++ = r;
3695
3696 for (x = w - 2; x > 0; --x)
3697 {
3698 *tp++ = t1;
3699 *rp++ = r;
3700 }
3701
3702 *tp = t2;
3703 *rp = r;
3704 }
3705}
3706
3707void
3708rxvt_term::scr_overlay_off ()
3709{
3710 if (!ov_text)
3711 return;
3712
3713 want_refresh = 1;
3714
3715 for (int y = 0; y < ov_h; y++)
3716 {
3717 delete [] ov_text[y];
3718 delete [] ov_rend[y];
3719 }
3720
3721 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0;
3723}
3724
3725void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3727{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return;
3730
3731 x++, y++;
3732
3733 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend;
3735}
3736
3737void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s)
3739{
3740 while (*s)
3741 scr_overlay_set (x++, y, *s++);
3742}
3743
3744void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3746{
3747 while (*s)
3748 {
3749 text_t t = *s++;
3750 int width = wcwidth (t);
3751
3752 while (width--)
3753 {
3754 scr_overlay_set (x++, y, t);
3755 t = NOCHAR;
3756 }
3757 }
3758}
3759
3760void
3761rxvt_term::scr_swap_overlay ()
3762{
3763 if (!ov_text)
3764 return;
3765
3766 // swap screen mem with overlay
3767 for (int y = ov_h; y--; )
3768 {
3769 text_t *t1 = ov_text[y];
3770 rend_t *r1 = ov_rend[y];
3771
3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3774
3775 for (int x = ov_w; x--; )
3776 {
3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3778 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3779 }
3780 }
3781}
3782
3783#endif
3496/* ------------------------------------------------------------------------- * 3784/* ------------------------------------------------------------------------- */
3497 * DEBUG ROUTINES *
3498 * ------------------------------------------------------------------------- */
3499#if 0
3500void
3501rxvt_debug_colors (void)
3502{
3503 int color;
3504 const char *name[] =
3505 {
3506 "fg", "bg",
3507 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3508 };
3509 3785
3510 fprintf (stderr, "Color ( ");
3511 if (rstyle & RS_RVid)
3512 fprintf (stderr, "rvid ");
3513 if (rstyle & RS_Bold)
3514 fprintf (stderr, "bold ");
3515 if (rstyle & RS_Blink)
3516 fprintf (stderr, "blink ");
3517 if (rstyle & RS_Uline)
3518 fprintf (stderr, "uline ");
3519 fprintf (stderr, "): ");
3520
3521 color = GET_FGCOLOR (rstyle);
3522#ifndef NO_BRIGHTCOLOR
3523 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3524 {
3525 color -= (minBrightCOLOR - minCOLOR);
3526 fprintf (stderr, "bright ");
3527 }
3528#endif
3529 fprintf (stderr, "%s on ", name[color]);
3530
3531 color = GET_BGCOLOR (rstyle);
3532#ifndef NO_BRIGHTCOLOR
3533 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3534 {
3535 color -= (minBrightCOLOR - minCOLOR);
3536 fprintf (stderr, "bright ");
3537 }
3538#endif
3539 fprintf (stderr, "%s\n", name[color]);
3540}
3541#endif

Diff Legend

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