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

Diff Legend

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