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

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

Diff Legend

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