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

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

Diff Legend

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