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

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

Diff Legend

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