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.17 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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