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.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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