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.170 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.335 by root, Tue Mar 30 23:00:35 2010 UTC

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

Diff Legend

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