ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.292 by root, Sun Dec 23 02:43:55 2007 UTC

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

Diff Legend

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