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.243 by ayin, Thu Jan 19 23:15:21 2006 UTC

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