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.167 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.417 by root, Mon May 28 16:40:03 2012 UTC

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

Diff Legend

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