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.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.390 by sf-exg, Fri Jul 8 20:54:31 2011 UTC

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

Diff Legend

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