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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

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

Diff Legend

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