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

Diff Legend

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