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

Diff Legend

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