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.82 by root, Wed Aug 4 03:33:53 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.ascii_map [' ' - 0x20]); 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
903 rend_t rend = SET_FONT (rstyle, 855
904 c > 0x7f || bold || c < 0x20 856 // nuke the character at this position, if required
905 ? TermWin.fontset->find_font (c, bold) 857 if (line->t[screen.cur.col] == NOCHAR
906 : TermWin.ascii_map [c - 0x20]); 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
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 ();
907 889
908 do 890 do
909 { 891 {
910 stp[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
911 srp[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
912 894
913 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
914 screen.cur.col++; 896 screen.cur.col++;
915 else 897 else
916 { 898 {
917 screen.tlen[row] = last_col; 899 line->l = ncol;
918 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
919 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
920 break; 902 break;
921 } 903 }
922 904
923 c = NOCHAR; 905 c = NOCHAR;
924 } 906 }
925 while (--width > 0); 907 while (--width > 0);
926 908
927 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
928 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 910 if (!width)
929 { 911 {
912 line->touch ();
913
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
915 {
930 stp[c] = ' '; 916 line->t[c] = ' ';
931 srp[c] = rend; 917 line->r[c] = rend;
918 }
932 } 919 }
933 } 920 }
934 else if (width == 0) 921 else // width == 0
935 { 922 {
936#if ENABLE_COMBINING 923#if ENABLE_COMBINING
937 // handle combining characters 924 // handle combining characters
938 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
939 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
940 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
941 928 line_t *linep;
942 text_t *tp; 929 text_t *tp;
943 rend_t *rp; 930 rend_t *rp;
944 931
945 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
946 { 933 {
934 linep = line;
947 tp = stp + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
948 rp = srp + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
949 } 937 }
950 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
951 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 939 && ROW(screen.cur.row - 1).is_longer ())
952 { 940 {
953 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 941 linep = &ROW(screen.cur.row - 1);
954 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
955 } 944 }
956 else 945 else
957 continue; 946 continue;
958 947
959 // handle double-width-chars by making them look extremely ugly 948 linep->touch ();
960 if (*tp == NOCHAR) 949
961 *tp = ' '; // hack //D //TODO //--tp, --rp; 950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
962 952
963 // first try to find a precomposed character 953 // first try to find a precomposed character
964 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
965 if (n == NOCHAR) 955 if (n == NOCHAR)
966 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
967 957
968 *tp = n; 958 *tp = n;
969 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
970#endif 960#endif
971 } 961 }
972 } 962 }
973 963
974 if (screen.tlen[row] != -1) /* XXX: think about this */ 964 max_it (line->l, screen.cur.col);
975 MAX_IT (screen.tlen[row], screen.cur.col);
976
977 /*
978 * If we wrote anywhere in the selected area, kill the selection
979 * XXX: should we kill the mark too? Possibly, but maybe that
980 * should be a similar check.
981 */
982 if (clearsel)
983 CLEAR_SELECTION ();
984 965
985#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
986 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
987#else /* drive with your eyes closed */
988 MAX_IT (screen.cur.row, 0);
989#endif 968#endif
990} 969}
991 970
992/* ------------------------------------------------------------------------- */ 971/* ------------------------------------------------------------------------- */
993/* 972/*
… …
1002 if (screen.cur.col == 0) 981 if (screen.cur.col == 0)
1003 { 982 {
1004 if (screen.cur.row > 0) 983 if (screen.cur.row > 0)
1005 { 984 {
1006#ifdef TERMCAP_HAS_BW 985#ifdef TERMCAP_HAS_BW
1007 screen.cur.col = TermWin.ncol - 1; 986 screen.cur.col = ncol - 1;
1008 screen.cur.row--; 987 screen.cur.row--;
1009 return; 988 return;
1010#endif 989#endif
1011
1012 } 990 }
1013 } 991 }
1014 else if ((screen.flags & Screen_WrapNext) == 0) 992 else if (!(screen.flags & Screen_WrapNext))
1015 scr_gotorc (0, -1, RELATIVE); 993 scr_gotorc (0, -1, RELATIVE);
1016 994
1017 screen.flags &= ~Screen_WrapNext; 995 screen.flags &= ~Screen_WrapNext;
1018} 996}
1019 997
… …
1022 * Process Horizontal Tab 1000 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1001 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1002 * XTERM_SEQ: CTRL-I
1025 */ 1003 */
1026void 1004void
1027rxvt_term::scr_tab (int count) 1005rxvt_term::scr_tab (int count, bool ht)
1028{ 1006{
1029 int i, x; 1007 int i, x;
1030 1008
1031 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1032 want_refresh = 1; 1009 want_refresh = 1;
1033 i = x = screen.cur.col; 1010 i = x = screen.cur.col;
1034 1011
1035 if (count == 0) 1012 if (count == 0)
1036 return; 1013 return;
1037 else if (count > 0) 1014 else if (count > 0)
1038 { 1015 {
1016 line_t &l = ROW(screen.cur.row);
1017 rend_t base_rend = l.r[i];
1018 ht &= l.t[i] == ' ';
1019
1039 for (; ++i < TermWin.ncol; ) 1020 for (; ++i < ncol; )
1040 if (tabs[i]) 1021 if (tabs[i])
1041 { 1022 {
1042 x = i; 1023 x = i;
1024
1043 if (!--count) 1025 if (!--count)
1044 break; 1026 break;
1045 } 1027 }
1028 else
1029 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend);
1046 1031
1047 if (count) 1032 if (count)
1048 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 }
1049 } 1054 }
1050 else /* if (count < 0) */ 1055 else /* if (count < 0) */
1051 { 1056 {
1052 for (; --i >= 0; ) 1057 for (; --i >= 0; )
1053 if (tabs[i]) 1058 if (tabs[i])
… …
1070 * Process DEC Back Index 1075 * Process DEC Back Index
1071 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1072 * 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
1073 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1074 */ 1079 */
1075#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1076void 1081void
1077rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1078{ 1083{
1079 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1080 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1081 else 1086 else
1082 {
1083 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1084 return; /* um, yeah? */
1085 scr_insdel_chars (1, INSERT); 1087 scr_insdel_chars (1, INSERT);
1086 }
1087} 1088}
1088#endif 1089#endif
1089/* ------------------------------------------------------------------------- */ 1090/* ------------------------------------------------------------------------- */
1090/* 1091/*
1091 * Process DEC Forward Index 1092 * Process DEC Forward Index
1092 * XTERM_SEQ: ESC 9 1093 * XTERM_SEQ: ESC 9
1093 * 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
1094 * in that row left. Clear right column. 1095 * in that row left. Clear right column.
1095 */ 1096 */
1096#ifndef NO_FRILLS 1097#if ENABLE_FRILLS
1097void 1098void
1098rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1099{ 1100{
1100 int row;
1101
1102 if (screen.cur.col < TermWin.ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1104 else 1103 else
1105 { 1104 {
1106 row = screen.cur.row + TermWin.saveLines; 1105 line_t &l = ROW(screen.cur.row);
1107 if (screen.tlen[row] == 0) 1106
1108 return; /* um, yeah? */ 1107 l.touch ();
1109 else if (screen.tlen[row] == -1) 1108 l.is_longer (0);
1110 screen.tlen[row] = TermWin.ncol; 1109
1111 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1112 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1113 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1114 } 1113 }
1115} 1114}
1116#endif 1115#endif
1117 1116
1118/* ------------------------------------------------------------------------- */ 1117/* ------------------------------------------------------------------------- */
… …
1123rxvt_term::scr_gotorc (int row, int col, int relative) 1122rxvt_term::scr_gotorc (int row, int col, int relative)
1124{ 1123{
1125 want_refresh = 1; 1124 want_refresh = 1;
1126 ZERO_SCROLLBACK (); 1125 ZERO_SCROLLBACK ();
1127 1126
1128 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));
1129
1130 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1131 MAX_IT (screen.cur.col, 0); 1128 clamp_it (screen.cur.col, 0, ncol - 1);
1132 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1133 1129
1134 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1131
1135 if (relative & R_RELATIVE) 1132 if (relative & R_RELATIVE)
1136 { 1133 {
1137 if (row > 0) 1134 if (row > 0)
1138 { 1135 {
1139 if (screen.cur.row <= screen.bscroll 1136 if (screen.cur.row <= screen.bscroll
… …
1154 else 1151 else
1155 { 1152 {
1156 if (screen.flags & Screen_Relative) 1153 if (screen.flags & Screen_Relative)
1157 { /* relative origin mode */ 1154 { /* relative origin mode */
1158 screen.cur.row = row + screen.tscroll; 1155 screen.cur.row = row + screen.tscroll;
1159 MIN_IT (screen.cur.row, screen.bscroll); 1156 min_it (screen.cur.row, screen.bscroll);
1160 } 1157 }
1161 else 1158 else
1162 screen.cur.row = row; 1159 screen.cur.row = row;
1163 } 1160 }
1164 MAX_IT (screen.cur.row, 0);
1165 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1166 1161
1167 while (screen.cur.col > 0 1162 clamp_it (screen.cur.row, 0, nrow - 1);
1168 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1169 screen.cur.col--;
1170} 1163}
1171 1164
1172/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
1173/* 1166/*
1174 * direction should be UP or DN 1167 * direction should be UP or DN
1175 */ 1168 */
1176void 1169void
1177rxvt_term::scr_index (enum page_dirn direction) 1170rxvt_term::scr_index (enum page_dirn direction)
1178{ 1171{
1179 int dirn; 1172 int dirn;
1180 1173
1181 want_refresh = 1; 1174 want_refresh = 1;
1175 ZERO_SCROLLBACK ();
1176
1182 dirn = ((direction == UP) ? 1 : -1); 1177 dirn = ((direction == UP) ? 1 : -1);
1183 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1184
1185 ZERO_SCROLLBACK ();
1186 1178
1187 screen.flags &= ~Screen_WrapNext; 1179 screen.flags &= ~Screen_WrapNext;
1180
1188 if ((screen.cur.row == screen.bscroll && direction == UP) 1181 if ((screen.cur.row == screen.bscroll && direction == UP)
1189 || (screen.cur.row == screen.tscroll && direction == DN)) 1182 || (screen.cur.row == screen.tscroll && direction == DN))
1190 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1183 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1191 else 1184 else
1192 screen.cur.row += dirn; 1185 screen.cur.row += dirn;
1193 MAX_IT (screen.cur.row, 0); 1186
1194 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1195 selection_check (0); 1188 selection_check (0);
1196} 1189}
1197 1190
1198/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1199/* 1192/*
… …
1203 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1204 */ 1197 */
1205void 1198void
1206rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1207{ 1200{
1208 unsigned int row, col, num; 1201 unsigned int col, num;
1209 1202
1210 want_refresh = 1; 1203 want_refresh = 1;
1211 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1212 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1213 1205
1214 selection_check (1); 1206 selection_check (1);
1215 1207
1216 screen.flags &= ~Screen_WrapNext; 1208 line_t &line = ROW(screen.cur.row);
1217 1209
1218 row = TermWin.saveLines + screen.cur.row; 1210 line.touch ();
1211 line.is_longer (0);
1212
1219 switch (mode) 1213 switch (mode)
1220 { 1214 {
1221 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1222 col = screen.cur.col; 1216 col = screen.cur.col;
1223 num = TermWin.ncol - col; 1217 num = ncol - col;
1224 MIN_IT (screen.tlen[row], (int16_t)col); 1218 min_it (line.l, col);
1225 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1226 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1227 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1228 break; 1222 break;
1229 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1233 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1234 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1235 break; 1229 break;
1236 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1237 col = 0; 1231 col = 0;
1238 num = TermWin.ncol; 1232 num = ncol;
1239 screen.tlen[row] = 0; 1233 line.l = 0;
1240 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1241 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1242 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1243 break; 1237 break;
1244 default: 1238 default:
1245 return; 1239 return;
1246 } 1240 }
1247 1241
1248 if (screen.text[row]) 1242 scr_blank_line (line, col, num, rstyle);
1249 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1250 else
1251 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1252} 1243}
1253 1244
1254/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1255/* 1246/*
1256 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1260 */ 1251 */
1261void 1252void
1262rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1263{ 1254{
1264 int num; 1255 int num;
1265 int32_t row, row_offset; 1256 int32_t row;
1266 rend_t ren; 1257 rend_t ren;
1267 XGCValues gcvalue; 1258 XGCValues gcvalue;
1268 1259
1269 want_refresh = 1; 1260 want_refresh = 1;
1270 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1271 ZERO_SCROLLBACK (); 1261 ZERO_SCROLLBACK ();
1272 row_offset = (int32_t)TermWin.saveLines;
1273 1262
1274 switch (mode) 1263 switch (mode)
1275 { 1264 {
1276 case 0: /* erase to end of screen */ 1265 case 0: /* erase to end of screen */
1277 selection_check (1); 1266 selection_check (1);
1278 scr_erase_line (0); 1267 scr_erase_line (0);
1279 row = screen.cur.row + 1; /* possible OOB */ 1268 row = screen.cur.row + 1; /* possible OOB */
1280 num = TermWin.nrow - row; 1269 num = nrow - row;
1281 break; 1270 break;
1282 case 1: /* erase to beginning of screen */ 1271 case 1: /* erase to beginning of screen */
1283 selection_check (3); 1272 selection_check (3);
1284 scr_erase_line (1); 1273 scr_erase_line (1);
1285 row = 0; 1274 row = 0;
1286 num = screen.cur.row; 1275 num = screen.cur.row;
1287 break; 1276 break;
1288 case 2: /* erase whole screen */ 1277 case 2: /* erase whole screen */
1289 selection_check (3); 1278 selection_check (3);
1290 row = 0; 1279 row = 0;
1291 num = TermWin.nrow; 1280 num = nrow;
1292 break; 1281 break;
1293 default: 1282 default:
1294 return; 1283 return;
1295 } 1284 }
1296
1297 refresh_type |= REFRESH_BOUNDS;
1298 1285
1299 if (selection.op && current_screen == selection.screen 1286 if (selection.op && current_screen == selection.screen
1300 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1287 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1301 || (selection.end.row >= row 1288 || (selection.end.row >= row
1302 && selection.end.row <= row + num))) 1289 && selection.end.row <= row + num)))
1303 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1304 1291
1305 if (row >= TermWin.nrow) /* Out Of Bounds */ 1292 if (row >= nrow) /* Out Of Bounds */
1306 return; 1293 return;
1307 1294
1308 MIN_IT (num, (TermWin.nrow - row)); 1295 min_it (num, nrow - row);
1309 1296
1310 if (rstyle & (RS_RVid | RS_Uline)) 1297 if (rstyle & (RS_RVid | RS_Uline))
1311 ren = (rend_t) ~RS_None; 1298 ren = (rend_t) ~RS_None;
1312 else if (GET_BASEBG (rstyle) == Color_bg) 1299 else if (GET_BASEBG (rstyle) == Color_bg)
1313 { 1300 {
1314 ren = DEFAULT_RSTYLE; 1301 ren = DEFAULT_RSTYLE;
1315 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1316 } 1303 }
1317 else 1304 else
1318 { 1305 {
1319 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1323 gcvalue.foreground = PixColors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1325 } 1312 }
1326 1313
1327 for (; num--; row++) 1314 for (; num--; row++)
1328 { 1315 {
1329 scr_blank_screen_mem (screen.text, screen.rend, 1316 scr_blank_screen_mem (ROW(row), rstyle);
1330 (unsigned int) (row + row_offset), rstyle); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1331 screen.tlen[row + row_offset] = 0;
1332 scr_blank_line (drawn_text[row], drawn_rend[row],
1333 (unsigned int)TermWin.ncol, ren);
1334 } 1318 }
1335} 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
1336 1331
1337/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1338/* 1333/*
1339 * Fill the screen with `E's 1334 * Fill the screen with `E's
1340 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1341 */ 1336 */
1342void 1337void
1343rxvt_term::scr_E () 1338rxvt_term::scr_E ()
1344{ 1339{
1345 int i, j, k; 1340 rend_t fs;
1346 rend_t *r1, fs;
1347 1341
1348 want_refresh = 1; 1342 want_refresh = 1;
1343 ZERO_SCROLLBACK ();
1344
1349 num_scr_allow = 0; 1345 num_scr_allow = 0;
1350 ZERO_SCROLLBACK ();
1351 selection_check (3); 1346 selection_check (3);
1352 1347
1353 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1348 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1354 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1349 for (int row = nrow; row--; )
1355 { 1350 {
1356 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1351 line_t &line = ROW(row);
1352
1357 fill_text (screen.text[k], 'E', TermWin.ncol); 1353 fill_text (line.t, 'E', ncol);
1358 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1354 rend_t *r1 = line.r;
1355
1356 for (int j = ncol; j--; )
1359 *r1++ = fs; 1357 *r1++ = fs;
1358
1359 line.is_longer (0);
1360 line.touch (ncol);
1360 } 1361 }
1361} 1362}
1362 1363
1363/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1364/* 1365/*
… …
1382 if (insdel == DELETE) 1383 if (insdel == DELETE)
1383 return; 1384 return;
1384 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1385 count = end; 1386 count = end;
1386 } 1387 }
1387 screen.flags &= ~Screen_WrapNext;
1388 1388
1389 scr_do_wrap ();
1390
1389 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1390} 1392}
1391 1393
1392/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1393/* 1395/*
1394 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
… …
1396void 1398void
1397rxvt_term::scr_insdel_chars (int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1398{ 1400{
1399 int col, row; 1401 int col, row;
1400 rend_t tr; 1402 rend_t tr;
1401 text_t *stp;
1402 rend_t *srp;
1403 int16_t *slp;
1404 1403
1405 want_refresh = 1; 1404 want_refresh = 1;
1406 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1407 1406
1408 if (count <= 0) 1407 if (count <= 0)
1409 return; 1408 return;
1410 1409
1410 scr_do_wrap ();
1411
1411 selection_check (1); 1412 selection_check (1);
1412 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1413 min_it (count, ncol - screen.cur.col);
1413 1414
1414 row = screen.cur.row + TermWin.saveLines;
1415 screen.flags &= ~Screen_WrapNext;
1416
1417 stp = screen.text[row];
1418 srp = screen.rend[row]; 1415 row = screen.cur.row;
1419 slp = & (screen.tlen[row]); 1416
1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1420 1421
1421 switch (insdel) 1422 switch (insdel)
1422 { 1423 {
1423 case INSERT: 1424 case INSERT:
1424 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1425 col--)
1426 { 1426 {
1427 stp[col] = stp[col - count]; 1427 line->t[col] = line->t[col - count];
1428 srp[col] = srp[col - count]; 1428 line->r[col] = line->r[col - count];
1429 } 1429 }
1430 1430
1431 if (*slp != -1) 1431 line->l = min (line->l + count, ncol);
1432 {
1433 *slp += count;
1434 MIN_IT (*slp, TermWin.ncol);
1435 }
1436 1432
1437 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1438 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1439 { 1435 {
1440 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
1441 || (selection.end.col + count >= TermWin.ncol)) 1437 || (selection.end.col + count >= ncol))
1442 CLEAR_SELECTION (); 1438 CLEAR_SELECTION ();
1443 else 1439 else
1444 { /* shift selection */ 1440 { /* shift selection */
1445 selection.beg.col += count; 1441 selection.beg.col += count;
1446 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1447 selection.end.col += count; 1443 selection.end.col += count;
1448 } 1444 }
1449 } 1445 }
1450 1446
1451 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (*line, screen.cur.col, count, rstyle);
1452 (unsigned int)count, rstyle);
1453 break; 1448 break;
1454 1449
1455 case ERASE: 1450 case ERASE:
1456 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1457 selection_check (1); 1452 selection_check (1);
1458 screen.cur.col -= count; 1453 screen.cur.col -= count;
1459 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1454
1460 (unsigned int)count, rstyle); 1455 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1461 break; 1457 break;
1462 1458
1463 case DELETE: 1459 case DELETE:
1464 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1465 1461
1466 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1462 for (col = screen.cur.col; (col + count) < ncol; col++)
1467 { 1463 {
1468 stp[col] = stp[col + count]; 1464 line->t[col] = line->t[col + count];
1469 srp[col] = srp[col + count]; 1465 line->r[col] = line->r[col + count];
1470 } 1466 }
1471 1467
1472 scr_blank_line (& (stp[TermWin.ncol - count]), 1468 line->l = max (line->l - count, 0);
1473 & (srp[TermWin.ncol - count]), 1469 scr_blank_line (*line, ncol - count, count, tr);
1474 (unsigned int)count, tr);
1475
1476 if (*slp == -1) /* break line continuation */
1477 *slp = TermWin.ncol;
1478
1479 *slp -= count;
1480 MAX_IT (*slp, 0);
1481 1470
1482 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1483 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1484 { 1473 {
1485 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1486 || (screen.cur.col >= selection.beg.col - count) 1475 || (screen.cur.col >= selection.beg.col - count)
1487 || selection.end.col >= TermWin.ncol) 1476 || selection.end.col >= ncol)
1488 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1489 else 1478 else
1490 { 1479 {
1491 /* shift selection */ 1480 /* shift selection */
1492 selection.beg.col -= count; 1481 selection.beg.col -= count;
1493 selection.mark.col -= count; /* XXX: yes? */ 1482 selection.mark.col -= count; /* XXX: yes? */
1494 selection.end.col -= count; 1483 selection.end.col -= count;
1495 } 1484 }
1496 } 1485 }
1497 1486
1498 break; 1487 break;
1499 } 1488 }
… …
1505 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1506 */ 1495 */
1507void 1496void
1508rxvt_term::scr_scroll_region (int top, int bot) 1497rxvt_term::scr_scroll_region (int top, int bot)
1509{ 1498{
1510 MAX_IT (top, 0); 1499 max_it (top, 0);
1511 MIN_IT (bot, (int)TermWin.nrow - 1); 1500 min_it (bot, nrow - 1);
1512 1501
1513 if (top > bot) 1502 if (top > bot)
1514 return; 1503 return;
1515 1504
1516 screen.tscroll = top; 1505 screen.tscroll = top;
… …
1545rxvt_term::scr_autowrap (int mode) 1534rxvt_term::scr_autowrap (int mode)
1546{ 1535{
1547 if (mode) 1536 if (mode)
1548 screen.flags |= Screen_Autowrap; 1537 screen.flags |= Screen_Autowrap;
1549 else 1538 else
1550 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1551} 1540}
1552 1541
1553/* ------------------------------------------------------------------------- */ 1542/* ------------------------------------------------------------------------- */
1554/* 1543/*
1555 * Set/unset margin origin mode 1544 * Set/unset margin origin mode
… …
1565{ 1554{
1566 if (mode) 1555 if (mode)
1567 screen.flags |= Screen_Relative; 1556 screen.flags |= Screen_Relative;
1568 else 1557 else
1569 screen.flags &= ~Screen_Relative; 1558 screen.flags &= ~Screen_Relative;
1559
1570 scr_gotorc (0, 0, 0); 1560 scr_gotorc (0, 0, 0);
1571} 1561}
1572 1562
1573/* ------------------------------------------------------------------------- */ 1563/* ------------------------------------------------------------------------- */
1574/* 1564/*
… …
1594 */ 1584 */
1595void 1585void
1596rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1597{ 1587{
1598 if (mode < 0) 1588 if (mode < 0)
1599 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1600 else if (screen.cur.col < TermWin.ncol) 1590 else if (screen.cur.col < ncol)
1601 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1602} 1592}
1603 1593
1604/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1605/* 1595/*
1606 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1608 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1609 */ 1599 */
1610void 1600void
1611rxvt_term::scr_rvideo_mode (int mode) 1601rxvt_term::scr_rvideo_mode (int mode)
1612{ 1602{
1613 XGCValues gcvalue; 1603 XGCValues gcvalue;
1614 1604
1615 if (rvideo != mode) 1605 if (rvideo != mode)
1616 { 1606 {
1617 rvideo = mode; 1607 rvideo = mode;
1618 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1619#if defined(XPM_BACKGROUND) 1609#if XPM_BACKGROUND
1620 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1621#endif 1611#endif
1622#if defined(TRANSPARENT) 1612#if TRANSPARENT
1623 if (! (Options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1624#endif 1614#endif
1625 XSetWindowBackground (display->display, TermWin.vt, 1615 XSetWindowBackground (display->display, vt,
1626 PixColors[Color_bg]); 1616 pix_colors[Color_bg]);
1627 1617
1628 gcvalue.foreground = PixColors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
1629 gcvalue.background = PixColors[Color_bg]; 1619 gcvalue.background = pix_colors[Color_bg];
1630 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1620 XChangeGC (display->display, gc, GCBackground | GCForeground,
1631 &gcvalue); 1621 &gcvalue);
1632 scr_clear (); 1622 scr_clear ();
1633 scr_touch (true); 1623 scr_touch (true);
1634 } 1624 }
1635} 1625}
… …
1653 * Set font style 1643 * Set font style
1654 */ 1644 */
1655void 1645void
1656rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1657{ 1647{
1648#if 0
1658 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1659 { 1650 {
1660 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1661 break; 1652 break;
1662 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1663 break; 1654 break;
… …
1670 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1671 break; 1662 break;
1672 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1673 break; 1664 break;
1674 } 1665 }
1666#endif
1675} 1667}
1676 1668
1677/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1678/* 1670/*
1679 * Choose a font 1671 * Choose a font
… …
1682 * XTERM_SEQ: Invoke G2 character set: ESC N 1674 * XTERM_SEQ: Invoke G2 character set: ESC N
1683 * XTERM_SEQ: Invoke G3 character set: ESC O 1675 * XTERM_SEQ: Invoke G3 character set: ESC O
1684 */ 1676 */
1685void 1677void
1686rxvt_term::scr_charset_choose (int set) 1678rxvt_term::scr_charset_choose (int set)
1687 { 1679{
1688 screen.charset = set; 1680 screen.charset = set;
1689 set_font_style (); 1681 set_font_style ();
1690 } 1682}
1691 1683
1692/* ------------------------------------------------------------------------- */ 1684/* ------------------------------------------------------------------------- */
1693/* 1685/*
1694 * Set a font 1686 * Set a font
1695 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1687 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1698 * XTERM_SEQ: Set G3 character set: ESC + <C> 1690 * XTERM_SEQ: Set G3 character set: ESC + <C>
1699 * See set_font_style for possible values for <C> 1691 * See set_font_style for possible values for <C>
1700 */ 1692 */
1701void 1693void
1702rxvt_term::scr_charset_set (int set, unsigned int ch) 1694rxvt_term::scr_charset_set (int set, unsigned int ch)
1703 { 1695{
1704 charsets[set] = (unsigned char)ch; 1696 charsets[set] = (unsigned char)ch;
1705 set_font_style (); 1697 set_font_style ();
1706 } 1698}
1707 1699
1708 1700
1709/* ------------------------------------------------------------------------- * 1701/* ------------------------------------------------------------------------- *
1710 * MAJOR SCREEN MANIPULATION * 1702 * MAJOR SCREEN MANIPULATION *
1711 * ------------------------------------------------------------------------- */ 1703 * ------------------------------------------------------------------------- */
… …
1716bool 1708bool
1717rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1718{ 1710{
1719 bool found = false; 1711 bool found = false;
1720 1712
1721 for (int i = 0; i < TermWin.nrow; i++) 1713 for (int i = 0; i < nrow; i++)
1722 { 1714 {
1723 int col = 0; 1715 int col = 0;
1724 rend_t *drp = drawn_rend [i]; 1716 rend_t *drp = drawn_buf[i].r;
1725 1717
1726 for (; col < TermWin.ncol; col++, drp++) 1718 for (; col < ncol; col++, drp++)
1727 if ((*drp & mask) == value) 1719 if ((*drp & mask) == value)
1728 { 1720 {
1729 found = true; 1721 found = true;
1730 *drp = ~value; 1722 *drp = ~value;
1731 } 1723 }
… …
1742 PART_END, 1734 PART_END,
1743 RC_COUNT 1735 RC_COUNT
1744}; 1736};
1745 1737
1746void 1738void
1747rxvt_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)
1748{ 1740{
1749 int i; 1741 int i;
1750 row_col_t rc[RC_COUNT]; 1742 row_col_t rc[RC_COUNT];
1751 1743
1752 if (drawn_text == NULL) /* sanity check */ 1744 if (!drawn_buf) /* sanity check */
1753 return; 1745 return;
1754 1746
1755#ifndef NO_SLOW_LINK_SUPPORT 1747#ifndef NO_SLOW_LINK_SUPPORT
1756 if (refresh_type == FAST_REFRESH && !display->is_local) 1748 if (refresh_type == FAST_REFRESH && !display->is_local)
1757 { 1749 {
1758 y = 0; 1750 y = 0;
1759 height = TermWin.height; 1751 eheight = height;
1760 } 1752 }
1761#endif
1762
1763#ifdef DEBUG_STRICT
1764 x = max (x, 0);
1765 x = min (x, (int)TermWin.width);
1766 y = max (y, 0);
1767 y = min (y, (int)TermWin.height);
1768#endif 1753#endif
1769 1754
1770 /* round down */ 1755 /* round down */
1771 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1772 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
1773 /* round up */ 1758 /* round up */
1774 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1759 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1775 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1760 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1776 1761
1777 /* sanity checks */ 1762 /* sanity checks */
1778 for (i = PART_BEG; i < RC_COUNT; i++) 1763 for (i = PART_BEG; i < RC_COUNT; i++)
1779 { 1764 {
1780 MIN_IT (rc[i].col, TermWin.ncol - 1); 1765 min_it (rc[i].col, ncol - 1);
1781 MIN_IT (rc[i].row, TermWin.nrow - 1); 1766 min_it (rc[i].row, nrow - 1);
1782 } 1767 }
1783
1784 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));
1785 1768
1786 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++)
1787 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);
1788 1771
1789 if (refresh) 1772 if (refresh)
1790 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1773 scr_refresh (SLOW_REFRESH);
1791} 1774}
1792 1775
1793/* ------------------------------------------------------------------------- */ 1776/* ------------------------------------------------------------------------- */
1794/* 1777/*
1795 * Refresh the entire screen 1778 * Refresh the entire screen
1796 */ 1779 */
1797void 1780void
1798rxvt_term::scr_touch (bool refresh) 1781rxvt_term::scr_touch (bool refresh)
1799{ 1782{
1800 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1783 scr_expose (0, 0, width, height, refresh);
1801} 1784}
1802 1785
1803/* ------------------------------------------------------------------------- */ 1786/* ------------------------------------------------------------------------- */
1804/* 1787/*
1805 * 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
… …
1807 */ 1790 */
1808int 1791int
1809rxvt_term::scr_move_to (int y, int len) 1792rxvt_term::scr_move_to (int y, int len)
1810{ 1793{
1811 long p = 0; 1794 long p = 0;
1812 uint16_t oldviewstart; 1795 unsigned int oldviewstart;
1813 1796
1814 oldviewstart = TermWin.view_start; 1797 oldviewstart = view_start;
1798
1815 if (y < len) 1799 if (y < len)
1816 { 1800 {
1817 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1801 p = (nrow + nsaved) * (len - y) / len;
1818 p -= (long) (TermWin.nrow - 1); 1802 p -= (long) (nrow - 1);
1819 p = max (p, 0); 1803 p = max (p, 0);
1820 } 1804 }
1821 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1805
1822 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);
1823 1807
1824 return scr_changeview (oldviewstart); 1808 return scr_changeview (oldviewstart);
1825} 1809}
1826 1810
1827/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
… …
1830 * direction should be UP or DN 1814 * direction should be UP or DN
1831 */ 1815 */
1832int 1816int
1833rxvt_term::scr_page (enum page_dirn direction, int nlines) 1817rxvt_term::scr_page (enum page_dirn direction, int nlines)
1834{ 1818{
1835 int n; 1819 int n;
1836 uint16_t oldviewstart; 1820 unsigned int oldviewstart;
1837 1821
1838 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1839#ifdef DEBUG_STRICT
1840 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1841#endif
1842 oldviewstart = TermWin.view_start; 1822 oldviewstart = view_start;
1823
1843 if (direction == UP) 1824 if (direction == UP)
1844 { 1825 {
1845 n = TermWin.view_start + nlines; 1826 n = view_start + nlines;
1846 TermWin.view_start = min (n, TermWin.nscrolled); 1827 view_start = min (n, nsaved);
1847 } 1828 }
1848 else 1829 else
1849 { 1830 {
1850 n = TermWin.view_start - nlines; 1831 n = view_start - nlines;
1851 TermWin.view_start = max (n, 0); 1832 view_start = max (n, 0);
1852 } 1833 }
1834
1853 return scr_changeview (oldviewstart); 1835 return scr_changeview (oldviewstart);
1854} 1836}
1855 1837
1856int 1838int
1857rxvt_term::scr_changeview (uint16_t oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1858{ 1840{
1859 if (TermWin.view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1860 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1861 want_refresh = 1; 1845 want_refresh = 1;
1862 num_scr -= (TermWin.view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1863 } 1847 }
1864 1848
1865 return (int) (TermWin.view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1866} 1850}
1867 1851
1868/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1869void 1853void
1870rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1871{ 1855{
1872#ifndef NO_BELL 1856#ifndef NO_BELL
1857
1873# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1874# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1875 if (Options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1876# endif 1861# endif
1877 XMapWindow (display->display, TermWin.parent[0]); 1862 XMapWindow (display->display, parent[0]);
1878# endif 1863# endif
1879 if (Options & Opt_visualBell) 1864
1865 if (OPTION (Opt_visualBell))
1880 { 1866 {
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 rxvt_usleep (VISUAL_BELL_DURATION);
1882 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1883 } 1870 }
1884 else 1871 else
1885 XBell (display->display, 0); 1872 XBell (display->display, 0);
1873
1886#endif 1874#endif
1887} 1875}
1888 1876
1889/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1890/* ARGSUSED */ 1878/* ARGSUSED */
1891void 1879void
1892rxvt_term::scr_printscreen (int fullhist) 1880rxvt_term::scr_printscreen (int fullhist)
1893{ 1881{
1894#ifdef PRINTPIPE 1882#ifdef PRINTPIPE
1895 int i, r1, nrows, row_offset; 1883 int nrows, row_start;
1896 text_t *t; 1884 FILE *fd;
1897 FILE *fd;
1898 1885
1899 if ((fd = popen_printer ()) == NULL) 1886 if ((fd = popen_printer ()) == NULL)
1900 return; 1887 return;
1901 nrows = TermWin.nrow; 1888
1902 row_offset = TermWin.saveLines;
1903 if (!fullhist) 1889 if (fullhist)
1904 row_offset -= TermWin.view_start; 1890 {
1891 nrows = nrow + nsaved;
1892 row_start = -nsaved;
1893 }
1905 else 1894 else
1906 { 1895 {
1907 nrows += TermWin.nscrolled; 1896 nrows = nrow;
1908 row_offset -= TermWin.nscrolled; 1897 row_start = -view_start;
1909 } 1898 }
1910 1899
1900 wctomb (0, 0);
1901
1911 for (r1 = 0; r1 < nrows; r1++) 1902 for (int r1 = 0; r1 < nrows; r1++)
1912 {
1913 t = screen.text[r1 + row_offset];
1914 for (i = TermWin.ncol - 1; i >= 0; i--)
1915 if (!isspace (t[i]))
1916 break;
1917 fprintf (fd, "%.*s\n", (i + 1), t);
1918 } 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
1919 pclose_printer (fd); 1928 pclose_printer (fd);
1920#endif 1929#endif
1921} 1930}
1922 1931
1923/* ------------------------------------------------------------------------- */ 1932/* ------------------------------------------------------------------------- */
1924/* 1933/*
1925 * Refresh the screen 1934 * Refresh the screen
1926 * drawn_text/drawn_rend contain the screen information before the update. 1935 * drawn_text/drawn_rend contain the screen information before the update.
1927 * screen.text/screen.rend contain what the screen will change to. 1936 * screen.text/screen.rend contain what the screen will change to.
1928 */ 1937 */
1929
1930#define FONT_WIDTH(X, Y) \
1931 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1932#define FONT_RBEAR(X, Y) \
1933 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1934#define FONT_LBEAR(X, Y) \
1935 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1936#define IS_FONT_CHAR(X, Y) \
1937 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1938
1939void 1938void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1941{ 1940{
1942 unsigned char clearfirst, /* first character writes before cell */
1943 clearlast, /* last character writes beyond cell */
1944 must_clear, /* use draw_string not draw_image_string */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1945 rvid, /* reverse video this position */
1946 showcursor; /* show the cursor */ 1942 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1943 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1944 ocrow; /* old cursor row */
1949 int i, /* tmp */ 1945 int i; /* tmp */
1950 row_offset; /* basic offset in screen structure */
1951#ifndef NO_CURSORCOLOR 1946#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1947 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1948#endif
1954 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1949 rend_t *crp; // cursor rendition pointer
1955 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1956 1950
1951 want_refresh = 0; /* screen is current */
1952
1957 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1953 if (refresh_type == NO_REFRESH || !mapped)
1958 return; 1954 return;
1959 1955
1960 /* 1956 /*
1961 * A: set up vars 1957 * A: set up vars
1962 */ 1958 */
1963 clearfirst = clearlast = must_clear = 0; 1959 must_clear = 0;
1964
1965 refresh_count = 0; 1960 refresh_count = 0;
1966 1961
1967 row_offset = TermWin.saveLines - TermWin.view_start;
1968
1969 if ((refresh_type & REFRESH_BOUNDS))
1970 {
1971 clearfirst = clearlast = 1;
1972 refresh_type &= ~REFRESH_BOUNDS;
1973 }
1974
1975#ifdef XPM_BACKGROUND 1962#if XPM_BACKGROUND
1976 must_clear |= (bgPixmap.pixmap != None); 1963 must_clear |= bgPixmap.pixmap != None;
1977#endif 1964#endif
1978#ifdef TRANSPARENT 1965#if TRANSPARENT
1979 must_clear |= ((Options & Opt_transparent) && am_transparent); 1966 must_clear |= OPTION (Opt_transparent) && am_transparent;
1980#endif 1967#endif
1981 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1968 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1982 1969
1983 /* 1970 /*
1984 * B: reverse any characters which are selected 1971 * B: reverse any characters which are selected
… …
1999 showcursor = 0; 1986 showcursor = 0;
2000#endif 1987#endif
2001 1988
2002 if (showcursor) 1989 if (showcursor)
2003 { 1990 {
2004 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 1991 int col = screen.cur.col;
2005 1992
1993 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1994 col--;
1995
1996 crp = &ROW(screen.cur.row).r[col];
1997
2006 if (showcursor && TermWin.focus) 1998 if (showcursor && focus)
2007 { 1999 {
2000 if (OPTION (Opt_cursorUnderline))
2001 *crp ^= RS_Uline;
2002 else
2003 {
2008 *srp ^= RS_RVid; 2004 *crp ^= RS_RVid;
2005
2009#ifndef NO_CURSORCOLOR 2006#ifndef NO_CURSORCOLOR
2010 cc1 = *srp & (RS_fgMask | RS_bgMask); 2007 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor)) 2008 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor; 2009 ccol1 = Color_cursor;
2013 else 2010 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = GET_FGCOLOR (rstyle); 2012 ccol1 = fgcolor_of (rstyle);
2016#else 2013#else
2017 ccol1 = Color_fg; 2014 ccol1 = Color_fg;
2018#endif 2015#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2)) 2016 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2; 2017 ccol2 = Color_cursor2;
2021 else 2018 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2019#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = GET_BGCOLOR (rstyle); 2020 ccol2 = bgcolor_of (rstyle);
2024#else 2021#else
2025 ccol2 = Color_bg; 2022 ccol2 = Color_bg;
2026#endif 2023#endif
2027 *srp = SET_FGCOLOR (*srp, ccol1); 2024 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *srp = SET_BGCOLOR (*srp, ccol2); 2025 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif 2026#endif
2027 }
2030 } 2028 }
2031 } 2029 }
2032 2030
2033 /* make sure no outline cursor is left around */ 2031 /* make sure no outline cursor is left around */
2034 setoldcursor = 0; 2032 setoldcursor = 0;
2035 if (ocrow != -1) 2033 if (ocrow != -1)
2036 { 2034 {
2037 if (screen.cur.row + TermWin.view_start != ocrow 2035 if (screen.cur.row + view_start != ocrow
2038 || screen.cur.col != oldcursor.col) 2036 || screen.cur.col != oldcursor.col)
2039 { 2037 {
2040 if (ocrow < TermWin.nrow 2038 if (ocrow < nrow
2041 && oldcursor.col < TermWin.ncol) 2039 && oldcursor.col < ncol)
2042 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2043 2041
2044 if (TermWin.focus || !showcursor) 2042 if (focus || !showcursor)
2045 oldcursor.row = -1; 2043 oldcursor.row = -1;
2046 else 2044 else
2047 setoldcursor = 1; 2045 setoldcursor = 1;
2048 } 2046 }
2049 } 2047 }
2050 else if (!TermWin.focus) 2048 else if (!focus)
2051 setoldcursor = 1; 2049 setoldcursor = 1;
2052 2050
2053 if (setoldcursor) 2051 if (setoldcursor)
2054 { 2052 {
2055 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2053 if (screen.cur.row + view_start >= nrow)
2056 oldcursor.row = -1; 2054 oldcursor.row = -1;
2057 else 2055 else
2058 { 2056 {
2059 oldcursor.row = screen.cur.row + TermWin.view_start; 2057 oldcursor.row = screen.cur.row + view_start;
2060 oldcursor.col = screen.cur.col; 2058 oldcursor.col = screen.cur.col;
2061 } 2059 }
2062 } 2060 }
2063 } 2061 }
2062
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY
2065 scr_swap_overlay ();
2066#endif
2064 2067
2065#ifndef NO_SLOW_LINK_SUPPORT 2068#ifndef NO_SLOW_LINK_SUPPORT
2066 /* 2069 /*
2067 * D: CopyArea pass - very useful for slower links 2070 * D: CopyArea pass - very useful for slower links
2068 * This has been deliberately kept simple. 2071 * This has been deliberately kept simple.
2069 */ 2072 */
2070 i = num_scr; 2073 i = num_scr;
2071 if (!display->is_local 2074 if (!display->is_local
2072 && refresh_type == FAST_REFRESH && num_scr_allow && i 2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2073 && abs (i) < TermWin.nrow && !must_clear) 2076 && abs (num_scr) < nrow && !must_clear)
2074 { 2077 {
2075 int16_t nits; 2078 int16_t nits;
2076 int j; 2079 int j;
2077 rend_t *drp2;
2078 text_t *dtp2;
2079 int len, wlen; 2080 int len, wlen;
2080 2081
2081 j = TermWin.nrow; 2082 j = nrow;
2082 wlen = len = -1; 2083 wlen = len = -1;
2083 row = i > 0 ? 0 : j - 1; 2084 row = i > 0 ? 0 : j - 1;
2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2085 { 2086 {
2086 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2087 { 2088 {
2088 stp = screen.text[row + row_offset]; 2089 line_t s = ROW(row - view_start);
2089 srp = screen.rend[row + row_offset];
2090 dtp = drawn_text[row]; 2090 line_t d = drawn_buf[row];
2091 dtp2 = drawn_text[row + i]; 2091 line_t d2 = drawn_buf[row + i];
2092 drp = drawn_rend[row];
2093 drp2 = drawn_rend[row + i];
2094 2092
2095 for (nits = 0, col = TermWin.ncol; col--; ) 2093 for (nits = 0, col = ncol; col--; )
2096 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2097 nits--; 2095 nits--;
2098 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])
2099 nits++; 2097 nits++;
2100 2098
2101 if (nits > 8) /* XXX: arbitrary choice */ 2099 if (nits > 8) /* XXX: arbitrary choice */
2102 { 2100 {
2103 for (col = TermWin.ncol; col--; ) 2101 for (col = ncol; col--; )
2104 { 2102 {
2105 *dtp++ = *dtp2++; 2103 *d.t++ = *d2.t++;
2106 *drp++ = *drp2++; 2104 *d.r++ = *d2.r++;
2107 } 2105 }
2108 2106
2109 if (len == -1) 2107 if (len == -1)
2110 len = row; 2108 len = row;
2111 2109
… …
2116 2114
2117 if (len != -1) 2115 if (len != -1)
2118 { 2116 {
2119 /* also comes here at end if needed because of >= above */ 2117 /* also comes here at end if needed because of >= above */
2120 if (wlen < len) 2118 if (wlen < len)
2121 SWAP_IT (wlen, len, int); 2119 ::swap (wlen, len);
2122 2120
2123 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2124 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2121 XCopyArea (display->display, vt, vt,
2125 TermWin.gc, 0, Row2Pixel (len + i), 2122 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)TermWin_TotalWidth (), 2123 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2124 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2125 0, Row2Pixel (len));
2129 len = -1; 2126 len = -1;
2130 } 2127 }
2131 } 2128 }
… …
2133#endif 2130#endif
2134 2131
2135 /* 2132 /*
2136 * E: main pass across every character 2133 * E: main pass across every character
2137 */ 2134 */
2138 for (row = 0; row < TermWin.nrow; row++) 2135 for (row = 0; row < nrow; row++)
2139 { 2136 {
2140 stp = screen.text[row + row_offset]; 2137 text_t *stp = ROW(row - view_start).t;
2141 srp = screen.rend[row + row_offset]; 2138 rend_t *srp = ROW(row - view_start).r;
2142 dtp = drawn_text[row]; 2139 text_t *dtp = drawn_buf[row].t;
2143 drp = drawn_rend[row]; 2140 rend_t *drp = drawn_buf[row].r;
2144 2141
2145 /* 2142 /*
2146 * E2: OK, now the real pass 2143 * E2: OK, now the real pass
2147 */ 2144 */
2148 int ypixel = (int)Row2Pixel (row); 2145 int ypixel = (int)Row2Pixel (row);
2149 2146
2150 for (col = 0; col < TermWin.ncol; col++) 2147 for (col = 0; col < ncol; col++)
2151 { 2148 {
2152 /* compare new text with old - if exactly the same then continue */ 2149 /* compare new text with old - if exactly the same then continue */
2153 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2150 if (stp[col] == dtp[col] /* Must match characters to skip. */
2154 && (srp[col] == drp[col] /* Either rendition the same or */ 2151 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2155 || (stp[col] == ' ' /* space w/ no background change */ 2152 || (stp[col] == ' ' /* space w/ no background change */
2156 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2153 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2157 continue; 2154 continue;
2158 2155
2159 // redraw one or more characters 2156 // redraw one or more characters
2160 2157
2161 // seek to the beginning if wide characters 2158 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2159 while (stp[col] == NOCHAR && col > 0)
2163 --col; 2160 --col;
2164 2161
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2162 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2166 text_t *text = stp + col; 2163 text_t *text = stp + col;
… …
2169 dtp[col] = stp[col]; 2166 dtp[col] = stp[col];
2170 drp[col] = rend; 2167 drp[col] = rend;
2171 2168
2172 int xpixel = Col2Pixel (col); 2169 int xpixel = Col2Pixel (col);
2173 2170
2174 // this loop looks very messy, it can probably be optimized
2175 // and cleaned a bit by you?
2176 for (i = 0; ++col < TermWin.ncol; ) 2171 for (i = 0; ++col < ncol; )
2177 { 2172 {
2178 if (stp[col] == NOCHAR) 2173 if (stp[col] == NOCHAR)
2179 { 2174 {
2180 dtp[col] = stp[col]; 2175 dtp[col] = stp[col];
2181 drp[col] = rend; 2176 drp[col] = rend;
2182 count++; 2177 count++;
2183
2184 if (i) // only possible skip if char unchanged
2185 i++; 2178 i++;
2186 2179
2187 continue; 2180 continue;
2188 } 2181 }
2189 2182
2190 if (rend != srp[col]) 2183 if (!RS_SAME (rend, srp[col]))
2191 break; 2184 break;
2192 2185
2193 count++; 2186 count++;
2194 2187
2195 if (stp[col] != dtp[col] 2188 if (stp[col] != dtp[col]
2196 || srp[col] != drp[col]) 2189 || !RS_SAME (srp[col], drp[col]))
2197 { 2190 {
2198 if (must_clear && (i++ > (count / 2))) 2191 if (must_clear && (i++ > count / 2))
2199 break; 2192 break;
2200 2193
2201 dtp[col] = stp[col]; 2194 dtp[col] = stp[col];
2202 drp[col] = rend; 2195 drp[col] = rend;
2203 i = 0; 2196 i = 0;
2204 } 2197 }
2205 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2198 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2206 break; 2199 break;
2207 } 2200 }
2208 2201
2209 col--; /* went one too far. move back */ 2202 col--; /* went one too far. move back */
2210 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--;
2211 2208
2212 /* 2209 /*
2213 * Determine the attributes for the string 2210 * Determine the attributes for the string
2214 */ 2211 */
2215 int fid = GET_FONT (rend);
2216 int fore = GET_FGCOLOR (rend); // desired foreground 2212 int fore = fgcolor_of (rend); // desired foreground
2217 int back = GET_BGCOLOR (rend); // desired background 2213 int back = bgcolor_of (rend); // desired background
2218 2214
2219 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];
2220 2222
2221 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;
2222 2231
2223#ifndef NO_BOLD_UNDERLINE_REVERSE 2232#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2233 if (rend & RS_Bold
2234 && fore == Color_fg)
2225 { 2235 {
2226 if (ISSET_PIXCOLOR (Color_BD)) 2236 if (ISSET_PIXCOLOR (Color_BD))
2227 fore = Color_BD; 2237 fore = Color_BD;
2238# if !ENABLE_STYLES
2228 else 2239 else
2229 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
2230 } 2287 }
2231
2232 if (rend & RS_Uline)
2233 if (ISSET_PIXCOLOR (Color_UL))
2234 fore = Color_UL;
2235#endif
2236
2237 if (rvid)
2238 {
2239 SWAP_IT (fore, back, int);
2240
2241#ifndef NO_BOLD_UNDERLINE_REVERSE
2242 if (ISSET_PIXCOLOR (Color_RV)
2243# ifndef NO_CURSORCOLOR
2244 && !ISSET_PIXCOLOR (Color_cursor)
2245# endif
2246 )
2247 back = Color_RV;
2248#endif
2249 }
2250
2251#ifdef TEXT_BLINK
2252 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2253 {
2254 if (!text_blink_ev.active)
2255 {
2256 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2257 hidden_text = 0;
2258 }
2259 else if (hidden_text)
2260 fore = back;
2261 }
2262#endif
2263 2288
2264 /* 2289 /*
2265 * Actually do the drawing of the string here 2290 * Actually do the drawing of the string here
2266 */ 2291 */
2267 rxvt_font *font = (*TermWin.fontset)[fid]; 2292 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2268 2293
2269 if (back == fore) 2294 if (back == fore)
2270 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2295 font->clear_rect (*drawable, xpixel, ypixel,
2271 TermWin.fwidth * count, TermWin.fheight, 2296 fwidth * count, fheight,
2272 back); 2297 back);
2273 else if (back == Color_bg) 2298 else if (back == Color_bg)
2274 { 2299 {
2275 if (must_clear) 2300 if (must_clear)
2276 { 2301 {
2277 CLEAR_CHARS (xpixel, ypixel, count); 2302 CLEAR_CHARS (xpixel, ypixel, count);
2278 2303
2279 for (i = 0; i < count; i++) /* don't draw empty strings */ 2304 for (i = 0; i < count; i++) /* don't draw empty strings */
2280 if (text[i] != ' ') 2305 if (text[i] != ' ')
2281 { 2306 {
2282 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2283 break; 2308 break;
2284 } 2309 }
2285 } 2310 }
2286 else 2311 else
2287 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2288 } 2313 }
2289 else 2314 else
2290 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2291 2316
2292 if (rend & RS_Uline && font->descent > 1 && fore != back) 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
2293 XDrawLine (display->display, drawBuffer, TermWin.gc, 2326 XDrawLine (display->display, drawBuffer, gc,
2294 xpixel, ypixel + font->ascent + 1, 2327 xpixel, ypixel + font->ascent + 1,
2295 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2328 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2329 }
2296 } /* for (col....) */ 2330 } /* for (col....) */
2297 } /* 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));
2298 2337
2299 /* 2338 /*
2300 * G: cleanup cursor and display outline cursor if necessary 2339 * G: cleanup cursor and display outline cursor if necessary
2301 */ 2340 */
2302 if (showcursor) 2341 if (showcursor)
2303 { 2342 {
2304 if (TermWin.focus) 2343 if (focus)
2344 {
2345 if (OPTION (Opt_cursorUnderline))
2346 *crp ^= RS_Uline;
2347 else
2305 { 2348 {
2306 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2307 [screen.cur.col]);
2308 *srp ^= RS_RVid; 2349 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2350#ifndef NO_CURSORCOLOR
2310 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2351 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2311#endif 2352#endif
2353 }
2312 } 2354 }
2313 else if (oldcursor.row >= 0) 2355 else if (oldcursor.row >= 0)
2314 { 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
2315#ifndef NO_CURSORCOLOR 2367#ifndef NO_CURSORCOLOR
2316 if (ISSET_PIXCOLOR (Color_cursor)) 2368 if (ISSET_PIXCOLOR (Color_cursor))
2317 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2369 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2318#endif 2370#endif
2319 int cursorwidth = 1;
2320 while (oldcursor.col + cursorwidth < TermWin.ncol
2321 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2322 cursorwidth++;
2323 2371
2324 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2372 XDrawRectangle (display->display, drawBuffer, gc,
2325 Col2Pixel (oldcursor.col), 2373 Col2Pixel (col),
2326 Row2Pixel (oldcursor.row), 2374 Row2Pixel (oldcursor.row),
2327 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2375 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2328 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2376 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2329 } 2377 }
2330 } 2378 }
2331 2379
2332 /* 2380 /*
2333 * H: cleanup selection 2381 * H: cleanup selection
2334 */ 2382 */
2335 scr_reverse_selection (); 2383 scr_reverse_selection ();
2336 2384
2337 /*
2338 * I: other general cleanup
2339 */
2340#if 0
2341 if (clearfirst && TermWin.int_bwidth)
2342 /*
2343 * clear the whole screen height, note that width == 0 is treated
2344 * specially by XClearArea
2345 */
2346 XClearArea (display->display, TermWin.vt, 0, 0,
2347 (unsigned int)TermWin.int_bwidth,
2348 (unsigned int)TermWin_TotalHeight (), False);
2349
2350 if (clearlast && TermWin.int_bwidth)
2351 /*
2352 * clear the whole screen height, note that width == 0 is treated
2353 * specially by XClearArea
2354 */
2355 XClearArea (display->display, TermWin.vt,
2356 TermWin.width + TermWin.int_bwidth, 0,
2357 (unsigned int)TermWin.int_bwidth,
2358 (unsigned int)TermWin_TotalHeight (), False);
2359#endif
2360
2361 if (refresh_type & SMOOTH_REFRESH) 2385 if (refresh_type & SMOOTH_REFRESH)
2362 XFlush (display->display); 2386 XFlush (display->display);
2363 2387
2364 num_scr = 0; 2388 num_scr = 0;
2365 num_scr_allow = 1; 2389 num_scr_allow = 1;
2366 want_refresh = 0; /* screen is current */
2367} 2390}
2368 2391
2369void 2392void
2370rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2393rxvt_term::scr_remap_chars (line_t &l)
2371{ 2394{
2372 if (!rp || !tp) 2395 if (!l.t)
2373 return; 2396 return;
2374 2397
2375 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2376 *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]));
2377} 2402}
2378 2403
2379void 2404void
2380rxvt_term::scr_remap_chars () 2405rxvt_term::scr_remap_chars ()
2381{ 2406{
2382 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2407 for (int i = total_rows; i--; )
2383 scr_remap_chars (screen.text[i], screen.rend[i]); 2408 scr_remap_chars (row_buf [i]);
2384 2409
2385 for (int i = TermWin.nrow; i--; ) 2410 for (int i = nrow; i--; )
2386 {
2387 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2388 scr_remap_chars (swap.text[i], swap.rend[i]);
2389 } 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;
2390} 2445}
2391 2446
2392/* ------------------------------------------------------------------------- */ 2447/* ------------------------------------------------------------------------- */
2393void 2448void
2394rxvt_term::scr_clear (bool really) 2449rxvt_term::scr_clear (bool really)
2395{ 2450{
2396 if (!TermWin.mapped) 2451 if (!mapped)
2397 return; 2452 return;
2398 2453
2399 num_scr_allow = 0; 2454 num_scr_allow = 0;
2400 want_refresh = 1; 2455 want_refresh = 1;
2401 2456
2402#ifdef TRANSPARENT 2457 if (really)
2403 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2458 XClearWindow (display->display, vt);
2404 { 2459}
2405 int i;
2406 2460
2407 if (! (Options & Opt_transparent_all)) 2461/* ------------------------------------------------------------------------- */
2408 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 }
2409 else 2490 else
2410 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2411
2412 while (i--)
2413 if (TermWin.parent[i] != None)
2414 XClearWindow (display->display, TermWin.parent[i]);
2415 }
2416#endif 2491#endif
2417 2492 {
2418 if (really) 2493 if (selection.beg.row >= -view_start)
2419 XClearWindow (display->display, TermWin.vt); 2494 {
2420}
2421
2422/* ------------------------------------------------------------------------- */
2423void
2424rxvt_term::scr_reverse_selection ()
2425{
2426 if (selection.op && current_screen == selection.screen)
2427 {
2428 int end_row = TermWin.saveLines - TermWin.view_start;
2429 int i = selection.beg.row + TermWin.saveLines;
2430 int col, row = selection.end.row + TermWin.saveLines;
2431 rend_t *srp;
2432
2433 if (i >= end_row)
2434 col = selection.beg.col; 2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2435 else 2498 else
2436 { 2499 {
2437 col = 0; 2500 col = 0;
2438 i = end_row; 2501 row = -view_start;
2439 } 2502 }
2440 2503
2441 end_row += TermWin.nrow; 2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2442 for (; i < row && i < end_row; i++, col = 0) 2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2443 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2444 srp[col] ^= RS_RVid; 2506 srp[col] ^= RS_RVid;
2445 2507
2446 if (i == row && i < end_row) 2508 if (row == selection.end.row)
2447 for (srp = screen.rend[i]; col < selection.end.col; col++) 2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2448 srp[col] ^= RS_RVid; 2510 srp[col] ^= RS_RVid;
2511 }
2449 } 2512 }
2450} 2513}
2451 2514
2452/* ------------------------------------------------------------------------- */ 2515/* ------------------------------------------------------------------------- */
2453/* 2516/*
… …
2460{ 2523{
2461 int row, wrote; 2524 int row, wrote;
2462 unsigned int width, towrite; 2525 unsigned int width, towrite;
2463 char r1[] = "\n"; 2526 char r1[] = "\n";
2464 2527
2465 for (row = TermWin.saveLines - TermWin.nscrolled; 2528 for (row = saveLines - nsaved;
2466 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2529 row < saveLines + nrow - 1; row++)
2467 { 2530 {
2468 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2531 width = row_buf[row].l >= 0 ? row_buf[row].l
2469 : TermWin.ncol; 2532 : ncol;
2470 for (towrite = width; towrite; towrite -= wrote) 2533 for (towrite = width; towrite; towrite -= wrote)
2471 { 2534 {
2472 wrote = write (fd, & (screen.text[row][width - towrite]), 2535 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2473 towrite); 2536 towrite);
2474 if (wrote < 0) 2537 if (wrote < 0)
2475 return; /* XXX: death, no report */ 2538 return; /* XXX: death, no report */
2476 } 2539 }
2477 if (screen.tlen[row] >= 0) 2540 if (row_buf[row].l >= 0)
2478 if (write (fd, r1, 1) <= 0) 2541 if (write (fd, r1, 1) <= 0)
2479 return; /* XXX: death, no report */ 2542 return; /* XXX: death, no report */
2480 } 2543 }
2481} 2544}
2482#endif 2545#endif
2483 2546
2484/* ------------------------------------------------------------------------- * 2547/* ------------------------------------------------------------------------- *
2485 * CHARACTER SELECTION * 2548 * CHARACTER SELECTION *
2486 * ------------------------------------------------------------------------- */ 2549 * ------------------------------------------------------------------------- */
2487
2488/*
2489 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2490 */
2491void 2550void
2492rxvt_term::selection_check (int check_more) 2551rxvt_term::selection_check (int check_more)
2493{ 2552{
2494 row_col_t pos; 2553 row_col_t pos;
2495 2554
2496 if (!selection.op) 2555 if (!selection.op)
2497 return; 2556 return;
2498 2557
2499 pos.row = pos.col = 0; 2558 pos.row = pos.col = 0;
2500 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2501 || (selection.beg.row >= TermWin.nrow) 2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2502 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2503 || (selection.mark.row >= TermWin.nrow)
2504 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2505 || (selection.end.row >= TermWin.nrow)
2506 || (check_more == 1 2562 || (check_more == 1
2507 && current_screen == selection.screen 2563 && current_screen == selection.screen
2508 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2509 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2510 || (check_more == 2 2566 || (check_more == 2
… …
2512 && ROWCOL_IS_AFTER (selection.end, pos)) 2568 && ROWCOL_IS_AFTER (selection.end, pos))
2513 || (check_more == 3 2569 || (check_more == 3
2514 && ROWCOL_IS_AFTER (selection.end, pos)) 2570 && ROWCOL_IS_AFTER (selection.end, pos))
2515 || (check_more == 4 /* screen width change */ 2571 || (check_more == 4 /* screen width change */
2516 && (selection.beg.row != selection.end.row 2572 && (selection.beg.row != selection.end.row
2517 || selection.end.col > TermWin.ncol))) 2573 || selection.end.col > ncol)))
2518 CLEAR_SELECTION (); 2574 CLEAR_SELECTION ();
2519} 2575}
2520 2576
2521/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2522/* 2578/*
2523 * Paste a selection direct to the command fd 2579 * Paste a selection direct to the command fd
2524 */ 2580 */
2525void 2581void
2526rxvt_term::paste (const unsigned char *data, unsigned int len) 2582rxvt_term::paste (char *data, unsigned int len)
2527{ 2583{
2528 unsigned int i, j, n;
2529 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2530
2531#if 0
2532 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2533 ZERO_SCROLLBACK (r);
2534#endif
2535
2536 /* convert normal newline chars into common keyboard Return key sequence */ 2584 /* convert normal newline chars into common keyboard Return key sequence */
2537 for (i = 0; i < len; i += PROP_SIZE) 2585 for (unsigned int i = 0; i < len; i++)
2538 {
2539 n = min (len - i, PROP_SIZE);
2540 MEMCPY (ds, data + i, n);
2541
2542 for (j = 0; j < n; j++)
2543 if (ds[j] == C0_LF) 2586 if (data[i] == C0_LF)
2544 ds[j] = C0_CR; 2587 data[i] = C0_CR;
2545 2588
2546 tt_write (ds, (int)n); 2589 tt_write (data, len);
2547 }
2548
2549 free (ds);
2550} 2590}
2551 2591
2552/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2553/* 2593/*
2554 * Respond to a notification that a primary selection has been sent 2594 * Respond to a notification that a primary selection has been sent
2555 * EXT: SelectionNotify 2595 * EXT: SelectionNotify
2556 */ 2596 */
2557int 2597void
2558rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2598rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2559{ 2599{
2560 long nread = 0;
2561 unsigned long bytes_after;
2562 XTextProperty ct;
2563
2564 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2565
2566 if (prop == None) /* check for failed XConvertSelection */ 2600 if (prop == None) /* check for failed XConvertSelection */
2567 { 2601 {
2568 if ((selection_type & Sel_CompoundText)) 2602 if ((selection_type & Sel_CompoundText))
2569 { 2603 {
2570 int selnum = selection_type & Sel_whereMask; 2604 int selnum = selection_type & Sel_whereMask;
… …
2583 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2617 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2584 else 2618 else
2585 selection_type = 0; 2619 selection_type = 0;
2586 } 2620 }
2587 2621
2588 return 0; 2622 return;
2589 }
2590
2591 for (;;)
2592 { 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
2593 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2647 if (XGetWindowProperty (display->display, win, prop,
2594 (long) (PROP_SIZE / 4), delete_prop, 2648 ct.nitems / 4, (bytes_after + 3) / 4,
2649 delete_prop, AnyPropertyType,
2595 AnyPropertyType, &ct.encoding, &ct.format, 2650 &ct2.encoding, &ct2.format,
2596 &ct.nitems, &bytes_after, 2651 &ct2.nitems, &bytes_after,
2597 &ct.value) != Success) 2652 &ct2.value) != Success)
2598 break; 2653 goto bailout;
2599 2654
2600 if (ct.encoding == 0) 2655 // realloc should be compatible to XFree, here, and elsewhere, too
2601 { 2656 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2602 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2657 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2603 break; 2658 ct.nitems += ct2.nitems;
2604 }
2605 2659
2660 XFree (ct2.value);
2661 }
2662
2606 if (ct.value == NULL) 2663 if (ct.value == 0)
2607 { 2664 goto bailout;
2608 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2609 continue;
2610 }
2611 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
2612 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 ();
2613 { 2692 }
2614 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2693 else
2615 2694 {
2616 if (selection_wait == Sel_normal && nread == 0 2695 if (selection_wait == Sel_normal
2617 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2696 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2618 { 2697 {
2619 /* 2698 /*
2620 * pass through again trying CUT_BUFFER0 if we've come from 2699 * pass through again trying CUT_BUFFER0 if we've come from
2621 * XConvertSelection () but nothing was presented 2700 * XConvertSelection () but nothing was presented
2622 */ 2701 */
2623 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2624 selection_paste (display->root, XA_CUT_BUFFER0, False); 2702 selection_paste (display->root, XA_CUT_BUFFER0, False);
2625 } 2703 }
2626 2704
2627 nread = -1; /* discount any previous stuff */ 2705 goto bailout;
2628 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)
2629 } 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 }
2630 2717
2718 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2631 nread += ct.nitems; 2719 incr_buf_fill += ct.nitems;
2632 2720
2721 goto bailout;
2722 }
2723
2633 char **cl; 2724 char **cl;
2634 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
2635 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2741 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2636 { 2742 && cl)
2743 {
2637 for (int i = 0; i < cr; i++) 2744 for (int i = 0; i < cr; i++)
2638 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2745 paste (cl[i], strlen (cl[i]));
2639 2746
2640 XFreeStringList (cl); 2747 XFreeStringList (cl);
2641 } 2748 }
2642 else 2749 else
2643 paste (ct.value, ct.nitems); 2750 paste ((char *)ct.value, ct.nitems); // paste raw
2644 2751
2645 if (bytes_after == 0) 2752bailout:
2646 break;
2647
2648 XFree (ct.value);
2649 }
2650
2651 if (ct.value)
2652 XFree (ct.value); 2753 XFree (ct.value);
2653 2754
2654 if (selection_wait == Sel_normal) 2755 if (selection_wait == Sel_normal)
2655 selection_wait = Sel_none; 2756 selection_wait = Sel_none;
2656
2657 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2658 return (int)nread;
2659} 2757}
2660 2758
2661void 2759void
2662rxvt_term::incr_cb (time_watcher &w) 2760rxvt_term::incr_cb (time_watcher &w)
2663{ 2761{
2664 selection_wait = Sel_none; 2762 selection_wait = Sel_none;
2665 2763
2764 incr_buf_size = 0;
2765 free (incr_buf);
2766
2666 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2767 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2667} 2768}
2668 2769
2669/*
2670 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2671 */
2672void 2770void
2673rxvt_term::selection_property (Window win, Atom prop) 2771rxvt_term::selection_property (Window win, Atom prop)
2674{ 2772{
2675 int reget_time = 0; 2773 if (prop == None || selection_wait != Sel_incr)
2676
2677 if (prop == None)
2678 return; 2774 return;
2679 2775
2680 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2681 if (selection_wait == Sel_normal)
2682 {
2683 int a, afmt;
2684 Atom atype;
2685 unsigned long bytes_after, nitems;
2686 unsigned char *s = NULL;
2687
2688 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2689 xa[XA_INCR], &atype, &afmt, &nitems,
2690 &bytes_after, &s);
2691 if (s)
2692 XFree (s);
2693 if (a != Success)
2694 return;
2695
2696#ifndef __CYGWIN32__
2697 if (atype == xa[XA_INCR])
2698 { /* start an INCR transfer */
2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2700 XDeleteProperty (display->display, win, prop);
2701 XFlush (display->display);
2702 reget_time = 1;
2703 selection_wait = Sel_incr;
2704 }
2705#endif
2706
2707 }
2708 else if (selection_wait == Sel_incr)
2709 {
2710 reget_time = 1;
2711
2712 if (selection_paste (win, prop, True) == -1) 2776 selection_paste (win, prop, true);
2713 {
2714 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2715 selection_wait = Sel_none;
2716 incr_ev.stop ();
2717 }
2718 }
2719 if (reget_time) /* received more data so reget time */
2720 incr_ev.start (NOW + 10);
2721} 2777}
2722 2778
2723/* ------------------------------------------------------------------------- */ 2779/* ------------------------------------------------------------------------- */
2724/* 2780/*
2725 * Request the current selection: 2781 * Request the current selection:
… …
2731 * EXT: button 2 release 2787 * EXT: button 2 release
2732 */ 2788 */
2733void 2789void
2734rxvt_term::selection_request (Time tm, int x, int y) 2790rxvt_term::selection_request (Time tm, int x, int y)
2735{ 2791{
2736 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2737
2738 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2792 if (x < 0 || x >= width || y < 0 || y >= height)
2739 return; /* outside window */ 2793 return; /* outside window */
2740 2794
2741 if (selection.text) 2795 if (selection.text)
2742 { /* internal selection */ 2796 { /* internal selection */
2743 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2744 char *str = rxvt_wcstombs (selection.text, selection.len); 2797 char *str = rxvt_wcstombs (selection.text, selection.len);
2745 paste ((unsigned char *)str, strlen (str)); 2798 paste (str, strlen (str));
2746 free (str); 2799 free (str);
2747 return; 2800 return;
2748 } 2801 }
2749 else 2802 else
2750 { 2803 {
… …
2762#else 2815#else
2763 selection_type = Sel_CompoundText; 2816 selection_type = Sel_CompoundText;
2764 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2817 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2765 return; 2818 return;
2766#endif 2819#endif
2767
2768 } 2820 }
2769 } 2821 }
2770 2822
2771 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2823 selection_wait = Sel_none; /* don't loop in selection_paste () */
2772 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2773 selection_paste (display->root, XA_CUT_BUFFER0, False); 2824 selection_paste (display->root, XA_CUT_BUFFER0, false);
2774} 2825}
2775 2826
2776int 2827int
2777rxvt_term::selection_request_other (Atom target, int selnum) 2828rxvt_term::selection_request_other (Atom target, int selnum)
2778{ 2829{
2779 Atom sel; 2830 Atom sel;
2780#ifdef DEBUG_SELECT
2781 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2782#endif
2783 2831
2784 selection_type |= selnum; 2832 selection_type |= selnum;
2785 2833
2786 if (selnum == Sel_Primary) 2834 if (selnum == Sel_Primary)
2787 sel = XA_PRIMARY; 2835 sel = XA_PRIMARY;
… …
2790 else 2838 else
2791 sel = xa[XA_CLIPBOARD]; 2839 sel = xa[XA_CLIPBOARD];
2792 2840
2793 if (XGetSelectionOwner (display->display, sel) != None) 2841 if (XGetSelectionOwner (display->display, sel) != None)
2794 { 2842 {
2795 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2796 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2843 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2797 TermWin.vt, selection_request_time); 2844 vt, selection_request_time);
2798 return 1; 2845 return 1;
2799 } 2846 }
2800 2847
2801 return 0; 2848 return 0;
2802} 2849}
… …
2807 * EXT: SelectionClear 2854 * EXT: SelectionClear
2808 */ 2855 */
2809void 2856void
2810rxvt_term::selection_clear () 2857rxvt_term::selection_clear ()
2811{ 2858{
2812 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2813
2814 want_refresh = 1; 2859 want_refresh = 1;
2815 free (selection.text); 2860 free (selection.text);
2816 selection.text = NULL; 2861 selection.text = NULL;
2817 selection.len = 0; 2862 selection.len = 0;
2818 CLEAR_SELECTION (); 2863 CLEAR_SELECTION ();
… …
2827 * EXT: button 1 or 3 release 2872 * EXT: button 1 or 3 release
2828 */ 2873 */
2829void 2874void
2830rxvt_term::selection_make (Time tm) 2875rxvt_term::selection_make (Time tm)
2831{ 2876{
2832 int i, col, end_col, row, end_row; 2877 int i;
2833 wchar_t *new_selection_text; 2878 wchar_t *new_selection_text;
2834 text_t *t; 2879 text_t *t;
2835 2880
2836 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2837 switch (selection.op) 2881 switch (selection.op)
2838 { 2882 {
2839 case SELECTION_CONT: 2883 case SELECTION_CONT:
2840 break; 2884 break;
2841 case SELECTION_INIT: 2885 case SELECTION_INIT:
… …
2851 selection.op = SELECTION_DONE; 2895 selection.op = SELECTION_DONE;
2852 2896
2853 if (selection.clicks == 4) 2897 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2898 return; /* nothing selected, go away */
2855 2899
2900 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2901 return;
2902
2856 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 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));
2858 2905
2859 col = selection.beg.col;
2860 MAX_IT (col, 0);
2861 row = selection.beg.row + TermWin.saveLines;
2862 end_row = selection.end.row + TermWin.saveLines;
2863 int ofs = 0; 2906 int ofs = 0;
2864 int extra = 0; 2907 int extra = 0;
2865 2908
2909 int col = selection.beg.col;
2910 int row = selection.beg.row;
2911
2912 int end_col;
2913
2866 for (; row <= end_row; row++, col = 0) 2914 for (; row <= selection.end.row; row++, col = 0)
2867 { 2915 {
2868 t = &(screen.text[row][col]); 2916#if ENABLE_FRILLS
2869 2917 if (selection.rect)
2870 end_col = screen.tlen[row]; 2918 {
2871 2919 col = selection.beg.col;
2872 if (end_col == -1)
2873 end_col = TermWin.ncol; 2920 end_col = ncol + 1;
2921 }
2922 else
2923#endif
2924 end_col = ROW(row).l;
2874 2925
2926 col = max (col, 0);
2927
2875 if (row == end_row) 2928 if (row == selection.end.row
2929#if ENABLE_FRILLS
2930 || selection.rect
2931#endif
2932 )
2876 MIN_IT (end_col, selection.end.col); 2933 min_it (end_col, selection.end.col);
2934
2935 t = ROW(row).t + col;
2877 2936
2878 for (; col < end_col; col++) 2937 for (; col < end_col; col++)
2879 { 2938 {
2880 if (*t == NOCHAR) 2939 if (*t == NOCHAR)
2881 t++; 2940 t++;
… …
2898#endif 2957#endif
2899 else 2958 else
2900 new_selection_text[ofs++] = *t++; 2959 new_selection_text[ofs++] = *t++;
2901 } 2960 }
2902 2961
2903 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
2904 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;
2905 } 2976 }
2906 2977
2907 if (end_col != selection.end.col) 2978 if (end_col != selection.end.col)
2908 new_selection_text[ofs++] = C0_LF; 2979 new_selection_text[ofs++] = C0_LF;
2909 2980
… …
2919 2990
2920 // 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
2921 selection.len = ofs; 2992 selection.len = ofs;
2922 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));
2923 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
2924 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2925 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3008 {
2926 display->set_selection_owner (this); 3009 display->set_selection_owner (this);
3010 return true;
3011 }
2927 else 3012 else
2928 rxvt_warn ("can't get primary selection, ignoring.\n"); 3013 return false;
2929 3014
2930#if 0 3015#if 0
2931 XTextProperty ct; 3016 XTextProperty ct;
2932 3017
2933 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2934 { 3019 {
2935 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3020 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2936 PropModeReplace, ct.value, ct.nitems);
2937 XFree (ct.value); 3021 XFree (ct.value);
2938 } 3022 }
2939#endif 3023#endif
2940
2941 selection_time = tm;
2942 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2943} 3024}
2944 3025
2945/* ------------------------------------------------------------------------- */ 3026/* ------------------------------------------------------------------------- */
2946/* 3027/*
2947 * 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
2948 * EXT: button 1 press 3029 * EXT: button 1 press
2949 */ 3030 */
2950void 3031void
2951rxvt_term::selection_click (int clicks, int x, int y) 3032rxvt_term::selection_click (int clicks, int x, int y)
2952{ 3033{
2953 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2954
2955 clicks = ((clicks - 1) % 3) + 1; 3034 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 3035 selection.clicks = clicks; /* save clicks so extend will work */
2957 3036
2958 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2959 3038
2960 if (clicks == 2 || clicks == 3) 3039 if (clicks == 2 || clicks == 3)
2961 selection_extend_colrow (selection.mark.col, 3040 selection_extend_colrow (selection.mark.col,
2962 selection.mark.row + TermWin.view_start, 3041 selection.mark.row + view_start,
2963 0, /* button 3 */ 3042 0, /* button 3 */
2964 1, /* button press */ 3043 1, /* button press */
2965 0); /* click change */ 3044 0); /* click change */
2966} 3045}
2967 3046
… …
2971 */ 3050 */
2972void 3051void
2973rxvt_term::selection_start_colrow (int col, int row) 3052rxvt_term::selection_start_colrow (int col, int row)
2974{ 3053{
2975 want_refresh = 1; 3054 want_refresh = 1;
3055
3056 selection.mark.row = row - view_start;
2976 selection.mark.col = col; 3057 selection.mark.col = col;
2977 selection.mark.row = row - TermWin.view_start;
2978 3058
2979 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
2980 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2981 MAX_IT (selection.mark.col, 0);
2982 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2983 3061
2984 while (selection.mark.col > 0 3062 while (selection.mark.col > 0
2985 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2986 --selection.mark.col; 3064 --selection.mark.col;
2987 3065
2988 if (selection.op) 3066 if (selection.op)
2989 { /* clear the old selection */ 3067 { /* clear the old selection */
2990 selection.beg.row = selection.end.row = selection.mark.row; 3068 selection.beg.row = selection.end.row = selection.mark.row;
… …
3001 * We now only find out the boundary in one direction 3079 * We now only find out the boundary in one direction
3002 */ 3080 */
3003 3081
3004/* 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 */
3005#define DELIMIT_TEXT(x) \ 3083#define DELIMIT_TEXT(x) \
3006 (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)))
3007#define DELIMIT_REND(x) 1 3085#define DELIMIT_REND(x) 1
3008 3086
3009void 3087void
3010rxvt_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)
3011{ 3089{
… …
3014 text_t *stp; 3092 text_t *stp;
3015 rend_t *srp; 3093 rend_t *srp;
3016 3094
3017 if (dirn == UP) 3095 if (dirn == UP)
3018 { 3096 {
3019 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3097 bound.row = - nsaved - 1;
3020 bound.col = 0; 3098 bound.col = 0;
3021 dirnadd = -1; 3099 dirnadd = -1;
3022 } 3100 }
3023 else 3101 else
3024 { 3102 {
3025 bound.row = TermWin.saveLines + TermWin.nrow; 3103 bound.row = nrow;
3026 bound.col = TermWin.ncol - 1; 3104 bound.col = ncol - 1;
3027 dirnadd = 1; 3105 dirnadd = 1;
3028 } 3106 }
3029 3107
3030 row = mark->row + TermWin.saveLines; 3108 row = mark->row;
3031 col = mark->col; 3109 col = max (mark->col, 0);
3032 MAX_IT (col, 0); 3110
3033 /* find the edge of a word */ 3111 /* find the edge of a word */
3034 stp = & (screen.text[row][col]); 3112 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3035 w1 = DELIMIT_TEXT (*stp); 3113 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3036
3037 srp = (&screen.rend[row][col]);
3038 w2 = DELIMIT_REND (*srp);
3039 3114
3040 for (;;) 3115 for (;;)
3041 { 3116 {
3042 for (; col != bound.col; col += dirnadd) 3117 for (; col != bound.col; col += dirnadd)
3043 { 3118 {
… …
3053 break; 3128 break;
3054 } 3129 }
3055 3130
3056 if ((col == bound.col) && (row != bound.row)) 3131 if ((col == bound.col) && (row != bound.row))
3057 { 3132 {
3058 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3133 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3059 { 3134 {
3060 trow = row + dirnadd; 3135 trow = row + dirnadd;
3061 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3136 tcol = dirn == UP ? ncol - 1 : 0;
3062 3137
3063 if (screen.text[trow] == NULL) 3138 if (!ROW(trow).t)
3064 break; 3139 break;
3065 3140
3066 stp = & (screen.text[trow][tcol]); 3141 stp = ROW(trow).t + tcol;
3067 srp = & (screen.rend[trow][tcol]); 3142 srp = ROW(trow).r + tcol;
3068 3143
3069 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3144 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3070 break; 3145 break;
3071 3146
3072 row = trow; 3147 row = trow;
… …
3075 } 3150 }
3076 } 3151 }
3077 break; 3152 break;
3078 } 3153 }
3079 3154
3080Old_Word_Selection_You_Die:
3081 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));
3082
3083 if (dirn == DN) 3155 if (dirn == DN)
3084 col++; /* put us on one past the end */ 3156 col++; /* put us on one past the end */
3085 3157
3086 /* Poke the values back in */ 3158 /* Poke the values back in */
3087 ret->row = row - TermWin.saveLines; 3159 ret->row = row;
3088 ret->col = col; 3160 ret->col = col;
3089} 3161}
3090 3162
3091/* ------------------------------------------------------------------------- */ 3163/* ------------------------------------------------------------------------- */
3092/* 3164/*
… …
3097 * flag == 2 ==> button 3 motion 3169 * flag == 2 ==> button 3 motion
3098 */ 3170 */
3099void 3171void
3100rxvt_term::selection_extend (int x, int y, int flag) 3172rxvt_term::selection_extend (int x, int y, int flag)
3101{ 3173{
3102 int col, row; 3174 int col = clamp (Pixel2Col (x), 0, ncol);
3103 3175 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 col = Pixel2Col (x);
3105 row = Pixel2Row (y);
3106 MAX_IT (row, 0);
3107 MIN_IT (row, (int)TermWin.nrow - 1);
3108 MAX_IT (col, 0);
3109 MIN_IT (col, (int)TermWin.ncol);
3110 3176
3111 /* 3177 /*
3112 * 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
3113 * 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
3114 * 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
3115 * be _past_ a character for it to be selected. 3181 * be _past_ a character for it to be selected.
3116 */ 3182 */
3117 if (((selection.clicks % 3) == 1) && !flag 3183 if (((selection.clicks % 3) == 1) && !flag
3118 && (col == selection.mark.col 3184 && (col == selection.mark.col
3119 && (row == selection.mark.row + TermWin.view_start))) 3185 && (row == selection.mark.row + view_start)))
3120 { 3186 {
3121 /* select nothing */ 3187 /* select nothing */
3122 selection.beg.row = selection.end.row = 0; 3188 selection.beg.row = selection.end.row = 0;
3123 selection.beg.col = selection.end.col = 0; 3189 selection.beg.col = selection.end.col = 0;
3124 selection.clicks = 4; 3190 selection.clicks = 4;
3125 want_refresh = 1; 3191 want_refresh = 1;
3126 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3127 return; 3192 return;
3128 } 3193 }
3129 3194
3130 if (selection.clicks == 4) 3195 if (selection.clicks == 4)
3131 selection.clicks = 1; 3196 selection.clicks = 1;
… …
3140 * Extend the selection to the specified col/row 3205 * Extend the selection to the specified col/row
3141 */ 3206 */
3142void 3207void
3143rxvt_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)
3144{ 3209{
3145 int16_t ncol = TermWin.ncol;
3146 int end_col;
3147 row_col_t pos; 3210 row_col_t pos;
3148 enum { 3211 enum {
3149 LEFT, RIGHT 3212 LEFT, RIGHT
3150 } closeto = RIGHT; 3213 } closeto = RIGHT;
3151 3214
3152 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));
3153 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));
3154
3155 want_refresh = 1; 3215 want_refresh = 1;
3216
3156 switch (selection.op) 3217 switch (selection.op)
3157 { 3218 {
3158 case SELECTION_INIT: 3219 case SELECTION_INIT:
3159 CLEAR_SELECTION (); 3220 CLEAR_SELECTION ();
3160 selection.op = SELECTION_BEGIN; 3221 selection.op = SELECTION_BEGIN;
… …
3173 selection_start_colrow (col, row); 3234 selection_start_colrow (col, row);
3174 /* FALLTHROUGH */ 3235 /* FALLTHROUGH */
3175 default: 3236 default:
3176 return; 3237 return;
3177 } 3238 }
3239
3178 if (selection.beg.col == selection.end.col 3240 if (selection.beg.col == selection.end.col
3179 && selection.beg.col != selection.mark.col 3241 && selection.beg.col != selection.mark.col
3180 && selection.beg.row == selection.end.row 3242 && selection.beg.row == selection.end.row
3181 && selection.beg.row != selection.mark.row) 3243 && selection.beg.row != selection.mark.row)
3182 { 3244 {
3183 selection.beg.col = selection.end.col = selection.mark.col; 3245 selection.beg.col = selection.end.col = selection.mark.col;
3184 selection.beg.row = selection.end.row = selection.mark.row; 3246 selection.beg.row = selection.end.row = selection.mark.row;
3185 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));
3186 } 3247 }
3187 3248
3188 pos.col = col; 3249 pos.col = col;
3189 pos.row = row; 3250 pos.row = row - view_start;
3190
3191 pos.row -= TermWin.view_start; /* adjust for scroll */
3192 3251
3193 /* 3252 /*
3194 * 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
3195 * in the way button3 drag extension works. 3254 * in the way button3 drag extension works.
3196 * We're either doing: button1 drag; button3 press; or button3 drag 3255 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3233 } 3292 }
3234 else 3293 else
3235 { /* button1 drag or button3 drag */ 3294 { /* button1 drag or button3 drag */
3236 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3295 if (ROWCOL_IS_AFTER (selection.mark, pos))
3237 { 3296 {
3238 if ((selection.mark.row == selection.end.row) 3297 if (selection.mark.row == selection.end.row
3239 && (selection.mark.col == selection.end.col) 3298 && selection.mark.col == selection.end.col
3299 && clickchange
3240 && clickchange && selection.clicks == 2) 3300 && selection.clicks == 2)
3241 selection.mark.col--; 3301 selection.mark.col--;
3242 3302
3243 selection.beg.row = pos.row; 3303 selection.beg.row = pos.row;
3244 selection.beg.col = pos.col; 3304 selection.beg.col = pos.col;
3245 selection.end.row = selection.mark.row; 3305 selection.end.row = selection.mark.row;
… …
3254 } 3314 }
3255 } 3315 }
3256 3316
3257 if (selection.clicks == 1) 3317 if (selection.clicks == 1)
3258 { 3318 {
3259 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3319 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3260 3320 && !ROW(selection.beg.row).is_longer ()
3261 if (end_col != -1 && selection.beg.col > end_col) 3321#if ENABLE_FRILLS
3322 && !selection.rect
3323#endif
3262 { 3324 )
3263#if 1
3264 selection.beg.col = ncol; 3325 selection.beg.col = ncol;
3265#else 3326
3266 if (selection.beg.row != selection.end.row) 3327 if (
3267 selection.beg.col = ncol; 3328 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3268 else 3329 && !ROW(selection.end.row).is_longer ()
3269 selection.beg.col = selection.mark.col; 3330#if ENABLE_FRILLS
3331 && !selection.rect
3270#endif 3332#endif
3271 } 3333 )
3272
3273 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3274
3275 if (end_col != -1 && selection.end.col > end_col)
3276 selection.end.col = ncol; 3334 selection.end.col = ncol;
3277 } 3335 }
3278 else if (selection.clicks == 2) 3336 else if (selection.clicks == 2)
3279 { 3337 {
3280 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3281 selection.end.col--; 3339 selection.end.col--;
3282 3340
3283 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3284 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 }
3285 } 3346 }
3286 else if (selection.clicks == 3) 3347 else if (selection.clicks == 3)
3287 { 3348 {
3288#ifndef NO_FRILLS 3349#if ENABLE_FRILLS
3289 if ((Options & Opt_tripleclickwords)) 3350 if (OPTION (Opt_tripleclickwords))
3290 { 3351 {
3291 int end_row; 3352 selection_delimit_word (UP, &selection.beg, &selection.beg);
3292 3353
3293 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3294 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3295
3296 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++)
3297 { 3355 {
3298 end_col = screen.tlen[end_row + TermWin.saveLines]; 3356 if (!ROW(end_row).is_longer ())
3299
3300 if (end_col != -1)
3301 { 3357 {
3302 selection.end.row = end_row; 3358 selection.end.row = end_row;
3303 selection.end.col = end_col; 3359 selection.end.col = ROW(end_row).l;
3304 selection_remove_trailing_spaces (); 3360 selection_remove_trailing_spaces ();
3305 break; 3361 break;
3306 } 3362 }
3307 } 3363 }
3308 } 3364 }
3309 else 3365 else
3310#endif 3366#endif
3311 { 3367 {
3312 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3368 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3313 selection.mark.col++; 3369 selection.mark.col++;
3370
3314 selection.beg.col = 0; 3371 selection.beg.col = 0;
3315 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++;
3316 } 3382 }
3317 } 3383 }
3318 3384
3319 if (button3 && buttonpress) 3385 if (button3 && buttonpress)
3320 { /* mark may need to be changed */ 3386 { /* mark may need to be changed */
3321 if (closeto == LEFT) 3387 if (closeto == LEFT)
3322 { 3388 {
3323 selection.mark.row = selection.end.row; 3389 selection.mark.row = selection.end.row;
3324 selection.mark.col = selection.end.col 3390 selection.mark.col = selection.end.col - (selection.clicks == 2);
3325 - (selection.clicks == 2);
3326 } 3391 }
3327 else 3392 else
3328 { 3393 {
3329 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3330 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3331 } 3396 }
3332 } 3397 }
3333 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));
3334}
3335 3398
3336#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
3337void 3406void
3338rxvt_term::selection_remove_trailing_spaces () 3407rxvt_term::selection_remove_trailing_spaces ()
3339{ 3408{
3340 int32_t end_col, end_row; 3409 int32_t end_col, end_row;
3341 text_t *stp; 3410 text_t *stp;
3342 3411
3343 end_col = selection.end.col; 3412 end_col = selection.end.col;
3344 end_row = selection.end.row; 3413 end_row = selection.end.row;
3414
3345 for ( ; end_row >= selection.beg.row; ) 3415 for (; end_row >= selection.beg.row; )
3346 { 3416 {
3347 stp = screen.text[end_row + TermWin.saveLines]; 3417 stp = ROW(end_row).t;
3418
3348 while (--end_col >= 0) 3419 while (--end_col >= 0)
3349 { 3420 {
3350 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3421 if (stp[end_col] != NOCHAR
3422 && !unicode::is_space (stp[end_col]))
3351 break; 3423 break;
3352 } 3424 }
3425
3353 if (end_col >= 0 3426 if (end_col >= 0
3354 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3427 || !ROW(end_row - 1).is_longer ())
3355 { 3428 {
3356 selection.end.col = end_col + 1; 3429 selection.end.col = end_col + 1;
3357 selection.end.row = end_row; 3430 selection.end.row = end_row;
3358 break; 3431 break;
3359 } 3432 }
3433
3360 end_row--; 3434 end_row--;
3361 end_col = TermWin.ncol; 3435 end_col = ncol;
3362 } 3436 }
3437
3363 if (selection.mark.row > selection.end.row) 3438 if (selection.mark.row > selection.end.row)
3364 { 3439 {
3365 selection.mark.row = selection.end.row; 3440 selection.mark.row = selection.end.row;
3366 selection.mark.col = selection.end.col; 3441 selection.mark.col = selection.end.col;
3367 } 3442 }
… …
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3458 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3459}
3385 3460
3386/* ------------------------------------------------------------------------- */ 3461/* ------------------------------------------------------------------------- */
3387/* 3462/*
3388 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3389 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3390 * the X11 protocol.
3391 */
3392typedef CARD32 Atom32;
3393
3394/* ------------------------------------------------------------------------- */
3395/*
3396 * Respond to a request for our current selection 3463 * Respond to a request for our current selection
3397 * EXT: SelectionRequest 3464 * EXT: SelectionRequest
3398 */ 3465 */
3399void 3466void
3400rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3467rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3401{ 3468{
3402 XSelectionEvent ev; 3469 XSelectionEvent ev;
3403 XTextProperty ct; 3470 dDisp;
3404 XICCEncodingStyle style;
3405 Atom target;
3406 3471
3407 ev.type = SelectionNotify; 3472 ev.type = SelectionNotify;
3408 ev.property = None; 3473 ev.property = None;
3409 ev.display = rq.display; 3474 ev.display = rq.display;
3410 ev.requestor = rq.requestor; 3475 ev.requestor = rq.requestor;
… …
3412 ev.target = rq.target; 3477 ev.target = rq.target;
3413 ev.time = rq.time; 3478 ev.time = rq.time;
3414 3479
3415 if (rq.target == xa[XA_TARGETS]) 3480 if (rq.target == xa[XA_TARGETS])
3416 { 3481 {
3417 Atom32 target_list[6]; 3482 Atom target_list[6];
3418 Atom32 *target = target_list; 3483 Atom *target = target_list;
3419 3484
3420 *target++ = (Atom32) xa[XA_TARGETS]; 3485 *target++ = xa[XA_TARGETS];
3421 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3486 *target++ = xa[XA_TIMESTAMP];
3422 *target++ = (Atom32) XA_STRING; 3487 *target++ = XA_STRING;
3423 *target++ = (Atom32) xa[XA_TEXT]; 3488 *target++ = xa[XA_TEXT];
3424 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3489 *target++ = xa[XA_COMPOUND_TEXT];
3425#if X_HAVE_UTF8_STRING 3490#if X_HAVE_UTF8_STRING
3426 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3491 *target++ = xa[XA_UTF8_STRING];
3427#endif 3492#endif
3428 3493
3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3494 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3430 (8 * sizeof (target_list[0])), PropModeReplace, 3495 32, PropModeReplace,
3431 (unsigned char *)target_list, 3496 (unsigned char *)target_list, target - target_list);
3432 target - target_list);
3433 ev.property = rq.property; 3497 ev.property = rq.property;
3434 } 3498 }
3499#if TODO // TODO
3435 else if (rq.target == xa[XA_MULTIPLE]) 3500 else if (rq.target == xa[XA_MULTIPLE])
3436 { 3501 {
3437 /* TODO: Handle MULTIPLE */ 3502 /* TODO: Handle MULTIPLE */
3438 } 3503 }
3504#endif
3439 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3505 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3440 { 3506 {
3441 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3507 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3442 (8 * sizeof (Time)), PropModeReplace,
3443 (unsigned char *)&selection_time, 1); 3508 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3444 ev.property = rq.property; 3509 ev.property = rq.property;
3445 } 3510 }
3446 else if (rq.target == XA_STRING 3511 else if (rq.target == XA_STRING
3447 || rq.target == xa[XA_TEXT] 3512 || rq.target == xa[XA_TEXT]
3448 || rq.target == xa[XA_COMPOUND_TEXT] 3513 || rq.target == xa[XA_COMPOUND_TEXT]
3449 || rq.target == xa[XA_UTF8_STRING] 3514 || rq.target == xa[XA_UTF8_STRING]
3450 ) 3515 )
3451 { 3516 {
3517 XTextProperty ct;
3518 Atom target = rq.target;
3452 short freect = 0; 3519 short freect = 0;
3453 int selectlen; 3520 int selectlen;
3454 wchar_t *cl; 3521 wchar_t *cl;
3455 3522 enum {
3456 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;
3457 3532
3458 if (target == XA_STRING) 3533 if (target == XA_STRING)
3459 // 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
3460 // will ask for another format anyways. 3535 // will ask for another format anyways.
3461 style = XStringStyle; 3536 style = enc_string;
3462 else if (target == xa[XA_TEXT]) 3537 else if (target == xa[XA_TEXT])
3463 style = XStdICCTextStyle; 3538 style = enc_text;
3464 else if (target == xa[XA_COMPOUND_TEXT]) 3539 else if (target == xa[XA_COMPOUND_TEXT])
3465 style = XCompoundTextStyle; 3540 style = enc_compound_text;
3466#if X_HAVE_UTF8_STRING 3541#if ENABLE_FRILLS
3467 else if (target == xa[XA_UTF8_STRING]) 3542 else if (target == xa[XA_UTF8_STRING])
3468 style = XUTF8StringStyle; 3543 style = enc_utf8;
3469#endif 3544#endif
3470 else 3545 else
3471 { 3546 {
3472 target = xa[XA_COMPOUND_TEXT]; 3547 target = xa[XA_COMPOUND_TEXT];
3473 style = XCompoundTextStyle; 3548 style = enc_compound_text;
3474 } 3549 }
3475 3550
3476 if (selection.text) 3551 if (selection.text)
3477 { 3552 {
3478 cl = selection.text; 3553 cl = selection.text;
… …
3482 { 3557 {
3483 cl = L""; 3558 cl = L"";
3484 selectlen = 0; 3559 selectlen = 0;
3485 } 3560 }
3486 3561
3487 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3562#if ENABLE_FRILLS
3488 // 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
3489 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3575 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3490 freect = 1; 3576 freect = 1;
3491 else 3577 else
3492 { 3578 {
3493 /* if we failed to convert then send it raw */ 3579 /* if we failed to convert then send it raw */
3494 ct.value = (unsigned char *)cl; 3580 ct.value = (unsigned char *)cl;
3495 ct.nitems = selectlen; 3581 ct.nitems = selectlen;
3582 ct.encoding = target;
3496 } 3583 }
3497 3584
3498 XChangeProperty (display->display, rq.requestor, rq.property, 3585 XChangeProperty (disp, rq.requestor, rq.property,
3499 target, 8, PropModeReplace, 3586 ct.encoding, 8, PropModeReplace,
3500 ct.value, (int)ct.nitems); 3587 ct.value, (int)ct.nitems);
3501 ev.property = rq.property; 3588 ev.property = rq.property;
3502 3589
3503 if (freect) 3590 if (freect)
3504 XFree (ct.value); 3591 XFree (ct.value);
3505 } 3592 }
3506 3593
3507 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3594 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3508} 3595}
3509 3596
3510/* ------------------------------------------------------------------------- * 3597/* ------------------------------------------------------------------------- *
3511 * MOUSE ROUTINES * 3598 * MOUSE ROUTINES *
3512 * ------------------------------------------------------------------------- */ 3599 * ------------------------------------------------------------------------- */
… …
3516 */ 3603 */
3517void 3604void
3518rxvt_term::pixel_position (int *x, int *y) 3605rxvt_term::pixel_position (int *x, int *y)
3519{ 3606{
3520 *x = Pixel2Col (*x); 3607 *x = Pixel2Col (*x);
3521 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3608 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3522 *y = Pixel2Row (*y); 3609 *y = Pixel2Row (*y);
3523 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3610 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3524} 3611}
3525 3612
3526/* ------------------------------------------------------------------------- */ 3613/* ------------------------------------------------------------------------- */
3527#ifdef USE_XIM 3614#ifdef USE_XIM
3528void 3615void
3529rxvt_term::im_set_position (XPoint *pos) 3616rxvt_term::im_set_position (XPoint &pos)
3530{ 3617{
3531 XWindowAttributes xwa; 3618 XWindowAttributes xwa;
3532 3619
3533 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3620 XGetWindowAttributes (display->display, vt, &xwa);
3621
3534 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3622 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3535 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3623 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3536} 3624}
3537
3538#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
3539/* ------------------------------------------------------------------------- */ 3760/* ------------------------------------------------------------------------- */
3761

Diff Legend

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