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

Diff Legend

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