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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.257 by root, Tue Jan 31 00:25:16 2006 UTC

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

Diff Legend

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