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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.242 by root, Thu Jan 19 19:51:08 2006 UTC

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

Diff Legend

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