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

Diff Legend

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