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

Diff Legend

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