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

Diff Legend

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