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

Diff Legend

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