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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.261 by root, Sat Feb 18 15:44:26 2006 UTC

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