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

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

Diff Legend

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