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

Diff Legend

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