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.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.381 by sf-exg, Fri Apr 22 10:01:39 2011 UTC

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

Diff Legend

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