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.78 by root, Fri Jul 30 18:35:11 2004 UTC vs.
Revision 1.217 by root, Mon Jan 9 19:01:56 2006 UTC

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

Diff Legend

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