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

Diff Legend

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