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.129 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC

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

Diff Legend

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