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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.202 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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