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

Diff Legend

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