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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.244 by root, Fri Jan 20 10:27:08 2006 UTC

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

Diff Legend

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