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

Diff Legend

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