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

Diff Legend

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