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.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC

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

Diff Legend

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