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.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.324 by root, Wed Nov 5 00:01:01 2008 UTC

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

Diff Legend

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