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.141 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.326 by root, Wed Nov 5 13:04:51 2008 UTC

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

Diff Legend

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