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

Diff Legend

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