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.170 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.425 by root, Fri Jun 29 22:10:18 2012 UTC

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

Diff Legend

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