ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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