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