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.159 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.314 by root, Tue Nov 4 14:34:13 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29#include "rxvtperl.h" /* NECESSARY */
30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 30
32#include <inttypes.h> 31#include <inttypes.h>
33 32
34#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
35 34
36inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
39 *start++ = value; 38 *start++ = value;
40} 39}
41 40
… …
46 45
47/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 50 if (option (Opt_scrollTtyOutput)) \
52 TermWin.view_start = 0 51 view_start = 0
53#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 56 selection.beg.row = selection.beg.col \
… …
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 86
88/* 87/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 89 */
93#define drawBuffer TermWin.vt
94
95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \
97 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \
99 (unsigned int)Height2Pixel (num), False)
100
101#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 91 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
104 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
106
107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
109 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \
111 (unsigned int)Height2Pixel (num))
112 95
113/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
116 99
117/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
118void 101void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 103{
121 efs &= ~RS_baseattrMask; 104 if (!l.t)
105 {
106 lalloc (l);
107 col = 0;
108 width = ncol;
109 }
110
111 l.touch ();
112
113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
115
116 text_t *et = l.t + col;
117 rend_t *er = l.r + col;
123 118
124 while (width--) 119 while (width--)
125 { 120 {
126 *et++ = ' '; 121 *et++ = ' ';
127 *er++ = efs; 122 *er++ = efs;
… …
129} 124}
130 125
131/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
132/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
133void 128void
134rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
135{ 130{
136#ifdef DEBUG_STRICT 131 scr_blank_line (l, 0, ncol, efs);
137 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
138#endif
139 if (tp[row] == NULL)
140 {
141 tp[row] = (text_t *)talloc->alloc ();
142 rp[row] = (rend_t *)ralloc->alloc ();
143 }
144 132
145 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 133 l.l = 0;
134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found begin, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
146} 154}
147 155
148/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
149 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
150 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159
151void 160void
152rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
153{ 162{
154 unsigned int ncol, nrow, total_rows, prev_total_rows;
155 unsigned int p, q;
156 int k;
157 rend_t setrstyle;
158
159#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
160 scr_overlay_off (); 164 scr_overlay_off ();
161#endif 165#endif
162 166
167 rvideo_mode = false;
163 TermWin.view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (TermWin.ncol == 0) 171 if (ncol == 0)
167 TermWin.ncol = 80; 172 ncol = 80;
168 173
169 if (TermWin.nrow == 0) 174 if (nrow == 0)
170 TermWin.nrow = 24; 175 nrow = 24;
171
172 ncol = TermWin.ncol;
173 nrow = TermWin.nrow;
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177 179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182
178 // we need at least two lines for wrapping to work correctly 183 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2) 184 while (nrow + saveLines < 2)
180 { 185 {
186 //TODO//FIXME
181 TermWin.saveLines++; 187 saveLines++;
182 prev_nrow--; 188 prev_nrow--;
183 TermWin.nscrolled++; 189 top_row--;
184 } 190 }
185 191
186 want_refresh = 1; 192 want_refresh = 1;
187 193
188 prev_total_rows = prev_nrow + TermWin.saveLines; 194 int prev_total_rows = prev_nrow + saveLines;
189 total_rows = nrow + TermWin.saveLines; 195 total_rows = nrow + saveLines;
190 196
191 screen.tscroll = 0; 197 screen.tscroll = 0;
192 screen.bscroll = nrow - 1; 198 screen.bscroll = nrow - 1;
193 199
194 if (!talloc) 200 if (!row_buf)
195 { 201 {
202 /*
203 * first time called so just malloc everything: don't rely on realloc
204 */
205 top_row = 0;
206 term_start = 0;
207
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 }
199 210
200 if (!screen.text) 211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 { 212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 /* 213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 * first time called so just malloc everything: don't rely on realloc 214
204 * Note: this is still needed so that all the scrollback lines are NULL 215 for (int row = nrow; row--; )
205 */ 216 {
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218
219 for (p = 0; p < nrow; p++)
220 {
221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 217 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 218 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
224 screen.tlen[q] = swap.tlen[p] = 0;
225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 219 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
226 } 220 }
227 221
228 memset (charsets, 'B', sizeof (charsets)); 222 memset (charsets, 'B', sizeof (charsets));
229 TermWin.nscrolled = 0; /* no saved lines */
230 rstyle = DEFAULT_RSTYLE; 223 rstyle = DEFAULT_RSTYLE;
231 screen.flags = Screen_DefaultFlags; 224 screen.flags = Screen_DefaultFlags;
232 screen.cur.row = screen.cur.col = 0; 225 screen.cur.row = screen.cur.col = 0;
233 screen.charset = 0; 226 screen.charset = 0;
234 current_screen = PRIMARY; 227 current_screen = PRIMARY;
… …
246 selection.text = NULL; 239 selection.text = NULL;
247 selection.len = 0; 240 selection.len = 0;
248 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
249 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
250 selection.clicks = 0; 243 selection.clicks = 0;
251 CLEAR_ALL_SELECTION ();
252 rvideo = 0;
253 } 244 }
254 else 245 else
255 { 246 {
256 /* 247 /*
257 * add or delete rows as appropriate 248 * add or delete rows as appropriate
258 */ 249 */
259 setrstyle = DEFAULT_RSTYLE;
260 250
251 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
252 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
253
254#if 0
261 if (nrow < prev_nrow) 255 if (nrow < prev_nrow)
262 { 256 {
263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266
267 for (p = nrow; p < prev_nrow; p++) 257 for (int row = nrow; row < prev_nrow; row++)
268 { 258 {
269 q = p + TermWin.saveLines; 259 lfree (swap_buf [row]);
260 lfree (drawn_buf[row]);
261 }
262 }
263#endif
270 264
271 if (screen.text[q]) 265 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267
268 for (int row = min (nrow, prev_nrow); row--; )
269 {
270 lresize (drawn_buf[row]);
271 lresize (swap_buf [row]);
272 }
273
274 for (int row = prev_nrow; row < nrow; row++)
275 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
282
283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
284 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row
286
287 if (top_row)
288 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm.
291
292 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294
295 do
296 {
297 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l;
303
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
272 { 305 {
273#ifdef DEBUG_STRICT 306 p = MOD (p - 1, prev_total_rows);
274 assert (screen.rend[q]); 307
275#endif 308 plines++;
276 talloc->free (screen.text[q]); 309 llen += prev_ncol;
277 ralloc->free (screen.rend[q]);
278 } 310 }
279 311
280 if (swap.text[p]) 312 int qlines = max (0, (llen - 1) / ncol) + 1;
313
314 // drop partial lines completely
315 if (q < qlines)
316 break;
317
318 q -= qlines;
319
320 int lofs = 0;
321 line_t *qline;
322
323 // re-assemble the full line by destination lines
324 for (int qrow = q; qlines--; qrow++)
281 { 325 {
282#ifdef DEBUG_STRICT 326 qline = row_buf + qrow;
283 assert (swap.rend[p]); 327 lalloc (*qline);
284#endif 328 qline->l = ncol;
285 talloc->free (swap.text[p]); 329 qline->is_longer (1);
286 ralloc->free (swap.rend[p]); 330
331 int qcol = 0;
332
333 // see below for cursor adjustment rationale
334 if (p == ocur.row)
335 screen.cur.row = q - (total_rows - nrow);
336
337 // fill a single destination line
338 while (lofs < llen && qcol < ncol)
339 {
340 int prow = lofs / prev_ncol;
341 int pcol = lofs % prev_ncol;
342
343 prow = MOD (p + prow, prev_total_rows);
344
345 // we only adjust the cursor _row_ and put it into
346 // the topmost line of "long line" it was in, as
347 // this seems to upset applications/shells/readline
348 // least.
349 if (prow == ocur.row)
350 screen.cur.row = q - (total_rows - nrow);
351
352 line_t &pline = old_buf [prow];
353
354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
355
356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
358
359 lofs += len;
360 qcol += len;
361 }
287 } 362 }
288 363
289#ifdef DEBUG_STRICT 364 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
290 assert (drawn_text[p] && drawn_rend[p]); 365 qline->is_longer (0);
291#endif 366 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
292 talloc->free (drawn_text[p]);
293 ralloc->free (drawn_rend[p]);
294 } 367 }
368 while (p != pend && q > 0);
295 369
296 /* we have fewer rows so fix up cursor position */ 370 term_start = total_rows - nrow;
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 371 top_row = q - term_start;
298 372
299 scr_reset_realloc (); /* realloc _last_ */ 373 // make sure all terminal lines exist
300 } 374 while (top_row > 0)
301 else if (nrow > prev_nrow) 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
302 { 376 }
303 /* add rows */ 377 else
304 scr_reset_realloc (); /* realloc _first_ */ 378 {
379 // if no scrollback exists (yet), wing, instead of wrap
305 380
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 381 for (int row = min (nrow, prev_nrow); row--; )
307
308 k = min (TermWin.nscrolled, nrow - prev_nrow);
309
310 for (p = prev_total_rows; p < total_rows; p++)
311 { 382 {
312 screen.tlen[p] = 0; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
313 screen.text[p] = NULL; 384 line_t &qline = row_buf [row];
314 screen.rend[p] = NULL; 385
386 qline = pline;
387 lresize (qline);
315 } 388 }
316 389
317 for (p = prev_total_rows; p < total_rows - k; p++)
318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
319
320 for (p = prev_nrow; p < nrow; p++) 390 for (int row = prev_nrow; row < nrow; row++)
321 { 391 {
322 swap.tlen[p] = 0; 392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
323 swap.text[p] = NULL;
324 swap.rend[p] = NULL;
325 drawn_text[p] = NULL;
326 drawn_rend[p] = NULL;
327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
329 } 393 }
330 394
331 if (k > 0) 395 term_start = 0;
332 {
333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k;
335 screen.s_cur.row += k;
336 TermWin.nscrolled -= k;
337 }
338
339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */
342 MIN_IT (screen.cur.row, nrow - 1);
343#endif
344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
345 }
346
347 /* resize columns */
348 if (ncol != prev_ncol)
349 { 396 }
350 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
351 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
352 397
353 for (p = 0; p < total_rows; p++) 398 free (old_buf);
354 { 399 delete old_ta;
355 if (screen.text[p]) 400 delete old_ra;
356 {
357 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
358 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
359 401
360 MIN_IT (screen.tlen[p], (int16_t)ncol); 402 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1);
361 404
362 if (ncol > prev_ncol)
363 scr_blank_line (&screen.text[p][prev_ncol],
364 &screen.rend[p][prev_ncol],
365 ncol - prev_ncol, setrstyle);
366 }
367 }
368
369 for (p = 0; p < nrow; p++)
370 {
371 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
372 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
373
374 if (ncol > prev_ncol)
375 scr_blank_line (&drawn_text[p][prev_ncol],
376 &drawn_rend[p][prev_ncol],
377 ncol - prev_ncol, setrstyle);
378
379 if (swap.text[p])
380 {
381 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
382 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
383
384 MIN_IT (swap.tlen[p], (int16_t)ncol);
385
386 if (ncol > prev_ncol)
387 scr_blank_line (&swap.text[p][prev_ncol],
388 &swap.rend[p][prev_ncol],
389 ncol - prev_ncol, setrstyle);
390 }
391
392 }
393
394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
395
396 delete talloc; talloc = ta;
397 delete ralloc; ralloc = ra;
398 }
399
400 if (tabs)
401 free (tabs); 405 free (tabs);
402 } 406 }
407
408 CLEAR_ALL_SELECTION ();
403 409
404 prev_nrow = nrow; 410 prev_nrow = nrow;
405 prev_ncol = ncol; 411 prev_ncol = ncol;
406 412
407 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
408 414
409 for (p = 0; p < ncol; p++) 415 for (int col = ncol; --col; )
410 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
411 420
412 tt_winch (); 421 tt_winch ();
413}
414 422
415void 423 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416rxvt_term::scr_reset_realloc ()
417{
418 unsigned int total_rows, nrow;
419
420 nrow = TermWin.nrow;
421 total_rows = nrow + TermWin.saveLines;
422 /* *INDENT-OFF* */
423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
424 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
425 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
426 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
427
428 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
429 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
430
431 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
432 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
433 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
434 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
435 /* *INDENT-ON* */
436} 424}
437 425
438/* ------------------------------------------------------------------------- */ 426/* ------------------------------------------------------------------------- */
439/* 427/*
440 * Free everything. That way malloc debugging can find leakage. 428 * Free everything. That way malloc debugging can find leakage.
441 */ 429 */
442void 430void
443rxvt_term::scr_release () 431rxvt_term::scr_release () NOTHROW
444{ 432{
445 unsigned int total_rows; 433 if (row_buf)
446 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
1371#if !ENABLE_MINIMAL
1395void 1372void
1396rxvt_term::scr_erase_savelines () 1373rxvt_term::scr_erase_savelines () NOTHROW
1397{ 1374{
1398 want_refresh = 1; 1375 want_refresh = 1;
1399 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
1400 1377
1401 for (int i = 0; i < TermWin.saveLines; ++i) 1378 top_row = 0;
1402 if (screen.text [i])
1403 {
1404 screen.tlen[i] = 0;
1405 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1406 }
1407} 1379}
1380#endif
1408 1381
1409/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1410/* 1383/*
1411 * Fill the screen with `E's 1384 * Fill the screen with `E's
1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1413 */ 1386 */
1414void 1387void
1415rxvt_term::scr_E () 1388rxvt_term::scr_E () NOTHROW
1416{ 1389{
1417 int i, j, k;
1418 rend_t *r1, fs; 1390 rend_t fs;
1419 1391
1420 want_refresh = 1; 1392 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
1422 1394
1423 num_scr_allow = 0; 1395 num_scr_allow = 0;
1424 selection_check (3); 1396 selection_check (3);
1425 1397
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1398 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1399 for (int row = nrow; row--; )
1428 { 1400 {
1429 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1401 line_t &line = ROW(row);
1402
1430 fill_text (screen.text[k], 'E', TermWin.ncol); 1403 fill_text (line.t, 'E', ncol);
1431 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1404 rend_t *r1 = line.r;
1405
1406 for (int j = ncol; j--; )
1432 *r1++ = fs; 1407 *r1++ = fs;
1408
1409 line.is_longer (0);
1410 line.touch (ncol);
1433 } 1411 }
1434} 1412}
1435 1413
1436/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1437/* 1415/*
1438 * Insert/Delete <count> lines 1416 * Insert/Delete <count> lines
1439 */ 1417 */
1440void 1418void
1441rxvt_term::scr_insdel_lines (int count, int insdel) 1419rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1442{ 1420{
1443 int end; 1421 int end;
1444 1422
1445 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1446 1424
… …
1458 count = end; 1436 count = end;
1459 } 1437 }
1460 1438
1461 scr_do_wrap (); 1439 scr_do_wrap ();
1462 1440
1463 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1441 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1464} 1442}
1465 1443
1466/* ------------------------------------------------------------------------- */ 1444/* ------------------------------------------------------------------------- */
1467/* 1445/*
1468 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1469 */ 1447 */
1470void 1448void
1471rxvt_term::scr_insdel_chars (int count, int insdel) 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1472{ 1450{
1473 int col, row;
1474 rend_t tr;
1475 text_t *stp;
1476 rend_t *srp;
1477 int16_t *slp;
1478
1479 want_refresh = 1; 1451 want_refresh = 1;
1480 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1481 1453
1482 if (count <= 0) 1454 if (count <= 0)
1483 return; 1455 return;
1484 1456
1485 scr_do_wrap (); 1457 scr_do_wrap ();
1486 1458
1487 selection_check (1); 1459 selection_check (1);
1488 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1460 min_it (count, ncol - screen.cur.col);
1489 1461
1490 row = screen.cur.row + TermWin.saveLines; 1462 int row = screen.cur.row;
1491 1463
1492 stp = screen.text[row]; 1464 line_t *line = &ROW(row);
1493 srp = screen.rend[row]; 1465
1494 slp = &screen.tlen[row]; 1466 line->touch ();
1467 line->is_longer (0);
1495 1468
1496 switch (insdel) 1469 switch (insdel)
1497 { 1470 {
1498 case INSERT: 1471 case INSERT:
1499 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1472 line->l = min (line->l + count, ncol);
1473
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1500 { 1475 {
1501 stp[col] = stp[col - count]; 1476 line->t[col] = line->t[col - count];
1502 srp[col] = srp[col - count]; 1477 line->r[col] = line->r[col - count];
1503 }
1504
1505 if (*slp != -1)
1506 {
1507 *slp += count;
1508 MIN_IT (*slp, TermWin.ncol);
1509 } 1478 }
1510 1479
1511 if (selection.op && current_screen == selection.screen 1480 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1481 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1482 {
1514 if (selection.end.row != screen.cur.row 1483 if (selection.end.row != screen.cur.row
1515 || (selection.end.col + count >= TermWin.ncol)) 1484 || (selection.end.col + count >= ncol))
1516 CLEAR_SELECTION (); 1485 CLEAR_SELECTION ();
1517 else 1486 else
1487 {
1518 { /* shift selection */ 1488 /* shift selection */
1519 selection.beg.col += count; 1489 selection.beg.col += count;
1520 selection.mark.col += count; /* XXX: yes? */ 1490 selection.mark.col += count; /* XXX: yes? */
1521 selection.end.col += count; 1491 selection.end.col += count;
1522 } 1492 }
1523 } 1493 }
1524 1494
1525 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1526 (unsigned int)count, rstyle);
1527 break; 1496 break;
1528 1497
1529 case ERASE: 1498 case ERASE:
1530 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1499 screen.cur.col += count; /* don't worry if > ncol */
1531 selection_check (1); 1500 selection_check (1);
1532 screen.cur.col -= count; 1501 screen.cur.col -= count;
1533 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1502
1534 (unsigned int)count, rstyle); 1503 scr_blank_line (*line, screen.cur.col, count, rstyle);
1535 break; 1504 break;
1536 1505
1537 case DELETE: 1506 case DELETE:
1538 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1539
1540 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1541 {
1542 stp[col] = stp[col + count];
1543 srp[col] = srp[col + count];
1544 }
1545
1546 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1547 (unsigned int)count, tr);
1548
1549 if (*slp == -1) /* break line continuation */
1550 *slp = TermWin.ncol;
1551 1507 {
1552 *slp -= count; 1508 line->l = max (line->l - count, 0);
1553 MAX_IT (*slp, 0);
1554 1509
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1511
1512 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 {
1514 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count];
1516 }
1517
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr);
1523
1555 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1556 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1557 { 1526 {
1558 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
1559 || (screen.cur.col >= selection.beg.col - count) 1528 || (screen.cur.col >= selection.beg.col - count)
1560 || selection.end.col >= TermWin.ncol) 1529 || selection.end.col >= ncol)
1561 CLEAR_SELECTION (); 1530 CLEAR_SELECTION ();
1562 else 1531 else
1563 { 1532 {
1564 /* shift selection */ 1533 /* shift selection */
1565 selection.beg.col -= count; 1534 selection.beg.col -= count;
1566 selection.mark.col -= count; /* XXX: yes? */ 1535 selection.mark.col -= count; /* XXX: yes? */
1567 selection.end.col -= count; 1536 selection.end.col -= count;
1568 } 1537 }
1538 }
1569 } 1539 }
1570 1540
1571 break; 1541 break;
1572 } 1542 }
1573} 1543}
… …
1576/* 1546/*
1577 * Set the scrolling region 1547 * Set the scrolling region
1578 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1548 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1579 */ 1549 */
1580void 1550void
1581rxvt_term::scr_scroll_region (int top, int bot) 1551rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1582{ 1552{
1583 MAX_IT (top, 0); 1553 max_it (top, 0);
1584 MIN_IT (bot, (int)TermWin.nrow - 1); 1554 min_it (bot, nrow - 1);
1585 1555
1586 if (top > bot) 1556 if (top > bot)
1587 return; 1557 return;
1588 1558
1589 screen.tscroll = top; 1559 screen.tscroll = top;
… …
1596 * Make the cursor visible/invisible 1566 * Make the cursor visible/invisible
1597 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1567 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1598 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1568 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1599 */ 1569 */
1600void 1570void
1601rxvt_term::scr_cursor_visible (int mode) 1571rxvt_term::scr_cursor_visible (int mode) NOTHROW
1602{ 1572{
1603 want_refresh = 1; 1573 want_refresh = 1;
1604 1574
1605 if (mode) 1575 if (mode)
1606 screen.flags |= Screen_VisibleCursor; 1576 screen.flags |= Screen_VisibleCursor;
… …
1613 * Set/unset automatic wrapping 1583 * Set/unset automatic wrapping
1614 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1584 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1615 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1585 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1616 */ 1586 */
1617void 1587void
1618rxvt_term::scr_autowrap (int mode) 1588rxvt_term::scr_autowrap (int mode) NOTHROW
1619{ 1589{
1620 if (mode) 1590 if (mode)
1621 screen.flags |= Screen_Autowrap; 1591 screen.flags |= Screen_Autowrap;
1622 else 1592 else
1623 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1593 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1632 * and the cursor cannot be moved outside. 1602 * and the cursor cannot be moved outside.
1633 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1603 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1634 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1604 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1635 */ 1605 */
1636void 1606void
1637rxvt_term::scr_relative_origin (int mode) 1607rxvt_term::scr_relative_origin (int mode) NOTHROW
1638{ 1608{
1639 if (mode) 1609 if (mode)
1640 screen.flags |= Screen_Relative; 1610 screen.flags |= Screen_Relative;
1641 else 1611 else
1642 screen.flags &= ~Screen_Relative; 1612 screen.flags &= ~Screen_Relative;
… …
1649 * Set insert/replace mode 1619 * Set insert/replace mode
1650 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1620 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1651 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1621 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1652 */ 1622 */
1653void 1623void
1654rxvt_term::scr_insert_mode (int mode) 1624rxvt_term::scr_insert_mode (int mode) NOTHROW
1655{ 1625{
1656 if (mode) 1626 if (mode)
1657 screen.flags |= Screen_Insert; 1627 screen.flags |= Screen_Insert;
1658 else 1628 else
1659 screen.flags &= ~Screen_Insert; 1629 screen.flags &= ~Screen_Insert;
… …
1665 * XTERM_SEQ: Set tab at current column : ESC H 1635 * XTERM_SEQ: Set tab at current column : ESC H
1666 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1636 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1667 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1637 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1668 */ 1638 */
1669void 1639void
1670rxvt_term::scr_set_tab (int mode) 1640rxvt_term::scr_set_tab (int mode) NOTHROW
1671{ 1641{
1672 if (mode < 0) 1642 if (mode < 0)
1673 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1643 memset (tabs, 0, ncol);
1674 else if (screen.cur.col < TermWin.ncol) 1644 else if (screen.cur.col < ncol)
1675 tabs[screen.cur.col] = (mode ? 1 : 0); 1645 tabs [screen.cur.col] = !!mode;
1676} 1646}
1677 1647
1678/* ------------------------------------------------------------------------- */ 1648/* ------------------------------------------------------------------------- */
1679/* 1649/*
1680 * Set reverse/normal video 1650 * Set reverse/normal video
1681 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1651 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1682 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1652 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1683 */ 1653 */
1684void 1654void
1685rxvt_term::scr_rvideo_mode (int mode) 1655rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1686{ 1656{
1687 XGCValues gcvalue; 1657 rvideo_mode = on;
1688 1658
1659#ifndef NO_BELL
1660 on ^= rvideo_bell;
1661#endif
1662
1689 if (rvideo != mode) 1663 if (rvideo_state != on)
1690 { 1664 {
1691 rvideo = mode; 1665 rvideo_state = on;
1666
1692 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#if XPM_BACKGROUND 1668#ifdef HAVE_BG_PIXMAP
1694 if (bgPixmap.pixmap == None) 1669 if (bgPixmap.pixmap == None)
1695#endif 1670#endif
1696#if TRANSPARENT 1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697 if (! (options & Opt_transparent) || am_transparent == 0)
1698#endif
1699 XSetWindowBackground (display->display, TermWin.vt,
1700 pix_colors[Color_bg]);
1701 1672
1673 XGCValues gcvalue;
1702 gcvalue.foreground = pix_colors[Color_fg]; 1674 gcvalue.foreground = pix_colors[Color_fg];
1703 gcvalue.background = pix_colors[Color_bg]; 1675 gcvalue.background = pix_colors[Color_bg];
1704 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1676 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1705 &gcvalue); 1677
1706 scr_clear (); 1678 scr_clear ();
1707 scr_touch (true); 1679 scr_touch (true);
1708 } 1680 }
1709} 1681}
1710 1682
… …
1712/* 1684/*
1713 * Report current cursor position 1685 * Report current cursor position
1714 * XTERM_SEQ: Report position: ESC [ 6 n 1686 * XTERM_SEQ: Report position: ESC [ 6 n
1715 */ 1687 */
1716void 1688void
1717rxvt_term::scr_report_position () 1689rxvt_term::scr_report_position () NOTHROW
1718{ 1690{
1719 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1691 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1720} 1692}
1721 1693
1722/* ------------------------------------------------------------------------- * 1694/* ------------------------------------------------------------------------- *
… …
1725 1697
1726/* 1698/*
1727 * Set font style 1699 * Set font style
1728 */ 1700 */
1729void 1701void
1730rxvt_term::set_font_style () 1702rxvt_term::set_font_style () NOTHROW
1731{ 1703{
1704#if 0
1732 switch (charsets[screen.charset]) 1705 switch (charsets [screen.charset])
1733 { 1706 {
1734 case '0': /* DEC Special Character & Line Drawing Set */ 1707 case '0': /* DEC Special Character & Line Drawing Set */
1735 break; 1708 break;
1736 case 'A': /* United Kingdom (UK) */ 1709 case 'A': /* United Kingdom (UK) */
1737 break; 1710 break;
… …
1744 case 'C': /* Finnish character set */ 1717 case 'C': /* Finnish character set */
1745 break; 1718 break;
1746 case 'K': /* German character set */ 1719 case 'K': /* German character set */
1747 break; 1720 break;
1748 } 1721 }
1722#endif
1749} 1723}
1750 1724
1751/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1752/* 1726/*
1753 * Choose a font 1727 * Choose a font
… …
1755 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1729 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1756 * XTERM_SEQ: Invoke G2 character set: ESC N 1730 * XTERM_SEQ: Invoke G2 character set: ESC N
1757 * XTERM_SEQ: Invoke G3 character set: ESC O 1731 * XTERM_SEQ: Invoke G3 character set: ESC O
1758 */ 1732 */
1759void 1733void
1760rxvt_term::scr_charset_choose (int set) 1734rxvt_term::scr_charset_choose (int set) NOTHROW
1761{ 1735{
1762 screen.charset = set; 1736 screen.charset = set;
1763 set_font_style (); 1737 set_font_style ();
1764} 1738}
1765 1739
… …
1771 * XTERM_SEQ: Set G2 character set: ESC * <C> 1745 * XTERM_SEQ: Set G2 character set: ESC * <C>
1772 * XTERM_SEQ: Set G3 character set: ESC + <C> 1746 * XTERM_SEQ: Set G3 character set: ESC + <C>
1773 * See set_font_style for possible values for <C> 1747 * See set_font_style for possible values for <C>
1774 */ 1748 */
1775void 1749void
1776rxvt_term::scr_charset_set (int set, unsigned int ch) 1750rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1777{ 1751{
1778 charsets[set] = (unsigned char)ch; 1752 charsets[set] = (unsigned char)ch;
1779 set_font_style (); 1753 set_font_style ();
1780} 1754}
1781 1755
… …
1786 1760
1787/* 1761/*
1788 * refresh matching text. 1762 * refresh matching text.
1789 */ 1763 */
1790bool 1764bool
1791rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1765rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1792{ 1766{
1793 bool found = false; 1767 bool found = false;
1794 1768
1795 for (int i = 0; i < TermWin.nrow; i++) 1769 for (int i = 0; i < nrow; i++)
1796 { 1770 {
1797 int col = 0;
1798 rend_t *drp = drawn_rend [i]; 1771 rend_t *drp = drawn_buf[i].r;
1799 1772
1800 for (; col < TermWin.ncol; col++, drp++) 1773 for (int col = 0; col < ncol; col++, drp++)
1801 if ((*drp & mask) == value) 1774 if ((*drp & mask) == value)
1802 { 1775 {
1803 found = true; 1776 found = true;
1804 *drp = ~value; 1777 *drp = ~value;
1805 } 1778 }
… …
1816 PART_END, 1789 PART_END,
1817 RC_COUNT 1790 RC_COUNT
1818}; 1791};
1819 1792
1820void 1793void
1821rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1794rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1822{ 1795{
1823 int i; 1796 int i;
1824 row_col_t rc[RC_COUNT]; 1797 row_col_t rc[RC_COUNT];
1825 1798
1826 if (drawn_text == NULL) /* sanity check */ 1799 if (!drawn_buf) /* sanity check */
1827 return; 1800 return;
1828 1801
1829#ifndef NO_SLOW_LINK_SUPPORT 1802#ifndef NO_SLOW_LINK_SUPPORT
1830 if (refresh_type == FAST_REFRESH && !display->is_local) 1803 if (refresh_type == FAST_REFRESH && !display->is_local)
1831 { 1804 {
1832 y = 0; 1805 y = 0;
1833 height = TermWin.height; 1806 eheight = height;
1834 } 1807 }
1835#endif
1836
1837#ifdef DEBUG_STRICT
1838 x = max (x, 0);
1839 x = min (x, (int)TermWin.width);
1840 y = max (y, 0);
1841 y = min (y, (int)TermWin.height);
1842#endif 1808#endif
1843 1809
1844 /* round down */ 1810 /* round down */
1845 rc[PART_BEG].col = Pixel2Col (x); 1811 rc[PART_BEG].col = Pixel2Col (x);
1846 rc[PART_BEG].row = Pixel2Row (y); 1812 rc[PART_BEG].row = Pixel2Row (y);
1847 /* round up */ 1813 /* round up */
1848 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1814 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1849 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1815 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1850 1816
1851 /* sanity checks */ 1817 /* sanity checks */
1852 for (i = PART_BEG; i < RC_COUNT; i++) 1818 for (i = PART_BEG; i < RC_COUNT; i++)
1853 { 1819 {
1854 MIN_IT (rc[i].col, TermWin.ncol - 1); 1820 min_it (rc[i].col, ncol - 1);
1855 MIN_IT (rc[i].row, TermWin.nrow - 1); 1821 min_it (rc[i].row, nrow - 1);
1856 } 1822 }
1857 1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1858 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1859 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1826
1827 num_scr_allow = 0;
1860 1828
1861 if (refresh) 1829 if (refresh)
1862 scr_refresh (SLOW_REFRESH); 1830 scr_refresh ();
1863} 1831}
1864 1832
1865/* ------------------------------------------------------------------------- */ 1833/* ------------------------------------------------------------------------- */
1866/* 1834/*
1867 * Refresh the entire screen 1835 * Refresh the entire screen
1868 */ 1836 */
1869void 1837void
1870rxvt_term::scr_touch (bool refresh) 1838rxvt_term::scr_touch (bool refresh) NOTHROW
1871{ 1839{
1872 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1840 scr_expose (0, 0, width, height, refresh);
1873} 1841}
1874 1842
1875/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1876/* 1844/*
1877 * Move the display so that the line represented by scrollbar value Y is at 1845 * Move the display so that the line represented by scrollbar value Y is at
1878 * the top of the screen 1846 * the top of the screen
1879 */ 1847 */
1880int 1848void
1881rxvt_term::scr_move_to (int y, int len) 1849rxvt_term::scr_move_to (int y, int len) NOTHROW
1882{ 1850{
1883 long p = 0; 1851 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1884 unsigned int oldviewstart;
1885
1886 oldviewstart = TermWin.view_start;
1887
1888 if (y < len)
1889 {
1890 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1891 p -= (long) (TermWin.nrow - 1);
1892 p = max (p, 0);
1893 }
1894
1895 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1896
1897 return scr_changeview (oldviewstart);
1898} 1852}
1899 1853
1900/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1901/* 1855/*
1902 * Page the screen up/down nlines 1856 * Page the screen up/down nlines
1903 * direction should be UP or DN 1857 * direction should be UP or DN
1904 */ 1858 */
1905int 1859bool
1906rxvt_term::scr_page (enum page_dirn direction, int nlines) 1860rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1907{ 1861{
1908 int n; 1862 int new_view_start =
1909 unsigned int oldviewstart; 1863 direction == UP ? view_start - nlines
1864 : view_start + nlines;
1910 1865
1911 oldviewstart = TermWin.view_start;
1912
1913 if (direction == UP)
1914 {
1915 n = TermWin.view_start + nlines;
1916 TermWin.view_start = min (n, TermWin.nscrolled);
1917 }
1918 else
1919 {
1920 n = TermWin.view_start - nlines;
1921 TermWin.view_start = max (n, 0);
1922 }
1923
1924 return scr_changeview (oldviewstart); 1866 return scr_changeview (new_view_start);
1925} 1867}
1926 1868
1927int 1869bool
1928rxvt_term::scr_changeview (unsigned int oldviewstart) 1870rxvt_term::scr_changeview (int new_view_start) NOTHROW
1929{ 1871{
1872 clamp_it (new_view_start, top_row, 0);
1873
1930 if (TermWin.view_start != oldviewstart) 1874 if (new_view_start == view_start)
1931 { 1875 return false;
1876
1877 num_scr += new_view_start - view_start;
1878 view_start = new_view_start;
1932 want_refresh = 1; 1879 want_refresh = 1;
1933 num_scr -= (TermWin.view_start - oldviewstart);
1934 }
1935 1880
1936 return (int) (TermWin.view_start - oldviewstart); 1881 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1937}
1938 1882
1939/* ------------------------------------------------------------------------- */ 1883 return true;
1940void 1884}
1941rxvt_term::scr_bell () 1885
1942{
1943#ifndef NO_BELL 1886#ifndef NO_BELL
1887void
1888rxvt_term::bell_cb (ev::timer &w, int revents)
1889{
1890 rvideo_bell = false;
1891 scr_rvideo_mode (rvideo_mode);
1892 refresh_check ();
1893}
1894#endif
1895
1896/* ------------------------------------------------------------------------- */
1897void
1898rxvt_term::scr_bell () NOTHROW
1899{
1900#ifndef NO_BELL
1901
1944# ifndef NO_MAPALERT 1902# ifndef NO_MAPALERT
1945# ifdef MAPALERT_OPTION 1903# ifdef MAPALERT_OPTION
1946 if (options & Opt_mapAlert) 1904 if (option (Opt_mapAlert))
1947# endif 1905# endif
1948 XMapWindow (display->display, TermWin.parent[0]); 1906 XMapWindow (dpy, parent[0]);
1949# endif 1907# endif
1908
1909# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell))
1911 set_urgency (1);
1912# endif
1913
1950 if (options & Opt_visualBell) 1914 if (option (Opt_visualBell))
1951 { 1915 {
1952 scr_rvideo_mode (!rvideo); /* refresh also done */ 1916 rvideo_bell = true;
1953 scr_rvideo_mode (!rvideo); /* refresh also done */ 1917 scr_rvideo_mode (rvideo_mode);
1918 flush ();
1919
1920 bell_ev.start (VISUAL_BELL_DURATION);
1954 } 1921 }
1955 else 1922 else
1956 XBell (display->display, 0); 1923 XBell (dpy, 0);
1957#endif 1924#endif
1958} 1925}
1959 1926
1960/* ------------------------------------------------------------------------- */ 1927/* ------------------------------------------------------------------------- */
1961/* ARGSUSED */ 1928/* ARGSUSED */
1962void 1929void
1963rxvt_term::scr_printscreen (int fullhist) 1930rxvt_term::scr_printscreen (int fullhist) NOTHROW
1964{ 1931{
1965#ifdef PRINTPIPE 1932#ifdef PRINTPIPE
1966 int i, r1, nrows, row_offset; 1933 int nrows, row_start;
1967 FILE *fd; 1934 FILE *fd = popen_printer ();
1968 1935
1969 if ((fd = popen_printer ()) == NULL) 1936 if (!fd)
1970 return; 1937 return;
1971 1938
1972 nrows = TermWin.nrow;
1973 row_offset = TermWin.saveLines;
1974
1975 if (!fullhist) 1939 if (fullhist)
1976 row_offset -= TermWin.view_start; 1940 {
1941 nrows = nrow - top_row;
1942 row_start = top_row;
1943 }
1977 else 1944 else
1978 { 1945 {
1979 nrows += TermWin.nscrolled; 1946 nrows = nrow;
1980 row_offset -= TermWin.nscrolled; 1947 row_start = view_start;
1981 } 1948 }
1982 1949
1983 wctomb (0, 0); 1950 wctomb (0, 0);
1984 1951
1985 for (r1 = 0; r1 < nrows; r1++) 1952 for (int r1 = 0; r1 < nrows; r1++)
1986 { 1953 {
1987 text_t *tp = screen.text[r1 + row_offset]; 1954 text_t *tp = ROW(r1).t;
1988 int len = screen.tlen[r1 + row_offset]; 1955 int len = ROW(r1).l;
1989 1956
1990 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1957 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1991 { 1958 {
1992 char mb[MB_LEN_MAX]; 1959 char mb[MB_LEN_MAX];
1993 text_t t = *tp++; 1960 text_t t = *tp++;
1994 if (t == NOCHAR) 1961 if (t == NOCHAR)
1995 continue; 1962 continue;
… …
2016/* 1983/*
2017 * Refresh the screen 1984 * Refresh the screen
2018 * drawn_text/drawn_rend contain the screen information before the update. 1985 * drawn_text/drawn_rend contain the screen information before the update.
2019 * screen.text/screen.rend contain what the screen will change to. 1986 * screen.text/screen.rend contain what the screen will change to.
2020 */ 1987 */
2021
2022#define FONT_WIDTH(X, Y) \
2023 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2024#define FONT_RBEAR(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2026#define FONT_LBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2028#define IS_FONT_CHAR(X, Y) \
2029 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2030
2031void 1988void
2032rxvt_term::scr_refresh (unsigned char refresh_type) 1989rxvt_term::scr_refresh () NOTHROW
2033{ 1990{
2034 unsigned char must_clear, /* use draw_string not draw_image_string */ 1991 unsigned char have_bg,
2035 showcursor; /* show the cursor */ 1992 showcursor; /* show the cursor */
2036 int16_t col, row, /* column/row we're processing */ 1993 int16_t col, row, /* column/row we're processing */
2037 ocrow; /* old cursor row */ 1994 ocrow; /* old cursor row */
2038 int i, /* tmp */ 1995 int i; /* tmp */
2039 row_offset; /* basic offset in screen structure */
2040#ifndef NO_CURSORCOLOR 1996#ifndef NO_CURSORCOLOR
2041 rend_t cc1; /* store colours at cursor position (s) */ 1997 rend_t cc1; /* store colours at cursor position (s) */
2042#endif 1998#endif
2043 rend_t *crp; // cursor rendition pointer 1999 rend_t *crp; // cursor rendition pointer
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2044 2002
2045 want_refresh = 0; /* screen is current */ 2003 want_refresh = 0; /* screen is current */
2046 2004
2047 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2005 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2006 return;
2049 2007
2050 /* 2008 /*
2051 * A: set up vars 2009 * A: set up vars
2052 */ 2010 */
2053 must_clear = 0;
2054 refresh_count = 0; 2011 refresh_count = 0;
2055 2012
2056 row_offset = TermWin.saveLines - TermWin.view_start; 2013 have_bg = 0;
2057 2014#ifdef HAVE_BG_PIXMAP
2058#if XPM_BACKGROUND 2015 have_bg = bgPixmap.pixmap != None;
2059 must_clear |= (bgPixmap.pixmap != None);
2060#endif
2061#if TRANSPARENT
2062 must_clear |= ((options & Opt_transparent) && am_transparent);
2063#endif 2016#endif
2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2065 2018
2066 /* 2019 /*
2067 * B: reverse any characters which are selected 2020 * B: reverse any characters which are selected
… …
2071 /* 2024 /*
2072 * C: set the cursor character (s) 2025 * C: set the cursor character (s)
2073 */ 2026 */
2074 { 2027 {
2075 unsigned char setoldcursor; 2028 unsigned char setoldcursor;
2076 rend_t ccol1, /* Cursor colour */
2077 ccol2; /* Cursor colour2 */
2078 2029
2079 showcursor = (screen.flags & Screen_VisibleCursor); 2030 showcursor = (screen.flags & Screen_VisibleCursor);
2080#ifdef CURSOR_BLINK 2031#ifdef CURSOR_BLINK
2081 if (hidden_cursor) 2032 if (hidden_cursor)
2082 showcursor = 0; 2033 showcursor = 0;
… …
2084 2035
2085 if (showcursor) 2036 if (showcursor)
2086 { 2037 {
2087 int col = screen.cur.col; 2038 int col = screen.cur.col;
2088 2039
2089 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2040 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2041 col--;
2091 2042
2092 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2043 crp = &ROW(screen.cur.row).r[col];
2093 2044
2045#ifndef NO_CURSORCOLOR
2046 cc1 = *crp & (RS_fgMask | RS_bgMask);
2047 if (ISSET_PIXCOLOR (Color_cursor))
2048 ccol1 = Color_cursor;
2049 else
2050#endif
2051#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2052 ccol1 = fgcolor_of (rstyle);
2053#else
2054 ccol1 = Color_fg;
2055#endif
2056
2057#ifndef NO_CURSORCOLOR
2058 if (ISSET_PIXCOLOR (Color_cursor2))
2059 ccol2 = Color_cursor2;
2060 else
2061#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2063 ccol2 = bgcolor_of (rstyle);
2064#else
2065 ccol2 = Color_bg;
2066#endif
2067
2094 if (showcursor && TermWin.focus) 2068 if (showcursor && focus)
2095 { 2069 {
2070 if (option (Opt_cursorUnderline))
2096 *crp ^= RS_RVid; 2071 *crp ^= RS_Uline;
2097#ifndef NO_CURSORCOLOR
2098 cc1 = *crp & (RS_fgMask | RS_bgMask);
2099 if (ISSET_PIXCOLOR (Color_cursor))
2100 ccol1 = Color_cursor;
2101 else 2072 else
2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2103 ccol1 = GET_FGCOLOR (rstyle);
2104#else
2105 ccol1 = Color_fg;
2106#endif
2107 if (ISSET_PIXCOLOR (Color_cursor2))
2108 ccol2 = Color_cursor2;
2109 else 2073 {
2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2074 *crp ^= RS_RVid;
2111 ccol2 = GET_BGCOLOR (rstyle);
2112#else
2113 ccol2 = Color_bg;
2114#endif
2115 *crp = SET_FGCOLOR (*crp, ccol1); 2075 *crp = SET_FGCOLOR (*crp, ccol1);
2116 *crp = SET_BGCOLOR (*crp, ccol2); 2076 *crp = SET_BGCOLOR (*crp, ccol2);
2117#endif 2077 }
2118 } 2078 }
2119 } 2079 }
2120 2080
2121 /* make sure no outline cursor is left around */ 2081 /* make sure no outline cursor is left around */
2122 setoldcursor = 0; 2082 setoldcursor = 0;
2123 if (ocrow != -1) 2083 if (ocrow != -1)
2124 { 2084 {
2125 if (screen.cur.row + TermWin.view_start != ocrow 2085 if (screen.cur.row - view_start != ocrow
2126 || screen.cur.col != oldcursor.col) 2086 || screen.cur.col != oldcursor.col)
2127 { 2087 {
2128 if (ocrow < TermWin.nrow 2088 if (ocrow < nrow
2129 && oldcursor.col < TermWin.ncol) 2089 && oldcursor.col < ncol)
2130 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2090 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2131 2091
2132 if (TermWin.focus || !showcursor) 2092 if (focus || !showcursor)
2133 oldcursor.row = -1; 2093 oldcursor.row = -1;
2134 else 2094 else
2135 setoldcursor = 1; 2095 setoldcursor = 1;
2136 } 2096 }
2137 } 2097 }
2138 else if (!TermWin.focus) 2098 else if (!focus)
2139 setoldcursor = 1; 2099 setoldcursor = 1;
2140 2100
2141 if (setoldcursor) 2101 if (setoldcursor)
2142 { 2102 {
2143 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2103 if (screen.cur.row - view_start >= nrow)
2144 oldcursor.row = -1; 2104 oldcursor.row = -1;
2145 else 2105 else
2146 { 2106 {
2147 oldcursor.row = screen.cur.row + TermWin.view_start; 2107 oldcursor.row = screen.cur.row - view_start;
2148 oldcursor.col = screen.cur.col; 2108 oldcursor.col = screen.cur.col;
2149 } 2109 }
2150 } 2110 }
2151 } 2111 }
2152 2112
2113 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2153#if ENABLE_OVERLAY 2114#if ENABLE_OVERLAY
2154 scr_swap_overlay (); 2115 scr_swap_overlay ();
2155#endif 2116#endif
2156
2157 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2158 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2159 2117
2160#ifndef NO_SLOW_LINK_SUPPORT 2118#ifndef NO_SLOW_LINK_SUPPORT
2161 /* 2119 /*
2162 * D: CopyArea pass - very useful for slower links 2120 * D: CopyArea pass - very useful for slower links
2163 * This has been deliberately kept simple. 2121 * This has been deliberately kept simple.
2164 */ 2122 */
2165 i = num_scr;
2166 if (!display->is_local 2123 if (!display->is_local
2167 && refresh_type == FAST_REFRESH && num_scr_allow && i 2124 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2168 && abs (i) < TermWin.nrow && !must_clear) 2125 && abs (num_scr) < nrow && !have_bg)
2169 { 2126 {
2170 int16_t nits; 2127 int16_t nits;
2128 int i = num_scr;
2171 int j; 2129 int j;
2172 int len, wlen; 2130 int len, wlen;
2131 dLocal (int, num_scr);
2173 2132
2174 j = TermWin.nrow; 2133 j = nrow;
2175 wlen = len = -1; 2134 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2135 row = i > 0 ? 0 : j - 1;
2136
2177 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2137 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2178 { 2138 {
2179 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2139 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2180 { 2140 {
2181 text_t *stp = screen.text[row + row_offset]; 2141 line_t s = ROW(view_start + row);
2182 rend_t *srp = screen.rend[row + row_offset];
2183 text_t *dtp = drawn_text[row]; 2142 line_t d = drawn_buf[row];
2184 text_t *dtp2 = drawn_text[row + i]; 2143 line_t d2 = drawn_buf[row + i];
2185 rend_t *drp = drawn_rend[row];
2186 rend_t *drp2 = drawn_rend[row + i];
2187 2144
2188 for (nits = 0, col = TermWin.ncol; col--; ) 2145 for (nits = 0, col = ncol; col--; )
2189 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2146 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2190 nits--; 2147 nits--;
2191 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2148 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2192 nits++; 2149 nits++;
2193 2150
2194 if (nits > 8) /* XXX: arbitrary choice */ 2151 if (nits > 8) /* XXX: arbitrary choice */
2195 { 2152 {
2196 for (col = TermWin.ncol; col--; ) 2153 for (col = ncol; col--; )
2197 { 2154 {
2198 *dtp++ = *dtp2++; 2155 *d.t++ = *d2.t++;
2199 *drp++ = *drp2++; 2156 *d.r++ = *d2.r++;
2200 } 2157 }
2201 2158
2202 if (len == -1) 2159 if (len == -1)
2203 len = row; 2160 len = row;
2204 2161
2205 wlen = row; 2162 wlen = row;
2206 continue; 2163 continue;
2207 } 2164 }
2208 } 2165 }
2209 2166
2210 if (len != -1) 2167 if (len >= 0)
2211 { 2168 {
2212 /* also comes here at end if needed because of >= above */ 2169 /* also comes here at end if needed because of >= above */
2213 if (wlen < len) 2170 if (wlen < len)
2214 SWAP_IT (wlen, len, int); 2171 ::swap (wlen, len);
2215 2172
2216 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2173 XGCValues gcv;
2174
2175 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2176 XCopyArea (dpy, vt, vt,
2217 TermWin.gc, 0, Row2Pixel (len + i), 2177 gc, 0, Row2Pixel (len + i),
2218 (unsigned int)TermWin_TotalWidth (), 2178 (unsigned int)this->width,
2219 (unsigned int)Height2Pixel (wlen - len + 1), 2179 (unsigned int)Height2Pixel (wlen - len + 1),
2220 0, Row2Pixel (len)); 2180 0, Row2Pixel (len));
2181 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2182
2221 len = -1; 2183 len = -1;
2222 } 2184 }
2223 } 2185 }
2224 } 2186 }
2225#endif 2187#endif
2226 2188
2227 /* 2189 /*
2228 * E: main pass across every character 2190 * E: main pass across every character
2229 */ 2191 */
2230 for (row = 0; row < TermWin.nrow; row++) 2192 for (row = 0; row < nrow; row++)
2231 { 2193 {
2232 text_t *stp = screen.text[row + row_offset]; 2194 text_t *stp = ROW(view_start + row).t;
2233 rend_t *srp = screen.rend[row + row_offset]; 2195 rend_t *srp = ROW(view_start + row).r;
2234 text_t *dtp = drawn_text[row]; 2196 text_t *dtp = drawn_buf[row].t;
2235 rend_t *drp = drawn_rend[row]; 2197 rend_t *drp = drawn_buf[row].r;
2236 2198
2237 /* 2199 /*
2238 * E2: OK, now the real pass 2200 * E2: OK, now the real pass
2239 */ 2201 */
2240 int ypixel = (int)Row2Pixel (row); 2202 int ypixel = (int)Row2Pixel (row);
2241 2203
2242 for (col = 0; col < TermWin.ncol; col++) 2204 for (col = 0; col < ncol; col++)
2243 { 2205 {
2244 /* compare new text with old - if exactly the same then continue */ 2206 /* compare new text with old - if exactly the same then continue */
2245 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2207 if (stp[col] == dtp[col] /* Must match characters to skip. */
2246 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2208 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2247 || (stp[col] == ' ' /* space w/ no background change */ 2209 || (stp[col] == ' ' /* space w/ no background change */
… …
2249 continue; 2211 continue;
2250 2212
2251 // redraw one or more characters 2213 // redraw one or more characters
2252 2214
2253 // seek to the beginning of wide characters 2215 // seek to the beginning of wide characters
2254 while (stp[col] == NOCHAR && col > 0) 2216 while (expect_false (stp[col] == NOCHAR && col > 0))
2255 --col; 2217 --col;
2256 2218
2257 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2258 text_t *text = stp + col; 2220 text_t *text = stp + col;
2259 int count = 1; 2221 int count = 1;
… …
2261 dtp[col] = stp[col]; 2223 dtp[col] = stp[col];
2262 drp[col] = rend; 2224 drp[col] = rend;
2263 2225
2264 int xpixel = Col2Pixel (col); 2226 int xpixel = Col2Pixel (col);
2265 2227
2266 for (i = 0; ++col < TermWin.ncol; ) 2228 for (i = 0; ++col < ncol; )
2267 { 2229 {
2268 if (stp[col] == NOCHAR) 2230 if (stp[col] == NOCHAR)
2269 { 2231 {
2270 dtp[col] = stp[col]; 2232 dtp[col] = stp[col];
2271 drp[col] = rend; 2233 drp[col] = rend;
… …
2281 count++; 2243 count++;
2282 2244
2283 if (stp[col] != dtp[col] 2245 if (stp[col] != dtp[col]
2284 || !RS_SAME (srp[col], drp[col])) 2246 || !RS_SAME (srp[col], drp[col]))
2285 { 2247 {
2286 if (must_clear && (i++ > count / 2)) 2248 if (have_bg && (i++ > count / 2))
2287 break; 2249 break;
2288 2250
2289 dtp[col] = stp[col]; 2251 dtp[col] = stp[col];
2290 drp[col] = rend; 2252 drp[col] = rend;
2291 i = 0; 2253 i = 0;
2292 } 2254 }
2293 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2255 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2294 break; 2256 break;
2295 } 2257 }
2296 2258
2297 col--; /* went one too far. move back */ 2259 col--; /* went one too far. move back */
2298 count -= i; /* dump any matching trailing chars */ 2260 count -= i; /* dump any matching trailing chars */
2299 2261
2300 // sometimes we optimize away the trailing NOCHAR's, add them back 2262 // sometimes we optimize away the trailing NOCHAR's, add them back
2301 while (i && text[count] == NOCHAR) 2263 while (expect_false (i && text[count] == NOCHAR))
2302 count++, i--; 2264 count++, i--;
2303
2304#if ENABLE_STYLES
2305 // force redraw after "careful" characters to avoid pixel droppings
2306 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2307 drp[col + 1] = ~srp[col + 1];
2308
2309 // include previous careful character(s) if possible, looks nicer (best effort...)
2310 while (text > stp
2311 && srp[text - stp - 1] & RS_Careful
2312 && RS_SAME (rend, srp[text - stp - 1]))
2313 text--, count++, xpixel -= TermWin.fwidth;
2314#endif
2315 2265
2316 /* 2266 /*
2317 * Determine the attributes for the string 2267 * Determine the attributes for the string
2318 */ 2268 */
2319 int fore = GET_FGCOLOR (rend); // desired foreground 2269 int fore = fgcolor_of (rend); // desired foreground
2320 int back = GET_BGCOLOR (rend); // desired background 2270 int back = bgcolor_of (rend); // desired background
2321 2271
2322 // only do special processing if ana attributes are set, which is rare 2272 // only do special processing if any attributes are set, which is unlikely
2323 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2324 { 2274 {
2325 bool invert = rend & RS_RVid; 2275 bool invert = rend & RS_RVid;
2326 2276
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2277#ifndef NO_BOLD_UNDERLINE_REVERSE
2328 if (rend & RS_Bold
2329 && fore == Color_fg) 2278 if (rend & RS_Bold && fore == Color_fg)
2330 { 2279 {
2331 if (ISSET_PIXCOLOR (Color_BD)) 2280 if (ISSET_PIXCOLOR (Color_BD))
2332 fore = Color_BD; 2281 fore = Color_BD;
2333# if !ENABLE_STYLES 2282# if !ENABLE_STYLES
2334 else 2283 else
2335 invert = !invert; 2284 invert = !invert;
2336# endif 2285# endif
2337 } 2286 }
2338 2287
2339 if (rend & RS_Italic 2288 if (rend & RS_Italic && fore == Color_fg)
2340 && fore == Color_fg)
2341 { 2289 {
2342 if (ISSET_PIXCOLOR (Color_IT)) 2290 if (ISSET_PIXCOLOR (Color_IT))
2343 fore = Color_IT; 2291 fore = Color_IT;
2344# if !ENABLE_STYLES 2292# if !ENABLE_STYLES
2345 else 2293 else
2346 invert = !invert; 2294 invert = !invert;
2347# endif 2295# endif
2348 } 2296 }
2349 2297
2350 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2351 fore = Color_UL; 2299 fore = Color_UL;
2352#endif 2300#endif
2353 2301
2354 if (invert) 2302 if (invert)
2355 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2356 SWAP_IT (fore, back, int); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2357 2315
2358#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2359 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2360 back = Color_RV; 2319 back = Color_RV;
2320# endif
2321 if (fore == back)
2322 {
2323 fore = Color_bg;
2324 back = Color_fg;
2325 }
2361#endif 2326#endif
2362 } 2327 }
2363 2328
2364#ifdef TEXT_BLINK 2329#ifdef TEXT_BLINK
2365 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2366 { 2331 {
2367 if (!text_blink_ev.active) 2332 if (!text_blink_ev.is_active ())
2368 { 2333 {
2369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2334 text_blink_ev.again ();
2370 hidden_text = 0; 2335 hidden_text = 0;
2371 } 2336 }
2372 else if (hidden_text) 2337 else if (hidden_text)
2373 fore = back; 2338 fore = back;
2374 } 2339 }
2375#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2376 } 2359 }
2377 2360
2378 /* 2361 /*
2379 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2380 */ 2363 */
2381 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2382 2365
2383 if (back == fore) 2366 if (expect_true (have_bg && back == Color_bg))
2384 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2385 TermWin.fwidth * count, TermWin.fheight,
2386 back);
2387 else if (back == Color_bg)
2388 { 2367 {
2389 if (must_clear) 2368 // this is very ugly, maybe push it into ->draw?
2390 {
2391 CLEAR_CHARS (xpixel, ypixel, count);
2392 2369
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2371 if (text[i] != ' ')
2395 { 2372 {
2396 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2397 break; 2374 goto did_clear;
2398 }
2399 } 2375 }
2400 else 2376
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2378 did_clear: ;
2402 } 2379 }
2403 else 2380 else
2404 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2382
2406 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2407 { 2384 {
2408#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2411 else 2388 else
2412#endif 2389#endif
2413 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2414 2391
2415 XDrawLine (display->display, drawBuffer, TermWin.gc, 2392 XDrawLine (dpy, vt, gc,
2416 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2418 } 2395 }
2419 } /* for (col....) */ 2396 } /* for (col....) */
2420 } /* for (row....) */ 2397 } /* for (row....) */
2421 2398
2422#if ENABLE_OVERLAY 2399#if ENABLE_OVERLAY
2423 scr_swap_overlay (); 2400 scr_swap_overlay ();
2424#endif 2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425 2403
2426 /* 2404 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2405 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2406 */
2429 if (showcursor) 2407 if (showcursor)
2430 { 2408 {
2431 if (TermWin.focus) 2409 if (focus)
2410 {
2411 if (option (Opt_cursorUnderline))
2412 *crp ^= RS_Uline;
2413 else
2432 { 2414 {
2433 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2434#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
2435 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2417 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2436#endif 2418#endif
2419 }
2437 } 2420 }
2438 else if (oldcursor.row >= 0) 2421 else if (oldcursor.row >= 0)
2439 { 2422 {
2423 int cursorwidth = 1;
2424 int col = oldcursor.col;
2425
2426 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2427 col--;
2428
2429 while (col + cursorwidth < ncol
2430 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2431 cursorwidth++;
2432
2440#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2441 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2442 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2443#endif 2437#endif
2444 int cursorwidth = 1; 2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2445 while (oldcursor.col + cursorwidth < TermWin.ncol
2446 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2447 cursorwidth++;
2448 2439
2449 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2440 XDrawRectangle (dpy, vt, gc,
2450 Col2Pixel (oldcursor.col), 2441 Col2Pixel (col),
2451 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2452 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2453 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2454 } 2445 }
2455 } 2446 }
2456 2447
2457 /* 2448 /*
2458 * H: cleanup selection 2449 * H: cleanup selection
2459 */ 2450 */
2460 scr_reverse_selection (); 2451 scr_reverse_selection ();
2461 2452
2462 if (refresh_type & SMOOTH_REFRESH)
2463 XFlush (display->display);
2464
2465 num_scr = 0; 2453 num_scr = 0;
2466 num_scr_allow = 1; 2454 num_scr_allow = 1;
2467} 2455}
2468 2456
2469void 2457void
2470rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2458rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2471{ 2459{
2472 if (!rp || !tp) 2460 if (!l.t)
2473 return; 2461 return;
2474 2462
2475 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2463 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2464
2465 for (int i = ncol; i--; )
2476 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2466 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2477} 2467}
2478 2468
2479void 2469void
2480rxvt_term::scr_remap_chars () 2470rxvt_term::scr_remap_chars () NOTHROW
2481{ 2471{
2482 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2472 for (int i = total_rows; i--; )
2483 scr_remap_chars (screen.text[i], screen.rend[i]); 2473 scr_remap_chars (row_buf [i]);
2484 2474
2485 for (int i = TermWin.nrow; i--; ) 2475 for (int i = nrow; i--; )
2486 {
2487 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2488 scr_remap_chars (swap.text[i], swap.rend[i]);
2489 } 2476 {
2477 scr_remap_chars (drawn_buf [i]);
2478 scr_remap_chars (swap_buf [i]);
2479 }
2490} 2480}
2491 2481
2492void 2482void
2493rxvt_term::scr_recolour () 2483rxvt_term::scr_recolour () NOTHROW
2494{ 2484{
2495 if (1 2485#ifdef HAVE_BG_PIXMAP
2496#if TRANSPARENT 2486 bgPixmap.apply ();
2497 && !am_transparent 2487#else
2498#endif 2488
2499#if XPM_BACKGROUND
2500 && !bgPixmap.pixmap
2501#endif
2502 )
2503 {
2504 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2505 XClearWindow (display->display, TermWin.parent[0]); 2490 XClearWindow (dpy, parent[0]);
2506 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2507#if HAVE_SCROLLBARS 2492
2508 if (scrollBar.win) 2493 if (scrollBar.win)
2509 { 2494 {
2510 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2511 scrollBar.setIdle (); 2496 scrollBar.state = STATE_IDLE;
2512 scrollbar_show (0); 2497 scrollBar.show (0);
2513 }
2514#endif
2515 } 2498 }
2516 2499
2500#endif
2501
2502 /* bgPixmap.apply () does not do the following : */
2517 scr_clear (); 2503 scr_clear ();
2518 scr_touch (true); 2504 scr_touch (true);
2519 want_refresh = 1; 2505 want_refresh = 1;
2520} 2506}
2521 2507
2522/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2523void 2509void
2524rxvt_term::scr_clear (bool really) 2510rxvt_term::scr_clear (bool really) NOTHROW
2525{ 2511{
2526 if (!TermWin.mapped) 2512 if (!mapped)
2527 return; 2513 return;
2528 2514
2529 num_scr_allow = 0; 2515 num_scr_allow = 0;
2530 want_refresh = 1; 2516 want_refresh = 1;
2531 2517
2532#if TRANSPARENT 2518 if (really)
2533 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 XClearWindow (dpy, vt);
2520}
2521
2522void
2523rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2524{
2525 int view_end = view_start + nrow;
2526 int row, col;
2527
2528 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2529 {
2530 text_t *stp = ROW(row).t;
2531 rend_t *srp = ROW(row).r;
2532
2533 for (col = beg_col; col < end_col; col++)
2534 srp[col] ^= rstyle1;
2535
2536 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2537 srp[col] ^= rstyle2;
2538
2539 if (++col < end_col)
2540 srp[col] ^= rstyle2;
2534 { 2541 }
2535 int i; 2542}
2536 2543
2537 if (!(options & Opt_transparent_all)) 2544void
2545rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2546{
2547 int view_end = view_start + nrow;
2548 int row, col;
2549
2550 if (beg_row >= view_start)
2551 {
2552 col = beg_col;
2553 row = beg_row;
2554 }
2555 else
2556 {
2538 i = 0; 2557 col = 0;
2558 row = view_start;
2559 }
2560
2561 for (; row < min (end_row, view_end); row++, col = 0)
2562 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2563 srp[col] ^= rstyle;
2564
2565 if (row == end_row)
2566 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2567 srp[col] ^= rstyle;
2568}
2569
2570/* ------------------------------------------------------------------------- */
2571void
2572rxvt_term::scr_reverse_selection () NOTHROW
2573{
2574 if (selection.op
2575 && current_screen == selection.screen
2576 && selection.end.row >= view_start)
2577 {
2578#if !ENABLE_MINIMAL
2579 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline);
2539 else 2583 else
2540 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2541
2542 while (i--)
2543 if (TermWin.parent[i] != None)
2544 XClearWindow (display->display, TermWin.parent[i]);
2545 }
2546#endif 2584#endif
2547 2585 scr_xor_span (selection.beg.row, selection.beg.col,
2548 if (really) 2586 selection.end.row, selection.end.col,
2549 XClearWindow (display->display, TermWin.vt); 2587 RS_RVid);
2550}
2551
2552/* ------------------------------------------------------------------------- */
2553void
2554rxvt_term::scr_reverse_selection ()
2555{
2556 if (selection.op && current_screen == selection.screen)
2557 {
2558 int end_row = TermWin.saveLines - TermWin.view_start;
2559 int i = selection.beg.row + TermWin.saveLines;
2560 int col, row = selection.end.row + TermWin.saveLines;
2561 rend_t *srp;
2562
2563#if ENABLE_FRILLS
2564 if (selection.rect)
2565 {
2566 end_row += TermWin.nrow;
2567
2568 for (; i <= row && i <= end_row; i++)
2569 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2570 srp[col] ^= RS_RVid;
2571 }
2572 else
2573#endif
2574 {
2575 if (i >= end_row)
2576 col = selection.beg.col;
2577 else
2578 {
2579 col = 0;
2580 i = end_row;
2581 }
2582
2583 end_row += TermWin.nrow;
2584
2585 for (; i < row && i < end_row; i++, col = 0)
2586 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2587 srp[col] ^= RS_RVid;
2588
2589 if (i == row && i < end_row)
2590 for (srp = screen.rend[i]; col < selection.end.col; col++)
2591 srp[col] ^= RS_RVid;
2592 }
2593 } 2588 }
2594} 2589}
2595 2590
2596/* ------------------------------------------------------------------------- */ 2591/* ------------------------------------------------------------------------- */
2597/* 2592/*
2598 * Dump the whole scrollback and screen to the passed filedescriptor. The 2593 * Dump the whole scrollback and screen to the passed filedescriptor. The
2599 * invoking routine must close the fd. 2594 * invoking routine must close the fd.
2600 */ 2595 */
2601#if 0 2596#if 0
2602void 2597void
2603rxvt_term::scr_dump (int fd) 2598rxvt_term::scr_dump (int fd) NOTHROW
2604{ 2599{
2605 int row, wrote; 2600 int row, wrote;
2606 unsigned int width, towrite; 2601 unsigned int width, towrite;
2607 char r1[] = "\n"; 2602 char r1[] = "\n";
2608 2603
2609 for (row = TermWin.saveLines - TermWin.nscrolled; 2604 for (row = saveLines + top_row;
2610 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2605 row < saveLines + nrow - 1; row++)
2611 { 2606 {
2612 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2607 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : TermWin.ncol; 2608 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2609 for (towrite = width; towrite; towrite -= wrote)
2615 { 2610 {
2616 wrote = write (fd, & (screen.text[row][width - towrite]), 2611 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2617 towrite); 2612 towrite);
2618 if (wrote < 0) 2613 if (wrote < 0)
2619 return; /* XXX: death, no report */ 2614 return; /* XXX: death, no report */
2620 } 2615 }
2621 if (screen.tlen[row] >= 0) 2616 if (row_buf[row].l >= 0)
2622 if (write (fd, r1, 1) <= 0) 2617 if (write (fd, r1, 1) <= 0)
2623 return; /* XXX: death, no report */ 2618 return; /* XXX: death, no report */
2624 } 2619 }
2625} 2620}
2626#endif 2621#endif
2627 2622
2628/* ------------------------------------------------------------------------- * 2623/* ------------------------------------------------------------------------- *
2629 * CHARACTER SELECTION * 2624 * CHARACTER SELECTION *
2630 * ------------------------------------------------------------------------- */ 2625 * ------------------------------------------------------------------------- */
2631
2632/*
2633 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2634 */
2635void 2626void
2636rxvt_term::selection_check (int check_more) 2627rxvt_term::selection_check (int check_more) NOTHROW
2637{ 2628{
2638 row_col_t pos; 2629 row_col_t pos;
2639 2630
2640 if (!selection.op) 2631 if (!selection.op)
2641 return; 2632 return;
2642 2633
2643 pos.row = pos.col = 0; 2634 pos.row = pos.col = 0;
2644 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2635 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2645 || (selection.beg.row >= TermWin.nrow) 2636 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2646 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2637 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2647 || (selection.mark.row >= TermWin.nrow)
2648 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2649 || (selection.end.row >= TermWin.nrow)
2650 || (check_more == 1 2638 || (check_more == 1
2651 && current_screen == selection.screen 2639 && current_screen == selection.screen
2652 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2640 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2653 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2641 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2654 || (check_more == 2 2642 || (check_more == 2
… …
2656 && ROWCOL_IS_AFTER (selection.end, pos)) 2644 && ROWCOL_IS_AFTER (selection.end, pos))
2657 || (check_more == 3 2645 || (check_more == 3
2658 && ROWCOL_IS_AFTER (selection.end, pos)) 2646 && ROWCOL_IS_AFTER (selection.end, pos))
2659 || (check_more == 4 /* screen width change */ 2647 || (check_more == 4 /* screen width change */
2660 && (selection.beg.row != selection.end.row 2648 && (selection.beg.row != selection.end.row
2661 || selection.end.col > TermWin.ncol))) 2649 || selection.end.col > ncol)))
2662 CLEAR_SELECTION (); 2650 CLEAR_SELECTION ();
2663} 2651}
2664 2652
2665/* ------------------------------------------------------------------------- */ 2653/* ------------------------------------------------------------------------- */
2666/* 2654/*
2667 * Paste a selection direct to the command fd 2655 * Paste a selection direct to the command fd
2668 */ 2656 */
2669void 2657void
2670rxvt_term::paste (unsigned char *data, unsigned int len) 2658rxvt_term::paste (char *data, unsigned int len) NOTHROW
2671{ 2659{
2672 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2673 for (unsigned int i = 0; i < len; i++) 2661 for (unsigned int i = 0; i < len; i++)
2674 if (data[i] == C0_LF) 2662 if (data[i] == C0_LF)
2675 data[i] = C0_CR; 2663 data[i] = C0_CR;
2676 2664
2665 if (priv_modes & PrivMode_BracketPaste)
2666 tt_printf ("\e[200~");
2667
2677 tt_write (data, len); 2668 tt_write (data, len);
2669
2670 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~");
2678} 2672}
2679 2673
2680/* ------------------------------------------------------------------------- */ 2674/* ------------------------------------------------------------------------- */
2681/* 2675/*
2682 * Respond to a notification that a primary selection has been sent 2676 * Respond to a notification that a primary selection has been sent
2683 * EXT: SelectionNotify 2677 * EXT: SelectionNotify
2684 */ 2678 */
2685void 2679void
2686rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2680rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2687{ 2681{
2688 if (prop == None) /* check for failed XConvertSelection */ 2682 if (prop == None) /* check for failed XConvertSelection */
2689 { 2683 {
2690 if ((selection_type & Sel_CompoundText)) 2684 if ((selection_type & Sel_CompoundText))
2691 { 2685 {
… …
2711 } 2705 }
2712 2706
2713 unsigned long bytes_after; 2707 unsigned long bytes_after;
2714 XTextProperty ct; 2708 XTextProperty ct;
2715 2709
2716 if (XGetWindowProperty (display->display, win, prop, 2710 if (XGetWindowProperty (dpy, win, prop,
2717 0, PROP_SIZE / 4, 2711 0, PROP_SIZE / 4,
2718 delete_prop, AnyPropertyType, 2712 delete_prop, AnyPropertyType,
2719 &ct.encoding, &ct.format, 2713 &ct.encoding, &ct.format,
2720 &ct.nitems, &bytes_after, 2714 &ct.nitems, &bytes_after,
2721 &ct.value) != Success) 2715 &ct.value) != Success)
… …
2730 if (bytes_after) 2724 if (bytes_after)
2731 { 2725 {
2732 // fetch and append remaining data 2726 // fetch and append remaining data
2733 XTextProperty ct2; 2727 XTextProperty ct2;
2734 2728
2735 if (XGetWindowProperty (display->display, win, prop, 2729 if (XGetWindowProperty (dpy, win, prop,
2736 ct.nitems / 4, (bytes_after + 3) / 4, 2730 ct.nitems / 4, (bytes_after + 3) / 4,
2737 delete_prop, AnyPropertyType, 2731 delete_prop, AnyPropertyType,
2738 &ct2.encoding, &ct2.format, 2732 &ct2.encoding, &ct2.format,
2739 &ct2.nitems, &bytes_after, 2733 &ct2.nitems, &bytes_after,
2740 &ct2.value) != Success) 2734 &ct2.value) != Success)
… …
2753 2747
2754 if (ct.encoding == xa[XA_INCR]) 2748 if (ct.encoding == xa[XA_INCR])
2755 { 2749 {
2756 // INCR selection, start handshake 2750 // INCR selection, start handshake
2757 if (!delete_prop) 2751 if (!delete_prop)
2758 XDeleteProperty (display->display, win, prop); 2752 XDeleteProperty (dpy, win, prop);
2759 2753
2760 selection_wait = Sel_incr; 2754 selection_wait = Sel_incr;
2761 incr_buf_fill = 0; 2755 incr_buf_fill = 0;
2762 incr_ev.start (NOW + 10); 2756 incr_ev.start (10);
2763 2757
2764 goto bailout; 2758 goto bailout;
2765 } 2759 }
2766 2760
2767 if (ct.nitems == 0) 2761 if (ct.nitems == 0)
… …
2776 ct.nitems = incr_buf_fill; 2770 ct.nitems = incr_buf_fill;
2777 incr_buf = 0; 2771 incr_buf = 0;
2778 incr_buf_size = 0; 2772 incr_buf_size = 0;
2779 incr_ev.stop (); 2773 incr_ev.stop ();
2780 } 2774 }
2781 else 2775 else
2782 { 2776 {
2783 if (selection_wait == Sel_normal 2777 if (selection_wait == Sel_normal
2784 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2785 { 2779 {
2786 /* 2780 /*
… …
2793 goto bailout; 2787 goto bailout;
2794 } 2788 }
2795 } 2789 }
2796 else if (selection_wait == Sel_incr) 2790 else if (selection_wait == Sel_incr)
2797 { 2791 {
2798 incr_ev.start (NOW + 10); 2792 incr_ev.start (10);
2799 2793
2800 while (incr_buf_fill + ct.nitems > incr_buf_size) 2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2801 { 2795 {
2802 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2803 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2810 } 2804 }
2811 2805
2812 char **cl; 2806 char **cl;
2813 int cr; 2807 int cr;
2814 2808
2815#if ENABLE_FRILLS 2809#if !ENABLE_MINIMAL
2816 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2817 // so recode it manually 2811 // so recode it manually
2818 if (ct.encoding == xa[XA_UTF8_STRING]) 2812 if (ct.encoding == xa[XA_UTF8_STRING])
2819 { 2813 {
2820 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2821 char *s = rxvt_wcstombs (w); 2815 char *s = rxvt_wcstombs (w);
2822 free (w); 2816 free (w);
2823 // TODO: strlen == only the first element will be converted. well... 2817 // TODO: strlen == only the first element will be converted. well...
2824 paste ((unsigned char *)s, strlen (s)); 2818 paste (s, strlen (s));
2825 free (s); 2819 free (s);
2826 } 2820 }
2827 else 2821 else
2828#endif 2822#endif
2829 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2830 && cl) 2824 && cl)
2831 { 2825 {
2832 for (int i = 0; i < cr; i++) 2826 for (int i = 0; i < cr; i++)
2833 paste ((unsigned char *)cl[i], strlen (cl[i])); 2827 paste (cl[i], strlen (cl[i]));
2834 2828
2835 XFreeStringList (cl); 2829 XFreeStringList (cl);
2836 } 2830 }
2837 else 2831 else
2838 paste (ct.value, ct.nitems); // paste raw 2832 paste ((char *)ct.value, ct.nitems); // paste raw
2839 2833
2840bailout: 2834bailout:
2841 XFree (ct.value); 2835 XFree (ct.value);
2842 2836
2843 if (selection_wait == Sel_normal) 2837 if (selection_wait == Sel_normal)
2844 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2845} 2839}
2846 2840
2847void 2841void
2848rxvt_term::incr_cb (time_watcher &w) 2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2849{ 2843{
2850 selection_wait = Sel_none; 2844 selection_wait = Sel_none;
2851 2845
2852 incr_buf_size = 0; 2846 incr_buf_size = 0;
2853 free (incr_buf); 2847 free (incr_buf);
2854 2848
2855 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2849 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2856} 2850}
2857 2851
2858void 2852void
2859rxvt_term::selection_property (Window win, Atom prop) 2853rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2860{ 2854{
2861 if (prop == None || selection_wait != Sel_incr) 2855 if (prop == None || selection_wait != Sel_incr)
2862 return; 2856 return;
2863 2857
2864 selection_paste (win, prop, true); 2858 selection_paste (win, prop, true);
2865} 2859}
2866 2860
2867/* ------------------------------------------------------------------------- */ 2861/* ------------------------------------------------------------------------- */
2868/* 2862/*
2869 * Request the current selection: 2863 * Request the current selection:
2870 * Order: > internal selection if available 2864 * Order: > internal selection if available
2871 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2872 * > CUT_BUFFER0 2866 * > CUT_BUFFER0
2873 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2874 * will auto fallback to CUT_BUFFER0 2868 * will auto fallback to CUT_BUFFER0
2875 * EXT: button 2 release 2869 * EXT: button 2 release
2876 */ 2870 */
2877void 2871void
2878rxvt_term::selection_request (Time tm, int x, int y) 2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2879{ 2873{
2880 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2874 if (selection.text && selnum == Sel_Primary)
2881 return; /* outside window */ 2875 {
2882
2883 if (selection.text)
2884 { /* internal selection */ 2876 /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len); 2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste ((unsigned char *)str, strlen (str)); 2878 paste (str, strlen (str));
2887 free (str); 2879 free (str);
2888 return; 2880 return;
2889 } 2881 }
2890 else 2882 else
2891 { 2883 {
2892 int i;
2893
2894 selection_request_time = tm; 2884 selection_request_time = tm;
2895 selection_wait = Sel_normal; 2885 selection_wait = Sel_normal;
2896 2886
2897 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2898 {
2899#if X_HAVE_UTF8_STRING 2887#if X_HAVE_UTF8_STRING
2900 selection_type = Sel_UTF8String; 2888 selection_type = Sel_UTF8String;
2901 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2902 return; 2890 return;
2903#else 2891#else
2904 selection_type = Sel_CompoundText; 2892 selection_type = Sel_CompoundText;
2905 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2906 return; 2894 return;
2907#endif 2895#endif
2908 }
2909 } 2896 }
2910 2897
2911 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2912 selection_paste (display->root, XA_CUT_BUFFER0, false); 2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2913} 2900}
2914 2901
2915int 2902int
2916rxvt_term::selection_request_other (Atom target, int selnum) 2903rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2917{ 2904{
2918 Atom sel; 2905 Atom sel;
2919#ifdef DEBUG_SELECT
2920 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2921#endif
2922 2906
2923 selection_type |= selnum; 2907 selection_type |= selnum;
2924 2908
2925 if (selnum == Sel_Primary) 2909 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY; 2910 sel = XA_PRIMARY;
2927 else if (selnum == Sel_Secondary) 2911 else if (selnum == Sel_Secondary)
2928 sel = XA_SECONDARY; 2912 sel = XA_SECONDARY;
2929 else 2913 else
2930 sel = xa[XA_CLIPBOARD]; 2914 sel = xa[XA_CLIPBOARD];
2931 2915
2932 if (XGetSelectionOwner (display->display, sel) != None) 2916 if (XGetSelectionOwner (dpy, sel) != None)
2933 { 2917 {
2934 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935 TermWin.vt, selection_request_time); 2919 vt, selection_request_time);
2936 return 1; 2920 return 1;
2937 } 2921 }
2938 2922
2939 return 0; 2923 return 0;
2940} 2924}
… …
2943/* 2927/*
2944 * Clear all selected text 2928 * Clear all selected text
2945 * EXT: SelectionClear 2929 * EXT: SelectionClear
2946 */ 2930 */
2947void 2931void
2948rxvt_term::selection_clear () 2932rxvt_term::selection_clear () NOTHROW
2949{ 2933{
2950 want_refresh = 1; 2934 want_refresh = 1;
2951 free (selection.text); 2935 free (selection.text);
2952 selection.text = NULL; 2936 selection.text = NULL;
2953 selection.len = 0; 2937 selection.len = 0;
… …
2963 * EXT: button 1 or 3 release 2947 * EXT: button 1 or 3 release
2964 */ 2948 */
2965void 2949void
2966rxvt_term::selection_make (Time tm) 2950rxvt_term::selection_make (Time tm)
2967{ 2951{
2968 int i, col, end_col, row, end_row; 2952 int i;
2969 wchar_t *new_selection_text; 2953 wchar_t *new_selection_text;
2970 text_t *t; 2954 text_t *t;
2971 2955
2972 switch (selection.op) 2956 switch (selection.op)
2973 { 2957 {
… …
2986 selection.op = SELECTION_DONE; 2970 selection.op = SELECTION_DONE;
2987 2971
2988 if (selection.clicks == 4) 2972 if (selection.clicks == 4)
2989 return; /* nothing selected, go away */ 2973 return; /* nothing selected, go away */
2990 2974
2975 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2976 return;
2977
2991 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2978 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2992 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2993 2980
2994 col = selection.beg.col;
2995 row = selection.beg.row + TermWin.saveLines;
2996 end_row = selection.end.row + TermWin.saveLines;
2997 int ofs = 0; 2981 int ofs = 0;
2998 int extra = 0; 2982 int extra = 0;
2999 2983
2984 int col = selection.beg.col;
2985 int row = selection.beg.row;
2986
2987 int end_col;
2988
3000 for (; row <= end_row; row++, col = 0) 2989 for (; row <= selection.end.row; row++, col = 0)
3001 { 2990 {
3002 end_col = screen.tlen[row]; 2991#if !ENABLE_MINIMAL
3003
3004#if ENABLE_FRILLS
3005 if (selection.rect) 2992 if (selection.rect)
3006 { 2993 {
3007 col = selection.beg.col; 2994 col = selection.beg.col;
3008 end_col = TermWin.ncol + 1; 2995 end_col = ncol + 1;
2996 }
2997 else
2998#endif
2999 end_col = ROW(row).l;
3000
3001 col = max (col, 0);
3002
3003 if (row == selection.end.row
3004#if !ENABLE_MINIMAL
3005 || selection.rect
3006#endif
3009 } 3007 )
3010#endif
3011
3012 MAX_IT (col, 0);
3013
3014 if (end_col == -1)
3015 end_col = TermWin.ncol;
3016
3017 if (row == end_row || selection.rect)
3018 MIN_IT (end_col, selection.end.col); 3008 min_it (end_col, selection.end.col);
3019 3009
3020 t = &screen.text[row][col]; 3010 t = ROW(row).t + col;
3011
3021 for (; col < end_col; col++) 3012 for (; col < end_col; col++)
3022 { 3013 {
3023 if (*t == NOCHAR) 3014 if (*t == NOCHAR)
3024 t++; 3015 t++;
3025#if ENABLE_COMBINING 3016#if ENABLE_COMBINING
… …
3041#endif 3032#endif
3042 else 3033 else
3043 new_selection_text[ofs++] = *t++; 3034 new_selection_text[ofs++] = *t++;
3044 } 3035 }
3045 3036
3046 if (screen.tlen[row] != -1 && row != end_row) 3037#if !ENABLE_MINIMAL
3038 if (selection.rect)
3039 {
3040 while (ofs
3041 && new_selection_text[ofs - 1] != C0_LF
3042 && unicode::is_space (new_selection_text[ofs - 1]))
3043 --ofs;
3044
3047 new_selection_text[ofs++] = C0_LF; 3045 new_selection_text[ofs++] = C0_LF;
3046 }
3047 else
3048#endif
3049 if (!ROW(row).is_longer () && row != selection.end.row)
3050 new_selection_text[ofs++] = C0_LF;
3048 } 3051 }
3049 3052
3050 if (end_col != selection.end.col) 3053 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF; 3054 new_selection_text[ofs++] = C0_LF;
3052 3055
… …
3062 3065
3063 // we usually allocate much more than necessary, so realloc it smaller again 3066 // we usually allocate much more than necessary, so realloc it smaller again
3064 selection.len = ofs; 3067 selection.len = ofs;
3065 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3068 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3066 3069
3070 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3071 return;
3072
3073 selection_grab (tm);
3074}
3075
3076bool
3077rxvt_term::selection_grab (Time tm) NOTHROW
3078{
3079 selection_time = tm;
3080
3067 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3068 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3083 {
3069 display->set_selection_owner (this); 3084 display->set_selection_owner (this);
3085 return true;
3086 }
3070 else 3087 else
3071 rxvt_warn ("can't get primary selection, ignoring.\n"); 3088 {
3089 selection_clear ();
3090 return false;
3091 }
3072 3092
3073#if 0 3093#if 0
3074 XTextProperty ct; 3094 XTextProperty ct;
3075 3095
3076 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3096 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3077 { 3097 {
3078 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3098 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3079 XFree (ct.value); 3099 XFree (ct.value);
3080 } 3100 }
3081#endif 3101#endif
3082
3083 selection_time = tm;
3084} 3102}
3085 3103
3086/* ------------------------------------------------------------------------- */ 3104/* ------------------------------------------------------------------------- */
3087/* 3105/*
3088 * Mark or select text based upon number of clicks: 1, 2, or 3 3106 * Mark or select text based upon number of clicks: 1, 2, or 3
3089 * EXT: button 1 press 3107 * EXT: button 1 press
3090 */ 3108 */
3091void 3109void
3092rxvt_term::selection_click (int clicks, int x, int y) 3110rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3093{ 3111{
3094 clicks = ((clicks - 1) % 3) + 1; 3112 clicks = ((clicks - 1) % 3) + 1;
3095 selection.clicks = clicks; /* save clicks so extend will work */ 3113 selection.clicks = clicks; /* save clicks so extend will work */
3096 3114
3115 if (clicks == 2 && !selection.rect
3116 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3117 {
3118 MEvent.clicks = 1; // what a mess
3119 selection.screen = current_screen;
3120 selection.op = SELECTION_CONT;
3121 return;
3122 }
3123
3097 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3124 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3098 3125
3099 if (clicks == 2 || clicks == 3) 3126 if (clicks == 2 || clicks == 3)
3100 selection_extend_colrow (selection.mark.col, 3127 selection_extend_colrow (selection.mark.col,
3101 selection.mark.row + TermWin.view_start, 3128 selection.mark.row - view_start,
3102 0, /* button 3 */ 3129 0, /* button 3 */
3103 1, /* button press */ 3130 1, /* button press */
3104 0); /* click change */ 3131 0); /* click change */
3105} 3132}
3106 3133
3107/* ------------------------------------------------------------------------- */ 3134/* ------------------------------------------------------------------------- */
3108/* 3135/*
3109 * Mark a selection at the specified col/row 3136 * Mark a selection at the specified col/row
3110 */ 3137 */
3111void 3138void
3112rxvt_term::selection_start_colrow (int col, int row) 3139rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3113{ 3140{
3114 want_refresh = 1; 3141 want_refresh = 1;
3142
3143 selection.mark.row = row + view_start;
3115 selection.mark.col = col; 3144 selection.mark.col = col;
3116 selection.mark.row = row - TermWin.view_start;
3117 3145
3118 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3146 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3119 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3147 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3120 MAX_IT (selection.mark.col, 0);
3121 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3122 3148
3123 while (selection.mark.col > 0 3149 while (selection.mark.col > 0
3124 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3150 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3125 --selection.mark.col; 3151 --selection.mark.col;
3126 3152
3127 if (selection.op) 3153 if (selection.op)
3154 {
3128 { /* clear the old selection */ 3155 /* clear the old selection */
3129 selection.beg.row = selection.end.row = selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3130 selection.beg.col = selection.end.col = selection.mark.col; 3157 selection.beg.col = selection.end.col = selection.mark.col;
3131 } 3158 }
3132 3159
3133 selection.op = SELECTION_INIT; 3160 selection.op = SELECTION_INIT;
… …
3144#define DELIMIT_TEXT(x) \ 3171#define DELIMIT_TEXT(x) \
3145 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3172 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3146#define DELIMIT_REND(x) 1 3173#define DELIMIT_REND(x) 1
3147 3174
3148void 3175void
3149rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3176rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3150{ 3177{
3151 int col, row, dirnadd, tcol, trow, w1, w2; 3178 int col, row, dirnadd, tcol, trow, w1, w2;
3152 row_col_t bound; 3179 row_col_t bound;
3153 text_t *stp; 3180 text_t *stp;
3154 rend_t *srp; 3181 rend_t *srp;
3155 3182
3156 if (dirn == UP) 3183 if (dirn == UP)
3157 { 3184 {
3158 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3185 bound.row = top_row - 1;
3159 bound.col = 0; 3186 bound.col = 0;
3160 dirnadd = -1; 3187 dirnadd = -1;
3161 } 3188 }
3162 else 3189 else
3163 { 3190 {
3164 bound.row = TermWin.saveLines + TermWin.nrow; 3191 bound.row = nrow;
3165 bound.col = TermWin.ncol - 1; 3192 bound.col = ncol - 1;
3166 dirnadd = 1; 3193 dirnadd = 1;
3167 } 3194 }
3168 3195
3169 row = mark->row + TermWin.saveLines; 3196 row = mark->row;
3170 col = mark->col; 3197 col = max (mark->col, 0);
3171 MAX_IT (col, 0); 3198
3172 /* find the edge of a word */ 3199 /* find the edge of a word */
3173 stp = &screen.text[row][col]; 3200 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3174 w1 = DELIMIT_TEXT (*stp); 3201 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3175
3176 srp = &screen.rend[row][col];
3177 w2 = DELIMIT_REND (*srp);
3178 3202
3179 for (;;) 3203 for (;;)
3180 { 3204 {
3181 for (; col != bound.col; col += dirnadd) 3205 for (; col != bound.col; col += dirnadd)
3182 { 3206 {
… …
3192 break; 3216 break;
3193 } 3217 }
3194 3218
3195 if ((col == bound.col) && (row != bound.row)) 3219 if ((col == bound.col) && (row != bound.row))
3196 { 3220 {
3197 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3221 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3198 { 3222 {
3199 trow = row + dirnadd; 3223 trow = row + dirnadd;
3200 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3224 tcol = dirn == UP ? ncol - 1 : 0;
3201 3225
3202 if (screen.text[trow] == NULL) 3226 if (!ROW(trow).t)
3203 break; 3227 break;
3204 3228
3205 stp = & (screen.text[trow][tcol]); 3229 stp = ROW(trow).t + tcol;
3206 srp = & (screen.rend[trow][tcol]); 3230 srp = ROW(trow).r + tcol;
3207 3231
3208 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3232 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3209 break; 3233 break;
3210 3234
3211 row = trow; 3235 row = trow;
… …
3214 } 3238 }
3215 } 3239 }
3216 break; 3240 break;
3217 } 3241 }
3218 3242
3219Old_Word_Selection_You_Die:
3220 if (dirn == DN) 3243 if (dirn == DN)
3221 col++; /* put us on one past the end */ 3244 col++; /* put us on one past the end */
3222 3245
3223 /* Poke the values back in */ 3246 /* Poke the values back in */
3224 ret->row = row - TermWin.saveLines; 3247 ret->row = row;
3225 ret->col = col; 3248 ret->col = col;
3226} 3249}
3227 3250
3228/* ------------------------------------------------------------------------- */ 3251/* ------------------------------------------------------------------------- */
3229/* 3252/*
… …
3232 * flag == 0 ==> button 1 3255 * flag == 0 ==> button 1
3233 * flag == 1 ==> button 3 press 3256 * flag == 1 ==> button 3 press
3234 * flag == 2 ==> button 3 motion 3257 * flag == 2 ==> button 3 motion
3235 */ 3258 */
3236void 3259void
3237rxvt_term::selection_extend (int x, int y, int flag) 3260rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3238{ 3261{
3239 int col, row; 3262 int col = clamp (Pixel2Col (x), 0, ncol);
3240 3263 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3241 col = Pixel2Col (x);
3242 row = Pixel2Row (y);
3243 MAX_IT (row, 0);
3244 MIN_IT (row, (int)TermWin.nrow - 1);
3245 MAX_IT (col, 0);
3246 MIN_IT (col, (int)TermWin.ncol);
3247 3264
3248 /* 3265 /*
3249 * If we're selecting characters (single click) then we must check first 3266 * If we're selecting characters (single click) then we must check first
3250 * if we are at the same place as the original mark. If we are then 3267 * if we are at the same place as the original mark. If we are then
3251 * select nothing. Otherwise, if we're to the right of the mark, you have to 3268 * select nothing. Otherwise, if we're to the right of the mark, you have to
3252 * be _past_ a character for it to be selected. 3269 * be _past_ a character for it to be selected.
3253 */ 3270 */
3254 if (((selection.clicks % 3) == 1) && !flag 3271 if (((selection.clicks % 3) == 1) && !flag
3255 && (col == selection.mark.col 3272 && (col == selection.mark.col
3256 && (row == selection.mark.row + TermWin.view_start))) 3273 && (row == selection.mark.row - view_start)))
3257 { 3274 {
3258 /* select nothing */ 3275 /* select nothing */
3259 selection.beg.row = selection.end.row = 0; 3276 selection.beg.row = selection.end.row = 0;
3260 selection.beg.col = selection.end.col = 0; 3277 selection.beg.col = selection.end.col = 0;
3261 selection.clicks = 4; 3278 selection.clicks = 4;
… …
3274/* ------------------------------------------------------------------------- */ 3291/* ------------------------------------------------------------------------- */
3275/* 3292/*
3276 * Extend the selection to the specified col/row 3293 * Extend the selection to the specified col/row
3277 */ 3294 */
3278void 3295void
3279rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3296rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3280{ 3297{
3281 int16_t ncol = TermWin.ncol;
3282 int end_col;
3283 row_col_t pos; 3298 row_col_t pos;
3284 enum { 3299 enum {
3285 LEFT, RIGHT 3300 LEFT, RIGHT
3286 } closeto = RIGHT; 3301 } closeto = RIGHT;
3287 3302
… …
3318 selection.beg.col = selection.end.col = selection.mark.col; 3333 selection.beg.col = selection.end.col = selection.mark.col;
3319 selection.beg.row = selection.end.row = selection.mark.row; 3334 selection.beg.row = selection.end.row = selection.mark.row;
3320 } 3335 }
3321 3336
3322 pos.col = col; 3337 pos.col = col;
3323 pos.row = row; 3338 pos.row = view_start + row;
3324
3325 pos.row -= TermWin.view_start; /* adjust for scroll */
3326 3339
3327 /* 3340 /*
3328 * This is mainly xterm style selection with a couple of differences, mainly 3341 * This is mainly xterm style selection with a couple of differences, mainly
3329 * in the way button3 drag extension works. 3342 * in the way button3 drag extension works.
3330 * We're either doing: button1 drag; button3 press; or button3 drag 3343 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3336 * a point/word/line which is either the start or end of the selection 3349 * a point/word/line which is either the start or end of the selection
3337 * and it was decided by whichever point/word/line was `fixed' at the 3350 * and it was decided by whichever point/word/line was `fixed' at the
3338 * time of the most recent button3 press 3351 * time of the most recent button3 press
3339 */ 3352 */
3340 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
3354 {
3341 { /* button3 press */ 3355 /* button3 press */
3342 /* 3356 /*
3343 * first determine which edge of the selection we are closest to 3357 * first determine which edge of the selection we are closest to
3344 */ 3358 */
3345 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3359 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3346 || (!ROWCOL_IS_AFTER (pos, selection.end) 3360 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3364 selection.mark.row = selection.beg.row; 3378 selection.mark.row = selection.beg.row;
3365 selection.mark.col = selection.beg.col; 3379 selection.mark.col = selection.beg.col;
3366 } 3380 }
3367 } 3381 }
3368 else 3382 else
3383 {
3369 { /* button1 drag or button3 drag */ 3384 /* button1 drag or button3 drag */
3370 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3385 if (ROWCOL_IS_AFTER (selection.mark, pos))
3371 { 3386 {
3372 if (selection.mark.row == selection.end.row 3387 if (selection.mark.row == selection.end.row
3373 && selection.mark.col == selection.end.col 3388 && selection.mark.col == selection.end.col
3374 && clickchange 3389 && clickchange
… …
3389 } 3404 }
3390 } 3405 }
3391 3406
3392 if (selection.clicks == 1) 3407 if (selection.clicks == 1)
3393 { 3408 {
3394 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3409 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3395 3410 && !ROW(selection.beg.row).is_longer ()
3396 if (selection.beg.col > end_col 3411#if !ENABLE_MINIMAL
3397 && end_col != -1
3398#if ENABLE_FRILLS
3399 && !selection.rect 3412 && !selection.rect
3400#endif 3413#endif
3401 ) 3414 )
3402 selection.beg.col = ncol; 3415 selection.beg.col = ncol;
3403 3416
3404 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3405
3406 if ( 3417 if (
3407 selection.end.col > end_col 3418 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3408 && end_col != -1 3419 && !ROW(selection.end.row).is_longer ()
3409#if ENABLE_FRILLS 3420#if !ENABLE_MINIMAL
3410 && !selection.rect 3421 && !selection.rect
3411#endif 3422#endif
3412 ) 3423 )
3413 selection.end.col = ncol; 3424 selection.end.col = ncol;
3414 } 3425 }
… …
3421 selection_delimit_word (DN, &selection.end, &selection.end); 3432 selection_delimit_word (DN, &selection.end, &selection.end);
3422 } 3433 }
3423 else if (selection.clicks == 3) 3434 else if (selection.clicks == 3)
3424 { 3435 {
3425#if ENABLE_FRILLS 3436#if ENABLE_FRILLS
3426 if (options & Opt_tripleclickwords) 3437 if (option (Opt_tripleclickwords))
3427 { 3438 {
3428 int end_row;
3429
3430 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3431 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3432 3440
3433 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3441 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3434 { 3442 {
3435 end_col = screen.tlen[end_row + TermWin.saveLines]; 3443 if (!ROW(end_row).is_longer ())
3436
3437 if (end_col != -1)
3438 { 3444 {
3439 selection.end.row = end_row; 3445 selection.end.row = end_row;
3440 selection.end.col = end_col; 3446 selection.end.col = ROW(end_row).l;
3447# if !ENABLE_MINIMAL
3441 selection_remove_trailing_spaces (); 3448 selection_remove_trailing_spaces ();
3449# endif
3442 break; 3450 break;
3443 } 3451 }
3444 } 3452 }
3445 } 3453 }
3446 else 3454 else
… …
3451 3459
3452 selection.beg.col = 0; 3460 selection.beg.col = 0;
3453 selection.end.col = ncol; 3461 selection.end.col = ncol;
3454 3462
3455 // select a complete logical line 3463 // select a complete logical line
3456 while (selection.beg.row > -TermWin.saveLines 3464 while (selection.beg.row > -saveLines
3457 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) 3465 && ROW(selection.beg.row - 1).is_longer ())
3458 selection.beg.row--; 3466 selection.beg.row--;
3459 3467
3460 while (selection.end.row < TermWin.nrow 3468 while (selection.end.row < nrow
3461 && screen.tlen[selection.end.row + TermWin.saveLines] == -1) 3469 && ROW(selection.end.row).is_longer ())
3462 selection.end.row++; 3470 selection.end.row++;
3463 } 3471 }
3464 } 3472 }
3465 3473
3466 if (button3 && buttonpress) 3474 if (button3 && buttonpress)
3475 {
3467 { /* mark may need to be changed */ 3476 /* mark may need to be changed */
3468 if (closeto == LEFT) 3477 if (closeto == LEFT)
3469 { 3478 {
3470 selection.mark.row = selection.end.row; 3479 selection.mark.row = selection.end.row;
3471 selection.mark.col = selection.end.col - (selection.clicks == 2); 3480 selection.mark.col = selection.end.col - (selection.clicks == 2);
3472 } 3481 }
… …
3475 selection.mark.row = selection.beg.row; 3484 selection.mark.row = selection.beg.row;
3476 selection.mark.col = selection.beg.col; 3485 selection.mark.col = selection.beg.col;
3477 } 3486 }
3478 } 3487 }
3479 3488
3480#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3481 if (selection.rect && selection.beg.col > selection.end.col) 3490 if (selection.rect && selection.beg.col > selection.end.col)
3482 SWAP_IT (selection.beg.col, selection.end.col, int); 3491 ::swap (selection.beg.col, selection.end.col);
3483#endif 3492#endif
3484} 3493}
3485 3494
3486#if ENABLE_FRILLS 3495#if !ENABLE_MINIMAL
3487void 3496void
3488rxvt_term::selection_remove_trailing_spaces () 3497rxvt_term::selection_remove_trailing_spaces () NOTHROW
3489{ 3498{
3490 int32_t end_col, end_row; 3499 int32_t end_col, end_row;
3491 text_t *stp; 3500 text_t *stp;
3492 3501
3493 end_col = selection.end.col; 3502 end_col = selection.end.col;
3494 end_row = selection.end.row; 3503 end_row = selection.end.row;
3495 3504
3496 for ( ; end_row >= selection.beg.row; ) 3505 for (; end_row >= selection.beg.row; )
3497 { 3506 {
3498 stp = screen.text[end_row + TermWin.saveLines]; 3507 stp = ROW(end_row).t;
3499 3508
3500 while (--end_col >= 0) 3509 while (--end_col >= 0)
3501 { 3510 {
3502 if (stp[end_col] != ' ' 3511 if (stp[end_col] != NOCHAR
3503 && stp[end_col] != '\t' 3512 && !unicode::is_space (stp[end_col]))
3504 && stp[end_col] != NOCHAR)
3505 break; 3513 break;
3506 } 3514 }
3507 3515
3508 if (end_col >= 0 3516 if (end_col >= 0
3509 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3517 || !ROW(end_row - 1).is_longer ())
3510 { 3518 {
3511 selection.end.col = end_col + 1; 3519 selection.end.col = end_col + 1;
3512 selection.end.row = end_row; 3520 selection.end.row = end_row;
3513 break; 3521 break;
3514 } 3522 }
3515 3523
3516 end_row--; 3524 end_row--;
3517 end_col = TermWin.ncol; 3525 end_col = ncol;
3518 } 3526 }
3519 3527
3520 if (selection.mark.row > selection.end.row) 3528 if (selection.mark.row > selection.end.row)
3521 { 3529 {
3522 selection.mark.row = selection.end.row; 3530 selection.mark.row = selection.end.row;
… …
3532/* 3540/*
3533 * Double click on button 3 when already selected 3541 * Double click on button 3 when already selected
3534 * EXT: button 3 double click 3542 * EXT: button 3 double click
3535 */ 3543 */
3536void 3544void
3537rxvt_term::selection_rotate (int x, int y) 3545rxvt_term::selection_rotate (int x, int y) NOTHROW
3538{ 3546{
3539 selection.clicks = selection.clicks % 3 + 1; 3547 selection.clicks = selection.clicks % 3 + 1;
3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3548 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3541} 3549}
3542 3550
… …
3544/* 3552/*
3545 * Respond to a request for our current selection 3553 * Respond to a request for our current selection
3546 * EXT: SelectionRequest 3554 * EXT: SelectionRequest
3547 */ 3555 */
3548void 3556void
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3557rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3558{
3551 XSelectionEvent ev; 3559 XSelectionEvent ev;
3552 dDisp;
3553 3560
3554 ev.type = SelectionNotify; 3561 ev.type = SelectionNotify;
3555 ev.property = None; 3562 ev.property = None;
3556 ev.display = rq.display; 3563 ev.display = rq.display;
3557 ev.requestor = rq.requestor; 3564 ev.requestor = rq.requestor;
… …
3571 *target++ = xa[XA_COMPOUND_TEXT]; 3578 *target++ = xa[XA_COMPOUND_TEXT];
3572#if X_HAVE_UTF8_STRING 3579#if X_HAVE_UTF8_STRING
3573 *target++ = xa[XA_UTF8_STRING]; 3580 *target++ = xa[XA_UTF8_STRING];
3574#endif 3581#endif
3575 3582
3576 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3583 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3577 32, PropModeReplace, 3584 32, PropModeReplace,
3578 (unsigned char *)target_list, target - target_list); 3585 (unsigned char *)target_list, target - target_list);
3579 ev.property = rq.property; 3586 ev.property = rq.property;
3580 } 3587 }
3581#if TODO // TODO 3588#if TODO // TODO
… …
3584 /* TODO: Handle MULTIPLE */ 3591 /* TODO: Handle MULTIPLE */
3585 } 3592 }
3586#endif 3593#endif
3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3588 { 3595 {
3589 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3590 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3597 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3591 ev.property = rq.property; 3598 ev.property = rq.property;
3592 } 3599 }
3593 else if (rq.target == XA_STRING 3600 else if (rq.target == XA_STRING
3594 || rq.target == xa[XA_TEXT] 3601 || rq.target == xa[XA_TEXT]
… …
3618 style = enc_string; 3625 style = enc_string;
3619 else if (target == xa[XA_TEXT]) 3626 else if (target == xa[XA_TEXT])
3620 style = enc_text; 3627 style = enc_text;
3621 else if (target == xa[XA_COMPOUND_TEXT]) 3628 else if (target == xa[XA_COMPOUND_TEXT])
3622 style = enc_compound_text; 3629 style = enc_compound_text;
3623#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3624 else if (target == xa[XA_UTF8_STRING]) 3631 else if (target == xa[XA_UTF8_STRING])
3625 style = enc_utf8; 3632 style = enc_utf8;
3626#endif 3633#endif
3627 else 3634 else
3628 { 3635 {
… …
3639 { 3646 {
3640 cl = L""; 3647 cl = L"";
3641 selectlen = 0; 3648 selectlen = 0;
3642 } 3649 }
3643 3650
3644#if ENABLE_FRILLS 3651#if !ENABLE_MINIMAL
3645 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3652 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3646 // so recode it manually 3653 // so recode it manually
3647 if (style == enc_utf8) 3654 if (style == enc_utf8)
3648 { 3655 {
3649 freect = 1; 3656 freect = 1;
… …
3652 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3659 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3653 ct.nitems = strlen ((char *)ct.value); 3660 ct.nitems = strlen ((char *)ct.value);
3654 } 3661 }
3655 else 3662 else
3656#endif 3663#endif
3657 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3664 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3658 freect = 1; 3665 freect = 1;
3659 else 3666 else
3660 { 3667 {
3661 /* if we failed to convert then send it raw */ 3668 /* if we failed to convert then send it raw */
3662 ct.value = (unsigned char *)cl; 3669 ct.value = (unsigned char *)cl;
3663 ct.nitems = selectlen; 3670 ct.nitems = selectlen;
3664 ct.encoding = target; 3671 ct.encoding = target;
3665 } 3672 }
3666 3673
3667 XChangeProperty (disp, rq.requestor, rq.property, 3674 XChangeProperty (dpy, rq.requestor, rq.property,
3668 ct.encoding, 8, PropModeReplace, 3675 ct.encoding, 8, PropModeReplace,
3669 ct.value, (int)ct.nitems); 3676 ct.value, (int)ct.nitems);
3670 ev.property = rq.property; 3677 ev.property = rq.property;
3671 3678
3672 if (freect) 3679 if (freect)
3673 XFree (ct.value); 3680 XFree (ct.value);
3674 } 3681 }
3675 3682
3676 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3683 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3677}
3678
3679/* ------------------------------------------------------------------------- *
3680 * MOUSE ROUTINES *
3681 * ------------------------------------------------------------------------- */
3682
3683/*
3684 * return col/row values corresponding to x/y pixel values
3685 */
3686void
3687rxvt_term::pixel_position (int *x, int *y)
3688{
3689 *x = Pixel2Col (*x);
3690 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3691 *y = Pixel2Row (*y);
3692 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3693} 3684}
3694 3685
3695/* ------------------------------------------------------------------------- */ 3686/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3687#ifdef USE_XIM
3697void 3688void
3698rxvt_term::im_set_position (XPoint &pos) 3689rxvt_term::im_set_position (XPoint &pos) NOTHROW
3699{ 3690{
3700 XWindowAttributes xwa; 3691 XWindowAttributes xwa;
3701 3692
3702 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3693 XGetWindowAttributes (dpy, vt, &xwa);
3703 3694
3704 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3695 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3705 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3696 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3706} 3697}
3707#endif 3698#endif
3708 3699
3709#if ENABLE_OVERLAY 3700#if ENABLE_OVERLAY
3710void 3701void
3711rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3702rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3712{ 3703{
3713 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3704 if (nrow < 1 || ncol < 1)
3714 return; 3705 return;
3715 3706
3716 want_refresh = 1; 3707 want_refresh = 1;
3717 3708
3718 scr_overlay_off (); 3709 scr_overlay_off ();
3719 3710
3720 if (x < 0) x = TermWin.ncol - w; 3711 if (x < 0) x = ncol - w;
3721 if (y < 0) y = TermWin.nrow - h; 3712 if (y < 0) y = nrow - h;
3722 3713
3723 // make space for border 3714 // make space for border
3724 w += 2; MIN_IT (w, TermWin.ncol); 3715 w += 2; min_it (w, ncol);
3725 h += 2; MIN_IT (h, TermWin.nrow); 3716 h += 2; min_it (h, nrow);
3726 3717
3727 x -= 1; MAX_IT (x, 0); 3718 x -= 1; clamp_it (x, 0, ncol - w);
3728 y -= 1; MAX_IT (y, 0); 3719 y -= 1; clamp_it (y, 0, nrow - h);
3729
3730 MIN_IT (x, TermWin.ncol - w);
3731 MIN_IT (y, TermWin.nrow - h);
3732 3720
3733 ov_x = x; ov_y = y; 3721 ov_x = x; ov_y = y;
3734 ov_w = w; ov_h = h; 3722 ov_w = w; ov_h = h;
3735 3723
3736 ov_text = new text_t *[h]; 3724 ov_text = new text_t *[h];
… …
3764 *rp = r; 3752 *rp = r;
3765 } 3753 }
3766} 3754}
3767 3755
3768void 3756void
3769rxvt_term::scr_overlay_off () 3757rxvt_term::scr_overlay_off () NOTHROW
3770{ 3758{
3771 if (!ov_text) 3759 if (!ov_text)
3772 return; 3760 return;
3773 3761
3774 want_refresh = 1; 3762 want_refresh = 1;
… …
3782 delete [] ov_text; ov_text = 0; 3770 delete [] ov_text; ov_text = 0;
3783 delete [] ov_rend; ov_rend = 0; 3771 delete [] ov_rend; ov_rend = 0;
3784} 3772}
3785 3773
3786void 3774void
3787rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3788{ 3776{
3789 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3790 return; 3778 return;
3791 3779
3792 x++, y++; 3780 x++, y++;
… …
3794 ov_text[y][x] = text; 3782 ov_text[y][x] = text;
3795 ov_rend[y][x] = rend; 3783 ov_rend[y][x] = rend;
3796} 3784}
3797 3785
3798void 3786void
3799rxvt_term::scr_overlay_set (int x, int y, const char *s) 3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3800{ 3788{
3801 while (*s) 3789 while (*s)
3802 scr_overlay_set (x++, y, *s++); 3790 scr_overlay_set (x++, y, *s++);
3803} 3791}
3804 3792
3805void 3793void
3794rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3795{
3796 while (*s)
3797 {
3798 text_t t = *s++;
3799 int width = WCWIDTH (t);
3800
3801 while (width--)
3802 {
3803 scr_overlay_set (x++, y, t);
3804 t = NOCHAR;
3805 }
3806 }
3807}
3808
3809void
3806rxvt_term::scr_swap_overlay () 3810rxvt_term::scr_swap_overlay () NOTHROW
3807{ 3811{
3808 if (!ov_text) 3812 if (!ov_text)
3809 return; 3813 return;
3810 3814
3811 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3812
3813 // swap screen mem with overlay 3815 // swap screen mem with overlay
3814 for (int y = ov_h; y--; ) 3816 for (int y = ov_h; y--; )
3815 { 3817 {
3816 text_t *t1 = ov_text[y]; 3818 text_t *t1 = ov_text[y];
3817 rend_t *r1 = ov_rend[y]; 3819 rend_t *r1 = ov_rend[y];
3818 3820
3819 text_t *t2 = screen.text[y + row_offset] + ov_x; 3821 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3820 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3822 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3821 3823
3822 for (int x = ov_w; x--; ) 3824 for (int x = ov_w; x--; )
3823 { 3825 {
3824 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3826 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3825 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3827 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3827 } 3829 }
3828} 3830}
3829 3831
3830#endif 3832#endif
3831/* ------------------------------------------------------------------------- */ 3833/* ------------------------------------------------------------------------- */
3834

Diff Legend

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