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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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