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.225 by root, Thu Jan 12 05:22:47 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)
121{ 121{
122 if (!l.t)
123 {
124 lalloc (l);
125 col = 0;
126 width = ncol;
127 }
128
129 l.touch ();
130
122 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133
134 text_t *et = l.t + col;
135 rend_t *er = l.r + col;
124 136
125 while (width--) 137 while (width--)
126 { 138 {
127 *et++ = ' '; 139 *et++ = ' ';
128 *er++ = efs; 140 *er++ = efs;
… …
130} 142}
131 143
132/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
134void 146void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
136{ 148{
137#ifdef DEBUG_STRICT 149 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145 150
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
152void 159void
153rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
154{ 161{
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 162#if ENABLE_OVERLAY
156 unsigned int p, q; 163 scr_overlay_off ();
157 int k; 164#endif
158 rend_t setrstyle;
159 165
160 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
161
162 TermWin.view_start = 0; 166 view_start = 0;
163 num_scr = 0; 167 num_scr = 0;
164 168
165 if (TermWin.ncol == 0) 169 if (ncol == 0)
166 TermWin.ncol = 80; 170 ncol = 80;
167 171
168 if (TermWin.nrow == 0) 172 if (nrow == 0)
169 TermWin.nrow = 24; 173 nrow = 24;
170
171 ncol = TermWin.ncol;
172 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2)
180 {
181 //TODO//FIXME
182 saveLines++;
183 prev_nrow--;
184 nsaved++;
185 }
186
177 want_refresh = 1; 187 want_refresh = 1;
178 188
189 int prev_total_rows = prev_nrow + saveLines;
179 total_rows = nrow + TermWin.saveLines; 190 total_rows = nrow + saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 191
182 screen.tscroll = 0; 192 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
184 194
185 if (!talloc) 195 if (!row_buf)
186 { 196 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 nsaved = 0; /* no saved lines */
201 term_start = 0;
202
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 }
190 205
191 if (prev_nrow == 0) 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
192 { 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
193 /* 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 * first time called so just malloc everything : don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL
196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
201 209
202 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 210 for (int row = nrow; row--; )
203 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
204
205 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
207 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
209
210 for (p = 0; p < nrow; p++)
211 {
212 q = p + TermWin.saveLines;
213 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
218 216
219 MEMSET (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 220 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 221 screen.charset = 0;
225 current_screen = PRIMARY; 222 current_screen = PRIMARY;
… …
245 else 242 else
246 { 243 {
247 /* 244 /*
248 * add or delete rows as appropriate 245 * add or delete rows as appropriate
249 */ 246 */
250 setrstyle = DEFAULT_RSTYLE;
251 247
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
253 { 253 {
254 /* delete rows */
255 k = min (TermWin.nscrolled, prev_nrow - nrow);
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 254 for (int row = nrow; row < prev_nrow; row++)
259 { 255 {
260 q = p + TermWin.saveLines; 256 lfree (swap_buf [row]);
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 - nsaved , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (nsaved)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
292 do
293 {
294 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
300
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
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 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
332 {
333 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol;
335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
346
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348
272 assert (swap.rend[p]); 349 assert (len);
273#endif 350 assert (pline.t);
274 talloc->free (swap.text[p]); 351
275 ralloc->free (swap.rend[p]); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354
355 lofs += len;
356 qcol += len;
357 }
276 } 358 }
277#ifdef DEBUG_STRICT 359
278 assert (drawn_text[p] && drawn_rend[p]); 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
279#endif 361 qline->is_longer (0);
280 talloc->free (drawn_text[p]); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
281 ralloc->free (drawn_rend[p]);
282 } 363 }
364 while (p != pend && q > 0);
283 365
284 /* we have fewer rows so fix up cursor position */ 366 term_start = total_rows - nrow;
285 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 367 nsaved = term_start - q;
286 MIN_IT (swap.cur.row, (int32_t)nrow - 1); 368
287 369 // make sure all terminal lines exist
288 scr_reset_realloc (); /* realloc _last_ */ 370 while (nsaved < 0)
289 } 371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
290 else if (nrow > prev_nrow)
291 { 372 }
292 /* add rows */ 373 else
293 scr_reset_realloc (); /* realloc _first_ */ 374 {
294 375 // if no scrollback exists (yet), wing, instead of wrap
295 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 376
296 377 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 { 378 {
301 screen.tlen[p] = 0; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
302 screen.text[p] = NULL; 380 line_t &qline = row_buf [row];
303 screen.rend[p] = NULL; 381
382 qline = pline;
383 lresize (qline);
304 } 384 }
305 385
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++) 386 for (int row = prev_nrow; row < nrow; row++)
310 { 387 {
311 swap.tlen[p] = 0; 388 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 } 389 }
319 390
320 if (k > 0) 391 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 { 392 }
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 393
345 for (p = 0; p < total_rows; p++) 394#ifdef DEBUG_STRICT //TODO: remove
346 { 395 for (int i = -nsaved; i < nrow; i++)
347 if (screen.text[p]) 396 assert (ROW (i).t);
348 { 397#endif
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 398
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 399 free (old_buf);
400 delete old_ta;
401 delete old_ra;
353 402
354 if (ncol > prev_ncol) 403 clamp_it (screen.cur.row, 0, nrow - 1);
355 scr_blank_line (& (screen.text[p][prev_ncol]), 404 clamp_it (screen.cur.col, 0, ncol - 1);
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 405
394 if (tabs) 406 if (tabs)
395 free (tabs); 407 free (tabs);
396 } 408 }
397 409
398 prev_nrow = nrow; 410 prev_nrow = nrow;
399 prev_ncol = ncol; 411 prev_ncol = ncol;
400 412
401 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
402 414
403 for (p = 0; p < ncol; p++) 415 for (int col = ncol; col--; )
404 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
405 417
406 tt_winch (); 418 tt_winch ();
407}
408 419
409void 420 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} 421}
431 422
432/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
433/* 424/*
434 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
435 */ 426 */
436void 427void
437rxvt_term::scr_release () 428rxvt_term::scr_release ()
438{ 429{
439 uint16_t total_rows;
440 int i;
441
442 total_rows = TermWin.nrow + TermWin.saveLines;
443
444 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
445 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
446 432
447 free (screen.text); 433 free (row_buf);
448 free (screen.tlen); 434 free (swap_buf);
449 free (screen.rend);
450 free (drawn_text); 435 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); 436 free (tabs);
458 437
459 /* NULL these so if anything tries to use them, we'll know about it */ 438 row_buf = 0; // signal that we freed all the arrays
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} 439}
467 440
468/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
469/* 442/*
470 * Hard reset 443 * Hard reset
471 */ 444 */
472void 445void
473rxvt_term::scr_poweron () 446rxvt_term::scr_poweron ()
474{ 447{
475 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
476
477 scr_release (); 448 scr_release ();
478 prev_nrow = prev_ncol = 0; 449 prev_nrow = prev_ncol = 0;
479 scr_reset (); 450 scr_reset ();
480 451
481 scr_clear (); 452 scr_clear (true);
482 scr_refresh (SLOW_REFRESH); 453 scr_refresh (SLOW_REFRESH);
483} 454}
484 455
485/* ------------------------------------------------------------------------- * 456/* ------------------------------------------------------------------------- *
486 * PROCESS SCREEN COMMANDS * 457 * PROCESS SCREEN COMMANDS *
… …
492 */ 463 */
493void 464void
494rxvt_term::scr_cursor (int mode) 465rxvt_term::scr_cursor (int mode)
495{ 466{
496 screen_t *s; 467 screen_t *s;
497
498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
499 468
500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
501 if (current_screen == SECONDARY) 470 if (current_screen == SECONDARY)
502 s = &swap; 471 s = &swap;
503 else 472 else
… …
505 s = &screen; 474 s = &screen;
506 475
507 switch (mode) 476 switch (mode)
508 { 477 {
509 case SAVE: 478 case SAVE:
510 s->s_cur.row = s->cur.row; 479 s->s_cur.row = screen.cur.row;
511 s->s_cur.col = s->cur.col; 480 s->s_cur.col = screen.cur.col;
512 s->s_rstyle = rstyle; 481 s->s_rstyle = rstyle;
513 s->s_charset = s->charset; 482 s->s_charset = screen.charset;
514 s->s_charset_char = charsets[s->charset]; 483 s->s_charset_char = charsets[screen.charset];
515 break; 484 break;
485
516 case RESTORE: 486 case RESTORE:
517 want_refresh = 1; 487 want_refresh = 1;
518 s->cur.row = s->s_cur.row; 488 screen.cur.row = s->s_cur.row;
519 s->cur.col = s->s_cur.col; 489 screen.cur.col = s->s_cur.col;
520 s->flags &= ~Screen_WrapNext; 490 screen.flags &= ~Screen_WrapNext;
521 rstyle = s->s_rstyle; 491 rstyle = s->s_rstyle;
522 s->charset = s->s_charset; 492 screen.charset = s->s_charset;
523 charsets[s->charset] = s->s_charset_char; 493 charsets[screen.charset] = s->s_charset_char;
524 set_font_style (); 494 set_font_style ();
525 break; 495 break;
526 } 496 }
527 497
528 /* boundary check in case screen size changed between SAVE and RESTORE */ 498 /* boundary check in case screen size changed between SAVE and RESTORE */
529 MIN_IT (s->cur.row, TermWin.nrow - 1); 499 min_it (s->cur.row, nrow - 1);
530 MIN_IT (s->cur.col, TermWin.ncol - 1); 500 min_it (s->cur.col, ncol - 1);
531#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
532 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
533 assert (s->cur.col >= 0); 503 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 504#endif
538} 505}
539 506
540/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
541/* 508/*
… …
544 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
545 */ 512 */
546int 513int
547rxvt_term::scr_change_screen (int scrn) 514rxvt_term::scr_change_screen (int scrn)
548{ 515{
549 int i;
550#if NSCREENS
551 int offset;
552#endif
553
554 want_refresh = 1; 516 want_refresh = 1;
555
556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
557
558 TermWin.view_start = 0; 517 view_start = 0;
559 518
560 if (current_screen == scrn) 519 if (current_screen == scrn)
561 return scrn; 520 return scrn;
562 521
563 selection_check (2); /* check for boundary cross */ 522 selection_check (2); /* check for boundary cross */
564 523
565 SWAP_IT (current_screen, scrn, int); 524 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
566#if NSCREENS 532#if NSCREENS
567 if (Options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
568 { 534 {
569 num_scr = 0; 535 num_scr = 0;
570 offset = TermWin.saveLines; 536
571 for (i = prev_nrow; i--;) 537 for (int i = prev_nrow; i--; )
572 { 538 ::swap (ROW(i), swap_buf [i]);
573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 539
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); 540 ::swap (screen.charset, swap.charset);
589 SWAP_IT (screen.flags, swap.flags, int); 541 ::swap (screen.flags, swap.flags);
590 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
591 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
592 } 544 }
593 else 545 else
594#endif 546#endif
595 if (Options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
596 //if (current_screen == PRIMARY)
597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
598 return scrn; 550 return scrn;
599} 551}
600 552
553// clear WrapNext indicator, solidifying position on next line
554void
555rxvt_term::scr_do_wrap ()
556{
557 if (!(screen.flags & Screen_WrapNext))
558 return;
559
560 screen.flags &= ~Screen_WrapNext;
561
562 screen.cur.col = 0;
563
564 if (screen.cur.row == screen.bscroll)
565 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
566 else if (screen.cur.row < nrow - 1)
567 screen.cur.row++;
568}
569
601/* ------------------------------------------------------------------------- */ 570/* ------------------------------------------------------------------------- */
602/* 571/*
603 * Change the colour for following text 572 * Change the colour for following text
604 */ 573 */
605void 574void
606rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
607{ 576{
608 color &= RS_fgMask; 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg;
579
609 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
610 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
611 else 582 else
612 rstyle = SET_BGCOLOR (rstyle, color); 583 rstyle = SET_BGCOLOR (rstyle, color);
613} 584}
… …
630/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
631/* 602/*
632 * Scroll text between <row1> and <row2> inclusive, by <count> lines 603 * Scroll text between <row1> and <row2> inclusive, by <count> lines
633 * count positive ==> scroll up 604 * count positive ==> scroll up
634 * count negative ==> scroll down 605 * count negative ==> scroll down
635 * spec == 0 for normal routines
636 */ 606 */
637int 607int
638rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 608rxvt_term::scr_scroll_text (int row1, int row2, int count)
639{ 609{
640 int i, j;
641 long nscrolled;
642
643 if (count == 0 || (row1 > row2)) 610 if (count == 0 || (row1 > row2))
644 return 0; 611 return 0;
645 612
646 want_refresh = 1; 613 want_refresh = 1;
647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 614 num_scr += count;
648 615
649 if (row1 == 0 && count > 0 616 if (count > 0
617 && row1 == 0
618 && row2 == nrow - 1
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
651 { 620 {
652 nscrolled = (long)TermWin.nscrolled + (long)count; 621 nsaved = min (nsaved + count, saveLines);
653 622
654 if (nscrolled > (long)TermWin.saveLines) 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
655 TermWin.nscrolled = TermWin.saveLines;
656 else 624
657 TermWin.nscrolled = (uint16_t)nscrolled; 625 term_start = (term_start + count) % total_rows;
658 626
627 if (selection.op && current_screen == selection.screen)
628 {
629 selection.beg.row -= count;
630 selection.end.row -= count;
631 selection.mark.row -= count;
632
633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
640 }
641
642 for (int i = count; i--; )
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
659 if ((Options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
660 && TermWin.view_start != 0 655 && view_start != 0
661 && TermWin.view_start != TermWin.saveLines) 656 && view_start != saveLines)
662 scr_page (UP, count); 657 scr_page (UP, count);
663 } 658 }
664 else if (!spec) 659 else
665 row1 += TermWin.saveLines; 660 {
666
667 row2 += TermWin.saveLines;
668
669 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
670 { 662 {
671 i = selection.beg.row + TermWin.saveLines; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
672 j = selection.end.row + TermWin.saveLines; 664 || (selection.beg.row < row2 && selection.end.row > row2)
673 if ((i < row1 && j > row1) 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
674 || (i < row2 && j > row2) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
675 || (i - count < row1 && i >= row1) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
676 || (i - count > row2 && i <= row2) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
677 || (j - count < row1 && j >= row1)
678 || (j - count > row2 && j <= row2))
679 { 669 {
680 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
681 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
682 } 672 }
683 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
684 { 674 {
685 /* move selected region too */ 675 /* move selected region too */
686 selection.beg.row -= count; 676 selection.beg.row -= count;
687 selection.end.row -= count; 677 selection.end.row -= count;
688 selection.mark.row -= count; 678 selection.mark.row -= count;
679
680 selection_check (0);
689 } 681 }
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 { 682 }
710 buf_text[i] = screen.text[j]; 683
711 buf_rend[i] = screen.rend[j]; 684 // use a simple and robust scrolling algorithm, this
685 // part of scr_scroll_text is not time-critical.
686
687 int rows = row2 - row1 + 1;
688
689 min_it (count, rows);
690
691 line_t *temp_buf = row_buf + total_rows;
692
693 for (int row = 0; row < rows; row++)
712 } 694 {
713 /* A2: Rotate lines */ 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
714 for (j = row1, i = j + count; i <= row2; i++, j++) 696
697 if (!IN_RANGE_EXC (row + count, 0, rows))
698 scr_blank_screen_mem (temp_buf [row], rstyle);
715 { 699 }
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 700
726 /* B1: Copy lines that will get clobbered by the rotation */ 701 for (int row = 0; row < rows; row++)
727 for (i = 0, j = row2; i < count; i++, j--) 702 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 } 703 }
754 704
755 return count; 705 return count;
756} 706}
757 707
758/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
759/* 709/*
760 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
761 */ 711 */
762void 712void
763rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
764{ 714{
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 */ 715 if (len <= 0) /* sanity */
772 return; 716 return;
773 717
718 unsigned char checksel;
719 unicode_t c;
720 int ncol = this->ncol;
721 const wchar_t *strend = str + len;
722
774 want_refresh = 1; 723 want_refresh = 1;
775 last_col = TermWin.ncol;
776
777 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
778 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
725
779 if (nlines > 0) 726 if (minlines > 0)
780 { 727 {
781 nlines += (screen.cur.row - screen.bscroll); 728 minlines += screen.cur.row - screen.bscroll;
729
782 if ((nlines > 0) 730 if (minlines > 0
783 && (screen.tscroll == 0) 731 && screen.tscroll == 0
784 && (screen.bscroll == (TermWin.nrow - 1))) 732 && screen.bscroll == nrow - 1)
785 { 733 {
786 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
787 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
788 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
789 } 737 }
790 } 738 }
739
791#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
792 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
793 assert ((screen.cur.row < TermWin.nrow) 742 assert (screen.cur.row < nrow
794 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 743 && screen.cur.row >= -nsaved);
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 744#endif
800 row = screen.cur.row + TermWin.saveLines; 745 int row = screen.cur.row;
801 746
802 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 747 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
803 clearsel = 0;
804 748
805 stp = screen.text[row]; 749 line_t *line = &ROW(row);
806 srp = screen.rend[row];
807 750
808 while (len--) 751 while (str < strend)
809 { 752 {
810 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
811 754
812 if (c < 0x20) 755 if (c < 0x20)
813 switch (c) 756 if (c == C0_LF)
814 { 757 {
815 case '\t': 758 max_it (line->l, screen.cur.col);
816 scr_tab (1);
817 continue;
818 759
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; 760 screen.flags &= ~Screen_WrapNext;
824 761
825 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 764 else if (screen.cur.row < (nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 765 row = ++screen.cur.row;
829 766
830 stp = screen.text[row]; /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
831 srp = screen.rend[row]; /* _must_ refresh */
832 continue; 768 continue;
769 }
770 else if (c == C0_CR)
771 {
772 max_it (line->l, screen.cur.col);
833 773
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; 774 screen.flags &= ~Screen_WrapNext;
839 screen.cur.col = 0; 775 screen.cur.col = 0;
840 continue; 776 continue;
777 }
778 else if (c == C0_HT)
779 {
780 scr_tab (1, true);
781 continue;
841 } 782 }
842 783
843 if (checksel /* see if we're writing within selection */ 784 if (checksel /* see if we're writing within selection */
844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
845 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 786 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
846 { 787 {
847 checksel = 0; 788 checksel = 0;
848 clearsel = 1; 789 /*
790 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check.
793 */
794 CLEAR_SELECTION ();
849 } 795 }
850 796
851 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
852 { 798 {
853 screen.tlen[row] = -1; 799 max_it (line->l, ncol);
854 if (screen.cur.row == screen.bscroll) 800 line->is_longer (1);
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines;
858 801
859 stp = screen.text[row]; /* _must_ refresh */ 802 scr_do_wrap ();
860 srp = screen.rend[row]; /* _must_ refresh */ 803
861 screen.cur.col = 0; 804 row = screen.cur.row;
862 screen.flags &= ~Screen_WrapNext; 805 line = &ROW(row); /* _must_ refresh */
806 }
807
808 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
810 c = 0xfffd;
811
812 // rely on wcwidth to tell us the character width, at least for non-latin1
813 // do wcwidth before further replacements, as wcwidth might return -1
814 // for the line drawing characters below as they might be invalid in the current
815 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c);
817
818 if (charsets [screen.charset] == '0') // DEC SPECIAL
819 {
820 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100
822 // 40-5e rxvt extension for extra curses acs chars
823 static uint16_t vt100_0[62] = { // 41 .. 7e
824 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
825 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
826 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
827 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
828 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
829 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
830 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
831 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
832 };
833
834 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
835 {
836 c = vt100_0[c - 0x41];
837 width = 1; // vt100 line drawing characters are always single-width
838 }
863 } 839 }
864 840
865 if (screen.flags & Screen_Insert) 841 if (screen.flags & Screen_Insert)
866 scr_insdel_chars (1, INSERT); 842 scr_insdel_chars (width, INSERT);
867 843
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) 844 if (width != 0)
891 { 845 {
892#if !UNICODE_3 && ENABLE_COMBINING 846#if !UNICODE_3
893 // trim characters we can't store directly :( 847 // trim characters we can't store directly :(
894 if (c >= 0x10000) 848 if (c >= 0x10000)
849# if ENABLE_COMBINING
895 c = rxvt_composite.compose (c); // map to lower 16 bits 850 c = rxvt_composite.compose (c); // map to lower 16 bits
851# else
852 c = 0xfffd;
896#endif 853# endif
854#endif
855
856 // nuke the character at this position, if required
857 if (line->t[screen.cur.col] == NOCHAR
858 || (screen.cur.col < ncol - 1
859 && line->t[screen.cur.col + 1] == NOCHAR))
860 {
861 int col = screen.cur.col;
862
863 // find begin
864 while (col > 0 && line->t[col] == NOCHAR)
865 col--;
866
867 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
868
869 // found begin, nuke
870 do {
871 line->t[col] = ' ';
872 line->r[col] = rend;
873 col++;
874 } while (col < ncol && line->t[col] == NOCHAR);
875 }
876
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
878
879 // if the character doesn't fit into the remaining columns...
880 if (screen.cur.col > ncol - width && ncol >= width)
881 {
882 // ...output spaces
883 c = ' ';
884 // and try the same character next loop iteration
885 --str;
886 }
887
888 line->touch ();
898 889
899 do 890 do
900 { 891 {
901 stp[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
902 srp[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
903 894
904 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
905 screen.cur.col++; 896 screen.cur.col++;
906 else 897 else
907 { 898 {
908 screen.tlen[row] = last_col; 899 line->l = ncol;
909 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
910 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
911 break; 902 break;
912 } 903 }
913 904
914 c = NOCHAR; 905 c = NOCHAR;
915 } 906 }
916 while (--width > 0); 907 while (--width > 0);
917 908
918 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
919 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 910 if (!width)
920 { 911 {
912 line->touch ();
913
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
915 {
921 stp[c] = ' '; 916 line->t[c] = ' ';
922 srp[c] = rend; 917 line->r[c] = rend;
918 }
923 } 919 }
924 } 920 }
925 else if (width == 0) 921 else // width == 0
926 { 922 {
927#if ENABLE_COMBINING 923#if ENABLE_COMBINING
928 // handle combining characters 924 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
932 928 line_t *linep;
933 text_t *tp; 929 text_t *tp;
934 rend_t *rp; 930 rend_t *rp;
935 931
936 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
937 { 933 {
934 linep = line;
938 tp = stp + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
939 rp = srp + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
940 } 937 }
941 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
942 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 939 && ROW(screen.cur.row - 1).is_longer ())
943 { 940 {
944 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 941 linep = &ROW(screen.cur.row - 1);
945 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
946 } 944 }
947 else 945 else
948 continue; 946 continue;
949 947
950 // handle double-width-chars by making them look extremely ugly 948 linep->touch ();
951 if (*tp == NOCHAR) 949
952 *tp = ' '; // hack //D //TODO //--tp, --rp; 950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
953 952
954 // first try to find a precomposed character 953 // first try to find a precomposed character
955 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
956 if (n == NOCHAR) 955 if (n == NOCHAR)
957 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
958 957
959 *tp = n; 958 *tp = n;
960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
961#endif 960#endif
962 } 961 }
963 } 962 }
964 963
965 if (screen.tlen[row] != -1) /* XXX: think about this */ 964 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 965
976#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
977 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
978#else /* drive with your eyes closed */
979 MAX_IT (screen.cur.row, 0);
980#endif 968#endif
981} 969}
982 970
983/* ------------------------------------------------------------------------- */ 971/* ------------------------------------------------------------------------- */
984/* 972/*
… …
987 */ 975 */
988void 976void
989rxvt_term::scr_backspace () 977rxvt_term::scr_backspace ()
990{ 978{
991 want_refresh = 1; 979 want_refresh = 1;
980
992 if (screen.cur.col == 0) 981 if (screen.cur.col == 0)
993 { 982 {
994 if (screen.cur.row > 0) 983 if (screen.cur.row > 0)
995 { 984 {
996#ifdef TERMCAP_HAS_BW 985#ifdef TERMCAP_HAS_BW
997 screen.cur.col = TermWin.ncol - 1; 986 screen.cur.col = ncol - 1;
998 screen.cur.row--; 987 screen.cur.row--;
999 return; 988 return;
1000#endif 989#endif
1001
1002 } 990 }
1003 } 991 }
1004 else if ((screen.flags & Screen_WrapNext) == 0) 992 else if (!(screen.flags & Screen_WrapNext))
1005 scr_gotorc (0, -1, RELATIVE); 993 scr_gotorc (0, -1, RELATIVE);
994
1006 screen.flags &= ~Screen_WrapNext; 995 screen.flags &= ~Screen_WrapNext;
1007} 996}
1008 997
1009/* ------------------------------------------------------------------------- */ 998/* ------------------------------------------------------------------------- */
1010/* 999/*
1011 * Process Horizontal Tab 1000 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1001 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1002 * XTERM_SEQ: CTRL-I
1014 */ 1003 */
1015void 1004void
1016rxvt_term::scr_tab (int count) 1005rxvt_term::scr_tab (int count, bool ht)
1017{ 1006{
1018 int i, x; 1007 int i, x;
1019 1008
1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1021 want_refresh = 1; 1009 want_refresh = 1;
1022 i = x = screen.cur.col; 1010 i = x = screen.cur.col;
1023 1011
1024 if (count == 0) 1012 if (count == 0)
1025 return; 1013 return;
1026 else if (count > 0) 1014 else if (count > 0)
1027 { 1015 {
1016 line_t &l = ROW(screen.cur.row);
1017 rend_t base_rend = l.r[i];
1018 ht &= l.t[i] == ' ';
1019
1028 for (; ++i < TermWin.ncol; ) 1020 for (; ++i < ncol; )
1029 if (tabs[i]) 1021 if (tabs[i])
1030 { 1022 {
1031 x = i; 1023 x = i;
1024
1032 if (!--count) 1025 if (!--count)
1033 break; 1026 break;
1034 } 1027 }
1028 else
1029 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend);
1035 1031
1036 if (count) 1032 if (count)
1037 x = TermWin.ncol - 1; 1033 x = ncol - 1;
1034
1035 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs))
1038 {
1039 base_rend = SET_FONT (base_rend, 0);
1040
1041 l.touch (x);
1042
1043 i = screen.cur.col;
1044
1045 l.t[i] = '\t';
1046 l.r[i] = base_rend;
1047
1048 while (++i < x)
1049 {
1050 l.t[i] = NOCHAR;
1051 l.r[i] = base_rend;
1052 }
1053 }
1038 } 1054 }
1039 else /* if (count < 0) */ 1055 else /* if (count < 0) */
1040 { 1056 {
1041 for (; --i >= 0; ) 1057 for (; --i >= 0; )
1042 if (tabs[i]) 1058 if (tabs[i])
… …
1059 * Process DEC Back Index 1075 * Process DEC Back Index
1060 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1061 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
1062 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1063 */ 1079 */
1064#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1065void 1081void
1066rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1067{ 1083{
1068 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1069 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1070 else 1086 else
1071 {
1072 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1073 return; /* um, yeah? */
1074 scr_insdel_chars (1, INSERT); 1087 scr_insdel_chars (1, INSERT);
1075 }
1076} 1088}
1077#endif 1089#endif
1078/* ------------------------------------------------------------------------- */ 1090/* ------------------------------------------------------------------------- */
1079/* 1091/*
1080 * Process DEC Forward Index 1092 * Process DEC Forward Index
1081 * XTERM_SEQ: ESC 9 1093 * XTERM_SEQ: ESC 9
1082 * Move cursor right in row. If we're at the right boundary, shift everything 1094 * Move cursor right in row. If we're at the right boundary, shift everything
1083 * in that row left. Clear right column. 1095 * in that row left. Clear right column.
1084 */ 1096 */
1085#ifndef NO_FRILLS 1097#if ENABLE_FRILLS
1086void 1098void
1087rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1088{ 1100{
1089 int row;
1090
1091 if (screen.cur.col < TermWin.ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1092 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1093 else 1103 else
1094 { 1104 {
1095 row = screen.cur.row + TermWin.saveLines; 1105 line_t &l = ROW(screen.cur.row);
1096 if (screen.tlen[row] == 0) 1106
1097 return; /* um, yeah? */ 1107 l.touch ();
1098 else if (screen.tlen[row] == -1) 1108 l.is_longer (0);
1099 screen.tlen[row] = TermWin.ncol; 1109
1100 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1101 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1102 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1103 } 1113 }
1104} 1114}
1105#endif 1115#endif
1106 1116
1107/* ------------------------------------------------------------------------- */ 1117/* ------------------------------------------------------------------------- */
… …
1112rxvt_term::scr_gotorc (int row, int col, int relative) 1122rxvt_term::scr_gotorc (int row, int col, int relative)
1113{ 1123{
1114 want_refresh = 1; 1124 want_refresh = 1;
1115 ZERO_SCROLLBACK (); 1125 ZERO_SCROLLBACK ();
1116 1126
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) 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1120 : col); 1128 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 1129
1124 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1131
1125 if (relative & R_RELATIVE) 1132 if (relative & R_RELATIVE)
1126 { 1133 {
1127 if (row > 0) 1134 if (row > 0)
1128 { 1135 {
1129 if (screen.cur.row <= screen.bscroll 1136 if (screen.cur.row <= screen.bscroll
… …
1144 else 1151 else
1145 { 1152 {
1146 if (screen.flags & Screen_Relative) 1153 if (screen.flags & Screen_Relative)
1147 { /* relative origin mode */ 1154 { /* relative origin mode */
1148 screen.cur.row = row + screen.tscroll; 1155 screen.cur.row = row + screen.tscroll;
1149 MIN_IT (screen.cur.row, screen.bscroll); 1156 min_it (screen.cur.row, screen.bscroll);
1150 } 1157 }
1151 else 1158 else
1152 screen.cur.row = row; 1159 screen.cur.row = row;
1153 } 1160 }
1154 MAX_IT (screen.cur.row, 0);
1155 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1156 1161
1157 while (screen.cur.col > 0 1162 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} 1163}
1161 1164
1162/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
1163/* 1166/*
1164 * direction should be UP or DN 1167 * direction should be UP or DN
1165 */ 1168 */
1166void 1169void
1167rxvt_term::scr_index (enum page_dirn direction) 1170rxvt_term::scr_index (enum page_dirn direction)
1168{ 1171{
1169 int dirn; 1172 int dirn;
1170 1173
1171 want_refresh = 1; 1174 want_refresh = 1;
1175 ZERO_SCROLLBACK ();
1176
1172 dirn = ((direction == UP) ? 1 : -1); 1177 dirn = ((direction == UP) ? 1 : -1);
1173 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1174
1175 ZERO_SCROLLBACK ();
1176 1178
1177 screen.flags &= ~Screen_WrapNext; 1179 screen.flags &= ~Screen_WrapNext;
1180
1178 if ((screen.cur.row == screen.bscroll && direction == UP) 1181 if ((screen.cur.row == screen.bscroll && direction == UP)
1179 || (screen.cur.row == screen.tscroll && direction == DN)) 1182 || (screen.cur.row == screen.tscroll && direction == DN))
1180 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1183 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1181 else 1184 else
1182 screen.cur.row += dirn; 1185 screen.cur.row += dirn;
1183 MAX_IT (screen.cur.row, 0); 1186
1184 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1187 clamp_it (screen.cur.row, 0, nrow - 1);
1185 selection_check (0); 1188 selection_check (0);
1186} 1189}
1187 1190
1188/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1189/* 1192/*
… …
1193 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1194 */ 1197 */
1195void 1198void
1196rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1197{ 1200{
1198 unsigned int row, col, num; 1201 unsigned int col, num;
1199 1202
1200 want_refresh = 1; 1203 want_refresh = 1;
1201 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1202 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1203 1205
1204 selection_check (1); 1206 selection_check (1);
1205 1207
1206 screen.flags &= ~Screen_WrapNext; 1208 line_t &line = ROW(screen.cur.row);
1207 1209
1208 row = TermWin.saveLines + screen.cur.row; 1210 line.touch ();
1211 line.is_longer (0);
1212
1209 switch (mode) 1213 switch (mode)
1210 { 1214 {
1211 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1212 col = screen.cur.col; 1216 col = screen.cur.col;
1213 num = TermWin.ncol - col; 1217 num = ncol - col;
1214 MIN_IT (screen.tlen[row], (int16_t)col); 1218 min_it (line.l, col);
1215 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1216 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1217 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1218 break; 1222 break;
1219 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1223 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1224 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1225 break; 1229 break;
1226 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1227 col = 0; 1231 col = 0;
1228 num = TermWin.ncol; 1232 num = ncol;
1229 screen.tlen[row] = 0; 1233 line.l = 0;
1230 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1231 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1232 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1233 break; 1237 break;
1234 default: 1238 default:
1235 return; 1239 return;
1236 } 1240 }
1237 1241
1238 if (screen.text[row]) 1242 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} 1243}
1244 1244
1245/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1246/* 1246/*
1247 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1251 */ 1251 */
1252void 1252void
1253rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1254{ 1254{
1255 int num; 1255 int num;
1256 int32_t row, row_offset; 1256 int32_t row;
1257 rend_t ren; 1257 rend_t ren;
1258 XGCValues gcvalue; 1258 XGCValues gcvalue;
1259 1259
1260 want_refresh = 1; 1260 want_refresh = 1;
1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1262 ZERO_SCROLLBACK (); 1261 ZERO_SCROLLBACK ();
1263 row_offset = (int32_t)TermWin.saveLines;
1264 1262
1265 switch (mode) 1263 switch (mode)
1266 { 1264 {
1267 case 0: /* erase to end of screen */ 1265 case 0: /* erase to end of screen */
1268 selection_check (1); 1266 selection_check (1);
1269 scr_erase_line (0); 1267 scr_erase_line (0);
1270 row = screen.cur.row + 1; /* possible OOB */ 1268 row = screen.cur.row + 1; /* possible OOB */
1271 num = TermWin.nrow - row; 1269 num = nrow - row;
1272 break; 1270 break;
1273 case 1: /* erase to beginning of screen */ 1271 case 1: /* erase to beginning of screen */
1274 selection_check (3); 1272 selection_check (3);
1275 scr_erase_line (1); 1273 scr_erase_line (1);
1276 row = 0; 1274 row = 0;
1277 num = screen.cur.row; 1275 num = screen.cur.row;
1278 break; 1276 break;
1279 case 2: /* erase whole screen */ 1277 case 2: /* erase whole screen */
1280 selection_check (3); 1278 selection_check (3);
1281 row = 0; 1279 row = 0;
1282 num = TermWin.nrow; 1280 num = nrow;
1283 break; 1281 break;
1284 default: 1282 default:
1285 return; 1283 return;
1286 } 1284 }
1287
1288 refresh_type |= REFRESH_BOUNDS;
1289 1285
1290 if (selection.op && current_screen == selection.screen 1286 if (selection.op && current_screen == selection.screen
1291 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1287 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1292 || (selection.end.row >= row 1288 || (selection.end.row >= row
1293 && selection.end.row <= row + num))) 1289 && selection.end.row <= row + num)))
1294 CLEAR_SELECTION (); 1290 CLEAR_SELECTION ();
1295 1291
1296 if (row >= TermWin.nrow) /* Out Of Bounds */ 1292 if (row >= nrow) /* Out Of Bounds */
1297 return; 1293 return;
1298 1294
1299 MIN_IT (num, (TermWin.nrow - row)); 1295 min_it (num, nrow - row);
1300 1296
1301 if (rstyle & (RS_RVid | RS_Uline)) 1297 if (rstyle & (RS_RVid | RS_Uline))
1302 ren = (rend_t) ~RS_None; 1298 ren = (rend_t) ~RS_None;
1303 else if (GET_BASEBG (rstyle) == Color_bg) 1299 else if (GET_BASEBG (rstyle) == Color_bg)
1304 { 1300 {
1305 ren = DEFAULT_RSTYLE; 1301 ren = DEFAULT_RSTYLE;
1306 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1307 } 1303 }
1308 else 1304 else
1309 { 1305 {
1310 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1311 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1313 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1314 gcvalue.foreground = PixColors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1316 } 1312 }
1317 1313
1318 for (; num--; row++) 1314 for (; num--; row++)
1319 { 1315 {
1320 scr_blank_screen_mem (screen.text, screen.rend, 1316 scr_blank_screen_mem (ROW(row), rstyle);
1321 (unsigned int) (row + row_offset), rstyle); 1317 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 } 1318 }
1326} 1319}
1320
1321#if ENABLE_FRILLS
1322void
1323rxvt_term::scr_erase_savelines ()
1324{
1325 want_refresh = 1;
1326 ZERO_SCROLLBACK ();
1327
1328 nsaved = 0;
1329}
1330#endif
1327 1331
1328/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1329/* 1333/*
1330 * Fill the screen with `E's 1334 * Fill the screen with `E's
1331 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1332 */ 1336 */
1333void 1337void
1334rxvt_term::scr_E () 1338rxvt_term::scr_E ()
1335{ 1339{
1336 int i, j, k; 1340 rend_t fs;
1337 rend_t *r1, fs;
1338 1341
1339 want_refresh = 1; 1342 want_refresh = 1;
1343 ZERO_SCROLLBACK ();
1344
1340 num_scr_allow = 0; 1345 num_scr_allow = 0;
1341 ZERO_SCROLLBACK ();
1342 selection_check (3); 1346 selection_check (3);
1343 1347
1344 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1348 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1345 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1349 for (int row = nrow; row--; )
1346 { 1350 {
1347 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1351 line_t &line = ROW(row);
1352
1348 fill_text (screen.text[k], 'E', TermWin.ncol); 1353 fill_text (line.t, 'E', ncol);
1349 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1354 rend_t *r1 = line.r;
1355
1356 for (int j = ncol; j--; )
1350 *r1++ = fs; 1357 *r1++ = fs;
1358
1359 line.is_longer (0);
1360 line.touch (ncol);
1351 } 1361 }
1352} 1362}
1353 1363
1354/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1355/* 1365/*
… …
1373 if (insdel == DELETE) 1383 if (insdel == DELETE)
1374 return; 1384 return;
1375 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1376 count = end; 1386 count = end;
1377 } 1387 }
1378 screen.flags &= ~Screen_WrapNext;
1379 1388
1389 scr_do_wrap ();
1390
1380 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1381} 1392}
1382 1393
1383/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1384/* 1395/*
1385 * Insert/Delete <count> characters from the current position 1396 * Insert/Delete <count> characters from the current position
… …
1387void 1398void
1388rxvt_term::scr_insdel_chars (int count, int insdel) 1399rxvt_term::scr_insdel_chars (int count, int insdel)
1389{ 1400{
1390 int col, row; 1401 int col, row;
1391 rend_t tr; 1402 rend_t tr;
1392 text_t *stp;
1393 rend_t *srp;
1394 int16_t *slp;
1395 1403
1396 want_refresh = 1; 1404 want_refresh = 1;
1397 ZERO_SCROLLBACK (); 1405 ZERO_SCROLLBACK ();
1398 1406
1399 if (count <= 0) 1407 if (count <= 0)
1400 return; 1408 return;
1401 1409
1410 scr_do_wrap ();
1411
1402 selection_check (1); 1412 selection_check (1);
1403 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1413 min_it (count, ncol - screen.cur.col);
1404 1414
1405 row = screen.cur.row + TermWin.saveLines;
1406 screen.flags &= ~Screen_WrapNext;
1407
1408 stp = screen.text[row];
1409 srp = screen.rend[row]; 1415 row = screen.cur.row;
1410 slp = & (screen.tlen[row]); 1416
1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1411 1421
1412 switch (insdel) 1422 switch (insdel)
1413 { 1423 {
1414 case INSERT: 1424 case INSERT:
1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1416 col--)
1417 { 1426 {
1418 stp[col] = stp[col - count]; 1427 line->t[col] = line->t[col - count];
1419 srp[col] = srp[col - count]; 1428 line->r[col] = line->r[col - count];
1420 } 1429 }
1421 1430
1422 if (*slp != -1) 1431 line->l = min (line->l + count, ncol);
1423 {
1424 *slp += count;
1425 MIN_IT (*slp, TermWin.ncol);
1426 }
1427 1432
1428 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1430 { 1435 {
1431 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
1432 || (selection.end.col + count >= TermWin.ncol)) 1437 || (selection.end.col + count >= ncol))
1433 CLEAR_SELECTION (); 1438 CLEAR_SELECTION ();
1434 else 1439 else
1435 { /* shift selection */ 1440 { /* shift selection */
1436 selection.beg.col += count; 1441 selection.beg.col += count;
1437 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1438 selection.end.col += count; 1443 selection.end.col += count;
1439 } 1444 }
1440 } 1445 }
1441 1446
1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (*line, screen.cur.col, count, rstyle);
1443 (unsigned int)count, rstyle);
1444 break; 1448 break;
1445 1449
1446 case ERASE: 1450 case ERASE:
1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1448 selection_check (1); 1452 selection_check (1);
1449 screen.cur.col -= count; 1453 screen.cur.col -= count;
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1454
1451 (unsigned int)count, rstyle); 1455 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1452 break; 1457 break;
1453 1458
1454 case DELETE: 1459 case DELETE:
1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1456 1461
1457 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1462 for (col = screen.cur.col; (col + count) < ncol; col++)
1458 { 1463 {
1459 stp[col] = stp[col + count]; 1464 line->t[col] = line->t[col + count];
1460 srp[col] = srp[col + count]; 1465 line->r[col] = line->r[col + count];
1461 } 1466 }
1462 1467
1463 scr_blank_line (& (stp[TermWin.ncol - count]), 1468 line->l = max (line->l - count, 0);
1464 & (srp[TermWin.ncol - count]), 1469 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 1470
1473 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1474 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1475 { 1473 {
1476 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1477 || (screen.cur.col >= selection.beg.col - count) 1475 || (screen.cur.col >= selection.beg.col - count)
1478 || selection.end.col >= TermWin.ncol) 1476 || selection.end.col >= ncol)
1479 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1480 else 1478 else
1481 { 1479 {
1482 /* shift selection */ 1480 /* shift selection */
1483 selection.beg.col -= count; 1481 selection.beg.col -= count;
1484 selection.mark.col -= count; /* XXX: yes? */ 1482 selection.mark.col -= count; /* XXX: yes? */
1485 selection.end.col -= count; 1483 selection.end.col -= count;
1486 } 1484 }
1487 } 1485 }
1488 1486
1489 break; 1487 break;
1490 } 1488 }
… …
1496 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1497 */ 1495 */
1498void 1496void
1499rxvt_term::scr_scroll_region (int top, int bot) 1497rxvt_term::scr_scroll_region (int top, int bot)
1500{ 1498{
1501 MAX_IT (top, 0); 1499 max_it (top, 0);
1502 MIN_IT (bot, (int)TermWin.nrow - 1); 1500 min_it (bot, nrow - 1);
1503 1501
1504 if (top > bot) 1502 if (top > bot)
1505 return; 1503 return;
1506 1504
1507 screen.tscroll = top; 1505 screen.tscroll = top;
… …
1517 */ 1515 */
1518void 1516void
1519rxvt_term::scr_cursor_visible (int mode) 1517rxvt_term::scr_cursor_visible (int mode)
1520{ 1518{
1521 want_refresh = 1; 1519 want_refresh = 1;
1520
1522 if (mode) 1521 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1522 screen.flags |= Screen_VisibleCursor;
1524 else 1523 else
1525 screen.flags &= ~Screen_VisibleCursor; 1524 screen.flags &= ~Screen_VisibleCursor;
1526} 1525}
… …
1535rxvt_term::scr_autowrap (int mode) 1534rxvt_term::scr_autowrap (int mode)
1536{ 1535{
1537 if (mode) 1536 if (mode)
1538 screen.flags |= Screen_Autowrap; 1537 screen.flags |= Screen_Autowrap;
1539 else 1538 else
1540 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1541} 1540}
1542 1541
1543/* ------------------------------------------------------------------------- */ 1542/* ------------------------------------------------------------------------- */
1544/* 1543/*
1545 * Set/unset margin origin mode 1544 * Set/unset margin origin mode
… …
1555{ 1554{
1556 if (mode) 1555 if (mode)
1557 screen.flags |= Screen_Relative; 1556 screen.flags |= Screen_Relative;
1558 else 1557 else
1559 screen.flags &= ~Screen_Relative; 1558 screen.flags &= ~Screen_Relative;
1559
1560 scr_gotorc (0, 0, 0); 1560 scr_gotorc (0, 0, 0);
1561} 1561}
1562 1562
1563/* ------------------------------------------------------------------------- */ 1563/* ------------------------------------------------------------------------- */
1564/* 1564/*
… …
1584 */ 1584 */
1585void 1585void
1586rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1587{ 1587{
1588 if (mode < 0) 1588 if (mode < 0)
1589 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1590 else if (screen.cur.col < TermWin.ncol) 1590 else if (screen.cur.col < ncol)
1591 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1592} 1592}
1593 1593
1594/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1595/* 1595/*
1596 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1599 */
1600void 1600void
1601rxvt_term::scr_rvideo_mode (int mode) 1601rxvt_term::scr_rvideo_mode (int mode)
1602{ 1602{
1603 XGCValues gcvalue; 1603 XGCValues gcvalue;
1604 1604
1605 if (rvideo != mode) 1605 if (rvideo != mode)
1606 { 1606 {
1607 rvideo = mode; 1607 rvideo = mode;
1608 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if defined(XPM_BACKGROUND) 1609#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1611#endif 1611#endif
1612#if defined(TRANSPARENT) 1612#if TRANSPARENT
1613 if (! (Options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif 1614#endif
1615 XSetWindowBackground (display->display, TermWin.vt, 1615 XSetWindowBackground (display->display, vt,
1616 PixColors[Color_bg]); 1616 pix_colors[Color_bg]);
1617 1617
1618 gcvalue.foreground = PixColors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = PixColors[Color_bg]; 1619 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1620 XChangeGC (display->display, gc, GCBackground | GCForeground,
1621 &gcvalue); 1621 &gcvalue);
1622 scr_clear (); 1622 scr_clear ();
1623 scr_touch (true); 1623 scr_touch (true);
1624 } 1624 }
1625} 1625}
… …
1643 * Set font style 1643 * Set font style
1644 */ 1644 */
1645void 1645void
1646rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1647{ 1647{
1648#if 0
1648 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1649 { 1650 {
1650 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1651 break; 1652 break;
1652 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1653 break; 1654 break;
… …
1660 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1661 break; 1662 break;
1662 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1663 break; 1664 break;
1664 } 1665 }
1666#endif
1665} 1667}
1666 1668
1667/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1668/* 1670/*
1669 * Choose a font 1671 * Choose a font
… …
1672 * XTERM_SEQ: Invoke G2 character set: ESC N 1674 * XTERM_SEQ: Invoke G2 character set: ESC N
1673 * XTERM_SEQ: Invoke G3 character set: ESC O 1675 * XTERM_SEQ: Invoke G3 character set: ESC O
1674 */ 1676 */
1675void 1677void
1676rxvt_term::scr_charset_choose (int set) 1678rxvt_term::scr_charset_choose (int set)
1677 { 1679{
1678 screen.charset = set; 1680 screen.charset = set;
1679 set_font_style (); 1681 set_font_style ();
1680 } 1682}
1681 1683
1682/* ------------------------------------------------------------------------- */ 1684/* ------------------------------------------------------------------------- */
1683/* 1685/*
1684 * Set a font 1686 * Set a font
1685 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1687 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1688 * XTERM_SEQ: Set G3 character set: ESC + <C> 1690 * XTERM_SEQ: Set G3 character set: ESC + <C>
1689 * See set_font_style for possible values for <C> 1691 * See set_font_style for possible values for <C>
1690 */ 1692 */
1691void 1693void
1692rxvt_term::scr_charset_set (int set, unsigned int ch) 1694rxvt_term::scr_charset_set (int set, unsigned int ch)
1693 { 1695{
1694 charsets[set] = (unsigned char)ch; 1696 charsets[set] = (unsigned char)ch;
1695 set_font_style (); 1697 set_font_style ();
1696 } 1698}
1697 1699
1698 1700
1699/* ------------------------------------------------------------------------- * 1701/* ------------------------------------------------------------------------- *
1700 * MAJOR SCREEN MANIPULATION * 1702 * MAJOR SCREEN MANIPULATION *
1701 * ------------------------------------------------------------------------- */ 1703 * ------------------------------------------------------------------------- */
… …
1706bool 1708bool
1707rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1708{ 1710{
1709 bool found = false; 1711 bool found = false;
1710 1712
1711 for (int i = 0; i < TermWin.nrow; i++) 1713 for (int i = 0; i < nrow; i++)
1712 { 1714 {
1713 int col = 0; 1715 int col = 0;
1714 rend_t *drp = drawn_rend [i]; 1716 rend_t *drp = drawn_buf[i].r;
1715 1717
1716 for (; col < TermWin.ncol; col++, drp++) 1718 for (; col < ncol; col++, drp++)
1717 if ((*drp & mask) == value) 1719 if ((*drp & mask) == value)
1718 { 1720 {
1719 found = true; 1721 found = true;
1720 *drp = ~value; 1722 *drp = ~value;
1721 } 1723 }
… …
1732 PART_END, 1734 PART_END,
1733 RC_COUNT 1735 RC_COUNT
1734}; 1736};
1735 1737
1736void 1738void
1737rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1738{ 1740{
1739 int i; 1741 int i;
1740 row_col_t rc[RC_COUNT]; 1742 row_col_t rc[RC_COUNT];
1741 1743
1742 if (drawn_text == NULL) /* sanity check */ 1744 if (!drawn_buf) /* sanity check */
1743 return; 1745 return;
1744 1746
1745#ifdef DEBUG_STRICT 1747#ifndef NO_SLOW_LINK_SUPPORT
1746 x = max (x, (int)TermWin.int_bwidth); 1748 if (refresh_type == FAST_REFRESH && !display->is_local)
1747 x = min (x, (int)TermWin.width); 1749 {
1748 y = max (y, (int)TermWin.int_bwidth); 1750 y = 0;
1749 y = min (y, (int)TermWin.height); 1751 eheight = height;
1752 }
1750#endif 1753#endif
1751 1754
1752 /* round down */ 1755 /* round down */
1753 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1754 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
1755 /* round up */ 1758 /* round up */
1756 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1759 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1757 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1760 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1758 1761
1759 /* sanity checks */ 1762 /* sanity checks */
1760 for (i = PART_BEG; i < RC_COUNT; i++) 1763 for (i = PART_BEG; i < RC_COUNT; i++)
1761 { 1764 {
1762 MIN_IT (rc[i].col, TermWin.ncol - 1); 1765 min_it (rc[i].col, ncol - 1);
1763 MIN_IT (rc[i].row, TermWin.nrow - 1); 1766 min_it (rc[i].row, nrow - 1);
1764 } 1767 }
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 1768
1768 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1769 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1770 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));
1771 1771
1772 if (refresh) 1772 if (refresh)
1773 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1773 scr_refresh (SLOW_REFRESH);
1774} 1774}
1775 1775
1776/* ------------------------------------------------------------------------- */ 1776/* ------------------------------------------------------------------------- */
1777/* 1777/*
1778 * Refresh the entire screen 1778 * Refresh the entire screen
1779 */ 1779 */
1780void 1780void
1781rxvt_term::scr_touch (bool refresh) 1781rxvt_term::scr_touch (bool refresh)
1782{ 1782{
1783 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1783 scr_expose (0, 0, width, height, refresh);
1784} 1784}
1785 1785
1786/* ------------------------------------------------------------------------- */ 1786/* ------------------------------------------------------------------------- */
1787/* 1787/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1788 * Move the display so that the line represented by scrollbar value Y is at
… …
1790 */ 1790 */
1791int 1791int
1792rxvt_term::scr_move_to (int y, int len) 1792rxvt_term::scr_move_to (int y, int len)
1793{ 1793{
1794 long p = 0; 1794 long p = 0;
1795 uint16_t oldviewstart; 1795 unsigned int oldviewstart;
1796 1796
1797 oldviewstart = TermWin.view_start; 1797 oldviewstart = view_start;
1798
1798 if (y < len) 1799 if (y < len)
1799 { 1800 {
1800 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1801 p = (nrow + nsaved) * (len - y) / len;
1801 p -= (long) (TermWin.nrow - 1); 1802 p -= (long) (nrow - 1);
1802 p = max (p, 0); 1803 p = max (p, 0);
1803 } 1804 }
1804 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1805
1805 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); 1806 view_start = (unsigned int)min (p, nsaved);
1806 1807
1807 return scr_changeview (oldviewstart); 1808 return scr_changeview (oldviewstart);
1808} 1809}
1809 1810
1810/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
… …
1813 * direction should be UP or DN 1814 * direction should be UP or DN
1814 */ 1815 */
1815int 1816int
1816rxvt_term::scr_page (enum page_dirn direction, int nlines) 1817rxvt_term::scr_page (enum page_dirn direction, int nlines)
1817{ 1818{
1818 int n; 1819 int n;
1819 uint16_t oldviewstart; 1820 unsigned int oldviewstart;
1820 1821
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; 1822 oldviewstart = view_start;
1823
1826 if (direction == UP) 1824 if (direction == UP)
1827 { 1825 {
1828 n = TermWin.view_start + nlines; 1826 n = view_start + nlines;
1829 TermWin.view_start = min (n, TermWin.nscrolled); 1827 view_start = min (n, nsaved);
1830 } 1828 }
1831 else 1829 else
1832 { 1830 {
1833 n = TermWin.view_start - nlines; 1831 n = view_start - nlines;
1834 TermWin.view_start = max (n, 0); 1832 view_start = max (n, 0);
1835 } 1833 }
1834
1836 return scr_changeview (oldviewstart); 1835 return scr_changeview (oldviewstart);
1837} 1836}
1838 1837
1839int 1838int
1840rxvt_term::scr_changeview (uint16_t oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1841{ 1840{
1842 if (TermWin.view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1843 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1844 want_refresh = 1; 1845 want_refresh = 1;
1845 num_scr -= (TermWin.view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1846 } 1847 }
1848
1847 return (int) (TermWin.view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1848} 1850}
1849 1851
1850/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1851void 1853void
1852rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1853{ 1855{
1854#ifndef NO_BELL 1856#ifndef NO_BELL
1857
1855# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1856# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1857 if (Options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1858# endif 1861# endif
1859 XMapWindow (display->display, TermWin.parent[0]); 1862 XMapWindow (display->display, parent[0]);
1860# endif 1863# endif
1861 if (Options & Opt_visualBell) 1864
1865 if (OPTION (Opt_visualBell))
1862 { 1866 {
1863 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1869 rxvt_usleep (VISUAL_BELL_DURATION);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1871 }
1866 else 1872 else
1867 XBell (display->display, 0); 1873 XBell (display->display, 0);
1874
1868#endif 1875#endif
1869} 1876}
1870 1877
1871/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1872/* ARGSUSED */ 1879/* ARGSUSED */
1873void 1880void
1874rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1875{ 1882{
1876#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1877 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1878 text_t *t; 1885 FILE *fd;
1879 FILE *fd;
1880 1886
1881 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1882 return; 1888 return;
1883 nrows = TermWin.nrow; 1889
1884 row_offset = TermWin.saveLines;
1885 if (!fullhist) 1890 if (fullhist)
1886 row_offset -= TermWin.view_start; 1891 {
1892 nrows = nrow + nsaved;
1893 row_start = -nsaved;
1894 }
1887 else 1895 else
1888 { 1896 {
1889 nrows += TermWin.nscrolled; 1897 nrows = nrow;
1890 row_offset -= TermWin.nscrolled; 1898 row_start = -view_start;
1891 } 1899 }
1892 1900
1901 wctomb (0, 0);
1902
1893 for (r1 = 0; r1 < nrows; r1++) 1903 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 } 1904 {
1905 text_t *tp = ROW(r1).t;
1906 int len = ROW(r1).l;
1907
1908 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1909 {
1910 char mb[MB_LEN_MAX];
1911 text_t t = *tp++;
1912 if (t == NOCHAR)
1913 continue;
1914
1915 len = wctomb (mb, t);
1916
1917 if (len <= 0)
1918 {
1919 mb[0] = ' ';
1920 len = 1;
1921 }
1922
1923 fwrite (mb, 1, len, fd);
1924 }
1925
1926 fputc ('\n', fd);
1927 }
1928
1901 pclose_printer (fd); 1929 pclose_printer (fd);
1902#endif 1930#endif
1903} 1931}
1904 1932
1905/* ------------------------------------------------------------------------- */ 1933/* ------------------------------------------------------------------------- */
1906/* 1934/*
1907 * Refresh the screen 1935 * Refresh the screen
1908 * drawn_text/drawn_rend contain the screen information before the update. 1936 * drawn_text/drawn_rend contain the screen information before the update.
1909 * screen.text/screen.rend contain what the screen will change to. 1937 * screen.text/screen.rend contain what the screen will change to.
1910 */ 1938 */
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 1939void
1922rxvt_term::scr_refresh (unsigned char refresh_type) 1940rxvt_term::scr_refresh (unsigned char refresh_type)
1923{ 1941{
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 */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
1927 rvid, /* reverse video this position */
1928 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1929 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1930 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1931 int i, /* tmp */ 1946 int i; /* tmp */
1932 row_offset; /* basic offset in screen structure */
1933#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
1934 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
1935#endif 1949#endif
1936 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1950 rend_t *crp; // cursor rendition pointer
1937 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1938 1951
1952 want_refresh = 0; /* screen is current */
1953
1939 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1954 if (refresh_type == NO_REFRESH || !mapped)
1940 return; 1955 return;
1941 1956
1942 /* 1957 /*
1943 * A: set up vars 1958 * A: set up vars
1944 */ 1959 */
1945 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1946
1947 refresh_count = 0; 1961 refresh_count = 0;
1948 1962
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 1963#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 1964 must_clear |= bgPixmap.pixmap != None;
1959#endif 1965#endif
1960#ifdef TRANSPARENT 1966#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1962#endif 1968#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 1970
1965 /* 1971 /*
1966 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 1987 showcursor = 0;
1982#endif 1988#endif
1983 1989
1984 if (showcursor) 1990 if (showcursor)
1985 { 1991 {
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 1992 int col = screen.cur.col;
1987 1993
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--;
1996
1997 crp = &ROW(screen.cur.row).r[col];
1998
1988 if (showcursor && TermWin.focus) 1999 if (showcursor && focus)
1989 { 2000 {
2001 if (OPTION (Opt_cursorUnderline))
2002 *crp ^= RS_Uline;
2003 else
2004 {
1990 *srp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2006
1991#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1995 else 2011 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1998#else 2014#else
1999 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
2000#endif 2016#endif
2001 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
2002 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2003 else 2019 else
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2006#else 2022#else
2007 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2008#endif 2024#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2027#endif
2028 }
2012 } 2029 }
2013 } 2030 }
2014 2031
2015 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2016 setoldcursor = 0; 2033 setoldcursor = 0;
2017 if (ocrow != -1) 2034 if (ocrow != -1)
2018 { 2035 {
2019 if (screen.cur.row + TermWin.view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2020 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2021 { 2038 {
2022 if (ocrow < TermWin.nrow 2039 if (ocrow < nrow
2023 && oldcursor.col < TermWin.ncol) 2040 && oldcursor.col < ncol)
2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2025 2042
2026 if (TermWin.focus || !showcursor) 2043 if (focus || !showcursor)
2027 oldcursor.row = -1; 2044 oldcursor.row = -1;
2028 else 2045 else
2029 setoldcursor = 1; 2046 setoldcursor = 1;
2030 } 2047 }
2031 } 2048 }
2032 else if (!TermWin.focus) 2049 else if (!focus)
2033 setoldcursor = 1; 2050 setoldcursor = 1;
2034 2051
2035 if (setoldcursor) 2052 if (setoldcursor)
2036 { 2053 {
2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2054 if (screen.cur.row + view_start >= nrow)
2038 oldcursor.row = -1; 2055 oldcursor.row = -1;
2039 else 2056 else
2040 { 2057 {
2041 oldcursor.row = screen.cur.row + TermWin.view_start; 2058 oldcursor.row = screen.cur.row + view_start;
2042 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2043 } 2060 }
2044 } 2061 }
2045 } 2062 }
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2046 2068
2047#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2070 /*
2049 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2051 */ 2073 */
2052 i = num_scr; 2074 i = num_scr;
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;
2061 2082
2062 j = TermWin.nrow; 2083 j = nrow;
2063 wlen = len = -1; 2084 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2087 {
2067 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2089 {
2069 stp = screen.text[row + row_offset]; 2090 line_t s = ROW(row - view_start);
2070 srp = screen.rend[row + row_offset];
2071 dtp = drawn_text[row]; 2091 line_t d = drawn_buf[row];
2072 dtp2 = drawn_text[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2073 drp = drawn_rend[row];
2074 drp2 = drawn_rend[row + i];
2075 2093
2076 for (nits = 0, col = TermWin.ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2077 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2078 nits--; 2096 nits--;
2079 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2097 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2080 nits++; 2098 nits++;
2081 2099
2082 if (nits > 8) /* XXX: arbitrary choice */ 2100 if (nits > 8) /* XXX: arbitrary choice */
2083 { 2101 {
2084 for (col = TermWin.ncol; col--; ) 2102 for (col = ncol; col--; )
2085 { 2103 {
2086 *dtp++ = *dtp2++; 2104 *d.t++ = *d2.t++;
2087 *drp++ = *drp2++; 2105 *d.r++ = *d2.r++;
2088 } 2106 }
2089 2107
2090 if (len == -1) 2108 if (len == -1)
2091 len = row; 2109 len = row;
2092 2110
… …
2097 2115
2098 if (len != -1) 2116 if (len != -1)
2099 { 2117 {
2100 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2101 if (wlen < len) 2119 if (wlen < len)
2102 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2103 2121
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, 2122 XCopyArea (display->display, vt, vt,
2106 TermWin.gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2107 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2108 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2109 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2110 len = -1; 2127 len = -1;
2111 } 2128 }
2112 } 2129 }
… …
2114#endif 2131#endif
2115 2132
2116 /* 2133 /*
2117 * E: main pass across every character 2134 * E: main pass across every character
2118 */ 2135 */
2119 for (row = 0; row < TermWin.nrow; row++) 2136 for (row = 0; row < nrow; row++)
2120 { 2137 {
2121 stp = screen.text[row + row_offset]; 2138 text_t *stp = ROW(row - view_start).t;
2122 srp = screen.rend[row + row_offset]; 2139 rend_t *srp = ROW(row - view_start).r;
2123 dtp = drawn_text[row]; 2140 text_t *dtp = drawn_buf[row].t;
2124 drp = drawn_rend[row]; 2141 rend_t *drp = drawn_buf[row].r;
2125 2142
2126 /* 2143 /*
2127 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2128 */ 2145 */
2129 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
2130 2147
2131 for (col = 0; col < TermWin.ncol; col++) 2148 for (col = 0; col < ncol; col++)
2132 { 2149 {
2133 /* compare new text with old - if exactly the same then continue */ 2150 /* compare new text with old - if exactly the same then continue */
2134 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2151 if (stp[col] == dtp[col] /* Must match characters to skip. */
2135 && (srp[col] == drp[col] /* Either rendition the same or */ 2152 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2136 || (stp[col] == ' ' /* space w/ no background change */ 2153 || (stp[col] == ' ' /* space w/ no background change */
2137 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2154 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2138 continue; 2155 continue;
2139 2156
2140 // redraw one or more characters 2157 // redraw one or more characters
2141 2158
2142 // seek to the beginning if wide characters 2159 // seek to the beginning of wide characters
2143 while (stp[col] == NOCHAR && col > 0) 2160 while (stp[col] == NOCHAR && col > 0)
2144 --col; 2161 --col;
2145 2162
2146 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2147 text_t *text = stp + col; 2164 text_t *text = stp + col;
… …
2150 dtp[col] = stp[col]; 2167 dtp[col] = stp[col];
2151 drp[col] = rend; 2168 drp[col] = rend;
2152 2169
2153 int xpixel = Col2Pixel (col); 2170 int xpixel = Col2Pixel (col);
2154 2171
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; ) 2172 for (i = 0; ++col < ncol; )
2158 { 2173 {
2159 if (stp[col] == NOCHAR) 2174 if (stp[col] == NOCHAR)
2160 { 2175 {
2161 dtp[col] = stp[col]; 2176 dtp[col] = stp[col];
2162 drp[col] = rend; 2177 drp[col] = rend;
2163 count++; 2178 count++;
2164
2165 if (i) // only possible skip if char unchanged
2166 i++; 2179 i++;
2167 2180
2168 continue; 2181 continue;
2169 } 2182 }
2170 2183
2171 if (rend != srp[col]) 2184 if (!RS_SAME (rend, srp[col]))
2172 break; 2185 break;
2173 2186
2174 count++; 2187 count++;
2175 2188
2176 if (stp[col] != dtp[col] 2189 if (stp[col] != dtp[col]
2177 || srp[col] != drp[col]) 2190 || !RS_SAME (srp[col], drp[col]))
2178 { 2191 {
2179 if (must_clear && (i++ > (count / 2))) 2192 if (must_clear && (i++ > count / 2))
2180 break; 2193 break;
2181 2194
2182 dtp[col] = stp[col]; 2195 dtp[col] = stp[col];
2183 drp[col] = rend; 2196 drp[col] = rend;
2184 i = 0; 2197 i = 0;
2185 } 2198 }
2186 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2187 break; 2200 break;
2188 } 2201 }
2189 2202
2190 col--; /* went one too far. move back */ 2203 col--; /* went one too far. move back */
2191 count -= i; /* dump any matching trailing chars */ 2204 count -= i; /* dump any matching trailing chars */
2205
2206 // sometimes we optimize away the trailing NOCHAR's, add them back
2207 while (i && text[count] == NOCHAR)
2208 count++, i--;
2192 2209
2193 /* 2210 /*
2194 * Determine the attributes for the string 2211 * Determine the attributes for the string
2195 */ 2212 */
2196 int fid = GET_FONT (rend);
2197 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2198 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2199 2215
2200 rend = GET_ATTR (rend); 2216 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2218 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2201 2223
2202 rvid = !!(rend & RS_RVid); 2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid;
2203 2232
2204#ifndef NO_BOLD_UNDERLINE_REVERSE 2233#ifndef NO_BOLD_UNDERLINE_REVERSE
2205 if (rend & RS_Bold && fore == Color_fg) 2234 if (rend & RS_Bold
2235 && fore == Color_fg)
2206 { 2236 {
2207 if (ISSET_PIXCOLOR (Color_BD)) 2237 if (ISSET_PIXCOLOR (Color_BD))
2208 fore = Color_BD; 2238 fore = Color_BD;
2239# if !ENABLE_STYLES
2209 else 2240 else
2210 rvid = !rvid; 2241 invert = !invert;
2242# endif
2243 }
2244
2245 if (rend & RS_Italic
2246 && fore == Color_fg)
2247 {
2248 if (ISSET_PIXCOLOR (Color_IT))
2249 fore = Color_IT;
2250# if !ENABLE_STYLES
2251 else
2252 invert = !invert;
2253# endif
2254 }
2255
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL;
2258#endif
2259
2260 if (invert)
2261 {
2262 ::swap (fore, back);
2263
2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV;
2267
2268 if (fore == back)
2269 {
2270 fore = Color_bg;
2271 back = Color_fg;
2272 }
2273#endif
2274 }
2275
2276#ifdef TEXT_BLINK
2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2278 {
2279 if (!text_blink_ev.active)
2280 {
2281 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2282 hidden_text = 0;
2283 }
2284 else if (hidden_text)
2285 fore = back;
2286 }
2287#endif
2211 } 2288 }
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 2289
2245 /* 2290 /*
2246 * Actually do the drawing of the string here 2291 * Actually do the drawing of the string here
2247 */ 2292 */
2248 rxvt_font *font = (*TermWin.fontset)[fid]; 2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2249 2294
2250 if (back == fore) 2295 if (back == fore)
2251 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2296 font->clear_rect (*drawable, xpixel, ypixel,
2252 TermWin.fwidth * count, TermWin.fheight, 2297 fwidth * count, fheight,
2253 back); 2298 back);
2254 else if (back == Color_bg) 2299 else if (back == Color_bg)
2255 { 2300 {
2256 if (must_clear) 2301 if (must_clear)
2257 { 2302 {
2258 CLEAR_CHARS (xpixel, ypixel, count); 2303 CLEAR_CHARS (xpixel, ypixel, count);
2259 2304
2260 for (i = 0; i < count; i++) /* don't draw empty strings */ 2305 for (i = 0; i < count; i++) /* don't draw empty strings */
2261 if (text[i] != ' ') 2306 if (text[i] != ' ')
2262 { 2307 {
2263 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2264 break; 2309 break;
2265 } 2310 }
2266 } 2311 }
2267 else 2312 else
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2269 } 2314 }
2270 else 2315 else
2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2272 2317
2273 if ((rend & RS_Uline) && (font->descent > 1)) 2318 if (rend & RS_Uline && font->descent > 1 && fore != back)
2319 {
2320#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2323 else
2324#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]);
2326
2274 XDrawLine (display->display, drawBuffer, TermWin.gc, 2327 XDrawLine (display->display, drawBuffer, gc,
2275 xpixel, ypixel + font->ascent + 1, 2328 xpixel, ypixel + font->ascent + 1,
2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 }
2277 } /* for (col....) */ 2331 } /* for (col....) */
2278 } /* for (row....) */ 2332 } /* for (row....) */
2333
2334#if ENABLE_OVERLAY
2335 scr_swap_overlay ();
2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2279 2338
2280 /* 2339 /*
2281 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2282 */ 2341 */
2283 if (showcursor) 2342 if (showcursor)
2284 { 2343 {
2285 if (TermWin.focus) 2344 if (focus)
2345 {
2346 if (OPTION (Opt_cursorUnderline))
2347 *crp ^= RS_Uline;
2348 else
2286 { 2349 {
2287 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2288 [screen.cur.col]);
2289 *srp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2290#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
2291 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2352 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2292#endif 2353#endif
2354 }
2293 } 2355 }
2294 else if (oldcursor.row >= 0) 2356 else if (oldcursor.row >= 0)
2295 { 2357 {
2358 int cursorwidth = 1;
2359 int col = oldcursor.col;
2360
2361 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2362 col--;
2363
2364 while (col + cursorwidth < ncol
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++;
2367
2296#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2297 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2298 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2299#endif 2371#endif
2300 int cursorwidth = 1;
2301 while (oldcursor.col + cursorwidth < TermWin.ncol
2302 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2303 cursorwidth++;
2304 2372
2305 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2373 XDrawRectangle (display->display, drawBuffer, gc,
2306 Col2Pixel (oldcursor.col), 2374 Col2Pixel (col),
2307 Row2Pixel (oldcursor.row), 2375 Row2Pixel (oldcursor.row),
2308 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2376 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2309 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2310 } 2378 }
2311 } 2379 }
2312 2380
2313 /* 2381 /*
2314 * H: cleanup selection 2382 * H: cleanup selection
2315 */ 2383 */
2316 scr_reverse_selection (); 2384 scr_reverse_selection ();
2317 2385
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; 2386 num_scr = 0;
2344 num_scr_allow = 1; 2387 num_scr_allow = 1;
2345 want_refresh = 0; /* screen is current */
2346} 2388}
2347 2389
2348void 2390void
2349rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2391rxvt_term::scr_remap_chars (line_t &l)
2350{ 2392{
2351 if (!rp || !tp) 2393 if (!l.t)
2352 return; 2394 return;
2353 2395
2354 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2355 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2397
2398 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2356} 2400}
2357 2401
2358void 2402void
2359rxvt_term::scr_remap_chars () 2403rxvt_term::scr_remap_chars ()
2360{ 2404{
2361 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2405 for (int i = total_rows; i--; )
2362 scr_remap_chars (screen.text[i], screen.rend[i]); 2406 scr_remap_chars (row_buf [i]);
2363 2407
2364 for (int i = TermWin.nrow; i--; ) 2408 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 } 2409 {
2410 scr_remap_chars (drawn_buf [i]);
2411 scr_remap_chars (swap_buf [i]);
2412 }
2413}
2414
2415void
2416rxvt_term::scr_recolour ()
2417{
2418 if (1
2419#if TRANSPARENT
2420 && !am_transparent
2421#endif
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 )
2426 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS
2431 if (scrollBar.win)
2432 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle ();
2435 scrollbar_show (0);
2436 }
2437#endif
2438 }
2439
2440 scr_clear ();
2441 scr_touch (true);
2442 want_refresh = 1;
2369} 2443}
2370 2444
2371/* ------------------------------------------------------------------------- */ 2445/* ------------------------------------------------------------------------- */
2372void 2446void
2373rxvt_term::scr_clear (bool really) 2447rxvt_term::scr_clear (bool really)
2374{ 2448{
2375 if (!TermWin.mapped) 2449 if (!mapped)
2376 return; 2450 return;
2377 2451
2378 num_scr_allow = 0; 2452 num_scr_allow = 0;
2379 want_refresh = 1; 2453 want_refresh = 1;
2380 2454
2381#ifdef TRANSPARENT 2455 if (really)
2382 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2456 XClearWindow (display->display, vt);
2457}
2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = -view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2383 { 2478 }
2384 int i; 2479}
2385 2480
2386 if (! (Options & Opt_transparent_all)) 2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= -view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2387 i = 0; 2494 col = 0;
2495 row = -view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2507/* ------------------------------------------------------------------------- */
2508void
2509rxvt_term::scr_reverse_selection ()
2510{
2511 if (selection.op
2512 && current_screen == selection.screen
2513 && selection.end.row >= -view_start)
2514 {
2515#if ENABLE_FRILLS
2516 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline);
2388 else 2520 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 2521#endif
2396 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2397 if (really) 2523 selection.end.row, selection.end.col,
2398 XClearWindow (display->display, TermWin.vt); 2524 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 } 2525 }
2429} 2526}
2430 2527
2431/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2432/* 2529/*
… …
2439{ 2536{
2440 int row, wrote; 2537 int row, wrote;
2441 unsigned int width, towrite; 2538 unsigned int width, towrite;
2442 char r1[] = "\n"; 2539 char r1[] = "\n";
2443 2540
2444 for (row = TermWin.saveLines - TermWin.nscrolled; 2541 for (row = saveLines - nsaved;
2445 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2542 row < saveLines + nrow - 1; row++)
2446 { 2543 {
2447 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2544 width = row_buf[row].l >= 0 ? row_buf[row].l
2448 : TermWin.ncol; 2545 : ncol;
2449 for (towrite = width; towrite; towrite -= wrote) 2546 for (towrite = width; towrite; towrite -= wrote)
2450 { 2547 {
2451 wrote = write (fd, & (screen.text[row][width - towrite]), 2548 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2452 towrite); 2549 towrite);
2453 if (wrote < 0) 2550 if (wrote < 0)
2454 return; /* XXX: death, no report */ 2551 return; /* XXX: death, no report */
2455 } 2552 }
2456 if (screen.tlen[row] >= 0) 2553 if (row_buf[row].l >= 0)
2457 if (write (fd, r1, 1) <= 0) 2554 if (write (fd, r1, 1) <= 0)
2458 return; /* XXX: death, no report */ 2555 return; /* XXX: death, no report */
2459 } 2556 }
2460} 2557}
2461#endif 2558#endif
2462 2559
2463/* ------------------------------------------------------------------------- * 2560/* ------------------------------------------------------------------------- *
2464 * CHARACTER SELECTION * 2561 * CHARACTER SELECTION *
2465 * ------------------------------------------------------------------------- */ 2562 * ------------------------------------------------------------------------- */
2466
2467/*
2468 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2469 */
2470void 2563void
2471rxvt_term::selection_check (int check_more) 2564rxvt_term::selection_check (int check_more)
2472{ 2565{
2473 row_col_t pos; 2566 row_col_t pos;
2474 2567
2475 if (!selection.op) 2568 if (!selection.op)
2476 return; 2569 return;
2477 2570
2478 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2479 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2480 || (selection.beg.row >= TermWin.nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2481 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, 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 2575 || (check_more == 1
2486 && current_screen == selection.screen 2576 && current_screen == selection.screen
2487 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2488 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2489 || (check_more == 2 2579 || (check_more == 2
… …
2491 && ROWCOL_IS_AFTER (selection.end, pos)) 2581 && ROWCOL_IS_AFTER (selection.end, pos))
2492 || (check_more == 3 2582 || (check_more == 3
2493 && ROWCOL_IS_AFTER (selection.end, pos)) 2583 && ROWCOL_IS_AFTER (selection.end, pos))
2494 || (check_more == 4 /* screen width change */ 2584 || (check_more == 4 /* screen width change */
2495 && (selection.beg.row != selection.end.row 2585 && (selection.beg.row != selection.end.row
2496 || selection.end.col > TermWin.ncol))) 2586 || selection.end.col > ncol)))
2497 CLEAR_SELECTION (); 2587 CLEAR_SELECTION ();
2498} 2588}
2499 2589
2500/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2501/* 2591/*
2502 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2503 */ 2593 */
2504void 2594void
2505rxvt_term::paste (const unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2506{ 2596{
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 */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2516 for (i = 0; i < len; i += PROP_SIZE) 2598 for (unsigned int i = 0; i < len; i++)
2517 { 2599 if (data[i] == C0_LF)
2518 n = min (len - i, PROP_SIZE); 2600 data[i] = C0_CR;
2519 MEMCPY (ds, data + i, n);
2520 2601
2521 for (j = 0; j < n; j++) 2602 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} 2603}
2530 2604
2531/* ------------------------------------------------------------------------- */ 2605/* ------------------------------------------------------------------------- */
2532/* 2606/*
2533 * Respond to a notification that a primary selection has been sent 2607 * Respond to a notification that a primary selection has been sent
2534 * EXT: SelectionNotify 2608 * EXT: SelectionNotify
2535 */ 2609 */
2536int 2610void
2537rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2538{ 2612{
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 */ 2613 if (prop == None) /* check for failed XConvertSelection */
2546 { 2614 {
2547 if ((selection_type & Sel_CompoundText)) 2615 if ((selection_type & Sel_CompoundText))
2548 { 2616 {
2549 int selnum = selection_type & Sel_whereMask; 2617 int selnum = selection_type & Sel_whereMask;
… …
2562 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2630 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2563 else 2631 else
2564 selection_type = 0; 2632 selection_type = 0;
2565 } 2633 }
2566 2634
2567 return 0; 2635 return;
2568 }
2569
2570 for (;;)
2571 { 2636 }
2637
2638 unsigned long bytes_after;
2639 XTextProperty ct;
2640
2641 if (XGetWindowProperty (display->display, win, prop,
2642 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after,
2646 &ct.value) != Success)
2647 {
2648 ct.value = 0;
2649 goto bailout;
2650 }
2651
2652 if (ct.encoding == None)
2653 goto bailout;
2654
2655 if (bytes_after)
2656 {
2657 // fetch and append remaining data
2658 XTextProperty ct2;
2659
2572 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2660 if (XGetWindowProperty (display->display, win, prop,
2573 (long) (PROP_SIZE / 4), delete_prop, 2661 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType,
2574 AnyPropertyType, &ct.encoding, &ct.format, 2663 &ct2.encoding, &ct2.format,
2575 &ct.nitems, &bytes_after, 2664 &ct2.nitems, &bytes_after,
2576 &ct.value) != Success) 2665 &ct2.value) != Success)
2577 break; 2666 goto bailout;
2578 2667
2579 if (ct.encoding == 0) 2668 // realloc should be compatible to XFree, here, and elsewhere, too
2580 { 2669 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2581 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2670 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2582 break; 2671 ct.nitems += ct2.nitems;
2583 }
2584 2672
2673 XFree (ct2.value);
2674 }
2675
2585 if (ct.value == NULL) 2676 if (ct.value == 0)
2586 { 2677 goto bailout;
2587 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2588 continue;
2589 }
2590 2678
2679 if (ct.encoding == xa[XA_INCR])
2680 {
2681 // INCR selection, start handshake
2682 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop);
2684
2685 selection_wait = Sel_incr;
2686 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10);
2688
2689 goto bailout;
2690 }
2691
2591 if (ct.nitems == 0) 2692 if (ct.nitems == 0)
2693 {
2694 if (selection_wait == Sel_incr)
2695 {
2696 XFree (ct.value);
2697
2698 // finally complete, now paste the whole thing
2699 selection_wait = Sel_normal;
2700 ct.value = (unsigned char *)incr_buf;
2701 ct.nitems = incr_buf_fill;
2702 incr_buf = 0;
2703 incr_buf_size = 0;
2704 incr_ev.stop ();
2592 { 2705 }
2593 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2706 else
2594 2707 {
2595 if (selection_wait == Sel_normal && nread == 0 2708 if (selection_wait == Sel_normal
2596 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2709 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2597 { 2710 {
2598 /* 2711 /*
2599 * pass through again trying CUT_BUFFER0 if we've come from 2712 * pass through again trying CUT_BUFFER0 if we've come from
2600 * XConvertSelection () but nothing was presented 2713 * XConvertSelection () but nothing was presented
2601 */ 2714 */
2602 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2603 selection_paste (display->root, XA_CUT_BUFFER0, False); 2715 selection_paste (display->root, XA_CUT_BUFFER0, False);
2604 } 2716 }
2605 2717
2606 nread = -1; /* discount any previous stuff */ 2718 goto bailout;
2607 break; 2719 }
2720 }
2721 else if (selection_wait == Sel_incr)
2722 {
2723 incr_ev.start (NOW + 10);
2724
2725 while (incr_buf_fill + ct.nitems > incr_buf_size)
2608 } 2726 {
2727 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2728 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2729 }
2609 2730
2731 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2610 nread += ct.nitems; 2732 incr_buf_fill += ct.nitems;
2611 2733
2734 goto bailout;
2735 }
2736
2612 char **cl; 2737 char **cl;
2613 int cr; 2738 int cr;
2739
2740#if ENABLE_FRILLS
2741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742 // so recode it manually
2743 if (ct.encoding == xa[XA_UTF8_STRING])
2744 {
2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2746 char *s = rxvt_wcstombs (w);
2747 free (w);
2748 // TODO: strlen == only the first element will be converted. well...
2749 paste (s, strlen (s));
2750 free (s);
2751 }
2752 else
2753#endif
2614 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2615 &cr) >= 0 && cl) 2755 && cl)
2616 { 2756 {
2617 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2618 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2619 2759
2620 XFreeStringList (cl); 2760 XFreeStringList (cl);
2621 } 2761 }
2622 else 2762 else
2623 paste (ct.value, ct.nitems); 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2624 2764
2625 if (bytes_after == 0) 2765bailout:
2626 break;
2627
2628 XFree (ct.value);
2629 }
2630
2631 if (ct.value)
2632 XFree (ct.value); 2766 XFree (ct.value);
2633 2767
2634 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
2635 selection_wait = Sel_none; 2769 selection_wait = Sel_none;
2636
2637 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2638 return (int)nread;
2639} 2770}
2640 2771
2641void 2772void
2642rxvt_term::incr_cb (time_watcher &w) 2773rxvt_term::incr_cb (time_watcher &w)
2643{ 2774{
2644 selection_wait = Sel_none; 2775 selection_wait = Sel_none;
2645 2776
2777 incr_buf_size = 0;
2778 free (incr_buf);
2779
2646 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2647} 2781}
2648 2782
2649/*
2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2651 */
2652void 2783void
2653rxvt_term::selection_property (Window win, Atom prop) 2784rxvt_term::selection_property (Window win, Atom prop)
2654{ 2785{
2655 int reget_time = 0; 2786 if (prop == None || selection_wait != Sel_incr)
2656
2657 if (prop == None)
2658 return; 2787 return;
2659 2788
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) 2789 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} 2790}
2702 2791
2703/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2704/* 2793/*
2705 * Request the current selection: 2794 * Request the current selection:
… …
2711 * EXT: button 2 release 2800 * EXT: button 2 release
2712 */ 2801 */
2713void 2802void
2714rxvt_term::selection_request (Time tm, int x, int y) 2803rxvt_term::selection_request (Time tm, int x, int y)
2715{ 2804{
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) 2805 if (x < 0 || x >= width || y < 0 || y >= height)
2719 return; /* outside window */ 2806 return; /* outside window */
2720 2807
2721 if (selection.text) 2808 if (selection.text)
2722 { /* internal selection */ 2809 { /* internal selection */
2723 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2724 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2725 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2726 free (str); 2812 free (str);
2727 return; 2813 return;
2728 } 2814 }
2729 else 2815 else
2730 { 2816 {
… …
2742#else 2828#else
2743 selection_type = Sel_CompoundText; 2829 selection_type = Sel_CompoundText;
2744 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2745 return; 2831 return;
2746#endif 2832#endif
2747
2748 } 2833 }
2749 } 2834 }
2750 2835
2751 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2836 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); 2837 selection_paste (display->root, XA_CUT_BUFFER0, false);
2754} 2838}
2755 2839
2756int 2840int
2757rxvt_term::selection_request_other (Atom target, int selnum) 2841rxvt_term::selection_request_other (Atom target, int selnum)
2758{ 2842{
2759 Atom sel; 2843 Atom sel;
2760#ifdef DEBUG_SELECT
2761 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2762#endif
2763 2844
2764 selection_type |= selnum; 2845 selection_type |= selnum;
2765 2846
2766 if (selnum == Sel_Primary) 2847 if (selnum == Sel_Primary)
2767 sel = XA_PRIMARY; 2848 sel = XA_PRIMARY;
… …
2770 else 2851 else
2771 sel = xa[XA_CLIPBOARD]; 2852 sel = xa[XA_CLIPBOARD];
2772 2853
2773 if (XGetSelectionOwner (display->display, sel) != None) 2854 if (XGetSelectionOwner (display->display, sel) != None)
2774 { 2855 {
2775 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2776 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2777 TermWin.vt, selection_request_time); 2857 vt, selection_request_time);
2778 return 1; 2858 return 1;
2779 } 2859 }
2780 2860
2781 return 0; 2861 return 0;
2782} 2862}
… …
2787 * EXT: SelectionClear 2867 * EXT: SelectionClear
2788 */ 2868 */
2789void 2869void
2790rxvt_term::selection_clear () 2870rxvt_term::selection_clear ()
2791{ 2871{
2792 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2793
2794 want_refresh = 1; 2872 want_refresh = 1;
2795 free (selection.text); 2873 free (selection.text);
2796 selection.text = NULL; 2874 selection.text = NULL;
2797 selection.len = 0; 2875 selection.len = 0;
2798 CLEAR_SELECTION (); 2876 CLEAR_SELECTION ();
… …
2807 * EXT: button 1 or 3 release 2885 * EXT: button 1 or 3 release
2808 */ 2886 */
2809void 2887void
2810rxvt_term::selection_make (Time tm) 2888rxvt_term::selection_make (Time tm)
2811{ 2889{
2812 int i, col, end_col, row, end_row; 2890 int i;
2813 wchar_t *new_selection_text; 2891 wchar_t *new_selection_text;
2814 text_t *t; 2892 text_t *t;
2815 2893
2816 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2817 switch (selection.op) 2894 switch (selection.op)
2818 { 2895 {
2819 case SELECTION_CONT: 2896 case SELECTION_CONT:
2820 break; 2897 break;
2821 case SELECTION_INIT: 2898 case SELECTION_INIT:
… …
2831 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2832 2909
2833 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2834 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2835 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2836 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2837 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2838 2918
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; 2919 int ofs = 0;
2844 int extra = 0; 2920 int extra = 0;
2845 2921
2922 int col = selection.beg.col;
2923 int row = selection.beg.row;
2924
2925 int end_col;
2926
2846 for (; row <= end_row; row++, col = 0) 2927 for (; row <= selection.end.row; row++, col = 0)
2847 { 2928 {
2848 t = &(screen.text[row][col]); 2929#if ENABLE_FRILLS
2849 2930 if (selection.rect)
2850 end_col = screen.tlen[row]; 2931 {
2851 2932 col = selection.beg.col;
2852 if (end_col == -1)
2853 end_col = TermWin.ncol; 2933 end_col = ncol + 1;
2934 }
2935 else
2936#endif
2937 end_col = ROW(row).l;
2854 2938
2939 col = max (col, 0);
2940
2855 if (row == end_row) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2856 MIN_IT (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2947
2948 t = ROW(row).t + col;
2857 2949
2858 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2859 { 2951 {
2860 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2861 t++; 2953 t++;
… …
2878#endif 2970#endif
2879 else 2971 else
2880 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2881 } 2973 }
2882 2974
2883 if (screen.tlen[row] != -1 && row != end_row) 2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2884 new_selection_text[ofs++] = L'\n'; 2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row)
2988 new_selection_text[ofs++] = C0_LF;
2885 } 2989 }
2886 2990
2887 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2888 new_selection_text[ofs++] = L'\n'; 2992 new_selection_text[ofs++] = C0_LF;
2889 2993
2890 new_selection_text[ofs] = 0; 2994 new_selection_text[ofs] = 0;
2891 2995
2892 if (ofs == 0) 2996 if (ofs == 0)
2893 { 2997 {
… …
2899 3003
2900 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2901 selection.len = ofs; 3005 selection.len = ofs;
2902 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2903 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
2904 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2905 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2906 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2907 else 3025 else
2908 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
2909 3030
2910#if 0 3031#if 0
2911 XTextProperty ct; 3032 XTextProperty ct;
2912 3033
2913 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2914 { 3035 {
2915 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2916 PropModeReplace, ct.value, ct.nitems);
2917 XFree (ct.value); 3037 XFree (ct.value);
2918 } 3038 }
2919#endif 3039#endif
2920
2921 selection_time = tm;
2922 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2923} 3040}
2924 3041
2925/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
2926/* 3043/*
2927 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
2928 * EXT: button 1 press 3045 * EXT: button 1 press
2929 */ 3046 */
2930void 3047void
2931rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
2932{ 3049{
2933 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2934
2935 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
2936 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
2937 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 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, -nsaved, 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 = - nsaved - 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 = row - view_start;
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