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

Diff Legend

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