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

Diff Legend

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