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

Diff Legend

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