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

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

Diff Legend

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