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

Diff Legend

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