ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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