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.273 by ayin, Mon Aug 13 07:18:58 2007 UTC

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

Diff Legend

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