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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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