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

Diff Legend

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