ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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