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

Diff Legend

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