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

Diff Legend

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