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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.239 by root, Thu Jan 19 17:14:46 2006 UTC

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

Diff Legend

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