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

Diff Legend

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