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.13 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.32 by pcg, Sun Feb 22 10:38:11 2004 UTC

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

Diff Legend

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