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

Diff Legend

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