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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC

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

Diff Legend

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