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

Diff Legend

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