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

Diff Legend

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