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

Diff Legend

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