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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.266 by root, Mon Oct 9 23:12:45 2006 UTC

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

Diff Legend

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