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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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