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.209 by root, Thu Jan 5 01:04:10 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;
727
787 if ((nlines > 0) 728 if (nlines > 0
788 && (screen.tscroll == 0) 729 && screen.tscroll == 0
789 && (screen.bscroll == (TermWin.nrow - 1))) 730 && screen.bscroll == (nrow - 1))
790 { 731 {
791 /* _at least_ this many lines need to be scrolled */ 732 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
793 screen.cur.row -= nlines; 734 screen.cur.row -= nlines;
794 } 735 }
795 } 736 }
737
796#ifdef DEBUG_STRICT 738#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 739 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 740 assert (screen.cur.row < nrow
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 741 && 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 742#endif
805 row = screen.cur.row + TermWin.saveLines; 743 int row = screen.cur.row;
806 744
807 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 745 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
808 clearsel = 0;
809 746
810 stp = screen.text[row]; 747 line_t *line = &ROW(row);
811 srp = screen.rend[row];
812 748
813 while (len--) 749 while (str < strend)
814 { 750 {
815 c = *str++; 751 c = *str++;
816 752
817 if (c < 0x20) 753 if (c < 0x20)
818 switch (c) 754 if (c == C0_LF)
819 { 755 {
820 case C0_HT: 756 if (!line->is_longer ()) /* XXX: think about this */
821 scr_tab (1); 757 max_it (line->l, screen.cur.col);
822 continue;
823 758
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; 759 screen.flags &= ~Screen_WrapNext;
829 760
830 if (screen.cur.row == screen.bscroll) 761 if (screen.cur.row == screen.bscroll)
831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 762 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
832 else if (screen.cur.row < (TermWin.nrow - 1)) 763 else if (screen.cur.row < (nrow - 1))
833 row = (++screen.cur.row) + TermWin.saveLines; 764 row = ++screen.cur.row;
834 765
835 stp = screen.text[row]; /* _must_ refresh */ 766 line = &ROW(row); /* _must_ refresh */
836 srp = screen.rend[row]; /* _must_ refresh */
837 continue; 767 continue;
768 }
769 else if (c == C0_CR)
770 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col);
838 773
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; 774 screen.flags &= ~Screen_WrapNext;
844 screen.cur.col = 0; 775 screen.cur.col = 0;
845 continue; 776 continue;
777 }
778 else if (c == C0_HT)
779 {
780 scr_tab (1, true);
781 continue;
846 } 782 }
847 783
848 if (checksel /* see if we're writing within selection */ 784 if (checksel /* see if we're writing within selection */
849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 786 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
851 { 787 {
852 checksel = 0; 788 checksel = 0;
853 clearsel = 1; 789 /*
790 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check.
793 */
794 CLEAR_SELECTION ();
854 } 795 }
855 796
856 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
857 { 798 {
858 screen.tlen[row] = -1; 799 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 800
864 stp = screen.text[row]; /* _must_ refresh */ 801 scr_do_wrap ();
865 srp = screen.rend[row]; /* _must_ refresh */ 802
866 screen.cur.col = 0; 803 row = screen.cur.row;
867 screen.flags &= ~Screen_WrapNext; 804 line = &ROW(row); /* _must_ refresh */
805 }
806
807 // some utf-8 decoders "decode" surrogate characters: let's fix this.
808 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
809 c = 0xfffd;
810
811 // rely on wcwidth to tell us the character width, at least for non-latin1
812 // do wcwidth before further replacements, as wcwidth might return -1
813 // for the line drawing characters below as they might be invalid in the current
814 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c);
816
817 if (charsets[screen.charset] == '0') // DEC SPECIAL
818 {
819 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e
823 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
824 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
825 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
826 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
827 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
828 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
829 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
830 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
831 };
832
833 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
834 {
835 c = vt100_0[c - 0x41];
836 width = 1; // vt100 line drawing characters are always single-width
837 }
868 } 838 }
869 839
870 if (screen.flags & Screen_Insert) 840 if (screen.flags & Screen_Insert)
871 scr_insdel_chars (1, INSERT); 841 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 842
895 if (width != 0) 843 if (width != 0)
896 { 844 {
897#if !UNICODE_3 && ENABLE_COMBINING 845#if !UNICODE_3
898 // trim characters we can't store directly :( 846 // trim characters we can't store directly :(
899 if (c >= 0x10000) 847 if (c >= 0x10000)
848# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 849 c = rxvt_composite.compose (c); // map to lower 16 bits
850# else
851 c = 0xfffd;
901#endif 852# endif
853#endif
854
855 // nuke the character at this position, if required
856 if (line->t[screen.cur.col] == NOCHAR
857 || (screen.cur.col < ncol - 1
858 && line->t[screen.cur.col + 1] == NOCHAR))
859 {
860 int col = screen.cur.col;
861
862 // find begin
863 while (col > 0 && line->t[col] == NOCHAR)
864 col--;
865
866 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
867
868 // found begin, nuke
869 do {
870 line->t[col] = ' ';
871 line->r[col] = rend;
872 col++;
873 } while (col < ncol && line->t[col] == NOCHAR);
874 }
875
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877
878 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width)
880 {
881 // ...output spaces
882 c = ' ';
883 // and try the same character next loop iteration
884 --str;
885 }
903 886
904 do 887 do
905 { 888 {
906 stp[screen.cur.col] = c; 889 line->t[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 890 line->r[screen.cur.col] = rend;
908 891
909 if (screen.cur.col < last_col - 1) 892 if (screen.cur.col < last_col - 1)
910 screen.cur.col++; 893 screen.cur.col++;
911 else 894 else
912 { 895 {
913 screen.tlen[row] = last_col; 896 line->l = last_col;
914 if (screen.flags & Screen_Autowrap) 897 if (screen.flags & Screen_Autowrap)
915 screen.flags |= Screen_WrapNext; 898 screen.flags |= Screen_WrapNext;
916 break; 899 break;
917 } 900 }
918 901
919 c = NOCHAR; 902 c = NOCHAR;
920 } 903 }
921 while (--width > 0); 904 while (--width > 0);
922 905
923 // pad with spaces when overwriting wide character with smaller one 906 // pad with spaces when overwriting wide character with smaller one
907 if (!width)
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
925 { 909 {
926 stp[c] = ' '; 910 line->t[c] = ' ';
927 srp[c] = rend; 911 line->r[c] = rend;
928 } 912 }
929 } 913 }
930 else if (width == 0) 914 else // width == 0
931 { 915 {
932#if ENABLE_COMBINING 916#if ENABLE_COMBINING
933 // handle combining characters 917 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 918 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 919 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 920 // we don't handle double-width characters nicely yet.
937
938 text_t *tp; 921 text_t *tp;
939 rend_t *rp; 922 rend_t *rp;
940 923
941 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
942 { 925 {
943 tp = stp + screen.cur.col - 1; 926 tp = line->t + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1; 927 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
945 } 931 }
946 else if (screen.cur.row > 0 932 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 933 && ROW(screen.cur.row - 1).is_longer ())
948 { 934 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 935 line_t *line = &ROW(screen.cur.row - 1);
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 936
937 tp = line->t + last_col - 1;
938 rp = line->r + last_col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
951 } 942 }
952 else 943 else
953 continue; 944 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 945
959 // first try to find a precomposed character 946 // first try to find a precomposed character
960 unicode_t n = rxvt_compose (*tp, c); 947 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 948 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 949 n = rxvt_composite.compose (*tp, c);
963 950
964 *tp = n; 951 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
966#endif 953#endif
967 } 954 }
968 } 955 }
969 956
970 if (screen.tlen[row] != -1) /* XXX: think about this */ 957 if (!line->is_longer ()) /* XXX: think about this */
971 MAX_IT (screen.tlen[row], screen.cur.col); 958 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 959
981#ifdef DEBUG_STRICT 960#ifdef DEBUG_STRICT
982 assert (screen.cur.row >= 0); 961 assert (screen.cur.row >= 0);
983#else /* drive with your eyes closed */
984 MAX_IT (screen.cur.row, 0);
985#endif 962#endif
986} 963}
987 964
988/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
989/* 966/*
… …
998 if (screen.cur.col == 0) 975 if (screen.cur.col == 0)
999 { 976 {
1000 if (screen.cur.row > 0) 977 if (screen.cur.row > 0)
1001 { 978 {
1002#ifdef TERMCAP_HAS_BW 979#ifdef TERMCAP_HAS_BW
1003 screen.cur.col = TermWin.ncol - 1; 980 screen.cur.col = ncol - 1;
1004 screen.cur.row--; 981 screen.cur.row--;
1005 return; 982 return;
1006#endif 983#endif
1007
1008 } 984 }
1009 } 985 }
1010 else if ((screen.flags & Screen_WrapNext) == 0) 986 else if (!(screen.flags & Screen_WrapNext))
1011 scr_gotorc (0, -1, RELATIVE); 987 scr_gotorc (0, -1, RELATIVE);
1012 988
1013 screen.flags &= ~Screen_WrapNext; 989 screen.flags &= ~Screen_WrapNext;
1014} 990}
1015 991
… …
1018 * Process Horizontal Tab 994 * Process Horizontal Tab
1019 * count: +ve = forward; -ve = backwards 995 * count: +ve = forward; -ve = backwards
1020 * XTERM_SEQ: CTRL-I 996 * XTERM_SEQ: CTRL-I
1021 */ 997 */
1022void 998void
1023rxvt_term::scr_tab (int count) 999rxvt_term::scr_tab (int count, bool ht)
1024{ 1000{
1025 int i, x; 1001 int i, x;
1026 1002
1027 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1028 want_refresh = 1; 1003 want_refresh = 1;
1029 i = x = screen.cur.col; 1004 i = x = screen.cur.col;
1030 1005
1031 if (count == 0) 1006 if (count == 0)
1032 return; 1007 return;
1033 else if (count > 0) 1008 else if (count > 0)
1034 { 1009 {
1010 line_t &l = ROW(screen.cur.row);
1011 rend_t base_rend = l.r[i];
1012 ht &= l.t[i] == ' ';
1013
1035 for (; ++i < TermWin.ncol; ) 1014 for (; ++i < ncol; )
1036 if (tabs[i]) 1015 if (tabs[i])
1037 { 1016 {
1038 x = i; 1017 x = i;
1039 if (!--count) 1018 if (!--count)
1040 break; 1019 break;
1041 } 1020 }
1021 else
1022 ht &= l.t[i] == ' '
1023 && RS_SAME (l.r[i], base_rend);
1042 1024
1043 if (count) 1025 if (count)
1044 x = TermWin.ncol - 1; 1026 x = ncol - 1;
1027
1028 // store horizontal tab commands as characters inside the text
1029 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs))
1031 {
1032 base_rend = SET_FONT (base_rend, 0);
1033
1034 if (!l.is_longer ()) /* XXX: think about this */
1035 max_it (l.l, x);
1036
1037 i = screen.cur.col;
1038
1039 l.t[i] = '\t';
1040 l.r[i] = base_rend;
1041
1042 while (++i < x)
1043 {
1044 l.t[i] = NOCHAR;
1045 l.r[i] = base_rend;
1046 }
1047 }
1045 } 1048 }
1046 else /* if (count < 0) */ 1049 else /* if (count < 0) */
1047 { 1050 {
1048 for (; --i >= 0; ) 1051 for (; --i >= 0; )
1049 if (tabs[i]) 1052 if (tabs[i])
… …
1066 * Process DEC Back Index 1069 * Process DEC Back Index
1067 * XTERM_SEQ: ESC 6 1070 * XTERM_SEQ: ESC 6
1068 * Move cursor left in row. If we're at the left boundary, shift everything 1071 * Move cursor left in row. If we're at the left boundary, shift everything
1069 * in that row right. Clear left column. 1072 * in that row right. Clear left column.
1070 */ 1073 */
1071#ifndef NO_FRILLS 1074#if ENABLE_FRILLS
1072void 1075void
1073rxvt_term::scr_backindex () 1076rxvt_term::scr_backindex ()
1074{ 1077{
1075 if (screen.cur.col > 0) 1078 if (screen.cur.col > 0)
1076 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1079 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1077 else 1080 else
1078 {
1079 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1080 return; /* um, yeah? */
1081 scr_insdel_chars (1, INSERT); 1081 scr_insdel_chars (1, INSERT);
1082 }
1083} 1082}
1084#endif 1083#endif
1085/* ------------------------------------------------------------------------- */ 1084/* ------------------------------------------------------------------------- */
1086/* 1085/*
1087 * Process DEC Forward Index 1086 * Process DEC Forward Index
1088 * XTERM_SEQ: ESC 9 1087 * XTERM_SEQ: ESC 9
1089 * Move cursor right in row. If we're at the right boundary, shift everything 1088 * Move cursor right in row. If we're at the right boundary, shift everything
1090 * in that row left. Clear right column. 1089 * in that row left. Clear right column.
1091 */ 1090 */
1092#ifndef NO_FRILLS 1091#if ENABLE_FRILLS
1093void 1092void
1094rxvt_term::scr_forwardindex () 1093rxvt_term::scr_forwardindex ()
1095{ 1094{
1096 int row;
1097
1098 if (screen.cur.col < TermWin.ncol - 1) 1095 if (screen.cur.col < ncol - 1)
1099 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1100 else 1097 else
1101 { 1098 {
1102 row = screen.cur.row + TermWin.saveLines; 1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1103 if (screen.tlen[row] == 0) 1100 ROW(screen.cur.row).l = ncol;
1104 return; /* um, yeah? */ 1101
1105 else if (screen.tlen[row] == -1)
1106 screen.tlen[row] = TermWin.ncol;
1107 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1108 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1109 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1110 } 1105 }
1111} 1106}
1112#endif 1107#endif
1113 1108
1114/* ------------------------------------------------------------------------- */ 1109/* ------------------------------------------------------------------------- */
… …
1119rxvt_term::scr_gotorc (int row, int col, int relative) 1114rxvt_term::scr_gotorc (int row, int col, int relative)
1120{ 1115{
1121 want_refresh = 1; 1116 want_refresh = 1;
1122 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1123 1118
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; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1127 MAX_IT (screen.cur.col, 0); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1128 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1129 1121
1130 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1123
1131 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1132 { 1125 {
1133 if (row > 0) 1126 if (row > 0)
1134 { 1127 {
1135 if (screen.cur.row <= screen.bscroll 1128 if (screen.cur.row <= screen.bscroll
… …
1150 else 1143 else
1151 { 1144 {
1152 if (screen.flags & Screen_Relative) 1145 if (screen.flags & Screen_Relative)
1153 { /* relative origin mode */ 1146 { /* relative origin mode */
1154 screen.cur.row = row + screen.tscroll; 1147 screen.cur.row = row + screen.tscroll;
1155 MIN_IT (screen.cur.row, screen.bscroll); 1148 min_it (screen.cur.row, screen.bscroll);
1156 } 1149 }
1157 else 1150 else
1158 screen.cur.row = row; 1151 screen.cur.row = row;
1159 } 1152 }
1160 MAX_IT (screen.cur.row, 0);
1161 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1162 1153
1163 while (screen.cur.col > 0 1154 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} 1155}
1167 1156
1168/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1169/* 1158/*
1170 * direction should be UP or DN 1159 * direction should be UP or DN
1171 */ 1160 */
1172void 1161void
1173rxvt_term::scr_index (enum page_dirn direction) 1162rxvt_term::scr_index (enum page_dirn direction)
1174{ 1163{
1175 int dirn; 1164 int dirn;
1176 1165
1177 want_refresh = 1; 1166 want_refresh = 1;
1167 ZERO_SCROLLBACK ();
1168
1178 dirn = ((direction == UP) ? 1 : -1); 1169 dirn = ((direction == UP) ? 1 : -1);
1179 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1180
1181 ZERO_SCROLLBACK ();
1182 1170
1183 screen.flags &= ~Screen_WrapNext; 1171 screen.flags &= ~Screen_WrapNext;
1172
1184 if ((screen.cur.row == screen.bscroll && direction == UP) 1173 if ((screen.cur.row == screen.bscroll && direction == UP)
1185 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1186 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1187 else 1176 else
1188 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1189 MAX_IT (screen.cur.row, 0); 1178
1190 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1191 selection_check (0); 1180 selection_check (0);
1192} 1181}
1193 1182
1194/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1195/* 1184/*
… …
1199 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1200 */ 1189 */
1201void 1190void
1202rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1203{ 1192{
1204 unsigned int row, col, num; 1193 unsigned int col, num;
1205 1194
1206 want_refresh = 1; 1195 want_refresh = 1;
1207 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1209 1197
1210 selection_check (1); 1198 selection_check (1);
1211 1199
1212 screen.flags &= ~Screen_WrapNext; 1200 line_t &line = ROW(screen.cur.row);
1213 1201
1214 row = TermWin.saveLines + screen.cur.row;
1215 switch (mode) 1202 switch (mode)
1216 { 1203 {
1217 case 0: /* erase to end of line */ 1204 case 0: /* erase to end of line */
1218 col = screen.cur.col; 1205 col = screen.cur.col;
1219 num = TermWin.ncol - col; 1206 num = ncol - col;
1220 MIN_IT (screen.tlen[row], (int16_t)col); 1207 min_it (line.l, col);
1221 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1208 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1222 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1209 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1223 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1224 break; 1211 break;
1225 case 1: /* erase to beginning of line */ 1212 case 1: /* erase to beginning of line */
… …
1229 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1216 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1230 CLEAR_SELECTION (); 1217 CLEAR_SELECTION ();
1231 break; 1218 break;
1232 case 2: /* erase whole line */ 1219 case 2: /* erase whole line */
1233 col = 0; 1220 col = 0;
1234 num = TermWin.ncol; 1221 num = ncol;
1235 screen.tlen[row] = 0; 1222 line.l = 0;
1236 if (selection.beg.row <= screen.cur.row 1223 if (selection.beg.row <= screen.cur.row
1237 && selection.end.row >= screen.cur.row) 1224 && selection.end.row >= screen.cur.row)
1238 CLEAR_SELECTION (); 1225 CLEAR_SELECTION ();
1239 break; 1226 break;
1240 default: 1227 default:
1241 return; 1228 return;
1242 } 1229 }
1243 1230
1244 if (screen.text[row]) 1231 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} 1232}
1249 1233
1250/* ------------------------------------------------------------------------- */ 1234/* ------------------------------------------------------------------------- */
1251/* 1235/*
1252 * Erase part of whole of the screen 1236 * Erase part of whole of the screen
… …
1256 */ 1240 */
1257void 1241void
1258rxvt_term::scr_erase_screen (int mode) 1242rxvt_term::scr_erase_screen (int mode)
1259{ 1243{
1260 int num; 1244 int num;
1261 int32_t row, row_offset; 1245 int32_t row;
1262 rend_t ren; 1246 rend_t ren;
1263 XGCValues gcvalue; 1247 XGCValues gcvalue;
1264 1248
1265 want_refresh = 1; 1249 want_refresh = 1;
1266 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1267 ZERO_SCROLLBACK (); 1250 ZERO_SCROLLBACK ();
1268 row_offset = (int32_t)TermWin.saveLines;
1269 1251
1270 switch (mode) 1252 switch (mode)
1271 { 1253 {
1272 case 0: /* erase to end of screen */ 1254 case 0: /* erase to end of screen */
1273 selection_check (1); 1255 selection_check (1);
1274 scr_erase_line (0); 1256 scr_erase_line (0);
1275 row = screen.cur.row + 1; /* possible OOB */ 1257 row = screen.cur.row + 1; /* possible OOB */
1276 num = TermWin.nrow - row; 1258 num = nrow - row;
1277 break; 1259 break;
1278 case 1: /* erase to beginning of screen */ 1260 case 1: /* erase to beginning of screen */
1279 selection_check (3); 1261 selection_check (3);
1280 scr_erase_line (1); 1262 scr_erase_line (1);
1281 row = 0; 1263 row = 0;
1282 num = screen.cur.row; 1264 num = screen.cur.row;
1283 break; 1265 break;
1284 case 2: /* erase whole screen */ 1266 case 2: /* erase whole screen */
1285 selection_check (3); 1267 selection_check (3);
1286 row = 0; 1268 row = 0;
1287 num = TermWin.nrow; 1269 num = nrow;
1288 break; 1270 break;
1289 default: 1271 default:
1290 return; 1272 return;
1291 } 1273 }
1292
1293 refresh_type |= REFRESH_BOUNDS;
1294 1274
1295 if (selection.op && current_screen == selection.screen 1275 if (selection.op && current_screen == selection.screen
1296 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1276 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1297 || (selection.end.row >= row 1277 || (selection.end.row >= row
1298 && selection.end.row <= row + num))) 1278 && selection.end.row <= row + num)))
1299 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1300 1280
1301 if (row >= TermWin.nrow) /* Out Of Bounds */ 1281 if (row >= nrow) /* Out Of Bounds */
1302 return; 1282 return;
1303 1283
1304 MIN_IT (num, (TermWin.nrow - row)); 1284 min_it (num, nrow - row);
1305 1285
1306 if (rstyle & (RS_RVid | RS_Uline)) 1286 if (rstyle & (RS_RVid | RS_Uline))
1307 ren = (rend_t) ~RS_None; 1287 ren = (rend_t) ~RS_None;
1308 else if (GET_BASEBG (rstyle) == Color_bg) 1288 else if (GET_BASEBG (rstyle) == Color_bg)
1309 { 1289 {
1310 ren = DEFAULT_RSTYLE; 1290 ren = DEFAULT_RSTYLE;
1311 CLEAR_ROWS (row, num); 1291 CLEAR_ROWS (row, num);
1312 } 1292 }
1313 else 1293 else
1314 { 1294 {
1315 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1295 ren = rstyle & (RS_fgMask | RS_bgMask);
1316 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1296 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1297 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1318 ERASE_ROWS (row, num); 1298 ERASE_ROWS (row, num);
1319 gcvalue.foreground = PixColors[Color_fg]; 1299 gcvalue.foreground = pix_colors[Color_fg];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1321 } 1301 }
1322 1302
1323 for (; num--; row++) 1303 for (; num--; row++)
1324 { 1304 {
1325 scr_blank_screen_mem (screen.text, screen.rend, 1305 ROW (row).l = 0;
1326 (unsigned int) (row + row_offset), rstyle); 1306 scr_blank_screen_mem (ROW (row), rstyle);
1327 screen.tlen[row + row_offset] = 0; 1307 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 } 1308 }
1331} 1309}
1310
1311#if ENABLE_FRILLS
1312void
1313rxvt_term::scr_erase_savelines ()
1314{
1315 want_refresh = 1;
1316 ZERO_SCROLLBACK ();
1317
1318 nsaved = 0;
1319}
1320#endif
1332 1321
1333/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1334/* 1323/*
1335 * Fill the screen with `E's 1324 * Fill the screen with `E's
1336 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1325 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1337 */ 1326 */
1338void 1327void
1339rxvt_term::scr_E () 1328rxvt_term::scr_E ()
1340{ 1329{
1341 int i, j, k; 1330 rend_t fs;
1342 rend_t *r1, fs;
1343 1331
1344 want_refresh = 1; 1332 want_refresh = 1;
1333 ZERO_SCROLLBACK ();
1334
1345 num_scr_allow = 0; 1335 num_scr_allow = 0;
1346 ZERO_SCROLLBACK ();
1347 selection_check (3); 1336 selection_check (3);
1348 1337
1349 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1338 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1350 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1339 for (int row = nrow; row--; )
1351 { 1340 {
1352 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1341 line_t &line = ROW(row);
1342
1353 fill_text (screen.text[k], 'E', TermWin.ncol); 1343 fill_text (line.t, 'E', ncol);
1354 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1344 rend_t *r1 = line.r;
1345
1346 for (int j = ncol; j--; )
1355 *r1++ = fs; 1347 *r1++ = fs;
1348
1349 line.l = ncol; /* make the `E's selectable */
1356 } 1350 }
1357} 1351}
1358 1352
1359/* ------------------------------------------------------------------------- */ 1353/* ------------------------------------------------------------------------- */
1360/* 1354/*
… …
1378 if (insdel == DELETE) 1372 if (insdel == DELETE)
1379 return; 1373 return;
1380 else if (insdel == INSERT) 1374 else if (insdel == INSERT)
1381 count = end; 1375 count = end;
1382 } 1376 }
1383 screen.flags &= ~Screen_WrapNext;
1384 1377
1378 scr_do_wrap ();
1379
1385 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1380 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1386} 1381}
1387 1382
1388/* ------------------------------------------------------------------------- */ 1383/* ------------------------------------------------------------------------- */
1389/* 1384/*
1390 * Insert/Delete <count> characters from the current position 1385 * Insert/Delete <count> characters from the current position
… …
1392void 1387void
1393rxvt_term::scr_insdel_chars (int count, int insdel) 1388rxvt_term::scr_insdel_chars (int count, int insdel)
1394{ 1389{
1395 int col, row; 1390 int col, row;
1396 rend_t tr; 1391 rend_t tr;
1397 text_t *stp;
1398 rend_t *srp;
1399 int16_t *slp;
1400 1392
1401 want_refresh = 1; 1393 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1394 ZERO_SCROLLBACK ();
1403 1395
1404 if (count <= 0) 1396 if (count <= 0)
1405 return; 1397 return;
1406 1398
1399 scr_do_wrap ();
1400
1407 selection_check (1); 1401 selection_check (1);
1408 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1402 min_it (count, ncol - screen.cur.col);
1409 1403
1410 row = screen.cur.row + TermWin.saveLines;
1411 screen.flags &= ~Screen_WrapNext;
1412
1413 stp = screen.text[row];
1414 srp = screen.rend[row]; 1404 row = screen.cur.row;
1415 slp = & (screen.tlen[row]); 1405
1406 line_t *line = &ROW(row);
1416 1407
1417 switch (insdel) 1408 switch (insdel)
1418 { 1409 {
1419 case INSERT: 1410 case INSERT:
1420 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1421 col--)
1422 { 1412 {
1423 stp[col] = stp[col - count]; 1413 line->t[col] = line->t[col - count];
1424 srp[col] = srp[col - count]; 1414 line->r[col] = line->r[col - count];
1425 } 1415 }
1426 1416
1427 if (*slp != -1) 1417 if (!line->is_longer ())
1428 { 1418 {
1429 *slp += count; 1419 line->l += count;
1430 MIN_IT (*slp, TermWin.ncol); 1420 min_it (line->l, ncol);
1431 } 1421 }
1432 1422
1433 if (selection.op && current_screen == selection.screen 1423 if (selection.op && current_screen == selection.screen
1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1435 { 1425 {
1436 if (selection.end.row != screen.cur.row 1426 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= TermWin.ncol)) 1427 || (selection.end.col + count >= ncol))
1438 CLEAR_SELECTION (); 1428 CLEAR_SELECTION ();
1439 else 1429 else
1440 { /* shift selection */ 1430 { /* shift selection */
1441 selection.beg.col += count; 1431 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1432 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1433 selection.end.col += count;
1444 } 1434 }
1445 } 1435 }
1446 1436
1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1437 scr_blank_line (*line, screen.cur.col, count, rstyle);
1448 (unsigned int)count, rstyle);
1449 break; 1438 break;
1450 1439
1451 case ERASE: 1440 case ERASE:
1452 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1441 screen.cur.col += count; /* don't worry if > ncol */
1453 selection_check (1); 1442 selection_check (1);
1454 screen.cur.col -= count; 1443 screen.cur.col -= count;
1455 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1444 scr_blank_line (*line, screen.cur.col, count, rstyle);
1456 (unsigned int)count, rstyle);
1457 break; 1445 break;
1458 1446
1459 case DELETE: 1447 case DELETE:
1460 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1461 1449
1462 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1450 for (col = screen.cur.col; (col + count) < ncol; col++)
1463 { 1451 {
1464 stp[col] = stp[col + count]; 1452 line->t[col] = line->t[col + count];
1465 srp[col] = srp[col + count]; 1453 line->r[col] = line->r[col + count];
1466 } 1454 }
1467 1455
1468 scr_blank_line (& (stp[TermWin.ncol - count]), 1456 scr_blank_line (*line, ncol - count, count, tr);
1469 & (srp[TermWin.ncol - count]),
1470 (unsigned int)count, tr);
1471 1457
1472 if (*slp == -1) /* break line continuation */ 1458 if (line->is_longer ()) /* break line continuation */
1473 *slp = TermWin.ncol; 1459 line->l = ncol;
1474 1460
1475 *slp -= count; 1461 line->l = max (line->l - count, 0);
1476 MAX_IT (*slp, 0);
1477 1462
1478 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1479 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1480 { 1465 {
1481 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
1482 || (screen.cur.col >= selection.beg.col - count) 1467 || (screen.cur.col >= selection.beg.col - count)
1483 || selection.end.col >= TermWin.ncol) 1468 || selection.end.col >= ncol)
1484 CLEAR_SELECTION (); 1469 CLEAR_SELECTION ();
1485 else 1470 else
1486 { 1471 {
1487 /* shift selection */ 1472 /* shift selection */
1488 selection.beg.col -= count; 1473 selection.beg.col -= count;
1489 selection.mark.col -= count; /* XXX: yes? */ 1474 selection.mark.col -= count; /* XXX: yes? */
1490 selection.end.col -= count; 1475 selection.end.col -= count;
1491 } 1476 }
1492 } 1477 }
1493 1478
1494 break; 1479 break;
1495 } 1480 }
… …
1501 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1502 */ 1487 */
1503void 1488void
1504rxvt_term::scr_scroll_region (int top, int bot) 1489rxvt_term::scr_scroll_region (int top, int bot)
1505{ 1490{
1506 MAX_IT (top, 0); 1491 max_it (top, 0);
1507 MIN_IT (bot, (int)TermWin.nrow - 1); 1492 min_it (bot, nrow - 1);
1508 1493
1509 if (top > bot) 1494 if (top > bot)
1510 return; 1495 return;
1511 1496
1512 screen.tscroll = top; 1497 screen.tscroll = top;
… …
1541rxvt_term::scr_autowrap (int mode) 1526rxvt_term::scr_autowrap (int mode)
1542{ 1527{
1543 if (mode) 1528 if (mode)
1544 screen.flags |= Screen_Autowrap; 1529 screen.flags |= Screen_Autowrap;
1545 else 1530 else
1546 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1547} 1532}
1548 1533
1549/* ------------------------------------------------------------------------- */ 1534/* ------------------------------------------------------------------------- */
1550/* 1535/*
1551 * Set/unset margin origin mode 1536 * Set/unset margin origin mode
… …
1561{ 1546{
1562 if (mode) 1547 if (mode)
1563 screen.flags |= Screen_Relative; 1548 screen.flags |= Screen_Relative;
1564 else 1549 else
1565 screen.flags &= ~Screen_Relative; 1550 screen.flags &= ~Screen_Relative;
1551
1566 scr_gotorc (0, 0, 0); 1552 scr_gotorc (0, 0, 0);
1567} 1553}
1568 1554
1569/* ------------------------------------------------------------------------- */ 1555/* ------------------------------------------------------------------------- */
1570/* 1556/*
… …
1590 */ 1576 */
1591void 1577void
1592rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1593{ 1579{
1594 if (mode < 0) 1580 if (mode < 0)
1595 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1596 else if (screen.cur.col < TermWin.ncol) 1582 else if (screen.cur.col < ncol)
1597 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs[screen.cur.col] = (mode ? 1 : 0);
1598} 1584}
1599 1585
1600/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1601/* 1587/*
… …
1604 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1605 */ 1591 */
1606void 1592void
1607rxvt_term::scr_rvideo_mode (int mode) 1593rxvt_term::scr_rvideo_mode (int mode)
1608{ 1594{
1609 XGCValues gcvalue; 1595 XGCValues gcvalue;
1610 1596
1611 if (rvideo != mode) 1597 if (rvideo != mode)
1612 { 1598 {
1613 rvideo = mode; 1599 rvideo = mode;
1614 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1615#if defined(XPM_BACKGROUND) 1601#if XPM_BACKGROUND
1616 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1617#endif 1603#endif
1618#if defined(TRANSPARENT) 1604#if TRANSPARENT
1619 if (! (Options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1620#endif 1606#endif
1621 XSetWindowBackground (display->display, TermWin.vt, 1607 XSetWindowBackground (display->display, vt,
1622 PixColors[Color_bg]); 1608 pix_colors[Color_bg]);
1623 1609
1624 gcvalue.foreground = PixColors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
1625 gcvalue.background = PixColors[Color_bg]; 1611 gcvalue.background = pix_colors[Color_bg];
1626 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1612 XChangeGC (display->display, gc, GCBackground | GCForeground,
1627 &gcvalue); 1613 &gcvalue);
1628 scr_clear (); 1614 scr_clear ();
1629 scr_touch (true); 1615 scr_touch (true);
1630 } 1616 }
1631} 1617}
… …
1678 * XTERM_SEQ: Invoke G2 character set: ESC N 1664 * XTERM_SEQ: Invoke G2 character set: ESC N
1679 * XTERM_SEQ: Invoke G3 character set: ESC O 1665 * XTERM_SEQ: Invoke G3 character set: ESC O
1680 */ 1666 */
1681void 1667void
1682rxvt_term::scr_charset_choose (int set) 1668rxvt_term::scr_charset_choose (int set)
1683 { 1669{
1684 screen.charset = set; 1670 screen.charset = set;
1685 set_font_style (); 1671 set_font_style ();
1686 } 1672}
1687 1673
1688/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
1689/* 1675/*
1690 * Set a font 1676 * Set a font
1691 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1677 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1694 * XTERM_SEQ: Set G3 character set: ESC + <C> 1680 * XTERM_SEQ: Set G3 character set: ESC + <C>
1695 * See set_font_style for possible values for <C> 1681 * See set_font_style for possible values for <C>
1696 */ 1682 */
1697void 1683void
1698rxvt_term::scr_charset_set (int set, unsigned int ch) 1684rxvt_term::scr_charset_set (int set, unsigned int ch)
1699 { 1685{
1700 charsets[set] = (unsigned char)ch; 1686 charsets[set] = (unsigned char)ch;
1701 set_font_style (); 1687 set_font_style ();
1702 } 1688}
1703 1689
1704 1690
1705/* ------------------------------------------------------------------------- * 1691/* ------------------------------------------------------------------------- *
1706 * MAJOR SCREEN MANIPULATION * 1692 * MAJOR SCREEN MANIPULATION *
1707 * ------------------------------------------------------------------------- */ 1693 * ------------------------------------------------------------------------- */
… …
1712bool 1698bool
1713rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1699rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1714{ 1700{
1715 bool found = false; 1701 bool found = false;
1716 1702
1717 for (int i = 0; i < TermWin.nrow; i++) 1703 for (int i = 0; i < nrow; i++)
1718 { 1704 {
1719 int col = 0; 1705 int col = 0;
1720 rend_t *drp = drawn_rend [i]; 1706 rend_t *drp = drawn_buf[i].r;
1721 1707
1722 for (; col < TermWin.ncol; col++, drp++) 1708 for (; col < ncol; col++, drp++)
1723 if ((*drp & mask) == value) 1709 if ((*drp & mask) == value)
1724 { 1710 {
1725 found = true; 1711 found = true;
1726 *drp = ~value; 1712 *drp = ~value;
1727 } 1713 }
… …
1738 PART_END, 1724 PART_END,
1739 RC_COUNT 1725 RC_COUNT
1740}; 1726};
1741 1727
1742void 1728void
1743rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1729rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1744{ 1730{
1745 int i; 1731 int i;
1746 row_col_t rc[RC_COUNT]; 1732 row_col_t rc[RC_COUNT];
1747 1733
1748 if (drawn_text == NULL) /* sanity check */ 1734 if (!drawn_buf) /* sanity check */
1749 return; 1735 return;
1750 1736
1751#ifdef DEBUG_STRICT 1737#ifndef NO_SLOW_LINK_SUPPORT
1752 x = max (x, (int)TermWin.int_bwidth); 1738 if (refresh_type == FAST_REFRESH && !display->is_local)
1753 x = min (x, (int)TermWin.width); 1739 {
1754 y = max (y, (int)TermWin.int_bwidth); 1740 y = 0;
1755 y = min (y, (int)TermWin.height); 1741 eheight = height;
1742 }
1756#endif 1743#endif
1757 1744
1758 /* round down */ 1745 /* round down */
1759 rc[PART_BEG].col = Pixel2Col (x); 1746 rc[PART_BEG].col = Pixel2Col (x);
1760 rc[PART_BEG].row = Pixel2Row (y); 1747 rc[PART_BEG].row = Pixel2Row (y);
1761 /* round up */ 1748 /* round up */
1762 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1749 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1763 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1750 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1764 1751
1765 /* sanity checks */ 1752 /* sanity checks */
1766 for (i = PART_BEG; i < RC_COUNT; i++) 1753 for (i = PART_BEG; i < RC_COUNT; i++)
1767 { 1754 {
1768 MIN_IT (rc[i].col, TermWin.ncol - 1); 1755 min_it (rc[i].col, ncol - 1);
1769 MIN_IT (rc[i].row, TermWin.nrow - 1); 1756 min_it (rc[i].row, nrow - 1);
1770 } 1757 }
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 1758
1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1759 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); 1760 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1776 1761
1777 if (refresh) 1762 if (refresh)
1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1763 scr_refresh (SLOW_REFRESH);
1779} 1764}
1780 1765
1781/* ------------------------------------------------------------------------- */ 1766/* ------------------------------------------------------------------------- */
1782/* 1767/*
1783 * Refresh the entire screen 1768 * Refresh the entire screen
1784 */ 1769 */
1785void 1770void
1786rxvt_term::scr_touch (bool refresh) 1771rxvt_term::scr_touch (bool refresh)
1787{ 1772{
1788 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1773 scr_expose (0, 0, width, height, refresh);
1789} 1774}
1790 1775
1791/* ------------------------------------------------------------------------- */ 1776/* ------------------------------------------------------------------------- */
1792/* 1777/*
1793 * Move the display so that the line represented by scrollbar value Y is at 1778 * Move the display so that the line represented by scrollbar value Y is at
… …
1795 */ 1780 */
1796int 1781int
1797rxvt_term::scr_move_to (int y, int len) 1782rxvt_term::scr_move_to (int y, int len)
1798{ 1783{
1799 long p = 0; 1784 long p = 0;
1800 uint16_t oldviewstart; 1785 unsigned int oldviewstart;
1801 1786
1802 oldviewstart = TermWin.view_start; 1787 oldviewstart = view_start;
1788
1803 if (y < len) 1789 if (y < len)
1804 { 1790 {
1805 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1791 p = (nrow + nsaved) * (len - y) / len;
1806 p -= (long) (TermWin.nrow - 1); 1792 p -= (long) (nrow - 1);
1807 p = max (p, 0); 1793 p = max (p, 0);
1808 } 1794 }
1809 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1795
1810 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); 1796 view_start = (unsigned int)min (p, nsaved);
1811 1797
1812 return scr_changeview (oldviewstart); 1798 return scr_changeview (oldviewstart);
1813} 1799}
1814 1800
1815/* ------------------------------------------------------------------------- */ 1801/* ------------------------------------------------------------------------- */
… …
1818 * direction should be UP or DN 1804 * direction should be UP or DN
1819 */ 1805 */
1820int 1806int
1821rxvt_term::scr_page (enum page_dirn direction, int nlines) 1807rxvt_term::scr_page (enum page_dirn direction, int nlines)
1822{ 1808{
1823 int n; 1809 int n;
1824 uint16_t oldviewstart; 1810 unsigned int oldviewstart;
1825 1811
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; 1812 oldviewstart = view_start;
1813
1831 if (direction == UP) 1814 if (direction == UP)
1832 { 1815 {
1833 n = TermWin.view_start + nlines; 1816 n = view_start + nlines;
1834 TermWin.view_start = min (n, TermWin.nscrolled); 1817 view_start = min (n, nsaved);
1835 } 1818 }
1836 else 1819 else
1837 { 1820 {
1838 n = TermWin.view_start - nlines; 1821 n = view_start - nlines;
1839 TermWin.view_start = max (n, 0); 1822 view_start = max (n, 0);
1840 } 1823 }
1824
1841 return scr_changeview (oldviewstart); 1825 return scr_changeview (oldviewstart);
1842} 1826}
1843 1827
1844int 1828int
1845rxvt_term::scr_changeview (uint16_t oldviewstart) 1829rxvt_term::scr_changeview (unsigned int oldviewstart)
1846{ 1830{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1847 if (TermWin.view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1848 { 1834 {
1849 want_refresh = 1; 1835 want_refresh = 1;
1850 num_scr -= (TermWin.view_start - oldviewstart); 1836 num_scr -= (view_start - oldviewstart);
1851 } 1837 }
1852 1838
1853 return (int) (TermWin.view_start - oldviewstart); 1839 return (int) (view_start - oldviewstart);
1854} 1840}
1855 1841
1856/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1857void 1843void
1858rxvt_term::scr_bell () 1844rxvt_term::scr_bell ()
1859{ 1845{
1860#ifndef NO_BELL 1846#ifndef NO_BELL
1847
1861# ifndef NO_MAPALERT 1848# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1849# ifdef MAPALERT_OPTION
1863 if (Options & Opt_mapAlert) 1850 if (OPTION (Opt_mapAlert))
1864# endif 1851# endif
1865 XMapWindow (display->display, TermWin.parent[0]); 1852 XMapWindow (display->display, parent[0]);
1866# endif 1853# endif
1867 if (Options & Opt_visualBell) 1854
1855 if (OPTION (Opt_visualBell))
1868 { 1856 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1857 scr_rvideo_mode (!rvideo); /* refresh also done */
1858 rxvt_usleep (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1860 }
1872 else 1861 else
1873 XBell (display->display, 0); 1862 XBell (display->display, 0);
1863
1874#endif 1864#endif
1875} 1865}
1876 1866
1877/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1868/* ARGSUSED */
1879void 1869void
1880rxvt_term::scr_printscreen (int fullhist) 1870rxvt_term::scr_printscreen (int fullhist)
1881{ 1871{
1882#ifdef PRINTPIPE 1872#ifdef PRINTPIPE
1883 int i, r1, nrows, row_offset; 1873 int nrows, row_start;
1884 text_t *t; 1874 FILE *fd;
1885 FILE *fd;
1886 1875
1887 if ((fd = popen_printer ()) == NULL) 1876 if ((fd = popen_printer ()) == NULL)
1888 return; 1877 return;
1889 nrows = TermWin.nrow; 1878
1890 row_offset = TermWin.saveLines;
1891 if (!fullhist) 1879 if (fullhist)
1892 row_offset -= TermWin.view_start; 1880 {
1881 nrows = nrow + nsaved;
1882 row_start = -nsaved;
1883 }
1893 else 1884 else
1894 { 1885 {
1895 nrows += TermWin.nscrolled; 1886 nrows = nrow;
1896 row_offset -= TermWin.nscrolled; 1887 row_start = -view_start;
1897 } 1888 }
1898 1889
1890 wctomb (0, 0);
1891
1899 for (r1 = 0; r1 < nrows; r1++) 1892 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 } 1893 {
1894 text_t *tp = ROW(r1).t;
1895 int len = ROW(r1).l;
1896
1897 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1898 {
1899 char mb[MB_LEN_MAX];
1900 text_t t = *tp++;
1901 if (t == NOCHAR)
1902 continue;
1903
1904 len = wctomb (mb, t);
1905
1906 if (len <= 0)
1907 {
1908 mb[0] = ' ';
1909 len = 1;
1910 }
1911
1912 fwrite (mb, 1, len, fd);
1913 }
1914
1915 fputc ('\n', fd);
1916 }
1917
1907 pclose_printer (fd); 1918 pclose_printer (fd);
1908#endif 1919#endif
1909} 1920}
1910 1921
1911/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1912/* 1923/*
1913 * Refresh the screen 1924 * Refresh the screen
1914 * drawn_text/drawn_rend contain the screen information before the update. 1925 * drawn_text/drawn_rend contain the screen information before the update.
1915 * screen.text/screen.rend contain what the screen will change to. 1926 * screen.text/screen.rend contain what the screen will change to.
1916 */ 1927 */
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 1928void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1929rxvt_term::scr_refresh (unsigned char refresh_type)
1929{ 1930{
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 */ 1931 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 1932 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1933 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1934 ocrow; /* old cursor row */
1937 int i, /* tmp */ 1935 int i; /* tmp */
1938 row_offset; /* basic offset in screen structure */
1939#ifndef NO_CURSORCOLOR 1936#ifndef NO_CURSORCOLOR
1940 rend_t cc1; /* store colours at cursor position (s) */ 1937 rend_t cc1; /* store colours at cursor position (s) */
1941#endif 1938#endif
1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1939 rend_t *crp; // cursor rendition pointer
1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1944 1940
1941 want_refresh = 0; /* screen is current */
1942
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1943 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 1944 return;
1947 1945
1948 /* 1946 /*
1949 * A: set up vars 1947 * A: set up vars
1950 */ 1948 */
1951 clearfirst = clearlast = must_clear = 0; 1949 must_clear = 0;
1952
1953 refresh_count = 0; 1950 refresh_count = 0;
1954 1951
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 1952#if XPM_BACKGROUND
1964 must_clear |= (bgPixmap.pixmap != None); 1953 must_clear |= bgPixmap.pixmap != None;
1965#endif 1954#endif
1966#ifdef TRANSPARENT 1955#if TRANSPARENT
1967 must_clear |= ((Options & Opt_transparent) && am_transparent); 1956 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 1957#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1958 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 1959
1971 /* 1960 /*
1972 * B: reverse any characters which are selected 1961 * B: reverse any characters which are selected
… …
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 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2054#if ENABLE_OVERLAY
2055 scr_swap_overlay ();
2056#endif
2052 2057
2053#ifndef NO_SLOW_LINK_SUPPORT 2058#ifndef NO_SLOW_LINK_SUPPORT
2054 /* 2059 /*
2055 * D: CopyArea pass - very useful for slower links 2060 * D: CopyArea pass - very useful for slower links
2056 * This has been deliberately kept simple. 2061 * This has been deliberately kept simple.
2057 */ 2062 */
2058 i = num_scr; 2063 i = num_scr;
2064 if (!display->is_local
2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2065 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2060 && abs (i) < TermWin.nrow && !must_clear) 2066 && abs (num_scr) < nrow && !must_clear)
2061 { 2067 {
2062 int16_t nits; 2068 int16_t nits;
2063 int j; 2069 int j;
2064 rend_t *drp2;
2065 text_t *dtp2;
2066 int len, wlen; 2070 int len, wlen;
2067 2071
2068 j = TermWin.nrow; 2072 j = nrow;
2069 wlen = len = -1; 2073 wlen = len = -1;
2070 row = i > 0 ? 0 : j - 1; 2074 row = i > 0 ? 0 : j - 1;
2071 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2072 { 2076 {
2073 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2074 { 2078 {
2075 stp = screen.text[row + row_offset]; 2079 line_t s = ROW(row - view_start);
2076 srp = screen.rend[row + row_offset];
2077 dtp = drawn_text[row]; 2080 line_t d = drawn_buf[row];
2078 dtp2 = drawn_text[row + i]; 2081 line_t d2 = drawn_buf[row + i];
2079 drp = drawn_rend[row];
2080 drp2 = drawn_rend[row + i];
2081 2082
2082 for (nits = 0, col = TermWin.ncol; col--; ) 2083 for (nits = 0, col = ncol; col--; )
2083 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2084 nits--; 2085 nits--;
2085 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2086 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2086 nits++; 2087 nits++;
2087 2088
2088 if (nits > 8) /* XXX: arbitrary choice */ 2089 if (nits > 8) /* XXX: arbitrary choice */
2089 { 2090 {
2090 for (col = TermWin.ncol; col--; ) 2091 for (col = ncol; col--; )
2091 { 2092 {
2092 *dtp++ = *dtp2++; 2093 *d.t++ = *d2.t++;
2093 *drp++ = *drp2++; 2094 *d.r++ = *d2.r++;
2094 } 2095 }
2095 2096
2096 if (len == -1) 2097 if (len == -1)
2097 len = row; 2098 len = row;
2098 2099
… …
2103 2104
2104 if (len != -1) 2105 if (len != -1)
2105 { 2106 {
2106 /* also comes here at end if needed because of >= above */ 2107 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2108 if (wlen < len)
2108 SWAP_IT (wlen, len, int); 2109 ::swap (wlen, len);
2109 2110
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, 2111 XCopyArea (display->display, vt, vt,
2112 TermWin.gc, 0, Row2Pixel (len + i), 2112 gc, 0, Row2Pixel (len + i),
2113 (unsigned int)TermWin_TotalWidth (), 2113 (unsigned int)this->width,
2114 (unsigned int)Height2Pixel (wlen - len + 1), 2114 (unsigned int)Height2Pixel (wlen - len + 1),
2115 0, Row2Pixel (len)); 2115 0, Row2Pixel (len));
2116 len = -1; 2116 len = -1;
2117 } 2117 }
2118 } 2118 }
… …
2120#endif 2120#endif
2121 2121
2122 /* 2122 /*
2123 * E: main pass across every character 2123 * E: main pass across every character
2124 */ 2124 */
2125 for (row = 0; row < TermWin.nrow; row++) 2125 for (row = 0; row < nrow; row++)
2126 { 2126 {
2127 stp = screen.text[row + row_offset]; 2127 text_t *stp = ROW(row - view_start).t;
2128 srp = screen.rend[row + row_offset]; 2128 rend_t *srp = ROW(row - view_start).r;
2129 dtp = drawn_text[row]; 2129 text_t *dtp = drawn_buf[row].t;
2130 drp = drawn_rend[row]; 2130 rend_t *drp = drawn_buf[row].r;
2131 2131
2132 /* 2132 /*
2133 * E2: OK, now the real pass 2133 * E2: OK, now the real pass
2134 */ 2134 */
2135 int ypixel = (int)Row2Pixel (row); 2135 int ypixel = (int)Row2Pixel (row);
2136 2136
2137 for (col = 0; col < TermWin.ncol; col++) 2137 for (col = 0; col < ncol; col++)
2138 { 2138 {
2139 /* compare new text with old - if exactly the same then continue */ 2139 /* compare new text with old - if exactly the same then continue */
2140 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2140 if (stp[col] == dtp[col] /* Must match characters to skip. */
2141 && (srp[col] == drp[col] /* Either rendition the same or */ 2141 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2142 || (stp[col] == ' ' /* space w/ no background change */ 2142 || (stp[col] == ' ' /* space w/ no background change */
2143 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2143 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2144 continue; 2144 continue;
2145 2145
2146 // redraw one or more characters 2146 // redraw one or more characters
2147 2147
2148 // seek to the beginning if wide characters 2148 // seek to the beginning of wide characters
2149 while (stp[col] == NOCHAR && col > 0) 2149 while (stp[col] == NOCHAR && col > 0)
2150 --col; 2150 --col;
2151 2151
2152 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2152 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2153 text_t *text = stp + col; 2153 text_t *text = stp + col;
… …
2156 dtp[col] = stp[col]; 2156 dtp[col] = stp[col];
2157 drp[col] = rend; 2157 drp[col] = rend;
2158 2158
2159 int xpixel = Col2Pixel (col); 2159 int xpixel = Col2Pixel (col);
2160 2160
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; ) 2161 for (i = 0; ++col < ncol; )
2164 { 2162 {
2165 if (stp[col] == NOCHAR) 2163 if (stp[col] == NOCHAR)
2166 { 2164 {
2167 dtp[col] = stp[col]; 2165 dtp[col] = stp[col];
2168 drp[col] = rend; 2166 drp[col] = rend;
2169 count++; 2167 count++;
2170
2171 if (i) // only possible skip if char unchanged
2172 i++; 2168 i++;
2173 2169
2174 continue; 2170 continue;
2175 } 2171 }
2176 2172
2177 if (rend != srp[col]) 2173 if (!RS_SAME (rend, srp[col]))
2178 break; 2174 break;
2179 2175
2180 count++; 2176 count++;
2181 2177
2182 if (stp[col] != dtp[col] 2178 if (stp[col] != dtp[col]
2183 || srp[col] != drp[col]) 2179 || !RS_SAME (srp[col], drp[col]))
2184 { 2180 {
2185 if (must_clear && (i++ > (count / 2))) 2181 if (must_clear && (i++ > count / 2))
2186 break; 2182 break;
2187 2183
2188 dtp[col] = stp[col]; 2184 dtp[col] = stp[col];
2189 drp[col] = rend; 2185 drp[col] = rend;
2190 i = 0; 2186 i = 0;
2191 } 2187 }
2192 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2188 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2193 break; 2189 break;
2194 } 2190 }
2195 2191
2196 col--; /* went one too far. move back */ 2192 col--; /* went one too far. move back */
2197 count -= i; /* dump any matching trailing chars */ 2193 count -= i; /* dump any matching trailing chars */
2194
2195 // sometimes we optimize away the trailing NOCHAR's, add them back
2196 while (i && text[count] == NOCHAR)
2197 count++, i--;
2198 2198
2199 /* 2199 /*
2200 * Determine the attributes for the string 2200 * Determine the attributes for the string
2201 */ 2201 */
2202 int fid = GET_FONT (rend);
2203 int fore = GET_FGCOLOR (rend); // desired foreground 2202 int fore = fgcolor_of (rend); // desired foreground
2204 int back = GET_BGCOLOR (rend); // desired background 2203 int back = bgcolor_of (rend); // desired background
2205 2204
2206 rend = GET_ATTR (rend); 2205 // only do special processing if any attributes are set, which is unlikely
2206 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2207 {
2208#if ENABLE_STYLES
2209 // force redraw after "careful" characters to avoid pixel droppings
2210 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2211 drp[col + 1] = ~srp[col + 1];
2207 2212
2208 rvid = !!(rend & RS_RVid); 2213 // include previous careful character(s) if possible, looks nicer (best effort...)
2214 while (text > stp
2215 && srp[text - stp - 1] & RS_Careful
2216 && RS_SAME (rend, srp[text - stp - 1]))
2217 text--, count++, xpixel -= fwidth;
2218#endif
2219
2220 bool invert = rend & RS_RVid;
2209 2221
2210#ifndef NO_BOLD_UNDERLINE_REVERSE 2222#ifndef NO_BOLD_UNDERLINE_REVERSE
2211 if (rend & RS_Bold && fore == Color_fg) 2223 if (rend & RS_Bold
2224 && fore == Color_fg)
2212 { 2225 {
2213 if (ISSET_PIXCOLOR (Color_BD)) 2226 if (ISSET_PIXCOLOR (Color_BD))
2214 fore = Color_BD; 2227 fore = Color_BD;
2228# if !ENABLE_STYLES
2215 else 2229 else
2216 rvid = !rvid; 2230 invert = !invert;
2231# endif
2232 }
2233
2234 if (rend & RS_Italic
2235 && fore == Color_fg)
2236 {
2237 if (ISSET_PIXCOLOR (Color_IT))
2238 fore = Color_IT;
2239# if !ENABLE_STYLES
2240 else
2241 invert = !invert;
2242# endif
2243 }
2244
2245 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2246 fore = Color_UL;
2247#endif
2248
2249 if (invert)
2250 {
2251 ::swap (fore, back);
2252
2253#ifndef NO_BOLD_UNDERLINE_REVERSE
2254 if (ISSET_PIXCOLOR (Color_RV))
2255 back = Color_RV;
2256
2257 if (fore == back)
2258 {
2259 fore = Color_bg;
2260 back = Color_fg;
2261 }
2262#endif
2263 }
2264
2265#ifdef TEXT_BLINK
2266 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2267 {
2268 if (!text_blink_ev.active)
2269 {
2270 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2271 hidden_text = 0;
2272 }
2273 else if (hidden_text)
2274 fore = back;
2275 }
2276#endif
2217 } 2277 }
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 2278
2251 /* 2279 /*
2252 * Actually do the drawing of the string here 2280 * Actually do the drawing of the string here
2253 */ 2281 */
2254 rxvt_font *font = (*TermWin.fontset)[fid]; 2282 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2255 2283
2256 if (back == fore) 2284 if (back == fore)
2257 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2285 font->clear_rect (*drawable, xpixel, ypixel,
2258 TermWin.fwidth * count, TermWin.fheight, 2286 fwidth * count, fheight,
2259 back); 2287 back);
2260 else if (back == Color_bg) 2288 else if (back == Color_bg)
2261 { 2289 {
2262 if (must_clear) 2290 if (must_clear)
2263 { 2291 {
2264 CLEAR_CHARS (xpixel, ypixel, count); 2292 CLEAR_CHARS (xpixel, ypixel, count);
2265 2293
2266 for (i = 0; i < count; i++) /* don't draw empty strings */ 2294 for (i = 0; i < count; i++) /* don't draw empty strings */
2267 if (text[i] != ' ') 2295 if (text[i] != ' ')
2268 { 2296 {
2269 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2297 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2270 break; 2298 break;
2271 } 2299 }
2272 } 2300 }
2273 else 2301 else
2274 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2275 } 2303 }
2276 else 2304 else
2277 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2305 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2278 2306
2279 if ((rend & RS_Uline) && (font->descent > 1)) 2307 if (rend & RS_Uline && font->descent > 1 && fore != back)
2308 {
2309#if ENABLE_FRILLS
2310 if (ISSET_PIXCOLOR (Color_underline))
2311 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2312 else
2313#endif
2314 XSetForeground (display->display, gc, pix_colors[fore]);
2315
2280 XDrawLine (display->display, drawBuffer, TermWin.gc, 2316 XDrawLine (display->display, drawBuffer, gc,
2281 xpixel, ypixel + font->ascent + 1, 2317 xpixel, ypixel + font->ascent + 1,
2282 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2318 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2319 }
2283 } /* for (col....) */ 2320 } /* for (col....) */
2284 } /* for (row....) */ 2321 } /* for (row....) */
2322
2323#if ENABLE_OVERLAY
2324 scr_swap_overlay ();
2325#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2285 2327
2286 /* 2328 /*
2287 * G: cleanup cursor and display outline cursor if necessary 2329 * G: cleanup cursor and display outline cursor if necessary
2288 */ 2330 */
2289 if (showcursor) 2331 if (showcursor)
2290 { 2332 {
2291 if (TermWin.focus) 2333 if (focus)
2334 {
2335 if (OPTION (Opt_cursorUnderline))
2336 *crp ^= RS_Uline;
2337 else
2292 { 2338 {
2293 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2294 [screen.cur.col]);
2295 *srp ^= RS_RVid; 2339 *crp ^= RS_RVid;
2296#ifndef NO_CURSORCOLOR 2340#ifndef NO_CURSORCOLOR
2297 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2341 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2298#endif 2342#endif
2343 }
2299 } 2344 }
2300 else if (oldcursor.row >= 0) 2345 else if (oldcursor.row >= 0)
2301 { 2346 {
2347 int cursorwidth = 1;
2348 int col = oldcursor.col;
2349
2350 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2351 col--;
2352
2353 while (col + cursorwidth < ncol
2354 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2355 cursorwidth++;
2356
2302#ifndef NO_CURSORCOLOR 2357#ifndef NO_CURSORCOLOR
2303 if (ISSET_PIXCOLOR (Color_cursor)) 2358 if (ISSET_PIXCOLOR (Color_cursor))
2304 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2359 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2305#endif 2360#endif
2306 int cursorwidth = 1;
2307 while (oldcursor.col + cursorwidth < TermWin.ncol
2308 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2309 cursorwidth++;
2310 2361
2311 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2362 XDrawRectangle (display->display, drawBuffer, gc,
2312 Col2Pixel (oldcursor.col), 2363 Col2Pixel (col),
2313 Row2Pixel (oldcursor.row), 2364 Row2Pixel (oldcursor.row),
2314 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2365 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2315 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2366 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2316 } 2367 }
2317 } 2368 }
2318 2369
2319 /* 2370 /*
2320 * H: cleanup selection 2371 * H: cleanup selection
2321 */ 2372 */
2322 scr_reverse_selection (); 2373 scr_reverse_selection ();
2323 2374
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
2346 if (refresh_type & SMOOTH_REFRESH) 2375 if (refresh_type & SMOOTH_REFRESH)
2347 XSync (display->display, False); 2376 XFlush (display->display);
2348 2377
2349 num_scr = 0; 2378 num_scr = 0;
2350 num_scr_allow = 1; 2379 num_scr_allow = 1;
2351 want_refresh = 0; /* screen is current */
2352} 2380}
2353 2381
2354void 2382void
2355rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2383rxvt_term::scr_remap_chars (const line_t &l)
2356{ 2384{
2357 if (!rp || !tp) 2385 if (!l.t)
2358 return; 2386 return;
2359 2387
2360 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2388 for (int i = ncol; i--; )
2361 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2362} 2390}
2363 2391
2364void 2392void
2365rxvt_term::scr_remap_chars () 2393rxvt_term::scr_remap_chars ()
2366{ 2394{
2367 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2395 for (int i = total_rows; i--; )
2368 scr_remap_chars (screen.text[i], screen.rend[i]); 2396 scr_remap_chars (row_buf [i]);
2369 2397
2370 for (int i = TermWin.nrow; i--; ) 2398 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 } 2399 {
2400 scr_remap_chars (drawn_buf [i]);
2401 scr_remap_chars (swap_buf [i]);
2402 }
2403}
2404
2405void
2406rxvt_term::scr_recolour ()
2407{
2408 if (1
2409#if TRANSPARENT
2410 && !am_transparent
2411#endif
2412#if XPM_BACKGROUND
2413 && !bgPixmap.pixmap
2414#endif
2415 )
2416 {
2417 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2418 XClearWindow (display->display, parent[0]);
2419 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2420#if HAVE_SCROLLBARS
2421 if (scrollBar.win)
2422 {
2423 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2424 scrollBar.setIdle ();
2425 scrollbar_show (0);
2426 }
2427#endif
2428 }
2429
2430 scr_clear ();
2431 scr_touch (true);
2432 want_refresh = 1;
2375} 2433}
2376 2434
2377/* ------------------------------------------------------------------------- */ 2435/* ------------------------------------------------------------------------- */
2378void 2436void
2379rxvt_term::scr_clear (bool really) 2437rxvt_term::scr_clear (bool really)
2380{ 2438{
2381 if (!TermWin.mapped) 2439 if (!mapped)
2382 return; 2440 return;
2383 2441
2384 num_scr_allow = 0; 2442 num_scr_allow = 0;
2385 want_refresh = 1; 2443 want_refresh = 1;
2386 2444
2387#ifdef TRANSPARENT 2445 if (really)
2388 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2446 XClearWindow (display->display, vt);
2389 { 2447}
2390 int i;
2391 2448
2392 if (! (Options & Opt_transparent_all)) 2449/* ------------------------------------------------------------------------- */
2393 i = 0; 2450void
2451rxvt_term::scr_reverse_selection ()
2452{
2453 if (selection.op
2454 && current_screen == selection.screen
2455 && selection.end.row >= -view_start)
2456 {
2457 int view_end = -view_start + nrow;
2458 int row, col;
2459
2460#if ENABLE_FRILLS
2461 if (selection.rect)
2462 {
2463 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = selection.beg.col; col < selection.end.col; col++)
2469 srp[col] ^= RS_RVid;
2470
2471 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= RS_RVid | RS_Uline;
2473
2474 if (++col < selection.end.col)
2475 srp[col] ^= RS_RVid | RS_Uline;
2476 }
2477 }
2394 else 2478 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 2479#endif
2402 2480 {
2403 if (really) 2481 if (selection.beg.row >= -view_start)
2404 XClearWindow (display->display, TermWin.vt); 2482 {
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; 2483 col = selection.beg.col;
2484 row = selection.beg.row;
2485 }
2420 else 2486 else
2421 { 2487 {
2422 col = 0; 2488 col = 0;
2423 i = end_row; 2489 row = -view_start;
2424 } 2490 }
2425 2491
2426 end_row += TermWin.nrow; 2492 for (; row < min (selection.end.row, view_end); row++, col = 0)
2427 for (; i < row && i < end_row; i++, col = 0) 2493 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; 2494 srp[col] ^= RS_RVid;
2430 2495
2431 if (i == row && i < end_row) 2496 if (row == selection.end.row)
2432 for (srp = screen.rend[i]; col < selection.end.col; col++) 2497 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2433 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
2499 }
2434 } 2500 }
2435} 2501}
2436 2502
2437/* ------------------------------------------------------------------------- */ 2503/* ------------------------------------------------------------------------- */
2438/* 2504/*
… …
2445{ 2511{
2446 int row, wrote; 2512 int row, wrote;
2447 unsigned int width, towrite; 2513 unsigned int width, towrite;
2448 char r1[] = "\n"; 2514 char r1[] = "\n";
2449 2515
2450 for (row = TermWin.saveLines - TermWin.nscrolled; 2516 for (row = saveLines - nsaved;
2451 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2517 row < saveLines + nrow - 1; row++)
2452 { 2518 {
2453 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2519 width = row_buf[row].l >= 0 ? row_buf[row].l
2454 : TermWin.ncol; 2520 : ncol;
2455 for (towrite = width; towrite; towrite -= wrote) 2521 for (towrite = width; towrite; towrite -= wrote)
2456 { 2522 {
2457 wrote = write (fd, & (screen.text[row][width - towrite]), 2523 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2458 towrite); 2524 towrite);
2459 if (wrote < 0) 2525 if (wrote < 0)
2460 return; /* XXX: death, no report */ 2526 return; /* XXX: death, no report */
2461 } 2527 }
2462 if (screen.tlen[row] >= 0) 2528 if (row_buf[row].l >= 0)
2463 if (write (fd, r1, 1) <= 0) 2529 if (write (fd, r1, 1) <= 0)
2464 return; /* XXX: death, no report */ 2530 return; /* XXX: death, no report */
2465 } 2531 }
2466} 2532}
2467#endif 2533#endif
2468 2534
2469/* ------------------------------------------------------------------------- * 2535/* ------------------------------------------------------------------------- *
2470 * CHARACTER SELECTION * 2536 * CHARACTER SELECTION *
2471 * ------------------------------------------------------------------------- */ 2537 * ------------------------------------------------------------------------- */
2472
2473/*
2474 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2475 */
2476void 2538void
2477rxvt_term::selection_check (int check_more) 2539rxvt_term::selection_check (int check_more)
2478{ 2540{
2479 row_col_t pos; 2541 row_col_t pos;
2480 2542
2481 if (!selection.op) 2543 if (!selection.op)
2482 return; 2544 return;
2483 2545
2484 pos.row = pos.col = 0; 2546 pos.row = pos.col = 0;
2485 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2547 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2486 || (selection.beg.row >= TermWin.nrow) 2548 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2487 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2549 || !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 2550 || (check_more == 1
2492 && current_screen == selection.screen 2551 && current_screen == selection.screen
2493 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2552 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2494 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2553 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2495 || (check_more == 2 2554 || (check_more == 2
… …
2497 && ROWCOL_IS_AFTER (selection.end, pos)) 2556 && ROWCOL_IS_AFTER (selection.end, pos))
2498 || (check_more == 3 2557 || (check_more == 3
2499 && ROWCOL_IS_AFTER (selection.end, pos)) 2558 && ROWCOL_IS_AFTER (selection.end, pos))
2500 || (check_more == 4 /* screen width change */ 2559 || (check_more == 4 /* screen width change */
2501 && (selection.beg.row != selection.end.row 2560 && (selection.beg.row != selection.end.row
2502 || selection.end.col > TermWin.ncol))) 2561 || selection.end.col > ncol)))
2503 CLEAR_SELECTION (); 2562 CLEAR_SELECTION ();
2504} 2563}
2505 2564
2506/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2507/* 2566/*
2508 * Paste a selection direct to the command fd 2567 * Paste a selection direct to the command fd
2509 */ 2568 */
2510void 2569void
2511rxvt_term::paste (const unsigned char *data, unsigned int len) 2570rxvt_term::paste (char *data, unsigned int len)
2512{ 2571{
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 */ 2572 /* convert normal newline chars into common keyboard Return key sequence */
2522 for (i = 0; i < len; i += PROP_SIZE) 2573 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) 2574 if (data[i] == C0_LF)
2529 ds[j] = C0_CR; 2575 data[i] = C0_CR;
2530 2576
2531 tt_write (ds, (int)n); 2577 tt_write (data, len);
2532 }
2533
2534 free (ds);
2535} 2578}
2536 2579
2537/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2538/* 2581/*
2539 * Respond to a notification that a primary selection has been sent 2582 * Respond to a notification that a primary selection has been sent
2540 * EXT: SelectionNotify 2583 * EXT: SelectionNotify
2541 */ 2584 */
2542int 2585void
2543rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2586rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2544{ 2587{
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 */ 2588 if (prop == None) /* check for failed XConvertSelection */
2552 { 2589 {
2553 if ((selection_type & Sel_CompoundText)) 2590 if ((selection_type & Sel_CompoundText))
2554 { 2591 {
2555 int selnum = selection_type & Sel_whereMask; 2592 int selnum = selection_type & Sel_whereMask;
… …
2568 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2605 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2569 else 2606 else
2570 selection_type = 0; 2607 selection_type = 0;
2571 } 2608 }
2572 2609
2573 return 0; 2610 return;
2574 }
2575
2576 for (;;)
2577 { 2611 }
2612
2613 unsigned long bytes_after;
2614 XTextProperty ct;
2615
2616 if (XGetWindowProperty (display->display, win, prop,
2617 0, PROP_SIZE / 4,
2618 delete_prop, AnyPropertyType,
2619 &ct.encoding, &ct.format,
2620 &ct.nitems, &bytes_after,
2621 &ct.value) != Success)
2622 {
2623 ct.value = 0;
2624 goto bailout;
2625 }
2626
2627 if (ct.encoding == None)
2628 goto bailout;
2629
2630 if (bytes_after)
2631 {
2632 // fetch and append remaining data
2633 XTextProperty ct2;
2634
2578 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2635 if (XGetWindowProperty (display->display, win, prop,
2579 (long) (PROP_SIZE / 4), delete_prop, 2636 ct.nitems / 4, (bytes_after + 3) / 4,
2637 delete_prop, AnyPropertyType,
2580 AnyPropertyType, &ct.encoding, &ct.format, 2638 &ct2.encoding, &ct2.format,
2581 &ct.nitems, &bytes_after, 2639 &ct2.nitems, &bytes_after,
2582 &ct.value) != Success) 2640 &ct2.value) != Success)
2583 break; 2641 goto bailout;
2584 2642
2585 if (ct.encoding == 0) 2643 // realloc should be compatible to XFree, here, and elsewhere, too
2586 { 2644 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2587 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2645 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2588 break; 2646 ct.nitems += ct2.nitems;
2589 }
2590 2647
2648 XFree (ct2.value);
2649 }
2650
2591 if (ct.value == NULL) 2651 if (ct.value == 0)
2592 { 2652 goto bailout;
2593 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2594 continue;
2595 }
2596 2653
2654 if (ct.encoding == xa[XA_INCR])
2655 {
2656 // INCR selection, start handshake
2657 if (!delete_prop)
2658 XDeleteProperty (display->display, win, prop);
2659
2660 selection_wait = Sel_incr;
2661 incr_buf_fill = 0;
2662 incr_ev.start (NOW + 10);
2663
2664 goto bailout;
2665 }
2666
2597 if (ct.nitems == 0) 2667 if (ct.nitems == 0)
2668 {
2669 if (selection_wait == Sel_incr)
2670 {
2671 XFree (ct.value);
2672
2673 // finally complete, now paste the whole thing
2674 selection_wait = Sel_normal;
2675 ct.value = (unsigned char *)incr_buf;
2676 ct.nitems = incr_buf_fill;
2677 incr_buf = 0;
2678 incr_buf_size = 0;
2679 incr_ev.stop ();
2598 { 2680 }
2599 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2681 else
2600 2682 {
2601 if (selection_wait == Sel_normal && nread == 0 2683 if (selection_wait == Sel_normal
2602 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2684 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2603 { 2685 {
2604 /* 2686 /*
2605 * pass through again trying CUT_BUFFER0 if we've come from 2687 * pass through again trying CUT_BUFFER0 if we've come from
2606 * XConvertSelection () but nothing was presented 2688 * XConvertSelection () but nothing was presented
2607 */ 2689 */
2608 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2609 selection_paste (display->root, XA_CUT_BUFFER0, False); 2690 selection_paste (display->root, XA_CUT_BUFFER0, False);
2610 } 2691 }
2611 2692
2612 nread = -1; /* discount any previous stuff */ 2693 goto bailout;
2613 break; 2694 }
2695 }
2696 else if (selection_wait == Sel_incr)
2697 {
2698 incr_ev.start (NOW + 10);
2699
2700 while (incr_buf_fill + ct.nitems > incr_buf_size)
2614 } 2701 {
2702 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2703 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2704 }
2615 2705
2706 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2616 nread += ct.nitems; 2707 incr_buf_fill += ct.nitems;
2617 2708
2709 goto bailout;
2710 }
2711
2618 char **cl; 2712 char **cl;
2619 int cr; 2713 int cr;
2714
2715#if ENABLE_FRILLS
2716 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2717 // so recode it manually
2718 if (ct.encoding == xa[XA_UTF8_STRING])
2719 {
2720 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2721 char *s = rxvt_wcstombs (w);
2722 free (w);
2723 // TODO: strlen == only the first element will be converted. well...
2724 paste (s, strlen (s));
2725 free (s);
2726 }
2727 else
2728#endif
2620 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2729 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2621 { 2730 && cl)
2731 {
2622 for (int i = 0; i < cr; i++) 2732 for (int i = 0; i < cr; i++)
2623 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2733 paste (cl[i], strlen (cl[i]));
2624 2734
2625 XFreeStringList (cl); 2735 XFreeStringList (cl);
2626 } 2736 }
2627 else 2737 else
2628 paste (ct.value, ct.nitems); 2738 paste ((char *)ct.value, ct.nitems); // paste raw
2629 2739
2630 if (bytes_after == 0) 2740bailout:
2631 break;
2632
2633 XFree (ct.value);
2634 }
2635
2636 if (ct.value)
2637 XFree (ct.value); 2741 XFree (ct.value);
2638 2742
2639 if (selection_wait == Sel_normal) 2743 if (selection_wait == Sel_normal)
2640 selection_wait = Sel_none; 2744 selection_wait = Sel_none;
2641
2642 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2643 return (int)nread;
2644} 2745}
2645 2746
2646void 2747void
2647rxvt_term::incr_cb (time_watcher &w) 2748rxvt_term::incr_cb (time_watcher &w)
2648{ 2749{
2649 selection_wait = Sel_none; 2750 selection_wait = Sel_none;
2650 2751
2752 incr_buf_size = 0;
2753 free (incr_buf);
2754
2651 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2755 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2652} 2756}
2653 2757
2654/*
2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2656 */
2657void 2758void
2658rxvt_term::selection_property (Window win, Atom prop) 2759rxvt_term::selection_property (Window win, Atom prop)
2659{ 2760{
2660 int reget_time = 0; 2761 if (prop == None || selection_wait != Sel_incr)
2661
2662 if (prop == None)
2663 return; 2762 return;
2664 2763
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) 2764 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} 2765}
2707 2766
2708/* ------------------------------------------------------------------------- */ 2767/* ------------------------------------------------------------------------- */
2709/* 2768/*
2710 * Request the current selection: 2769 * Request the current selection:
… …
2716 * EXT: button 2 release 2775 * EXT: button 2 release
2717 */ 2776 */
2718void 2777void
2719rxvt_term::selection_request (Time tm, int x, int y) 2778rxvt_term::selection_request (Time tm, int x, int y)
2720{ 2779{
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) 2780 if (x < 0 || x >= width || y < 0 || y >= height)
2724 return; /* outside window */ 2781 return; /* outside window */
2725 2782
2726 if (selection.text) 2783 if (selection.text)
2727 { /* internal selection */ 2784 { /* internal selection */
2728 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2785 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2786 paste (str, strlen (str));
2731 free (str); 2787 free (str);
2732 return; 2788 return;
2733 } 2789 }
2734 else 2790 else
2735 { 2791 {
… …
2747#else 2803#else
2748 selection_type = Sel_CompoundText; 2804 selection_type = Sel_CompoundText;
2749 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2805 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2750 return; 2806 return;
2751#endif 2807#endif
2752
2753 } 2808 }
2754 } 2809 }
2755 2810
2756 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2811 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); 2812 selection_paste (display->root, XA_CUT_BUFFER0, false);
2759} 2813}
2760 2814
2761int 2815int
2762rxvt_term::selection_request_other (Atom target, int selnum) 2816rxvt_term::selection_request_other (Atom target, int selnum)
2763{ 2817{
2764 Atom sel; 2818 Atom sel;
2765#ifdef DEBUG_SELECT
2766 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2767#endif
2768 2819
2769 selection_type |= selnum; 2820 selection_type |= selnum;
2770 2821
2771 if (selnum == Sel_Primary) 2822 if (selnum == Sel_Primary)
2772 sel = XA_PRIMARY; 2823 sel = XA_PRIMARY;
… …
2775 else 2826 else
2776 sel = xa[XA_CLIPBOARD]; 2827 sel = xa[XA_CLIPBOARD];
2777 2828
2778 if (XGetSelectionOwner (display->display, sel) != None) 2829 if (XGetSelectionOwner (display->display, sel) != None)
2779 { 2830 {
2780 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2781 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2831 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2782 TermWin.vt, selection_request_time); 2832 vt, selection_request_time);
2783 return 1; 2833 return 1;
2784 } 2834 }
2785 2835
2786 return 0; 2836 return 0;
2787} 2837}
… …
2792 * EXT: SelectionClear 2842 * EXT: SelectionClear
2793 */ 2843 */
2794void 2844void
2795rxvt_term::selection_clear () 2845rxvt_term::selection_clear ()
2796{ 2846{
2797 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2798
2799 want_refresh = 1; 2847 want_refresh = 1;
2800 free (selection.text); 2848 free (selection.text);
2801 selection.text = NULL; 2849 selection.text = NULL;
2802 selection.len = 0; 2850 selection.len = 0;
2803 CLEAR_SELECTION (); 2851 CLEAR_SELECTION ();
… …
2812 * EXT: button 1 or 3 release 2860 * EXT: button 1 or 3 release
2813 */ 2861 */
2814void 2862void
2815rxvt_term::selection_make (Time tm) 2863rxvt_term::selection_make (Time tm)
2816{ 2864{
2817 int i, col, end_col, row, end_row; 2865 int i;
2818 wchar_t *new_selection_text; 2866 wchar_t *new_selection_text;
2819 text_t *t; 2867 text_t *t;
2820 2868
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2822 switch (selection.op) 2869 switch (selection.op)
2823 { 2870 {
2824 case SELECTION_CONT: 2871 case SELECTION_CONT:
2825 break; 2872 break;
2826 case SELECTION_INIT: 2873 case SELECTION_INIT:
… …
2836 selection.op = SELECTION_DONE; 2883 selection.op = SELECTION_DONE;
2837 2884
2838 if (selection.clicks == 4) 2885 if (selection.clicks == 4)
2839 return; /* nothing selected, go away */ 2886 return; /* nothing selected, go away */
2840 2887
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return;
2890
2841 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2842 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2843 2893
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; 2894 int ofs = 0;
2849 int extra = 0; 2895 int extra = 0;
2850 2896
2897 int col = selection.beg.col;
2898 int row = selection.beg.row;
2899
2900 int end_col;
2901
2851 for (; row <= end_row; row++, col = 0) 2902 for (; row <= selection.end.row; row++, col = 0)
2852 { 2903 {
2853 t = &(screen.text[row][col]); 2904#if ENABLE_FRILLS
2854 2905 if (selection.rect)
2855 end_col = screen.tlen[row]; 2906 {
2856 2907 col = selection.beg.col;
2857 if (end_col == -1)
2858 end_col = TermWin.ncol; 2908 end_col = ncol + 1;
2909 }
2910 else
2911#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2859 2913
2914 col = max (col, 0);
2915
2860 if (row == end_row) 2916 if (row == selection.end.row
2917#if ENABLE_FRILLS
2918 || selection.rect
2919#endif
2920 )
2861 MIN_IT (end_col, selection.end.col); 2921 min_it (end_col, selection.end.col);
2862 2922
2923 t = ROW(row).t + col;
2863 for (; col < end_col; col++) 2924 for (; col < end_col; col++)
2864 { 2925 {
2865 if (*t == NOCHAR) 2926 if (*t == NOCHAR)
2866 t++; 2927 t++;
2867#if ENABLE_COMBINING 2928#if ENABLE_COMBINING
… …
2883#endif 2944#endif
2884 else 2945 else
2885 new_selection_text[ofs++] = *t++; 2946 new_selection_text[ofs++] = *t++;
2886 } 2947 }
2887 2948
2888 if (screen.tlen[row] != -1 && row != end_row) 2949#if ENABLE_FRILLS
2950 if (selection.rect)
2951 {
2952 while (ofs
2953 && new_selection_text[ofs - 1] != C0_LF
2954 && unicode::is_space (new_selection_text[ofs - 1]))
2955 --ofs;
2956
2889 new_selection_text[ofs++] = C0_LF; 2957 new_selection_text[ofs++] = C0_LF;
2958 }
2959 else
2960#endif
2961 if (!ROW(row).is_longer () && row != selection.end.row)
2962 new_selection_text[ofs++] = C0_LF;
2890 } 2963 }
2891 2964
2892 if (end_col != selection.end.col) 2965 if (end_col != selection.end.col)
2893 new_selection_text[ofs++] = C0_LF; 2966 new_selection_text[ofs++] = C0_LF;
2894 2967
… …
2904 2977
2905 // we usually allocate much more than necessary, so realloc it smaller again 2978 // we usually allocate much more than necessary, so realloc it smaller again
2906 selection.len = ofs; 2979 selection.len = ofs;
2907 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2908 2981
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return;
2984
2985 selection_grab (tm);
2986}
2987
2988bool
2989rxvt_term::selection_grab (Time tm)
2990{
2991 selection_time = tm;
2992
2909 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2910 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2995 {
2911 display->set_selection_owner (this); 2996 display->set_selection_owner (this);
2997 return true;
2998 }
2912 else 2999 else
2913 rxvt_warn ("can't get primary selection, ignoring.\n"); 3000 return false;
2914 3001
2915#if 0 3002#if 0
2916 XTextProperty ct; 3003 XTextProperty ct;
2917 3004
2918 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2919 { 3006 {
2920 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2921 PropModeReplace, ct.value, ct.nitems);
2922 XFree (ct.value); 3008 XFree (ct.value);
2923 } 3009 }
2924#endif 3010#endif
2925
2926 selection_time = tm;
2927 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2928} 3011}
2929 3012
2930/* ------------------------------------------------------------------------- */ 3013/* ------------------------------------------------------------------------- */
2931/* 3014/*
2932 * Mark or select text based upon number of clicks: 1, 2, or 3 3015 * Mark or select text based upon number of clicks: 1, 2, or 3
2933 * EXT: button 1 press 3016 * EXT: button 1 press
2934 */ 3017 */
2935void 3018void
2936rxvt_term::selection_click (int clicks, int x, int y) 3019rxvt_term::selection_click (int clicks, int x, int y)
2937{ 3020{
2938 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2939
2940 clicks = ((clicks - 1) % 3) + 1; 3021 clicks = ((clicks - 1) % 3) + 1;
2941 selection.clicks = clicks; /* save clicks so extend will work */ 3022 selection.clicks = clicks; /* save clicks so extend will work */
2942 3023
2943 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3024 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2944 3025
2945 if (clicks == 2 || clicks == 3) 3026 if (clicks == 2 || clicks == 3)
2946 selection_extend_colrow (selection.mark.col, 3027 selection_extend_colrow (selection.mark.col,
2947 selection.mark.row + TermWin.view_start, 3028 selection.mark.row + view_start,
2948 0, /* button 3 */ 3029 0, /* button 3 */
2949 1, /* button press */ 3030 1, /* button press */
2950 0); /* click change */ 3031 0); /* click change */
2951} 3032}
2952 3033
… …
2956 */ 3037 */
2957void 3038void
2958rxvt_term::selection_start_colrow (int col, int row) 3039rxvt_term::selection_start_colrow (int col, int row)
2959{ 3040{
2960 want_refresh = 1; 3041 want_refresh = 1;
3042
3043 selection.mark.row = row - view_start;
2961 selection.mark.col = col; 3044 selection.mark.col = col;
2962 selection.mark.row = row - TermWin.view_start;
2963 3045
2964 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3046 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
2965 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3047 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 3048
2969 while (selection.mark.col > 0 3049 while (selection.mark.col > 0
2970 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3050 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2971 --selection.mark.col; 3051 --selection.mark.col;
2972 3052
2973 if (selection.op) 3053 if (selection.op)
2974 { /* clear the old selection */ 3054 { /* clear the old selection */
2975 selection.beg.row = selection.end.row = selection.mark.row; 3055 selection.beg.row = selection.end.row = selection.mark.row;
… …
2986 * We now only find out the boundary in one direction 3066 * We now only find out the boundary in one direction
2987 */ 3067 */
2988 3068
2989/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3069/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2990#define DELIMIT_TEXT(x) \ 3070#define DELIMIT_TEXT(x) \
2991 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3071 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2992#define DELIMIT_REND(x) 1 3072#define DELIMIT_REND(x) 1
2993 3073
2994void 3074void
2995rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3075rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2996{ 3076{
… …
2999 text_t *stp; 3079 text_t *stp;
3000 rend_t *srp; 3080 rend_t *srp;
3001 3081
3002 if (dirn == UP) 3082 if (dirn == UP)
3003 { 3083 {
3004 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3084 bound.row = - nsaved - 1;
3005 bound.col = 0; 3085 bound.col = 0;
3006 dirnadd = -1; 3086 dirnadd = -1;
3007 } 3087 }
3008 else 3088 else
3009 { 3089 {
3010 bound.row = TermWin.saveLines + TermWin.nrow; 3090 bound.row = nrow;
3011 bound.col = TermWin.ncol - 1; 3091 bound.col = ncol - 1;
3012 dirnadd = 1; 3092 dirnadd = 1;
3013 } 3093 }
3014 3094
3015 row = mark->row + TermWin.saveLines; 3095 row = mark->row;
3016 col = mark->col; 3096 col = max (mark->col, 0);
3017 MAX_IT (col, 0); 3097
3018 /* find the edge of a word */ 3098 /* find the edge of a word */
3019 stp = & (screen.text[row][col]); 3099 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3020 w1 = DELIMIT_TEXT (*stp); 3100 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3021
3022 srp = (&screen.rend[row][col]);
3023 w2 = DELIMIT_REND (*srp);
3024 3101
3025 for (;;) 3102 for (;;)
3026 { 3103 {
3027 for (; col != bound.col; col += dirnadd) 3104 for (; col != bound.col; col += dirnadd)
3028 { 3105 {
… …
3038 break; 3115 break;
3039 } 3116 }
3040 3117
3041 if ((col == bound.col) && (row != bound.row)) 3118 if ((col == bound.col) && (row != bound.row))
3042 { 3119 {
3043 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3120 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3044 { 3121 {
3045 trow = row + dirnadd; 3122 trow = row + dirnadd;
3046 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3123 tcol = dirn == UP ? ncol - 1 : 0;
3047 3124
3048 if (screen.text[trow] == NULL) 3125 if (!ROW(trow).t)
3049 break; 3126 break;
3050 3127
3051 stp = & (screen.text[trow][tcol]); 3128 stp = ROW(trow).t + tcol;
3052 srp = & (screen.rend[trow][tcol]); 3129 srp = ROW(trow).r + tcol;
3053 3130
3054 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3131 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3055 break; 3132 break;
3056 3133
3057 row = trow; 3134 row = trow;
… …
3060 } 3137 }
3061 } 3138 }
3062 break; 3139 break;
3063 } 3140 }
3064 3141
3065Old_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)); 3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3269 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3270 } 3333 }
3271 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3272 { 3335 {
3273#ifndef NO_FRILLS 3336#if ENABLE_FRILLS
3274 if ((Options & Opt_tripleclickwords)) 3337 if (OPTION (Opt_tripleclickwords))
3275 { 3338 {
3276 int end_row; 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3277 3340
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++) 3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3282 { 3342 {
3283 end_col = screen.tlen[end_row + TermWin.saveLines]; 3343 if (!ROW(end_row).is_longer ())
3284
3285 if (end_col != -1)
3286 { 3344 {
3287 selection.end.row = end_row; 3345 selection.end.row = end_row;
3288 selection.end.col = end_col; 3346 selection.end.col = ROW(end_row).l;
3289 selection_remove_trailing_spaces (); 3347 selection_remove_trailing_spaces ();
3290 break; 3348 break;
3291 } 3349 }
3292 } 3350 }
3293 } 3351 }
3294 else 3352 else
3295#endif 3353#endif
3296 { 3354 {
3297 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3355 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3298 selection.mark.col++; 3356 selection.mark.col++;
3357
3299 selection.beg.col = 0; 3358 selection.beg.col = 0;
3300 selection.end.col = ncol; 3359 selection.end.col = ncol;
3360
3361 // select a complete logical line
3362 while (selection.beg.row > -saveLines
3363 && ROW(selection.beg.row - 1).is_longer ())
3364 selection.beg.row--;
3365
3366 while (selection.end.row < nrow
3367 && ROW(selection.end.row).is_longer ())
3368 selection.end.row++;
3301 } 3369 }
3302 } 3370 }
3303 3371
3304 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
3305 { /* mark may need to be changed */ 3373 { /* mark may need to be changed */
3306 if (closeto == LEFT) 3374 if (closeto == LEFT)
3307 { 3375 {
3308 selection.mark.row = selection.end.row; 3376 selection.mark.row = selection.end.row;
3309 selection.mark.col = selection.end.col 3377 selection.mark.col = selection.end.col - (selection.clicks == 2);
3310 - (selection.clicks == 2);
3311 } 3378 }
3312 else 3379 else
3313 { 3380 {
3314 selection.mark.row = selection.beg.row; 3381 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3382 selection.mark.col = selection.beg.col;
3316 } 3383 }
3317 } 3384 }
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 3385
3321#ifndef NO_FRILLS 3386#if ENABLE_FRILLS
3387 if (selection.rect && selection.beg.col > selection.end.col)
3388 ::swap (selection.beg.col, selection.end.col);
3389#endif
3390}
3391
3392#if ENABLE_FRILLS
3322void 3393void
3323rxvt_term::selection_remove_trailing_spaces () 3394rxvt_term::selection_remove_trailing_spaces ()
3324{ 3395{
3325 int32_t end_col, end_row; 3396 int32_t end_col, end_row;
3326 text_t *stp; 3397 text_t *stp;
3327 3398
3328 end_col = selection.end.col; 3399 end_col = selection.end.col;
3329 end_row = selection.end.row; 3400 end_row = selection.end.row;
3401
3330 for ( ; end_row >= selection.beg.row; ) 3402 for (; end_row >= selection.beg.row; )
3331 { 3403 {
3332 stp = screen.text[end_row + TermWin.saveLines]; 3404 stp = ROW(end_row).t;
3405
3333 while (--end_col >= 0) 3406 while (--end_col >= 0)
3334 { 3407 {
3335 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3408 if (stp[end_col] != NOCHAR
3409 && !unicode::is_space (stp[end_col]))
3336 break; 3410 break;
3337 } 3411 }
3412
3338 if (end_col >= 0 3413 if (end_col >= 0
3339 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3414 || !ROW(end_row - 1).is_longer ())
3340 { 3415 {
3341 selection.end.col = end_col + 1; 3416 selection.end.col = end_col + 1;
3342 selection.end.row = end_row; 3417 selection.end.row = end_row;
3343 break; 3418 break;
3344 } 3419 }
3420
3345 end_row--; 3421 end_row--;
3346 end_col = TermWin.ncol; 3422 end_col = ncol;
3347 } 3423 }
3424
3348 if (selection.mark.row > selection.end.row) 3425 if (selection.mark.row > selection.end.row)
3349 { 3426 {
3350 selection.mark.row = selection.end.row; 3427 selection.mark.row = selection.end.row;
3351 selection.mark.col = selection.end.col; 3428 selection.mark.col = selection.end.col;
3352 } 3429 }
… …
3368 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3445 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3369} 3446}
3370 3447
3371/* ------------------------------------------------------------------------- */ 3448/* ------------------------------------------------------------------------- */
3372/* 3449/*
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 3450 * Respond to a request for our current selection
3382 * EXT: SelectionRequest 3451 * EXT: SelectionRequest
3383 */ 3452 */
3384void 3453void
3385rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3454rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3386{ 3455{
3387 XSelectionEvent ev; 3456 XSelectionEvent ev;
3388 XTextProperty ct; 3457 dDisp;
3389 XICCEncodingStyle style;
3390 Atom target;
3391 3458
3392 ev.type = SelectionNotify; 3459 ev.type = SelectionNotify;
3393 ev.property = None; 3460 ev.property = None;
3394 ev.display = rq.display; 3461 ev.display = rq.display;
3395 ev.requestor = rq.requestor; 3462 ev.requestor = rq.requestor;
… …
3397 ev.target = rq.target; 3464 ev.target = rq.target;
3398 ev.time = rq.time; 3465 ev.time = rq.time;
3399 3466
3400 if (rq.target == xa[XA_TARGETS]) 3467 if (rq.target == xa[XA_TARGETS])
3401 { 3468 {
3402 Atom32 target_list[6]; 3469 Atom target_list[6];
3403 Atom32 *target = target_list; 3470 Atom *target = target_list;
3404 3471
3405 *target++ = (Atom32) xa[XA_TARGETS]; 3472 *target++ = xa[XA_TARGETS];
3406 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3473 *target++ = xa[XA_TIMESTAMP];
3407 *target++ = (Atom32) XA_STRING; 3474 *target++ = XA_STRING;
3408 *target++ = (Atom32) xa[XA_TEXT]; 3475 *target++ = xa[XA_TEXT];
3409 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3476 *target++ = xa[XA_COMPOUND_TEXT];
3410#if X_HAVE_UTF8_STRING 3477#if X_HAVE_UTF8_STRING
3411 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3478 *target++ = xa[XA_UTF8_STRING];
3412#endif 3479#endif
3413 3480
3414 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3415 (8 * sizeof (target_list[0])), PropModeReplace, 3482 32, PropModeReplace,
3416 (unsigned char *)target_list, 3483 (unsigned char *)target_list, target - target_list);
3417 target - target_list);
3418 ev.property = rq.property; 3484 ev.property = rq.property;
3419 } 3485 }
3486#if TODO // TODO
3420 else if (rq.target == xa[XA_MULTIPLE]) 3487 else if (rq.target == xa[XA_MULTIPLE])
3421 { 3488 {
3422 /* TODO: Handle MULTIPLE */ 3489 /* TODO: Handle MULTIPLE */
3423 } 3490 }
3491#endif
3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3425 { 3493 {
3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3427 (8 * sizeof (Time)), PropModeReplace,
3428 (unsigned char *)&selection_time, 1); 3495 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3429 ev.property = rq.property; 3496 ev.property = rq.property;
3430 } 3497 }
3431 else if (rq.target == XA_STRING 3498 else if (rq.target == XA_STRING
3432 || rq.target == xa[XA_TEXT] 3499 || rq.target == xa[XA_TEXT]
3433 || rq.target == xa[XA_COMPOUND_TEXT] 3500 || rq.target == xa[XA_COMPOUND_TEXT]
3434 || rq.target == xa[XA_UTF8_STRING] 3501 || rq.target == xa[XA_UTF8_STRING]
3435 ) 3502 )
3436 { 3503 {
3504 XTextProperty ct;
3505 Atom target = rq.target;
3437 short freect = 0; 3506 short freect = 0;
3438 int selectlen; 3507 int selectlen;
3439 wchar_t *cl; 3508 wchar_t *cl;
3440 3509 enum {
3441 target = rq.target; 3510 enc_string = XStringStyle,
3511 enc_text = XStdICCTextStyle,
3512 enc_compound_text = XCompoundTextStyle,
3513#ifdef X_HAVE_UTF8_STRING
3514 enc_utf8 = XUTF8StringStyle,
3515#else
3516 enc_utf8 = -1,
3517#endif
3518 } style;
3442 3519
3443 if (target == XA_STRING) 3520 if (target == XA_STRING)
3444 // we actually don't do XA_STRING, but who cares, as i18n clients 3521 // we actually don't do XA_STRING, but who cares, as i18n clients
3445 // will ask for another format anyways. 3522 // will ask for another format anyways.
3446 style = XStringStyle; 3523 style = enc_string;
3447 else if (target == xa[XA_TEXT]) 3524 else if (target == xa[XA_TEXT])
3448 style = XStdICCTextStyle; 3525 style = enc_text;
3449 else if (target == xa[XA_COMPOUND_TEXT]) 3526 else if (target == xa[XA_COMPOUND_TEXT])
3450 style = XCompoundTextStyle; 3527 style = enc_compound_text;
3451#if X_HAVE_UTF8_STRING 3528#if ENABLE_FRILLS
3452 else if (target == xa[XA_UTF8_STRING]) 3529 else if (target == xa[XA_UTF8_STRING])
3453 style = XUTF8StringStyle; 3530 style = enc_utf8;
3454#endif 3531#endif
3455 else 3532 else
3456 { 3533 {
3457 target = xa[XA_COMPOUND_TEXT]; 3534 target = xa[XA_COMPOUND_TEXT];
3458 style = XCompoundTextStyle; 3535 style = enc_compound_text;
3459 } 3536 }
3460 3537
3461 if (selection.text) 3538 if (selection.text)
3462 { 3539 {
3463 cl = selection.text; 3540 cl = selection.text;
… …
3467 { 3544 {
3468 cl = L""; 3545 cl = L"";
3469 selectlen = 0; 3546 selectlen = 0;
3470 } 3547 }
3471 3548
3472 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3549#if ENABLE_FRILLS
3473 // manually for XUTF8StringStyle. 3550 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3551 // so recode it manually
3552 if (style == enc_utf8)
3553 {
3554 freect = 1;
3555 ct.encoding = target;
3556 ct.format = 8;
3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3558 ct.nitems = strlen ((char *)ct.value);
3559 }
3560 else
3561#endif
3474 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3475 freect = 1; 3563 freect = 1;
3476 else 3564 else
3477 { 3565 {
3478 /* if we failed to convert then send it raw */ 3566 /* if we failed to convert then send it raw */
3479 ct.value = (unsigned char *)cl; 3567 ct.value = (unsigned char *)cl;
3480 ct.nitems = selectlen; 3568 ct.nitems = selectlen;
3569 ct.encoding = target;
3481 } 3570 }
3482 3571
3483 XChangeProperty (display->display, rq.requestor, rq.property, 3572 XChangeProperty (disp, rq.requestor, rq.property,
3484 target, 8, PropModeReplace, 3573 ct.encoding, 8, PropModeReplace,
3485 ct.value, (int)ct.nitems); 3574 ct.value, (int)ct.nitems);
3486 ev.property = rq.property; 3575 ev.property = rq.property;
3487 3576
3488 if (freect) 3577 if (freect)
3489 XFree (ct.value); 3578 XFree (ct.value);
3490 } 3579 }
3491 3580
3492 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3493} 3582}
3494 3583
3495/* ------------------------------------------------------------------------- * 3584/* ------------------------------------------------------------------------- *
3496 * MOUSE ROUTINES * 3585 * MOUSE ROUTINES *
3497 * ------------------------------------------------------------------------- */ 3586 * ------------------------------------------------------------------------- */
… …
3501 */ 3590 */
3502void 3591void
3503rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3504{ 3593{
3505 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3506 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3507 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3508 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3509} 3598}
3510 3599
3511/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3512#ifdef USE_XIM 3601#ifdef USE_XIM
3513void 3602void
3514rxvt_term::im_set_position (XPoint *pos) 3603rxvt_term::im_set_position (XPoint &pos)
3515{ 3604{
3516 XWindowAttributes xwa; 3605 XWindowAttributes xwa;
3517 3606
3518 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3607 XGetWindowAttributes (display->display, vt, &xwa);
3608
3519 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3609 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3520 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3521} 3611}
3522
3523#endif 3612#endif
3613
3614#if ENABLE_OVERLAY
3615void
3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3617{
3618 if (nrow < 1 || ncol < 1)
3619 return;
3620
3621 want_refresh = 1;
3622
3623 scr_overlay_off ();
3624
3625 if (x < 0) x = ncol - w;
3626 if (y < 0) y = nrow - h;
3627
3628 // make space for border
3629 w += 2; min_it (w, ncol);
3630 h += 2; min_it (h, nrow);
3631
3632 x -= 1; clamp_it (x, 0, ncol - w);
3633 y -= 1; clamp_it (y, 0, nrow - h);
3634
3635 ov_x = x; ov_y = y;
3636 ov_w = w; ov_h = h;
3637
3638 ov_text = new text_t *[h];
3639 ov_rend = new rend_t *[h];
3640
3641 for (y = 0; y < h; y++)
3642 {
3643 text_t *tp = ov_text[y] = new text_t[w];
3644 rend_t *rp = ov_rend[y] = new rend_t[w];
3645
3646 text_t t0, t1, t2;
3647 rend_t r = OVERLAY_RSTYLE;
3648
3649 if (y == 0)
3650 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3651 else if (y < h - 1)
3652 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3653 else
3654 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3655
3656 *tp++ = t0;
3657 *rp++ = r;
3658
3659 for (x = w - 2; x > 0; --x)
3660 {
3661 *tp++ = t1;
3662 *rp++ = r;
3663 }
3664
3665 *tp = t2;
3666 *rp = r;
3667 }
3668}
3669
3670void
3671rxvt_term::scr_overlay_off ()
3672{
3673 if (!ov_text)
3674 return;
3675
3676 want_refresh = 1;
3677
3678 for (int y = 0; y < ov_h; y++)
3679 {
3680 delete [] ov_text[y];
3681 delete [] ov_rend[y];
3682 }
3683
3684 delete [] ov_text; ov_text = 0;
3685 delete [] ov_rend; ov_rend = 0;
3686}
3687
3688void
3689rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3690{
3691 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3692 return;
3693
3694 x++, y++;
3695
3696 ov_text[y][x] = text;
3697 ov_rend[y][x] = rend;
3698}
3699
3700void
3701rxvt_term::scr_overlay_set (int x, int y, const char *s)
3702{
3703 while (*s)
3704 scr_overlay_set (x++, y, *s++);
3705}
3706
3707void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3709{
3710 while (*s)
3711 {
3712 text_t t = *s++;
3713 int width = wcwidth (t);
3714
3715 while (width--)
3716 {
3717 scr_overlay_set (x++, y, t);
3718 t = NOCHAR;
3719 }
3720 }
3721}
3722
3723void
3724rxvt_term::scr_swap_overlay ()
3725{
3726 if (!ov_text)
3727 return;
3728
3729 // swap screen mem with overlay
3730 for (int y = ov_h; y--; )
3731 {
3732 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y];
3734
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3737
3738 for (int x = ov_w; x--; )
3739 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3742 }
3743 }
3744}
3745
3746#endif
3524/* ------------------------------------------------------------------------- */ 3747/* ------------------------------------------------------------------------- */
3748

Diff Legend

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