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

Diff Legend

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