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.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.278 by root, Mon Sep 17 08:31:54 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29#include "rxvtperl.h" /* NECESSARY */
30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 30
32#include <inttypes.h> 31#include <inttypes.h>
33#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); 369
299 370 // make sure all terminal lines exist
300 scr_reset_realloc (); /* realloc _last_ */ 371 while (top_row > 0)
301 } 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
302 else if (nrow > prev_nrow)
303 { 373 }
304 /* add rows */ 374 else
305 scr_reset_realloc (); /* realloc _first_ */ 375 {
306 376 // if no scrollback exists (yet), wing, instead of wrap
307 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 377
308 378 for (int row = min (nrow, prev_nrow); row--; )
309 k = min (TermWin.nscrolled, nrow - prev_nrow);
310
311 for (p = prev_total_rows; p < total_rows; p++)
312 { 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;
… …
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
882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
883
884 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */
886 } 837
838 line->l = ncol;
839 line->is_longer (1);
887 840
841 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */
843 }
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
… …
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 if (!width) 947 if (!width)
948 {
949 line->touch ();
950
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
980 { 952 {
981 stp[c] = ' '; 953 line->t[c] = ' ';
982 srp[c] = rend; 954 line->r[c] = rend;
983 } 955 }
984 } 956 }
957 }
985 else if (width == 0) 958 else // width == 0
986 { 959 {
987#if ENABLE_COMBINING 960#if ENABLE_COMBINING
988 // handle combining characters 961 // handle combining characters
989 // we just tag the accent on the previous on-screen character. 962 // we just tag the accent on the previous on-screen character.
990 // this is arguably not correct, but also arguably not wrong. 963 // this is arguably not correct, but also arguably not wrong.
991 // we don't handle double-width characters nicely yet. 964 // we don't handle double-width characters nicely yet.
992 965 line_t *linep;
993 text_t *tp; 966 text_t *tp;
994 rend_t *rp; 967 rend_t *rp;
995 968
996 if (screen.cur.col > 0) 969 if (screen.cur.col > 0)
997 { 970 {
971 linep = line;
998 tp = stp + screen.cur.col - 1; 972 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 973 rp = line->r + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
1003 } 974 }
1004 else if (screen.cur.row > 0 975 else if (screen.cur.row > 0
1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 976 && ROW(screen.cur.row - 1).is_longer ())
1006 { 977 {
1007 int line = screen.cur.row - 1 + TermWin.saveLines; 978 linep = &ROW(screen.cur.row - 1);
1008
1009 tp = screen.text[line] + last_col - 1; 979 tp = line->t + ncol - 1;
1010 rp = screen.rend[line] + last_col - 1; 980 rp = line->r + ncol - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
1014 } 981 }
1015 else 982 else
1016 continue; 983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
1017 989
1018 // first try to find a precomposed character 990 // first try to find a precomposed character
1019 unicode_t n = rxvt_compose (*tp, c); 991 unicode_t n = rxvt_compose (*tp, c);
1020 if (n == NOCHAR) 992 if (n == NOCHAR)
1021 n = rxvt_composite.compose (*tp, c); 993 n = rxvt_composite.compose (*tp, c);
… …
1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1025#endif 997#endif
1026 } 998 }
1027 } 999 }
1028 1000
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 1001 max_it (line->l, screen.cur.col);
1030 MAX_IT (screen.tlen[row], screen.cur.col);
1031 1002
1032#ifdef DEBUG_STRICT 1003#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 1004 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0);
1036#endif 1005#endif
1037} 1006}
1038 1007
1039/* ------------------------------------------------------------------------- */ 1008/* ------------------------------------------------------------------------- */
1040/* 1009/*
1041 * 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
1042 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
1043 */ 1012 */
1044void 1013void
1045rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
1046{ 1015{
1047 want_refresh = 1; 1016 want_refresh = 1;
1048 1017
1049 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1050 { 1019 {
1051 if (screen.cur.row > 0) 1020 if (screen.cur.row > 0)
1052 { 1021 {
1053#ifdef TERMCAP_HAS_BW 1022#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 1023 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 1024 screen.cur.row--;
1056 return; 1025 return;
1057#endif 1026#endif
1058 } 1027 }
1059 } 1028 }
… …
1068 * Process Horizontal Tab 1037 * Process Horizontal Tab
1069 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1070 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1071 */ 1040 */
1072void 1041void
1073rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1074{ 1043{
1075 int i, x; 1044 int i, x;
1076 1045
1077 want_refresh = 1; 1046 want_refresh = 1;
1078 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
1079 1048
1080 if (count == 0) 1049 if (count == 0)
1081 return; 1050 return;
1082 else if (count > 0) 1051 else if (count > 0)
1083 { 1052 {
1084 int row = TermWin.saveLines + screen.cur.row; 1053 line_t &l = ROW(screen.cur.row);
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i]; 1054 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1055 ht &= l.t[i] == ' ';
1089 1056
1090 for (; ++i < TermWin.ncol; ) 1057 for (; ++i < ncol; )
1091 if (tabs[i]) 1058 if (tabs[i])
1092 { 1059 {
1093 x = i; 1060 x = i;
1061
1094 if (!--count) 1062 if (!--count)
1095 break; 1063 break;
1096 } 1064 }
1097 else 1065 else
1098 ht &= tp[i] == ' ' 1066 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1100 1068
1101 if (count) 1069 if (count)
1102 x = TermWin.ncol - 1; 1070 x = ncol - 1;
1103 1071
1104 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1074 if (ht && option (Opt_pastableTabs))
1107 { 1075 {
1108 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1109 1077
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1078 l.touch (x);
1111 MAX_IT (screen.tlen[row], x);
1112 1079
1113 i = screen.cur.col; 1080 i = screen.cur.col;
1114 1081
1115 tp[i] = '\t'; 1082 l.t[i] = '\t';
1116 rp[i] = base_rend; 1083 l.r[i] = base_rend;
1117 1084
1118 while (++i < x) 1085 while (++i < x)
1119 { 1086 {
1120 tp[i] = NOCHAR; 1087 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1088 l.r[i] = base_rend;
1122 } 1089 }
1123 } 1090 }
1124 } 1091 }
1125 else /* if (count < 0) */ 1092 else /* if (count < 0) */
1126 { 1093 {
… …
1145 * Process DEC Back Index 1112 * Process DEC Back Index
1146 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1147 * 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
1148 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1149 */ 1116 */
1150#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1151void 1118void
1152rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1153{ 1120{
1154 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1123 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
1162 }
1163} 1125}
1164#endif 1126#endif
1165/* ------------------------------------------------------------------------- */ 1127/* ------------------------------------------------------------------------- */
1166/* 1128/*
1167 * Process DEC Forward Index 1129 * Process DEC Forward Index
1168 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1169 * 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
1170 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1171 */ 1133 */
1172#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1173void 1135void
1174rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1175{ 1137{
1176 int row;
1177
1178 if (screen.cur.col < TermWin.ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1140 else
1181 { 1141 {
1182 row = screen.cur.row + TermWin.saveLines; 1142 line_t &l = ROW(screen.cur.row);
1183 1143
1184 if (screen.tlen[row] == 0) 1144 l.touch ();
1185 return; /* um, yeah? */ 1145 l.is_longer (0);
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1146
1189 scr_gotorc (0, 0, R_RELATIVE); 1147 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1148 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1149 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1150 }
1193} 1151}
1194#endif 1152#endif
1195 1153
1196/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1197/* 1155/*
1198 * Goto Row/Column 1156 * Goto Row/Column
1199 */ 1157 */
1200void 1158void
1201rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1202{ 1160{
1203 want_refresh = 1; 1161 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1205 1163
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1165 clamp_it (screen.cur.col, 0, ncol - 1);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1209 1166
1210 screen.flags &= ~Screen_WrapNext; 1167 screen.flags &= ~Screen_WrapNext;
1211 1168
1212 if (relative & R_RELATIVE) 1169 if (relative & R_RELATIVE)
1213 { 1170 {
… …
1231 else 1188 else
1232 { 1189 {
1233 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1234 { /* relative origin mode */ 1191 { /* relative origin mode */
1235 screen.cur.row = row + screen.tscroll; 1192 screen.cur.row = row + screen.tscroll;
1236 MIN_IT (screen.cur.row, screen.bscroll); 1193 min_it (screen.cur.row, screen.bscroll);
1237 } 1194 }
1238 else 1195 else
1239 screen.cur.row = row; 1196 screen.cur.row = row;
1240 } 1197 }
1241 1198
1242 MAX_IT (screen.cur.row, 0); 1199 clamp_it (screen.cur.row, 0, nrow - 1);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1244} 1200}
1245 1201
1246/* ------------------------------------------------------------------------- */ 1202/* ------------------------------------------------------------------------- */
1247/* 1203/*
1248 * direction should be UP or DN 1204 * direction should be UP or DN
1249 */ 1205 */
1250void 1206void
1251rxvt_term::scr_index (enum page_dirn direction) 1207rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1252{ 1208{
1253 int dirn; 1209 int dirn;
1254 1210
1255 want_refresh = 1; 1211 want_refresh = 1;
1256 ZERO_SCROLLBACK (); 1212 ZERO_SCROLLBACK ();
… …
1259 1215
1260 screen.flags &= ~Screen_WrapNext; 1216 screen.flags &= ~Screen_WrapNext;
1261 1217
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1218 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1219 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1220 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1221 else
1266 screen.cur.row += dirn; 1222 screen.cur.row += dirn;
1267 1223
1268 MAX_IT (screen.cur.row, 0); 1224 clamp_it (screen.cur.row, 0, nrow - 1);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1270 selection_check (0); 1225 selection_check (0);
1271} 1226}
1272 1227
1273/* ------------------------------------------------------------------------- */ 1228/* ------------------------------------------------------------------------- */
1274/* 1229/*
… …
1276 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1277 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1278 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1279 */ 1234 */
1280void 1235void
1281rxvt_term::scr_erase_line (int mode) 1236rxvt_term::scr_erase_line (int mode) NOTHROW
1282{ 1237{
1283 unsigned int row, col, num; 1238 unsigned int col, num;
1284 1239
1285 want_refresh = 1; 1240 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1241 ZERO_SCROLLBACK ();
1287 1242
1288 selection_check (1); 1243 selection_check (1);
1289 1244
1290 row = TermWin.saveLines + screen.cur.row; 1245 line_t &line = ROW(screen.cur.row);
1246
1247 line.touch ();
1248 line.is_longer (0);
1249
1291 switch (mode) 1250 switch (mode)
1292 { 1251 {
1293 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1253 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1254 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1255 min_it (line.l, col);
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1300 break; 1259 break;
1301 case 1: /* erase to beginning of line */ 1260 case 1: /* erase to beginning of line */
… …
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1265 CLEAR_SELECTION ();
1307 break; 1266 break;
1308 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1309 col = 0; 1268 col = 0;
1310 num = TermWin.ncol; 1269 num = ncol;
1311 screen.tlen[row] = 0; 1270 line.l = 0;
1312 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1272 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1273 CLEAR_SELECTION ();
1315 break; 1274 break;
1316 default: 1275 default:
1317 return; 1276 return;
1318 } 1277 }
1319 1278
1320 if (screen.text[row]) 1279 scr_blank_line (line, col, num, rstyle);
1321 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1322 else
1323 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1324} 1280}
1325 1281
1326/* ------------------------------------------------------------------------- */ 1282/* ------------------------------------------------------------------------- */
1327/* 1283/*
1328 * Erase part of whole of the screen 1284 * Erase part of whole of the screen
1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1332 */ 1288 */
1333void 1289void
1334rxvt_term::scr_erase_screen (int mode) 1290rxvt_term::scr_erase_screen (int mode) NOTHROW
1335{ 1291{
1336 int num; 1292 int num;
1337 int32_t row, row_offset; 1293 int32_t row;
1338 rend_t ren; 1294 rend_t ren;
1339 XGCValues gcvalue; 1295 XGCValues gcvalue;
1340 1296
1341 want_refresh = 1; 1297 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1298 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1299
1346 switch (mode) 1300 switch (mode)
1347 { 1301 {
1348 case 0: /* erase to end of screen */ 1302 case 0: /* erase to end of screen */
1349 selection_check (1); 1303 selection_check (1);
1350 scr_erase_line (0); 1304 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1305 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1306 num = nrow - row;
1353 break; 1307 break;
1354 case 1: /* erase to beginning of screen */ 1308 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1309 selection_check (3);
1356 scr_erase_line (1); 1310 scr_erase_line (1);
1357 row = 0; 1311 row = 0;
1358 num = screen.cur.row; 1312 num = screen.cur.row;
1359 break; 1313 break;
1360 case 2: /* erase whole screen */ 1314 case 2: /* erase whole screen */
1361 selection_check (3); 1315 selection_check (3);
1362 row = 0; 1316 row = 0;
1363 num = TermWin.nrow; 1317 num = nrow;
1364 break; 1318 break;
1365 default: 1319 default:
1366 return; 1320 return;
1367 } 1321 }
1368 1322
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1324 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1325 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1326 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1327 CLEAR_SELECTION ();
1374 1328
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1376 return; 1330 return;
1377 1331
1378 MIN_IT (num, (TermWin.nrow - row)); 1332 min_it (num, nrow - row);
1379 1333
1380 if (rstyle & (RS_RVid | RS_Uline)) 1334 if (rstyle & (RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1335 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1336 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1337 {
… …
1385 CLEAR_ROWS (row, num); 1339 CLEAR_ROWS (row, num);
1386 } 1340 }
1387 else 1341 else
1388 { 1342 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1393 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1395 } 1349 }
1396 1350
1397 for (; num--; row++) 1351 for (; num--; row++)
1398 { 1352 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1400 screen.tlen[row + row_offset] = 0; 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1402 } 1355 }
1403} 1356}
1357
1358#if !ENABLE_MINIMAL
1359void
1360rxvt_term::scr_erase_savelines () NOTHROW
1361{
1362 want_refresh = 1;
1363 ZERO_SCROLLBACK ();
1364
1365 top_row = 0;
1366}
1367#endif
1404 1368
1405/* ------------------------------------------------------------------------- */ 1369/* ------------------------------------------------------------------------- */
1406/* 1370/*
1407 * Fill the screen with `E's 1371 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1372 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1373 */
1410void 1374void
1411rxvt_term::scr_E () 1375rxvt_term::scr_E () NOTHROW
1412{ 1376{
1413 int i, j, k; 1377 rend_t fs;
1414 rend_t *r1, fs;
1415 1378
1416 want_refresh = 1; 1379 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1380 ZERO_SCROLLBACK ();
1418 1381
1419 num_scr_allow = 0; 1382 num_scr_allow = 0;
1420 selection_check (3); 1383 selection_check (3);
1421 1384
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1385 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1386 for (int row = nrow; row--; )
1424 { 1387 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1388 line_t &line = ROW(row);
1389
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1390 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1391 rend_t *r1 = line.r;
1392
1393 for (int j = ncol; j--; )
1428 *r1++ = fs; 1394 *r1++ = fs;
1395
1396 line.is_longer (0);
1397 line.touch (ncol);
1429 } 1398 }
1430} 1399}
1431 1400
1432/* ------------------------------------------------------------------------- */ 1401/* ------------------------------------------------------------------------- */
1433/* 1402/*
1434 * Insert/Delete <count> lines 1403 * Insert/Delete <count> lines
1435 */ 1404 */
1436void 1405void
1437rxvt_term::scr_insdel_lines (int count, int insdel) 1406rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1438{ 1407{
1439 int end; 1408 int end;
1440 1409
1441 ZERO_SCROLLBACK (); 1410 ZERO_SCROLLBACK ();
1442 1411
… …
1454 count = end; 1423 count = end;
1455 } 1424 }
1456 1425
1457 scr_do_wrap (); 1426 scr_do_wrap ();
1458 1427
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1428 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1429}
1461 1430
1462/* ------------------------------------------------------------------------- */ 1431/* ------------------------------------------------------------------------- */
1463/* 1432/*
1464 * Insert/Delete <count> characters from the current position 1433 * Insert/Delete <count> characters from the current position
1465 */ 1434 */
1466void 1435void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1468{ 1437{
1469 int col, row; 1438 int col, row;
1470 rend_t tr; 1439 rend_t tr;
1471 text_t *stp;
1472 rend_t *srp;
1473 int16_t *slp;
1474 1440
1475 want_refresh = 1; 1441 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1442 ZERO_SCROLLBACK ();
1477 1443
1478 if (count <= 0) 1444 if (count <= 0)
1479 return; 1445 return;
1480 1446
1481 scr_do_wrap (); 1447 scr_do_wrap ();
1482 1448
1483 selection_check (1); 1449 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1450 min_it (count, ncol - screen.cur.col);
1485 1451
1486 row = screen.cur.row + TermWin.saveLines;
1487
1488 stp = screen.text[row];
1489 srp = screen.rend[row]; 1452 row = screen.cur.row;
1490 slp = &screen.tlen[row]; 1453
1454 line_t *line = &ROW(row);
1455
1456 line->touch ();
1457 line->is_longer (0);
1491 1458
1492 switch (insdel) 1459 switch (insdel)
1493 { 1460 {
1494 case INSERT: 1461 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1463 {
1497 stp[col] = stp[col - count]; 1464 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1465 line->r[col] = line->r[col - count];
1499 } 1466 }
1500 1467
1501 if (*slp != -1) 1468 line->l = min (line->l + count, ncol);
1502 {
1503 *slp += count;
1504 MIN_IT (*slp, TermWin.ncol);
1505 }
1506 1469
1507 if (selection.op && current_screen == selection.screen 1470 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1472 {
1510 if (selection.end.row != screen.cur.row 1473 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1474 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1475 CLEAR_SELECTION ();
1513 else 1476 else
1514 { /* shift selection */ 1477 { /* shift selection */
1515 selection.beg.col += count; 1478 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1479 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1480 selection.end.col += count;
1518 } 1481 }
1519 } 1482 }
1520 1483
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1484 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1485 break;
1524 1486
1525 case ERASE: 1487 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1488 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1489 selection_check (1);
1528 screen.cur.col -= count; 1490 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1491
1530 (unsigned int)count, rstyle); 1492 line->l = max (line->l - count, 0);
1493 scr_blank_line (*line, screen.cur.col, count, rstyle);
1531 break; 1494 break;
1532 1495
1533 case DELETE: 1496 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1535 1498
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1499 for (col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1500 {
1538 stp[col] = stp[col + count]; 1501 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1502 line->r[col] = line->r[col + count];
1540 } 1503 }
1541 1504
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1505 line->l = max (line->l - count, 0);
1543 (unsigned int)count, tr); 1506 scr_blank_line (*line, ncol - count, count, tr);
1544
1545 if (*slp == -1) /* break line continuation */
1546 *slp = TermWin.ncol;
1547
1548 *slp -= count;
1549 MAX_IT (*slp, 0);
1550 1507
1551 if (selection.op && current_screen == selection.screen 1508 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1510 {
1554 if (selection.end.row != screen.cur.row 1511 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1512 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1513 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1514 CLEAR_SELECTION ();
1558 else 1515 else
1559 { 1516 {
1560 /* shift selection */ 1517 /* shift selection */
1561 selection.beg.col -= count; 1518 selection.beg.col -= count;
… …
1572/* 1529/*
1573 * Set the scrolling region 1530 * Set the scrolling region
1574 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1531 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1575 */ 1532 */
1576void 1533void
1577rxvt_term::scr_scroll_region (int top, int bot) 1534rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1578{ 1535{
1579 MAX_IT (top, 0); 1536 max_it (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1537 min_it (bot, nrow - 1);
1581 1538
1582 if (top > bot) 1539 if (top > bot)
1583 return; 1540 return;
1584 1541
1585 screen.tscroll = top; 1542 screen.tscroll = top;
… …
1592 * Make the cursor visible/invisible 1549 * Make the cursor visible/invisible
1593 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1550 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1594 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1551 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1595 */ 1552 */
1596void 1553void
1597rxvt_term::scr_cursor_visible (int mode) 1554rxvt_term::scr_cursor_visible (int mode) NOTHROW
1598{ 1555{
1599 want_refresh = 1; 1556 want_refresh = 1;
1600 1557
1601 if (mode) 1558 if (mode)
1602 screen.flags |= Screen_VisibleCursor; 1559 screen.flags |= Screen_VisibleCursor;
… …
1609 * Set/unset automatic wrapping 1566 * Set/unset automatic wrapping
1610 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1567 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1611 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1568 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1612 */ 1569 */
1613void 1570void
1614rxvt_term::scr_autowrap (int mode) 1571rxvt_term::scr_autowrap (int mode) NOTHROW
1615{ 1572{
1616 if (mode) 1573 if (mode)
1617 screen.flags |= Screen_Autowrap; 1574 screen.flags |= Screen_Autowrap;
1618 else 1575 else
1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1576 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1628 * and the cursor cannot be moved outside. 1585 * and the cursor cannot be moved outside.
1629 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1586 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1630 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1587 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1631 */ 1588 */
1632void 1589void
1633rxvt_term::scr_relative_origin (int mode) 1590rxvt_term::scr_relative_origin (int mode) NOTHROW
1634{ 1591{
1635 if (mode) 1592 if (mode)
1636 screen.flags |= Screen_Relative; 1593 screen.flags |= Screen_Relative;
1637 else 1594 else
1638 screen.flags &= ~Screen_Relative; 1595 screen.flags &= ~Screen_Relative;
… …
1645 * Set insert/replace mode 1602 * Set insert/replace mode
1646 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1603 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1647 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1604 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1648 */ 1605 */
1649void 1606void
1650rxvt_term::scr_insert_mode (int mode) 1607rxvt_term::scr_insert_mode (int mode) NOTHROW
1651{ 1608{
1652 if (mode) 1609 if (mode)
1653 screen.flags |= Screen_Insert; 1610 screen.flags |= Screen_Insert;
1654 else 1611 else
1655 screen.flags &= ~Screen_Insert; 1612 screen.flags &= ~Screen_Insert;
… …
1661 * XTERM_SEQ: Set tab at current column : ESC H 1618 * XTERM_SEQ: Set tab at current column : ESC H
1662 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1619 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1663 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1620 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1664 */ 1621 */
1665void 1622void
1666rxvt_term::scr_set_tab (int mode) 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1667{ 1624{
1668 if (mode < 0) 1625 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1670 else if (screen.cur.col < TermWin.ncol) 1627 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1628 tabs [screen.cur.col] = !!mode;
1672} 1629}
1673 1630
1674/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
1675/* 1632/*
1676 * Set reverse/normal video 1633 * Set reverse/normal video
1677 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1634 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1635 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1679 */ 1636 */
1680void 1637void
1681rxvt_term::scr_rvideo_mode (int mode) 1638rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1682{ 1639{
1683 XGCValues gcvalue; 1640 rvideo_mode = on;
1684 1641
1642#ifndef NO_BELL
1643 on ^= rvideo_bell;
1644#endif
1645
1685 if (rvideo != mode) 1646 if (rvideo_state != on)
1686 { 1647 {
1687 rvideo = mode; 1648 rvideo_state = on;
1649
1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1691#endif 1653#endif
1692#if TRANSPARENT 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 if (! (options & Opt_transparent) || am_transparent == 0)
1694#endif
1695 XSetWindowBackground (display->display, TermWin.vt,
1696 pix_colors[Color_bg]);
1697 1655
1656 XGCValues gcvalue;
1698 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1701 &gcvalue); 1660
1702 scr_clear (); 1661 scr_clear ();
1703 scr_touch (true); 1662 scr_touch (true);
1704 } 1663 }
1705} 1664}
1706 1665
… …
1708/* 1667/*
1709 * Report current cursor position 1668 * Report current cursor position
1710 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1711 */ 1670 */
1712void 1671void
1713rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1714{ 1673{
1715 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1716} 1675}
1717 1676
1718/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1721 1680
1722/* 1681/*
1723 * Set font style 1682 * Set font style
1724 */ 1683 */
1725void 1684void
1726rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1727{ 1686{
1687#if 0
1728 switch (charsets[screen.charset]) 1688 switch (charsets [screen.charset])
1729 { 1689 {
1730 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
1731 break; 1691 break;
1732 case 'A': /* United Kingdom (UK) */ 1692 case 'A': /* United Kingdom (UK) */
1733 break; 1693 break;
… …
1740 case 'C': /* Finnish character set */ 1700 case 'C': /* Finnish character set */
1741 break; 1701 break;
1742 case 'K': /* German character set */ 1702 case 'K': /* German character set */
1743 break; 1703 break;
1744 } 1704 }
1705#endif
1745} 1706}
1746 1707
1747/* ------------------------------------------------------------------------- */ 1708/* ------------------------------------------------------------------------- */
1748/* 1709/*
1749 * Choose a font 1710 * Choose a font
… …
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1715 */
1755void 1716void
1756rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1718{
1758 screen.charset = set; 1719 screen.charset = set;
1759 set_font_style (); 1720 set_font_style ();
1760} 1721}
1761 1722
… …
1767 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1768 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1769 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1770 */ 1731 */
1771void 1732void
1772rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1773{ 1734{
1774 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1775 set_font_style (); 1736 set_font_style ();
1776} 1737}
1777 1738
… …
1782 1743
1783/* 1744/*
1784 * refresh matching text. 1745 * refresh matching text.
1785 */ 1746 */
1786bool 1747bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1749{
1789 bool found = false; 1750 bool found = false;
1790 1751
1791 for (int i = 0; i < TermWin.nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1792 { 1753 {
1793 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1754 rend_t *drp = drawn_buf[i].r;
1795 1755
1796 for (; col < TermWin.ncol; col++, drp++) 1756 for (int col = 0; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1757 if ((*drp & mask) == value)
1798 { 1758 {
1799 found = true; 1759 found = true;
1800 *drp = ~value; 1760 *drp = ~value;
1801 } 1761 }
… …
1812 PART_END, 1772 PART_END,
1813 RC_COUNT 1773 RC_COUNT
1814}; 1774};
1815 1775
1816void 1776void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1777rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1778{
1819 int i; 1779 int i;
1820 row_col_t rc[RC_COUNT]; 1780 row_col_t rc[RC_COUNT];
1821 1781
1822 if (drawn_text == NULL) /* sanity check */ 1782 if (!drawn_buf) /* sanity check */
1823 return; 1783 return;
1824 1784
1825#ifndef NO_SLOW_LINK_SUPPORT 1785#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1786 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1787 {
1828 y = 0; 1788 y = 0;
1829 height = TermWin.height; 1789 eheight = height;
1830 } 1790 }
1831#endif
1832
1833#ifdef DEBUG_STRICT
1834 x = max (x, 0);
1835 x = min (x, (int)TermWin.width);
1836 y = max (y, 0);
1837 y = min (y, (int)TermWin.height);
1838#endif 1791#endif
1839 1792
1840 /* round down */ 1793 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1794 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1795 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1796 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1797 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1798 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1799
1847 /* sanity checks */ 1800 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1802 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1852 } 1805 }
1853 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809
1810 num_scr_allow = 0;
1856 1811
1857 if (refresh) 1812 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1813 scr_refresh ();
1859} 1814}
1860 1815
1861/* ------------------------------------------------------------------------- */ 1816/* ------------------------------------------------------------------------- */
1862/* 1817/*
1863 * Refresh the entire screen 1818 * Refresh the entire screen
1864 */ 1819 */
1865void 1820void
1866rxvt_term::scr_touch (bool refresh) 1821rxvt_term::scr_touch (bool refresh) NOTHROW
1867{ 1822{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1823 scr_expose (0, 0, width, height, refresh);
1869} 1824}
1870 1825
1871/* ------------------------------------------------------------------------- */ 1826/* ------------------------------------------------------------------------- */
1872/* 1827/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1828 * Move the display so that the line represented by scrollbar value Y is at
1874 * the top of the screen 1829 * the top of the screen
1875 */ 1830 */
1876int 1831void
1877rxvt_term::scr_move_to (int y, int len) 1832rxvt_term::scr_move_to (int y, int len) NOTHROW
1878{ 1833{
1879 long p = 0; 1834 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1880 unsigned int oldviewstart;
1881
1882 oldviewstart = TermWin.view_start;
1883
1884 if (y < len)
1885 {
1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1887 p -= (long) (TermWin.nrow - 1);
1888 p = max (p, 0);
1889 }
1890
1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1892
1893 return scr_changeview (oldviewstart);
1894} 1835}
1895 1836
1896/* ------------------------------------------------------------------------- */ 1837/* ------------------------------------------------------------------------- */
1897/* 1838/*
1898 * Page the screen up/down nlines 1839 * Page the screen up/down nlines
1899 * direction should be UP or DN 1840 * direction should be UP or DN
1900 */ 1841 */
1901int 1842bool
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1843rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1903{ 1844{
1904 int n; 1845 int new_view_start =
1905 unsigned int oldviewstart; 1846 direction == UP ? view_start - nlines
1847 : view_start + nlines;
1906 1848
1907#ifdef DEBUG_STRICT
1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909#endif
1910 oldviewstart = TermWin.view_start;
1911 if (direction == UP)
1912 {
1913 n = TermWin.view_start + nlines;
1914 TermWin.view_start = min (n, TermWin.nscrolled);
1915 }
1916 else
1917 {
1918 n = TermWin.view_start - nlines;
1919 TermWin.view_start = max (n, 0);
1920 }
1921 return scr_changeview (oldviewstart); 1849 return scr_changeview (new_view_start);
1922} 1850}
1923 1851
1924int 1852bool
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1853rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1854{
1855 clamp_it (new_view_start, top_row, 0);
1856
1927 if (TermWin.view_start != oldviewstart) 1857 if (new_view_start == view_start)
1928 { 1858 return false;
1859
1860 num_scr += new_view_start - view_start;
1861 view_start = new_view_start;
1929 want_refresh = 1; 1862 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart);
1931 }
1932 1863
1933 return (int) (TermWin.view_start - oldviewstart); 1864 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1934}
1935 1865
1936/* ------------------------------------------------------------------------- */ 1866 return true;
1937void 1867}
1938rxvt_term::scr_bell () 1868
1939{
1940#ifndef NO_BELL 1869#ifndef NO_BELL
1870void
1871rxvt_term::bell_cb (time_watcher &w)
1872{
1873 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode);
1875}
1876#endif
1877
1878/* ------------------------------------------------------------------------- */
1879void
1880rxvt_term::scr_bell () NOTHROW
1881{
1882#ifndef NO_BELL
1883
1941# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1886 if (option (Opt_mapAlert))
1944# endif 1887# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1888 XMapWindow (dpy, parent[0]);
1946# endif 1889# endif
1890
1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif
1901
1947 if (options & Opt_visualBell) 1902 if (option (Opt_visualBell))
1948 { 1903 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1904 rvideo_bell = true;
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1905 scr_rvideo_mode (rvideo_mode);
1906 display->flush ();
1907
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1951 } 1909 }
1952 else 1910 else
1953 XBell (display->display, 0); 1911 XBell (dpy, 0);
1954#endif 1912#endif
1955} 1913}
1956 1914
1957/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1916/* ARGSUSED */
1959void 1917void
1960rxvt_term::scr_printscreen (int fullhist) 1918rxvt_term::scr_printscreen (int fullhist) NOTHROW
1961{ 1919{
1962#ifdef PRINTPIPE 1920#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1921 int nrows, row_start;
1964 FILE *fd; 1922 FILE *fd;
1965 1923
1966 if ((fd = popen_printer ()) == NULL) 1924 if ((fd = popen_printer ()) == NULL)
1967 return; 1925 return;
1968 1926
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1927 if (fullhist)
1973 row_offset -= TermWin.view_start; 1928 {
1929 nrows = nrow - top_row;
1930 row_start = top_row;
1931 }
1974 else 1932 else
1975 { 1933 {
1976 nrows += TermWin.nscrolled; 1934 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1935 row_start = view_start;
1978 } 1936 }
1979 1937
1980 wctomb (0, 0); 1938 wctomb (0, 0);
1981 1939
1982 for (r1 = 0; r1 < nrows; r1++) 1940 for (int r1 = 0; r1 < nrows; r1++)
1983 { 1941 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1942 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1943 int len = ROW(r1).l;
1986 1944
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1946 {
1989 char mb[MB_LEN_MAX]; 1947 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1948 text_t t = *tp++;
1991 if (t == NOCHAR) 1949 if (t == NOCHAR)
1992 continue; 1950 continue;
… …
2013/* 1971/*
2014 * Refresh the screen 1972 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 1973 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 1974 * screen.text/screen.rend contain what the screen will change to.
2017 */ 1975 */
2018
2019#define FONT_WIDTH(X, Y) \
2020 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021#define FONT_RBEAR(X, Y) \
2022 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023#define FONT_LBEAR(X, Y) \
2024 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025#define IS_FONT_CHAR(X, Y) \
2026 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028void 1976void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 1977rxvt_term::scr_refresh () NOTHROW
2030{ 1978{
2031 unsigned char must_clear, /* use draw_string not draw_image_string */ 1979 unsigned char have_bg,
2032 showcursor; /* show the cursor */ 1980 showcursor; /* show the cursor */
2033 int16_t col, row, /* column/row we're processing */ 1981 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 1982 ocrow; /* old cursor row */
2035 int i, /* tmp */ 1983 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 1984#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 1985 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 1986#endif
2040 rend_t *crp; // cursor rendition pointer 1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */
2041 1990
2042 want_refresh = 0; /* screen is current */ 1991 want_refresh = 0; /* screen is current */
2043 1992
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1993 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 1994 return;
2046 1995
2047 /* 1996 /*
2048 * A: set up vars 1997 * A: set up vars
2049 */ 1998 */
2050 must_clear = 0; 1999 have_bg = 0;
2051 refresh_count = 0; 2000 refresh_count = 0;
2052 2001
2053 row_offset = TermWin.saveLines - TermWin.view_start; 2002#ifdef HAVE_BG_PIXMAP
2054
2055#if XPM_BACKGROUND
2056 must_clear |= (bgPixmap.pixmap != None); 2003 have_bg |= bgPixmap.pixmap != None;
2057#endif
2058#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent);
2060#endif 2004#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 2006
2063 /* 2007 /*
2064 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
2068 /* 2012 /*
2069 * C: set the cursor character (s) 2013 * C: set the cursor character (s)
2070 */ 2014 */
2071 { 2015 {
2072 unsigned char setoldcursor; 2016 unsigned char setoldcursor;
2073 rend_t ccol1, /* Cursor colour */
2074 ccol2; /* Cursor colour2 */
2075 2017
2076 showcursor = (screen.flags & Screen_VisibleCursor); 2018 showcursor = (screen.flags & Screen_VisibleCursor);
2077#ifdef CURSOR_BLINK 2019#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2020 if (hidden_cursor)
2079 showcursor = 0; 2021 showcursor = 0;
… …
2081 2023
2082 if (showcursor) 2024 if (showcursor)
2083 { 2025 {
2084 int col = screen.cur.col; 2026 int col = screen.cur.col;
2085 2027
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2029 col--;
2088 2030
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2031 crp = &ROW(screen.cur.row).r[col];
2090 2032
2033#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor;
2037 else
2038#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol1 = fgcolor_of (rstyle);
2041#else
2042 ccol1 = Color_fg;
2043#endif
2044
2045#ifndef NO_CURSORCOLOR
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol2 = bgcolor_of (rstyle);
2052#else
2053 ccol2 = Color_bg;
2054#endif
2055
2091 if (showcursor && TermWin.focus) 2056 if (showcursor && focus)
2092 { 2057 {
2058 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_RVid; 2059 *crp ^= RS_Uline;
2094#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor;
2098 else 2060 else
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol1 = GET_FGCOLOR (rstyle);
2101#else
2102 ccol1 = Color_fg;
2103#endif
2104 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2;
2106 else 2061 {
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2062 *crp ^= RS_RVid;
2108 ccol2 = GET_BGCOLOR (rstyle);
2109#else
2110 ccol2 = Color_bg;
2111#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2064 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2065 }
2115 } 2066 }
2116 } 2067 }
2117 2068
2118 /* make sure no outline cursor is left around */ 2069 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2070 setoldcursor = 0;
2120 if (ocrow != -1) 2071 if (ocrow != -1)
2121 { 2072 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2073 if (screen.cur.row - view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2074 || screen.cur.col != oldcursor.col)
2124 { 2075 {
2125 if (ocrow < TermWin.nrow 2076 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2077 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2078 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2079
2129 if (TermWin.focus || !showcursor) 2080 if (focus || !showcursor)
2130 oldcursor.row = -1; 2081 oldcursor.row = -1;
2131 else 2082 else
2132 setoldcursor = 1; 2083 setoldcursor = 1;
2133 } 2084 }
2134 } 2085 }
2135 else if (!TermWin.focus) 2086 else if (!focus)
2136 setoldcursor = 1; 2087 setoldcursor = 1;
2137 2088
2138 if (setoldcursor) 2089 if (setoldcursor)
2139 { 2090 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2091 if (screen.cur.row - view_start >= nrow)
2141 oldcursor.row = -1; 2092 oldcursor.row = -1;
2142 else 2093 else
2143 { 2094 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2095 oldcursor.row = screen.cur.row - view_start;
2145 oldcursor.col = screen.cur.col; 2096 oldcursor.col = screen.cur.col;
2146 } 2097 }
2147 } 2098 }
2148 } 2099 }
2149 2100
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2150#if ENABLE_OVERLAY 2102#if ENABLE_OVERLAY
2151 scr_swap_overlay (); 2103 scr_swap_overlay ();
2152#endif 2104#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156 2105
2157#ifndef NO_SLOW_LINK_SUPPORT 2106#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2107 /*
2159 * D: CopyArea pass - very useful for slower links 2108 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2109 * This has been deliberately kept simple.
2161 */ 2110 */
2162 i = num_scr;
2163 if (!display->is_local 2111 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2112 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2113 && abs (num_scr) < nrow && !have_bg)
2166 { 2114 {
2167 int16_t nits; 2115 int16_t nits;
2116 int i = num_scr;
2168 int j; 2117 int j;
2169 int len, wlen; 2118 int len, wlen;
2119 dLocal (int, num_scr);
2170 2120
2171 j = TermWin.nrow; 2121 j = nrow;
2172 wlen = len = -1; 2122 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2123 row = i > 0 ? 0 : j - 1;
2124
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2125 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2126 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2127 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2128 {
2178 text_t *stp = screen.text[row + row_offset]; 2129 line_t s = ROW(view_start + row);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2130 line_t d = drawn_buf[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2131 line_t d2 = drawn_buf[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2132
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2133 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2134 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2135 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2136 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2137 nits++;
2190 2138
2191 if (nits > 8) /* XXX: arbitrary choice */ 2139 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2140 {
2193 for (col = TermWin.ncol; col--; ) 2141 for (col = ncol; col--; )
2194 { 2142 {
2195 *dtp++ = *dtp2++; 2143 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2144 *d.r++ = *d2.r++;
2197 } 2145 }
2198 2146
2199 if (len == -1) 2147 if (len == -1)
2200 len = row; 2148 len = row;
2201 2149
2202 wlen = row; 2150 wlen = row;
2203 continue; 2151 continue;
2204 } 2152 }
2205 } 2153 }
2206 2154
2207 if (len != -1) 2155 if (len >= 0)
2208 { 2156 {
2209 /* also comes here at end if needed because of >= above */ 2157 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2158 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2159 ::swap (wlen, len);
2212 2160
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2161 XGCValues gcv;
2162
2163 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2164 XCopyArea (dpy, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2165 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2166 (unsigned int)this->width,
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2167 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2168 0, Row2Pixel (len));
2169 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2170
2218 len = -1; 2171 len = -1;
2219 } 2172 }
2220 } 2173 }
2221 } 2174 }
2222#endif 2175#endif
2223 2176
2224 /* 2177 /*
2225 * E: main pass across every character 2178 * E: main pass across every character
2226 */ 2179 */
2227 for (row = 0; row < TermWin.nrow; row++) 2180 for (row = 0; row < nrow; row++)
2228 { 2181 {
2229 text_t *stp = screen.text[row + row_offset]; 2182 text_t *stp = ROW(view_start + row).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2183 rend_t *srp = ROW(view_start + row).r;
2231 text_t *dtp = drawn_text[row]; 2184 text_t *dtp = drawn_buf[row].t;
2232 rend_t *drp = drawn_rend[row]; 2185 rend_t *drp = drawn_buf[row].r;
2233 2186
2234 /* 2187 /*
2235 * E2: OK, now the real pass 2188 * E2: OK, now the real pass
2236 */ 2189 */
2237 int ypixel = (int)Row2Pixel (row); 2190 int ypixel = (int)Row2Pixel (row);
2238 2191
2239 for (col = 0; col < TermWin.ncol; col++) 2192 for (col = 0; col < ncol; col++)
2240 { 2193 {
2241 /* compare new text with old - if exactly the same then continue */ 2194 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2195 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2196 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2197 || (stp[col] == ' ' /* space w/ no background change */
… …
2258 dtp[col] = stp[col]; 2211 dtp[col] = stp[col];
2259 drp[col] = rend; 2212 drp[col] = rend;
2260 2213
2261 int xpixel = Col2Pixel (col); 2214 int xpixel = Col2Pixel (col);
2262 2215
2263 for (i = 0; ++col < TermWin.ncol; ) 2216 for (i = 0; ++col < ncol; )
2264 { 2217 {
2265 if (stp[col] == NOCHAR) 2218 if (stp[col] == NOCHAR)
2266 { 2219 {
2267 dtp[col] = stp[col]; 2220 dtp[col] = stp[col];
2268 drp[col] = rend; 2221 drp[col] = rend;
… …
2278 count++; 2231 count++;
2279 2232
2280 if (stp[col] != dtp[col] 2233 if (stp[col] != dtp[col]
2281 || !RS_SAME (srp[col], drp[col])) 2234 || !RS_SAME (srp[col], drp[col]))
2282 { 2235 {
2283 if (must_clear && (i++ > count / 2)) 2236 if (have_bg && (i++ > count / 2))
2284 break; 2237 break;
2285 2238
2286 dtp[col] = stp[col]; 2239 dtp[col] = stp[col];
2287 drp[col] = rend; 2240 drp[col] = rend;
2288 i = 0; 2241 i = 0;
2289 } 2242 }
2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2243 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2291 break; 2244 break;
2292 } 2245 }
2293 2246
2294 col--; /* went one too far. move back */ 2247 col--; /* went one too far. move back */
2295 count -= i; /* dump any matching trailing chars */ 2248 count -= i; /* dump any matching trailing chars */
2296 2249
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2250 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2251 while (i && text[count] == NOCHAR)
2299 count++, i--; 2252 count++, i--;
2300 2253
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2313 /* 2254 /*
2314 * Determine the attributes for the string 2255 * Determine the attributes for the string
2315 */ 2256 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2257 int fore = fgcolor_of (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2258 int back = bgcolor_of (rend); // desired background
2318 2259
2319 // only do special processing if ana attributes are set, which is rare 2260 // only do special processing if any attributes are set, which is unlikely
2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2321 { 2262 {
2322 bool invert = rend & RS_RVid; 2263 bool invert = rend & RS_RVid;
2323 2264
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold 2266 if (rend & RS_Bold
… …
2342 else 2283 else
2343 invert = !invert; 2284 invert = !invert;
2344# endif 2285# endif
2345 } 2286 }
2346 2287
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL; 2289 fore = Color_UL;
2349#endif 2290#endif
2350 2291
2351 if (invert) 2292 if (invert)
2352 { 2293 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2353 SWAP_IT (fore, back, int); 2300 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2354 2305
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2306#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2356 if (ISSET_PIXCOLOR (Color_RV)) 2308 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV; 2309 back = Color_RV;
2310# endif
2311 if (fore == back)
2312 {
2313 fore = Color_bg;
2314 back = Color_fg;
2315 }
2358#endif 2316#endif
2359 } 2317 }
2360 2318
2361#ifdef TEXT_BLINK 2319#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2368 } 2326 }
2369 else if (hidden_text) 2327 else if (hidden_text)
2370 fore = back; 2328 fore = back;
2371 } 2329 }
2372#endif 2330#endif
2331
2332#if ENABLE_STYLES
2333 // "careful" (too wide) character handling
2334
2335 // include previous careful character(s) if possible, looks nicer (best effort...)
2336 while (text > stp
2337 && srp[text - stp - 1] & RS_Careful
2338 && RS_SAME (rend, srp[text - stp - 1]))
2339 text--, count++, xpixel -= fwidth;
2340
2341 // force redraw after "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2343 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2344
2345 // force redraw before "careful" characters to avoid pixel droppings
2346 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2347 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2348#endif
2373 } 2349 }
2374 2350
2375 /* 2351 /*
2376 * Actually do the drawing of the string here 2352 * Actually do the drawing of the string here
2377 */ 2353 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2355
2380 if (back == fore)
2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2382 TermWin.fwidth * count, TermWin.fheight,
2383 back);
2384 else if (back == Color_bg) 2356 if (have_bg && back == Color_bg)
2385 { 2357 {
2386 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2387 {
2388 CLEAR_CHARS (xpixel, ypixel, count);
2389 2359
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2361 if (text[i] != ' ')
2392 { 2362 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2394 break; 2364 goto did_clear;
2395 }
2396 } 2365 }
2397 else 2366
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2399 } 2369 }
2400 else 2370 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2372
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2374 {
2375#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else
2379#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2380 XSetForeground (dpy, gc, pix_colors[fore]);
2381
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2382 XDrawLine (dpy, drawBuffer, gc,
2407 xpixel, ypixel + font->ascent + 1, 2383 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2385 }
2410 } /* for (col....) */ 2386 } /* for (col....) */
2411 } /* for (row....) */ 2387 } /* for (row....) */
2412 2388
2413#if ENABLE_OVERLAY 2389#if ENABLE_OVERLAY
2414 scr_swap_overlay (); 2390 scr_swap_overlay ();
2415#endif 2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2416 2393
2417 /* 2394 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2395 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2396 */
2420 if (showcursor) 2397 if (showcursor)
2421 { 2398 {
2422 if (TermWin.focus) 2399 if (focus)
2400 {
2401 if (option (Opt_cursorUnderline))
2402 *crp ^= RS_Uline;
2403 else
2423 { 2404 {
2424 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2407 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2408#endif
2409 }
2428 } 2410 }
2429 else if (oldcursor.row >= 0) 2411 else if (oldcursor.row >= 0)
2430 { 2412 {
2413 int cursorwidth = 1;
2414 int col = oldcursor.col;
2415
2416 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2417 col--;
2418
2419 while (col + cursorwidth < ncol
2420 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2421 cursorwidth++;
2422
2431#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2434#endif 2427#endif
2435 int cursorwidth = 1; 2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2429
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2441 Col2Pixel (oldcursor.col), 2431 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2435 }
2446 } 2436 }
2447 2437
2448 /* 2438 /*
2449 * H: cleanup selection 2439 * H: cleanup selection
2450 */ 2440 */
2451 scr_reverse_selection (); 2441 scr_reverse_selection ();
2452 2442
2453 if (refresh_type & SMOOTH_REFRESH)
2454 XFlush (display->display);
2455
2456 num_scr = 0; 2443 num_scr = 0;
2457 num_scr_allow = 1; 2444 num_scr_allow = 1;
2458} 2445}
2459 2446
2460void 2447void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2462{ 2449{
2463 if (!rp || !tp) 2450 if (!l.t)
2464 return; 2451 return;
2465 2452
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2454
2455 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2456 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2457}
2469 2458
2470void 2459void
2471rxvt_term::scr_remap_chars () 2460rxvt_term::scr_remap_chars () NOTHROW
2472{ 2461{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2462 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2463 scr_remap_chars (row_buf [i]);
2475 2464
2476 for (int i = TermWin.nrow; i--; ) 2465 for (int i = nrow; i--; )
2477 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2480 } 2466 {
2467 scr_remap_chars (drawn_buf [i]);
2468 scr_remap_chars (swap_buf [i]);
2469 }
2481} 2470}
2482 2471
2483void 2472void
2484rxvt_term::scr_recolour () 2473rxvt_term::scr_recolour () NOTHROW
2485{ 2474{
2486 if (1 2475#ifdef HAVE_BG_PIXMAP
2487#if TRANSPARENT 2476 bgPixmap.apply ();
2488 && !am_transparent 2477#else
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2479 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2482 if (scrollBar.win)
2500 { 2483 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2503 scrollbar_show (0); 2486 scrollbar_show (0);
2504 } 2487 }
2505#endif 2488# endif
2506 } 2489#endif
2507 2490
2508 scr_clear (); 2491 scr_clear ();
2509 scr_touch (true); 2492 scr_touch (true);
2510 want_refresh = 1; 2493 want_refresh = 1;
2511} 2494}
2512 2495
2513/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2514void 2497void
2515rxvt_term::scr_clear (bool really) 2498rxvt_term::scr_clear (bool really) NOTHROW
2516{ 2499{
2517 if (!TermWin.mapped) 2500 if (!mapped)
2518 return; 2501 return;
2519 2502
2520 num_scr_allow = 0; 2503 num_scr_allow = 0;
2521 want_refresh = 1; 2504 want_refresh = 1;
2522 2505
2523#if TRANSPARENT 2506 if (really)
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2507 XClearWindow (dpy, vt);
2508}
2509
2510void
2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2517 {
2518 text_t *stp = ROW(row).t;
2519 rend_t *srp = ROW(row).r;
2520
2521 for (col = beg_col; col < end_col; col++)
2522 srp[col] ^= rstyle1;
2523
2524 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2525 srp[col] ^= rstyle2;
2526
2527 if (++col < end_col)
2528 srp[col] ^= rstyle2;
2525 { 2529 }
2526 int i; 2530}
2527 2531
2528 if (!(options & Opt_transparent_all)) 2532void
2533rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2534{
2535 int view_end = view_start + nrow;
2536 int row, col;
2537
2538 if (beg_row >= view_start)
2539 {
2540 col = beg_col;
2541 row = beg_row;
2542 }
2543 else
2544 {
2529 i = 0; 2545 col = 0;
2546 row = view_start;
2547 }
2548
2549 for (; row < min (end_row, view_end); row++, col = 0)
2550 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2551 srp[col] ^= rstyle;
2552
2553 if (row == end_row)
2554 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2555 srp[col] ^= rstyle;
2556}
2557
2558/* ------------------------------------------------------------------------- */
2559void
2560rxvt_term::scr_reverse_selection () NOTHROW
2561{
2562 if (selection.op
2563 && current_screen == selection.screen
2564 && selection.end.row >= view_start)
2565 {
2566#if !ENABLE_MINIMAL
2567 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline);
2530 else 2571 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif 2572#endif
2538 2573 scr_xor_span (selection.beg.row, selection.beg.col,
2539 if (really) 2574 selection.end.row, selection.end.col,
2540 XClearWindow (display->display, TermWin.vt); 2575 RS_RVid);
2541}
2542
2543/* ------------------------------------------------------------------------- */
2544void
2545rxvt_term::scr_reverse_selection ()
2546{
2547 if (selection.op && current_screen == selection.screen)
2548 {
2549 int end_row = TermWin.saveLines - TermWin.view_start;
2550 int i = selection.beg.row + TermWin.saveLines;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553
2554#if ENABLE_FRILLS
2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2569 {
2570 col = 0;
2571 i = end_row;
2572 }
2573
2574 end_row += TermWin.nrow;
2575
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid;
2579
2580 if (i == row && i < end_row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid;
2583 }
2584 } 2576 }
2585} 2577}
2586 2578
2587/* ------------------------------------------------------------------------- */ 2579/* ------------------------------------------------------------------------- */
2588/* 2580/*
2589 * Dump the whole scrollback and screen to the passed filedescriptor. The 2581 * Dump the whole scrollback and screen to the passed filedescriptor. The
2590 * invoking routine must close the fd. 2582 * invoking routine must close the fd.
2591 */ 2583 */
2592#if 0 2584#if 0
2593void 2585void
2594rxvt_term::scr_dump (int fd) 2586rxvt_term::scr_dump (int fd) NOTHROW
2595{ 2587{
2596 int row, wrote; 2588 int row, wrote;
2597 unsigned int width, towrite; 2589 unsigned int width, towrite;
2598 char r1[] = "\n"; 2590 char r1[] = "\n";
2599 2591
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2592 for (row = saveLines - nsaved;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2593 row < saveLines + nrow - 1; row++)
2602 { 2594 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2595 width = row_buf[row].l >= 0 ? row_buf[row].l
2604 : TermWin.ncol; 2596 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2597 for (towrite = width; towrite; towrite -= wrote)
2606 { 2598 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2599 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2608 towrite); 2600 towrite);
2609 if (wrote < 0) 2601 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2602 return; /* XXX: death, no report */
2611 } 2603 }
2612 if (screen.tlen[row] >= 0) 2604 if (row_buf[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2605 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2615 } 2607 }
2616} 2608}
2617#endif 2609#endif
2618 2610
2619/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2614void
2627rxvt_term::selection_check (int check_more) 2615rxvt_term::selection_check (int check_more) NOTHROW
2628{ 2616{
2629 row_col_t pos; 2617 row_col_t pos;
2630 2618
2631 if (!selection.op) 2619 if (!selection.op)
2632 return; 2620 return;
2633 2621
2634 pos.row = pos.col = 0; 2622 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2626 || (check_more == 1
2642 && current_screen == selection.screen 2627 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2630 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2632 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2633 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2634 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2635 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2636 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2637 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2638 CLEAR_SELECTION ();
2654} 2639}
2655 2640
2656/* ------------------------------------------------------------------------- */ 2641/* ------------------------------------------------------------------------- */
2657/* 2642/*
2658 * Paste a selection direct to the command fd 2643 * Paste a selection direct to the command fd
2659 */ 2644 */
2660void 2645void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2646rxvt_term::paste (char *data, unsigned int len) NOTHROW
2662{ 2647{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2648 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PROP_SIZE) 2649 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PROP_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2650 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2651 data[i] = C0_CR;
2675 2652
2676 tt_write (ds, (int)n); 2653 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2654}
2681 2655
2682/* ------------------------------------------------------------------------- */ 2656/* ------------------------------------------------------------------------- */
2683/* 2657/*
2684 * Respond to a notification that a primary selection has been sent 2658 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2659 * EXT: SelectionNotify
2686 */ 2660 */
2687int 2661void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2689{ 2663{
2690 long nread = 0;
2691 unsigned long bytes_after;
2692 XTextProperty ct;
2693
2694 if (prop == None) /* check for failed XConvertSelection */ 2664 if (prop == None) /* check for failed XConvertSelection */
2695 { 2665 {
2696 if ((selection_type & Sel_CompoundText)) 2666 if ((selection_type & Sel_CompoundText))
2697 { 2667 {
2698 int selnum = selection_type & Sel_whereMask; 2668 int selnum = selection_type & Sel_whereMask;
… …
2711 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2681 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2712 else 2682 else
2713 selection_type = 0; 2683 selection_type = 0;
2714 } 2684 }
2715 2685
2716 return 0; 2686 return;
2717 }
2718
2719 for (;;)
2720 { 2687 }
2721 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2688
2722 (long) (PROP_SIZE / 4), delete_prop, 2689 unsigned long bytes_after;
2690 XTextProperty ct;
2691
2692 if (XGetWindowProperty (dpy, win, prop,
2693 0, PROP_SIZE / 4,
2694 delete_prop, AnyPropertyType,
2695 &ct.encoding, &ct.format,
2696 &ct.nitems, &bytes_after,
2697 &ct.value) != Success)
2698 {
2699 ct.value = 0;
2700 goto bailout;
2701 }
2702
2703 if (ct.encoding == None)
2704 goto bailout;
2705
2706 if (bytes_after)
2707 {
2708 // fetch and append remaining data
2709 XTextProperty ct2;
2710
2711 if (XGetWindowProperty (dpy, win, prop,
2712 ct.nitems / 4, (bytes_after + 3) / 4,
2713 delete_prop, AnyPropertyType,
2723 AnyPropertyType, &ct.encoding, &ct.format, 2714 &ct2.encoding, &ct2.format,
2724 &ct.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2725 &ct.value) != Success) 2716 &ct2.value) != Success)
2726 break; 2717 goto bailout;
2727 2718
2728 if (ct.encoding == 0) 2719 // realloc should be compatible to XFree, here, and elsewhere, too
2729 break; 2720 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2721 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2722 ct.nitems += ct2.nitems;
2730 2723
2724 XFree (ct2.value);
2725 }
2726
2727 if (ct.value == 0)
2728 goto bailout;
2729
2731 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2732 { 2731 {
2733 // INCR selection, start handshake 2732 // INCR selection, start handshake
2733 if (!delete_prop)
2734 XDeleteProperty (display->display, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2735
2735 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2737 incr_buf_fill = 0;
2736 incr_ev.start (NOW + 10); 2738 incr_ev.start (NOW + 10);
2737 break;
2738 }
2739 2739
2740 if (ct.value == NULL) 2740 goto bailout;
2741 continue; 2741 }
2742 2742
2743 if (ct.nitems == 0) 2743 if (ct.nitems == 0)
2744 {
2745 if (selection_wait == Sel_incr)
2746 {
2747 XFree (ct.value);
2748
2749 // finally complete, now paste the whole thing
2750 selection_wait = Sel_normal;
2751 ct.value = (unsigned char *)incr_buf;
2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0;
2754 incr_buf_size = 0;
2755 incr_ev.stop ();
2744 { 2756 }
2757 else
2758 {
2745 if (selection_wait == Sel_normal && nread == 0 2759 if (selection_wait == Sel_normal
2746 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2747 { 2761 {
2748 /* 2762 /*
2749 * pass through again trying CUT_BUFFER0 if we've come from 2763 * pass through again trying CUT_BUFFER0 if we've come from
2750 * XConvertSelection () but nothing was presented 2764 * XConvertSelection () but nothing was presented
2751 */ 2765 */
2752 selection_paste (display->root, XA_CUT_BUFFER0, False); 2766 selection_paste (display->root, XA_CUT_BUFFER0, False);
2753 } 2767 }
2754 2768
2755 nread = -1; /* discount any previous stuff */ 2769 goto bailout;
2756 break; 2770 }
2771 }
2772 else if (selection_wait == Sel_incr)
2773 {
2774 incr_ev.start (NOW + 10);
2775
2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2757 } 2777 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2780 }
2758 2781
2782 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2759 nread += ct.nitems; 2783 incr_buf_fill += ct.nitems;
2760 2784
2785 goto bailout;
2786 }
2787
2761 char **cl; 2788 char **cl;
2762 int cr; 2789 int cr;
2763 2790
2764#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2765 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2766 // so recode it manually 2793 // so recode it manually
2767 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2768 { 2795 {
2769 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2770 char *s = rxvt_wcstombs (w); 2797 char *s = rxvt_wcstombs (w);
2771 2798 free (w);
2772 // TODO: strlen == only the first element will be converted. well... 2799 // TODO: strlen == only the first element will be converted. well...
2773 paste ((unsigned char *)s, strlen (s)); 2800 paste (s, strlen (s));
2774
2775 free (s); 2801 free (s);
2776 free (w); 2802 }
2777 }
2778 else 2803 else
2779#endif 2804#endif
2780 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 { 2806 && cl)
2807 {
2782 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2783 paste ((unsigned char *)cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2784 2810
2785 XFreeStringList (cl); 2811 XFreeStringList (cl);
2786 } 2812 }
2787 else 2813 else
2788 paste (ct.value, ct.nitems); 2814 paste ((char *)ct.value, ct.nitems); // paste raw
2789 2815
2790 if (bytes_after == 0) 2816bailout:
2791 break;
2792
2793 XFree (ct.value);
2794 }
2795
2796 if (ct.value)
2797 XFree (ct.value); 2817 XFree (ct.value);
2798 2818
2799 if (selection_wait == Sel_normal) 2819 if (selection_wait == Sel_normal)
2800 selection_wait = Sel_none; 2820 selection_wait = Sel_none;
2801
2802 return (int)nread;
2803} 2821}
2804 2822
2805void 2823void
2806rxvt_term::incr_cb (time_watcher &w) 2824rxvt_term::incr_cb (time_watcher &w) NOTHROW
2807{ 2825{
2808 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2809 2827
2828 incr_buf_size = 0;
2829 free (incr_buf);
2830
2810 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2811} 2832}
2812 2833
2813/*
2814 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2815 */
2816void 2834void
2817rxvt_term::selection_property (Window win, Atom prop) 2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2818{ 2836{
2819 if (prop == None || selection_wait != Sel_incr) 2837 if (prop == None || selection_wait != Sel_incr)
2820 return; 2838 return;
2821 2839
2822 if (selection_paste (win, prop, 1) > 0) 2840 selection_paste (win, prop, true);
2823 incr_ev.start (NOW + 10);
2824 else
2825 {
2826 selection_wait = Sel_none;
2827 incr_ev.stop ();
2828 }
2829} 2841}
2830 2842
2831/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2832/* 2844/*
2833 * Request the current selection: 2845 * Request the current selection:
… …
2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2838 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
2839 * EXT: button 2 release 2851 * EXT: button 2 release
2840 */ 2852 */
2841void 2853void
2842rxvt_term::selection_request (Time tm, int x, int y) 2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2843{ 2855{
2844 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2856 if (selection.text && selnum == Sel_Primary)
2845 return; /* outside window */
2846
2847 if (selection.text)
2848 { /* internal selection */ 2857 { /* internal selection */
2849 char *str = rxvt_wcstombs (selection.text, selection.len); 2858 char *str = rxvt_wcstombs (selection.text, selection.len);
2850 paste ((unsigned char *)str, strlen (str)); 2859 paste (str, strlen (str));
2851 free (str); 2860 free (str);
2852 return; 2861 return;
2853 } 2862 }
2854 else 2863 else
2855 { 2864 {
2856 int i;
2857
2858 selection_request_time = tm; 2865 selection_request_time = tm;
2859 selection_wait = Sel_normal; 2866 selection_wait = Sel_normal;
2860 2867
2861 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2862 {
2863#if X_HAVE_UTF8_STRING 2868#if X_HAVE_UTF8_STRING
2864 selection_type = Sel_UTF8String; 2869 selection_type = Sel_UTF8String;
2865 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2866 return; 2871 return;
2867#else 2872#else
2868 selection_type = Sel_CompoundText; 2873 selection_type = Sel_CompoundText;
2869 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2870 return; 2875 return;
2871#endif 2876#endif
2872 }
2873 } 2877 }
2874 2878
2875 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2879 selection_wait = Sel_none; /* don't loop in selection_paste () */
2876 selection_paste (display->root, XA_CUT_BUFFER0, False); 2880 selection_paste (display->root, XA_CUT_BUFFER0, false);
2877} 2881}
2878 2882
2879int 2883int
2880rxvt_term::selection_request_other (Atom target, int selnum) 2884rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2881{ 2885{
2882 Atom sel; 2886 Atom sel;
2883#ifdef DEBUG_SELECT
2884 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2885#endif
2886 2887
2887 selection_type |= selnum; 2888 selection_type |= selnum;
2888 2889
2889 if (selnum == Sel_Primary) 2890 if (selnum == Sel_Primary)
2890 sel = XA_PRIMARY; 2891 sel = XA_PRIMARY;
2891 else if (selnum == Sel_Secondary) 2892 else if (selnum == Sel_Secondary)
2892 sel = XA_SECONDARY; 2893 sel = XA_SECONDARY;
2893 else 2894 else
2894 sel = xa[XA_CLIPBOARD]; 2895 sel = xa[XA_CLIPBOARD];
2895 2896
2896 if (XGetSelectionOwner (display->display, sel) != None) 2897 if (XGetSelectionOwner (dpy, sel) != None)
2897 { 2898 {
2898 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2899 TermWin.vt, selection_request_time); 2900 vt, selection_request_time);
2900 return 1; 2901 return 1;
2901 } 2902 }
2902 2903
2903 return 0; 2904 return 0;
2904} 2905}
… …
2907/* 2908/*
2908 * Clear all selected text 2909 * Clear all selected text
2909 * EXT: SelectionClear 2910 * EXT: SelectionClear
2910 */ 2911 */
2911void 2912void
2912rxvt_term::selection_clear () 2913rxvt_term::selection_clear () NOTHROW
2913{ 2914{
2914 want_refresh = 1; 2915 want_refresh = 1;
2915 free (selection.text); 2916 free (selection.text);
2916 selection.text = NULL; 2917 selection.text = NULL;
2917 selection.len = 0; 2918 selection.len = 0;
… …
2927 * EXT: button 1 or 3 release 2928 * EXT: button 1 or 3 release
2928 */ 2929 */
2929void 2930void
2930rxvt_term::selection_make (Time tm) 2931rxvt_term::selection_make (Time tm)
2931{ 2932{
2932 int i, col, end_col, row, end_row; 2933 int i;
2933 wchar_t *new_selection_text; 2934 wchar_t *new_selection_text;
2934 text_t *t; 2935 text_t *t;
2935 2936
2936 switch (selection.op) 2937 switch (selection.op)
2937 { 2938 {
… …
2950 selection.op = SELECTION_DONE; 2951 selection.op = SELECTION_DONE;
2951 2952
2952 if (selection.clicks == 4) 2953 if (selection.clicks == 4)
2953 return; /* nothing selected, go away */ 2954 return; /* nothing selected, go away */
2954 2955
2956 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2957 return;
2958
2955 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2959 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2956 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2960 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2957 2961
2958 col = selection.beg.col;
2959 row = selection.beg.row + TermWin.saveLines;
2960 end_row = selection.end.row + TermWin.saveLines;
2961 int ofs = 0; 2962 int ofs = 0;
2962 int extra = 0; 2963 int extra = 0;
2963 2964
2965 int col = selection.beg.col;
2966 int row = selection.beg.row;
2967
2968 int end_col;
2969
2964 for (; row <= end_row; row++, col = 0) 2970 for (; row <= selection.end.row; row++, col = 0)
2965 { 2971 {
2966 end_col = screen.tlen[row]; 2972#if !ENABLE_MINIMAL
2967
2968#if ENABLE_FRILLS
2969 if (selection.rect) 2973 if (selection.rect)
2970 { 2974 {
2971 col = selection.beg.col; 2975 col = selection.beg.col;
2972 end_col = TermWin.ncol + 1; 2976 end_col = ncol + 1;
2977 }
2978 else
2979#endif
2980 end_col = ROW(row).l;
2981
2982 col = max (col, 0);
2983
2984 if (row == selection.end.row
2985#if !ENABLE_MINIMAL
2986 || selection.rect
2987#endif
2973 } 2988 )
2974#endif
2975
2976 MAX_IT (col, 0);
2977
2978 if (end_col == -1)
2979 end_col = TermWin.ncol;
2980
2981 if (row == end_row || selection.rect)
2982 MIN_IT (end_col, selection.end.col); 2989 min_it (end_col, selection.end.col);
2983 2990
2984 t = &screen.text[row][col]; 2991 t = ROW(row).t + col;
2992
2985 for (; col < end_col; col++) 2993 for (; col < end_col; col++)
2986 { 2994 {
2987 if (*t == NOCHAR) 2995 if (*t == NOCHAR)
2988 t++; 2996 t++;
2989#if ENABLE_COMBINING 2997#if ENABLE_COMBINING
… …
3005#endif 3013#endif
3006 else 3014 else
3007 new_selection_text[ofs++] = *t++; 3015 new_selection_text[ofs++] = *t++;
3008 } 3016 }
3009 3017
3010 if (screen.tlen[row] != -1 && row != end_row) 3018#if !ENABLE_MINIMAL
3019 if (selection.rect)
3020 {
3021 while (ofs
3022 && new_selection_text[ofs - 1] != C0_LF
3023 && unicode::is_space (new_selection_text[ofs - 1]))
3024 --ofs;
3025
3011 new_selection_text[ofs++] = C0_LF; 3026 new_selection_text[ofs++] = C0_LF;
3027 }
3028 else
3029#endif
3030 if (!ROW(row).is_longer () && row != selection.end.row)
3031 new_selection_text[ofs++] = C0_LF;
3012 } 3032 }
3013 3033
3014 if (end_col != selection.end.col) 3034 if (end_col != selection.end.col)
3015 new_selection_text[ofs++] = C0_LF; 3035 new_selection_text[ofs++] = C0_LF;
3016 3036
… …
3026 3046
3027 // we usually allocate much more than necessary, so realloc it smaller again 3047 // we usually allocate much more than necessary, so realloc it smaller again
3028 selection.len = ofs; 3048 selection.len = ofs;
3029 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3049 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3030 3050
3051 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3052 return;
3053
3054 selection_grab (tm);
3055}
3056
3057bool
3058rxvt_term::selection_grab (Time tm) NOTHROW
3059{
3060 selection_time = tm;
3061
3031 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3032 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3064 {
3033 display->set_selection_owner (this); 3065 display->set_selection_owner (this);
3066 return true;
3067 }
3034 else 3068 else
3035 rxvt_warn ("can't get primary selection, ignoring.\n"); 3069 {
3070 selection_clear ();
3071 return false;
3072 }
3036 3073
3037#if 0 3074#if 0
3038 XTextProperty ct; 3075 XTextProperty ct;
3039 3076
3040 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3077 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3041 { 3078 {
3042 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3079 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3043 XFree (ct.value); 3080 XFree (ct.value);
3044 } 3081 }
3045#endif 3082#endif
3046
3047 selection_time = tm;
3048} 3083}
3049 3084
3050/* ------------------------------------------------------------------------- */ 3085/* ------------------------------------------------------------------------- */
3051/* 3086/*
3052 * Mark or select text based upon number of clicks: 1, 2, or 3 3087 * Mark or select text based upon number of clicks: 1, 2, or 3
3053 * EXT: button 1 press 3088 * EXT: button 1 press
3054 */ 3089 */
3055void 3090void
3056rxvt_term::selection_click (int clicks, int x, int y) 3091rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3057{ 3092{
3058 clicks = ((clicks - 1) % 3) + 1; 3093 clicks = ((clicks - 1) % 3) + 1;
3059 selection.clicks = clicks; /* save clicks so extend will work */ 3094 selection.clicks = clicks; /* save clicks so extend will work */
3060 3095
3096 if (clicks == 2 && !selection.rect
3097 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3098 {
3099 MEvent.clicks = 1; // what a mess
3100 selection.screen = current_screen;
3101 selection.op = SELECTION_CONT;
3102 return;
3103 }
3104
3061 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3105 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3062 3106
3063 if (clicks == 2 || clicks == 3) 3107 if (clicks == 2 || clicks == 3)
3064 selection_extend_colrow (selection.mark.col, 3108 selection_extend_colrow (selection.mark.col,
3065 selection.mark.row + TermWin.view_start, 3109 selection.mark.row - view_start,
3066 0, /* button 3 */ 3110 0, /* button 3 */
3067 1, /* button press */ 3111 1, /* button press */
3068 0); /* click change */ 3112 0); /* click change */
3069} 3113}
3070 3114
3071/* ------------------------------------------------------------------------- */ 3115/* ------------------------------------------------------------------------- */
3072/* 3116/*
3073 * Mark a selection at the specified col/row 3117 * Mark a selection at the specified col/row
3074 */ 3118 */
3075void 3119void
3076rxvt_term::selection_start_colrow (int col, int row) 3120rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3077{ 3121{
3078 want_refresh = 1; 3122 want_refresh = 1;
3123
3124 selection.mark.row = row + view_start;
3079 selection.mark.col = col; 3125 selection.mark.col = col;
3080 selection.mark.row = row - TermWin.view_start;
3081 3126
3082 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3127 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3083 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084 MAX_IT (selection.mark.col, 0);
3085 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3086 3129
3087 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3088 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3132 --selection.mark.col;
3090 3133
3091 if (selection.op) 3134 if (selection.op)
3092 { /* clear the old selection */ 3135 { /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3136 selection.beg.row = selection.end.row = selection.mark.row;
… …
3108#define DELIMIT_TEXT(x) \ 3151#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3152 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3153#define DELIMIT_REND(x) 1
3111 3154
3112void 3155void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3156rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3157{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3158 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3159 row_col_t bound;
3117 text_t *stp; 3160 text_t *stp;
3118 rend_t *srp; 3161 rend_t *srp;
3119 3162
3120 if (dirn == UP) 3163 if (dirn == UP)
3121 { 3164 {
3122 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3165 bound.row = top_row - 1;
3123 bound.col = 0; 3166 bound.col = 0;
3124 dirnadd = -1; 3167 dirnadd = -1;
3125 } 3168 }
3126 else 3169 else
3127 { 3170 {
3128 bound.row = TermWin.saveLines + TermWin.nrow; 3171 bound.row = nrow;
3129 bound.col = TermWin.ncol - 1; 3172 bound.col = ncol - 1;
3130 dirnadd = 1; 3173 dirnadd = 1;
3131 } 3174 }
3132 3175
3133 row = mark->row + TermWin.saveLines; 3176 row = mark->row;
3134 col = mark->col; 3177 col = max (mark->col, 0);
3135 MAX_IT (col, 0); 3178
3136 /* find the edge of a word */ 3179 /* find the edge of a word */
3137 stp = &screen.text[row][col]; 3180 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3138 w1 = DELIMIT_TEXT (*stp); 3181 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3139
3140 srp = &screen.rend[row][col];
3141 w2 = DELIMIT_REND (*srp);
3142 3182
3143 for (;;) 3183 for (;;)
3144 { 3184 {
3145 for (; col != bound.col; col += dirnadd) 3185 for (; col != bound.col; col += dirnadd)
3146 { 3186 {
… …
3156 break; 3196 break;
3157 } 3197 }
3158 3198
3159 if ((col == bound.col) && (row != bound.row)) 3199 if ((col == bound.col) && (row != bound.row))
3160 { 3200 {
3161 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3201 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3162 { 3202 {
3163 trow = row + dirnadd; 3203 trow = row + dirnadd;
3164 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3204 tcol = dirn == UP ? ncol - 1 : 0;
3165 3205
3166 if (screen.text[trow] == NULL) 3206 if (!ROW(trow).t)
3167 break; 3207 break;
3168 3208
3169 stp = & (screen.text[trow][tcol]); 3209 stp = ROW(trow).t + tcol;
3170 srp = & (screen.rend[trow][tcol]); 3210 srp = ROW(trow).r + tcol;
3171 3211
3172 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3212 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3173 break; 3213 break;
3174 3214
3175 row = trow; 3215 row = trow;
… …
3178 } 3218 }
3179 } 3219 }
3180 break; 3220 break;
3181 } 3221 }
3182 3222
3183Old_Word_Selection_You_Die:
3184 if (dirn == DN) 3223 if (dirn == DN)
3185 col++; /* put us on one past the end */ 3224 col++; /* put us on one past the end */
3186 3225
3187 /* Poke the values back in */ 3226 /* Poke the values back in */
3188 ret->row = row - TermWin.saveLines; 3227 ret->row = row;
3189 ret->col = col; 3228 ret->col = col;
3190} 3229}
3191 3230
3192/* ------------------------------------------------------------------------- */ 3231/* ------------------------------------------------------------------------- */
3193/* 3232/*
… …
3196 * flag == 0 ==> button 1 3235 * flag == 0 ==> button 1
3197 * flag == 1 ==> button 3 press 3236 * flag == 1 ==> button 3 press
3198 * flag == 2 ==> button 3 motion 3237 * flag == 2 ==> button 3 motion
3199 */ 3238 */
3200void 3239void
3201rxvt_term::selection_extend (int x, int y, int flag) 3240rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3202{ 3241{
3203 int col, row; 3242 int col = clamp (Pixel2Col (x), 0, ncol);
3204 3243 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3205 col = Pixel2Col (x);
3206 row = Pixel2Row (y);
3207 MAX_IT (row, 0);
3208 MIN_IT (row, (int)TermWin.nrow - 1);
3209 MAX_IT (col, 0);
3210 MIN_IT (col, (int)TermWin.ncol);
3211 3244
3212 /* 3245 /*
3213 * If we're selecting characters (single click) then we must check first 3246 * If we're selecting characters (single click) then we must check first
3214 * if we are at the same place as the original mark. If we are then 3247 * if we are at the same place as the original mark. If we are then
3215 * select nothing. Otherwise, if we're to the right of the mark, you have to 3248 * select nothing. Otherwise, if we're to the right of the mark, you have to
3216 * be _past_ a character for it to be selected. 3249 * be _past_ a character for it to be selected.
3217 */ 3250 */
3218 if (((selection.clicks % 3) == 1) && !flag 3251 if (((selection.clicks % 3) == 1) && !flag
3219 && (col == selection.mark.col 3252 && (col == selection.mark.col
3220 && (row == selection.mark.row + TermWin.view_start))) 3253 && (row == selection.mark.row - view_start)))
3221 { 3254 {
3222 /* select nothing */ 3255 /* select nothing */
3223 selection.beg.row = selection.end.row = 0; 3256 selection.beg.row = selection.end.row = 0;
3224 selection.beg.col = selection.end.col = 0; 3257 selection.beg.col = selection.end.col = 0;
3225 selection.clicks = 4; 3258 selection.clicks = 4;
… …
3238/* ------------------------------------------------------------------------- */ 3271/* ------------------------------------------------------------------------- */
3239/* 3272/*
3240 * Extend the selection to the specified col/row 3273 * Extend the selection to the specified col/row
3241 */ 3274 */
3242void 3275void
3243rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3276rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3244{ 3277{
3245 int16_t ncol = TermWin.ncol;
3246 int end_col;
3247 row_col_t pos; 3278 row_col_t pos;
3248 enum { 3279 enum {
3249 LEFT, RIGHT 3280 LEFT, RIGHT
3250 } closeto = RIGHT; 3281 } closeto = RIGHT;
3251 3282
… …
3282 selection.beg.col = selection.end.col = selection.mark.col; 3313 selection.beg.col = selection.end.col = selection.mark.col;
3283 selection.beg.row = selection.end.row = selection.mark.row; 3314 selection.beg.row = selection.end.row = selection.mark.row;
3284 } 3315 }
3285 3316
3286 pos.col = col; 3317 pos.col = col;
3287 pos.row = row; 3318 pos.row = view_start + row;
3288
3289 pos.row -= TermWin.view_start; /* adjust for scroll */
3290 3319
3291 /* 3320 /*
3292 * This is mainly xterm style selection with a couple of differences, mainly 3321 * This is mainly xterm style selection with a couple of differences, mainly
3293 * in the way button3 drag extension works. 3322 * in the way button3 drag extension works.
3294 * We're either doing: button1 drag; button3 press; or button3 drag 3323 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3353 } 3382 }
3354 } 3383 }
3355 3384
3356 if (selection.clicks == 1) 3385 if (selection.clicks == 1)
3357 { 3386 {
3358 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3387 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3359 3388 && !ROW(selection.beg.row).is_longer ()
3360 if (selection.beg.col > end_col 3389#if !ENABLE_MINIMAL
3361 && end_col != -1
3362#if ENABLE_FRILLS
3363 && !selection.rect 3390 && !selection.rect
3364#endif 3391#endif
3365 ) 3392 )
3366 selection.beg.col = ncol; 3393 selection.beg.col = ncol;
3367 3394
3368 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3369
3370 if ( 3395 if (
3371 selection.end.col > end_col 3396 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && end_col != -1 3397 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3398#if !ENABLE_MINIMAL
3374 && !selection.rect 3399 && !selection.rect
3375#endif 3400#endif
3376 ) 3401 )
3377 selection.end.col = ncol; 3402 selection.end.col = ncol;
3378 } 3403 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3410 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3411 }
3387 else if (selection.clicks == 3) 3412 else if (selection.clicks == 3)
3388 { 3413 {
3389#if ENABLE_FRILLS 3414#if ENABLE_FRILLS
3390 if ((options & Opt_tripleclickwords)) 3415 if (option (Opt_tripleclickwords))
3391 { 3416 {
3392 int end_row;
3393
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3396 3418
3397 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3419 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3420 {
3399 end_col = screen.tlen[end_row + TermWin.saveLines]; 3421 if (!ROW(end_row).is_longer ())
3400
3401 if (end_col != -1)
3402 { 3422 {
3403 selection.end.row = end_row; 3423 selection.end.row = end_row;
3404 selection.end.col = end_col; 3424 selection.end.col = ROW(end_row).l;
3425# if !ENABLE_MINIMAL
3405 selection_remove_trailing_spaces (); 3426 selection_remove_trailing_spaces ();
3427# endif
3406 break; 3428 break;
3407 } 3429 }
3408 } 3430 }
3409 } 3431 }
3410 else 3432 else
… …
3413 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3435 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3414 selection.mark.col++; 3436 selection.mark.col++;
3415 3437
3416 selection.beg.col = 0; 3438 selection.beg.col = 0;
3417 selection.end.col = ncol; 3439 selection.end.col = ncol;
3440
3441 // select a complete logical line
3442 while (selection.beg.row > -saveLines
3443 && ROW(selection.beg.row - 1).is_longer ())
3444 selection.beg.row--;
3445
3446 while (selection.end.row < nrow
3447 && ROW(selection.end.row).is_longer ())
3448 selection.end.row++;
3418 } 3449 }
3419 } 3450 }
3420 3451
3421 if (button3 && buttonpress) 3452 if (button3 && buttonpress)
3422 { /* mark may need to be changed */ 3453 { /* mark may need to be changed */
… …
3430 selection.mark.row = selection.beg.row; 3461 selection.mark.row = selection.beg.row;
3431 selection.mark.col = selection.beg.col; 3462 selection.mark.col = selection.beg.col;
3432 } 3463 }
3433 } 3464 }
3434 3465
3435#if ENABLE_FRILLS 3466#if !ENABLE_MINIMAL
3436 if (selection.rect && selection.beg.col > selection.end.col) 3467 if (selection.rect && selection.beg.col > selection.end.col)
3437 SWAP_IT (selection.beg.col, selection.end.col, int); 3468 ::swap (selection.beg.col, selection.end.col);
3438#endif 3469#endif
3439} 3470}
3440 3471
3441#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3442void 3473void
3443rxvt_term::selection_remove_trailing_spaces () 3474rxvt_term::selection_remove_trailing_spaces () NOTHROW
3444{ 3475{
3445 int32_t end_col, end_row; 3476 int32_t end_col, end_row;
3446 text_t *stp; 3477 text_t *stp;
3447 3478
3448 end_col = selection.end.col; 3479 end_col = selection.end.col;
3449 end_row = selection.end.row; 3480 end_row = selection.end.row;
3450 3481
3451 for ( ; end_row >= selection.beg.row; ) 3482 for (; end_row >= selection.beg.row; )
3452 { 3483 {
3453 stp = screen.text[end_row + TermWin.saveLines]; 3484 stp = ROW(end_row).t;
3454 3485
3455 while (--end_col >= 0) 3486 while (--end_col >= 0)
3456 { 3487 {
3457 if (stp[end_col] != ' ' 3488 if (stp[end_col] != NOCHAR
3458 && stp[end_col] != '\t' 3489 && !unicode::is_space (stp[end_col]))
3459 && stp[end_col] != NOCHAR)
3460 break; 3490 break;
3461 } 3491 }
3462 3492
3463 if (end_col >= 0 3493 if (end_col >= 0
3464 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3494 || !ROW(end_row - 1).is_longer ())
3465 { 3495 {
3466 selection.end.col = end_col + 1; 3496 selection.end.col = end_col + 1;
3467 selection.end.row = end_row; 3497 selection.end.row = end_row;
3468 break; 3498 break;
3469 } 3499 }
3470 3500
3471 end_row--; 3501 end_row--;
3472 end_col = TermWin.ncol; 3502 end_col = ncol;
3473 } 3503 }
3474 3504
3475 if (selection.mark.row > selection.end.row) 3505 if (selection.mark.row > selection.end.row)
3476 { 3506 {
3477 selection.mark.row = selection.end.row; 3507 selection.mark.row = selection.end.row;
… …
3487/* 3517/*
3488 * Double click on button 3 when already selected 3518 * Double click on button 3 when already selected
3489 * EXT: button 3 double click 3519 * EXT: button 3 double click
3490 */ 3520 */
3491void 3521void
3492rxvt_term::selection_rotate (int x, int y) 3522rxvt_term::selection_rotate (int x, int y) NOTHROW
3493{ 3523{
3494 selection.clicks = selection.clicks % 3 + 1; 3524 selection.clicks = selection.clicks % 3 + 1;
3495 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3525 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3496} 3526}
3497 3527
… …
3499/* 3529/*
3500 * Respond to a request for our current selection 3530 * Respond to a request for our current selection
3501 * EXT: SelectionRequest 3531 * EXT: SelectionRequest
3502 */ 3532 */
3503void 3533void
3504rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3534rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3505{ 3535{
3506 XSelectionEvent ev; 3536 XSelectionEvent ev;
3507 3537
3508 ev.type = SelectionNotify; 3538 ev.type = SelectionNotify;
3509 ev.property = None; 3539 ev.property = None;
… …
3525 *target++ = xa[XA_COMPOUND_TEXT]; 3555 *target++ = xa[XA_COMPOUND_TEXT];
3526#if X_HAVE_UTF8_STRING 3556#if X_HAVE_UTF8_STRING
3527 *target++ = xa[XA_UTF8_STRING]; 3557 *target++ = xa[XA_UTF8_STRING];
3528#endif 3558#endif
3529 3559
3530 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3531 32, PropModeReplace, 3561 32, PropModeReplace,
3532 (unsigned char *)target_list, target - target_list); 3562 (unsigned char *)target_list, target - target_list);
3533 ev.property = rq.property; 3563 ev.property = rq.property;
3534 } 3564 }
3535#if TODO // TODO 3565#if TODO // TODO
… …
3538 /* TODO: Handle MULTIPLE */ 3568 /* TODO: Handle MULTIPLE */
3539 } 3569 }
3540#endif 3570#endif
3541 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3542 { 3572 {
3543 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3544 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3574 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3545 ev.property = rq.property; 3575 ev.property = rq.property;
3546 } 3576 }
3547 else if (rq.target == XA_STRING 3577 else if (rq.target == XA_STRING
3548 || rq.target == xa[XA_TEXT] 3578 || rq.target == xa[XA_TEXT]
… …
3572 style = enc_string; 3602 style = enc_string;
3573 else if (target == xa[XA_TEXT]) 3603 else if (target == xa[XA_TEXT])
3574 style = enc_text; 3604 style = enc_text;
3575 else if (target == xa[XA_COMPOUND_TEXT]) 3605 else if (target == xa[XA_COMPOUND_TEXT])
3576 style = enc_compound_text; 3606 style = enc_compound_text;
3577#if ENABLE_FRILLS 3607#if !ENABLE_MINIMAL
3578 else if (target == xa[XA_UTF8_STRING]) 3608 else if (target == xa[XA_UTF8_STRING])
3579 style = enc_utf8; 3609 style = enc_utf8;
3580#endif 3610#endif
3581 else 3611 else
3582 { 3612 {
… …
3593 { 3623 {
3594 cl = L""; 3624 cl = L"";
3595 selectlen = 0; 3625 selectlen = 0;
3596 } 3626 }
3597 3627
3598#if ENABLE_FRILLS 3628#if !ENABLE_MINIMAL
3599 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3629 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3600 // so recode it manually 3630 // so recode it manually
3601 if (style == enc_utf8) 3631 if (style == enc_utf8)
3602 { 3632 {
3603 freect = 1; 3633 freect = 1;
… …
3606 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3636 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3607 ct.nitems = strlen ((char *)ct.value); 3637 ct.nitems = strlen ((char *)ct.value);
3608 } 3638 }
3609 else 3639 else
3610#endif 3640#endif
3611 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3641 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3612 freect = 1; 3642 freect = 1;
3613 else 3643 else
3614 { 3644 {
3615 /* if we failed to convert then send it raw */ 3645 /* if we failed to convert then send it raw */
3616 ct.value = (unsigned char *)cl; 3646 ct.value = (unsigned char *)cl;
3617 ct.nitems = selectlen; 3647 ct.nitems = selectlen;
3618 ct.encoding = target; 3648 ct.encoding = target;
3619 } 3649 }
3620 3650
3621 XChangeProperty (display->display, rq.requestor, rq.property, 3651 XChangeProperty (dpy, rq.requestor, rq.property,
3622 ct.encoding, 8, PropModeReplace, 3652 ct.encoding, 8, PropModeReplace,
3623 ct.value, (int)ct.nitems); 3653 ct.value, (int)ct.nitems);
3624 ev.property = rq.property; 3654 ev.property = rq.property;
3625 3655
3626 if (freect) 3656 if (freect)
3627 XFree (ct.value); 3657 XFree (ct.value);
3628 } 3658 }
3629 3659
3630 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3631} 3661}
3632 3662
3633/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3634 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3635 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3636 3666
3637/* 3667/*
3638 * return col/row values corresponding to x/y pixel values 3668 * return col/row values corresponding to x/y pixel values
3639 */ 3669 */
3640void 3670void
3641rxvt_term::pixel_position (int *x, int *y) 3671rxvt_term::pixel_position (int *x, int *y) NOTHROW
3642{ 3672{
3643 *x = Pixel2Col (*x); 3673 *x = Pixel2Col (*x);
3644 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3674 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3645 *y = Pixel2Row (*y); 3675 *y = Pixel2Row (*y);
3646 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3676 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3647} 3677}
3648 3678
3649/* ------------------------------------------------------------------------- */ 3679/* ------------------------------------------------------------------------- */
3650#ifdef USE_XIM 3680#ifdef USE_XIM
3651void 3681void
3652rxvt_term::im_set_position (XPoint &pos) 3682rxvt_term::im_set_position (XPoint &pos) NOTHROW
3653{ 3683{
3654 XWindowAttributes xwa; 3684 XWindowAttributes xwa;
3655 3685
3656 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3686 XGetWindowAttributes (dpy, vt, &xwa);
3657 3687
3658 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3688 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3659 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3689 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3660} 3690}
3661#endif 3691#endif
3662 3692
3663#if ENABLE_OVERLAY 3693#if ENABLE_OVERLAY
3664void 3694void
3665rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3695rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3666{ 3696{
3667 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3697 if (nrow < 1 || ncol < 1)
3668 return; 3698 return;
3669 3699
3670 want_refresh = 1; 3700 want_refresh = 1;
3671 3701
3672 scr_overlay_off (); 3702 scr_overlay_off ();
3673 3703
3674 if (x < 0) x = TermWin.ncol - w; 3704 if (x < 0) x = ncol - w;
3675 if (y < 0) y = TermWin.nrow - h; 3705 if (y < 0) y = nrow - h;
3676 3706
3677 // make space for border 3707 // make space for border
3678 w += 2; MIN_IT (w, TermWin.ncol); 3708 w += 2; min_it (w, ncol);
3679 h += 2; MIN_IT (h, TermWin.nrow); 3709 h += 2; min_it (h, nrow);
3680 3710
3681 x -= 1; MAX_IT (x, 0); 3711 x -= 1; clamp_it (x, 0, ncol - w);
3682 y -= 1; MAX_IT (y, 0); 3712 y -= 1; clamp_it (y, 0, nrow - h);
3683
3684 MIN_IT (x, TermWin.ncol - w);
3685 MIN_IT (y, TermWin.nrow - h);
3686 3713
3687 ov_x = x; ov_y = y; 3714 ov_x = x; ov_y = y;
3688 ov_w = w; ov_h = h; 3715 ov_w = w; ov_h = h;
3689 3716
3690 ov_text = new text_t *[h]; 3717 ov_text = new text_t *[h];
… …
3718 *rp = r; 3745 *rp = r;
3719 } 3746 }
3720} 3747}
3721 3748
3722void 3749void
3723rxvt_term::scr_overlay_off () 3750rxvt_term::scr_overlay_off () NOTHROW
3724{ 3751{
3725 if (!ov_text) 3752 if (!ov_text)
3726 return; 3753 return;
3727 3754
3728 want_refresh = 1; 3755 want_refresh = 1;
… …
3736 delete [] ov_text; ov_text = 0; 3763 delete [] ov_text; ov_text = 0;
3737 delete [] ov_rend; ov_rend = 0; 3764 delete [] ov_rend; ov_rend = 0;
3738} 3765}
3739 3766
3740void 3767void
3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3742{ 3769{
3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3744 return; 3771 return;
3745 3772
3746 x++, y++; 3773 x++, y++;
… …
3748 ov_text[y][x] = text; 3775 ov_text[y][x] = text;
3749 ov_rend[y][x] = rend; 3776 ov_rend[y][x] = rend;
3750} 3777}
3751 3778
3752void 3779void
3753rxvt_term::scr_overlay_set (int x, int y, const char *s) 3780rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3754{ 3781{
3755 while (*s) 3782 while (*s)
3756 scr_overlay_set (x++, y, *s++); 3783 scr_overlay_set (x++, y, *s++);
3757} 3784}
3758 3785
3759void 3786void
3787rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3788{
3789 while (*s)
3790 {
3791 text_t t = *s++;
3792 int width = WCWIDTH (t);
3793
3794 while (width--)
3795 {
3796 scr_overlay_set (x++, y, t);
3797 t = NOCHAR;
3798 }
3799 }
3800}
3801
3802void
3760rxvt_term::scr_swap_overlay () 3803rxvt_term::scr_swap_overlay () NOTHROW
3761{ 3804{
3762 if (!ov_text) 3805 if (!ov_text)
3763 return; 3806 return;
3764 3807
3765 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3766
3767 // swap screen mem with overlay 3808 // swap screen mem with overlay
3768 for (int y = ov_h; y--; ) 3809 for (int y = ov_h; y--; )
3769 { 3810 {
3770 text_t *t1 = ov_text[y]; 3811 text_t *t1 = ov_text[y];
3771 rend_t *r1 = ov_rend[y]; 3812 rend_t *r1 = ov_rend[y];
3772 3813
3773 text_t *t2 = screen.text[y + row_offset] + ov_x; 3814 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3774 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3815 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3775 3816
3776 for (int x = ov_w; x--; ) 3817 for (int x = ov_w; x--; )
3777 { 3818 {
3778 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3819 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3779 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3820 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3781 } 3822 }
3782} 3823}
3783 3824
3784#endif 3825#endif
3785/* ------------------------------------------------------------------------- */ 3826/* ------------------------------------------------------------------------- */
3827

Diff Legend

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