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

Diff Legend

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