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.182 by root, Wed Dec 21 10:35:47 2005 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

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

Diff Legend

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