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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.379 by sf-exg, Fri Apr 1 11:06:42 2011 UTC

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

Diff Legend

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