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

Diff Legend

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