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.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.32 by pcg, Sun Feb 22 10:38:11 2004 UTC

… …
71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) <= (D))) 72 (((A) == (C)) && ((B) <= (D)))
73 73
74/* these must be row_col_t */ 74/* these must be row_col_t */
75#define ROWCOL_IS_AFTER(X, Y) \ 75#define ROWCOL_IS_AFTER(X, Y) \
76 ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) 76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
77#define ROWCOL_IS_BEFORE(X, Y) \ 77#define ROWCOL_IS_BEFORE(X, Y) \
78 ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IN_ROW_AFTER(X, Y) \ 79#define ROWCOL_IN_ROW_AFTER(X, Y) \
80 ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_BEFORE(X, Y) \
82 ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 92 */
93#define drawBuffer TermWin.vt 93#define drawBuffer TermWin.vt
94 94
95#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 96 if (TermWin.mapped) \
97 XClearArea (Xdisplay, drawBuffer, TermWin.int_bwidth, \ 97 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \
98 Row2Pixel(row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)TermWin.width, \
99 (unsigned int)Height2Pixel(num), False) 99 (unsigned int)Height2Pixel (num), False)
100 100
101#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 102 if (TermWin.mapped) \
103 XClearArea (Xdisplay, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel(num), \ 104 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel(1), False) 105 (unsigned int)Height2Pixel (1), False)
106 106
107#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
108 XFillRectangle (Xdisplay, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
109 TermWin.int_bwidth, Row2Pixel(row), \ 109 TermWin.int_bwidth, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 110 (unsigned int)TermWin.width, \
111 (unsigned int)Height2Pixel(num)) 111 (unsigned int)Height2Pixel (num))
112 112
113/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
… …
131/* Fill a full line with blanks - make sure it is allocated first */ 131/* Fill a full line with blanks - make sure it is allocated first */
132void 132void
133rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 133rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)
134{ 134{
135#ifdef DEBUG_STRICT 135#ifdef DEBUG_STRICT
136 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 136 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
137#endif 137#endif
138 if (tp[row] == NULL) 138 if (tp[row] == NULL)
139 { 139 {
140 tp[row] = (text_t *)talloc->alloc (); 140 tp[row] = (text_t *)talloc->alloc ();
141 rp[row] = (rend_t *)ralloc->alloc (); 141 rp[row] = (rend_t *)ralloc->alloc ();
… …
153 unsigned int ncol, nrow, total_rows, prev_total_rows; 153 unsigned int ncol, nrow, total_rows, prev_total_rows;
154 unsigned int p, q; 154 unsigned int p, q;
155 int k; 155 int k;
156 rend_t setrstyle; 156 rend_t setrstyle;
157 157
158 D_SCREEN((stderr, "rxvt_scr_reset()")); 158 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
159 159
160 TermWin.view_start = 0; 160 TermWin.view_start = 0;
161 num_scr = 0; 161 num_scr = 0;
162 162
163 if (TermWin.ncol == 0) 163 if (TermWin.ncol == 0)
… …
183 if (!talloc) 183 if (!talloc)
184 { 184 {
185 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 185 talloc = new rxvt_salloc (ncol * sizeof (text_t));
186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
187 } 187 }
188 188
189 if (prev_nrow == 0) 189 if (prev_nrow == 0)
190 { 190 {
191 /* 191 /*
192 * first time called so just malloc everything : don't rely on realloc 192 * 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 193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 194 */
195 screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 195 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
196 buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 196 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 197 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
198 swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 198 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
199 199
200 screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); 200 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
201 swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); 201 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
202 202
203 screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 203 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
204 buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 204 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
205 drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 205 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
206 swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 206 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
207 207
208 for (p = 0; p < nrow; p++) 208 for (p = 0; p < nrow; p++)
209 { 209 {
210 q = p + TermWin.saveLines; 210 q = p + TermWin.saveLines;
211 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 211 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 212 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 screen.tlen[q] = swap.tlen[p] = 0; 213 screen.tlen[q] = swap.tlen[p] = 0;
214 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
215 } 215 }
216 216
217 MEMSET(charsets, 'B', sizeof(charsets)); 217 MEMSET (charsets, 'B', sizeof (charsets));
218 TermWin.nscrolled = 0; /* no saved lines */ 218 TermWin.nscrolled = 0; /* no saved lines */
219 rstyle = DEFAULT_RSTYLE; 219 rstyle = DEFAULT_RSTYLE;
220 screen.flags = Screen_DefaultFlags; 220 screen.flags = Screen_DefaultFlags;
221 screen.cur.row = screen.cur.col = 0; 221 screen.cur.row = screen.cur.col = 0;
222 screen.charset = 0; 222 screen.charset = 0;
… …
321 screen.cur.row += k; 321 screen.cur.row += k;
322 screen.s_cur.row += k; 322 screen.s_cur.row += k;
323 TermWin.nscrolled -= k; 323 TermWin.nscrolled -= k;
324 } 324 }
325#ifdef DEBUG_STRICT 325#ifdef DEBUG_STRICT
326 assert(screen.cur.row < TermWin.nrow); 326 assert (screen.cur.row < TermWin.nrow);
327 assert(swap.cur.row < TermWin.nrow); 327 assert (swap.cur.row < TermWin.nrow);
328#else /* drive with your eyes closed */ 328#else /* drive with your eyes closed */
329 329
330 MIN_IT(screen.cur.row, nrow - 1); 330 MIN_IT (screen.cur.row, nrow - 1);
331 MIN_IT(swap.cur.row, nrow - 1); 331 MIN_IT (swap.cur.row, nrow - 1);
332#endif 332#endif
333 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 333 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
334 } 334 }
335 335
336 /* resize columns */ 336 /* resize columns */
337 if (ncol != prev_ncol) 337 if (ncol != prev_ncol)
338 { 338 {
339 int common = min (prev_ncol, ncol); 339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342 342
343 for (p = 0; p < total_rows; p++) 343 for (p = 0; p < total_rows; p++)
344 { 344 {
345 if (screen.text[p]) 345 if (screen.text[p])
346 { 346 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
349 349
350 MIN_IT(screen.tlen[p], (int16_t)ncol); 350 MIN_IT (screen.tlen[p], (int16_t)ncol);
351 351
352 if (ncol > prev_ncol) 352 if (ncol > prev_ncol)
353 scr_blank_line (&(screen.text[p][prev_ncol]), 353 scr_blank_line (& (screen.text[p][prev_ncol]),
354 &(screen.rend[p][prev_ncol]), 354 & (screen.rend[p][prev_ncol]),
355 ncol - prev_ncol, 355 ncol - prev_ncol,
356 setrstyle); 356 setrstyle);
357 } 357 }
358 } 358 }
359 359
… …
361 { 361 {
362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
364 364
365 if (ncol > prev_ncol) 365 if (ncol > prev_ncol)
366 scr_blank_line (&(drawn_text[p][prev_ncol]), 366 scr_blank_line (& (drawn_text[p][prev_ncol]),
367 &(drawn_rend[p][prev_ncol]), 367 & (drawn_rend[p][prev_ncol]),
368 ncol - prev_ncol, setrstyle); 368 ncol - prev_ncol, setrstyle);
369 369
370 if (swap.text[p]) 370 if (swap.text[p])
371 { 371 {
372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
374 374
375 MIN_IT(swap.tlen[p], (int16_t)ncol); 375 MIN_IT (swap.tlen[p], (int16_t)ncol);
376 376
377 if (ncol > prev_ncol) 377 if (ncol > prev_ncol)
378 scr_blank_line (&(swap.text[p][prev_ncol]), 378 scr_blank_line (& (swap.text[p][prev_ncol]),
379 &(swap.rend[p][prev_ncol]), 379 & (swap.rend[p][prev_ncol]),
380 ncol - prev_ncol, setrstyle); 380 ncol - prev_ncol, setrstyle);
381 } 381 }
382 382
383 } 383 }
384 384
… …
388 delete talloc; talloc = ta; 388 delete talloc; talloc = ta;
389 delete ralloc; ralloc = ra; 389 delete ralloc; ralloc = ra;
390 } 390 }
391 391
392 if (tabs) 392 if (tabs)
393 free(tabs); 393 free (tabs);
394 } 394 }
395 395
396 prev_nrow = nrow; 396 prev_nrow = nrow;
397 prev_ncol = ncol; 397 prev_ncol = ncol;
398 398
399 tabs = (char *)rxvt_malloc (ncol * sizeof(char)); 399 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
400 400
401 for (p = 0; p < ncol; p++) 401 for (p = 0; p < ncol; p++)
402 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 402 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
403 403
404 tt_winch (); 404 tt_winch ();
405} 405}
406 406
407void 407void
408rxvt_term::scr_reset_realloc() 408rxvt_term::scr_reset_realloc ()
409{ 409{
410 uint16_t total_rows, nrow; 410 uint16_t total_rows, nrow;
411 411
412 nrow = TermWin.nrow; 412 nrow = TermWin.nrow;
413 total_rows = nrow + TermWin.saveLines; 413 total_rows = nrow + TermWin.saveLines;
414 /* *INDENT-OFF* */ 414 /* *INDENT-OFF* */
415 screen.text = (text_t **)rxvt_realloc(screen.text, total_rows * sizeof(text_t *)); 415 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
416 buf_text = (text_t **)rxvt_realloc(buf_text , total_rows * sizeof(text_t *)); 416 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
417 drawn_text = (text_t **)rxvt_realloc(drawn_text , nrow * sizeof(text_t *)); 417 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
418 swap.text = (text_t **)rxvt_realloc(swap.text , nrow * sizeof(text_t *)); 418 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
419 419
420 screen.tlen = (int16_t *)rxvt_realloc(screen.tlen, total_rows * sizeof(int16_t)); 420 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
421 swap.tlen = (int16_t *)rxvt_realloc(swap.tlen , total_rows * sizeof(int16_t)); 421 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
422 422
423 screen.rend = (rend_t **)rxvt_realloc(screen.rend, total_rows * sizeof(rend_t *)); 423 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
424 buf_rend = (rend_t **)rxvt_realloc(buf_rend , total_rows * sizeof(rend_t *)); 424 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
425 drawn_rend = (rend_t **)rxvt_realloc(drawn_rend , nrow * sizeof(rend_t *)); 425 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
426 swap.rend = (rend_t **)rxvt_realloc(swap.rend , nrow * sizeof(rend_t *)); 426 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
427 /* *INDENT-ON* */ 427 /* *INDENT-ON* */
428} 428}
429 429
430/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
431/* 431/*
432 * Free everything. That way malloc debugging can find leakage. 432 * Free everything. That way malloc debugging can find leakage.
433 */ 433 */
434void 434void
435rxvt_term::scr_release() 435rxvt_term::scr_release ()
436{ 436{
437 uint16_t total_rows; 437 uint16_t total_rows;
438 int i; 438 int i;
439 439
440 total_rows = TermWin.nrow + TermWin.saveLines; 440 total_rows = TermWin.nrow + TermWin.saveLines;
… …
442#ifdef DEBUG_STRICT 442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++) 443 for (i = 0; i < total_rows; i++)
444 { 444 {
445 if (screen.text[i]) 445 if (screen.text[i])
446 /* then so is screen.rend[i] */ 446 /* then so is screen.rend[i] */
447 assert(screen.rend[i]); 447 assert (screen.rend[i]);
448 } 448 }
449#endif 449#endif
450 450
451 delete talloc; talloc = 0; 451 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 452 delete ralloc; ralloc = 0;
… …
477 * Hard reset 477 * Hard reset
478 */ 478 */
479void 479void
480rxvt_term::scr_poweron () 480rxvt_term::scr_poweron ()
481{ 481{
482 D_SCREEN((stderr, "rxvt_scr_poweron()")); 482 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
483 483
484 scr_release (); 484 scr_release ();
485 prev_nrow = prev_ncol = 0; 485 prev_nrow = prev_ncol = 0;
486 scr_reset (); 486 scr_reset ();
487 487
488 scr_clear (); 488 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 489 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 490}
494 491
495/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
501 * XTERM_SEQ: Restore cursor: ESC 8 498 * XTERM_SEQ: Restore cursor: ESC 8
502 */ 499 */
503void 500void
504rxvt_term::scr_cursor (int mode) 501rxvt_term::scr_cursor (int mode)
505{ 502{
506 screen_t *s; 503 screen_t *s;
507 504
508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
509 506
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 508 if (current_screen == SECONDARY)
512 s = &(swap); 509 s = & (swap);
513 else 510 else
514#endif 511#endif
515 s = &(screen); 512 s = & (screen);
516 switch (mode) { 513 switch (mode)
514 {
517 case SAVE: 515 case SAVE:
518 s->s_cur.row = s->cur.row; 516 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 517 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 518 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 519 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 520 s->s_charset_char = charsets[s->charset];
523 break; 521 break;
524 case RESTORE: 522 case RESTORE:
525 want_refresh = 1; 523 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 524 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 525 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 526 s->flags &= ~Screen_WrapNext;
529 rstyle = s->s_rstyle; 527 rstyle = s->s_rstyle;
530 s->charset = s->s_charset; 528 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 529 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 530 set_font_style ();
533 break; 531 break;
534 } 532 }
535/* boundary check in case screen size changed between SAVE and RESTORE */ 533 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT(s->cur.row, TermWin.nrow - 1); 534 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT(s->cur.col, TermWin.ncol - 1); 535 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 536#ifdef DEBUG_STRICT
539 assert(s->cur.row >= 0); 537 assert (s->cur.row >= 0);
540 assert(s->cur.col >= 0); 538 assert (s->cur.col >= 0);
541#else /* drive with your eyes closed */ 539#else /* drive with your eyes closed */
542 MAX_IT(s->cur.row, 0); 540 MAX_IT (s->cur.row, 0);
543 MAX_IT(s->cur.col, 0); 541 MAX_IT (s->cur.col, 0);
544#endif 542#endif
545} 543}
546 544
547/* ------------------------------------------------------------------------- */ 545/* ------------------------------------------------------------------------- */
548/* 546/*
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 550 */
553int 551int
554rxvt_term::scr_change_screen (int scrn) 552rxvt_term::scr_change_screen (int scrn)
555{ 553{
556 int i; 554 int i;
557#if NSCREENS 555#if NSCREENS
558 int offset; 556 int offset;
559#endif 557#endif
560 558
561 want_refresh = 1; 559 want_refresh = 1;
562 560
563 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564 562
565 TermWin.view_start = 0; 563 TermWin.view_start = 0;
566 564
567 if (current_screen == scrn) 565 if (current_screen == scrn)
568 return current_screen; 566 return current_screen;
569 567
570 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
571 569
572 SWAP_IT(current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 571#if NSCREENS
574 num_scr = 0; 572 num_scr = 0;
575 offset = TermWin.saveLines; 573 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) { 574 for (i = prev_nrow; i--;)
575 {
577 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *); 576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
578 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t); 577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
579 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *); 578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
580 } 579 }
581 SWAP_IT(screen.cur.row, swap.cur.row, int16_t); 580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
582 SWAP_IT(screen.cur.col, swap.cur.col, int16_t); 581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
583# ifdef DEBUG_STRICT 582# ifdef DEBUG_STRICT
584 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
585 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
586# else /* drive with your eyes closed */ 585# else /* drive with your eyes closed */
587 MAX_IT(screen.cur.row, 0); 586 MAX_IT (screen.cur.row, 0);
588 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1); 587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
589 MAX_IT(screen.cur.col, 0); 588 MAX_IT (screen.cur.col, 0);
590 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1); 589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
591# endif 590# endif
592 SWAP_IT(screen.charset, swap.charset, int16_t); 591 SWAP_IT (screen.charset, swap.charset, int16_t);
593 SWAP_IT(screen.flags, swap.flags, int); 592 SWAP_IT (screen.flags, swap.flags, int);
594 screen.flags |= Screen_VisibleCursor; 593 screen.flags |= Screen_VisibleCursor;
595 swap.flags |= Screen_VisibleCursor; 594 swap.flags |= Screen_VisibleCursor;
596
597# ifdef RXVT_GRAPHICS
598
599 if (Gr_Displayed ()) {
600 Gr_scroll (0);
601 Gr_ChangeScreen ();
602 }
603# endif
604#else 595#else
605# ifdef SCROLL_ON_NO_SECONDARY 596# ifdef SCROLL_ON_NO_SECONDARY
606# ifdef RXVT_GRAPHICS
607 if (Gr_Displayed ())
608 Gr_ClearScreen ();
609# endif
610 if (current_screen == PRIMARY 597 if (current_screen == PRIMARY)
611# ifdef RXVT_GRAPHICS
612 && !Gr_Displayed ()
613# endif
614 )
615 scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0); 598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
616# endif 599# endif
617#endif 600#endif
618 return scrn; 601 return scrn;
619} 602}
620 603
621/* ------------------------------------------------------------------------- */ 604/* ------------------------------------------------------------------------- */
622/* 605/*
623 * Change the colour for following text 606 * Change the colour for following text
624 */ 607 */
625void 608void
626rxvt_term::scr_color (unsigned int color, int fgbg) 609rxvt_term::scr_color (unsigned int color, int fgbg)
627{ 610{
628 color &= RS_fgMask; 611 color &= RS_fgMask;
629 if (fgbg == Color_fg) 612 if (fgbg == Color_fg)
630 rstyle = SET_FGCOLOR(rstyle, color); 613 rstyle = SET_FGCOLOR (rstyle, color);
631 else 614 else
632 rstyle = SET_BGCOLOR(rstyle, color); 615 rstyle = SET_BGCOLOR (rstyle, color);
633} 616}
634 617
635/* ------------------------------------------------------------------------- */ 618/* ------------------------------------------------------------------------- */
636/* 619/*
637 * Change the rendition style for following text 620 * Change the rendition style for following text
638 */ 621 */
639void 622void
640rxvt_term::scr_rendition (int set, int style) 623rxvt_term::scr_rendition (int set, int style)
641{ 624 {
642 if (set) 625 if (set)
643 rstyle |= style; 626 rstyle |= style;
644 else if (style == ~RS_None) 627 else if (style == ~RS_None)
645 rstyle = DEFAULT_RSTYLE; 628 rstyle = DEFAULT_RSTYLE;
646 else 629 else
647 rstyle &= ~style; 630 rstyle &= ~style;
648} 631 }
649 632
650/* ------------------------------------------------------------------------- */ 633/* ------------------------------------------------------------------------- */
651/* 634/*
652 * Scroll text between <row1> and <row2> inclusive, by <count> lines 635 * Scroll text between <row1> and <row2> inclusive, by <count> lines
653 * count positive ==> scroll up 636 * count positive ==> scroll up
… …
662 645
663 if (count == 0 || (row1 > row2)) 646 if (count == 0 || (row1 > row2))
664 return 0; 647 return 0;
665 648
666 want_refresh = 1; 649 want_refresh = 1;
667 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 650 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
668 651
669 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY))
670 { 653 {
671 nscrolled = (long)TermWin.nscrolled + (long)count; 654 nscrolled = (long)TermWin.nscrolled + (long)count;
672 655
… …
715 698
716 if (count < 0) 699 if (count < 0)
717 count = -count; 700 count = -count;
718 701
719 i = row2 - row1 + 1; 702 i = row2 - row1 + 1;
720 MIN_IT(count, i); 703 MIN_IT (count, i);
721 704
722 if (j > 0) 705 if (j > 0)
723 { 706 {
724 /* A: scroll up */ 707 /* A: scroll up */
725 708
… …
769 if (!spec) /* line length may not equal TermWin.ncol */ 752 if (!spec) /* line length may not equal TermWin.ncol */
770 scr_blank_screen_mem (screen.text, screen.rend, 753 scr_blank_screen_mem (screen.text, screen.rend,
771 (unsigned int)j, rstyle); 754 (unsigned int)j, rstyle);
772 } 755 }
773 756
774#ifdef RXVT_GRAPHICS
775 if (Gr_Displayed ())
776 Gr_scroll (count);
777#endif
778
779 return count; 757 return count;
780} 758}
781 759
782/* ------------------------------------------------------------------------- */ 760/* ------------------------------------------------------------------------- */
783/* 761/*
784 * Add text given in <str> of length <len> to screen struct 762 * Add text given in <str> of length <len> to screen struct
785 */ 763 */
786void 764void
787rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
788{ 766{
789 unsigned char checksel, clearsel; 767 unsigned char checksel, clearsel;
790 uint32_t c; 768 uint32_t c;
791 int i, row, last_col; 769 int i, row, last_col;
792 text_t *stp; 770 text_t *stp;
793 rend_t *srp; 771 rend_t *srp;
794 772
795 if (len <= 0) /* sanity */ 773 if (len <= 0) /* sanity */
796 return; 774 return;
797 775
798 want_refresh = 1; 776 want_refresh = 1;
799 last_col = TermWin.ncol; 777 last_col = TermWin.ncol;
800 778
801 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 779 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
802 ZERO_SCROLLBACK(); 780 ZERO_SCROLLBACK ();
803 if (nlines > 0) { 781 if (nlines > 0)
782 {
804 nlines += (screen.cur.row - screen.bscroll); 783 nlines += (screen.cur.row - screen.bscroll);
805 if ((nlines > 0) 784 if ((nlines > 0)
806 && (screen.tscroll == 0) 785 && (screen.tscroll == 0)
807 && (screen.bscroll == (TermWin.nrow - 1))) { 786 && (screen.bscroll == (TermWin.nrow - 1)))
787 {
808 /* _at least_ this many lines need to be scrolled */ 788 /* _at least_ this many lines need to be scrolled */
809 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); 789 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
810 screen.cur.row -= nlines; 790 screen.cur.row -= nlines;
811 } 791 }
812 } 792 }
813#ifdef DEBUG_STRICT 793#ifdef DEBUG_STRICT
814 assert(screen.cur.col < last_col); 794 assert (screen.cur.col < last_col);
815 assert((screen.cur.row < TermWin.nrow) 795 assert ((screen.cur.row < TermWin.nrow)
816 && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); 796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
817#else /* drive with your eyes closed */ 797#else /* drive with your eyes closed */
818 MIN_IT(screen.cur.col, last_col - 1); 798 MIN_IT (screen.cur.col, last_col - 1);
819 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
820 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); 800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
821#endif 801#endif
822 row = screen.cur.row + TermWin.saveLines; 802 row = screen.cur.row + TermWin.saveLines;
823 803
824 checksel = (selection.op 804 checksel = (selection.op
825 && current_screen == selection.screen) ? 1 : 0; 805 && current_screen == selection.screen) ? 1 : 0;
826 clearsel = 0; 806 clearsel = 0;
827 807
828 stp = screen.text[row]; 808 stp = screen.text[row];
829 srp = screen.rend[row]; 809 srp = screen.rend[row];
830 810
831 for (i = 0; i < len;) { 811 for (i = 0; i < len;)
812 {
832 c = str[i++]; 813 c = str[i++];
833 switch (c) { 814 switch (c)
815 {
834 case '\t': 816 case '\t':
835 scr_tab (1); 817 scr_tab (1);
836 continue; 818 continue;
837 case '\n': 819 case '\n':
838 if (screen.tlen[row] != -1) /* XXX: think about this */ 820 if (screen.tlen[row] != -1) /* XXX: think about this */
839 MAX_IT(screen.tlen[row], screen.cur.col); 821 MAX_IT (screen.tlen[row], screen.cur.col);
840 screen.flags &= ~Screen_WrapNext; 822 screen.flags &= ~Screen_WrapNext;
841 if (screen.cur.row == screen.bscroll) 823 if (screen.cur.row == screen.bscroll)
842 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
843 else if (screen.cur.row < (TermWin.nrow - 1)) 825 else if (screen.cur.row < (TermWin.nrow - 1))
844 row = (++screen.cur.row) + TermWin.saveLines; 826 row = (++screen.cur.row) + TermWin.saveLines;
845 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
846 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
847 continue; 829 continue;
848 case '\r': 830 case '\r':
849 if (screen.tlen[row] != -1) /* XXX: think about this */ 831 if (screen.tlen[row] != -1) /* XXX: think about this */
850 MAX_IT(screen.tlen[row], screen.cur.col); 832 MAX_IT (screen.tlen[row], screen.cur.col);
851 screen.flags &= ~Screen_WrapNext; 833 screen.flags &= ~Screen_WrapNext;
852 screen.cur.col = 0; 834 screen.cur.col = 0;
853 continue; 835 continue;
854 default: 836 default:
855 if (c == 127) 837 if (c == 127)
856 continue; /* yummmm..... */ 838 continue; /* yummmm..... */
857 break; 839 break;
858 } 840 }
859 841
860 if (checksel /* see if we're writing within selection */ 842 if (checksel /* see if we're writing within selection */
861 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
862 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) { 844 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 {
863 checksel = 0; 846 checksel = 0;
864 clearsel = 1; 847 clearsel = 1;
865 } 848 }
866 if (screen.flags & Screen_WrapNext) { 849 if (screen.flags & Screen_WrapNext)
850 {
867 screen.tlen[row] = -1; 851 screen.tlen[row] = -1;
868 if (screen.cur.row == screen.bscroll) 852 if (screen.cur.row == screen.bscroll)
869 scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0); 853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
870 else if (screen.cur.row < (TermWin.nrow - 1)) 854 else if (screen.cur.row < (TermWin.nrow - 1))
871 row = (++screen.cur.row) + TermWin.saveLines; 855 row = (++screen.cur.row) + TermWin.saveLines;
872 stp = screen.text[row]; /* _must_ refresh */ 856 stp = screen.text[row]; /* _must_ refresh */
873 srp = screen.rend[row]; /* _must_ refresh */ 857 srp = screen.rend[row]; /* _must_ refresh */
874 screen.cur.col = 0; 858 screen.cur.col = 0;
875 screen.flags &= ~Screen_WrapNext; 859 screen.flags &= ~Screen_WrapNext;
876 } 860 }
877 if (screen.flags & Screen_Insert) 861 if (screen.flags & Screen_Insert)
878 scr_insdel_chars (1, INSERT); 862 scr_insdel_chars (1, INSERT);
879 863
880 if (charsets[screen.charset] == '0') // DEC SPECIAL 864 if (charsets[screen.charset] == '0') // DEC SPECIAL
881 switch (c) 865 switch (c)
882 { 866 {
883 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
884 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
885 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
886 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
887 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
888 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
889 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
890 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
891 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
892 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
893 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
894 } 878 }
895 879
896 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
897 // rely on wcwidth to tell us the character width, at least for non-ascii 881 // rely on wcwidth to tell us the character width, at least for non-ascii
898 int width = c <= 128 ? 1 : wcwidth (c); 882 int width = c <= 128 ? 1 : wcwidth (c);
899 883
900 // width -1 characters (e.g. combining chars) are ignored currently. 884 // width -1 characters (e.g. combining chars) are ignored currently.
901 if (width > 0) 885 if (width > 0)
902 do 886 do
903 { 887 {
904 stp[screen.cur.col] = c; 888 stp[screen.cur.col] = c;
905 srp[screen.cur.col] = rend; 889 srp[screen.cur.col] = rend;
906 890
907 if (screen.cur.col < last_col - 1) 891 if (screen.cur.col < last_col - 1)
908 screen.cur.col++; 892 screen.cur.col++;
909 else 893 else
910 { 894 {
911 screen.tlen[row] = last_col; 895 screen.tlen[row] = last_col;
912 if (screen.flags & Screen_Autowrap) 896 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 897 screen.flags |= Screen_WrapNext;
914 break; 898 break;
915 } 899 }
916 900
917 c = NOCHAR; 901 c = NOCHAR;
918 } 902 }
919 while (--width > 0); 903 while (--width > 0);
920 else 904 else
921 (void)0; /* handle combining character etc. here. */ 905 (void)0; /* handle combining character etc. here. */
922 } 906 }
923 907
924 if (screen.tlen[row] != -1) /* XXX: think about this */ 908 if (screen.tlen[row] != -1) /* XXX: think about this */
925 MAX_IT(screen.tlen[row], screen.cur.col); 909 MAX_IT (screen.tlen[row], screen.cur.col);
926 910
927/* 911 /*
928 * If we wrote anywhere in the selected area, kill the selection 912 * If we wrote anywhere in the selected area, kill the selection
929 * XXX: should we kill the mark too? Possibly, but maybe that 913 * XXX: should we kill the mark too? Possibly, but maybe that
930 * should be a similar check. 914 * should be a similar check.
931 */ 915 */
932 if (clearsel) 916 if (clearsel)
933 CLEAR_SELECTION(); 917 CLEAR_SELECTION ();
934 918
935#ifdef DEBUG_STRICT 919#ifdef DEBUG_STRICT
936 assert(screen.cur.row >= 0); 920 assert (screen.cur.row >= 0);
937#else /* drive with your eyes closed */ 921#else /* drive with your eyes closed */
938 MAX_IT(screen.cur.row, 0); 922 MAX_IT (screen.cur.row, 0);
939#endif 923#endif
940} 924}
941 925
942/* ------------------------------------------------------------------------- */ 926/* ------------------------------------------------------------------------- */
943/* 927/*
… …
945 * XTERM_SEQ: CTRL-H 929 * XTERM_SEQ: CTRL-H
946 */ 930 */
947void 931void
948rxvt_term::scr_backspace () 932rxvt_term::scr_backspace ()
949{ 933{
950 want_refresh = 1; 934 want_refresh = 1;
951 if (screen.cur.col == 0) { 935 if (screen.cur.col == 0)
936 {
952 if (screen.cur.row > 0) { 937 if (screen.cur.row > 0)
938 {
953#ifdef TERMCAP_HAS_BW 939#ifdef TERMCAP_HAS_BW
954 screen.cur.col = TermWin.ncol - 1; 940 screen.cur.col = TermWin.ncol - 1;
955 screen.cur.row--; 941 screen.cur.row--;
956 return; 942 return;
957#endif 943#endif
944
958 } 945 }
946 }
959 } else if ((screen.flags & Screen_WrapNext) == 0) 947 else if ((screen.flags & Screen_WrapNext) == 0)
960 scr_gotorc (0, -1, RELATIVE); 948 scr_gotorc (0, -1, RELATIVE);
961 screen.flags &= ~Screen_WrapNext; 949 screen.flags &= ~Screen_WrapNext;
962} 950}
963 951
964/* ------------------------------------------------------------------------- */ 952/* ------------------------------------------------------------------------- */
965/* 953/*
966 * Process Horizontal Tab 954 * Process Horizontal Tab
… …
968 * XTERM_SEQ: CTRL-I 956 * XTERM_SEQ: CTRL-I
969 */ 957 */
970void 958void
971rxvt_term::scr_tab (int count) 959rxvt_term::scr_tab (int count)
972{ 960{
973 int i, x; 961 int i, x;
974 962
975 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
976 want_refresh = 1; 964 want_refresh = 1;
977 i = x = screen.cur.col; 965 i = x = screen.cur.col;
978 if (count == 0) 966 if (count == 0)
979 return; 967 return;
980 else if (count > 0) { 968 else if (count > 0)
969 {
981 for (; ++i < TermWin.ncol; ) 970 for (; ++i < TermWin.ncol; )
982 if (tabs[i]) { 971 if (tabs[i])
972 {
983 x = i; 973 x = i;
984 if (!--count) 974 if (!--count)
985 break; 975 break;
986 } 976 }
987 if (count) 977 if (count)
988 x = TermWin.ncol - 1; 978 x = TermWin.ncol - 1;
979 }
989 } else /* if (count < 0) */ { 980 else /* if (count < 0) */
981 {
990 for (; --i >= 0; ) 982 for (; --i >= 0; )
991 if (tabs[i]) { 983 if (tabs[i])
992 x = i;
993 if (!++count)
994 break;
995 } 984 {
996 if (count)
997 x = 0; 985 x = i;
986 if (!++count)
987 break;
988 }
989 if (count)
990 x = 0;
998 } 991 }
999 if (x != screen.cur.col) 992 if (x != screen.cur.col)
1000 scr_gotorc (0, x, R_RELATIVE); 993 scr_gotorc (0, x, R_RELATIVE);
1001} 994}
1002 995
1003/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
1004/* 997/*
1005 * Process DEC Back Index 998 * Process DEC Back Index
… …
1009 */ 1002 */
1010#ifndef NO_FRILLS 1003#ifndef NO_FRILLS
1011void 1004void
1012rxvt_term::scr_backindex () 1005rxvt_term::scr_backindex ()
1013{ 1006{
1014 if (screen.cur.col > 0) 1007 if (screen.cur.col > 0)
1015 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1008 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1016 else { 1009 else
1010 {
1017 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1011 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1018 return; /* um, yeah? */ 1012 return; /* um, yeah? */
1019 scr_insdel_chars (1, INSERT); 1013 scr_insdel_chars (1, INSERT);
1020 } 1014 }
1021} 1015}
1022#endif 1016#endif
1023/* ------------------------------------------------------------------------- */ 1017/* ------------------------------------------------------------------------- */
1024/* 1018/*
… …
1029 */ 1023 */
1030#ifndef NO_FRILLS 1024#ifndef NO_FRILLS
1031void 1025void
1032rxvt_term::scr_forwardindex () 1026rxvt_term::scr_forwardindex ()
1033{ 1027{
1034 int row; 1028 int row;
1035 1029
1036 if (screen.cur.col < TermWin.ncol - 1) 1030 if (screen.cur.col < TermWin.ncol - 1)
1037 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1031 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1038 else { 1032 else
1033 {
1039 row = screen.cur.row + TermWin.saveLines; 1034 row = screen.cur.row + TermWin.saveLines;
1040 if (screen.tlen[row] == 0) 1035 if (screen.tlen[row] == 0)
1041 return; /* um, yeah? */ 1036 return; /* um, yeah? */
1042 else if (screen.tlen[row] == -1) 1037 else if (screen.tlen[row] == -1)
1043 screen.tlen[row] = TermWin.ncol; 1038 screen.tlen[row] = TermWin.ncol;
1044 scr_gotorc (0, 0, R_RELATIVE); 1039 scr_gotorc (0, 0, R_RELATIVE);
1045 scr_insdel_chars (1, DELETE); 1040 scr_insdel_chars (1, DELETE);
1046 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1041 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1047 } 1042 }
1048} 1043}
1049#endif 1044#endif
1050 1045
1051/* ------------------------------------------------------------------------- */ 1046/* ------------------------------------------------------------------------- */
… …
1053 * Goto Row/Column 1048 * Goto Row/Column
1054 */ 1049 */
1055void 1050void
1056rxvt_term::scr_gotorc (int row, int col, int relative) 1051rxvt_term::scr_gotorc (int row, int col, int relative)
1057{ 1052{
1058 want_refresh = 1; 1053 want_refresh = 1;
1059 ZERO_SCROLLBACK(); 1054 ZERO_SCROLLBACK ();
1060#ifdef RXVT_GRAPHICS
1061 if (Gr_Displayed ())
1062 Gr_scroll (0);
1063#endif
1064 1055
1065 D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1056 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1066 1057
1067 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1068 : col); 1059 : col);
1069 MAX_IT(screen.cur.col, 0); 1060 MAX_IT (screen.cur.col, 0);
1070 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); 1061 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1071 1062
1072 screen.flags &= ~Screen_WrapNext; 1063 screen.flags &= ~Screen_WrapNext;
1073 if (relative & R_RELATIVE) { 1064 if (relative & R_RELATIVE)
1065 {
1074 if (row > 0) { 1066 if (row > 0)
1067 {
1075 if (screen.cur.row <= screen.bscroll 1068 if (screen.cur.row <= screen.bscroll
1076 && (screen.cur.row + row) > screen.bscroll) 1069 && (screen.cur.row + row) > screen.bscroll)
1077 screen.cur.row = screen.bscroll; 1070 screen.cur.row = screen.bscroll;
1078 else 1071 else
1079 screen.cur.row += row;
1080 } else if (row < 0) {
1081 if (screen.cur.row >= screen.tscroll
1082 && (screen.cur.row + row) < screen.tscroll)
1083 screen.cur.row = screen.tscroll;
1084 else
1085 screen.cur.row += row;
1086 }
1087 } else {
1088 if (screen.flags & Screen_Relative) { /* relative origin mode */
1089 screen.cur.row = row + screen.tscroll;
1090 MIN_IT(screen.cur.row, screen.bscroll);
1091 } else
1092 screen.cur.row = row; 1072 screen.cur.row += row;
1073 }
1074 else if (row < 0)
1075 {
1076 if (screen.cur.row >= screen.tscroll
1077 && (screen.cur.row + row) < screen.tscroll)
1078 screen.cur.row = screen.tscroll;
1079 else
1080 screen.cur.row += row;
1081 }
1082 }
1083 else
1093 } 1084 {
1085 if (screen.flags & Screen_Relative)
1086 { /* relative origin mode */
1087 screen.cur.row = row + screen.tscroll;
1088 MIN_IT (screen.cur.row, screen.bscroll);
1089 }
1090 else
1091 screen.cur.row = row;
1092 }
1094 MAX_IT(screen.cur.row, 0); 1093 MAX_IT (screen.cur.row, 0);
1095 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1096} 1095}
1097 1096
1098/* ------------------------------------------------------------------------- */ 1097/* ------------------------------------------------------------------------- */
1099/* 1098/*
1100 * direction should be UP or DN 1099 * direction should be UP or DN
1101 */ 1100 */
1102void 1101void
1103rxvt_term::scr_index (enum page_dirn direction) 1102rxvt_term::scr_index (enum page_dirn direction)
1104{ 1103{
1105 int dirn; 1104 int dirn;
1106 1105
1107 want_refresh = 1; 1106 want_refresh = 1;
1108 dirn = ((direction == UP) ? 1 : -1); 1107 dirn = ((direction == UP) ? 1 : -1);
1109 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1110 1109
1111 ZERO_SCROLLBACK(); 1110 ZERO_SCROLLBACK ();
1112 1111
1113#ifdef RXVT_GRAPHICS
1114 if (Gr_Displayed ())
1115 Gr_scroll (0);
1116#endif
1117
1118 screen.flags &= ~Screen_WrapNext; 1112 screen.flags &= ~Screen_WrapNext;
1119 if ((screen.cur.row == screen.bscroll && direction == UP) 1113 if ((screen.cur.row == screen.bscroll && direction == UP)
1120 || (screen.cur.row == screen.tscroll && direction == DN)) 1114 || (screen.cur.row == screen.tscroll && direction == DN))
1121 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); 1115 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1122 else 1116 else
1123 screen.cur.row += dirn; 1117 screen.cur.row += dirn;
1124 MAX_IT(screen.cur.row, 0); 1118 MAX_IT (screen.cur.row, 0);
1125 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1119 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1126 selection_check (0); 1120 selection_check (0);
1127} 1121}
1128 1122
1129/* ------------------------------------------------------------------------- */ 1123/* ------------------------------------------------------------------------- */
1130/* 1124/*
1131 * Erase part or whole of a line 1125 * Erase part or whole of a line
… …
1137rxvt_term::scr_erase_line (int mode) 1131rxvt_term::scr_erase_line (int mode)
1138{ 1132{
1139 unsigned int row, col, num; 1133 unsigned int row, col, num;
1140 1134
1141 want_refresh = 1; 1135 want_refresh = 1;
1142 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row)); 1136 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1143 ZERO_SCROLLBACK (); 1137 ZERO_SCROLLBACK ();
1144
1145#ifdef RXVT_GRAPHICS
1146 if (Gr_Displayed ())
1147 Gr_scroll (0);
1148#endif
1149 1138
1150 selection_check (1); 1139 selection_check (1);
1151 1140
1152 screen.flags &= ~Screen_WrapNext; 1141 screen.flags &= ~Screen_WrapNext;
1153 1142
… …
1155 switch (mode) 1144 switch (mode)
1156 { 1145 {
1157 case 0: /* erase to end of line */ 1146 case 0: /* erase to end of line */
1158 col = screen.cur.col; 1147 col = screen.cur.col;
1159 num = TermWin.ncol - col; 1148 num = TermWin.ncol - col;
1160 MIN_IT(screen.tlen[row], (int16_t)col); 1149 MIN_IT (screen.tlen[row], (int16_t)col);
1161 if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) 1150 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1162 || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) 1151 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1163 CLEAR_SELECTION(); 1152 CLEAR_SELECTION ();
1164 break; 1153 break;
1165 case 1: /* erase to beginning of line */ 1154 case 1: /* erase to beginning of line */
1166 col = 0; 1155 col = 0;
1167 num = screen.cur.col + 1; 1156 num = screen.cur.col + 1;
1168 if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) 1157 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1169 || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) 1158 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1170 CLEAR_SELECTION(); 1159 CLEAR_SELECTION ();
1171 break; 1160 break;
1172 case 2: /* erase whole line */ 1161 case 2: /* erase whole line */
1173 col = 0; 1162 col = 0;
1174 num = TermWin.ncol; 1163 num = TermWin.ncol;
1175 screen.tlen[row] = 0; 1164 screen.tlen[row] = 0;
1176 if (selection.beg.row <= screen.cur.row 1165 if (selection.beg.row <= screen.cur.row
1177 && selection.end.row >= screen.cur.row) 1166 && selection.end.row >= screen.cur.row)
1178 CLEAR_SELECTION(); 1167 CLEAR_SELECTION ();
1179 break; 1168 break;
1180 default: 1169 default:
1181 return; 1170 return;
1182 } 1171 }
1183 1172
1184 if (screen.text[row]) 1173 if (screen.text[row])
1185 scr_blank_line (&(screen.text[row][col]), 1174 scr_blank_line (& (screen.text[row][col]),
1186 &(screen.rend[row][col]), num, rstyle); 1175 & (screen.rend[row][col]), num, rstyle);
1187 else 1176 else
1188 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1177 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1189} 1178}
1190 1179
1191/* ------------------------------------------------------------------------- */ 1180/* ------------------------------------------------------------------------- */
… …
1196 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1197 */ 1186 */
1198void 1187void
1199rxvt_term::scr_erase_screen (int mode) 1188rxvt_term::scr_erase_screen (int mode)
1200{ 1189{
1201 int num; 1190 int num;
1202 int32_t row, row_offset; 1191 int32_t row, row_offset;
1203 rend_t ren; 1192 rend_t ren;
1204 XGCValues gcvalue; 1193 XGCValues gcvalue;
1205 1194
1206 want_refresh = 1; 1195 want_refresh = 1;
1207 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); 1196 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1197 ZERO_SCROLLBACK ();
1209 row_offset = (int32_t)TermWin.saveLines; 1198 row_offset = (int32_t)TermWin.saveLines;
1210 1199
1211 switch (mode) { 1200 switch (mode)
1201 {
1212 case 0: /* erase to end of screen */ 1202 case 0: /* erase to end of screen */
1213 selection_check (1); 1203 selection_check (1);
1214 scr_erase_line (0); 1204 scr_erase_line (0);
1215 row = screen.cur.row + 1; /* possible OOB */ 1205 row = screen.cur.row + 1; /* possible OOB */
1216 num = TermWin.nrow - row; 1206 num = TermWin.nrow - row;
1217 break; 1207 break;
1218 case 1: /* erase to beginning of screen */ 1208 case 1: /* erase to beginning of screen */
1219 selection_check (3); 1209 selection_check (3);
1220 scr_erase_line (1); 1210 scr_erase_line (1);
1221 row = 0; 1211 row = 0;
1222 num = screen.cur.row; 1212 num = screen.cur.row;
1223 break; 1213 break;
1224 case 2: /* erase whole screen */ 1214 case 2: /* erase whole screen */
1225 selection_check (3); 1215 selection_check (3);
1226#ifdef RXVT_GRAPHICS
1227 Gr_ClearScreen ();
1228#endif
1229 row = 0; 1216 row = 0;
1230 num = TermWin.nrow; 1217 num = TermWin.nrow;
1231 break; 1218 break;
1232 default: 1219 default:
1233 return; 1220 return;
1234 } 1221 }
1235 refresh_type |= REFRESH_BOUNDS; 1222 refresh_type |= REFRESH_BOUNDS;
1236 if (selection.op && current_screen == selection.screen 1223 if (selection.op && current_screen == selection.screen
1237 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1224 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1238 || (selection.end.row >= row 1225 || (selection.end.row >= row
1239 && selection.end.row <= row + num))) 1226 && selection.end.row <= row + num)))
1240 CLEAR_SELECTION (); 1227 CLEAR_SELECTION ();
1241 if (row >= TermWin.nrow) /* Out Of Bounds */ 1228 if (row >= TermWin.nrow) /* Out Of Bounds */
1242 return; 1229 return;
1243 MIN_IT(num, (TermWin.nrow - row)); 1230 MIN_IT (num, (TermWin.nrow - row));
1244 if (rstyle & (RS_RVid | RS_Uline)) 1231 if (rstyle & (RS_RVid | RS_Uline))
1245 ren = (rend_t) ~RS_None; 1232 ren = (rend_t) ~RS_None;
1246 else if (GET_BASEBG(rstyle) == Color_bg) { 1233 else if (GET_BASEBG (rstyle) == Color_bg)
1234 {
1247 ren = DEFAULT_RSTYLE; 1235 ren = DEFAULT_RSTYLE;
1248 CLEAR_ROWS(row, num); 1236 CLEAR_ROWS (row, num);
1249 } else { 1237 }
1238 else
1239 {
1250 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1240 ren = (rstyle & (RS_fgMask | RS_bgMask));
1251 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1241 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)];
1252 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1253 ERASE_ROWS(row, num); 1243 ERASE_ROWS (row, num);
1254 gcvalue.foreground = PixColors[Color_fg]; 1244 gcvalue.foreground = PixColors[Color_fg];
1255 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1256 } 1246 }
1257 for (; num--; row++) { 1247 for (; num--; row++)
1248 {
1258 scr_blank_screen_mem (screen.text, screen.rend, 1249 scr_blank_screen_mem (screen.text, screen.rend,
1259 (unsigned int)(row + row_offset), rstyle); 1250 (unsigned int) (row + row_offset), rstyle);
1260 screen.tlen[row + row_offset] = 0; 1251 screen.tlen[row + row_offset] = 0;
1261 scr_blank_line (drawn_text[row], drawn_rend[row], 1252 scr_blank_line (drawn_text[row], drawn_rend[row],
1262 (unsigned int)TermWin.ncol, ren); 1253 (unsigned int)TermWin.ncol, ren);
1263 } 1254 }
1264} 1255}
1265 1256
1266/* ------------------------------------------------------------------------- */ 1257/* ------------------------------------------------------------------------- */
1267/* 1258/*
… …
1269 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1260 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1270 */ 1261 */
1271void 1262void
1272rxvt_term::scr_E () 1263rxvt_term::scr_E ()
1273{ 1264{
1274 int i, j, k; 1265 int i, j, k;
1275 rend_t *r1, fs; 1266 rend_t *r1, fs;
1276 1267
1277 want_refresh = 1; 1268 want_refresh = 1;
1278 num_scr_allow = 0; 1269 num_scr_allow = 0;
1279 ZERO_SCROLLBACK(); 1270 ZERO_SCROLLBACK ();
1280 selection_check (3); 1271 selection_check (3);
1281 1272
1282 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1273 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1283 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) { 1274 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1275 {
1284 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1276 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1285 fill_text (screen.text[k], 'E', TermWin.ncol); 1277 fill_text (screen.text[k], 'E', TermWin.ncol);
1286 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1278 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1287 *r1++ = fs; 1279 *r1++ = fs;
1288 } 1280 }
1289} 1281}
1290 1282
1291/* ------------------------------------------------------------------------- */ 1283/* ------------------------------------------------------------------------- */
1292/* 1284/*
1293 * Insert/Delete <count> lines 1285 * Insert/Delete <count> lines
1294 */ 1286 */
1295void 1287void
1296rxvt_term::scr_insdel_lines (int count, int insdel) 1288rxvt_term::scr_insdel_lines (int count, int insdel)
1297{ 1289{
1298 int end; 1290 int end;
1299 1291
1300 ZERO_SCROLLBACK(); 1292 ZERO_SCROLLBACK ();
1301 1293
1302#ifdef RXVT_GRAPHICS
1303 if (Gr_Displayed ())
1304 Gr_scroll (0);
1305#endif
1306
1307 selection_check (1); 1294 selection_check (1);
1308 1295
1309 if (screen.cur.row > screen.bscroll) 1296 if (screen.cur.row > screen.bscroll)
1297 return;
1298
1299 end = screen.bscroll - screen.cur.row + 1;
1300 if (count > end)
1301 {
1302 if (insdel == DELETE)
1310 return; 1303 return;
1311
1312 end = screen.bscroll - screen.cur.row + 1;
1313 if (count > end) {
1314 if (insdel == DELETE)
1315 return;
1316 else if (insdel == INSERT) 1304 else if (insdel == INSERT)
1317 count = end; 1305 count = end;
1318 } 1306 }
1319 screen.flags &= ~Screen_WrapNext; 1307 screen.flags &= ~Screen_WrapNext;
1320 1308
1321 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); 1309 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1322} 1310}
1323 1311
1324/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1325/* 1313/*
1326 * Insert/Delete <count> characters from the current position 1314 * Insert/Delete <count> characters from the current position
1327 */ 1315 */
1328void 1316void
1329rxvt_term::scr_insdel_chars (int count, int insdel) 1317rxvt_term::scr_insdel_chars (int count, int insdel)
1330{ 1318{
1331 int col, row; 1319 int col, row;
1332 rend_t tr; 1320 rend_t tr;
1333 text_t *stp; 1321 text_t *stp;
1334 rend_t *srp; 1322 rend_t *srp;
1335 int16_t *slp; 1323 int16_t *slp;
1336 1324
1337 want_refresh = 1; 1325 want_refresh = 1;
1338 ZERO_SCROLLBACK(); 1326 ZERO_SCROLLBACK ();
1339 1327
1340#ifdef RXVT_GRAPHICS
1341 if (Gr_Displayed ())
1342 Gr_scroll (0);
1343#endif
1344
1345 if (count <= 0) 1328 if (count <= 0)
1346 return; 1329 return;
1347 1330
1348 selection_check (1); 1331 selection_check (1);
1349 MIN_IT(count, (TermWin.ncol - screen.cur.col)); 1332 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1350 1333
1351 row = screen.cur.row + TermWin.saveLines; 1334 row = screen.cur.row + TermWin.saveLines;
1352 screen.flags &= ~Screen_WrapNext; 1335 screen.flags &= ~Screen_WrapNext;
1353 1336
1354 stp = screen.text[row]; 1337 stp = screen.text[row];
1355 srp = screen.rend[row]; 1338 srp = screen.rend[row];
1356 slp = &(screen.tlen[row]); 1339 slp = & (screen.tlen[row]);
1357 switch (insdel) { 1340 switch (insdel)
1341 {
1358 case INSERT: 1342 case INSERT:
1359 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1360 col--) { 1344 col--)
1345 {
1361 stp[col] = stp[col - count]; 1346 stp[col] = stp[col - count];
1362 srp[col] = srp[col - count]; 1347 srp[col] = srp[col - count];
1363 } 1348 }
1364 if (*slp != -1) { 1349 if (*slp != -1)
1350 {
1365 *slp += count; 1351 *slp += count;
1366 MIN_IT(*slp, TermWin.ncol); 1352 MIN_IT (*slp, TermWin.ncol);
1367 } 1353 }
1368 if (selection.op && current_screen == selection.screen 1354 if (selection.op && current_screen == selection.screen
1369 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 {
1370 if (selection.end.row != screen.cur.row 1357 if (selection.end.row != screen.cur.row
1371 || (selection.end.col + count >= TermWin.ncol)) 1358 || (selection.end.col + count >= TermWin.ncol))
1372 CLEAR_SELECTION(); 1359 CLEAR_SELECTION ();
1360 else
1373 else { /* shift selection */ 1361 { /* shift selection */
1374 selection.beg.col += count; 1362 selection.beg.col += count;
1375 selection.mark.col += count; /* XXX: yes? */ 1363 selection.mark.col += count; /* XXX: yes? */
1376 selection.end.col += count; 1364 selection.end.col += count;
1377 } 1365 }
1378 } 1366 }
1379 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1380 (unsigned int)count, rstyle); 1368 (unsigned int)count, rstyle);
1381 break; 1369 break;
1382 case ERASE: 1370 case ERASE:
1383 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1384 selection_check (1); 1372 selection_check (1);
1385 screen.cur.col -= count; 1373 screen.cur.col -= count;
1386 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1387 (unsigned int)count, rstyle); 1375 (unsigned int)count, rstyle);
1388 break; 1376 break;
1389 case DELETE: 1377 case DELETE:
1390 tr = srp[TermWin.ncol - 1] 1378 tr = srp[TermWin.ncol - 1]
1391 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1392 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) { 1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1381 {
1393 stp[col] = stp[col + count]; 1382 stp[col] = stp[col + count];
1394 srp[col] = srp[col + count]; 1383 srp[col] = srp[col + count];
1395 } 1384 }
1396 scr_blank_line (&(stp[TermWin.ncol - count]), 1385 scr_blank_line (& (stp[TermWin.ncol - count]),
1397 &(srp[TermWin.ncol - count]), 1386 & (srp[TermWin.ncol - count]),
1398 (unsigned int)count, tr); 1387 (unsigned int)count, tr);
1399 if (*slp == -1) /* break line continuation */ 1388 if (*slp == -1) /* break line continuation */
1400 *slp = TermWin.ncol; 1389 *slp = TermWin.ncol;
1401 *slp -= count; 1390 *slp -= count;
1402 MAX_IT(*slp, 0); 1391 MAX_IT (*slp, 0);
1403 if (selection.op && current_screen == selection.screen 1392 if (selection.op && current_screen == selection.screen
1404 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) { 1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 {
1405 if (selection.end.row != screen.cur.row 1395 if (selection.end.row != screen.cur.row
1406 || (screen.cur.col >= selection.beg.col - count) 1396 || (screen.cur.col >= selection.beg.col - count)
1407 || selection.end.col >= TermWin.ncol) 1397 || selection.end.col >= TermWin.ncol)
1408 CLEAR_SELECTION(); 1398 CLEAR_SELECTION ();
1409 else { 1399 else
1400 {
1410 /* shift selection */ 1401 /* shift selection */
1411 selection.beg.col -= count; 1402 selection.beg.col -= count;
1412 selection.mark.col -= count; /* XXX: yes? */ 1403 selection.mark.col -= count; /* XXX: yes? */
1413 selection.end.col -= count; 1404 selection.end.col -= count;
1414 } 1405 }
1415 } 1406 }
1416 break; 1407 break;
1417 } 1408 }
1418} 1409}
1419 1410
1420/* ------------------------------------------------------------------------- */ 1411/* ------------------------------------------------------------------------- */
… …
1423 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1414 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1424 */ 1415 */
1425void 1416void
1426rxvt_term::scr_scroll_region (int top, int bot) 1417rxvt_term::scr_scroll_region (int top, int bot)
1427{ 1418{
1428 MAX_IT(top, 0); 1419 MAX_IT (top, 0);
1429 MIN_IT(bot, (int)TermWin.nrow - 1); 1420 MIN_IT (bot, (int)TermWin.nrow - 1);
1430 if (top > bot) 1421 if (top > bot)
1431 return; 1422 return;
1432 screen.tscroll = top; 1423 screen.tscroll = top;
1433 screen.bscroll = bot; 1424 screen.bscroll = bot;
1434 scr_gotorc (0, 0, 0); 1425 scr_gotorc (0, 0, 0);
1435} 1426}
1436 1427
1437/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1438/* 1429/*
1439 * Make the cursor visible/invisible 1430 * Make the cursor visible/invisible
… …
1441 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1432 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1442 */ 1433 */
1443void 1434void
1444rxvt_term::scr_cursor_visible (int mode) 1435rxvt_term::scr_cursor_visible (int mode)
1445{ 1436{
1446 want_refresh = 1; 1437 want_refresh = 1;
1447 if (mode) 1438 if (mode)
1448 screen.flags |= Screen_VisibleCursor; 1439 screen.flags |= Screen_VisibleCursor;
1449 else 1440 else
1450 screen.flags &= ~Screen_VisibleCursor; 1441 screen.flags &= ~Screen_VisibleCursor;
1451} 1442}
1452 1443
1453/* ------------------------------------------------------------------------- */ 1444/* ------------------------------------------------------------------------- */
1454/* 1445/*
1455 * Set/unset automatic wrapping 1446 * Set/unset automatic wrapping
… …
1457 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1448 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1458 */ 1449 */
1459void 1450void
1460rxvt_term::scr_autowrap (int mode) 1451rxvt_term::scr_autowrap (int mode)
1461{ 1452{
1462 if (mode) 1453 if (mode)
1463 screen.flags |= Screen_Autowrap; 1454 screen.flags |= Screen_Autowrap;
1464 else 1455 else
1465 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1456 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext);
1466} 1457}
1467 1458
1468/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1469/* 1460/*
1470 * Set/unset margin origin mode 1461 * Set/unset margin origin mode
… …
1476 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1467 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1477 */ 1468 */
1478void 1469void
1479rxvt_term::scr_relative_origin (int mode) 1470rxvt_term::scr_relative_origin (int mode)
1480{ 1471{
1481 if (mode) 1472 if (mode)
1482 screen.flags |= Screen_Relative; 1473 screen.flags |= Screen_Relative;
1483 else 1474 else
1484 screen.flags &= ~Screen_Relative; 1475 screen.flags &= ~Screen_Relative;
1485 scr_gotorc (0, 0, 0); 1476 scr_gotorc (0, 0, 0);
1486} 1477}
1487 1478
1488/* ------------------------------------------------------------------------- */ 1479/* ------------------------------------------------------------------------- */
1489/* 1480/*
1490 * Set insert/replace mode 1481 * Set insert/replace mode
… …
1492 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1493 */ 1484 */
1494void 1485void
1495rxvt_term::scr_insert_mode (int mode) 1486rxvt_term::scr_insert_mode (int mode)
1496{ 1487{
1497 if (mode) 1488 if (mode)
1498 screen.flags |= Screen_Insert; 1489 screen.flags |= Screen_Insert;
1499 else 1490 else
1500 screen.flags &= ~Screen_Insert; 1491 screen.flags &= ~Screen_Insert;
1501} 1492}
1502 1493
1503/* ------------------------------------------------------------------------- */ 1494/* ------------------------------------------------------------------------- */
1504/* 1495/*
1505 * Set/Unset tabs 1496 * Set/Unset tabs
… …
1508 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1499 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1509 */ 1500 */
1510void 1501void
1511rxvt_term::scr_set_tab (int mode) 1502rxvt_term::scr_set_tab (int mode)
1512{ 1503{
1513 if (mode < 0) 1504 if (mode < 0)
1514 MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); 1505 MEMSET (tabs, 0, TermWin.ncol * sizeof (char));
1515 else if (screen.cur.col < TermWin.ncol) 1506 else if (screen.cur.col < TermWin.ncol)
1516 tabs[screen.cur.col] = (mode ? 1 : 0); 1507 tabs[screen.cur.col] = (mode ? 1 : 0);
1517} 1508}
1518 1509
1519/* ------------------------------------------------------------------------- */ 1510/* ------------------------------------------------------------------------- */
1520/* 1511/*
1521 * Set reverse/normal video 1512 * Set reverse/normal video
… …
1523 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1514 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1524 */ 1515 */
1525void 1516void
1526rxvt_term::scr_rvideo_mode (int mode) 1517rxvt_term::scr_rvideo_mode (int mode)
1527{ 1518{
1528 XGCValues gcvalue; 1519 XGCValues gcvalue;
1529 1520
1530 if (rvideo != mode) { 1521 if (rvideo != mode)
1522 {
1531 rvideo = mode; 1523 rvideo = mode;
1532 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1524 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1533#if defined(XPM_BACKGROUND) 1525#if defined(XPM_BACKGROUND)
1534 if (bgPixmap.pixmap == None) 1526 if (bgPixmap.pixmap == None)
1535#endif 1527#endif
1536#if defined(TRANSPARENT) 1528#if defined(TRANSPARENT)
1537 if (!(Options & Opt_transparent) || am_transparent == 0) 1529 if (! (Options & Opt_transparent) || am_transparent == 0)
1538#endif 1530#endif
1539 XSetWindowBackground(Xdisplay, TermWin.vt, 1531 XSetWindowBackground (display->display, TermWin.vt,
1540 PixColors[Color_bg]); 1532 PixColors[Color_bg]);
1541 1533
1542 gcvalue.foreground = PixColors[Color_fg]; 1534 gcvalue.foreground = PixColors[Color_fg];
1543 gcvalue.background = PixColors[Color_bg]; 1535 gcvalue.background = PixColors[Color_bg];
1544 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground, 1536 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1545 &gcvalue); 1537 &gcvalue);
1546 scr_clear (); 1538 scr_clear ();
1547 scr_touch (true); 1539 scr_touch (true);
1548 } 1540 }
1549} 1541}
1550 1542
1551/* ------------------------------------------------------------------------- */ 1543/* ------------------------------------------------------------------------- */
1552/* 1544/*
… …
1554 * XTERM_SEQ: Report position: ESC [ 6 n 1546 * XTERM_SEQ: Report position: ESC [ 6 n
1555 */ 1547 */
1556void 1548void
1557rxvt_term::scr_report_position () 1549rxvt_term::scr_report_position ()
1558{ 1550{
1559 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1551 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1560} 1552}
1561 1553
1562/* ------------------------------------------------------------------------- * 1554/* ------------------------------------------------------------------------- *
1563 * FONTS * 1555 * FONTS *
1564 * ------------------------------------------------------------------------- */ 1556 * ------------------------------------------------------------------------- */
… …
1567 * Set font style 1559 * Set font style
1568 */ 1560 */
1569void 1561void
1570rxvt_term::set_font_style () 1562rxvt_term::set_font_style ()
1571{ 1563{
1572 switch (charsets[screen.charset]) { 1564 switch (charsets[screen.charset])
1565 {
1573 case '0': /* DEC Special Character & Line Drawing Set */ 1566 case '0': /* DEC Special Character & Line Drawing Set */
1574 break; 1567 break;
1575 case 'A': /* United Kingdom (UK) */ 1568 case 'A': /* United Kingdom (UK) */
1576 break; 1569 break;
1577 case 'B': /* United States (USASCII) */ 1570 case 'B': /* United States (USASCII) */
1578 break; 1571 break;
1579 case '<': /* Multinational character set */ 1572 case '<': /* Multinational character set */
1580 break; 1573 break;
1581 case '5': /* Finnish character set */ 1574 case '5': /* Finnish character set */
1582 break; 1575 break;
1583 case 'C': /* Finnish character set */ 1576 case 'C': /* Finnish character set */
1584 break; 1577 break;
1585 case 'K': /* German character set */ 1578 case 'K': /* German character set */
1586 break; 1579 break;
1587 } 1580 }
1588} 1581}
1589 1582
1590/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
… …
1595 * XTERM_SEQ: Invoke G2 character set: ESC N 1588 * XTERM_SEQ: Invoke G2 character set: ESC N
1596 * XTERM_SEQ: Invoke G3 character set: ESC O 1589 * XTERM_SEQ: Invoke G3 character set: ESC O
1597 */ 1590 */
1598void 1591void
1599rxvt_term::scr_charset_choose (int set) 1592rxvt_term::scr_charset_choose (int set)
1600{ 1593 {
1601 screen.charset = set; 1594 screen.charset = set;
1602 set_font_style (); 1595 set_font_style ();
1603} 1596 }
1604 1597
1605/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1606/* 1599/*
1607 * Set a font 1600 * Set a font
1608 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1601 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1611 * XTERM_SEQ: Set G3 character set: ESC + <C> 1604 * XTERM_SEQ: Set G3 character set: ESC + <C>
1612 * See set_font_style for possible values for <C> 1605 * See set_font_style for possible values for <C>
1613 */ 1606 */
1614void 1607void
1615rxvt_term::scr_charset_set (int set, unsigned int ch) 1608rxvt_term::scr_charset_set (int set, unsigned int ch)
1616{ 1609 {
1617 charsets[set] = (unsigned char)ch; 1610 charsets[set] = (unsigned char)ch;
1618 set_font_style (); 1611 set_font_style ();
1619} 1612 }
1620 1613
1621 1614
1622/* ------------------------------------------------------------------------- * 1615/* ------------------------------------------------------------------------- *
1623 * MAJOR SCREEN MANIPULATION * 1616 * MAJOR SCREEN MANIPULATION *
1624 * ------------------------------------------------------------------------- */ 1617 * ------------------------------------------------------------------------- */
… …
1649 1642
1650/* 1643/*
1651 * Refresh an area 1644 * Refresh an area
1652 */ 1645 */
1653enum { 1646enum {
1654 PART_BEG = 0, 1647 PART_BEG = 0,
1655 PART_END, 1648 PART_END,
1656 RC_COUNT 1649 RC_COUNT
1657}; 1650};
1658 1651
1659void 1652void
1660rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1653rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1661{ 1654{
… …
1664 1657
1665 if (drawn_text == NULL) /* sanity check */ 1658 if (drawn_text == NULL) /* sanity check */
1666 return; 1659 return;
1667 1660
1668#ifdef DEBUG_STRICT 1661#ifdef DEBUG_STRICT
1669 x = max(x, (int)TermWin.int_bwidth); 1662 x = max (x, (int)TermWin.int_bwidth);
1670 x = min(x, (int)TermWin.width); 1663 x = min (x, (int)TermWin.width);
1671 y = max(y, (int)TermWin.int_bwidth); 1664 y = max (y, (int)TermWin.int_bwidth);
1672 y = min(y, (int)TermWin.height); 1665 y = min (y, (int)TermWin.height);
1673#endif 1666#endif
1674 1667
1675/* round down */ 1668 /* round down */
1676 rc[PART_BEG].col = Pixel2Col(x); 1669 rc[PART_BEG].col = Pixel2Col (x);
1677 rc[PART_BEG].row = Pixel2Row(y); 1670 rc[PART_BEG].row = Pixel2Row (y);
1678/* round up */ 1671 /* round up */
1679 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1672 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1680 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1673 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1681 1674
1682/* sanity checks */ 1675 /* sanity checks */
1683 for (i = PART_BEG; i < RC_COUNT; i++) 1676 for (i = PART_BEG; i < RC_COUNT; i++)
1684 { 1677 {
1685 MIN_IT(rc[i].col, TermWin.ncol - 1); 1678 MIN_IT (rc[i].col, TermWin.ncol - 1);
1686 MIN_IT(rc[i].row, TermWin.nrow - 1); 1679 MIN_IT (rc[i].row, TermWin.nrow - 1);
1687 } 1680 }
1688 1681
1689 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1682 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1690 1683
1691 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1684 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1692 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1685 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0,
1693 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1686 (rc[PART_END].col - rc[PART_BEG].col + 1));
1694 1687
1695 if (refresh) 1688 if (refresh)
1696 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1689 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1697} 1690}
… …
1712 * the top of the screen 1705 * the top of the screen
1713 */ 1706 */
1714int 1707int
1715rxvt_term::scr_move_to (int y, int len) 1708rxvt_term::scr_move_to (int y, int len)
1716{ 1709{
1717 long p = 0; 1710 long p = 0;
1718 uint16_t oldviewstart; 1711 uint16_t oldviewstart;
1719 1712
1720 oldviewstart = TermWin.view_start; 1713 oldviewstart = TermWin.view_start;
1721 if (y < len) { 1714 if (y < len)
1715 {
1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1716 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1723 p -= (long)(TermWin.nrow - 1); 1717 p -= (long) (TermWin.nrow - 1);
1724 p = max(p, 0); 1718 p = max (p, 0);
1725 } 1719 }
1726 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); 1720 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1727 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); 1721 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1728 1722
1729 return scr_changeview (oldviewstart); 1723 return scr_changeview (oldviewstart);
1730} 1724}
1731 1725
1732/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1733/* 1727/*
1734 * Page the screen up/down nlines 1728 * Page the screen up/down nlines
1735 * direction should be UP or DN 1729 * direction should be UP or DN
1736 */ 1730 */
1737int 1731int
1738rxvt_term::scr_page (enum page_dirn direction, int nlines) 1732rxvt_term::scr_page (enum page_dirn direction, int nlines)
1739{ 1733{
1740 int n; 1734 int n;
1741 uint16_t oldviewstart; 1735 uint16_t oldviewstart;
1742 1736
1743 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1737 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1744#ifdef DEBUG_STRICT 1738#ifdef DEBUG_STRICT
1745 assert((nlines >= 0) && (nlines <= TermWin.nrow)); 1739 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1746#endif 1740#endif
1747 oldviewstart = TermWin.view_start; 1741 oldviewstart = TermWin.view_start;
1748 if (direction == UP) { 1742 if (direction == UP)
1743 {
1749 n = TermWin.view_start + nlines; 1744 n = TermWin.view_start + nlines;
1750 TermWin.view_start = min(n, TermWin.nscrolled); 1745 TermWin.view_start = min (n, TermWin.nscrolled);
1751 } else { 1746 }
1747 else
1748 {
1752 n = TermWin.view_start - nlines; 1749 n = TermWin.view_start - nlines;
1753 TermWin.view_start = max(n, 0); 1750 TermWin.view_start = max (n, 0);
1754 } 1751 }
1755 return scr_changeview (oldviewstart); 1752 return scr_changeview (oldviewstart);
1756} 1753}
1757 1754
1758int 1755int
1759rxvt_term::scr_changeview (uint16_t oldviewstart) 1756rxvt_term::scr_changeview (uint16_t oldviewstart)
1760{ 1757{
1761 if (TermWin.view_start != oldviewstart) { 1758 if (TermWin.view_start != oldviewstart)
1759 {
1762 want_refresh = 1; 1760 want_refresh = 1;
1763#ifdef RXVT_GRAPHICS
1764 if (Gr_Displayed ())
1765 Gr_scroll (0);
1766#endif
1767 num_scr -= (TermWin.view_start - oldviewstart); 1761 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1762 }
1769 return (int)(TermWin.view_start - oldviewstart); 1763 return (int) (TermWin.view_start - oldviewstart);
1770} 1764}
1771 1765
1772/* ------------------------------------------------------------------------- */ 1766/* ------------------------------------------------------------------------- */
1773void 1767void
1774rxvt_term::scr_bell () 1768rxvt_term::scr_bell ()
1775{ 1769{
1776#ifndef NO_BELL 1770#ifndef NO_BELL
1777# ifndef NO_MAPALERT 1771# ifndef NO_MAPALERT
1778# ifdef MAPALERT_OPTION 1772# ifdef MAPALERT_OPTION
1779 if (Options & Opt_mapAlert) 1773 if (Options & Opt_mapAlert)
1780# endif 1774# endif
1781 XMapWindow(Xdisplay, TermWin.parent[0]); 1775 XMapWindow (display->display, TermWin.parent[0]);
1782# endif 1776# endif
1783 if (Options & Opt_visualBell) { 1777 if (Options & Opt_visualBell)
1778 {
1784 scr_rvideo_mode (!rvideo); /* refresh also done */ 1779 scr_rvideo_mode (!rvideo); /* refresh also done */
1785 scr_rvideo_mode (!rvideo); /* refresh also done */ 1780 scr_rvideo_mode (!rvideo); /* refresh also done */
1781 }
1786 } else 1782 else
1787 XBell(Xdisplay, 0); 1783 XBell (display->display, 0);
1788#endif 1784#endif
1789} 1785}
1790 1786
1791/* ------------------------------------------------------------------------- */ 1787/* ------------------------------------------------------------------------- */
1792/* ARGSUSED */ 1788/* ARGSUSED */
1793void 1789void
1794rxvt_term::scr_printscreen (int fullhist) 1790rxvt_term::scr_printscreen (int fullhist)
1795{ 1791{
1796#ifdef PRINTPIPE 1792#ifdef PRINTPIPE
1797 int i, r1, nrows, row_offset; 1793 int i, r1, nrows, row_offset;
1798 text_t *t; 1794 text_t *t;
1799 FILE *fd; 1795 FILE *fd;
1800 1796
1801 if ((fd = popen_printer ()) == NULL) 1797 if ((fd = popen_printer ()) == NULL)
1802 return; 1798 return;
1803 nrows = TermWin.nrow; 1799 nrows = TermWin.nrow;
1804 row_offset = TermWin.saveLines; 1800 row_offset = TermWin.saveLines;
1805 if (!fullhist) 1801 if (!fullhist)
1806 row_offset -= TermWin.view_start; 1802 row_offset -= TermWin.view_start;
1807 else { 1803 else
1804 {
1808 nrows += TermWin.nscrolled; 1805 nrows += TermWin.nscrolled;
1809 row_offset -= TermWin.nscrolled; 1806 row_offset -= TermWin.nscrolled;
1810 } 1807 }
1811 1808
1812 for (r1 = 0; r1 < nrows; r1++) { 1809 for (r1 = 0; r1 < nrows; r1++)
1810 {
1813 t = screen.text[r1 + row_offset]; 1811 t = screen.text[r1 + row_offset];
1814 for (i = TermWin.ncol - 1; i >= 0; i--) 1812 for (i = TermWin.ncol - 1; i >= 0; i--)
1815 if (!isspace(t[i])) 1813 if (!isspace (t[i]))
1816 break; 1814 break;
1817 fprintf(fd, "%.*s\n", (i + 1), t); 1815 fprintf (fd, "%.*s\n", (i + 1), t);
1818 } 1816 }
1819 pclose_printer (fd); 1817 pclose_printer (fd);
1820#endif 1818#endif
1821} 1819}
1822 1820
1823/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1824/* 1822/*
… …
1826 * drawn_text/drawn_rend contain the screen information before the update. 1824 * drawn_text/drawn_rend contain the screen information before the update.
1827 * screen.text/screen.rend contain what the screen will change to. 1825 * screen.text/screen.rend contain what the screen will change to.
1828 */ 1826 */
1829 1827
1830#define FONT_WIDTH(X, Y) \ 1828#define FONT_WIDTH(X, Y) \
1831 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1829 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1832#define FONT_RBEAR(X, Y) \ 1830#define FONT_RBEAR(X, Y) \
1833 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1831 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1834#define FONT_LBEAR(X, Y) \ 1832#define FONT_LBEAR(X, Y) \
1835 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1833 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1836#define IS_FONT_CHAR(X, Y) \ 1834#define IS_FONT_CHAR(X, Y) \
1837 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1838 1836
1839void 1837void
1840rxvt_term::scr_refresh (unsigned char refresh_type) 1838rxvt_term::scr_refresh (unsigned char refresh_type)
1841{ 1839{
1842 unsigned char clearfirst, /* first character writes before cell */ 1840 unsigned char clearfirst, /* first character writes before cell */
1843 clearlast, /* last character writes beyond cell */ 1841 clearlast, /* last character writes beyond cell */
1844 must_clear, /* use draw_string not draw_image_string */ 1842 must_clear, /* use draw_string not draw_image_string */
1845 rvid, /* reverse video this position */ 1843 rvid, /* reverse video this position */
1846 showcursor; /* show the cursor */ 1844 showcursor; /* show the cursor */
1847 int16_t col, row, /* column/row we're processing */ 1845 int16_t col, row, /* column/row we're processing */
1848 ocrow; /* old cursor row */ 1846 ocrow; /* old cursor row */
1849 int cursorwidth; 1847 int cursorwidth;
1850 int i, /* tmp */ 1848 int i, /* tmp */
1851 row_offset; /* basic offset in screen structure */ 1849 row_offset; /* basic offset in screen structure */
1852#ifndef NO_CURSORCOLOR 1850#ifndef NO_CURSORCOLOR
1853 rend_t cc1; /* store colours at cursor position(s) */ 1851 rend_t cc1; /* store colours at cursor position (s) */
1854#endif 1852#endif
1855 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1856 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1857 1855
1858 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1856 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1859 return; 1857 return;
1860 1858
1861 /* 1859 /*
1862 * A: set up vars 1860 * A: set up vars
1863 */ 1861 */
1864 clearfirst = clearlast = must_clear = 0; 1862 clearfirst = clearlast = must_clear = 0;
1865 1863
1866 refresh_count = 0; 1864 refresh_count = 0;
1867 1865
1868 row_offset = TermWin.saveLines - TermWin.view_start; 1866 row_offset = TermWin.saveLines - TermWin.view_start;
1869 1867
1870 if ((refresh_type & REFRESH_BOUNDS)) 1868 if ((refresh_type & REFRESH_BOUNDS))
1869 {
1870 clearfirst = clearlast = 1;
1871 refresh_type &= ~REFRESH_BOUNDS;
1872 }
1873
1874#ifdef XPM_BACKGROUND
1875 must_clear |= (bgPixmap.pixmap != None);
1876#endif
1877#ifdef TRANSPARENT
1878 must_clear |= ((Options & Opt_transparent) && am_transparent);
1879#endif
1880 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1881
1882 /*
1883 * B: reverse any characters which are selected
1884 */
1885 scr_reverse_selection ();
1886
1887 /*
1888 * C: set the cursor character (s)
1889 */
1890 {
1891 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */
1894
1895 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK
1898 if (hidden_cursor)
1899 showcursor = 0;
1900#endif
1901
1902 cursorwidth = 0;
1903
1904 if (showcursor)
1871 { 1905 {
1872 clearfirst = clearlast = 1;
1873 refresh_type &= ~REFRESH_BOUNDS;
1874 }
1875
1876#if defined(XPM_BACKGROUND)
1877 must_clear |= (bgPixmap.pixmap != None);
1878#endif
1879#if defined(TRANSPARENT)
1880 must_clear |= ((Options & Opt_transparent) && am_transparent);
1881#endif
1882 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1883
1884 /*
1885 * B: reverse any characters which are selected
1886 */
1887 scr_reverse_selection ();
1888
1889 /*
1890 * C: set the cursor character(s)
1891 */
1892 {
1893 unsigned char setoldcursor;
1894 rend_t ccol1, /* Cursor colour */
1895 ccol2; /* Cursor colour2 */
1896
1897 showcursor = (screen.flags & Screen_VisibleCursor);
1898 cursorwidth = 0;
1899#ifdef CURSOR_BLINK
1900 if (hidden_cursor)
1901 showcursor = 0;
1902#endif
1903
1904 cursorwidth = 0;
1905
1906 if (showcursor)
1907 {
1908 cursorwidth++; 1906 cursorwidth++;
1909 1907
1910 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1911 [screen.cur.col]); 1909 [screen.cur.col]);
1912 1910
1913 if (showcursor && TermWin.focus) 1911 if (showcursor && TermWin.focus)
1914 { 1912 {
1915 *srp ^= RS_RVid; 1913 *srp ^= RS_RVid;
1916#ifndef NO_CURSORCOLOR 1914#ifndef NO_CURSORCOLOR
1917 cc1 = *srp & (RS_fgMask | RS_bgMask); 1915 cc1 = *srp & (RS_fgMask | RS_bgMask);
1918 if (ISSET_PIXCOLOR (Color_cursor)) 1916 if (ISSET_PIXCOLOR (Color_cursor))
1919 ccol1 = Color_cursor; 1917 ccol1 = Color_cursor;
1920 else 1918 else
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1919#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1922 ccol1 = GET_FGCOLOR(rstyle); 1920 ccol1 = GET_FGCOLOR (rstyle);
1923#else 1921#else
1924 ccol1 = Color_fg; 1922 ccol1 = Color_fg;
1925#endif 1923#endif
1926 if (ISSET_PIXCOLOR (Color_cursor2)) 1924 if (ISSET_PIXCOLOR (Color_cursor2))
1927 ccol2 = Color_cursor2; 1925 ccol2 = Color_cursor2;
1928 else 1926 else
1929#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1927#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1930 ccol2 = GET_BGCOLOR(rstyle); 1928 ccol2 = GET_BGCOLOR (rstyle);
1931#else 1929#else
1932 ccol2 = Color_bg; 1930 ccol2 = Color_bg;
1933#endif 1931#endif
1934 *srp = SET_FGCOLOR(*srp, ccol1); 1932 *srp = SET_FGCOLOR (*srp, ccol1);
1935 *srp = SET_BGCOLOR(*srp, ccol2); 1933 *srp = SET_BGCOLOR (*srp, ccol2);
1936#endif 1934#endif
1937 }
1938 }
1939 1935
1940 /* make sure no outline cursor is left around */
1941 setoldcursor = 0;
1942 if (ocrow != -1) {
1943 if (screen.cur.row + TermWin.view_start != ocrow
1944 || screen.cur.col != oldcursor.col) {
1945 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) {
1947 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1948 }
1949 if (TermWin.focus || !showcursor)
1950 oldcursor.row = -1;
1951 else
1952 setoldcursor = 1;
1953 }
1954 } else if (!TermWin.focus)
1955 setoldcursor = 1;
1956 if (setoldcursor) {
1957 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1958 oldcursor.row = -1;
1959 else {
1960 oldcursor.row = screen.cur.row + TermWin.view_start;
1961 oldcursor.col = screen.cur.col;
1962 } 1936 }
1963 } 1937 }
1938
1939 /* make sure no outline cursor is left around */
1940 setoldcursor = 0;
1941 if (ocrow != -1)
1942 {
1943 if (screen.cur.row + TermWin.view_start != ocrow
1944 || screen.cur.col != oldcursor.col)
1945 {
1946 if (ocrow < TermWin.nrow
1947 && oldcursor.col < TermWin.ncol)
1948 {
1949 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1950 }
1951 if (TermWin.focus || !showcursor)
1952 oldcursor.row = -1;
1953 else
1954 setoldcursor = 1;
1955 }
1964 } 1956 }
1957 else if (!TermWin.focus)
1958 setoldcursor = 1;
1959 if (setoldcursor)
1960 {
1961 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1962 oldcursor.row = -1;
1963 else
1964 {
1965 oldcursor.row = screen.cur.row + TermWin.view_start;
1966 oldcursor.col = screen.cur.col;
1967 }
1968 }
1969 }
1965 1970
1966#ifndef NO_SLOW_LINK_SUPPORT 1971#ifndef NO_SLOW_LINK_SUPPORT
1972 /*
1973 * D: CopyArea pass - very useful for slower links
1974 * This has been deliberately kept simple.
1975 */
1976 i = num_scr;
1977 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1978 && abs (i) < TermWin.nrow && !must_clear)
1979 {
1980 int16_t nits;
1981 int j;
1982 rend_t *drp2;
1983 text_t *dtp2;
1984 int len, wlen;
1985
1986 j = TermWin.nrow;
1987 wlen = len = -1;
1988 row = i > 0 ? 0 : j - 1;
1989 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1990 {
1991 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1992 {
1993 stp = screen.text[row + row_offset];
1994 srp = screen.rend[row + row_offset];
1995 dtp = drawn_text[row];
1996 dtp2 = drawn_text[row + i];
1997 drp = drawn_rend[row];
1998 drp2 = drawn_rend[row + i];
1999
2000 for (nits = 0, col = TermWin.ncol; col--; )
2001 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2002 nits--;
2003 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2004 nits++;
2005
2006 if (nits > 8) /* XXX: arbitrary choice */
2007 {
2008 for (col = TermWin.ncol; col--; )
2009 {
2010 *dtp++ = *dtp2++;
2011 *drp++ = *drp2++;
2012 }
2013
2014 if (len == -1)
2015 len = row;
2016
2017 wlen = row;
2018 continue;
2019 }
2020 }
2021
2022 if (len != -1)
2023 {
2024 /* also comes here at end if needed because of >= above */
2025 if (wlen < len)
2026 SWAP_IT (wlen, len, int);
2027
2028 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2029 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2030 TermWin.gc, 0, Row2Pixel (len + i),
2031 (unsigned int)TermWin_TotalWidth (),
2032 (unsigned int)Height2Pixel (wlen - len + 1),
2033 0, Row2Pixel (len));
2034 len = -1;
2035 }
2036 }
2037 }
2038#endif
2039
2040 /*
2041 * E: main pass across every character
2042 */
2043 for (row = 0; row < TermWin.nrow; row++)
2044 {
2045 stp = screen.text[row + row_offset];
2046 srp = screen.rend[row + row_offset];
2047 dtp = drawn_text[row];
2048 drp = drawn_rend[row];
2049
2050 /*
2051 * E2: OK, now the real pass
2052 */
2053 int ypixel = (int)Row2Pixel (row);
2054
2055 for (col = 0; col < TermWin.ncol; col++)
2056 {
2057 /* compare new text with old - if exactly the same then continue */
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2059
2060 if (stp[col] == dtp[col] /* Must match characters to skip. */
2061 && (rend == drp[col] /* Either rendition the same or */
2062 || (stp[col] == ' ' /* space w/ no background change */
2063 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2064 continue;
2065
2066 text_t *text = stp + col;
2067 int count = 1;
2068
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col];
2072 drp[col] = rend;
2073
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076
2077 int xpixel = Col2Pixel (col);
2078
2079 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you?
2081 for (i = 0; ++col < TermWin.ncol; )
2082 {
2083 if (stp[col] == NOCHAR)
2084 {
2085 dtp[col] = stp[col];
2086 drp[col] = rend;
2087 count++;
2088
2089 if (i) // only possible skip if char unchanged
2090 i++;
2091
2092 continue;
2093 }
2094
2095 if (rend != srp[col])
2096 break;
2097
2098 count++;
2099
2100 if (stp[col] != dtp[col]
2101 || srp[col] != drp[col])
2102 {
2103 if (must_clear && (i++ > (count / 2)))
2104 break;
2105
2106 dtp[col] = stp[col];
2107 drp[col] = rend;
2108 i = 0;
2109 }
2110 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2111 break;
2112 }
2113
2114 col--; /* went one too far. move back */
2115 count -= i; /* dump any matching trailing chars */
2116
2117 /*
2118 * Determine the attributes for the string
2119 */
2120 int fid = GET_FONT (rend);
2121 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background
2123
2124 rend = GET_ATTR (rend);
2125
2126 rvid = !! (rend & RS_RVid);
2127 if (rvid)
2128 {
2129 SWAP_IT (fore, back, int);
2130
2131#ifndef NO_BOLD_UNDERLINE_REVERSE
2132 if (ISSET_PIXCOLOR (Color_RV)
2133# ifndef NO_CURSORCOLOR
2134 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif
2136 )
2137 back = Color_RV;
2138#endif
2139
2140 }
2141#ifdef TEXT_BLINK
2142 if (rend & RS_Blink)
2143 {
2144 if (!text_blink_ev.active)
2145 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0;
2148 }
2149 else if (hidden_text)
2150 fore = back;
2151 }
2152#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 }
2166#endif
2167
2168 /*
2169 * Actually do the drawing of the string here
2170 */
2171 rxvt_font *font = (*TermWin.fontset)[fid];
2172
2173 if (back == fore)
2174 font->clear_rect (xpixel, ypixel,
2175 TermWin.fwidth * count, TermWin.fheight,
2176 back);
2177 else if (back == Color_bg)
2178 {
2179 if (must_clear)
2180 {
2181 CLEAR_CHARS (xpixel, ypixel, count);
2182
2183 for (i = 0; i < count; i++) /* don't draw empty strings */
2184 if (text[i] != ' ')
2185 {
2186 font->draw (xpixel, ypixel, text, count, fore, -1);
2187 break;
2188 }
2189 }
2190 else
2191 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2192 }
2193 else
2194 font->draw (xpixel, ypixel, text, count, fore, back);
2195
2196 if ((rend & RS_Uline) && (font->descent > 1))
2197 XDrawLine (display->display, drawBuffer, TermWin.gc,
2198 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2200 } /* for (col....) */
2201 } /* for (row....) */
2202
2203 /*
2204 * G: cleanup cursor and display outline cursor if necessary
2205 */
2206 if (showcursor)
2207 {
2208 if (TermWin.focus)
2209 {
2210 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2211 [screen.cur.col]);
2212 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif
2216
2217 }
2218 else if (oldcursor.row >= 0)
2219 {
2220#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 }
2230 }
2231
2232 /*
2233 * H: cleanup selection
2234 */
2235 scr_reverse_selection ();
2236
2237 /*
2238 * I: other general cleanup
2239 */
2240 if (clearfirst && TermWin.int_bwidth)
1967 /* 2241 /*
1968 * D: CopyArea pass - very useful for slower links 2242 * clear the whole screen height, note that width == 0 is treated
1969 * This has been deliberately kept simple. 2243 * specially by XClearArea
1970 */ 2244 */
1971 i = num_scr; 2245 XClearArea (display->display, TermWin.vt, 0, 0,
1972 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2246 (unsigned int)TermWin.int_bwidth,
1973 && abs(i) < TermWin.nrow && !must_clear)
1974 {
1975 int16_t nits;
1976 int j;
1977 rend_t *drp2;
1978 text_t *dtp2;
1979 int len, wlen;
1980
1981 j = TermWin.nrow;
1982 wlen = len = -1;
1983 row = i > 0 ? 0 : j - 1;
1984 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1985 {
1986 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
1987 {
1988 stp = screen.text[row + row_offset];
1989 srp = screen.rend[row + row_offset];
1990 dtp = drawn_text[row];
1991 dtp2 = drawn_text[row + i];
1992 drp = drawn_rend[row];
1993 drp2 = drawn_rend[row + i];
1994
1995 for (nits = 0, col = TermWin.ncol; col--; )
1996 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
1997 nits--;
1998 else if (stp[col] != dtp[col] || srp[col] != drp[col])
1999 nits++;
2000
2001 if (nits > 8) /* XXX: arbitrary choice */
2002 {
2003 for (col = TermWin.ncol; col--; )
2004 {
2005 *dtp++ = *dtp2++;
2006 *drp++ = *drp2++;
2007 }
2008
2009 if (len == -1)
2010 len = row;
2011
2012 wlen = row;
2013 continue;
2014 }
2015 }
2016
2017 if (len != -1)
2018 {
2019 /* also comes here at end if needed because of >= above */
2020 if (wlen < len)
2021 SWAP_IT(wlen, len, int);
2022
2023 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2024 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2025 TermWin.gc, 0, Row2Pixel (len + i),
2026 (unsigned int)TermWin_TotalWidth (), 2247 (unsigned int)TermWin_TotalHeight (), False);
2027 (unsigned int)Height2Pixel (wlen - len + 1), 2248 if (clearlast && TermWin.int_bwidth)
2028 0, Row2Pixel (len));
2029 len = -1;
2030 }
2031 }
2032 }
2033#endif
2034
2035 /* 2249 /*
2036 * E: main pass across every character 2250 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea
2037 */ 2252 */
2038 for (row = 0; row < TermWin.nrow; row++)
2039 {
2040 stp = screen.text[row + row_offset];
2041 srp = screen.rend[row + row_offset];
2042 dtp = drawn_text[row];
2043 drp = drawn_rend[row];
2044
2045 /*
2046 * E2: OK, now the real pass
2047 */
2048 int ypixel = (int)Row2Pixel(row);
2049
2050 for (col = 0; col < TermWin.ncol; col++)
2051 {
2052 /* compare new text with old - if exactly the same then continue */
2053 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2054
2055 if (stp[col] == dtp[col] /* Must match characters to skip. */
2056 && (rend == drp[col] /* Either rendition the same or */
2057 || (stp[col] == ' ' /* space w/ no background change */
2058 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2059 continue;
2060
2061 text_t *text = stp + col;
2062 int count = 1;
2063
2064 /* redraw one or more characters */
2065
2066 dtp[col] = stp[col];
2067 drp[col] = rend;
2068
2069 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2070 continue;
2071
2072 int xpixel = Col2Pixel(col);
2073
2074 // this loop looks very messy, it can probably be optimized
2075 // and cleaned a bit by you?
2076 for (i = 0; ++col < TermWin.ncol; )
2077 {
2078 if (stp[col] == NOCHAR)
2079 {
2080 dtp[col] = stp[col];
2081 drp[col] = rend;
2082 count++;
2083
2084 if (i) // only possible skip if char unchanged
2085 i++;
2086
2087 continue;
2088 }
2089
2090 if (rend != srp[col])
2091 break;
2092
2093 count++;
2094
2095 if (stp[col] != dtp[col]
2096 || srp[col] != drp[col])
2097 {
2098 if (must_clear && (i++ > (count / 2)))
2099 break;
2100
2101 dtp[col] = stp[col];
2102 drp[col] = rend;
2103 i = 0;
2104 }
2105 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2106 break;
2107 }
2108
2109 col--; /* went one too far. move back */
2110 count -= i; /* dump any matching trailing chars */
2111
2112 /*
2113 * Determine the attributes for the string
2114 */
2115 int fid = GET_FONT (rend);
2116 int fore = GET_FGCOLOR (rend); // desired foreground
2117 int back = GET_BGCOLOR (rend); // desired background
2118
2119 rend = GET_ATTR (rend);
2120
2121 rvid = !!(rend & RS_RVid);
2122#ifdef TEXT_BLINK
2123 if (rend & RS_Blink)
2124 {
2125 if (!text_blink_ev.active)
2126 {
2127 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2128 hidden_text = 0;
2129 }
2130 else if (hidden_text)
2131 fore = back;
2132 }
2133#endif
2134 if (rvid)
2135 {
2136 SWAP_IT(fore, back, int);
2137
2138#ifndef NO_BOLD_UNDERLINE_REVERSE
2139 if (ISSET_PIXCOLOR (Color_RV)
2140# ifndef NO_CURSORCOLOR
2141 && !ISSET_PIXCOLOR (Color_cursor)
2142# endif
2143 )
2144 back = Color_RV;
2145#endif
2146 }
2147#ifndef NO_BOLD_UNDERLINE_REVERSE
2148 else if (rend & RS_Bold)
2149 {
2150 if (ISSET_PIXCOLOR (Color_BD))
2151 fore = Color_BD;
2152 else if (fore == Color_fg)
2153 fore = Color_White;
2154 }
2155 else if (rend & RS_Uline)
2156 {
2157 if (ISSET_PIXCOLOR (Color_UL))
2158 fore = Color_UL;
2159 }
2160#endif
2161
2162 /*
2163 * Actually do the drawing of the string here
2164 */
2165 rxvt_font *font = (*TermWin.fontset)[fid];
2166
2167 if (back == Color_bg)
2168 {
2169 if (must_clear)
2170 {
2171 for (i = 0; i < count; i++) /* don't draw empty strings */
2172 if (text[i] != ' ')
2173 {
2174 font->draw (xpixel, ypixel, text, count, fore, -1);
2175 goto nodraw;
2176 }
2177
2178 CLEAR_CHARS (xpixel, ypixel, count);
2179nodraw: ;
2180 }
2181 else
2182 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2183 }
2184 else
2185 font->draw (xpixel, ypixel, text, count, fore, back);
2186
2187 if ((rend & RS_Uline) && (font->descent > 1))
2188 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2189 xpixel, ypixel + font->ascent + 1,
2190 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2191 } /* for (col....) */
2192 } /* for (row....) */
2193
2194 /*
2195 * G: cleanup cursor and display outline cursor if necessary
2196 */
2197 if (showcursor) {
2198 if (TermWin.focus) {
2199 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2200 [screen.cur.col]);
2201 *srp ^= RS_RVid;
2202#ifndef NO_CURSORCOLOR
2203 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2204#endif
2205 } else if (oldcursor.row >= 0) {
2206#ifndef NO_CURSORCOLOR
2207 if (ISSET_PIXCOLOR (Color_cursor))
2208 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2209#endif
2210 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2211 Col2Pixel(oldcursor.col),
2212 Row2Pixel(oldcursor.row),
2213 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2214 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2215 }
2216 }
2217
2218 /*
2219 * H: cleanup selection
2220 */
2221 scr_reverse_selection ();
2222
2223 /*
2224 * I: other general cleanup
2225 */
2226 if (clearfirst && TermWin.int_bwidth)
2227 /*
2228 * clear the whole screen height, note that width == 0 is treated
2229 * specially by XClearArea
2230 */
2231 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2232 (unsigned int)TermWin.int_bwidth,
2233 (unsigned int)TermWin_TotalHeight(), False);
2234 if (clearlast && TermWin.int_bwidth)
2235 /*
2236 * clear the whole screen height, note that width == 0 is treated
2237 * specially by XClearArea
2238 */
2239 XClearArea(Xdisplay, TermWin.vt, 2253 XClearArea (display->display, TermWin.vt,
2240 TermWin.width + TermWin.int_bwidth, 0, 2254 TermWin.width + TermWin.int_bwidth, 0,
2241 (unsigned int)TermWin.int_bwidth, 2255 (unsigned int)TermWin.int_bwidth,
2242 (unsigned int)TermWin_TotalHeight(), False); 2256 (unsigned int)TermWin_TotalHeight (), False);
2243 if (refresh_type & SMOOTH_REFRESH) 2257 if (refresh_type & SMOOTH_REFRESH)
2244 XSync(Xdisplay, False); 2258 XSync (display->display, False);
2245 2259
2246 num_scr = 0; 2260 num_scr = 0;
2247 num_scr_allow = 1; 2261 num_scr_allow = 1;
2248 want_refresh = 0; /* screen is current */ 2262 want_refresh = 0; /* screen is current */
2249} 2263}
2250 2264
2251/* ------------------------------------------------------------------------- */
2252void 2265void
2266rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2267{
2268 if (!rp || !tp)
2269 return;
2270
2271 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2272 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2273}
2274
2275void
2276rxvt_term::scr_remap_chars ()
2277{
2278 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2279 scr_remap_chars (screen.text[i], screen.rend[i]);
2280
2281 for (int i = TermWin.nrow; i--; )
2282 {
2283 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2284 scr_remap_chars (swap.text[i], swap.rend[i]);
2285 }
2286}
2287
2288/* ------------------------------------------------------------------------- */
2289void
2253rxvt_term::scr_clear() 2290rxvt_term::scr_clear ()
2254{ 2291{
2255 if (!TermWin.mapped) 2292 if (!TermWin.mapped)
2256 return; 2293 return;
2257 2294
2258 num_scr_allow = 0; 2295 num_scr_allow = 0;
… …
2260#ifdef TRANSPARENT 2297#ifdef TRANSPARENT
2261 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2262 { 2299 {
2263 int i; 2300 int i;
2264 2301
2265 if (!(Options & Opt_transparent_all)) 2302 if (! (Options & Opt_transparent_all))
2266 i = 0; 2303 i = 0;
2267 else 2304 else
2268 i = (int)(sizeof(TermWin.parent) / sizeof(Window)); 2305 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2269 2306
2270 while (i--) 2307 while (i--)
2271 if (TermWin.parent[i] != None) 2308 if (TermWin.parent[i] != None)
2272 XClearWindow(Xdisplay, TermWin.parent[i]); 2309 XClearWindow (display->display, TermWin.parent[i]);
2273 } 2310 }
2274#endif 2311#endif
2275 2312
2276 XClearWindow (Xdisplay, TermWin.vt); 2313 XClearWindow (display->display, TermWin.vt);
2277} 2314}
2278 2315
2279/* ------------------------------------------------------------------------- */ 2316/* ------------------------------------------------------------------------- */
2280void 2317void
2281rxvt_term::scr_reverse_selection () 2318rxvt_term::scr_reverse_selection ()
2282{ 2319{
2283 int i, col, row, end_row; 2320 int i, col, row, end_row;
2284 rend_t *srp; 2321 rend_t *srp;
2285 2322
2286 if (selection.op && current_screen == selection.screen) { 2323 if (selection.op && current_screen == selection.screen)
2324 {
2287 end_row = TermWin.saveLines - TermWin.view_start; 2325 end_row = TermWin.saveLines - TermWin.view_start;
2288 i = selection.beg.row + TermWin.saveLines; 2326 i = selection.beg.row + TermWin.saveLines;
2289 row = selection.end.row + TermWin.saveLines; 2327 row = selection.end.row + TermWin.saveLines;
2290 if (i >= end_row) 2328 if (i >= end_row)
2291 col = selection.beg.col; 2329 col = selection.beg.col;
2292 else { 2330 else
2331 {
2293 col = 0; 2332 col = 0;
2294 i = end_row; 2333 i = end_row;
2295 } 2334 }
2296 end_row += TermWin.nrow; 2335 end_row += TermWin.nrow;
2297 for (; i < row && i < end_row; i++, col = 0) 2336 for (; i < row && i < end_row; i++, col = 0)
2298 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2299 srp[col] ^= RS_RVid; 2338 srp[col] ^= RS_RVid;
2300 if (i == row && i < end_row) 2339 if (i == row && i < end_row)
2301 for (srp = screen.rend[i]; col < selection.end.col; col++) 2340 for (srp = screen.rend[i]; col < selection.end.col; col++)
2302 srp[col] ^= RS_RVid; 2341 srp[col] ^= RS_RVid;
2303 } 2342 }
2304} 2343}
2305 2344
2306/* ------------------------------------------------------------------------- */ 2345/* ------------------------------------------------------------------------- */
2307/* 2346/*
… …
2310 */ 2349 */
2311#if 0 2350#if 0
2312void 2351void
2313rxvt_term::scr_dump (int fd) 2352rxvt_term::scr_dump (int fd)
2314{ 2353{
2315 int row, wrote; 2354 int row, wrote;
2316 unsigned int width, towrite; 2355 unsigned int width, towrite;
2317 char r1[] = "\n"; 2356 char r1[] = "\n";
2318 2357
2319 for (row = TermWin.saveLines - TermWin.nscrolled; 2358 for (row = TermWin.saveLines - TermWin.nscrolled;
2320 row < TermWin.saveLines + TermWin.nrow - 1; row++) { 2359 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2360 {
2321 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2361 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2322 : TermWin.ncol; 2362 : TermWin.ncol;
2323 for (towrite = width; towrite; towrite -= wrote) { 2363 for (towrite = width; towrite; towrite -= wrote)
2364 {
2324 wrote = write(fd, &(screen.text[row][width - towrite]), 2365 wrote = write (fd, & (screen.text[row][width - towrite]),
2325 towrite); 2366 towrite);
2326 if (wrote < 0) 2367 if (wrote < 0)
2327 return; /* XXX: death, no report */ 2368 return; /* XXX: death, no report */
2328 } 2369 }
2329 if (screen.tlen[row] >= 0) 2370 if (screen.tlen[row] >= 0)
2330 if (write(fd, r1, 1) <= 0) 2371 if (write (fd, r1, 1) <= 0)
2331 return; /* XXX: death, no report */ 2372 return; /* XXX: death, no report */
2332 } 2373 }
2333} 2374}
2334#endif 2375#endif
2335 2376
2336/* ------------------------------------------------------------------------- * 2377/* ------------------------------------------------------------------------- *
… …
2341 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2382 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2342 */ 2383 */
2343void 2384void
2344rxvt_term::selection_check (int check_more) 2385rxvt_term::selection_check (int check_more)
2345{ 2386{
2346 row_col_t pos; 2387 row_col_t pos;
2347 2388
2348 if (!selection.op) 2389 if (!selection.op)
2349 return; 2390 return;
2350 2391
2351 pos.row = pos.col = 0; 2392 pos.row = pos.col = 0;
2352 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2393 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2353 || (selection.beg.row >= TermWin.nrow) 2394 || (selection.beg.row >= TermWin.nrow)
2354 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2395 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2355 || (selection.mark.row >= TermWin.nrow) 2396 || (selection.mark.row >= TermWin.nrow)
2356 || (selection.end.row < -(int32_t)TermWin.nscrolled) 2397 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2357 || (selection.end.row >= TermWin.nrow) 2398 || (selection.end.row >= TermWin.nrow)
2358 || (check_more == 1 2399 || (check_more == 1
2359 && current_screen == selection.screen 2400 && current_screen == selection.screen
2360 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2401 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2361 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2402 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2362 || (check_more == 2 2403 || (check_more == 2
2363 && ROWCOL_IS_BEFORE(selection.beg, pos) 2404 && ROWCOL_IS_BEFORE (selection.beg, pos)
2364 && ROWCOL_IS_AFTER(selection.end, pos)) 2405 && ROWCOL_IS_AFTER (selection.end, pos))
2365 || (check_more == 3 2406 || (check_more == 3
2366 && ROWCOL_IS_AFTER(selection.end, pos)) 2407 && ROWCOL_IS_AFTER (selection.end, pos))
2367 || (check_more == 4 /* screen width change */ 2408 || (check_more == 4 /* screen width change */
2368 && (selection.beg.row != selection.end.row 2409 && (selection.beg.row != selection.end.row
2369 || selection.end.col > TermWin.ncol))) 2410 || selection.end.col > TermWin.ncol)))
2370 CLEAR_SELECTION(); 2411 CLEAR_SELECTION ();
2371} 2412}
2372 2413
2373/* ------------------------------------------------------------------------- */ 2414/* ------------------------------------------------------------------------- */
2374/* 2415/*
2375 * Paste a selection direct to the command fd 2416 * Paste a selection direct to the command fd
… …
2377void 2418void
2378rxvt_term::paste (const unsigned char *data, unsigned int len) 2419rxvt_term::paste (const unsigned char *data, unsigned int len)
2379{ 2420{
2380 unsigned int i, j, n; 2421 unsigned int i, j, n;
2381 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2422 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2382 2423
2383#if 0 2424#if 0
2384 /* a paste should act like the user is typing, so check scrollTtyKeypress */ 2425 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2385 ZERO_SCROLLBACK (r); 2426 ZERO_SCROLLBACK (r);
2386#endif 2427#endif
2387 2428
… …
2396 ds[j] = '\r'; 2437 ds[j] = '\r';
2397 2438
2398 tt_write (ds, (int)n); 2439 tt_write (ds, (int)n);
2399 } 2440 }
2400 2441
2401 free(ds); 2442 free (ds);
2402} 2443}
2403 2444
2404/* ------------------------------------------------------------------------- */ 2445/* ------------------------------------------------------------------------- */
2405/* 2446/*
2406 * Respond to a notification that a primary selection has been sent 2447 * Respond to a notification that a primary selection has been sent
… …
2411{ 2452{
2412 long nread = 0; 2453 long nread = 0;
2413 unsigned long bytes_after; 2454 unsigned long bytes_after;
2414 XTextProperty ct; 2455 XTextProperty ct;
2415 2456
2416 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); 2457 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2417 2458
2418 if (prop == None) /* check for failed XConvertSelection */ 2459 if (prop == None) /* check for failed XConvertSelection */
2419 { 2460 {
2420 if ((selection_type & Sel_CompoundText)) 2461 if ((selection_type & Sel_CompoundText))
2421 { 2462 {
… …
2423 2464
2424 selection_type = 0; 2465 selection_type = 0;
2425 if (selnum != Sel_direct) 2466 if (selnum != Sel_direct)
2426 selection_request_other (XA_STRING, selnum); 2467 selection_request_other (XA_STRING, selnum);
2427 } 2468 }
2428 2469
2429 if ((selection_type & Sel_UTF8String)) 2470 if ((selection_type & Sel_UTF8String))
2430 { 2471 {
2431 int selnum = selection_type & Sel_whereMask; 2472 int selnum = selection_type & Sel_whereMask;
2432 2473
2433 selection_type = Sel_CompoundText; 2474 selection_type = Sel_CompoundText;
2434 if (selnum != Sel_direct) 2475 if (selnum != Sel_direct)
2435 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2476 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2436 else 2477 else
2437 selection_type = 0; 2478 selection_type = 0;
2438 } 2479 }
2439 2480
2440 return 0; 2481 return 0;
2441 } 2482 }
2442 2483
2443 for (;;) 2484 for (;;)
2444 { 2485 {
2445 if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4), 2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2446 (long)(PROP_SIZE / 4), delete_prop, 2487 (long) (PROP_SIZE / 4), delete_prop,
2447 AnyPropertyType, &ct.encoding, &ct.format, 2488 AnyPropertyType, &ct.encoding, &ct.format,
2448 &ct.nitems, &bytes_after, 2489 &ct.nitems, &bytes_after,
2449 &ct.value) != Success) 2490 &ct.value) != Success)
2450 break; 2491 break;
2451 2492
2452 if (ct.encoding == 0) 2493 if (ct.encoding == 0)
2453 { 2494 {
2454 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2455 break; 2496 break;
2456 } 2497 }
2457 2498
2458 if (ct.value == NULL) 2499 if (ct.value == NULL)
2459 { 2500 {
2460 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2501 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2461 continue; 2502 continue;
2462 } 2503 }
2463 2504
2464 if (ct.nitems == 0) 2505 if (ct.nitems == 0)
2465 { 2506 {
2466 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2467 if (selection_wait == Sel_normal && nread == 0) 2508 if (selection_wait == Sel_normal && nread == 0)
2468 { 2509 {
2469 /* 2510 /*
2470 * pass through again trying CUT_BUFFER0 if we've come from 2511 * pass through again trying CUT_BUFFER0 if we've come from
2471 * XConvertSelection() but nothing was presented 2512 * XConvertSelection () but nothing was presented
2472 */ 2513 */
2473 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2514 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2474 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2515 selection_paste (display->root, XA_CUT_BUFFER0, False);
2475 } 2516 }
2476 2517
2477 nread = -1; /* discount any previous stuff */ 2518 nread = -1; /* discount any previous stuff */
2478 break; 2519 break;
2479 } 2520 }
2480 2521
2481 nread += ct.nitems; 2522 nread += ct.nitems;
2482 2523
2483 char **cl; 2524 char **cl;
2484 int cr; 2525 int cr;
2485 if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl, 2526 if (XmbTextPropertyToTextList (display->display, &ct, &cl,
2486 &cr) >= 0 && cl) 2527 &cr) >= 0 && cl)
2487 { 2528 {
2488 for (int i = 0; i < cr; i++) 2529 for (int i = 0; i < cr; i++)
2489 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2530 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2490 2531
… …
2503 XFree (ct.value); 2544 XFree (ct.value);
2504 2545
2505 if (selection_wait == Sel_normal) 2546 if (selection_wait == Sel_normal)
2506 selection_wait = Sel_none; 2547 selection_wait = Sel_none;
2507 2548
2508 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2549 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2509 return (int)nread; 2550 return (int)nread;
2510} 2551}
2511 2552
2512void 2553void
2513rxvt_term::incr_cb (time_watcher &w) 2554rxvt_term::incr_cb (time_watcher &w)
… …
2521 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2562 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2522 */ 2563 */
2523void 2564void
2524rxvt_term::selection_property (Window win, Atom prop) 2565rxvt_term::selection_property (Window win, Atom prop)
2525{ 2566{
2526 int reget_time = 0; 2567 int reget_time = 0;
2527 2568
2528 if (prop == None) 2569 if (prop == None)
2570 return;
2571 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2572 if (selection_wait == Sel_normal)
2573 {
2574 int a, afmt;
2575 Atom atype;
2576 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL;
2578
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2580 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s);
2582 if (s)
2583 XFree (s);
2584 if (a != Success)
2529 return; 2585 return;
2530 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2531 if (selection_wait == Sel_normal) {
2532 int a, afmt;
2533 Atom atype;
2534 unsigned long bytes_after, nitems;
2535 unsigned char *s = NULL;
2536
2537 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2538 xa[XA_INCR], &atype, &afmt, &nitems,
2539 &bytes_after, &s);
2540 if (s)
2541 XFree(s);
2542 if (a != Success)
2543 return;
2544#ifndef __CYGWIN32__ 2586#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR])
2545 if (atype == xa[XA_INCR]) { /* start an INCR transfer */ 2588 { /* start an INCR transfer */
2546 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2547 XDeleteProperty(Xdisplay, win, prop); 2590 XDeleteProperty (display->display, win, prop);
2548 XFlush(Xdisplay); 2591 XFlush (display->display);
2549 reget_time = 1; 2592 reget_time = 1;
2550 selection_wait = Sel_incr; 2593 selection_wait = Sel_incr;
2551 } 2594 }
2552#endif 2595#endif
2596
2597 }
2553 } else if (selection_wait == Sel_incr) { 2598 else if (selection_wait == Sel_incr)
2599 {
2554 reget_time = 1; 2600 reget_time = 1;
2555 if (selection_paste (win, prop, True) == -1) { 2601 if (selection_paste (win, prop, True) == -1)
2602 {
2556 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2557 selection_wait = Sel_none; 2604 selection_wait = Sel_none;
2558 incr_ev.stop (); 2605 incr_ev.stop ();
2559 } 2606 }
2560 } 2607 }
2561 if (reget_time) /* received more data so reget time */ 2608 if (reget_time) /* received more data so reget time */
2562 incr_ev.start (NOW + 10); 2609 incr_ev.start (NOW + 10);
2563} 2610}
2564/* ------------------------------------------------------------------------- */ 2611/* ------------------------------------------------------------------------- */
2565/* 2612/*
2566 * Request the current selection: 2613 * Request the current selection:
2567 * Order: > internal selection if available 2614 * Order: > internal selection if available
2568 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2569 * > CUT_BUFFER0 2616 * > CUT_BUFFER0
2570 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2617 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2571 * will auto fallback to CUT_BUFFER0 2618 * will auto fallback to CUT_BUFFER0
2572 * EXT: button 2 release 2619 * EXT: button 2 release
2573 */ 2620 */
2574void 2621void
2575rxvt_term::selection_request (Time tm, int x, int y) 2622rxvt_term::selection_request (Time tm, int x, int y)
2576{ 2623{
2577 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2624 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2578 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2579 return; /* outside window */ 2626 return; /* outside window */
2580 2627
2581 if (selection.text != NULL) { /* internal selection */ 2628 if (selection.text != NULL)
2629 { /* internal selection */
2582 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2583 paste (selection.text, selection.len); 2631 paste (selection.text, selection.len);
2584 return; 2632 return;
2585 } else { 2633 }
2634 else
2635 {
2586 int i; 2636 int i;
2587 2637
2588 selection_request_time = tm; 2638 selection_request_time = tm;
2589 selection_wait = Sel_normal; 2639 selection_wait = Sel_normal;
2590 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 {
2591#if X_HAVE_UTF8_STRING 2642#if X_HAVE_UTF8_STRING
2592 selection_type = Sel_UTF8String; 2643 selection_type = Sel_UTF8String;
2593 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2644 if (selection_request_other (xa[XA_UTF8_STRING], i))
2594 return; 2645 return;
2595#else 2646#else
2596 selection_type = Sel_CompoundText; 2647 selection_type = Sel_CompoundText;
2597 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2648 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2598 return; 2649 return;
2599#endif 2650#endif
2651
2600 } 2652 }
2601 } 2653 }
2602 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2603 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2604 selection_paste (Xroot, XA_CUT_BUFFER0, False); 2656 selection_paste (display->root, XA_CUT_BUFFER0, False);
2605} 2657}
2606 2658
2607int 2659int
2608rxvt_term::selection_request_other (Atom target, int selnum) 2660rxvt_term::selection_request_other (Atom target, int selnum)
2609{ 2661{
2610 Atom sel; 2662 Atom sel;
2611#ifdef DEBUG_SELECT 2663#ifdef DEBUG_SELECT
2612 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2613#endif 2665#endif
2614 2666
2615 selection_type |= selnum; 2667 selection_type |= selnum;
2616 if (selnum == Sel_Primary) 2668 if (selnum == Sel_Primary)
2617 sel = XA_PRIMARY; 2669 sel = XA_PRIMARY;
2618 else if (selnum == Sel_Secondary) 2670 else if (selnum == Sel_Secondary)
2619 sel = XA_SECONDARY; 2671 sel = XA_SECONDARY;
2620 else 2672 else
2621 sel = xa[XA_CLIPBOARD]; 2673 sel = xa[XA_CLIPBOARD];
2622 if (XGetSelectionOwner(Xdisplay, sel) != None) { 2674 if (XGetSelectionOwner (display->display, sel) != None)
2675 {
2623 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2676 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2624 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION], 2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2625 TermWin.vt, selection_request_time); 2678 TermWin.vt, selection_request_time);
2626 return 1; 2679 return 1;
2627 } 2680 }
2628 return 0; 2681 return 0;
2629} 2682}
2630 2683
2631/* ------------------------------------------------------------------------- */ 2684/* ------------------------------------------------------------------------- */
2632/* 2685/*
2633 * Clear all selected text 2686 * Clear all selected text
2634 * EXT: SelectionClear 2687 * EXT: SelectionClear
2635 */ 2688 */
2636void 2689void
2637rxvt_term::selection_clear () 2690rxvt_term::selection_clear ()
2638{ 2691{
2639 D_SELECT((stderr, "rxvt_selection_clear()")); 2692 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2640 2693
2641 want_refresh = 1; 2694 want_refresh = 1;
2642 if (selection.text) 2695 if (selection.text)
2643 free(selection.text); 2696 free (selection.text);
2644 selection.text = NULL; 2697 selection.text = NULL;
2645 selection.len = 0; 2698 selection.len = 0;
2646 CLEAR_SELECTION(); 2699 CLEAR_SELECTION ();
2647} 2700}
2648 2701
2649/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2650/* 2703/*
2651 * Copy a selection into the cut buffer 2704 * Copy a selection into the cut buffer
2652 * EXT: button 1 or 3 release 2705 * EXT: button 1 or 3 release
2653 */ 2706 */
2654void 2707void
2655rxvt_term::selection_make (Time tm) 2708rxvt_term::selection_make (Time tm)
2656{ 2709{
2657 int i, col, end_col, row, end_row; 2710 int i, col, end_col, row, end_row;
2658 unsigned char *new_selection_text; 2711 unsigned char *new_selection_text;
2659 char *str; 2712 char *str;
2660 text_t *t; 2713 text_t *t;
2661#ifdef ACS_ASCII 2714#ifdef ACS_ASCII
2662 rend_t *re; 2715 rend_t *re;
2663#endif 2716#endif
2664 2717
2665 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2718 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2666 switch (selection.op) { 2719 switch (selection.op)
2720 {
2667 case SELECTION_CONT: 2721 case SELECTION_CONT:
2668 break; 2722 break;
2669 case SELECTION_INIT: 2723 case SELECTION_INIT:
2670 CLEAR_SELECTION(); 2724 CLEAR_SELECTION ();
2671 /* FALLTHROUGH */ 2725 /* FALLTHROUGH */
2672 case SELECTION_BEGIN: 2726 case SELECTION_BEGIN:
2673 selection.op = SELECTION_DONE; 2727 selection.op = SELECTION_DONE;
2674 /* FALLTHROUGH */ 2728 /* FALLTHROUGH */
2675 default: 2729 default:
2676 return; 2730 return;
2677 } 2731 }
2678 selection.op = SELECTION_DONE; 2732 selection.op = SELECTION_DONE;
2679 2733
2680 if (selection.clicks == 4) 2734 if (selection.clicks == 4)
2681 return; /* nothing selected, go away */ 2735 return; /* nothing selected, go away */
2682 2736
2683 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2737 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
2684 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2738 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1);
2685 2739
2686 new_selection_text = (unsigned char *)str; 2740 new_selection_text = (unsigned char *)str;
2687 2741
2688 col = selection.beg.col; 2742 col = selection.beg.col;
2689 MAX_IT(col, 0); 2743 MAX_IT (col, 0);
2690 row = selection.beg.row + TermWin.saveLines; 2744 row = selection.beg.row + TermWin.saveLines;
2691 end_row = selection.end.row + TermWin.saveLines; 2745 end_row = selection.end.row + TermWin.saveLines;
2692 2746
2693 for (; row <= end_row; row++, col = 0) 2747 for (; row <= end_row; row++, col = 0)
2748 {
2749 t = & (screen.text[row][col]);
2750
2751 end_col = screen.tlen[row];
2752
2753 if (end_col == -1)
2754 end_col = TermWin.ncol;
2755
2756 if (row == end_row)
2757 MIN_IT (end_col, selection.end.col);
2758
2759 for (; col < end_col; col++)
2760 if (*t == NOCHAR)
2761 t++;
2762 else
2763 {
2764 int len = wctomb (str, *t++);
2765 if (len > 0)
2766 str += len;
2767 }
2768
2769 if (screen.tlen[row] != -1 && row != end_row)
2770 *str++ = '\n';
2771 }
2772
2773#ifndef NO_OLD_SELECTION
2774 if (selection_style == OLD_SELECT)
2775 if (end_col == TermWin.ncol)
2776 *str++ = '\n';
2777#endif
2778#ifndef NO_NEW_SELECTION
2779 if (selection_style != OLD_SELECT)
2780 if (end_col != selection.end.col)
2781 *str++ = '\n';
2782#endif
2783 *str = '\0';
2784
2785 i = str - (char *)new_selection_text;
2786 if (i == 0)
2787 {
2788 free (new_selection_text);
2789 return;
2790 }
2791
2792 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2793 if (str - (char *)new_selection_text > 1024)
2794 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2795
2796 selection.len = i;
2797
2798 if (selection.text)
2799 free (selection.text);
2800
2801 selection.text = new_selection_text;
2802
2803 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2804 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2805 display->set_selection_owner (this);
2806 else
2807 rxvt_print_error ("can't get primary selection");
2808
2809 {
2810 XTextProperty ct;
2811 char *cl = (char *)selection.text;
2812
2813 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0)
2694 { 2814 {
2695 t = &(screen.text[row][col]); 2815 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2696 2816 PropModeReplace, ct.value, ct.nitems);
2697 end_col = screen.tlen[row]; 2817 XFree (ct.value);
2698
2699 if (end_col == -1)
2700 end_col = TermWin.ncol;
2701
2702 if (row == end_row)
2703 MIN_IT (end_col, selection.end.col);
2704
2705 for (; col < end_col; col++)
2706 if (*t == NOCHAR)
2707 t++;
2708 else
2709 {
2710 int len = wctomb (str, *t++);
2711 if (len > 0)
2712 str += len;
2713 }
2714
2715 if (screen.tlen[row] != -1 && row != end_row)
2716 *str++ = '\n';
2717 } 2818 }
2718
2719#ifndef NO_OLD_SELECTION
2720 if (selection_style == OLD_SELECT)
2721 if (end_col == TermWin.ncol)
2722 *str++ = '\n';
2723#endif
2724#ifndef NO_NEW_SELECTION
2725 if (selection_style != OLD_SELECT)
2726 if (end_col != selection.end.col)
2727 *str++ = '\n';
2728#endif
2729 *str = '\0';
2730
2731 i = str - (char *)new_selection_text;
2732 if (i == 0)
2733 {
2734 free (new_selection_text);
2735 return;
2736 }
2737
2738 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2739 if (str - (char *)new_selection_text > 1024)
2740 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2741
2742 selection.len = i;
2743
2744 if (selection.text)
2745 free (selection.text);
2746
2747 selection.text = new_selection_text;
2748
2749 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2750 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2751 rxvt_print_error("can't get primary selection");
2752
2753
2754 {
2755 XTextProperty ct;
2756 char *cl = (char *)selection.text;
2757
2758 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2759 {
2760 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2761 PropModeReplace, ct.value, ct.nitems);
2762 XFree (ct.value);
2763 }
2764 else 2819 else
2765 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2820 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2766 PropModeReplace, selection.text, (int)selection.len); 2821 PropModeReplace, selection.text, (int)selection.len);
2767 } 2822 }
2768 2823
2769 selection_time = tm; 2824 selection_time = tm;
2770 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); 2825 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2771} 2826}
2772 2827
2773/* ------------------------------------------------------------------------- */ 2828/* ------------------------------------------------------------------------- */
2774/* 2829/*
2775 * Mark or select text based upon number of clicks: 1, 2, or 3 2830 * Mark or select text based upon number of clicks: 1, 2, or 3
2776 * EXT: button 1 press 2831 * EXT: button 1 press
2777 */ 2832 */
2778void 2833void
2779rxvt_term::selection_click (int clicks, int x, int y) 2834rxvt_term::selection_click (int clicks, int x, int y)
2780{ 2835{
2781 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2836 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2782 2837
2783 clicks = ((clicks - 1) % 3) + 1; 2838 clicks = ((clicks - 1) % 3) + 1;
2784 selection.clicks = clicks; /* save clicks so extend will work */ 2839 selection.clicks = clicks; /* save clicks so extend will work */
2785 2840
2786 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 2841 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2787 2842
2788 if (clicks == 2 || clicks == 3) 2843 if (clicks == 2 || clicks == 3)
2789 selection_extend_colrow (selection.mark.col, 2844 selection_extend_colrow (selection.mark.col,
2790 selection.mark.row + TermWin.view_start, 2845 selection.mark.row + TermWin.view_start,
2791 0, /* button 3 */ 2846 0, /* button 3 */
2792 1, /* button press */ 2847 1, /* button press */
2793 0); /* click change */ 2848 0); /* click change */
2794} 2849}
2795 2850
2796/* ------------------------------------------------------------------------- */ 2851/* ------------------------------------------------------------------------- */
2797/* 2852/*
2798 * Mark a selection at the specified col/row 2853 * Mark a selection at the specified col/row
2799 */ 2854 */
2800void 2855void
2801rxvt_term::selection_start_colrow (int col, int row) 2856rxvt_term::selection_start_colrow (int col, int row)
2802{ 2857{
2803 want_refresh = 1; 2858 want_refresh = 1;
2804 selection.mark.col = col; 2859 selection.mark.col = col;
2805 selection.mark.row = row - TermWin.view_start; 2860 selection.mark.row = row - TermWin.view_start;
2806 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 2861 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2807 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 2862 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2808 MAX_IT(selection.mark.col, 0); 2863 MAX_IT (selection.mark.col, 0);
2809 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); 2864 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2810 2865
2811 if (selection.op) { /* clear the old selection */ 2866 if (selection.op)
2867 { /* clear the old selection */
2812 selection.beg.row = selection.end.row = selection.mark.row; 2868 selection.beg.row = selection.end.row = selection.mark.row;
2813 selection.beg.col = selection.end.col = selection.mark.col; 2869 selection.beg.col = selection.end.col = selection.mark.col;
2814 } 2870 }
2815 selection.op = SELECTION_INIT; 2871 selection.op = SELECTION_INIT;
2816 selection.screen = current_screen; 2872 selection.screen = current_screen;
2817} 2873}
2818 2874
2819/* ------------------------------------------------------------------------- */ 2875/* ------------------------------------------------------------------------- */
2820/* 2876/*
2821 * Word select: select text for 2 clicks 2877 * Word select: select text for 2 clicks
2822 * We now only find out the boundary in one direction 2878 * We now only find out the boundary in one direction
2823 */ 2879 */
2824 2880
2825/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2881/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2826#define DELIMIT_TEXT(x) \ 2882#define DELIMIT_TEXT(x) \
2827 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) 2883 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL))
2828#define DELIMIT_REND(x) 1 2884#define DELIMIT_REND(x) 1
2829 2885
2830void 2886void
2831rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2887rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2832{ 2888{
2833 int col, row, dirnadd, tcol, trow, w1, w2; 2889 int col, row, dirnadd, tcol, trow, w1, w2;
2834 row_col_t bound; 2890 row_col_t bound;
2835 text_t *stp; 2891 text_t *stp;
2836 rend_t *srp; 2892 rend_t *srp;
2837 2893
2838 if (dirn == UP) { 2894 if (dirn == UP)
2895 {
2839 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2896 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2840 bound.col = 0; 2897 bound.col = 0;
2841 dirnadd = -1; 2898 dirnadd = -1;
2842 } else { 2899 }
2900 else
2901 {
2843 bound.row = TermWin.saveLines + TermWin.nrow; 2902 bound.row = TermWin.saveLines + TermWin.nrow;
2844 bound.col = TermWin.ncol - 1; 2903 bound.col = TermWin.ncol - 1;
2845 dirnadd = 1; 2904 dirnadd = 1;
2846 } 2905 }
2847 row = mark->row + TermWin.saveLines; 2906 row = mark->row + TermWin.saveLines;
2848 col = mark->col; 2907 col = mark->col;
2849 MAX_IT(col, 0); 2908 MAX_IT (col, 0);
2850/* find the edge of a word */ 2909 /* find the edge of a word */
2851 stp = &(screen.text[row][col]); 2910 stp = & (screen.text[row][col]);
2852 w1 = DELIMIT_TEXT(*stp); 2911 w1 = DELIMIT_TEXT (*stp);
2853 2912
2854 if (selection_style != NEW_SELECT) { 2913 if (selection_style != NEW_SELECT)
2914 {
2855 if (w1 == 1) { 2915 if (w1 == 1)
2916 {
2856 stp += dirnadd; 2917 stp += dirnadd;
2857 if (DELIMIT_TEXT(*stp) == 1) 2918 if (DELIMIT_TEXT (*stp) == 1)
2858 goto Old_Word_Selection_You_Die; 2919 goto Old_Word_Selection_You_Die;
2859 col += dirnadd; 2920 col += dirnadd;
2860 } 2921 }
2861 w1 = 0; 2922 w1 = 0;
2862 } 2923 }
2863 srp = (&screen.rend[row][col]); 2924 srp = (&screen.rend[row][col]);
2864 w2 = DELIMIT_REND(*srp); 2925 w2 = DELIMIT_REND (*srp);
2865 2926
2866 for (;;) { 2927 for (;;)
2928 {
2867 for (; col != bound.col; col += dirnadd) { 2929 for (; col != bound.col; col += dirnadd)
2930 {
2868 stp += dirnadd; 2931 stp += dirnadd;
2869 if (DELIMIT_TEXT(*stp) != w1) 2932 if (DELIMIT_TEXT (*stp) != w1)
2933 break;
2934 srp += dirnadd;
2935 if (DELIMIT_REND (*srp) != w2)
2936 break;
2937 }
2938 if ((col == bound.col) && (row != bound.row))
2939 {
2940 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2941 {
2942 trow = row + dirnadd;
2943 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2944 if (screen.text[trow] == NULL)
2870 break; 2945 break;
2871 srp += dirnadd; 2946 stp = & (screen.text[trow][tcol]);
2872 if (DELIMIT_REND(*srp) != w2) 2947 srp = & (screen.rend[trow][tcol]);
2948 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2873 break; 2949 break;
2874 }
2875 if ((col == bound.col) && (row != bound.row)) {
2876 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2877 trow = row + dirnadd;
2878 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2879 if (screen.text[trow] == NULL)
2880 break;
2881 stp = &(screen.text[trow][tcol]);
2882 srp = &(screen.rend[trow][tcol]);
2883 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2884 break;
2885 row = trow; 2950 row = trow;
2886 col = tcol; 2951 col = tcol;
2887 continue; 2952 continue;
2888 } 2953 }
2889 } 2954 }
2890 break; 2955 break;
2891 } 2956 }
2892 Old_Word_Selection_You_Die: 2957Old_Word_Selection_You_Die:
2893 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 2958 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2894 2959
2895 if (dirn == DN) 2960 if (dirn == DN)
2896 col++; /* put us on one past the end */ 2961 col++; /* put us on one past the end */
2897 2962
2898/* Poke the values back in */ 2963 /* Poke the values back in */
2899 ret->row = row - TermWin.saveLines; 2964 ret->row = row - TermWin.saveLines;
2900 ret->col = col; 2965 ret->col = col;
2901} 2966}
2902 2967
2903/* ------------------------------------------------------------------------- */ 2968/* ------------------------------------------------------------------------- */
2904/* 2969/*
2905 * Extend the selection to the specified x/y pixel location 2970 * Extend the selection to the specified x/y pixel location
… …
2911void 2976void
2912rxvt_term::selection_extend (int x, int y, int flag) 2977rxvt_term::selection_extend (int x, int y, int flag)
2913{ 2978{
2914 int col, row; 2979 int col, row;
2915 2980
2916 col = Pixel2Col(x); 2981 col = Pixel2Col (x);
2917 row = Pixel2Row(y); 2982 row = Pixel2Row (y);
2918 MAX_IT(row, 0); 2983 MAX_IT (row, 0);
2919 MIN_IT(row, (int)TermWin.nrow - 1); 2984 MIN_IT (row, (int)TermWin.nrow - 1);
2920 MAX_IT(col, 0); 2985 MAX_IT (col, 0);
2921 MIN_IT(col, (int)TermWin.ncol); 2986 MIN_IT (col, (int)TermWin.ncol);
2922 2987
2923#ifndef NO_NEW_SELECTION 2988#ifndef NO_NEW_SELECTION
2924 /* 2989 /*
2925 * If we're selecting characters (single click) then we must check first 2990 * If we're selecting characters (single click) then we must check first
2926 * if we are at the same place as the original mark. If we are then 2991 * if we are at the same place as the original mark. If we are then
… …
2936 /* select nothing */ 3001 /* select nothing */
2937 selection.beg.row = selection.end.row = 0; 3002 selection.beg.row = selection.end.row = 0;
2938 selection.beg.col = selection.end.col = 0; 3003 selection.beg.col = selection.end.col = 0;
2939 selection.clicks = 4; 3004 selection.clicks = 4;
2940 want_refresh = 1; 3005 want_refresh = 1;
2941 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4")); 3006 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
2942 return; 3007 return;
2943 } 3008 }
2944 } 3009 }
2945#endif 3010#endif
2946 if (selection.clicks == 4) 3011 if (selection.clicks == 4)
2947 selection.clicks = 1; 3012 selection.clicks = 1;
2948 3013
2949 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3014 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2950 flag == 1 ? 1 : 0, /* ? button press */ 3015 flag == 1 ? 1 : 0, /* ? button press */
2951 0); /* no click change */ 3016 0); /* no click change */
2952} 3017}
2953 3018
2954/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2955/* 3020/*
2956 * Extend the selection to the specified col/row 3021 * Extend the selection to the specified col/row
2957 */ 3022 */
2958void 3023void
2959rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3024rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2960{ 3025{
2961 int16_t ncol = TermWin.ncol; 3026 int16_t ncol = TermWin.ncol;
2962 int end_col; 3027 int end_col;
2963 row_col_t pos; 3028 row_col_t pos;
2964 enum { 3029 enum {
2965 LEFT, RIGHT 3030 LEFT, RIGHT
2966 } closeto = RIGHT; 3031 } closeto = RIGHT;
2967 3032
2968 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 3033 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
2969 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3034 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
2970 3035
2971 want_refresh = 1; 3036 want_refresh = 1;
2972 switch (selection.op) { 3037 switch (selection.op)
3038 {
2973 case SELECTION_INIT: 3039 case SELECTION_INIT:
2974 CLEAR_SELECTION(); 3040 CLEAR_SELECTION ();
2975 selection.op = SELECTION_BEGIN; 3041 selection.op = SELECTION_BEGIN;
2976 /* FALLTHROUGH */ 3042 /* FALLTHROUGH */
2977 case SELECTION_BEGIN: 3043 case SELECTION_BEGIN:
2978 if (row != selection.mark.row || col != selection.mark.col 3044 if (row != selection.mark.row || col != selection.mark.col
2979 || (!button3 && buttonpress)) 3045 || (!button3 && buttonpress))
2980 selection.op = SELECTION_CONT; 3046 selection.op = SELECTION_CONT;
2981 break; 3047 break;
2982 case SELECTION_DONE: 3048 case SELECTION_DONE:
2983 selection.op = SELECTION_CONT; 3049 selection.op = SELECTION_CONT;
2984 /* FALLTHROUGH */ 3050 /* FALLTHROUGH */
2985 case SELECTION_CONT: 3051 case SELECTION_CONT:
2986 break; 3052 break;
2987 case SELECTION_CLEAR: 3053 case SELECTION_CLEAR:
2988 selection_start_colrow (col, row); 3054 selection_start_colrow (col, row);
2989 /* FALLTHROUGH */ 3055 /* FALLTHROUGH */
2990 default: 3056 default:
2991 return; 3057 return;
2992 } 3058 }
2993 if (selection.beg.col == selection.end.col 3059 if (selection.beg.col == selection.end.col
2994 && selection.beg.col != selection.mark.col 3060 && selection.beg.col != selection.mark.col
2995 && selection.beg.row == selection.end.row 3061 && selection.beg.row == selection.end.row
2996 && selection.beg.row != selection.mark.row) { 3062 && selection.beg.row != selection.mark.row)
3063 {
2997 selection.beg.col = selection.end.col = selection.mark.col; 3064 selection.beg.col = selection.end.col = selection.mark.col;
2998 selection.beg.row = selection.end.row = selection.mark.row; 3065 selection.beg.row = selection.end.row = selection.mark.row;
2999 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3066 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3000 } 3067 }
3001 3068
3002 pos.col = col; 3069 pos.col = col;
3003 pos.row = row; 3070 pos.row = row;
3004 3071
3005 pos.row -= TermWin.view_start; /* adjust for scroll */ 3072 pos.row -= TermWin.view_start; /* adjust for scroll */
3006 3073
3007#ifndef NO_OLD_SELECTION 3074#ifndef NO_OLD_SELECTION
3008/* 3075 /*
3009 * This mimics some of the selection behaviour of version 2.20 and before. 3076 * This mimics some of the selection behaviour of version 2.20 and before.
3010 * There are no ``selection modes'', button3 is always character extension. 3077 * There are no ``selection modes'', button3 is always character extension.
3011 * Note: button3 drag is always available, c.f. v2.20 3078 * Note: button3 drag is always available, c.f. v2.20
3012 * Selection always terminates (left or right as appropriate) at the mark. 3079 * Selection always terminates (left or right as appropriate) at the mark.
3013 */ 3080 */
3014 if (selection_style == OLD_SELECT) { 3081 if (selection_style == OLD_SELECT)
3082 {
3015 if (selection.clicks == 1 || button3) { 3083 if (selection.clicks == 1 || button3)
3084 {
3016 if (hate_those_clicks) { 3085 if (hate_those_clicks)
3086 {
3017 hate_those_clicks = 0; 3087 hate_those_clicks = 0;
3018 if (selection.clicks == 1) { 3088 if (selection.clicks == 1)
3089 {
3019 selection.beg.row = selection.mark.row; 3090 selection.beg.row = selection.mark.row;
3020 selection.beg.col = selection.mark.col; 3091 selection.beg.col = selection.mark.col;
3092 }
3021 } else { 3093 else
3094 {
3022 selection.mark.row = selection.beg.row; 3095 selection.mark.row = selection.beg.row;
3023 selection.mark.col = selection.beg.col; 3096 selection.mark.col = selection.beg.col;
3024 } 3097 }
3025 } 3098 }
3026 if (ROWCOL_IS_BEFORE(pos, selection.mark)) { 3099 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3100 {
3027 selection.end.row = selection.mark.row; 3101 selection.end.row = selection.mark.row;
3028 selection.end.col = selection.mark.col + 1; 3102 selection.end.col = selection.mark.col + 1;
3029 selection.beg.row = pos.row; 3103 selection.beg.row = pos.row;
3030 selection.beg.col = pos.col; 3104 selection.beg.col = pos.col;
3031 } else {
3032 selection.beg.row = selection.mark.row;
3033 selection.beg.col = selection.mark.col;
3034 selection.end.row = pos.row;
3035 selection.end.col = pos.col + 1;
3036 } 3105 }
3106 else
3107 {
3108 selection.beg.row = selection.mark.row;
3109 selection.beg.col = selection.mark.col;
3110 selection.end.row = pos.row;
3111 selection.end.col = pos.col + 1;
3112 }
3113 }
3037 } else if (selection.clicks == 2) { 3114 else if (selection.clicks == 2)
3115 {
3038 selection_delimit_word (UP, &(selection.mark), 3116 selection_delimit_word (UP, & (selection.mark),
3039 &(selection.beg)); 3117 & (selection.beg));
3040 selection_delimit_word (DN, &(selection.mark), 3118 selection_delimit_word (DN, & (selection.mark),
3041 &(selection.end)); 3119 & (selection.end));
3042 hate_those_clicks = 1; 3120 hate_those_clicks = 1;
3121 }
3043 } else if (selection.clicks == 3) { 3122 else if (selection.clicks == 3)
3123 {
3044 selection.beg.row = selection.end.row = selection.mark.row; 3124 selection.beg.row = selection.end.row = selection.mark.row;
3045 selection.beg.col = 0; 3125 selection.beg.col = 0;
3046 selection.end.col = ncol; 3126 selection.end.col = ncol;
3047 hate_those_clicks = 1; 3127 hate_those_clicks = 1;
3048 } 3128 }
3049 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3129 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3050 return; 3130 return;
3051 } 3131 }
3052#endif /* ! NO_OLD_SELECTION */ 3132#endif /* ! NO_OLD_SELECTION */
3053#ifndef NO_NEW_SELECTION 3133#ifndef NO_NEW_SELECTION
3054/* selection_style must not be OLD_SELECT to get here */ 3134 /* selection_style must not be OLD_SELECT to get here */
3055/* 3135 /*
3056 * This is mainly xterm style selection with a couple of differences, mainly 3136 * This is mainly xterm style selection with a couple of differences, mainly
3057 * in the way button3 drag extension works. 3137 * in the way button3 drag extension works.
3058 * We're either doing: button1 drag; button3 press; or button3 drag 3138 * We're either doing: button1 drag; button3 press; or button3 drag
3059 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3139 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3060 * is always at the left/right edge of the selection. 3140 * is always at the left/right edge of the selection.
3061 * b) button3 press: extend/contract character/word/line at whichever edge of 3141 * b) button3 press: extend/contract character/word/line at whichever edge of
3062 * the selection we are closest to. 3142 * the selection we are closest to.
3063 * c) button3 drag : extend/contract character/word/line - we select around 3143 * c) button3 drag : extend/contract character/word/line - we select around
3064 * a point/word/line which is either the start or end of the selection 3144 * a point/word/line which is either the start or end of the selection
3065 * and it was decided by whichever point/word/line was `fixed' at the 3145 * and it was decided by whichever point/word/line was `fixed' at the
3066 * time of the most recent button3 press 3146 * time of the most recent button3 press
3067 */ 3147 */
3068 if (button3 && buttonpress) { /* button3 press */ 3148 if (button3 && buttonpress)
3149 { /* button3 press */
3069 /* 3150 /*
3070 * first determine which edge of the selection we are closest to 3151 * first determine which edge of the selection we are closest to
3071 */ 3152 */
3072 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3153 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3073 || (!ROWCOL_IS_AFTER(pos, selection.end) 3154 || (!ROWCOL_IS_AFTER (pos, selection.end)
3074 && (((pos.col - selection.beg.col) 3155 && (((pos.col - selection.beg.col)
3075 + ((pos.row - selection.beg.row) * ncol)) 3156 + ((pos.row - selection.beg.row) * ncol))
3076 < ((selection.end.col - pos.col) 3157 < ((selection.end.col - pos.col)
3077 + ((selection.end.row - pos.row) * ncol))))) 3158 + ((selection.end.row - pos.row) * ncol)))))
3078 closeto = LEFT; 3159 closeto = LEFT;
3079 if (closeto == LEFT) { 3160 if (closeto == LEFT)
3161 {
3080 selection.beg.row = pos.row; 3162 selection.beg.row = pos.row;
3081 selection.beg.col = pos.col; 3163 selection.beg.col = pos.col;
3082 selection.mark.row = selection.end.row; 3164 selection.mark.row = selection.end.row;
3083 selection.mark.col = selection.end.col 3165 selection.mark.col = selection.end.col
3084 - (selection.clicks == 2); 3166 - (selection.clicks == 2);
3167 }
3085 } else { 3168 else
3169 {
3086 selection.end.row = pos.row; 3170 selection.end.row = pos.row;
3087 selection.end.col = pos.col; 3171 selection.end.col = pos.col;
3088 selection.mark.row = selection.beg.row; 3172 selection.mark.row = selection.beg.row;
3089 selection.mark.col = selection.beg.col; 3173 selection.mark.col = selection.beg.col;
3090 } 3174 }
3175 }
3176 else
3091 } else { /* button1 drag or button3 drag */ 3177 { /* button1 drag or button3 drag */
3092 if (ROWCOL_IS_AFTER(selection.mark, pos)) { 3178 if (ROWCOL_IS_AFTER (selection.mark, pos))
3179 {
3093 if ((selection.mark.row == selection.end.row) 3180 if ((selection.mark.row == selection.end.row)
3094 && (selection.mark.col == selection.end.col) 3181 && (selection.mark.col == selection.end.col)
3095 && clickchange && selection.clicks == 2) 3182 && clickchange && selection.clicks == 2)
3096 selection.mark.col--; 3183 selection.mark.col--;
3097 selection.beg.row = pos.row; 3184 selection.beg.row = pos.row;
3098 selection.beg.col = pos.col; 3185 selection.beg.col = pos.col;
3099 selection.end.row = selection.mark.row; 3186 selection.end.row = selection.mark.row;
3100 selection.end.col = selection.mark.col 3187 selection.end.col = selection.mark.col
3101 + (selection.clicks == 2); 3188 + (selection.clicks == 2);
3189 }
3102 } else { 3190 else
3191 {
3103 selection.beg.row = selection.mark.row; 3192 selection.beg.row = selection.mark.row;
3193 selection.beg.col = selection.mark.col;
3194 selection.end.row = pos.row;
3195 selection.end.col = pos.col;
3196 }
3197 }
3198
3199 if (selection.clicks == 1)
3200 {
3201 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3202 if (end_col != -1 && selection.beg.col > end_col)
3203 {
3204#if 1
3205 selection.beg.col = ncol;
3206#else
3207 if (selection.beg.row != selection.end.row)
3208 selection.beg.col = ncol;
3209 else
3104 selection.beg.col = selection.mark.col; 3210 selection.beg.col = selection.mark.col;
3105 selection.end.row = pos.row;
3106 selection.end.col = pos.col;
3107 }
3108 }
3109
3110 if (selection.clicks == 1) {
3111 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3112 if (end_col != -1 && selection.beg.col > end_col) {
3113#if 1
3114 selection.beg.col = ncol;
3115#else
3116 if (selection.beg.row != selection.end.row)
3117 selection.beg.col = ncol;
3118 else
3119 selection.beg.col = selection.mark.col;
3120#endif 3211#endif
3212
3121 } 3213 }
3122 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3214 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3123 if (end_col != -1 && selection.end.col > end_col) 3215 if (end_col != -1 && selection.end.col > end_col)
3124 selection.end.col = ncol; 3216 selection.end.col = ncol;
3125 3217
3218 }
3126 } else if (selection.clicks == 2) { 3219 else if (selection.clicks == 2)
3220 {
3127 if (ROWCOL_IS_AFTER(selection.end, selection.beg)) 3221 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3128 selection.end.col--; 3222 selection.end.col--;
3129 selection_delimit_word (UP, &(selection.beg), 3223 selection_delimit_word (UP, & (selection.beg),
3130 &(selection.beg)); 3224 & (selection.beg));
3131 selection_delimit_word (DN, &(selection.end), 3225 selection_delimit_word (DN, & (selection.end),
3132 &(selection.end)); 3226 & (selection.end));
3227 }
3133 } else if (selection.clicks == 3) { 3228 else if (selection.clicks == 3)
3229 {
3134#ifndef NO_FRILLS 3230#ifndef NO_FRILLS
3135 if ((Options & Opt_tripleclickwords)) { 3231 if ((Options & Opt_tripleclickwords))
3232 {
3136 int end_row; 3233 int end_row;
3137 3234
3138 selection_delimit_word (UP, &(selection.beg), 3235 selection_delimit_word (UP, & (selection.beg),
3139 &(selection.beg)); 3236 & (selection.beg));
3140 end_row = screen.tlen[selection.mark.row 3237 end_row = screen.tlen[selection.mark.row
3141 + TermWin.saveLines]; 3238 + TermWin.saveLines];
3142 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3239 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3143 end_row++) { 3240 end_row++)
3241 {
3144 end_col = screen.tlen[end_row + TermWin.saveLines]; 3242 end_col = screen.tlen[end_row + TermWin.saveLines];
3145 if (end_col != -1) { 3243 if (end_col != -1)
3244 {
3146 selection.end.row = end_row; 3245 selection.end.row = end_row;
3147 selection.end.col = end_col; 3246 selection.end.col = end_col;
3148 selection_remove_trailing_spaces (); 3247 selection_remove_trailing_spaces ();
3149 break; 3248 break;
3150 } 3249 }
3151 } 3250 }
3152 } else
3153#endif
3154 { 3251 }
3252 else
3253#endif
3254
3255 {
3155 if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) 3256 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3156 selection.mark.col++; 3257 selection.mark.col++;
3157 selection.beg.col = 0; 3258 selection.beg.col = 0;
3158 selection.end.col = ncol; 3259 selection.end.col = ncol;
3159 } 3260 }
3160 } 3261 }
3262 if (button3 && buttonpress)
3161 if (button3 && buttonpress) { /* mark may need to be changed */ 3263 { /* mark may need to be changed */
3162 if (closeto == LEFT) { 3264 if (closeto == LEFT)
3265 {
3163 selection.mark.row = selection.end.row; 3266 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col 3267 selection.mark.col = selection.end.col
3165 - (selection.clicks == 2); 3268 - (selection.clicks == 2);
3269 }
3166 } else { 3270 else
3271 {
3167 selection.mark.row = selection.beg.row; 3272 selection.mark.row = selection.beg.row;
3168 selection.mark.col = selection.beg.col; 3273 selection.mark.col = selection.beg.col;
3169 } 3274 }
3170 } 3275 }
3171 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3276 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3172#endif /* ! NO_NEW_SELECTION */ 3277#endif /* ! NO_NEW_SELECTION */
3173} 3278}
3174 3279
3175#ifndef NO_FRILLS 3280#ifndef NO_FRILLS
3176void 3281void
3177rxvt_term::selection_remove_trailing_spaces () 3282rxvt_term::selection_remove_trailing_spaces ()
3178{ 3283{
3179 int32_t end_col, end_row; 3284 int32_t end_col, end_row;
3180 text_t *stp; 3285 text_t *stp;
3181 3286
3182 end_col = selection.end.col; 3287 end_col = selection.end.col;
3183 end_row = selection.end.row; 3288 end_row = selection.end.row;
3184 for ( ; end_row >= selection.beg.row; ) { 3289 for ( ; end_row >= selection.beg.row; )
3290 {
3185 stp = screen.text[end_row + TermWin.saveLines]; 3291 stp = screen.text[end_row + TermWin.saveLines];
3186 while (--end_col >= 0) { 3292 while (--end_col >= 0)
3293 {
3187 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3294 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3188 break;
3189 }
3190 if (end_col >= 0
3191 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) {
3192 selection.end.col = end_col + 1;
3193 selection.end.row = end_row;
3194 break; 3295 break;
3195 } 3296 }
3297 if (end_col >= 0
3298 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3299 {
3300 selection.end.col = end_col + 1;
3301 selection.end.row = end_row;
3302 break;
3303 }
3196 end_row--; 3304 end_row--;
3197 end_col = TermWin.ncol; 3305 end_col = TermWin.ncol;
3198 } 3306 }
3199 if (selection.mark.row > selection.end.row) { 3307 if (selection.mark.row > selection.end.row)
3308 {
3200 selection.mark.row = selection.end.row; 3309 selection.mark.row = selection.end.row;
3201 selection.mark.col = selection.end.col; 3310 selection.mark.col = selection.end.col;
3311 }
3202 } else if (selection.mark.row == selection.end.row 3312 else if (selection.mark.row == selection.end.row
3203 && selection.mark.col > selection.end.col) 3313 && selection.mark.col > selection.end.col)
3204 selection.mark.col = selection.end.col; 3314 selection.mark.col = selection.end.col;
3205} 3315}
3206#endif 3316#endif
3207 3317
3208/* ------------------------------------------------------------------------- */ 3318/* ------------------------------------------------------------------------- */
3209/* 3319/*
… …
3212 */ 3322 */
3213void 3323void
3214rxvt_term::selection_rotate (int x, int y) 3324rxvt_term::selection_rotate (int x, int y)
3215{ 3325{
3216 selection.clicks = selection.clicks % 3 + 1; 3326 selection.clicks = selection.clicks % 3 + 1;
3217 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3327 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3218} 3328}
3219 3329
3220/* ------------------------------------------------------------------------- */ 3330/* ------------------------------------------------------------------------- */
3221/* 3331/*
3222 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3332 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
… …
3229/* 3339/*
3230 * Respond to a request for our current selection 3340 * Respond to a request for our current selection
3231 * EXT: SelectionRequest 3341 * EXT: SelectionRequest
3232 */ 3342 */
3233void 3343void
3234rxvt_term::selection_send (const XSelectionRequestEvent *rq) 3344rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3235{ 3345{
3236 XSelectionEvent ev; 3346 XSelectionEvent ev;
3237 XTextProperty ct; 3347 XTextProperty ct;
3238 XICCEncodingStyle style; 3348 XICCEncodingStyle style;
3239 Atom target; 3349 Atom target;
3240 3350
3241 ev.type = SelectionNotify; 3351 ev.type = SelectionNotify;
3242 ev.property = None; 3352 ev.property = None;
3243 ev.display = rq->display; 3353 ev.display = rq.display;
3244 ev.requestor = rq->requestor; 3354 ev.requestor = rq.requestor;
3245 ev.selection = rq->selection; 3355 ev.selection = rq.selection;
3246 ev.target = rq->target; 3356 ev.target = rq.target;
3247 ev.time = rq->time; 3357 ev.time = rq.time;
3248 3358
3249 if (rq->target == xa[XA_TARGETS]) { 3359 if (rq.target == xa[XA_TARGETS])
3360 {
3250 Atom32 target_list[5]; 3361 Atom32 target_list[5];
3251 Atom32 *target = target_list; 3362 Atom32 *target = target_list;
3252 3363
3253 *target++ = (Atom32) xa[XA_TARGETS]; 3364 *target++ = (Atom32) xa[XA_TARGETS];
3254 *target++ = (Atom32) XA_STRING; 3365 *target++ = (Atom32) XA_STRING;
3255 *target++ = (Atom32) xa[XA_TEXT]; 3366 *target++ = (Atom32) xa[XA_TEXT];
3256 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3367 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3257#if X_HAVE_UTF8_STRING 3368#if X_HAVE_UTF8_STRING
3258 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3369 *target++ = (Atom32) xa[XA_UTF8_STRING];
3259#endif 3370#endif
3260 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM, 3371 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3261 (8 * sizeof(target_list[0])), PropModeReplace, 3372 (8 * sizeof (target_list[0])), PropModeReplace,
3262 (unsigned char *)target_list, 3373 (unsigned char *)target_list,
3263 target - target_list); 3374 target - target_list);
3264 ev.property = rq->property; 3375 ev.property = rq.property;
3376 }
3265 } else if (rq->target == xa[XA_MULTIPLE]) { 3377 else if (rq.target == xa[XA_MULTIPLE])
3378 {
3266 /* TODO: Handle MULTIPLE */ 3379 /* TODO: Handle MULTIPLE */
3380 }
3267 } else if (rq->target == xa[XA_TIMESTAMP] && selection.text) { 3381 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3382 {
3268 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3383 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3269 (8 * sizeof(Time)), PropModeReplace, 3384 (8 * sizeof (Time)), PropModeReplace,
3270 (unsigned char *)&selection_time, 1); 3385 (unsigned char *)&selection_time, 1);
3271 ev.property = rq->property; 3386 ev.property = rq.property;
3387 }
3272 } else if (rq->target == XA_STRING 3388 else if (rq.target == XA_STRING
3273 || rq->target == xa[XA_TEXT] 3389 || rq.target == xa[XA_TEXT]
3274 || rq->target == xa[XA_COMPOUND_TEXT] 3390 || rq.target == xa[XA_COMPOUND_TEXT]
3275 || rq->target == xa[XA_UTF8_STRING] 3391 || rq.target == xa[XA_UTF8_STRING]
3276 ) { 3392 )
3393 {
3277 short freect = 0; 3394 short freect = 0;
3278 int selectlen; 3395 int selectlen;
3279 char *cl; 3396 char *cl;
3280 3397
3281 target = rq->target; 3398 target = rq.target;
3282 3399
3283 if (target == XA_STRING) 3400 if (target == XA_STRING)
3284 // we actually don't do XA_STRING, but who cares, as i18n clients 3401 // we actually don't do XA_STRING, but who cares, as i18n clients
3285 // will ask for another format anyways. 3402 // will ask for another format anyways.
3286 style = XStringStyle; 3403 style = XStringStyle;
3287 else if (target == xa[XA_TEXT]) 3404 else if (target == xa[XA_TEXT])
3288 style = XTextStyle; 3405 style = XTextStyle;
3289 else if (target == xa[XA_COMPOUND_TEXT]) 3406 else if (target == xa[XA_COMPOUND_TEXT])
3407 style = XCompoundTextStyle;
3408#if X_HAVE_UTF8_STRING
3409 else if (target == xa[XA_UTF8_STRING])
3410 style = XUTF8StringStyle;
3411#endif
3412 else
3413 {
3414 target = xa[XA_COMPOUND_TEXT];
3290 style = XCompoundTextStyle; 3415 style = XCompoundTextStyle;
3291#if X_HAVE_UTF8_STRING
3292 else if (target == xa[XA_UTF8_STRING])
3293 style = XUTF8StringStyle;
3294#endif
3295 else
3296 {
3297 target = xa[XA_COMPOUND_TEXT];
3298 style = XCompoundTextStyle;
3299 } 3416 }
3300 3417
3301 if (selection.text) { 3418 if (selection.text)
3419 {
3302 cl = (char *)selection.text; 3420 cl = (char *)selection.text;
3303 selectlen = selection.len; 3421 selectlen = selection.len;
3422 }
3304 } else { 3423 else
3424 {
3305 cl = ""; 3425 cl = "";
3306 selectlen = 0; 3426 selectlen = 0;
3307 } 3427 }
3308 3428
3309 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0) 3429 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3310 freect = 1; 3430 freect = 1;
3311 else 3431 else
3312 { 3432 {
3313 /* if we failed to convert then send it raw */ 3433 /* if we failed to convert then send it raw */
3314 ct.value = (unsigned char *)cl; 3434 ct.value = (unsigned char *)cl;
3315 ct.nitems = selectlen; 3435 ct.nitems = selectlen;
3316 } 3436 }
3317 3437
3318 XChangeProperty(Xdisplay, rq->requestor, rq->property, 3438 XChangeProperty (display->display, rq.requestor, rq.property,
3319 target, 8, PropModeReplace, 3439 target, 8, PropModeReplace,
3320 ct.value, (int)ct.nitems); 3440 ct.value, (int)ct.nitems);
3321 ev.property = rq->property; 3441 ev.property = rq.property;
3322 3442
3323 if (freect) 3443 if (freect)
3324 XFree (ct.value); 3444 XFree (ct.value);
3325 } 3445 }
3326 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3446 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3327} 3447}
3328 3448
3329/* ------------------------------------------------------------------------- * 3449/* ------------------------------------------------------------------------- *
3330 * MOUSE ROUTINES * 3450 * MOUSE ROUTINES *
3331 * ------------------------------------------------------------------------- */ 3451 * ------------------------------------------------------------------------- */
… …
3334 * return col/row values corresponding to x/y pixel values 3454 * return col/row values corresponding to x/y pixel values
3335 */ 3455 */
3336void 3456void
3337rxvt_term::pixel_position (int *x, int *y) 3457rxvt_term::pixel_position (int *x, int *y)
3338{ 3458{
3339 *x = Pixel2Col(*x); 3459 *x = Pixel2Col (*x);
3340 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ 3460 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3341 *y = Pixel2Row(*y); 3461 *y = Pixel2Row (*y);
3342 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ 3462 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3343} 3463}
3344 3464
3345/* ------------------------------------------------------------------------- */ 3465/* ------------------------------------------------------------------------- */
3346#ifdef USE_XIM 3466#ifdef USE_XIM
3347void 3467void
3348rxvt_term::set_position (XPoint *pos) 3468rxvt_term::im_set_position (XPoint *pos)
3349{ 3469{
3350 XWindowAttributes xwa; 3470 XWindowAttributes xwa;
3351 3471
3352 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); 3472 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3353 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3473 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3354 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3474 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3355} 3475}
3356 3476
3357#endif 3477#endif
… …
3360/* ------------------------------------------------------------------------- * 3480/* ------------------------------------------------------------------------- *
3361 * DEBUG ROUTINES * 3481 * DEBUG ROUTINES *
3362 * ------------------------------------------------------------------------- */ 3482 * ------------------------------------------------------------------------- */
3363#if 0 3483#if 0
3364void 3484void
3365rxvt_debug_colors(void) 3485rxvt_debug_colors (void)
3366{ 3486{
3367 int color; 3487 int color;
3368 const char *name[] = { 3488 const char *name[] =
3489 {
3369 "fg", "bg", 3490 "fg", "bg",
3370 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3491 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3371 }; 3492 };
3372 3493
3373 fprintf(stderr, "Color ( "); 3494 fprintf (stderr, "Color ( ");
3374 if (rstyle & RS_RVid) 3495 if (rstyle & RS_RVid)
3375 fprintf(stderr, "rvid "); 3496 fprintf (stderr, "rvid ");
3376 if (rstyle & RS_Bold) 3497 if (rstyle & RS_Bold)
3377 fprintf(stderr, "bold "); 3498 fprintf (stderr, "bold ");
3378 if (rstyle & RS_Blink) 3499 if (rstyle & RS_Blink)
3379 fprintf(stderr, "blink "); 3500 fprintf (stderr, "blink ");
3380 if (rstyle & RS_Uline) 3501 if (rstyle & RS_Uline)
3381 fprintf(stderr, "uline "); 3502 fprintf (stderr, "uline ");
3382 fprintf(stderr, "): "); 3503 fprintf (stderr, "): ");
3383 3504
3384 color = GET_FGCOLOR(rstyle); 3505 color = GET_FGCOLOR (rstyle);
3385#ifndef NO_BRIGHTCOLOR 3506#ifndef NO_BRIGHTCOLOR
3386 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3507 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3508 {
3387 color -= (minBrightCOLOR - minCOLOR); 3509 color -= (minBrightCOLOR - minCOLOR);
3388 fprintf(stderr, "bright "); 3510 fprintf (stderr, "bright ");
3389 } 3511 }
3390#endif 3512#endif
3391 fprintf(stderr, "%s on ", name[color]); 3513 fprintf (stderr, "%s on ", name[color]);
3392 3514
3393 color = GET_BGCOLOR(rstyle); 3515 color = GET_BGCOLOR (rstyle);
3394#ifndef NO_BRIGHTCOLOR 3516#ifndef NO_BRIGHTCOLOR
3395 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3517 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3518 {
3396 color -= (minBrightCOLOR - minCOLOR); 3519 color -= (minBrightCOLOR - minCOLOR);
3397 fprintf(stderr, "bright "); 3520 fprintf (stderr, "bright ");
3398 } 3521 }
3399#endif 3522#endif
3400 fprintf(stderr, "%s\n", name[color]); 3523 fprintf (stderr, "%s\n", name[color]);
3401} 3524}
3402#endif 3525#endif

Diff Legend

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