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

Diff Legend

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