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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.54 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

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