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.150 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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