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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.319 by root, Tue Nov 4 23:08:44 2008 UTC

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

Diff Legend

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