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.41 by pcg, Sun Feb 29 15:31:56 2004 UTC vs.
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC

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

Diff Legend

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