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

Diff Legend

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