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

Diff Legend

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