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

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

Diff Legend

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