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

Diff Legend

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