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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.30 by pcg, Fri Feb 13 12:16:21 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
… …
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 (display->display, 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 (display->display, 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 (display->display, 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)
… …
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 */
… …
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
… …
503void 503void
504rxvt_term::scr_cursor (int mode) 504rxvt_term::scr_cursor (int mode)
505{ 505{
506 screen_t *s; 506 screen_t *s;
507 507
508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 508 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
509 509
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 511 if (current_screen == SECONDARY)
512 s = &(swap); 512 s = & (swap);
513 else 513 else
514#endif 514#endif
515 s = &(screen); 515 s = & (screen);
516 switch (mode) 516 switch (mode)
517 { 517 {
518 case SAVE: 518 case SAVE:
519 s->s_cur.row = s->cur.row; 519 s->s_cur.row = s->cur.row;
520 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
… …
532 charsets[s->charset] = s->s_charset_char; 532 charsets[s->charset] = s->s_charset_char;
533 set_font_style (); 533 set_font_style ();
534 break; 534 break;
535 } 535 }
536 /* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
537 MIN_IT(s->cur.row, TermWin.nrow - 1); 537 MIN_IT (s->cur.row, TermWin.nrow - 1);
538 MIN_IT(s->cur.col, TermWin.ncol - 1); 538 MIN_IT (s->cur.col, TermWin.ncol - 1);
539#ifdef DEBUG_STRICT 539#ifdef DEBUG_STRICT
540 assert(s->cur.row >= 0); 540 assert (s->cur.row >= 0);
541 assert(s->cur.col >= 0); 541 assert (s->cur.col >= 0);
542#else /* drive with your eyes closed */ 542#else /* drive with your eyes closed */
543 MAX_IT(s->cur.row, 0); 543 MAX_IT (s->cur.row, 0);
544 MAX_IT(s->cur.col, 0); 544 MAX_IT (s->cur.col, 0);
545#endif 545#endif
546} 546}
547 547
548/* ------------------------------------------------------------------------- */ 548/* ------------------------------------------------------------------------- */
549/* 549/*
… …
559 int offset; 559 int offset;
560#endif 560#endif
561 561
562 want_refresh = 1; 562 want_refresh = 1;
563 563
564 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 564 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
565 565
566 TermWin.view_start = 0; 566 TermWin.view_start = 0;
567 567
568 if (current_screen == scrn) 568 if (current_screen == scrn)
569 return current_screen; 569 return current_screen;
570 570
571 selection_check (2); /* check for boundary cross */ 571 selection_check (2); /* check for boundary cross */
572 572
573 SWAP_IT(current_screen, scrn, int); 573 SWAP_IT (current_screen, scrn, int);
574#if NSCREENS 574#if NSCREENS
575 num_scr = 0; 575 num_scr = 0;
576 offset = TermWin.saveLines; 576 offset = TermWin.saveLines;
577 for (i = prev_nrow; i--;) 577 for (i = prev_nrow; i--;)
578 { 578 {
579 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *); 579 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
580 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t); 580 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
581 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *); 581 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
582 } 582 }
583 SWAP_IT(screen.cur.row, swap.cur.row, int16_t); 583 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
584 SWAP_IT(screen.cur.col, swap.cur.col, int16_t); 584 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
585# ifdef DEBUG_STRICT 585# ifdef DEBUG_STRICT
586 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 586 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
587 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 587 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
588# else /* drive with your eyes closed */ 588# else /* drive with your eyes closed */
589 MAX_IT(screen.cur.row, 0); 589 MAX_IT (screen.cur.row, 0);
590 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1); 590 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
591 MAX_IT(screen.cur.col, 0); 591 MAX_IT (screen.cur.col, 0);
592 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1); 592 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
593# endif 593# endif
594 SWAP_IT(screen.charset, swap.charset, int16_t); 594 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT(screen.flags, swap.flags, int); 595 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 596 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 597 swap.flags |= Screen_VisibleCursor;
598 598
599# ifdef RXVT_GRAPHICS 599# ifdef RXVT_GRAPHICS
600 600
… …
613 if (current_screen == PRIMARY 613 if (current_screen == PRIMARY
614# ifdef RXVT_GRAPHICS 614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed () 615 && !Gr_Displayed ()
616# endif 616# endif
617 ) 617 )
618 scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0); 618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 619# endif
620#endif 620#endif
621 return scrn; 621 return scrn;
622} 622}
623 623
… …
628void 628void
629rxvt_term::scr_color (unsigned int color, int fgbg) 629rxvt_term::scr_color (unsigned int color, int fgbg)
630{ 630{
631 color &= RS_fgMask; 631 color &= RS_fgMask;
632 if (fgbg == Color_fg) 632 if (fgbg == Color_fg)
633 rstyle = SET_FGCOLOR(rstyle, color); 633 rstyle = SET_FGCOLOR (rstyle, color);
634 else 634 else
635 rstyle = SET_BGCOLOR(rstyle, color); 635 rstyle = SET_BGCOLOR (rstyle, color);
636} 636}
637 637
638/* ------------------------------------------------------------------------- */ 638/* ------------------------------------------------------------------------- */
639/* 639/*
640 * Change the rendition style for following text 640 * Change the rendition style for following text
… …
665 665
666 if (count == 0 || (row1 > row2)) 666 if (count == 0 || (row1 > row2))
667 return 0; 667 return 0;
668 668
669 want_refresh = 1; 669 want_refresh = 1;
670 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 670 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
671 671
672 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 672 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY))
673 { 673 {
674 nscrolled = (long)TermWin.nscrolled + (long)count; 674 nscrolled = (long)TermWin.nscrolled + (long)count;
675 675
… …
718 718
719 if (count < 0) 719 if (count < 0)
720 count = -count; 720 count = -count;
721 721
722 i = row2 - row1 + 1; 722 i = row2 - row1 + 1;
723 MIN_IT(count, i); 723 MIN_IT (count, i);
724 724
725 if (j > 0) 725 if (j > 0)
726 { 726 {
727 /* A: scroll up */ 727 /* A: scroll up */
728 728
… …
799 return; 799 return;
800 800
801 want_refresh = 1; 801 want_refresh = 1;
802 last_col = TermWin.ncol; 802 last_col = TermWin.ncol;
803 803
804 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 804 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
805 ZERO_SCROLLBACK(); 805 ZERO_SCROLLBACK ();
806 if (nlines > 0) 806 if (nlines > 0)
807 { 807 {
808 nlines += (screen.cur.row - screen.bscroll); 808 nlines += (screen.cur.row - screen.bscroll);
809 if ((nlines > 0) 809 if ((nlines > 0)
810 && (screen.tscroll == 0) 810 && (screen.tscroll == 0)
811 && (screen.bscroll == (TermWin.nrow - 1))) 811 && (screen.bscroll == (TermWin.nrow - 1)))
812 { 812 {
813 /* _at least_ this many lines need to be scrolled */ 813 /* _at least_ this many lines need to be scrolled */
814 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); 814 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
815 screen.cur.row -= nlines; 815 screen.cur.row -= nlines;
816 } 816 }
817 } 817 }
818#ifdef DEBUG_STRICT 818#ifdef DEBUG_STRICT
819 assert(screen.cur.col < last_col); 819 assert (screen.cur.col < last_col);
820 assert((screen.cur.row < TermWin.nrow) 820 assert ((screen.cur.row < TermWin.nrow)
821 && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); 821 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
822#else /* drive with your eyes closed */ 822#else /* drive with your eyes closed */
823 MIN_IT(screen.cur.col, last_col - 1); 823 MIN_IT (screen.cur.col, last_col - 1);
824 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 824 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
825 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); 825 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
826#endif 826#endif
827 row = screen.cur.row + TermWin.saveLines; 827 row = screen.cur.row + TermWin.saveLines;
828 828
829 checksel = (selection.op 829 checksel = (selection.op
830 && current_screen == selection.screen) ? 1 : 0; 830 && current_screen == selection.screen) ? 1 : 0;
… …
841 case '\t': 841 case '\t':
842 scr_tab (1); 842 scr_tab (1);
843 continue; 843 continue;
844 case '\n': 844 case '\n':
845 if (screen.tlen[row] != -1) /* XXX: think about this */ 845 if (screen.tlen[row] != -1) /* XXX: think about this */
846 MAX_IT(screen.tlen[row], screen.cur.col); 846 MAX_IT (screen.tlen[row], screen.cur.col);
847 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
848 if (screen.cur.row == screen.bscroll) 848 if (screen.cur.row == screen.bscroll)
849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
850 else if (screen.cur.row < (TermWin.nrow - 1)) 850 else if (screen.cur.row < (TermWin.nrow - 1))
851 row = (++screen.cur.row) + TermWin.saveLines; 851 row = (++screen.cur.row) + TermWin.saveLines;
852 stp = screen.text[row]; /* _must_ refresh */ 852 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */ 853 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 854 continue;
855 case '\r': 855 case '\r':
856 if (screen.tlen[row] != -1) /* XXX: think about this */ 856 if (screen.tlen[row] != -1) /* XXX: think about this */
857 MAX_IT(screen.tlen[row], screen.cur.col); 857 MAX_IT (screen.tlen[row], screen.cur.col);
858 screen.flags &= ~Screen_WrapNext; 858 screen.flags &= ~Screen_WrapNext;
859 screen.cur.col = 0; 859 screen.cur.col = 0;
860 continue; 860 continue;
861 default: 861 default:
862 if (c == 127) 862 if (c == 127)
863 continue; /* yummmm..... */ 863 continue; /* yummmm..... */
864 break; 864 break;
865 } 865 }
866 866
867 if (checksel /* see if we're writing within selection */ 867 if (checksel /* see if we're writing within selection */
868 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 868 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
869 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 869 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
870 { 870 {
871 checksel = 0; 871 checksel = 0;
872 clearsel = 1; 872 clearsel = 1;
873 } 873 }
874 if (screen.flags & Screen_WrapNext) 874 if (screen.flags & Screen_WrapNext)
875 { 875 {
876 screen.tlen[row] = -1; 876 screen.tlen[row] = -1;
877 if (screen.cur.row == screen.bscroll) 877 if (screen.cur.row == screen.bscroll)
878 scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0); 878 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
879 else if (screen.cur.row < (TermWin.nrow - 1)) 879 else if (screen.cur.row < (TermWin.nrow - 1))
880 row = (++screen.cur.row) + TermWin.saveLines; 880 row = (++screen.cur.row) + TermWin.saveLines;
881 stp = screen.text[row]; /* _must_ refresh */ 881 stp = screen.text[row]; /* _must_ refresh */
882 srp = screen.rend[row]; /* _must_ refresh */ 882 srp = screen.rend[row]; /* _must_ refresh */
883 screen.cur.col = 0; 883 screen.cur.col = 0;
… …
929 else 929 else
930 (void)0; /* handle combining character etc. here. */ 930 (void)0; /* handle combining character etc. here. */
931 } 931 }
932 932
933 if (screen.tlen[row] != -1) /* XXX: think about this */ 933 if (screen.tlen[row] != -1) /* XXX: think about this */
934 MAX_IT(screen.tlen[row], screen.cur.col); 934 MAX_IT (screen.tlen[row], screen.cur.col);
935 935
936 /* 936 /*
937 * If we wrote anywhere in the selected area, kill the selection 937 * If we wrote anywhere in the selected area, kill the selection
938 * XXX: should we kill the mark too? Possibly, but maybe that 938 * XXX: should we kill the mark too? Possibly, but maybe that
939 * should be a similar check. 939 * should be a similar check.
940 */ 940 */
941 if (clearsel) 941 if (clearsel)
942 CLEAR_SELECTION(); 942 CLEAR_SELECTION ();
943 943
944#ifdef DEBUG_STRICT 944#ifdef DEBUG_STRICT
945 assert(screen.cur.row >= 0); 945 assert (screen.cur.row >= 0);
946#else /* drive with your eyes closed */ 946#else /* drive with your eyes closed */
947 MAX_IT(screen.cur.row, 0); 947 MAX_IT (screen.cur.row, 0);
948#endif 948#endif
949} 949}
950 950
951/* ------------------------------------------------------------------------- */ 951/* ------------------------------------------------------------------------- */
952/* 952/*
… …
983void 983void
984rxvt_term::scr_tab (int count) 984rxvt_term::scr_tab (int count)
985{ 985{
986 int i, x; 986 int i, x;
987 987
988 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 988 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
989 want_refresh = 1; 989 want_refresh = 1;
990 i = x = screen.cur.col; 990 i = x = screen.cur.col;
991 if (count == 0) 991 if (count == 0)
992 return; 992 return;
993 else if (count > 0) 993 else if (count > 0)
… …
1074 */ 1074 */
1075void 1075void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1076rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1077{
1078 want_refresh = 1; 1078 want_refresh = 1;
1079 ZERO_SCROLLBACK(); 1079 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS 1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ()) 1081 if (Gr_Displayed ())
1082 Gr_scroll (0); 1082 Gr_scroll (0);
1083#endif 1083#endif
1084 1084
1085 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)); 1085 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));
1086 1086
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1088 : col);
1089 MAX_IT(screen.cur.col, 0); 1089 MAX_IT (screen.cur.col, 0);
1090 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); 1090 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1091 1091
1092 screen.flags &= ~Screen_WrapNext; 1092 screen.flags &= ~Screen_WrapNext;
1093 if (relative & R_RELATIVE) 1093 if (relative & R_RELATIVE)
1094 { 1094 {
1095 if (row > 0) 1095 if (row > 0)
… …
1112 else 1112 else
1113 { 1113 {
1114 if (screen.flags & Screen_Relative) 1114 if (screen.flags & Screen_Relative)
1115 { /* relative origin mode */ 1115 { /* relative origin mode */
1116 screen.cur.row = row + screen.tscroll; 1116 screen.cur.row = row + screen.tscroll;
1117 MIN_IT(screen.cur.row, screen.bscroll); 1117 MIN_IT (screen.cur.row, screen.bscroll);
1118 } 1118 }
1119 else 1119 else
1120 screen.cur.row = row; 1120 screen.cur.row = row;
1121 } 1121 }
1122 MAX_IT(screen.cur.row, 0); 1122 MAX_IT (screen.cur.row, 0);
1123 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1123 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1124} 1124}
1125 1125
1126/* ------------------------------------------------------------------------- */ 1126/* ------------------------------------------------------------------------- */
1127/* 1127/*
1128 * direction should be UP or DN 1128 * direction should be UP or DN
… …
1132{ 1132{
1133 int dirn; 1133 int dirn;
1134 1134
1135 want_refresh = 1; 1135 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1136 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1138
1139 ZERO_SCROLLBACK(); 1139 ZERO_SCROLLBACK ();
1140 1140
1141#ifdef RXVT_GRAPHICS 1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ()) 1142 if (Gr_Displayed ())
1143 Gr_scroll (0); 1143 Gr_scroll (0);
1144#endif 1144#endif
1145 1145
1146 screen.flags &= ~Screen_WrapNext; 1146 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1147 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1148 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); 1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1150 else 1150 else
1151 screen.cur.row += dirn; 1151 screen.cur.row += dirn;
1152 MAX_IT(screen.cur.row, 0); 1152 MAX_IT (screen.cur.row, 0);
1153 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); 1153 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1154 selection_check (0); 1154 selection_check (0);
1155} 1155}
1156 1156
1157/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1158/* 1158/*
… …
1165rxvt_term::scr_erase_line (int mode) 1165rxvt_term::scr_erase_line (int mode)
1166{ 1166{
1167 unsigned int row, col, num; 1167 unsigned int row, col, num;
1168 1168
1169 want_refresh = 1; 1169 want_refresh = 1;
1170 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row)); 1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1171 ZERO_SCROLLBACK ();
1172 1172
1173#ifdef RXVT_GRAPHICS 1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ()) 1174 if (Gr_Displayed ())
1175 Gr_scroll (0); 1175 Gr_scroll (0);
… …
1183 switch (mode) 1183 switch (mode)
1184 { 1184 {
1185 case 0: /* erase to end of line */ 1185 case 0: /* erase to end of line */
1186 col = screen.cur.col; 1186 col = screen.cur.col;
1187 num = TermWin.ncol - col; 1187 num = TermWin.ncol - col;
1188 MIN_IT(screen.tlen[row], (int16_t)col); 1188 MIN_IT (screen.tlen[row], (int16_t)col);
1189 if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) 1189 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1190 || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) 1190 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1191 CLEAR_SELECTION(); 1191 CLEAR_SELECTION ();
1192 break; 1192 break;
1193 case 1: /* erase to beginning of line */ 1193 case 1: /* erase to beginning of line */
1194 col = 0; 1194 col = 0;
1195 num = screen.cur.col + 1; 1195 num = screen.cur.col + 1;
1196 if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) 1196 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1197 || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) 1197 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1198 CLEAR_SELECTION(); 1198 CLEAR_SELECTION ();
1199 break; 1199 break;
1200 case 2: /* erase whole line */ 1200 case 2: /* erase whole line */
1201 col = 0; 1201 col = 0;
1202 num = TermWin.ncol; 1202 num = TermWin.ncol;
1203 screen.tlen[row] = 0; 1203 screen.tlen[row] = 0;
1204 if (selection.beg.row <= screen.cur.row 1204 if (selection.beg.row <= screen.cur.row
1205 && selection.end.row >= screen.cur.row) 1205 && selection.end.row >= screen.cur.row)
1206 CLEAR_SELECTION(); 1206 CLEAR_SELECTION ();
1207 break; 1207 break;
1208 default: 1208 default:
1209 return; 1209 return;
1210 } 1210 }
1211 1211
1212 if (screen.text[row]) 1212 if (screen.text[row])
1213 scr_blank_line (&(screen.text[row][col]), 1213 scr_blank_line (& (screen.text[row][col]),
1214 &(screen.rend[row][col]), num, rstyle); 1214 & (screen.rend[row][col]), num, rstyle);
1215 else 1215 else
1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1217} 1217}
1218 1218
1219/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
… …
1230 int32_t row, row_offset; 1230 int32_t row, row_offset;
1231 rend_t ren; 1231 rend_t ren;
1232 XGCValues gcvalue; 1232 XGCValues gcvalue;
1233 1233
1234 want_refresh = 1; 1234 want_refresh = 1;
1235 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); 1235 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1236 ZERO_SCROLLBACK (); 1236 ZERO_SCROLLBACK ();
1237 row_offset = (int32_t)TermWin.saveLines; 1237 row_offset = (int32_t)TermWin.saveLines;
1238 1238
1239 switch (mode) 1239 switch (mode)
1240 { 1240 {
… …
1267 || (selection.end.row >= row 1267 || (selection.end.row >= row
1268 && selection.end.row <= row + num))) 1268 && selection.end.row <= row + num)))
1269 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1270 if (row >= TermWin.nrow) /* Out Of Bounds */ 1270 if (row >= TermWin.nrow) /* Out Of Bounds */
1271 return; 1271 return;
1272 MIN_IT(num, (TermWin.nrow - row)); 1272 MIN_IT (num, (TermWin.nrow - row));
1273 if (rstyle & (RS_RVid | RS_Uline)) 1273 if (rstyle & (RS_RVid | RS_Uline))
1274 ren = (rend_t) ~RS_None; 1274 ren = (rend_t) ~RS_None;
1275 else if (GET_BASEBG(rstyle) == Color_bg) 1275 else if (GET_BASEBG (rstyle) == Color_bg)
1276 { 1276 {
1277 ren = DEFAULT_RSTYLE; 1277 ren = DEFAULT_RSTYLE;
1278 CLEAR_ROWS(row, num); 1278 CLEAR_ROWS (row, num);
1279 } 1279 }
1280 else 1280 else
1281 { 1281 {
1282 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1282 ren = (rstyle & (RS_fgMask | RS_bgMask));
1283 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1283 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)];
1284 XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); 1284 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1285 ERASE_ROWS(row, num); 1285 ERASE_ROWS (row, num);
1286 gcvalue.foreground = PixColors[Color_fg]; 1286 gcvalue.foreground = PixColors[Color_fg];
1287 XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); 1287 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1288 } 1288 }
1289 for (; num--; row++) 1289 for (; num--; row++)
1290 { 1290 {
1291 scr_blank_screen_mem (screen.text, screen.rend, 1291 scr_blank_screen_mem (screen.text, screen.rend,
1292 (unsigned int)(row + row_offset), rstyle); 1292 (unsigned int) (row + row_offset), rstyle);
1293 screen.tlen[row + row_offset] = 0; 1293 screen.tlen[row + row_offset] = 0;
1294 scr_blank_line (drawn_text[row], drawn_rend[row], 1294 scr_blank_line (drawn_text[row], drawn_rend[row],
1295 (unsigned int)TermWin.ncol, ren); 1295 (unsigned int)TermWin.ncol, ren);
1296 } 1296 }
1297} 1297}
… …
1307 int i, j, k; 1307 int i, j, k;
1308 rend_t *r1, fs; 1308 rend_t *r1, fs;
1309 1309
1310 want_refresh = 1; 1310 want_refresh = 1;
1311 num_scr_allow = 0; 1311 num_scr_allow = 0;
1312 ZERO_SCROLLBACK(); 1312 ZERO_SCROLLBACK ();
1313 selection_check (3); 1313 selection_check (3);
1314 1314
1315 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1315 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1316 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1316 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1317 { 1317 {
… …
1329void 1329void
1330rxvt_term::scr_insdel_lines (int count, int insdel) 1330rxvt_term::scr_insdel_lines (int count, int insdel)
1331{ 1331{
1332 int end; 1332 int end;
1333 1333
1334 ZERO_SCROLLBACK(); 1334 ZERO_SCROLLBACK ();
1335 1335
1336#ifdef RXVT_GRAPHICS 1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ()) 1337 if (Gr_Displayed ())
1338 Gr_scroll (0); 1338 Gr_scroll (0);
1339#endif 1339#endif
… …
1351 else if (insdel == INSERT) 1351 else if (insdel == INSERT)
1352 count = end; 1352 count = end;
1353 } 1353 }
1354 screen.flags &= ~Screen_WrapNext; 1354 screen.flags &= ~Screen_WrapNext;
1355 1355
1356 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); 1356 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1357} 1357}
1358 1358
1359/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1360/* 1360/*
1361 * Insert/Delete <count> characters from the current position 1361 * Insert/Delete <count> characters from the current position
… …
1368 text_t *stp; 1368 text_t *stp;
1369 rend_t *srp; 1369 rend_t *srp;
1370 int16_t *slp; 1370 int16_t *slp;
1371 1371
1372 want_refresh = 1; 1372 want_refresh = 1;
1373 ZERO_SCROLLBACK(); 1373 ZERO_SCROLLBACK ();
1374 1374
1375#ifdef RXVT_GRAPHICS 1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ()) 1376 if (Gr_Displayed ())
1377 Gr_scroll (0); 1377 Gr_scroll (0);
1378#endif 1378#endif
1379 1379
1380 if (count <= 0) 1380 if (count <= 0)
1381 return; 1381 return;
1382 1382
1383 selection_check (1); 1383 selection_check (1);
1384 MIN_IT(count, (TermWin.ncol - screen.cur.col)); 1384 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1385 1385
1386 row = screen.cur.row + TermWin.saveLines; 1386 row = screen.cur.row + TermWin.saveLines;
1387 screen.flags &= ~Screen_WrapNext; 1387 screen.flags &= ~Screen_WrapNext;
1388 1388
1389 stp = screen.text[row]; 1389 stp = screen.text[row];
1390 srp = screen.rend[row]; 1390 srp = screen.rend[row];
1391 slp = &(screen.tlen[row]); 1391 slp = & (screen.tlen[row]);
1392 switch (insdel) 1392 switch (insdel)
1393 { 1393 {
1394 case INSERT: 1394 case INSERT:
1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1396 col--) 1396 col--)
… …
1399 srp[col] = srp[col - count]; 1399 srp[col] = srp[col - count];
1400 } 1400 }
1401 if (*slp != -1) 1401 if (*slp != -1)
1402 { 1402 {
1403 *slp += count; 1403 *slp += count;
1404 MIN_IT(*slp, TermWin.ncol); 1404 MIN_IT (*slp, TermWin.ncol);
1405 } 1405 }
1406 if (selection.op && current_screen == selection.screen 1406 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) 1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1408 {
1409 if (selection.end.row != screen.cur.row 1409 if (selection.end.row != screen.cur.row
1410 || (selection.end.col + count >= TermWin.ncol)) 1410 || (selection.end.col + count >= TermWin.ncol))
1411 CLEAR_SELECTION(); 1411 CLEAR_SELECTION ();
1412 else 1412 else
1413 { /* shift selection */ 1413 { /* shift selection */
1414 selection.beg.col += count; 1414 selection.beg.col += count;
1415 selection.mark.col += count; /* XXX: yes? */ 1415 selection.mark.col += count; /* XXX: yes? */
1416 selection.end.col += count; 1416 selection.end.col += count;
1417 } 1417 }
1418 } 1418 }
1419 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1419 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1420 (unsigned int)count, rstyle); 1420 (unsigned int)count, rstyle);
1421 break; 1421 break;
1422 case ERASE: 1422 case ERASE:
1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1424 selection_check (1); 1424 selection_check (1);
1425 screen.cur.col -= count; 1425 screen.cur.col -= count;
1426 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), 1426 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1427 (unsigned int)count, rstyle); 1427 (unsigned int)count, rstyle);
1428 break; 1428 break;
1429 case DELETE: 1429 case DELETE:
1430 tr = srp[TermWin.ncol - 1] 1430 tr = srp[TermWin.ncol - 1]
1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 { 1433 {
1434 stp[col] = stp[col + count]; 1434 stp[col] = stp[col + count];
1435 srp[col] = srp[col + count]; 1435 srp[col] = srp[col + count];
1436 } 1436 }
1437 scr_blank_line (&(stp[TermWin.ncol - count]), 1437 scr_blank_line (& (stp[TermWin.ncol - count]),
1438 &(srp[TermWin.ncol - count]), 1438 & (srp[TermWin.ncol - count]),
1439 (unsigned int)count, tr); 1439 (unsigned int)count, tr);
1440 if (*slp == -1) /* break line continuation */ 1440 if (*slp == -1) /* break line continuation */
1441 *slp = TermWin.ncol; 1441 *slp = TermWin.ncol;
1442 *slp -= count; 1442 *slp -= count;
1443 MAX_IT(*slp, 0); 1443 MAX_IT (*slp, 0);
1444 if (selection.op && current_screen == selection.screen 1444 if (selection.op && current_screen == selection.screen
1445 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) 1445 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1446 { 1446 {
1447 if (selection.end.row != screen.cur.row 1447 if (selection.end.row != screen.cur.row
1448 || (screen.cur.col >= selection.beg.col - count) 1448 || (screen.cur.col >= selection.beg.col - count)
1449 || selection.end.col >= TermWin.ncol) 1449 || selection.end.col >= TermWin.ncol)
1450 CLEAR_SELECTION(); 1450 CLEAR_SELECTION ();
1451 else 1451 else
1452 { 1452 {
1453 /* shift selection */ 1453 /* shift selection */
1454 selection.beg.col -= count; 1454 selection.beg.col -= count;
1455 selection.mark.col -= count; /* XXX: yes? */ 1455 selection.mark.col -= count; /* XXX: yes? */
… …
1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1467 */ 1467 */
1468void 1468void
1469rxvt_term::scr_scroll_region (int top, int bot) 1469rxvt_term::scr_scroll_region (int top, int bot)
1470{ 1470{
1471 MAX_IT(top, 0); 1471 MAX_IT (top, 0);
1472 MIN_IT(bot, (int)TermWin.nrow - 1); 1472 MIN_IT (bot, (int)TermWin.nrow - 1);
1473 if (top > bot) 1473 if (top > bot)
1474 return; 1474 return;
1475 screen.tscroll = top; 1475 screen.tscroll = top;
1476 screen.bscroll = bot; 1476 screen.bscroll = bot;
1477 scr_gotorc (0, 0, 0); 1477 scr_gotorc (0, 0, 0);
… …
1503rxvt_term::scr_autowrap (int mode) 1503rxvt_term::scr_autowrap (int mode)
1504{ 1504{
1505 if (mode) 1505 if (mode)
1506 screen.flags |= Screen_Autowrap; 1506 screen.flags |= Screen_Autowrap;
1507 else 1507 else
1508 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1508 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext);
1509} 1509}
1510 1510
1511/* ------------------------------------------------------------------------- */ 1511/* ------------------------------------------------------------------------- */
1512/* 1512/*
1513 * Set/unset margin origin mode 1513 * Set/unset margin origin mode
… …
1552 */ 1552 */
1553void 1553void
1554rxvt_term::scr_set_tab (int mode) 1554rxvt_term::scr_set_tab (int mode)
1555{ 1555{
1556 if (mode < 0) 1556 if (mode < 0)
1557 MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); 1557 MEMSET (tabs, 0, TermWin.ncol * sizeof (char));
1558 else if (screen.cur.col < TermWin.ncol) 1558 else if (screen.cur.col < TermWin.ncol)
1559 tabs[screen.cur.col] = (mode ? 1 : 0); 1559 tabs[screen.cur.col] = (mode ? 1 : 0);
1560} 1560}
1561 1561
1562/* ------------------------------------------------------------------------- */ 1562/* ------------------------------------------------------------------------- */
… …
1571 XGCValues gcvalue; 1571 XGCValues gcvalue;
1572 1572
1573 if (rvideo != mode) 1573 if (rvideo != mode)
1574 { 1574 {
1575 rvideo = mode; 1575 rvideo = mode;
1576 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1576 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1577#if defined(XPM_BACKGROUND) 1577#if defined(XPM_BACKGROUND)
1578 if (bgPixmap.pixmap == None) 1578 if (bgPixmap.pixmap == None)
1579#endif 1579#endif
1580#if defined(TRANSPARENT) 1580#if defined(TRANSPARENT)
1581 if (!(Options & Opt_transparent) || am_transparent == 0) 1581 if (! (Options & Opt_transparent) || am_transparent == 0)
1582#endif 1582#endif
1583 XSetWindowBackground(display->display, TermWin.vt, 1583 XSetWindowBackground (display->display, TermWin.vt,
1584 PixColors[Color_bg]); 1584 PixColors[Color_bg]);
1585 1585
1586 gcvalue.foreground = PixColors[Color_fg]; 1586 gcvalue.foreground = PixColors[Color_fg];
1587 gcvalue.background = PixColors[Color_bg]; 1587 gcvalue.background = PixColors[Color_bg];
1588 XChangeGC(display->display, TermWin.gc, GCBackground | GCForeground, 1588 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1589 &gcvalue); 1589 &gcvalue);
1590 scr_clear (); 1590 scr_clear ();
1591 scr_touch (true); 1591 scr_touch (true);
1592 } 1592 }
1593} 1593}
… …
1598 * XTERM_SEQ: Report position: ESC [ 6 n 1598 * XTERM_SEQ: Report position: ESC [ 6 n
1599 */ 1599 */
1600void 1600void
1601rxvt_term::scr_report_position () 1601rxvt_term::scr_report_position ()
1602{ 1602{
1603 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1603 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1604} 1604}
1605 1605
1606/* ------------------------------------------------------------------------- * 1606/* ------------------------------------------------------------------------- *
1607 * FONTS * 1607 * FONTS *
1608 * ------------------------------------------------------------------------- */ 1608 * ------------------------------------------------------------------------- */
… …
1709 1709
1710 if (drawn_text == NULL) /* sanity check */ 1710 if (drawn_text == NULL) /* sanity check */
1711 return; 1711 return;
1712 1712
1713#ifdef DEBUG_STRICT 1713#ifdef DEBUG_STRICT
1714 x = max(x, (int)TermWin.int_bwidth); 1714 x = max (x, (int)TermWin.int_bwidth);
1715 x = min(x, (int)TermWin.width); 1715 x = min (x, (int)TermWin.width);
1716 y = max(y, (int)TermWin.int_bwidth); 1716 y = max (y, (int)TermWin.int_bwidth);
1717 y = min(y, (int)TermWin.height); 1717 y = min (y, (int)TermWin.height);
1718#endif 1718#endif
1719 1719
1720 /* round down */ 1720 /* round down */
1721 rc[PART_BEG].col = Pixel2Col(x); 1721 rc[PART_BEG].col = Pixel2Col (x);
1722 rc[PART_BEG].row = Pixel2Row(y); 1722 rc[PART_BEG].row = Pixel2Row (y);
1723 /* round up */ 1723 /* round up */
1724 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1724 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1725 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1725 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1726 1726
1727 /* sanity checks */ 1727 /* sanity checks */
1728 for (i = PART_BEG; i < RC_COUNT; i++) 1728 for (i = PART_BEG; i < RC_COUNT; i++)
1729 { 1729 {
1730 MIN_IT(rc[i].col, TermWin.ncol - 1); 1730 MIN_IT (rc[i].col, TermWin.ncol - 1);
1731 MIN_IT(rc[i].row, TermWin.nrow - 1); 1731 MIN_IT (rc[i].row, TermWin.nrow - 1);
1732 } 1732 }
1733 1733
1734 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)); 1734 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));
1735 1735
1736 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1736 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1737 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1737 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0,
1738 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1738 (rc[PART_END].col - rc[PART_BEG].col + 1));
1739 1739
1740 if (refresh) 1740 if (refresh)
1741 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1741 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1742} 1742}
… …
1764 1764
1765 oldviewstart = TermWin.view_start; 1765 oldviewstart = TermWin.view_start;
1766 if (y < len) 1766 if (y < len)
1767 { 1767 {
1768 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1768 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1769 p -= (long)(TermWin.nrow - 1); 1769 p -= (long) (TermWin.nrow - 1);
1770 p = max(p, 0); 1770 p = max (p, 0);
1771 } 1771 }
1772 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); 1772 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1773 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); 1773 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1774 1774
1775 return scr_changeview (oldviewstart); 1775 return scr_changeview (oldviewstart);
1776} 1776}
1777 1777
1778/* ------------------------------------------------------------------------- */ 1778/* ------------------------------------------------------------------------- */
… …
1784rxvt_term::scr_page (enum page_dirn direction, int nlines) 1784rxvt_term::scr_page (enum page_dirn direction, int nlines)
1785{ 1785{
1786 int n; 1786 int n;
1787 uint16_t oldviewstart; 1787 uint16_t oldviewstart;
1788 1788
1789 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1789 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1790#ifdef DEBUG_STRICT 1790#ifdef DEBUG_STRICT
1791 assert((nlines >= 0) && (nlines <= TermWin.nrow)); 1791 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1792#endif 1792#endif
1793 oldviewstart = TermWin.view_start; 1793 oldviewstart = TermWin.view_start;
1794 if (direction == UP) 1794 if (direction == UP)
1795 { 1795 {
1796 n = TermWin.view_start + nlines; 1796 n = TermWin.view_start + nlines;
1797 TermWin.view_start = min(n, TermWin.nscrolled); 1797 TermWin.view_start = min (n, TermWin.nscrolled);
1798 } 1798 }
1799 else 1799 else
1800 { 1800 {
1801 n = TermWin.view_start - nlines; 1801 n = TermWin.view_start - nlines;
1802 TermWin.view_start = max(n, 0); 1802 TermWin.view_start = max (n, 0);
1803 } 1803 }
1804 return scr_changeview (oldviewstart); 1804 return scr_changeview (oldviewstart);
1805} 1805}
1806 1806
1807int 1807int
… …
1814 if (Gr_Displayed ()) 1814 if (Gr_Displayed ())
1815 Gr_scroll (0); 1815 Gr_scroll (0);
1816#endif 1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1817 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1818 }
1819 return (int)(TermWin.view_start - oldviewstart); 1819 return (int) (TermWin.view_start - oldviewstart);
1820} 1820}
1821 1821
1822/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1823void 1823void
1824rxvt_term::scr_bell () 1824rxvt_term::scr_bell ()
… …
1826#ifndef NO_BELL 1826#ifndef NO_BELL
1827# ifndef NO_MAPALERT 1827# ifndef NO_MAPALERT
1828# ifdef MAPALERT_OPTION 1828# ifdef MAPALERT_OPTION
1829 if (Options & Opt_mapAlert) 1829 if (Options & Opt_mapAlert)
1830# endif 1830# endif
1831 XMapWindow(display->display, TermWin.parent[0]); 1831 XMapWindow (display->display, TermWin.parent[0]);
1832# endif 1832# endif
1833 if (Options & Opt_visualBell) 1833 if (Options & Opt_visualBell)
1834 { 1834 {
1835 scr_rvideo_mode (!rvideo); /* refresh also done */ 1835 scr_rvideo_mode (!rvideo); /* refresh also done */
1836 scr_rvideo_mode (!rvideo); /* refresh also done */ 1836 scr_rvideo_mode (!rvideo); /* refresh also done */
1837 } 1837 }
1838 else 1838 else
1839 XBell(display->display, 0); 1839 XBell (display->display, 0);
1840#endif 1840#endif
1841} 1841}
1842 1842
1843/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1844/* ARGSUSED */ 1844/* ARGSUSED */
… …
1864 1864
1865 for (r1 = 0; r1 < nrows; r1++) 1865 for (r1 = 0; r1 < nrows; r1++)
1866 { 1866 {
1867 t = screen.text[r1 + row_offset]; 1867 t = screen.text[r1 + row_offset];
1868 for (i = TermWin.ncol - 1; i >= 0; i--) 1868 for (i = TermWin.ncol - 1; i >= 0; i--)
1869 if (!isspace(t[i])) 1869 if (!isspace (t[i]))
1870 break; 1870 break;
1871 fprintf(fd, "%.*s\n", (i + 1), t); 1871 fprintf (fd, "%.*s\n", (i + 1), t);
1872 } 1872 }
1873 pclose_printer (fd); 1873 pclose_printer (fd);
1874#endif 1874#endif
1875} 1875}
1876 1876
… …
1880 * drawn_text/drawn_rend contain the screen information before the update. 1880 * drawn_text/drawn_rend contain the screen information before the update.
1881 * screen.text/screen.rend contain what the screen will change to. 1881 * screen.text/screen.rend contain what the screen will change to.
1882 */ 1882 */
1883 1883
1884#define FONT_WIDTH(X, Y) \ 1884#define FONT_WIDTH(X, Y) \
1885 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1885 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1886#define FONT_RBEAR(X, Y) \ 1886#define FONT_RBEAR(X, Y) \
1887 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1887 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1888#define FONT_LBEAR(X, Y) \ 1888#define FONT_LBEAR(X, Y) \
1889 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1889 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1890#define IS_FONT_CHAR(X, Y) \ 1890#define IS_FONT_CHAR(X, Y) \
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1892
1893void 1893void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1894rxvt_term::scr_refresh (unsigned char refresh_type)
… …
1902 ocrow; /* old cursor row */ 1902 ocrow; /* old cursor row */
1903 int cursorwidth; 1903 int cursorwidth;
1904 int i, /* tmp */ 1904 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1905 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1906#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position(s) */ 1907 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1908#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1911
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1912 if (refresh_type == NO_REFRESH || !TermWin.mapped)
… …
1939 * B: reverse any characters which are selected 1939 * B: reverse any characters which are selected
1940 */ 1940 */
1941 scr_reverse_selection (); 1941 scr_reverse_selection ();
1942 1942
1943 /* 1943 /*
1944 * C: set the cursor character(s) 1944 * C: set the cursor character (s)
1945 */ 1945 */
1946 { 1946 {
1947 unsigned char setoldcursor; 1947 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1948 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1949 ccol2; /* Cursor colour2 */
… …
1959 1959
1960 if (showcursor) 1960 if (showcursor)
1961 { 1961 {
1962 cursorwidth++; 1962 cursorwidth++;
1963 1963
1964 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1965 [screen.cur.col]); 1965 [screen.cur.col]);
1966 1966
1967 if (showcursor && TermWin.focus) 1967 if (showcursor && TermWin.focus)
1968 { 1968 {
1969 *srp ^= RS_RVid; 1969 *srp ^= RS_RVid;
… …
1971 cc1 = *srp & (RS_fgMask | RS_bgMask); 1971 cc1 = *srp & (RS_fgMask | RS_bgMask);
1972 if (ISSET_PIXCOLOR (Color_cursor)) 1972 if (ISSET_PIXCOLOR (Color_cursor))
1973 ccol1 = Color_cursor; 1973 ccol1 = Color_cursor;
1974 else 1974 else
1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1976 ccol1 = GET_FGCOLOR(rstyle); 1976 ccol1 = GET_FGCOLOR (rstyle);
1977#else 1977#else
1978 ccol1 = Color_fg; 1978 ccol1 = Color_fg;
1979#endif 1979#endif
1980 if (ISSET_PIXCOLOR (Color_cursor2)) 1980 if (ISSET_PIXCOLOR (Color_cursor2))
1981 ccol2 = Color_cursor2; 1981 ccol2 = Color_cursor2;
1982 else 1982 else
1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1984 ccol2 = GET_BGCOLOR(rstyle); 1984 ccol2 = GET_BGCOLOR (rstyle);
1985#else 1985#else
1986 ccol2 = Color_bg; 1986 ccol2 = Color_bg;
1987#endif 1987#endif
1988 *srp = SET_FGCOLOR(*srp, ccol1); 1988 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR(*srp, ccol2); 1989 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 1990#endif
1991 1991
1992 } 1992 }
1993 } 1993 }
1994 1994
… …
2029 * D: CopyArea pass - very useful for slower links 2029 * D: CopyArea pass - very useful for slower links
2030 * This has been deliberately kept simple. 2030 * This has been deliberately kept simple.
2031 */ 2031 */
2032 i = num_scr; 2032 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs(i) < TermWin.nrow && !must_clear) 2034 && abs (i) < TermWin.nrow && !must_clear)
2035 { 2035 {
2036 int16_t nits; 2036 int16_t nits;
2037 int j; 2037 int j;
2038 rend_t *drp2; 2038 rend_t *drp2;
2039 text_t *dtp2; 2039 text_t *dtp2;
… …
2077 2077
2078 if (len != -1) 2078 if (len != -1)
2079 { 2079 {
2080 /* also comes here at end if needed because of >= above */ 2080 /* also comes here at end if needed because of >= above */
2081 if (wlen < len) 2081 if (wlen < len)
2082 SWAP_IT(wlen, len, int); 2082 SWAP_IT (wlen, len, int);
2083 2083
2084 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2084 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2085 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2085 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2086 TermWin.gc, 0, Row2Pixel (len + i), 2086 TermWin.gc, 0, Row2Pixel (len + i),
2087 (unsigned int)TermWin_TotalWidth (), 2087 (unsigned int)TermWin_TotalWidth (),
2088 (unsigned int)Height2Pixel (wlen - len + 1), 2088 (unsigned int)Height2Pixel (wlen - len + 1),
2089 0, Row2Pixel (len)); 2089 0, Row2Pixel (len));
… …
2104 drp = drawn_rend[row]; 2104 drp = drawn_rend[row];
2105 2105
2106 /* 2106 /*
2107 * E2: OK, now the real pass 2107 * E2: OK, now the real pass
2108 */ 2108 */
2109 int ypixel = (int)Row2Pixel(row); 2109 int ypixel = (int)Row2Pixel (row);
2110 2110
2111 for (col = 0; col < TermWin.ncol; col++) 2111 for (col = 0; col < TermWin.ncol; col++)
2112 { 2112 {
2113 /* compare new text with old - if exactly the same then continue */ 2113 /* compare new text with old - if exactly the same then continue */
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115 2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */ 2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */ 2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) 2119 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2120 continue; 2120 continue;
2121 2121
2122 text_t *text = stp + col; 2122 text_t *text = stp + col;
2123 int count = 1; 2123 int count = 1;
2124 2124
… …
2128 drp[col] = rend; 2128 drp[col] = rend;
2129 2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */ 2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue; 2131 continue;
2132 2132
2133 int xpixel = Col2Pixel(col); 2133 int xpixel = Col2Pixel (col);
2134 2134
2135 // this loop looks very messy, it can probably be optimized 2135 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you? 2136 // and cleaned a bit by you?
2137 for (i = 0; ++col < TermWin.ncol; ) 2137 for (i = 0; ++col < TermWin.ncol; )
2138 { 2138 {
… …
2177 int fore = GET_FGCOLOR (rend); // desired foreground 2177 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background 2178 int back = GET_BGCOLOR (rend); // desired background
2179 2179
2180 rend = GET_ATTR (rend); 2180 rend = GET_ATTR (rend);
2181 2181
2182 rvid = !!(rend & RS_RVid); 2182 rvid = !! (rend & RS_RVid);
2183 if (rvid) 2183 if (rvid)
2184 { 2184 {
2185 SWAP_IT(fore, back, int); 2185 SWAP_IT (fore, back, int);
2186 2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (ISSET_PIXCOLOR (Color_RV) 2188 if (ISSET_PIXCOLOR (Color_RV)
2189# ifndef NO_CURSORCOLOR 2189# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (Color_cursor) 2190 && !ISSET_PIXCOLOR (Color_cursor)
… …
2248 } 2248 }
2249 else 2249 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2250 font->draw (xpixel, ypixel, text, count, fore, back);
2251 2251
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2252 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine(display->display, drawBuffer, TermWin.gc, 2253 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2254 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */ 2256 } /* for (col....) */
2257 } /* for (row....) */ 2257 } /* for (row....) */
2258 2258
2259 /* 2259 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2260 * G: cleanup cursor and display outline cursor if necessary
2261 */ 2261 */
2262 if (showcursor) 2262 if (showcursor)
2263 { 2263 {
2264 if (TermWin.focus) 2264 if (TermWin.focus)
2265 { 2265 {
2266 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2266 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2267 [screen.cur.col]); 2267 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2268 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2269#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2271#endif
2272 2272
2273 } 2273 }
2274 else if (oldcursor.row >= 0) 2274 else if (oldcursor.row >= 0)
2275 { 2275 {
2276#ifndef NO_CURSORCOLOR 2276#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2277 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2279#endif
2280 XDrawRectangle(display->display, drawBuffer, TermWin.gc, 2280 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel(oldcursor.col), 2281 Col2Pixel (oldcursor.col),
2282 Row2Pixel(oldcursor.row), 2282 Row2Pixel (oldcursor.row),
2283 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2283 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2284 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2285 } 2285 }
2286 } 2286 }
2287 2287
2288 /* 2288 /*
2289 * H: cleanup selection 2289 * H: cleanup selection
… …
2296 if (clearfirst && TermWin.int_bwidth) 2296 if (clearfirst && TermWin.int_bwidth)
2297 /* 2297 /*
2298 * clear the whole screen height, note that width == 0 is treated 2298 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2299 * specially by XClearArea
2300 */ 2300 */
2301 XClearArea(display->display, TermWin.vt, 0, 0, 2301 XClearArea (display->display, TermWin.vt, 0, 0,
2302 (unsigned int)TermWin.int_bwidth, 2302 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight(), False); 2303 (unsigned int)TermWin_TotalHeight (), False);
2304 if (clearlast && TermWin.int_bwidth) 2304 if (clearlast && TermWin.int_bwidth)
2305 /* 2305 /*
2306 * clear the whole screen height, note that width == 0 is treated 2306 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2307 * specially by XClearArea
2308 */ 2308 */
2309 XClearArea(display->display, TermWin.vt, 2309 XClearArea (display->display, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0, 2310 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)TermWin.int_bwidth, 2311 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight(), False); 2312 (unsigned int)TermWin_TotalHeight (), False);
2313 if (refresh_type & SMOOTH_REFRESH) 2313 if (refresh_type & SMOOTH_REFRESH)
2314 XSync(display->display, False); 2314 XSync (display->display, False);
2315 2315
2316 num_scr = 0; 2316 num_scr = 0;
2317 num_scr_allow = 1; 2317 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2318 want_refresh = 0; /* screen is current */
2319} 2319}
2320 2320
2321/* ------------------------------------------------------------------------- */ 2321/* ------------------------------------------------------------------------- */
2322void 2322void
2323rxvt_term::scr_clear() 2323rxvt_term::scr_clear ()
2324{ 2324{
2325 if (!TermWin.mapped) 2325 if (!TermWin.mapped)
2326 return; 2326 return;
2327 2327
2328 num_scr_allow = 0; 2328 num_scr_allow = 0;
… …
2330#ifdef TRANSPARENT 2330#ifdef TRANSPARENT
2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 { 2332 {
2333 int i; 2333 int i;
2334 2334
2335 if (!(Options & Opt_transparent_all)) 2335 if (! (Options & Opt_transparent_all))
2336 i = 0; 2336 i = 0;
2337 else 2337 else
2338 i = (int)(sizeof(TermWin.parent) / sizeof(Window)); 2338 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2339 2339
2340 while (i--) 2340 while (i--)
2341 if (TermWin.parent[i] != None) 2341 if (TermWin.parent[i] != None)
2342 XClearWindow(display->display, TermWin.parent[i]); 2342 XClearWindow (display->display, TermWin.parent[i]);
2343 } 2343 }
2344#endif 2344#endif
2345 2345
2346 XClearWindow (display->display, TermWin.vt); 2346 XClearWindow (display->display, TermWin.vt);
2347} 2347}
… …
2393 { 2393 {
2394 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2394 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2395 : TermWin.ncol; 2395 : TermWin.ncol;
2396 for (towrite = width; towrite; towrite -= wrote) 2396 for (towrite = width; towrite; towrite -= wrote)
2397 { 2397 {
2398 wrote = write(fd, &(screen.text[row][width - towrite]), 2398 wrote = write (fd, & (screen.text[row][width - towrite]),
2399 towrite); 2399 towrite);
2400 if (wrote < 0) 2400 if (wrote < 0)
2401 return; /* XXX: death, no report */ 2401 return; /* XXX: death, no report */
2402 } 2402 }
2403 if (screen.tlen[row] >= 0) 2403 if (screen.tlen[row] >= 0)
2404 if (write(fd, r1, 1) <= 0) 2404 if (write (fd, r1, 1) <= 0)
2405 return; /* XXX: death, no report */ 2405 return; /* XXX: death, no report */
2406 } 2406 }
2407} 2407}
2408#endif 2408#endif
2409 2409
… …
2421 2421
2422 if (!selection.op) 2422 if (!selection.op)
2423 return; 2423 return;
2424 2424
2425 pos.row = pos.col = 0; 2425 pos.row = pos.col = 0;
2426 if ((selection.beg.row < -(int32_t)TermWin.nscrolled) 2426 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2427 || (selection.beg.row >= TermWin.nrow) 2427 || (selection.beg.row >= TermWin.nrow)
2428 || (selection.mark.row < -(int32_t)TermWin.nscrolled) 2428 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2429 || (selection.mark.row >= TermWin.nrow) 2429 || (selection.mark.row >= TermWin.nrow)
2430 || (selection.end.row < -(int32_t)TermWin.nscrolled) 2430 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2431 || (selection.end.row >= TermWin.nrow) 2431 || (selection.end.row >= TermWin.nrow)
2432 || (check_more == 1 2432 || (check_more == 1
2433 && current_screen == selection.screen 2433 && current_screen == selection.screen
2434 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) 2434 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2435 && ROWCOL_IS_BEFORE(screen.cur, selection.end)) 2435 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2436 || (check_more == 2 2436 || (check_more == 2
2437 && ROWCOL_IS_BEFORE(selection.beg, pos) 2437 && ROWCOL_IS_BEFORE (selection.beg, pos)
2438 && ROWCOL_IS_AFTER(selection.end, pos)) 2438 && ROWCOL_IS_AFTER (selection.end, pos))
2439 || (check_more == 3 2439 || (check_more == 3
2440 && ROWCOL_IS_AFTER(selection.end, pos)) 2440 && ROWCOL_IS_AFTER (selection.end, pos))
2441 || (check_more == 4 /* screen width change */ 2441 || (check_more == 4 /* screen width change */
2442 && (selection.beg.row != selection.end.row 2442 && (selection.beg.row != selection.end.row
2443 || selection.end.col > TermWin.ncol))) 2443 || selection.end.col > TermWin.ncol)))
2444 CLEAR_SELECTION(); 2444 CLEAR_SELECTION ();
2445} 2445}
2446 2446
2447/* ------------------------------------------------------------------------- */ 2447/* ------------------------------------------------------------------------- */
2448/* 2448/*
2449 * Paste a selection direct to the command fd 2449 * Paste a selection direct to the command fd
… …
2470 ds[j] = '\r'; 2470 ds[j] = '\r';
2471 2471
2472 tt_write (ds, (int)n); 2472 tt_write (ds, (int)n);
2473 } 2473 }
2474 2474
2475 free(ds); 2475 free (ds);
2476} 2476}
2477 2477
2478/* ------------------------------------------------------------------------- */ 2478/* ------------------------------------------------------------------------- */
2479/* 2479/*
2480 * Respond to a notification that a primary selection has been sent 2480 * Respond to a notification that a primary selection has been sent
… …
2485{ 2485{
2486 long nread = 0; 2486 long nread = 0;
2487 unsigned long bytes_after; 2487 unsigned long bytes_after;
2488 XTextProperty ct; 2488 XTextProperty ct;
2489 2489
2490 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); 2490 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2491 2491
2492 if (prop == None) /* check for failed XConvertSelection */ 2492 if (prop == None) /* check for failed XConvertSelection */
2493 { 2493 {
2494 if ((selection_type & Sel_CompoundText)) 2494 if ((selection_type & Sel_CompoundText))
2495 { 2495 {
… …
2514 return 0; 2514 return 0;
2515 } 2515 }
2516 2516
2517 for (;;) 2517 for (;;)
2518 { 2518 {
2519 if (XGetWindowProperty(display->display, win, prop, (long)(nread / 4), 2519 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2520 (long)(PROP_SIZE / 4), delete_prop, 2520 (long) (PROP_SIZE / 4), delete_prop,
2521 AnyPropertyType, &ct.encoding, &ct.format, 2521 AnyPropertyType, &ct.encoding, &ct.format,
2522 &ct.nitems, &bytes_after, 2522 &ct.nitems, &bytes_after,
2523 &ct.value) != Success) 2523 &ct.value) != Success)
2524 break; 2524 break;
2525 2525
2526 if (ct.encoding == 0) 2526 if (ct.encoding == 0)
2527 { 2527 {
2528 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2528 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2529 break; 2529 break;
2530 } 2530 }
2531 2531
2532 if (ct.value == NULL) 2532 if (ct.value == NULL)
2533 { 2533 {
2534 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2534 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2535 continue; 2535 continue;
2536 } 2536 }
2537 2537
2538 if (ct.nitems == 0) 2538 if (ct.nitems == 0)
2539 { 2539 {
2540 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2540 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2541 if (selection_wait == Sel_normal && nread == 0) 2541 if (selection_wait == Sel_normal && nread == 0)
2542 { 2542 {
2543 /* 2543 /*
2544 * pass through again trying CUT_BUFFER0 if we've come from 2544 * pass through again trying CUT_BUFFER0 if we've come from
2545 * XConvertSelection() but nothing was presented 2545 * XConvertSelection () but nothing was presented
2546 */ 2546 */
2547 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2547 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2548 selection_paste (display->root, XA_CUT_BUFFER0, False); 2548 selection_paste (display->root, XA_CUT_BUFFER0, False);
2549 } 2549 }
2550 2550
2551 nread = -1; /* discount any previous stuff */ 2551 nread = -1; /* discount any previous stuff */
2552 break; 2552 break;
… …
2577 XFree (ct.value); 2577 XFree (ct.value);
2578 2578
2579 if (selection_wait == Sel_normal) 2579 if (selection_wait == Sel_normal)
2580 selection_wait = Sel_none; 2580 selection_wait = Sel_none;
2581 2581
2582 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2582 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2583 return (int)nread; 2583 return (int)nread;
2584} 2584}
2585 2585
2586void 2586void
2587rxvt_term::incr_cb (time_watcher &w) 2587rxvt_term::incr_cb (time_watcher &w)
… …
2599{ 2599{
2600 int reget_time = 0; 2600 int reget_time = 0;
2601 2601
2602 if (prop == None) 2602 if (prop == None)
2603 return; 2603 return;
2604 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); 2604 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal) 2605 if (selection_wait == Sel_normal)
2606 { 2606 {
2607 int a, afmt; 2607 int a, afmt;
2608 Atom atype; 2608 Atom atype;
2609 unsigned long bytes_after, nitems; 2609 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL; 2610 unsigned char *s = NULL;
2611 2611
2612 a = XGetWindowProperty(display->display, win, prop, 0L, 1L, False, 2612 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems, 2613 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s); 2614 &bytes_after, &s);
2615 if (s) 2615 if (s)
2616 XFree(s); 2616 XFree (s);
2617 if (a != Success) 2617 if (a != Success)
2618 return; 2618 return;
2619#ifndef __CYGWIN32__ 2619#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR]) 2620 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */ 2621 { /* start an INCR transfer */
2622 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2622 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2623 XDeleteProperty(display->display, win, prop); 2623 XDeleteProperty (display->display, win, prop);
2624 XFlush(display->display); 2624 XFlush (display->display);
2625 reget_time = 1; 2625 reget_time = 1;
2626 selection_wait = Sel_incr; 2626 selection_wait = Sel_incr;
2627 } 2627 }
2628#endif 2628#endif
2629 2629
… …
2631 else if (selection_wait == Sel_incr) 2631 else if (selection_wait == Sel_incr)
2632 { 2632 {
2633 reget_time = 1; 2633 reget_time = 1;
2634 if (selection_paste (win, prop, True) == -1) 2634 if (selection_paste (win, prop, True) == -1)
2635 { 2635 {
2636 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2636 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2637 selection_wait = Sel_none; 2637 selection_wait = Sel_none;
2638 incr_ev.stop (); 2638 incr_ev.stop ();
2639 } 2639 }
2640 } 2640 }
2641 if (reget_time) /* received more data so reget time */ 2641 if (reget_time) /* received more data so reget time */
… …
2645/* 2645/*
2646 * Request the current selection: 2646 * Request the current selection:
2647 * Order: > internal selection if available 2647 * Order: > internal selection if available
2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2649 * > CUT_BUFFER0 2649 * > CUT_BUFFER0
2650 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2650 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2651 * will auto fallback to CUT_BUFFER0 2651 * will auto fallback to CUT_BUFFER0
2652 * EXT: button 2 release 2652 * EXT: button 2 release
2653 */ 2653 */
2654void 2654void
2655rxvt_term::selection_request (Time tm, int x, int y) 2655rxvt_term::selection_request (Time tm, int x, int y)
2656{ 2656{
2657 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2657 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2659 return; /* outside window */ 2659 return; /* outside window */
2660 2660
2661 if (selection.text != NULL) 2661 if (selection.text != NULL)
2662 { /* internal selection */ 2662 { /* internal selection */
2663 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2663 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2664 paste (selection.text, selection.len); 2664 paste (selection.text, selection.len);
2665 return; 2665 return;
2666 } 2666 }
2667 else 2667 else
2668 { 2668 {
… …
2682 return; 2682 return;
2683#endif 2683#endif
2684 2684
2685 } 2685 }
2686 } 2686 }
2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2688 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2688 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2689 selection_paste (display->root, XA_CUT_BUFFER0, False); 2689 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690} 2690}
2691 2691
2692int 2692int
2693rxvt_term::selection_request_other (Atom target, int selnum) 2693rxvt_term::selection_request_other (Atom target, int selnum)
… …
2702 sel = XA_PRIMARY; 2702 sel = XA_PRIMARY;
2703 else if (selnum == Sel_Secondary) 2703 else if (selnum == Sel_Secondary)
2704 sel = XA_SECONDARY; 2704 sel = XA_SECONDARY;
2705 else 2705 else
2706 sel = xa[XA_CLIPBOARD]; 2706 sel = xa[XA_CLIPBOARD];
2707 if (XGetSelectionOwner(display->display, sel) != None) 2707 if (XGetSelectionOwner (display->display, sel) != None)
2708 { 2708 {
2709 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2709 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2710 XConvertSelection(display->display, sel, target, xa[XA_VT_SELECTION], 2710 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2711 TermWin.vt, selection_request_time); 2711 TermWin.vt, selection_request_time);
2712 return 1; 2712 return 1;
2713 } 2713 }
2714 return 0; 2714 return 0;
2715} 2715}
… …
2720 * EXT: SelectionClear 2720 * EXT: SelectionClear
2721 */ 2721 */
2722void 2722void
2723rxvt_term::selection_clear () 2723rxvt_term::selection_clear ()
2724{ 2724{
2725 D_SELECT((stderr, "rxvt_selection_clear()")); 2725 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2726
2727 want_refresh = 1; 2727 want_refresh = 1;
2728 if (selection.text) 2728 if (selection.text)
2729 free(selection.text); 2729 free (selection.text);
2730 selection.text = NULL; 2730 selection.text = NULL;
2731 selection.len = 0; 2731 selection.len = 0;
2732 CLEAR_SELECTION(); 2732 CLEAR_SELECTION ();
2733} 2733}
2734 2734
2735/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2736/* 2736/*
2737 * Copy a selection into the cut buffer 2737 * Copy a selection into the cut buffer
… …
2746 text_t *t; 2746 text_t *t;
2747#ifdef ACS_ASCII 2747#ifdef ACS_ASCII
2748 rend_t *re; 2748 rend_t *re;
2749#endif 2749#endif
2750 2750
2751 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2751 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2752 switch (selection.op) 2752 switch (selection.op)
2753 { 2753 {
2754 case SELECTION_CONT: 2754 case SELECTION_CONT:
2755 break; 2755 break;
2756 case SELECTION_INIT: 2756 case SELECTION_INIT:
2757 CLEAR_SELECTION(); 2757 CLEAR_SELECTION ();
2758 /* FALLTHROUGH */ 2758 /* FALLTHROUGH */
2759 case SELECTION_BEGIN: 2759 case SELECTION_BEGIN:
2760 selection.op = SELECTION_DONE; 2760 selection.op = SELECTION_DONE;
2761 /* FALLTHROUGH */ 2761 /* FALLTHROUGH */
2762 default: 2762 default:
… …
2766 2766
2767 if (selection.clicks == 4) 2767 if (selection.clicks == 4)
2768 return; /* nothing selected, go away */ 2768 return; /* nothing selected, go away */
2769 2769
2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
2771 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2771 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1);
2772 2772
2773 new_selection_text = (unsigned char *)str; 2773 new_selection_text = (unsigned char *)str;
2774 2774
2775 col = selection.beg.col; 2775 col = selection.beg.col;
2776 MAX_IT(col, 0); 2776 MAX_IT (col, 0);
2777 row = selection.beg.row + TermWin.saveLines; 2777 row = selection.beg.row + TermWin.saveLines;
2778 end_row = selection.end.row + TermWin.saveLines; 2778 end_row = selection.end.row + TermWin.saveLines;
2779 2779
2780 for (; row <= end_row; row++, col = 0) 2780 for (; row <= end_row; row++, col = 0)
2781 { 2781 {
2782 t = &(screen.text[row][col]); 2782 t = & (screen.text[row][col]);
2783 2783
2784 end_col = screen.tlen[row]; 2784 end_col = screen.tlen[row];
2785 2785
2786 if (end_col == -1) 2786 if (end_col == -1)
2787 end_col = TermWin.ncol; 2787 end_col = TermWin.ncol;
… …
2835 2835
2836 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2836 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2837 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2838 display->set_selection_owner (this); 2838 display->set_selection_owner (this);
2839 else 2839 else
2840 rxvt_print_error("can't get primary selection"); 2840 rxvt_print_error ("can't get primary selection");
2841 2841
2842 { 2842 {
2843 XTextProperty ct; 2843 XTextProperty ct;
2844 char *cl = (char *)selection.text; 2844 char *cl = (char *)selection.text;
2845 2845
2846 if (XmbTextListToTextProperty(display->display, &cl, 1, XStringStyle, &ct) >= 0) 2846 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0)
2847 { 2847 {
2848 XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2848 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2849 PropModeReplace, ct.value, ct.nitems); 2849 PropModeReplace, ct.value, ct.nitems);
2850 XFree (ct.value); 2850 XFree (ct.value);
2851 } 2851 }
2852 else 2852 else
2853 XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2853 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2854 PropModeReplace, selection.text, (int)selection.len); 2854 PropModeReplace, selection.text, (int)selection.len);
2855 } 2855 }
2856 2856
2857 selection_time = tm; 2857 selection_time = tm;
2858 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); 2858 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2859} 2859}
2860 2860
2861/* ------------------------------------------------------------------------- */ 2861/* ------------------------------------------------------------------------- */
2862/* 2862/*
2863 * Mark or select text based upon number of clicks: 1, 2, or 3 2863 * Mark or select text based upon number of clicks: 1, 2, or 3
2864 * EXT: button 1 press 2864 * EXT: button 1 press
2865 */ 2865 */
2866void 2866void
2867rxvt_term::selection_click (int clicks, int x, int y) 2867rxvt_term::selection_click (int clicks, int x, int y)
2868{ 2868{
2869 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2869 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2870 2870
2871 clicks = ((clicks - 1) % 3) + 1; 2871 clicks = ((clicks - 1) % 3) + 1;
2872 selection.clicks = clicks; /* save clicks so extend will work */ 2872 selection.clicks = clicks; /* save clicks so extend will work */
2873 2873
2874 selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); 2874 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2875 2875
2876 if (clicks == 2 || clicks == 3) 2876 if (clicks == 2 || clicks == 3)
2877 selection_extend_colrow (selection.mark.col, 2877 selection_extend_colrow (selection.mark.col,
2878 selection.mark.row + TermWin.view_start, 2878 selection.mark.row + TermWin.view_start,
2879 0, /* button 3 */ 2879 0, /* button 3 */
… …
2889rxvt_term::selection_start_colrow (int col, int row) 2889rxvt_term::selection_start_colrow (int col, int row)
2890{ 2890{
2891 want_refresh = 1; 2891 want_refresh = 1;
2892 selection.mark.col = col; 2892 selection.mark.col = col;
2893 selection.mark.row = row - TermWin.view_start; 2893 selection.mark.row = row - TermWin.view_start;
2894 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); 2894 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2895 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); 2895 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2896 MAX_IT(selection.mark.col, 0); 2896 MAX_IT (selection.mark.col, 0);
2897 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); 2897 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2898 2898
2899 if (selection.op) 2899 if (selection.op)
2900 { /* clear the old selection */ 2900 { /* clear the old selection */
2901 selection.beg.row = selection.end.row = selection.mark.row; 2901 selection.beg.row = selection.end.row = selection.mark.row;
2902 selection.beg.col = selection.end.col = selection.mark.col; 2902 selection.beg.col = selection.end.col = selection.mark.col;
… …
2911 * We now only find out the boundary in one direction 2911 * We now only find out the boundary in one direction
2912 */ 2912 */
2913 2913
2914/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2914/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2915#define DELIMIT_TEXT(x) \ 2915#define DELIMIT_TEXT(x) \
2916 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) 2916 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL))
2917#define DELIMIT_REND(x) 1 2917#define DELIMIT_REND(x) 1
2918 2918
2919void 2919void
2920rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2920rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2921{ 2921{
… …
2936 bound.col = TermWin.ncol - 1; 2936 bound.col = TermWin.ncol - 1;
2937 dirnadd = 1; 2937 dirnadd = 1;
2938 } 2938 }
2939 row = mark->row + TermWin.saveLines; 2939 row = mark->row + TermWin.saveLines;
2940 col = mark->col; 2940 col = mark->col;
2941 MAX_IT(col, 0); 2941 MAX_IT (col, 0);
2942 /* find the edge of a word */ 2942 /* find the edge of a word */
2943 stp = &(screen.text[row][col]); 2943 stp = & (screen.text[row][col]);
2944 w1 = DELIMIT_TEXT(*stp); 2944 w1 = DELIMIT_TEXT (*stp);
2945 2945
2946 if (selection_style != NEW_SELECT) 2946 if (selection_style != NEW_SELECT)
2947 { 2947 {
2948 if (w1 == 1) 2948 if (w1 == 1)
2949 { 2949 {
2950 stp += dirnadd; 2950 stp += dirnadd;
2951 if (DELIMIT_TEXT(*stp) == 1) 2951 if (DELIMIT_TEXT (*stp) == 1)
2952 goto Old_Word_Selection_You_Die; 2952 goto Old_Word_Selection_You_Die;
2953 col += dirnadd; 2953 col += dirnadd;
2954 } 2954 }
2955 w1 = 0; 2955 w1 = 0;
2956 } 2956 }
2957 srp = (&screen.rend[row][col]); 2957 srp = (&screen.rend[row][col]);
2958 w2 = DELIMIT_REND(*srp); 2958 w2 = DELIMIT_REND (*srp);
2959 2959
2960 for (;;) 2960 for (;;)
2961 { 2961 {
2962 for (; col != bound.col; col += dirnadd) 2962 for (; col != bound.col; col += dirnadd)
2963 { 2963 {
2964 stp += dirnadd; 2964 stp += dirnadd;
2965 if (DELIMIT_TEXT(*stp) != w1) 2965 if (DELIMIT_TEXT (*stp) != w1)
2966 break; 2966 break;
2967 srp += dirnadd; 2967 srp += dirnadd;
2968 if (DELIMIT_REND(*srp) != w2) 2968 if (DELIMIT_REND (*srp) != w2)
2969 break; 2969 break;
2970 } 2970 }
2971 if ((col == bound.col) && (row != bound.row)) 2971 if ((col == bound.col) && (row != bound.row))
2972 { 2972 {
2973 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) 2973 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2974 { 2974 {
2975 trow = row + dirnadd; 2975 trow = row + dirnadd;
2976 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 2976 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2977 if (screen.text[trow] == NULL) 2977 if (screen.text[trow] == NULL)
2978 break; 2978 break;
2979 stp = &(screen.text[trow][tcol]); 2979 stp = & (screen.text[trow][tcol]);
2980 srp = &(screen.rend[trow][tcol]); 2980 srp = & (screen.rend[trow][tcol]);
2981 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 2981 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2982 break; 2982 break;
2983 row = trow; 2983 row = trow;
2984 col = tcol; 2984 col = tcol;
2985 continue; 2985 continue;
2986 } 2986 }
2987 } 2987 }
2988 break; 2988 break;
2989 } 2989 }
2990Old_Word_Selection_You_Die: 2990Old_Word_Selection_You_Die:
2991 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)); 2991 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));
2992 2992
2993 if (dirn == DN) 2993 if (dirn == DN)
2994 col++; /* put us on one past the end */ 2994 col++; /* put us on one past the end */
2995 2995
2996 /* Poke the values back in */ 2996 /* Poke the values back in */
… …
3009void 3009void
3010rxvt_term::selection_extend (int x, int y, int flag) 3010rxvt_term::selection_extend (int x, int y, int flag)
3011{ 3011{
3012 int col, row; 3012 int col, row;
3013 3013
3014 col = Pixel2Col(x); 3014 col = Pixel2Col (x);
3015 row = Pixel2Row(y); 3015 row = Pixel2Row (y);
3016 MAX_IT(row, 0); 3016 MAX_IT (row, 0);
3017 MIN_IT(row, (int)TermWin.nrow - 1); 3017 MIN_IT (row, (int)TermWin.nrow - 1);
3018 MAX_IT(col, 0); 3018 MAX_IT (col, 0);
3019 MIN_IT(col, (int)TermWin.ncol); 3019 MIN_IT (col, (int)TermWin.ncol);
3020 3020
3021#ifndef NO_NEW_SELECTION 3021#ifndef NO_NEW_SELECTION
3022 /* 3022 /*
3023 * If we're selecting characters (single click) then we must check first 3023 * If we're selecting characters (single click) then we must check first
3024 * if we are at the same place as the original mark. If we are then 3024 * if we are at the same place as the original mark. If we are then
… …
3034 /* select nothing */ 3034 /* select nothing */
3035 selection.beg.row = selection.end.row = 0; 3035 selection.beg.row = selection.end.row = 0;
3036 selection.beg.col = selection.end.col = 0; 3036 selection.beg.col = selection.end.col = 0;
3037 selection.clicks = 4; 3037 selection.clicks = 4;
3038 want_refresh = 1; 3038 want_refresh = 1;
3039 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4")); 3039 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3040 return; 3040 return;
3041 } 3041 }
3042 } 3042 }
3043#endif 3043#endif
3044 if (selection.clicks == 4) 3044 if (selection.clicks == 4)
… …
3061 row_col_t pos; 3061 row_col_t pos;
3062 enum { 3062 enum {
3063 LEFT, RIGHT 3063 LEFT, RIGHT
3064 } closeto = RIGHT; 3064 } closeto = RIGHT;
3065 3065
3066 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)); 3066 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));
3067 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)); 3067 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));
3068 3068
3069 want_refresh = 1; 3069 want_refresh = 1;
3070 switch (selection.op) 3070 switch (selection.op)
3071 { 3071 {
3072 case SELECTION_INIT: 3072 case SELECTION_INIT:
3073 CLEAR_SELECTION(); 3073 CLEAR_SELECTION ();
3074 selection.op = SELECTION_BEGIN; 3074 selection.op = SELECTION_BEGIN;
3075 /* FALLTHROUGH */ 3075 /* FALLTHROUGH */
3076 case SELECTION_BEGIN: 3076 case SELECTION_BEGIN:
3077 if (row != selection.mark.row || col != selection.mark.col 3077 if (row != selection.mark.row || col != selection.mark.col
3078 || (!button3 && buttonpress)) 3078 || (!button3 && buttonpress))
… …
3094 && selection.beg.row == selection.end.row 3094 && selection.beg.row == selection.end.row
3095 && selection.beg.row != selection.mark.row) 3095 && selection.beg.row != selection.mark.row)
3096 { 3096 {
3097 selection.beg.col = selection.end.col = selection.mark.col; 3097 selection.beg.col = selection.end.col = selection.mark.col;
3098 selection.beg.row = selection.end.row = selection.mark.row; 3098 selection.beg.row = selection.end.row = selection.mark.row;
3099 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)); 3099 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));
3100 } 3100 }
3101 3101
3102 pos.col = col; 3102 pos.col = col;
3103 pos.row = row; 3103 pos.row = row;
3104 3104
… …
3127 { 3127 {
3128 selection.mark.row = selection.beg.row; 3128 selection.mark.row = selection.beg.row;
3129 selection.mark.col = selection.beg.col; 3129 selection.mark.col = selection.beg.col;
3130 } 3130 }
3131 } 3131 }
3132 if (ROWCOL_IS_BEFORE(pos, selection.mark)) 3132 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3133 { 3133 {
3134 selection.end.row = selection.mark.row; 3134 selection.end.row = selection.mark.row;
3135 selection.end.col = selection.mark.col + 1; 3135 selection.end.col = selection.mark.col + 1;
3136 selection.beg.row = pos.row; 3136 selection.beg.row = pos.row;
3137 selection.beg.col = pos.col; 3137 selection.beg.col = pos.col;
… …
3144 selection.end.col = pos.col + 1; 3144 selection.end.col = pos.col + 1;
3145 } 3145 }
3146 } 3146 }
3147 else if (selection.clicks == 2) 3147 else if (selection.clicks == 2)
3148 { 3148 {
3149 selection_delimit_word (UP, &(selection.mark), 3149 selection_delimit_word (UP, & (selection.mark),
3150 &(selection.beg)); 3150 & (selection.beg));
3151 selection_delimit_word (DN, &(selection.mark), 3151 selection_delimit_word (DN, & (selection.mark),
3152 &(selection.end)); 3152 & (selection.end));
3153 hate_those_clicks = 1; 3153 hate_those_clicks = 1;
3154 } 3154 }
3155 else if (selection.clicks == 3) 3155 else if (selection.clicks == 3)
3156 { 3156 {
3157 selection.beg.row = selection.end.row = selection.mark.row; 3157 selection.beg.row = selection.end.row = selection.mark.row;
3158 selection.beg.col = 0; 3158 selection.beg.col = 0;
3159 selection.end.col = ncol; 3159 selection.end.col = ncol;
3160 hate_those_clicks = 1; 3160 hate_those_clicks = 1;
3161 } 3161 }
3162 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)); 3162 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));
3163 return; 3163 return;
3164 } 3164 }
3165#endif /* ! NO_OLD_SELECTION */ 3165#endif /* ! NO_OLD_SELECTION */
3166#ifndef NO_NEW_SELECTION 3166#ifndef NO_NEW_SELECTION
3167 /* selection_style must not be OLD_SELECT to get here */ 3167 /* selection_style must not be OLD_SELECT to get here */
… …
3181 if (button3 && buttonpress) 3181 if (button3 && buttonpress)
3182 { /* button3 press */ 3182 { /* button3 press */
3183 /* 3183 /*
3184 * first determine which edge of the selection we are closest to 3184 * first determine which edge of the selection we are closest to
3185 */ 3185 */
3186 if (ROWCOL_IS_BEFORE(pos, selection.beg) 3186 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3187 || (!ROWCOL_IS_AFTER(pos, selection.end) 3187 || (!ROWCOL_IS_AFTER (pos, selection.end)
3188 && (((pos.col - selection.beg.col) 3188 && (((pos.col - selection.beg.col)
3189 + ((pos.row - selection.beg.row) * ncol)) 3189 + ((pos.row - selection.beg.row) * ncol))
3190 < ((selection.end.col - pos.col) 3190 < ((selection.end.col - pos.col)
3191 + ((selection.end.row - pos.row) * ncol))))) 3191 + ((selection.end.row - pos.row) * ncol)))))
3192 closeto = LEFT; 3192 closeto = LEFT;
… …
3206 selection.mark.col = selection.beg.col; 3206 selection.mark.col = selection.beg.col;
3207 } 3207 }
3208 } 3208 }
3209 else 3209 else
3210 { /* button1 drag or button3 drag */ 3210 { /* button1 drag or button3 drag */
3211 if (ROWCOL_IS_AFTER(selection.mark, pos)) 3211 if (ROWCOL_IS_AFTER (selection.mark, pos))
3212 { 3212 {
3213 if ((selection.mark.row == selection.end.row) 3213 if ((selection.mark.row == selection.end.row)
3214 && (selection.mark.col == selection.end.col) 3214 && (selection.mark.col == selection.end.col)
3215 && clickchange && selection.clicks == 2) 3215 && clickchange && selection.clicks == 2)
3216 selection.mark.col--; 3216 selection.mark.col--;
… …
3249 selection.end.col = ncol; 3249 selection.end.col = ncol;
3250 3250
3251 } 3251 }
3252 else if (selection.clicks == 2) 3252 else if (selection.clicks == 2)
3253 { 3253 {
3254 if (ROWCOL_IS_AFTER(selection.end, selection.beg)) 3254 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3255 selection.end.col--; 3255 selection.end.col--;
3256 selection_delimit_word (UP, &(selection.beg), 3256 selection_delimit_word (UP, & (selection.beg),
3257 &(selection.beg)); 3257 & (selection.beg));
3258 selection_delimit_word (DN, &(selection.end), 3258 selection_delimit_word (DN, & (selection.end),
3259 &(selection.end)); 3259 & (selection.end));
3260 } 3260 }
3261 else if (selection.clicks == 3) 3261 else if (selection.clicks == 3)
3262 { 3262 {
3263#ifndef NO_FRILLS 3263#ifndef NO_FRILLS
3264 if ((Options & Opt_tripleclickwords)) 3264 if ((Options & Opt_tripleclickwords))
3265 { 3265 {
3266 int end_row; 3266 int end_row;
3267 3267
3268 selection_delimit_word (UP, &(selection.beg), 3268 selection_delimit_word (UP, & (selection.beg),
3269 &(selection.beg)); 3269 & (selection.beg));
3270 end_row = screen.tlen[selection.mark.row 3270 end_row = screen.tlen[selection.mark.row
3271 + TermWin.saveLines]; 3271 + TermWin.saveLines];
3272 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3272 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3273 end_row++) 3273 end_row++)
3274 { 3274 {
… …
3284 } 3284 }
3285 else 3285 else
3286#endif 3286#endif
3287 3287
3288 { 3288 {
3289 if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) 3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3290 selection.mark.col++; 3290 selection.mark.col++;
3291 selection.beg.col = 0; 3291 selection.beg.col = 0;
3292 selection.end.col = ncol; 3292 selection.end.col = ncol;
3293 } 3293 }
3294 } 3294 }
… …
3304 { 3304 {
3305 selection.mark.row = selection.beg.row; 3305 selection.mark.row = selection.beg.row;
3306 selection.mark.col = selection.beg.col; 3306 selection.mark.col = selection.beg.col;
3307 } 3307 }
3308 } 3308 }
3309 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)); 3309 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));
3310#endif /* ! NO_NEW_SELECTION */ 3310#endif /* ! NO_NEW_SELECTION */
3311} 3311}
3312 3312
3313#ifndef NO_FRILLS 3313#ifndef NO_FRILLS
3314void 3314void
… …
3355 */ 3355 */
3356void 3356void
3357rxvt_term::selection_rotate (int x, int y) 3357rxvt_term::selection_rotate (int x, int y)
3358{ 3358{
3359 selection.clicks = selection.clicks % 3 + 1; 3359 selection.clicks = selection.clicks % 3 + 1;
3360 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3360 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3361} 3361}
3362 3362
3363/* ------------------------------------------------------------------------- */ 3363/* ------------------------------------------------------------------------- */
3364/* 3364/*
3365 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3365 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
… …
3399 *target++ = (Atom32) xa[XA_TEXT]; 3399 *target++ = (Atom32) xa[XA_TEXT];
3400 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3400 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3401#if X_HAVE_UTF8_STRING 3401#if X_HAVE_UTF8_STRING
3402 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3402 *target++ = (Atom32) xa[XA_UTF8_STRING];
3403#endif 3403#endif
3404 XChangeProperty(display->display, rq.requestor, rq.property, XA_ATOM, 3404 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3405 (8 * sizeof(target_list[0])), PropModeReplace, 3405 (8 * sizeof (target_list[0])), PropModeReplace,
3406 (unsigned char *)target_list, 3406 (unsigned char *)target_list,
3407 target - target_list); 3407 target - target_list);
3408 ev.property = rq.property; 3408 ev.property = rq.property;
3409 } 3409 }
3410 else if (rq.target == xa[XA_MULTIPLE]) 3410 else if (rq.target == xa[XA_MULTIPLE])
3411 { 3411 {
3412 /* TODO: Handle MULTIPLE */ 3412 /* TODO: Handle MULTIPLE */
3413 } 3413 }
3414 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3414 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3415 { 3415 {
3416 XChangeProperty(display->display, rq.requestor, rq.property, XA_INTEGER, 3416 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3417 (8 * sizeof(Time)), PropModeReplace, 3417 (8 * sizeof (Time)), PropModeReplace,
3418 (unsigned char *)&selection_time, 1); 3418 (unsigned char *)&selection_time, 1);
3419 ev.property = rq.property; 3419 ev.property = rq.property;
3420 } 3420 }
3421 else if (rq.target == XA_STRING 3421 else if (rq.target == XA_STRING
3422 || rq.target == xa[XA_TEXT] 3422 || rq.target == xa[XA_TEXT]
… …
3457 { 3457 {
3458 cl = ""; 3458 cl = "";
3459 selectlen = 0; 3459 selectlen = 0;
3460 } 3460 }
3461 3461
3462 if (XmbTextListToTextProperty(display->display, &cl, 1, style, &ct) >= 0) 3462 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3463 freect = 1; 3463 freect = 1;
3464 else 3464 else
3465 { 3465 {
3466 /* if we failed to convert then send it raw */ 3466 /* if we failed to convert then send it raw */
3467 ct.value = (unsigned char *)cl; 3467 ct.value = (unsigned char *)cl;
… …
3487 * return col/row values corresponding to x/y pixel values 3487 * return col/row values corresponding to x/y pixel values
3488 */ 3488 */
3489void 3489void
3490rxvt_term::pixel_position (int *x, int *y) 3490rxvt_term::pixel_position (int *x, int *y)
3491{ 3491{
3492 *x = Pixel2Col(*x); 3492 *x = Pixel2Col (*x);
3493 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ 3493 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3494 *y = Pixel2Row(*y); 3494 *y = Pixel2Row (*y);
3495 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ 3495 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3496} 3496}
3497 3497
3498/* ------------------------------------------------------------------------- */ 3498/* ------------------------------------------------------------------------- */
3499#ifdef USE_XIM 3499#ifdef USE_XIM
3500void 3500void
… …
3513/* ------------------------------------------------------------------------- * 3513/* ------------------------------------------------------------------------- *
3514 * DEBUG ROUTINES * 3514 * DEBUG ROUTINES *
3515 * ------------------------------------------------------------------------- */ 3515 * ------------------------------------------------------------------------- */
3516#if 0 3516#if 0
3517void 3517void
3518rxvt_debug_colors(void) 3518rxvt_debug_colors (void)
3519{ 3519{
3520 int color; 3520 int color;
3521 const char *name[] = 3521 const char *name[] =
3522 { 3522 {
3523 "fg", "bg", 3523 "fg", "bg",
3524 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3524 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3525 }; 3525 };
3526 3526
3527 fprintf(stderr, "Color ( "); 3527 fprintf (stderr, "Color ( ");
3528 if (rstyle & RS_RVid) 3528 if (rstyle & RS_RVid)
3529 fprintf(stderr, "rvid "); 3529 fprintf (stderr, "rvid ");
3530 if (rstyle & RS_Bold) 3530 if (rstyle & RS_Bold)
3531 fprintf(stderr, "bold "); 3531 fprintf (stderr, "bold ");
3532 if (rstyle & RS_Blink) 3532 if (rstyle & RS_Blink)
3533 fprintf(stderr, "blink "); 3533 fprintf (stderr, "blink ");
3534 if (rstyle & RS_Uline) 3534 if (rstyle & RS_Uline)
3535 fprintf(stderr, "uline "); 3535 fprintf (stderr, "uline ");
3536 fprintf(stderr, "): "); 3536 fprintf (stderr, "): ");
3537 3537
3538 color = GET_FGCOLOR(rstyle); 3538 color = GET_FGCOLOR (rstyle);
3539#ifndef NO_BRIGHTCOLOR 3539#ifndef NO_BRIGHTCOLOR
3540 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) 3540 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3541 { 3541 {
3542 color -= (minBrightCOLOR - minCOLOR); 3542 color -= (minBrightCOLOR - minCOLOR);
3543 fprintf(stderr, "bright "); 3543 fprintf (stderr, "bright ");
3544 } 3544 }
3545#endif 3545#endif
3546 fprintf(stderr, "%s on ", name[color]); 3546 fprintf (stderr, "%s on ", name[color]);
3547 3547
3548 color = GET_BGCOLOR(rstyle); 3548 color = GET_BGCOLOR (rstyle);
3549#ifndef NO_BRIGHTCOLOR 3549#ifndef NO_BRIGHTCOLOR
3550 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) 3550 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3551 { 3551 {
3552 color -= (minBrightCOLOR - minCOLOR); 3552 color -= (minBrightCOLOR - minCOLOR);
3553 fprintf(stderr, "bright "); 3553 fprintf (stderr, "bright ");
3554 } 3554 }
3555#endif 3555#endif
3556 fprintf(stderr, "%s\n", name[color]); 3556 fprintf (stderr, "%s\n", name[color]);
3557} 3557}
3558#endif 3558#endif

Diff Legend

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