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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines