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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.405 by sf-exg, Tue Nov 15 20:09:13 2011 UTC

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

Diff Legend

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