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.38 by pcg, Wed Feb 25 10:26:50 2004 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

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

Diff Legend

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