ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC

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

Diff Legend

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