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

Diff Legend

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