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

Diff Legend

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