ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.78 by root, Fri Jul 30 18:35:11 2004 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC

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

Diff Legend

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