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.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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