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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

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

Diff Legend

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