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

Diff Legend

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