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

Diff Legend

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