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.215 by root, Sun Jan 8 06:35:23 2006 UTC

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

Diff Legend

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