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.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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