ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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