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

Diff Legend

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